Merge
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index c287c93..acd76c4 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -239,3 +239,4 @@
763ada2a1d8c5962bc8c3d297e57c562d2e95338 jdk8-b115
cbfe5da942c63ef865cab4a7159e01eff7d7fcf5 jdk8-b116
a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117
+0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 jdk8-b118
diff --git a/Makefile b/Makefile
index 2ef4bb9..c021078 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,549 +23,112 @@
# questions.
#
-# If NEWBUILD is defined, use the new build-infra Makefiles and configure.
-# See NewMakefile.gmk for more information.
+# This must be the first rule
+default:
-# If not specified, select what the default build is
-ifndef NEWBUILD
- NEWBUILD=true
+# Inclusion of this pseudo-target will cause make to execute this file
+# serially, regardless of -j. Recursively called makefiles will not be
+# affected, however. This is required for correct dependency management.
+.NOTPARALLEL:
+
+# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
+# /usr/ccs/bin/make lacks basically every other flow control mechanism.
+TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
+
+# Assume we have GNU make, but check version.
+ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
+ $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
endif
-ifeq ($(NEWBUILD),true)
-
- # The new top level Makefile
- include NewMakefile.gmk
-
-else # Original Makefile logic
-
-BUILD_PARENT_DIRECTORY=.
-
-# Basename of any originally supplied ALT_OUTPUTDIR directory
-ifndef ORIG_OUTPUTDIR_BASENAME
- ifdef ALT_OUTPUTDIR
- ORIG_OUTPUTDIR_BASENAME := $(shell basename $(ALT_OUTPUTDIR))
- else
- ORIG_OUTPUTDIR_BASENAME = $(PLATFORM)-$(ARCH)
- endif
-endif
-export ORIG_OUTPUTDIR_BASENAME
-
-# The three possible directories created for output (3 build flavors)
-OUTPUTDIR_BASENAME- = $(ORIG_OUTPUTDIR_BASENAME)
-OUTPUTDIR_BASENAME-debug = $(ORIG_OUTPUTDIR_BASENAME)-debug
-OUTPUTDIR_BASENAME-fastdebug = $(ORIG_OUTPUTDIR_BASENAME)-fastdebug
-
-# Relative path to a debug output area
-REL_JDK_OUTPUTDIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME))
-
-# The created jdk image directory
-JDK_IMAGE_DIRNAME = j2sdk-image
-JDK_IMAGE_DIR = $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
-ABS_JDK_IMAGE_DIR = $(ABS_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
-
-# Relative path from an output directory to the image directory
-REL_JDK_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME))/$(JDK_IMAGE_DIRNAME)
-REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
-REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
-
-ifndef TOPDIR
- TOPDIR:=.
-endif
-
-ifndef JDK_TOPDIR
- JDK_TOPDIR=$(TOPDIR)/jdk
-endif
-ifndef JDK_MAKE_SHARED_DIR
- JDK_MAKE_SHARED_DIR=$(JDK_TOPDIR)/make/common/shared
-endif
-
-default: all
-
-include $(JDK_MAKE_SHARED_DIR)/Defs-control.gmk
-include ./make/Defs-internal.gmk
-include ./make/sanity-rules.gmk
-include ./make/hotspot-rules.gmk
-include ./make/langtools-rules.gmk
-include ./make/corba-rules.gmk
-include ./make/jaxp-rules.gmk
-include ./make/jaxws-rules.gmk
-include ./make/jdk-rules.gmk
-include ./make/nashorn-rules.gmk
-include ./make/install-rules.gmk
-include ./make/sponsors-rules.gmk
-include ./make/deploy-rules.gmk
-
-all:: sanity
-
-ifeq ($(SKIP_FASTDEBUG_BUILD), false)
- all:: fastdebug_build
-endif
-
-ifeq ($(SKIP_DEBUG_BUILD), false)
- all:: debug_build
-endif
-
-all:: all_product_build
-
-all_product_build::
-
-# Everything for a full product build
-ifeq ($(SKIP_PRODUCT_BUILD), false)
-
- all_product_build:: product_build
-
- ifeq ($(BUILD_INSTALL), true)
- all_product_build:: $(INSTALL)
- clobber:: install-clobber
- endif
-
- ifeq ($(BUILD_SPONSORS), true)
- all_product_build:: $(SPONSORS)
- clobber:: sponsors-clobber
- endif
-
- ifneq ($(SKIP_COMPARE_IMAGES), true)
- all_product_build:: compare-image
- endif
-
-endif
-
-define StartTimer
- $(MKDIR) -p $(BUILDTIMESDIR)
- $(RM) $(BUILDTIMESDIR)/build_time_*
- $(call RecordStartTime,TOTAL)
-endef
-
-define StopTimer
- $(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,TOTAL) && $(call ReportBuildTimes,$1),)
-endef
-
-# Generic build of basic repo series
-generic_build_repo_series:: $(SOURCE_TIPS)
- $(MKDIR) -p $(JDK_IMAGE_DIR)
- @$(call StartTimer)
-
-ifeq ($(BUILD_LANGTOOLS), true)
- generic_build_repo_series:: langtools
- clobber:: langtools-clobber
-endif
-
-ifeq ($(BUILD_CORBA), true)
- generic_build_repo_series:: corba
- clobber:: corba-clobber
-endif
-
-ifeq ($(BUILD_JAXP), true)
- generic_build_repo_series:: jaxp
- clobber:: jaxp-clobber
-endif
-
-ifeq ($(BUILD_JAXWS), true)
- generic_build_repo_series:: jaxws
- clobber:: jaxws-clobber
-endif
-
-ifeq ($(BUILD_HOTSPOT), true)
- generic_build_repo_series:: $(HOTSPOT)
- clobber:: hotspot-clobber
-endif
-
-ifeq ($(BUILD_JDK), true)
- generic_build_repo_series:: $(JDK_JAVA_EXE)
- clobber:: jdk-clobber
-endif
-
-ifeq ($(BUILD_NASHORN), true)
- generic_build_repo_series:: $(NASHORN)
- clobber:: nashorn-clobber
-endif
-
-ifeq ($(BUILD_DEPLOY), true)
- generic_build_repo_series:: $(DEPLOY)
- clobber:: deploy-clobber
-endif
-
-generic_build_repo_series::
- @$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build))
-
-# The debug build, fastdebug or debug. Needs special handling.
-# Note that debug builds do NOT do INSTALL steps, but must be done
-# after the product build and before the INSTALL step of the product build.
-#
-# DEBUG_NAME is fastdebug or debug
-# ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix
-# The resulting image directory (j2sdk-image) is used by the install makefiles
-# to create a debug install bundle jdk-*-debug-** bundle (tar or zip)
-# which will install in the debug or fastdebug subdirectory of the
-# normal product install area.
-# The install process needs to know what the DEBUG_NAME is, so
-# look for INSTALL_DEBUG_NAME in the install rules.
-#
-# NOTE: On windows, do not use $(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME).
-# Due to the use of short paths in $(ABS_OUTPUTDIR), this may
-# not be the same location.
-#
-
-# Location of fresh bootdir output
-ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
-FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
-FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(REL_JDK_IMAGE_DIR)
-
-create_fresh_product_bootdir: FRC
- $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
- GENERATE_DOCS=false \
- BOOT_CYCLE_SETTINGS= \
- build_product_image
-
-create_fresh_debug_bootdir: FRC
- $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
- GENERATE_DOCS=false \
- BOOT_CYCLE_DEBUG_SETTINGS= \
- build_debug_image
-
-create_fresh_fastdebug_bootdir: FRC
- $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
- GENERATE_DOCS=false \
- BOOT_CYCLE_DEBUG_SETTINGS= \
- build_fastdebug_image
-
-# Create boot image?
-ifeq ($(SKIP_BOOT_CYCLE),false)
- ifneq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
- DO_BOOT_CYCLE=true
- endif
-endif
-
-
-
-ifeq ($(DO_BOOT_CYCLE),true)
-
- # Create the bootdir to use in the build
- product_build:: create_fresh_product_bootdir
- debug_build:: create_fresh_debug_bootdir
- fastdebug_build:: create_fresh_fastdebug_bootdir
-
- # Define variables to be used now for the boot jdk
- BOOT_CYCLE_SETTINGS= \
- ALT_BOOTDIR=$(FRESH_BOOTDIR) \
- ALT_JDK_IMPORT_PATH=$(FRESH_BOOTDIR)
- BOOT_CYCLE_DEBUG_SETTINGS= \
- ALT_BOOTDIR=$(FRESH_DEBUG_BOOTDIR) \
- ALT_JDK_IMPORT_PATH=$(FRESH_DEBUG_BOOTDIR)
-
+# Locate this Makefile
+ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
+ makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
else
+ makefile_path:=$(lastword $(MAKEFILE_LIST))
+endif
+root_dir:=$(dir $(makefile_path))
- # Use the supplied ALT_BOOTDIR as the boot
- BOOT_CYCLE_SETTINGS=
- BOOT_CYCLE_DEBUG_SETTINGS=
+# ... and then we can include our helper functions
+include $(root_dir)/make/MakeHelpers.gmk
+$(eval $(call ParseLogLevel))
+$(eval $(call ParseConfAndSpec))
+
+# Now determine if we have zero, one or several configurations to build.
+ifeq ($(SPEC),)
+ # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
+else
+ ifeq ($(words $(SPEC)),1)
+ # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
+ include $(root_dir)/make/Main.gmk
+ else
+ # We are building multiple configurations.
+ # First, find out the valid targets
+ # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
+ # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
+ all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
+ $(MAKE) -p -q -f make/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
+ grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
+
+ $(all_phony_targets):
+ @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
+ $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
+
+ .PHONY: $(all_phony_targets)
+
+ endif
endif
-build_product_image:
- $(MAKE) \
- SKIP_FASTDEBUG_BUILD=true \
- SKIP_DEBUG_BUILD=true \
- $(BOOT_CYCLE_SETTINGS) \
- generic_build_repo_series
+# Include this after a potential spec file has been included so that the bundles target
+# has access to the spec variables.
+include $(root_dir)/make/Jprt.gmk
-# NOTE: On windows, do not use $(ABS_OUTPUTDIR)-$(DEBUG_NAME).
-# Due to the use of short paths in $(ABS_OUTPUTDIR), this may
-# not be the same location.
+# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
+# If you addd more global targets, please update the variable global_targets in MakeHelpers.
-generic_debug_build:
- $(MAKE) \
- ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \
- DEBUG_NAME=$(DEBUG_NAME) \
- GENERATE_DOCS=false \
- $(BOOT_CYCLE_DEBUG_SETTINGS) \
- generic_build_repo_series
+help:
+ $(info )
+ $(info OpenJDK Makefile help)
+ $(info =====================)
+ $(info )
+ $(info Common make targets)
+ $(info . make [default] # Compile all product in langtools, hotspot, jaxp, jaxws,)
+ $(info . # corba and jdk)
+ $(info . make all # Compile everything, all repos and images)
+ $(info . make images # Create complete j2sdk and j2re images)
+ $(info . make docs # Create javadocs)
+ $(info . make overlay-images # Create limited images for sparc 64 bit platforms)
+ $(info . make profiles # Create complete j2re compact profile images)
+ $(info . make bootcycle-images # Build images twice, second time with newly build JDK)
+ $(info . make install # Install the generated images locally)
+ $(info . make clean # Remove all files generated by make, but not those)
+ $(info . # generated by configure)
+ $(info . make dist-clean # Remove all files, including configuration)
+ $(info . make help # Give some help on using make)
+ $(info . make test # Run tests, default is all tests (see TEST below))
+ $(info )
+ $(info Targets for specific components)
+ $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
+ $(info . make <component> # Build <component> and everything it depends on. )
+ $(info . make <component>-only # Build <component> only, without dependencies. This)
+ $(info . # is faster but can result in incorrect build results!)
+ $(info . make clean-<component> # Remove files generated by make for <component>)
+ $(info )
+ $(info Useful make variables)
+ $(info . make CONF= # Build all configurations (note, assignment is empty))
+ $(info . make CONF=<substring> # Build the configuration(s) with a name matching)
+ $(info . # <substring>)
+ $(info )
+ $(info . make LOG=<loglevel> # Change the log level from warn to <loglevel>)
+ $(info . # Available log levels are:)
+ $(info . # 'warn' (default), 'info', 'debug' and 'trace')
+ $(info . # To see executed command lines, use LOG=debug)
+ $(info )
+ $(info . make JOBS=<n> # Run <n> parallel make jobs)
+ $(info . # Note that -jN does not work as expected!)
+ $(info )
+ $(info . make test TEST=<test> # Only run the given test or tests, e.g.)
+ $(info . # make test TEST="jdk_lang jdk_net")
+ $(info )
-build_debug_image:
- $(MAKE) DEBUG_NAME=debug generic_debug_build
-
-build_fastdebug_image:
- $(MAKE) DEBUG_NAME=fastdebug generic_debug_build
-
-# Build final image
-product_build:: build_product_image
-debug_build:: build_debug_image
-fastdebug_build:: build_fastdebug_image
-
-# The source tips are stored with the relative path to the repo.
-# This file will be used when constructing the jdk image.
-source_tips: $(SOURCE_TIPS)
- $(CAT) $<
-$(SOURCE_TIPS): FRC
- @$(prep-target)
- @$(call GetSourceTips)
-
-clobber:: REPORT_BUILD_TIMES=
-clobber::
- $(RM) -r $(OUTPUTDIR)/*
- -($(RMDIR) -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1; $(TRUE))
-
-clean: clobber
-
-#
-# Dev builds
-#
-
-dev : dev-build
-
-dev-build:
- $(MAKE) DEV_ONLY=true all
-dev-sanity:
- $(MAKE) DEV_ONLY=true sanity
-dev-clobber:
- $(MAKE) DEV_ONLY=true clobber
-
-#
-# Quick jdk verification build
-#
-jdk_only:
- $(MAKE) SKIP_FASTDEBUG_BUILD=true BUILD_HOTSPOT=false all
-
-
-#
-# Quick jdk verification fastdebug build
-#
-jdk_fastdebug_only:
- $(MAKE) DEBUG_NAME=fastdebug BUILD_HOTSPOT=false BUILD_DEPLOY=false \
- BUILD_INSTALL=false BUILD_SPONSORS=false generic_debug_build
-
-#
-# Quick deploy verification fastdebug build
-#
-deploy_fastdebug_only:
- $(MAKE) \
- DEBUG_NAME=fastdebug \
- BUILD_HOTSPOT=false \
- BUILD_JDK=false \
- BUILD_LANGTOOLS=false \
- BUILD_NASHORN=false \
- BUILD_CORBA=false \
- BUILD_JAXP=false \
- BUILD_JAXWS=false \
- BUILD_INSTALL=false \
- BUILD_SPONSORS=false \
- generic_debug_build
-
-#
-# Product build (skip debug builds)
-#
-product_only:
- $(MAKE) SKIP_FASTDEBUG_BUILD=true all
-
-#
-# Check target
-#
-
-check: variable_check
-
-#
-# Help target
-#
-help: intro_help target_help variable_help notes_help examples_help
-
-# Intro help message
-intro_help:
- @$(ECHO) "\
-Makefile for the JDK builds (all the JDK). \n\
-"
-
-# Target help
-target_help:
- @$(ECHO) "\
---- Common Targets --- \n\
-all -- build the core JDK (default target) \n\
-help -- Print out help information \n\
-check -- Check make variable values for correctness \n\
-sanity -- Perform detailed sanity checks on system and settings \n\
-fastdebug_build -- build the core JDK in 'fastdebug' mode (-g -O) \n\
-debug_build -- build the core JDK in 'debug' mode (-g) \n\
-clean -- remove all built and imported files \n\
-clobber -- same as clean \n\
-"
-
-# Variable help (only common ones used by this Makefile)
-variable_help: variable_help_intro variable_list variable_help_end
-variable_help_intro:
- @$(ECHO) "--- Common Variables ---"
-variable_help_end:
- @$(ECHO) " "
-
-# One line descriptions for the variables
-OUTPUTDIR.desc = Output directory
-PARALLEL_COMPILE_JOBS.desc = Solaris/Linux parallel compile run count
-SLASH_JAVA.desc = Root of all build tools, e.g. /java or J:
-BOOTDIR.desc = JDK used to boot the build
-JDK_IMPORT_PATH.desc = JDK used to import components of the build
-COMPILER_PATH.desc = Compiler install directory
-CACERTS_FILE.desc = Location of certificates file
-DEVTOOLS_PATH.desc = Directory containing zip and gnumake
-CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files
-
-# Make variables to print out (description and value)
-VARIABLE_PRINTVAL_LIST += \
- OUTPUTDIR \
- PARALLEL_COMPILE_JOBS \
- SLASH_JAVA \
- BOOTDIR \
- JDK_IMPORT_PATH \
- COMPILER_PATH \
- CACERTS_FILE \
- DEVTOOLS_PATH
-
-# Make variables that should refer to directories that exist
-VARIABLE_CHECKDIR_LIST += \
- SLASH_JAVA \
- BOOTDIR \
- JDK_IMPORT_PATH \
- COMPILER_PATH \
- DEVTOOLS_PATH
-
-# Make variables that should refer to files that exist
-VARIABLE_CHECKFIL_LIST += \
- CACERTS_FILE
-
-# For pattern rules below, so all are treated the same
-DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval)
-DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)
-DO_CHECKFIL_LIST=$(VARIABLE_CHECKFIL_LIST:%=%.checkfil)
-
-# Complete variable check
-variable_check: $(DO_CHECKDIR_LIST) $(DO_CHECKFIL_LIST)
-variable_list: $(DO_PRINTVAL_LIST) variable_check
-
-# Pattern rule for printing out a variable
-%.printval:
- @$(ECHO) " ALT_$* - $($*.desc)"
- @$(ECHO) " \t $*=$($*)"
-
-# Pattern rule for checking to see if a variable with a directory exists
-%.checkdir:
- @if [ ! -d $($*) ] ; then \
- $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \
- fi
-
-# Pattern rule for checking to see if a variable with a file exists
-%.checkfil:
- @if [ ! -f $($*) ] ; then \
- $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \
- fi
-
-# Misc notes on help
-notes_help:
- @$(ECHO) "\
---- Notes --- \n\
-- All builds use same output directory unless overridden with \n\
- \t ALT_OUTPUTDIR=<dir>, changing from product to fastdebug you may want \n\
- \t to use the clean target first. \n\
-- JDK_IMPORT_PATH must refer to a compatible build, not all past promoted \n\
- \t builds or previous release JDK builds will work. \n\
-- The fastest builds have been when the sources and the BOOTDIR are on \n\
- \t local disk. \n\
-"
-
-examples_help:
- @$(ECHO) "\
---- Examples --- \n\
- $(MAKE) fastdebug_build \n\
- $(MAKE) ALT_OUTPUTDIR=/tmp/foobar all \n\
- $(MAKE) ALT_OUTPUTDIR=/tmp/foobar fastdebug_build \n\
- $(MAKE) ALT_OUTPUTDIR=/tmp/foobar all \n\
- $(MAKE) ALT_BOOTDIR=/opt/java/jdk1.5.0 \n\
- $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk1.6.0 \n\
-"
-
-################################################################
-# Source bundling
-################################################################
-ifeq ($(BUNDLE_RULES_AVAILABLE), true)
- include $(BUNDLE_RULES)
-endif
-
-################################################################
-# rule to test
-################################################################
-
-.NOTPARALLEL: test_run
-
-test:
- $(MAKE) test_run
-
-test_run: test_clean test_start test_summary
-
-test_start:
- @$(ECHO) "Tests started at `$(DATE)`"
-
-test_clean:
- $(RM) $(OUTPUTDIR)/test_failures.txt $(OUTPUTDIR)/test_log.txt
-
-test_summary: $(OUTPUTDIR)/test_failures.txt
- @$(ECHO) "#################################################"
- @$(ECHO) "Tests completed at `$(DATE)`"
- @( $(EGREP) '^TEST STATS:' $(OUTPUTDIR)/test_log.txt \
- || $(ECHO) "No TEST STATS seen in log" )
- @$(ECHO) "For complete details see: $(OUTPUTDIR)/test_log.txt"
- @$(ECHO) "#################################################"
- @if [ -s $< ] ; then \
- $(ECHO) "ERROR: Test failure count: `$(CAT) $< | $(WC) -l`"; \
- $(CAT) $<; \
- exit 1; \
- else \
- $(ECHO) "Success! No failures detected"; \
- fi
-
-# Get failure list from log
-$(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
- @$(RM) $@
- @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@
-
-# Get log file of all tests run
-JDK_TO_TEST := $(shell \
- if [ -d "$(ABS_JDK_IMAGE_DIR)" ] ; then \
- $(ECHO) "$(ABS_JDK_IMAGE_DIR)"; \
- elif [ -d "$(ABS_OUTPUTDIR)/bin" ] ; then \
- $(ECHO) "$(ABS_OUTPUTDIR)"; \
- elif [ "$(PRODUCT_HOME)" != "" -a -d "$(PRODUCT_HOME)/bin" ] ; then \
- $(ECHO) "$(PRODUCT_HOME)"; \
- fi \
-)
-TEST_TARGETS=all
-$(OUTPUTDIR)/test_log.txt:
- $(RM) $@
- ( $(CD) test && \
- $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) $(TEST_TARGETS) \
- ) | tee $@
-
-################################################################
-# JPRT rule to build
-################################################################
-
-include ./make/jprt.gmk
-
-################################################################
-# PHONY
-################################################################
-
-.PHONY: all test test_run test_start test_summary test_clean \
- generic_build_repo_series \
- what clobber insane \
- dev dev-build dev-sanity dev-clobber \
- product_build \
- fastdebug_build \
- debug_build \
- build_product_image \
- build_debug_image \
- build_fastdebug_image \
- create_fresh_product_bootdir \
- create_fresh_debug_bootdir \
- create_fresh_fastdebug_bootdir \
- generic_debug_build
-
-# Force target
-FRC:
-
-endif # Original Makefile logic
-
+.PHONY: help
diff --git a/NewMakefile.gmk b/NewMakefile.gmk
deleted file mode 100644
index a3389ff..0000000
--- a/NewMakefile.gmk
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This must be the first rule
-default:
-
-# Inclusion of this pseudo-target will cause make to execute this file
-# serially, regardless of -j. Recursively called makefiles will not be
-# affected, however. This is required for correct dependency management.
-.NOTPARALLEL:
-
-# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
-# /usr/ccs/bin/make lacks basically every other flow control mechanism.
-TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
-
-# Assume we have GNU make, but check version.
-ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
- $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
-endif
-
-# Locate this Makefile
-ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
- makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
- makefile_path:=$(lastword $(MAKEFILE_LIST))
-endif
-root_dir:=$(dir $(makefile_path))
-
-# ... and then we can include our helper functions
-include $(root_dir)/common/makefiles/MakeHelpers.gmk
-
-$(eval $(call ParseLogLevel))
-$(eval $(call ParseConfAndSpec))
-
-# Now determine if we have zero, one or several configurations to build.
-ifeq ($(SPEC),)
- # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
-else
- ifeq ($(words $(SPEC)),1)
- # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
- include $(root_dir)/common/makefiles/Main.gmk
- else
- # We are building multiple configurations.
- # First, find out the valid targets
- # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
- # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
- all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
- $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
- grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
-
- $(all_phony_targets):
- @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
- $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
-
- .PHONY: $(all_phony_targets)
-
- endif
-endif
-
-# Include this after a potential spec file has been included so that the bundles target
-# has access to the spec variables.
-include $(root_dir)/common/makefiles/Jprt.gmk
-
-# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
-# If you addd more global targets, please update the variable global_targets in MakeHelpers.
-
-help:
- $(info )
- $(info OpenJDK Makefile help)
- $(info =====================)
- $(info )
- $(info Common make targets)
- $(info . make [default] # Compile all product in langtools, hotspot, jaxp, jaxws,)
- $(info . # corba and jdk)
- $(info . make all # Compile everything, all repos and images)
- $(info . make images # Create complete j2sdk and j2re images)
- $(info . make docs # Create javadocs)
- $(info . make overlay-images # Create limited images for sparc 64 bit platforms)
- $(info . make profiles # Create complete j2re compact profile images)
- $(info . make bootcycle-images # Build images twice, second time with newly build JDK)
- $(info . make install # Install the generated images locally)
- $(info . make clean # Remove all files generated by make, but not those)
- $(info . # generated by configure)
- $(info . make dist-clean # Remove all files, including configuration)
- $(info . make help # Give some help on using make)
- $(info . make test # Run tests, default is all tests (see TEST below))
- $(info )
- $(info Targets for specific components)
- $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
- $(info . make <component> # Build <component> and everything it depends on. )
- $(info . make <component>-only # Build <component> only, without dependencies. This)
- $(info . # is faster but can result in incorrect build results!)
- $(info . make clean-<component> # Remove files generated by make for <component>)
- $(info )
- $(info Useful make variables)
- $(info . make CONF= # Build all configurations (note, assignment is empty))
- $(info . make CONF=<substring> # Build the configuration(s) with a name matching)
- $(info . # <substring>)
- $(info )
- $(info . make LOG=<loglevel> # Change the log level from warn to <loglevel>)
- $(info . # Available log levels are:)
- $(info . # 'warn' (default), 'info', 'debug' and 'trace')
- $(info . # To see executed command lines, use LOG=debug)
- $(info )
- $(info . make JOBS=<n> # Run <n> parallel make jobs)
- $(info . # Note that -jN does not work as expected!)
- $(info )
- $(info . make test TEST=<test> # Only run the given test or tests, e.g.)
- $(info . # make test TEST="jdk_lang jdk_net")
- $(info )
-
-.PHONY: help
diff --git a/common/autoconf/Makefile.in b/common/autoconf/Makefile.in
index a15b53f..000a9e7 100644
--- a/common/autoconf/Makefile.in
+++ b/common/autoconf/Makefile.in
@@ -24,4 +24,4 @@
# This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
# GENERATED FILE, DO NOT EDIT
SPEC:=@OUTPUT_ROOT@/spec.gmk
-include @SRC_ROOT@/NewMakefile.gmk
+include @SRC_ROOT@/Makefile
diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4
index 92d755a..9ef7b04 100644
--- a/common/autoconf/basics.m4
+++ b/common/autoconf/basics.m4
@@ -412,7 +412,7 @@
# Test from where we are running configure, in or outside of src root.
if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
|| test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
- || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
+ || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
# We are running configure from the src root.
# Create a default ./build/target-variant-debuglevel output root.
if test "x${CONF_NAME}" = x; then
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index edac17d..1344095 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -3865,7 +3865,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1383151988
+DATE_WHEN_GENERATED=1384422786
###############################################################################
#
@@ -8042,7 +8042,7 @@
# Test from where we are running configure, in or outside of src root.
if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
|| test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
- || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
+ || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
# We are running configure from the src root.
# Create a default ./build/target-variant-debuglevel output root.
if test "x${CONF_NAME}" = x; then
@@ -16201,32 +16201,25 @@
cd "$CURDIR"
# Verify that the addon source root does not have any root makefiles.
# If it does, then it is usually an error, prevent this.
- if test -f $with_add_source_root/langtools/makefiles/Makefile || \
- test -f $with_add_source_root/langtools/make/Makefile; then
+ if test -f $with_add_source_root/langtools/make/Makefile; then
as_fn_error $? "Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources." "$LINENO" 5
fi
- if test -f $with_add_source_root/corba/makefiles/Makefile || \
- test -f $with_add_source_root/corba/make/Makefile; then
+ if test -f $with_add_source_root/corba/make/Makefile; then
as_fn_error $? "Your add source root seems to contain a full corba repo! An add source root should only contain additional sources." "$LINENO" 5
fi
- if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
- test -f $with_add_source_root/jaxp/make/Makefile; then
+ if test -f $with_add_source_root/jaxp/make/Makefile; then
as_fn_error $? "Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources." "$LINENO" 5
fi
- if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
- test -f $with_add_source_root/jaxws/make/Makefile; then
+ if test -f $with_add_source_root/jaxws/make/Makefile; then
as_fn_error $? "Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources." "$LINENO" 5
fi
- if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
- test -f $with_add_source_root/hotspot/make/Makefile; then
+ if test -f $with_add_source_root/hotspot/make/Makefile; then
as_fn_error $? "Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources." "$LINENO" 5
fi
- if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
- test -f $with_add_source_root/nashorn/make/Makefile; then
+ if test -f $with_add_source_root/nashorn/make/Makefile; then
as_fn_error $? "Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources." "$LINENO" 5
fi
- if test -f $with_add_source_root/jdk/makefiles/Makefile || \
- test -f $with_add_source_root/jdk/make/Makefile; then
+ if test -f $with_add_source_root/jdk/make/Makefile; then
as_fn_error $? "Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources." "$LINENO" 5
fi
fi
@@ -16240,32 +16233,25 @@
cd "$with_override_source_root"
OVERRIDE_SRC_ROOT="`pwd`"
cd "$CURDIR"
- if test -f $with_override_source_root/langtools/makefiles/Makefile || \
- test -f $with_override_source_root/langtools/make/Makefile; then
+ if test -f $with_override_source_root/langtools/make/Makefile; then
as_fn_error $? "Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override." "$LINENO" 5
fi
- if test -f $with_override_source_root/corba/makefiles/Makefile || \
- test -f $with_override_source_root/corba/make/Makefile; then
+ if test -f $with_override_source_root/corba/make/Makefile; then
as_fn_error $? "Your override source root seems to contain a full corba repo! An override source root should only contain sources that override." "$LINENO" 5
fi
- if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
- test -f $with_override_source_root/jaxp/make/Makefile; then
+ if test -f $with_override_source_root/jaxp/make/Makefile; then
as_fn_error $? "Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override." "$LINENO" 5
fi
- if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
- test -f $with_override_source_root/jaxws/make/Makefile; then
+ if test -f $with_override_source_root/jaxws/make/Makefile; then
as_fn_error $? "Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override." "$LINENO" 5
fi
- if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
- test -f $with_override_source_root/hotspot/make/Makefile; then
+ if test -f $with_override_source_root/hotspot/make/Makefile; then
as_fn_error $? "Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override." "$LINENO" 5
fi
- if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
- test -f $with_override_source_root/nashorn/make/Makefile; then
+ if test -f $with_override_source_root/nashorn/make/Makefile; then
as_fn_error $? "Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override." "$LINENO" 5
fi
- if test -f $with_override_source_root/jdk/makefiles/Makefile || \
- test -f $with_override_source_root/jdk/make/Makefile; then
+ if test -f $with_override_source_root/jdk/make/Makefile; then
as_fn_error $? "Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override." "$LINENO" 5
fi
fi
@@ -16344,7 +16330,7 @@
cd "$with_override_langtools"
LANGTOOLS_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
+ if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if langtools should be overridden" >&5
@@ -16357,7 +16343,7 @@
cd "$with_override_corba"
CORBA_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
+ if ! test -f $CORBA_TOPDIR/make/Makefile; then
as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if corba should be overridden" >&5
@@ -16370,7 +16356,7 @@
cd "$with_override_jaxp"
JAXP_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
+ if ! test -f $JAXP_TOPDIR/make/Makefile; then
as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxp should be overridden" >&5
@@ -16383,7 +16369,7 @@
cd "$with_override_jaxws"
JAXWS_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
+ if ! test -f $JAXWS_TOPDIR/make/Makefile; then
as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxws should be overridden" >&5
@@ -16396,8 +16382,7 @@
cd "$with_override_hotspot"
HOTSPOT_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
- ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
+ if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
as_fn_error $? "You have to override hotspot with a full hotspot repo!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5
@@ -16410,7 +16395,7 @@
cd "$with_override_nashorn"
NASHORN_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
+ if ! test -f $NASHORN_TOPDIR/make/Makefile; then
as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
@@ -16423,7 +16408,7 @@
cd "$with_override_jdk"
JDK_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
+ if ! test -f $JDK_TOPDIR/make/Makefile; then
as_fn_error $? "You have to override JDK with a full JDK repo!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if JDK should be overridden" >&5
diff --git a/common/autoconf/hotspot-spec.gmk.in b/common/autoconf/hotspot-spec.gmk.in
index b5a38d2..82677a5 100644
--- a/common/autoconf/hotspot-spec.gmk.in
+++ b/common/autoconf/hotspot-spec.gmk.in
@@ -129,4 +129,4 @@
# Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files.
# This is needed to get the LOG setting to work properly.
-include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
+include $(SRC_ROOT)/make/common/MakeBase.gmk
diff --git a/common/autoconf/source-dirs.m4 b/common/autoconf/source-dirs.m4
index e5d1262..bd1d4f4 100644
--- a/common/autoconf/source-dirs.m4
+++ b/common/autoconf/source-dirs.m4
@@ -80,32 +80,25 @@
cd "$CURDIR"
# Verify that the addon source root does not have any root makefiles.
# If it does, then it is usually an error, prevent this.
- if test -f $with_add_source_root/langtools/makefiles/Makefile || \
- test -f $with_add_source_root/langtools/make/Makefile; then
+ if test -f $with_add_source_root/langtools/make/Makefile; then
AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.])
fi
- if test -f $with_add_source_root/corba/makefiles/Makefile || \
- test -f $with_add_source_root/corba/make/Makefile; then
+ if test -f $with_add_source_root/corba/make/Makefile; then
AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.])
fi
- if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
- test -f $with_add_source_root/jaxp/make/Makefile; then
+ if test -f $with_add_source_root/jaxp/make/Makefile; then
AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.])
fi
- if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
- test -f $with_add_source_root/jaxws/make/Makefile; then
+ if test -f $with_add_source_root/jaxws/make/Makefile; then
AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.])
fi
- if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
- test -f $with_add_source_root/hotspot/make/Makefile; then
+ if test -f $with_add_source_root/hotspot/make/Makefile; then
AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.])
fi
- if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
- test -f $with_add_source_root/nashorn/make/Makefile; then
+ if test -f $with_add_source_root/nashorn/make/Makefile; then
AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.])
fi
- if test -f $with_add_source_root/jdk/makefiles/Makefile || \
- test -f $with_add_source_root/jdk/make/Makefile; then
+ if test -f $with_add_source_root/jdk/make/Makefile; then
AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.])
fi
fi
@@ -119,32 +112,25 @@
cd "$with_override_source_root"
OVERRIDE_SRC_ROOT="`pwd`"
cd "$CURDIR"
- if test -f $with_override_source_root/langtools/makefiles/Makefile || \
- test -f $with_override_source_root/langtools/make/Makefile; then
+ if test -f $with_override_source_root/langtools/make/Makefile; then
AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.])
fi
- if test -f $with_override_source_root/corba/makefiles/Makefile || \
- test -f $with_override_source_root/corba/make/Makefile; then
+ if test -f $with_override_source_root/corba/make/Makefile; then
AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.])
fi
- if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
- test -f $with_override_source_root/jaxp/make/Makefile; then
+ if test -f $with_override_source_root/jaxp/make/Makefile; then
AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.])
fi
- if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
- test -f $with_override_source_root/jaxws/make/Makefile; then
+ if test -f $with_override_source_root/jaxws/make/Makefile; then
AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.])
fi
- if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
- test -f $with_override_source_root/hotspot/make/Makefile; then
+ if test -f $with_override_source_root/hotspot/make/Makefile; then
AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.])
fi
- if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
- test -f $with_override_source_root/nashorn/make/Makefile; then
+ if test -f $with_override_source_root/nashorn/make/Makefile; then
AC_MSG_ERROR([Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override.])
fi
- if test -f $with_override_source_root/jdk/makefiles/Makefile || \
- test -f $with_override_source_root/jdk/make/Makefile; then
+ if test -f $with_override_source_root/jdk/make/Makefile; then
AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.])
fi
fi
@@ -195,7 +181,7 @@
cd "$with_override_langtools"
LANGTOOLS_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
+ if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
AC_MSG_ERROR([You have to override langtools with a full langtools repo!])
fi
AC_MSG_CHECKING([if langtools should be overridden])
@@ -206,7 +192,7 @@
cd "$with_override_corba"
CORBA_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
+ if ! test -f $CORBA_TOPDIR/make/Makefile; then
AC_MSG_ERROR([You have to override corba with a full corba repo!])
fi
AC_MSG_CHECKING([if corba should be overridden])
@@ -217,7 +203,7 @@
cd "$with_override_jaxp"
JAXP_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
+ if ! test -f $JAXP_TOPDIR/make/Makefile; then
AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!])
fi
AC_MSG_CHECKING([if jaxp should be overridden])
@@ -228,7 +214,7 @@
cd "$with_override_jaxws"
JAXWS_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
+ if ! test -f $JAXWS_TOPDIR/make/Makefile; then
AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!])
fi
AC_MSG_CHECKING([if jaxws should be overridden])
@@ -239,8 +225,7 @@
cd "$with_override_hotspot"
HOTSPOT_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
- ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
+ if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!])
fi
AC_MSG_CHECKING([if hotspot should be overridden])
@@ -251,7 +236,7 @@
cd "$with_override_nashorn"
NASHORN_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
+ if ! test -f $NASHORN_TOPDIR/make/Makefile; then
AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
fi
AC_MSG_CHECKING([if nashorn should be overridden])
@@ -262,7 +247,7 @@
cd "$with_override_jdk"
JDK_TOPDIR="`pwd`"
cd "$CURDIR"
- if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
+ if ! test -f $JDK_TOPDIR/make/Makefile; then
AC_MSG_ERROR([You have to override JDK with a full JDK repo!])
fi
AC_MSG_CHECKING([if JDK should be overridden])
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index 3b08c6d..08412bc 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -65,8 +65,8 @@
endif
# Specify where the common include directory for makefiles is.
-ifeq (,$(findstring -I @SRC_ROOT@/common/makefiles,$(MAKE)))
- MAKE:=$(MAKE) -I @SRC_ROOT@/common/makefiles
+ifeq (,$(findstring -I @SRC_ROOT@/make/common,$(MAKE)))
+ MAKE:=$(MAKE) -I @SRC_ROOT@/make/common
endif
# The "human readable" name of this configuration
diff --git a/common/bin/compare.sh b/common/bin/compare.sh
index 732c675..08c0d6b 100644
--- a/common/bin/compare.sh
+++ b/common/bin/compare.sh
@@ -1113,14 +1113,15 @@
if [ -d "$THIS/install/j2sdk-image" ]; then
THIS_J2SDK="$THIS/install/j2sdk-image"
THIS_J2RE="$THIS/install/j2re-image"
- echo "Comparing install images"
+ echo "Selecting install images in this build"
elif [ -d "$THIS/deploy/j2sdk-image" ]; then
THIS_J2SDK="$THIS/deploy/j2sdk-image"
THIS_J2RE="$THIS/deploy/j2re-image"
- echo "Comparing deploy images"
+ echo "Selecting deploy images in this build"
elif [ -d "$THIS/images/j2sdk-image" ]; then
THIS_J2SDK="$THIS/images/j2sdk-image"
THIS_J2RE="$THIS/images/j2re-image"
+ echo "Selecting jdk images in this build"
fi
if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
@@ -1128,15 +1129,18 @@
# If there is an install image, prefer that, it's also overlay
THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
+ echo "Selecting install overlay images in this build"
else
THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
+ echo "Selecting jdk overlay images in this build"
fi
fi
if [ -d "$THIS/images/j2sdk-bundle" ]; then
THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
+ echo "Selecting bundles in this build"
fi
# Figure out the layout of the other build (old or new, normal or overlay image)
@@ -1144,21 +1148,34 @@
if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
OTHER_J2SDK="$OTHER/j2sdk-image"
OTHER_J2RE="$OTHER/j2re-image"
+ echo "Selecting old-style images in other build"
else
OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
+ echo "Selecting overlay images in other build"
fi
+elif [ -d "$OTHER/install/j2sdk-image" ]; then
+ OTHER_J2SDK="$OTHER/install/j2sdk-image"
+ OTHER_J2RE="$OTHER/install/j2re-image"
+ echo "Selecting install images in other build"
+elif [ -d "$OTHER/deploy/j2sdk-image" ]; then
+ OTHER_J2SDK="$OTHER/deploy/j2sdk-image"
+ OTHER_J2RE="$OTHER/deploy/j2re-image"
+ echo "Selecting deploy images in other build"
elif [ -d "$OTHER/images/j2sdk-image" ]; then
OTHER_J2SDK="$OTHER/images/j2sdk-image"
OTHER_J2RE="$OTHER/images/j2re-image"
+ echo "Selecting jdk images in other build"
fi
if [ -d "$OTHER/j2sdk-bundle" ]; then
OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
+ echo "Selecting bundles in other build"
elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
+ echo "Selecting jdk bundles in other build"
fi
if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
diff --git a/common/makefiles/JavaCompilation.gmk b/common/makefiles/JavaCompilation.gmk
deleted file mode 100644
index 065bbbc..0000000
--- a/common/makefiles/JavaCompilation.gmk
+++ /dev/null
@@ -1,592 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This makefile is much simpler now that it can use the smart javac wrapper
-# for dependency tracking between java packages and incremental compiles.
-# It could be even more simple if we added support for incremental jar updates
-# directly from the smart javac wrapper.
-
-# Cleaning/copying properties here is not a good solution. The properties
-# should be cleaned/copied by a annotation processor in sjavac.
-
-# When you read this source. Remember that $(sort ...) has the side effect
-# of removing duplicates. It is actually this side effect that is
-# desired whenever sort is used below!
-
-ifeq (,$(_MAKEBASE_GMK))
- $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
-endif
-
-FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
-
-define SetupJavaCompiler
- # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE
- # This is the name of the compiler setup.
- # param 2-9 are named args.
- # JVM:=The jvm used to run the javac/javah command
- # JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
- # FLAGS:=Flags to be supplied to javac
- # SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
- # SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
- $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
- $(call LogSetupMacroEntry,SetupJavaCompiler($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 SetupJavaCompiler, please update JavaCompilation.gmk))
-
- # The port file contains the tcp/ip on which the server listens
- # and the cookie necessary to talk to the server.
- $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
- # You can use a different JVM to run the background javac server.
- ifeq ($$($1_SERVER_JVM),)
- # It defaults to the same JVM that is used to start the javac command.
- $1_SERVER_JVM:=$$($1_JVM)
- endif
-endef
-
-define SetupArchive
- # param 1 is for example ARCHIVE_MYPACKAGE
- # param 2 are the dependecies
- # param 3,4,5,6,7,8,9 are named args.
- # SRCS:=List of directories in where to find files to add to archive
- # SUFFIXES:=File suffixes to include in jar
- # INCLUDES:=List of directories/packages in SRCS that should be included
- # EXCLUDES:=List of directories/packages in SRCS that should be excluded
- # EXCLUDE_FILES:=List of files in SRCS that should be excluded
- # EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match.
- # JAR:=Jar file to create
- # MANIFEST:=Optional manifest file template.
- # JARMAIN:=Optional main class to add to manifest
- # JARINDEX:=true means generate the index in the jar file.
- # SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically
- # added to the archive.
- # EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest.
- # CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable
-
- # NOTE: $2 is dependencies, not a named argument!
- $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
- $(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
- $(if $(findstring $(LOG_LEVEL),trace), $(info *[2] <dependencies> = $(strip $2)))
- $(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk))
-
- $1_JARMAIN:=$(strip $$($1_JARMAIN))
- $1_JARNAME:=$$(notdir $$($1_JAR))
- $1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest
- $1_DELETESS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletess
- $1_DELETES_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletes
- $1_BIN:=$$(dir $$($1_JAR))
-
- ifeq (,$$($1_SUFFIXES))
- # No suffix was set, default to classes.
- $1_SUFFIXES:=.class
- endif
- # Convert suffixes to a find expression
- $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
- # On windows, a lot of includes/excludes risk making the command line too long, so
- # writing the grep patterns to files.
- ifneq (,$$($1_INCLUDES))
- $1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS), \
- $$(addprefix $$(src)/,$$($1_INCLUDES)))
- # If there are a lot of include patterns, output to file to shorten command lines
- ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
- $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
- else
- $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include $$(NEWLINE) \
- $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \
- >> $$($1_BIN)/_the.$$($1_JARNAME)_include)
- $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
- endif
- endif
- ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
- $1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
- $$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))
- # If there are a lot of include patterns, output to file to shorten command lines
- ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
- $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
- else
- $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude $$(NEWLINE) \
- $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \
- >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)
- $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
- endif
- endif
-
- # Check if this jar needs to have its index generated.
- ifneq (,$$($1_JARINDEX))
- $1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@))
- else
- $1_JARINDEX = true
- endif
- # When this macro is run in the same makefile as the java compilation, dependencies are
- # transfered in make variables. When the macro is run in a different makefile than the
- # java compilation, the dependencies need to be found in the filesystem.
- ifneq (,$2)
- $1_DEPS:=$2
- else
- $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \
- $$(call CacheFind,$$($1_SRCS)))
- ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
- $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS))
- endif
- ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
- $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
- endif
- # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command
- # lines, but not here for use in make dependencies.
- $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
- ifeq (,$$($1_SKIP_METAINF))
- $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
- endif
- endif
-
- # Utility macros, to make the shell script receipt somewhat easier to decipher.
-
- # The capture contents macro finds all files (matching the patterns, typically
- # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
- $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
- (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
- $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
- $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES))) > \
- $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
- # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
- ifeq (,$$($1_SKIP_METAINF))
- $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE))
- endif
- # The capture deletes macro finds all deleted files and concatenates them. The resulting file
- # tells us what to remove from the jar-file.
- $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
- # The update contents macro updates the jar file with the previously capture contents.
- # xargs is used to trim the whitespace from the contents file, to see if it is empty.
- $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
- (cd $$(src) && \
- if [ -n "`$(CAT) _the.$$($1_JARNAME)_contents | $(XARGS)`" ]; then \
- $(ECHO) " updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
- $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
- fi) $$(NEWLINE))
- # The s-variants of the above macros are used when the jar is created from scratch.
- $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
- (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
- $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
- $$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES))) > \
- $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
-
- ifeq (,$$($1_SKIP_METAINF))
- $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \
- ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \
- $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
- endif
- $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
- (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
-
- # Use a slightly shorter name for logging, but with enough path to identify this jar.
- $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
-
- ifneq (,$$($1_CHECK_COMPRESS_JAR))
- $1_JAR_CREATE_OPTIONS := c0fm
- $1_JAR_UPDATE_OPTIONS := u0f
- ifeq ($(COMPRESS_JARS), true)
- $1_JAR_CREATE_OPTIONS := cfm
- $1_JAR_UPDATE_OPTIONS := uf
- endif
- else
- $1_JAR_CREATE_OPTIONS := cfm
- $1_JAR_UPDATE_OPTIONS := uf
- endif
-
- # Here is the rule that creates/updates the jar file.
- $$($1_JAR) : $$($1_DEPS)
- $(MKDIR) -p $$($1_BIN)
- $$($1_GREP_INCLUDE_OUTPUT)
- $$($1_GREP_EXCLUDE_OUTPUT)
- $$(if $$($1_MANIFEST), \
- $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
- -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
- , \
- $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
- $$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
- $$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE))
- $$(if $$(wildcard $$@), \
- $(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \
- $$($1_CAPTURE_CONTENTS) \
- $$($1_CAPTURE_METAINF) \
- $(RM) $$($1_DELETES_FILE) $$(NEWLINE) \
- $$($1_CAPTURE_DELETES) \
- $(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE) \
- if [ -s $$($1_DELETESS_FILE) ]; then \
- $(ECHO) " deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \
- $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \
- fi $$(NEWLINE) \
- $$($1_UPDATE_CONTENTS) true $$(NEWLINE) \
- $$($1_JARINDEX) && true \
- , \
- $(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
- $$($1_SCAPTURE_CONTENTS) \
- $$($1_SCAPTURE_METAINF) \
- $$($1_SUPDATE_CONTENTS) \
- $$($1_JARINDEX) && true )
-
-endef
-
-define SetupZipArchive
- # param 1 is for example ZIP_MYSOURCE
- # param 2,3,4,5,6,7,8,9 are named args.
- # SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
- $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
- $(call LogSetupMacroEntry,SetupZipArchive($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 SetupZipArchive, please update JavaCompilation.gmk))
-
- # To avoid running find over too large sets of files, which causes make to crash
- # on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
- # of directories to run find in, if available.
- ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
- $1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC), \
- $$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
- else
- $1_FIND_LIST := $$($1_SRC)
- endif
-
- # Find all files in the source tree.
- $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST)))
-
- # Filter on suffixes if set
- ifneq ($$($1_SUFFIXES),)
- $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS))
- endif
-
- ifneq ($$($1_INCLUDES),)
- ifneq ($$($1_SUFFIXES),)
- $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \
- $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
- else
- $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
- endif
- endif
- ifneq ($$($1_INCLUDE_FILES),)
- $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
- endif
- ifneq ($$($1_EXCLUDES),)
- $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
- $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
- $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
- endif
-
- # Use a slightly shorter name for logging, but with enough path to identify this zip.
- $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP))
-
- # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
- # I.e. the zip -i and -x options should match the filtering done in the makefile.
- # Explicitly excluded files can be given with absolute path. The patsubst solution
- # isn't perfect but the likelyhood of an absolute path to match something in a src
- # dir is very small.
- # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
- # and only fail if it's not.
- $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
- $(MKDIR) -p $$(@D)
- $(ECHO) Updating $$($1_NAME)
- $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
- $(TOUCH) $$@
-endef
-
-define add_file_to_copy
- # param 1 = BUILD_MYPACKAGE
- # parma 2 = The source file to copy.
- $2_TARGET:=$2
- # Remove the source prefix.
- $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
- # Now we can setup the depency that will trigger the copying.
- $$($1_BIN)$$($2_TARGET) : $2
- $(MKDIR) -p $$(@D)
- $(CP) $$< $$@
- $(CHMOD) -f ug+w $$@
-
- # And do not forget this target
- $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
-endef
-
-
-# This macro is used only for properties files that are to be
-# copied over to the classes directory in cleaned form:
-# Previously this was inconsistently done in different repositories.
-# This is the new clean standard. Though it is to be superseded by
-# a standard annotation processor from with sjavac.
-define add_file_to_copy_and_clean
- # param 1 = BUILD_MYPACKAGE
- # parma 2 = The source file to copy and clean.
- $2_TARGET:=$2
- # Remove the source prefix.
- $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
- # Now we can setup the depency that will trigger the copying.
- $$($1_BIN)$$($2_TARGET) : $2
- $(MKDIR) -p $$(@D)
- $(CAT) $$< | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
- | $(SED) -f "$(SRC_ROOT)/common/makefiles/support/unicode2x.sed" \
- | $(SED) -e '/^#/d' -e '/^$$$$/d' \
- -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
- -e 's/^[ \t]*//;s/[ \t]*$$$$//' \
- -e 's/\\=/=/' | LANG=C $(SORT) > $$@
- $(CHMOD) -f ug+w $$@
-
- # And do not forget this target
- $1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET)
-endef
-
-define remove_string
- $2 := $$(subst $1,,$$($2))
-endef
-
-define replace_space_with_pathsep
- $1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2)))
-endef
-
-define SetupJavaCompilation
- # param 1 is for example BUILD_MYPACKAGE
- # param 2,3,4,5,6,7,8 are named args.
- # SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC
- # JVM:=path to ..bin/java
- # ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
- # SRC:=one or more directories to search for sources
- # BIN:=store classes here
- # INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
- # EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
- # COPY:=.prp means copy all prp files to the corresponding package in BIN.
- # CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN.
- # COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo
- # SRCZIP:=Create a src.zip based on the found sources and copied files.
- # INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
- # EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
- # "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
- # JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete
- # source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
- # HEADERS:=path to directory where all generated c-headers are written.
- # DEPENDS:=Extra dependecy
- $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
- $(call LogSetupMacroEntry,SetupJavaCompilation($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 SetupJavaCompilation, please update JavaCompilation.gmk))
-
- # Extract the info from the java compiler setup.
- $1_JVM := $$($$($1_SETUP)_JVM)
- $1_JAVAC := $$($$($1_SETUP)_JAVAC)
- $1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS)
- ifeq ($$($1_JAVAC),)
- $$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP))
- endif
- $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
- $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
-
- # Handle addons and overrides.
- $1_SRC:=$$(call ADD_SRCS,$$($1_SRC))
- # Make sure the dirs exist.
- $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d)))
- $$(eval $$(call MakeDir,$$($1_BIN)))
- # Find all files in the source trees.
- $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC)))
- # Extract the java files.
- ifneq ($$($1_EXCLUDE_FILES),)
- $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
- endif
- $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$(filter %.java,$$($1_ALL_SRCS)))
- ifneq ($$($1_INCLUDE_FILES),)
- $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
- $1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS))
- endif
-
- # Now we have a list of all java files to compile: $$($1_SRCS)
-
- # Create the corresponding smart javac wrapper command line.
- $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix .*,$$(subst /,.,$$($1_EXCLUDES)))) \
- $$(addprefix -i ,$$(addsuffix .*,$$(subst /,.,$$($1_INCLUDES)))) \
- $$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
- $$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
- -src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"
-
- # Prepend the source/bin path to the filter expressions.
- ifneq ($$($1_INCLUDES),)
- $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
- $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
- endif
- ifneq ($$($1_EXCLUDES),)
- $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
- $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
- endif
-
- # Find all files to be copied from source to bin.
- ifneq (,$$($1_COPY))
- # Search for all files to be copied.
- $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
- # Copy these explicitly
- $1_ALL_COPIES += $$($1_COPY_FILES)
- # Copy must also respect filters.
- ifneq (,$$($1_INCLUDES))
- $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
- endif
- ifneq (,$$($1_EXCLUDES))
- $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
- endif
- ifneq (,$$($1_EXCLUDE_FILES))
- $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
- endif
- # All files below META-INF are always copied.
- $1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
- ifneq (,$$($1_ALL_COPIES))
- # Yep, there are files to be copied!
- $1_ALL_COPY_TARGETS:=
- $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
- # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
- endif
- endif
-
- # Find all property files to be copied and cleaned from source to bin.
- ifneq (,$$($1_CLEAN))
- # Search for all files to be copied.
- $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
- # Copy and clean must also respect filters.
- ifneq (,$$($1_INCLUDES))
- $1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS))
- endif
- ifneq (,$$($1_EXCLUDES))
- $1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS))
- endif
- ifneq (,$$($1_EXCLUDE_FILES))
- $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS))
- endif
- ifneq (,$$($1_ALL_CLEANS))
- # Yep, there are files to be copied and cleaned!
- $1_ALL_COPY_CLEAN_TARGETS:=
- $$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_copy_and_clean,$1,$$i)))
- # Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files!
- endif
- endif
-
- # Prep the source paths.
- ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),)
- $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE)))
- else
- $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
- endif
-
- # Create a sed expression to remove the source roots and to replace / with .
- # and remove .java at the end.
- $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
-
- ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
- ifneq (,$$($1_HEADERS))
- $1_HEADERS_ARG := -h $$($1_HEADERS)
- endif
-
- # Using sjavac to compile.
- $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
-
- # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be
- # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
- # and javac is simply replaced with sjavac.
- $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
-
- # Set the $1_REMOTE to spawn a background javac server.
- $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
-
- $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
- $(MKDIR) -p $$(@D)
- $$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
- $(ECHO) Compiling $1
- ($$($1_JVM) $$($1_SJAVAC) \
- $$($1_REMOTE) \
- -j $(JOBS) \
- --permit-unidentified-artifacts \
- --permit-sources-without-package \
- --compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
- --log=$(LOG_LEVEL) \
- $$($1_SJAVAC_ARGS) \
- $$($1_FLAGS) \
- $$($1_HEADERS_ARG) \
- -d $$($1_BIN) && \
- $(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
- else
- # Using plain javac to batch compile everything.
- $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch
-
- # When building in batch, put headers in a temp dir to filter out those that actually
- # changed before copying them to the real header dir.
- ifneq (,$$($1_HEADERS))
- $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
-
- $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
- $(MKDIR) -p $$(@D)
- for f in `ls $$($1_HEADERS).tmp`; do \
- if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \
- $(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \
- fi; \
- done
- $(RM) -r $$($1_HEADERS).tmp
- $(TOUCH) $$@
-
- $1 += $$($1_HEADERS)/_the.$1_headers
- endif
-
- # When not using sjavac, pass along all sources to javac using an @file.
- $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS)
- $(MKDIR) -p $$(@D)
- $(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp
- $$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
- $(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
- ($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
- -implicit:none -sourcepath "$$($1_SRCROOTSC)" \
- -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \
- $(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
-
- endif
-
- # Check if a jar file was specified, then setup the rules for the jar.
- ifneq (,$$($1_JAR))
- # If no suffixes was explicitly set for this jar file.
- # Use class and the cleaned/copied properties file suffixes as the default
- # for the types of files to be put into the jar.
- ifeq (,$$($1_SUFFIXES))
- $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
- endif
-
- $$(eval $$(call SetupArchive,ARCHIVE_$1,$$($1), \
- SRCS:=$$($1_BIN), \
- SUFFIXES:=$$($1_SUFFIXES), \
- EXCLUDE:=$$($1_EXCLUDES), \
- INCLUDES:=$$($1_INCLUDES), \
- EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \
- JAR:=$$($1_JAR), \
- JARMAIN:=$$($1_JARMAIN), \
- MANIFEST:=$$($1_MANIFEST), \
- EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
- JARINDEX:=$$($1_JARINDEX), \
- HEADERS:=$$($1_HEADERS), \
- SETUP:=$$($1_SETUP)))
- endif
-
- # Check if a srczip was specified, then setup the rules for the srczip.
- ifneq (,$$($1_SRCZIP))
- $$(eval $$(call SetupZipArchive,ARCHIVE_$1, \
- SRC:=$$($1_SRC), \
- ZIP:=$$($1_SRCZIP), \
- INCLUDES:=$$($1_INCLUDES), \
- EXCLUDES:=$$($1_EXCLUDES), \
- EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
- endif
-
-endef
diff --git a/common/makefiles/Jprt.gmk b/common/makefiles/Jprt.gmk
deleted file mode 100644
index e80aea9..0000000
--- a/common/makefiles/Jprt.gmk
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This file is included by the root NewerMakefile and contains targets
-# and utilities needed by JPRT.
-
-# Utilities used in this Makefile. Most of this makefile executes without
-# the context of a spec file from configure.
-CAT=cat
-CMP=cmp
-CP=cp
-ECHO=echo
-MKDIR=mkdir
-PRINTF=printf
-PWD=pwd
-# Insure we have a path that looks like it came from pwd
-# (This is mostly for Windows sake and drive letters)
-define UnixPath # path
-$(shell (cd "$1" && $(PWD)))
-endef
-
-BUILD_DIR_ROOT:=$(root_dir)/build
-
-ifdef OPENJDK
- OPEN_BUILD=true
-else
- OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
- $(wildcard $(root_dir)/jdk/make/closed), \
- $(wildcard $(root_dir)/jdk/test/closed), \
- $(wildcard $(root_dir)/hotspot/src/closed), \
- $(wildcard $(root_dir)/hotspot/make/closed), \
- $(wildcard $(root_dir)/hotspot/test/closed)), \
- false,true)
-endif
-
-HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
-
-###########################################################################
-# To help in adoption of the new configure&&make build process, a bridge
-# build will use the old settings to run configure and do the build.
-
-# Build with the configure bridge. After running configure, restart make
-# to parse the new spec file.
-BRIDGE_TARGETS := all
-# Add bootcycle-images target if legacy variable is set.
-ifeq ($(SKIP_BOOT_CYCLE),false)
- BRIDGE_TARGETS += bootcycle-images
-endif
-bridgeBuild: bridge2configure
- @cd $(root_dir) && $(MAKE) -f NewMakefile.gmk $(BRIDGE_TARGETS)
-
-# Bridge from old Makefile ALT settings to configure options
-bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts
- bash ./configure $(strip $(shell $(CAT) $<))
-
-# Create a file with configure options created from old Makefile mechanisms.
-$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest
- $(RM) $@
- $(CP) $< $@
-
-# Use this file to only change when obvious things have changed
-$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC
- $(RM) $@.tmp
- $(MKDIR) -p $(BUILD_DIR_ROOT)
- @$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
- ifdef ARCH_DATA_MODEL
- @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
- endif
- ifeq ($(ARCH_DATA_MODEL),32)
- @$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp
- endif
- ifdef ALT_PARALLEL_COMPILE_JOBS
- @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
- endif
- ifdef ALT_BOOTDIR
- @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
- endif
- ifdef ALT_CUPS_HEADERS_PATH
- @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
- endif
- ifdef ALT_FREETYPE_HEADERS_PATH
- @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
- endif
- ifdef ENABLE_SJAVAC
- @$(ECHO) " --enable-sjavac" >> $@.tmp
- endif
- ifeq ($(HOTSPOT_AVAILABLE),false)
- ifdef ALT_JDK_IMPORT_PATH
- @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
- endif
- endif
- ifeq ($(OPEN_BUILD),true)
- @$(ECHO) " --enable-openjdk-only " >> $@.tmp
- else
-# Todo: move to closed?
- ifdef ALT_MOZILLA_HEADERS_PATH
- @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp
- endif
- ifdef ALT_JUNIT_DIR
- @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp
- endif
- ifdef ANT_HOME
- @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp
- endif
- ifdef ALT_JAVAFX_ZIP_DIR
- @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp
- endif
- ifdef ALT_JMC_ZIP_DIR
- @$(ECHO) " --with-jmc-zip-dir=$(call UnixPath,$(ALT_JMC_ZIP_DIR)) " >> $@.tmp
- endif
- ifdef ALT_WIXDIR
- @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
- endif
- ifdef ALT_INSTALL_LZMA_PATH
- @$(ECHO) " --with-lzma-path=$(call UnixPath,$(ALT_INSTALL_LZMA_PATH)) " >> $@.tmp
- endif
- ifdef ALT_INSTALL_UPX_PATH
- @$(ECHO) " --with-upx-path=$(call UnixPath,$(ALT_INSTALL_UPX_PATH)) " >> $@.tmp
- endif
- ifdef ALT_INSTALL_UPX_FILENAME
- @$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
- endif
- ifdef ALT_CCSS_SIGNING_DIR
- @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
- endif
- ifdef ALT_SLASH_JAVA
- @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
- endif
- ifdef ALT_SPARKLE_FRAMEWORK_DIR
- @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
- endif
- endif
- @if [ -f $@ ] ; then \
- if ! $(CMP) $@ $@.tmp > /dev/null ; then \
- $(CP) $@.tmp $@ ; \
- fi ; \
- else \
- $(CP) $@.tmp $@ ; \
- fi
- $(RM) $@.tmp
-
-PHONY_LIST += bridge2configure bridgeBuild
-
-###########################################################################
-# JPRT targets
-
-ifndef JPRT_ARCHIVE_BUNDLE
- JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
-endif
-ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
- JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
-endif
-
-# These targets execute in a SPEC free context, before calling bridgeBuild
-# to generate the SPEC.
-jprt_build_product: DEBUG_LEVEL=release
-jprt_build_product: BUILD_DIRNAME=*-release
-jprt_build_product: jprt_build_generic
-
-jprt_build_fastdebug: DEBUG_LEVEL=fastdebug
-jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug
-jprt_build_fastdebug: jprt_build_generic
-
-jprt_build_debug: DEBUG_LEVEL=slowdebug
-jprt_build_debug: BUILD_DIRNAME=*-debug
-jprt_build_debug: jprt_build_generic
-
-jprt_build_generic: BRIDGE_TARGETS+=jprt_bundle
-jprt_build_generic: bridgeBuild
-
-# This target must be called in the context of a SPEC file
-jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
- @$(call CheckIfMakeAtEnd)
-
-# This target must be called in the context of a SPEC file
-$(JPRT_ARCHIVE_BUNDLE): bundles
- $(MKDIR) -p $(@D)
- $(RM) $@
- $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
-
-SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
-SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
-SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
-SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
-
-# Bundle up the images
-bundles: all bundles-only
-bundles-only: start-make
- @$(call TargetEnter)
- $(MKDIR) -p $(BUILD_OUTPUT)/bundles
- $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
- $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
- if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
- $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
- fi
- @$(call TargetExit)
-
-# Copy images to one unified location regardless of platform etc.
-final-images: all final-images-only
-final-images-only: start-make
- @$(call TargetEnter)
- $(RM) -r $(BUILD_OUTPUT)/final-images
- $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
- $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
- $(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
- $(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/
- ifeq ($(OPENJDK_TARGET_OS),macosx)
- $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)
- $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)
- $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/
- $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/
- endif
- @$(call TargetExit)
-
-
-# Keep track of phony targets
-PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
- jprt_build_generic bundles jprt_bundle \
- final-images final-images-only
-
-###########################################################################
-# Phony targets
-.PHONY: $(PHONY_LIST)
-
-# Force target
-FRC:
diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk
deleted file mode 100644
index fa02feb..0000000
--- a/common/makefiles/Main.gmk
+++ /dev/null
@@ -1,245 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-### This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file.
-
-# Now load the spec
-include $(SPEC)
-
-# Load the vital tools for all the makefiles.
-include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
-
-# Include the corresponding custom file, if present.
--include $(CUSTOM_MAKE_DIR)/Main.gmk
-
-### Clean up from previous run
-
-# Remove any build.log from a previous run, if they exist
-ifneq (,$(BUILD_LOG))
- ifneq (,$(BUILD_LOG_PREVIOUS))
- # Rotate old log
- $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
- $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
- else
- $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
- endif
- $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
-endif
-# Remove any javac server logs and port files. This
-# prevents a new make run to reuse the previous servers.
-ifneq (,$(SJAVAC_SERVER_DIR))
- $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
-endif
-
-# Reset the build timers.
-$(eval $(call ResetAllTimers))
-
-# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
-# hence this workaround.
-MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
-
-### Main targets
-
-default: jdk
- @$(call CheckIfMakeAtEnd)
-
-all: images docs
- @$(call CheckIfMakeAtEnd)
-
-# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
-# is up to date after changes to configure
-$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
- @$(ECHO) ERROR: $(SPEC) is not up to date
- @$(ECHO) Please rerun configure!
- @if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
-
-start-make: $(SPEC)
- @$(call AtMakeStart)
-
-langtools: langtools-only
-langtools-only: start-make
- @$(call TargetEnter)
- @($(CD) $(LANGTOOLS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildLangtools.gmk)
- @$(call TargetExit)
-
-corba: langtools corba-only
-corba-only: start-make
- @$(call TargetEnter)
- @($(CD) $(CORBA_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildCorba.gmk)
- @$(call TargetExit)
-
-jaxp: langtools jaxp-only
-jaxp-only: start-make
- @$(call TargetEnter)
- @($(CD) $(JAXP_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxp.gmk)
- @$(call TargetExit)
-
-jaxws: langtools jaxp jaxws-only
-jaxws-only: start-make
- @$(call TargetEnter)
- @($(CD) $(JAXWS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxws.gmk)
- @$(call TargetExit)
-
-ifeq ($(BUILD_HOTSPOT),true)
- hotspot: hotspot-only
- hotspot-only: start-make
- @$(call TargetEnter)
- @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
- @$(call TargetExit)
-endif
-
-jdk: langtools hotspot corba jaxp jaxws jdk-only
-jdk-only: start-make
- @$(call TargetEnter)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
- @$(call TargetExit)
-
-nashorn: jdk nashorn-only
-nashorn-only: start-make
- @$(call TargetEnter)
- @($(CD) $(NASHORN_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
- @$(call TargetExit)
-
-demos: jdk demos-only
-demos-only: start-make
- @$(call TargetEnter)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos)
- @$(call TargetExit)
-
-# Note: This double-colon rule is intentional, to support
-# custom make file integration.
-images:: source-tips demos nashorn images-only
-images-only: start-make
- @$(call TargetEnter)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
- @$(call TargetExit)
-
-overlay-images: source-tips demos overlay-images-only
-overlay-images-only: start-make
- @$(call TargetEnter)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
- @$(call TargetExit)
-
-profiles: profiles-oscheck source-tips jdk hotspot profiles-only
-profiles-only: start-make
- @$(call TargetEnter)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
- @$(call TargetExit)
-
-profiles-oscheck:
- ifneq ($(OPENJDK_TARGET_OS), linux)
- @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
- endif
-
-install: images install-only
-install-only: start-make
- @$(call TargetEnter)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk install)
- @$(call TargetExit)
-
-docs: jdk docs-only
-docs-only: start-make
- @$(call TargetEnter)
- @($(CD) $(SRC_ROOT)/common/makefiles/javadoc && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
- @$(call TargetExit)
-
-sign-jars: jdk sign-jars-only
-sign-jars-only: start-make
- @$(call TargetEnter)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
- @$(call TargetExit)
-
-bootcycle-images: images bootcycle-images-only
-bootcycle-images-only: start-make
- @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
- @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
-
-test: images test-only
-test-only: start-make
- @$(call TargetEnter)
- @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
- @$(call TargetExit)
-
-# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
-# used to track the exact sources used to build that image.
-source-tips: $(OUTPUT_ROOT)/source_tips
-$(OUTPUT_ROOT)/source_tips: FRC
- @$(MKDIR) -p $(@D)
- @$(RM) $@
- @$(call GetSourceTips)
-
-
-# Remove everything, except the output from configure.
-clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs clean-test
- @($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
- @$(ECHO) Cleaned all build artifacts.
-
-# Remove everything, including configure configuration.
-# If the output directory was created by configure and now becomes empty, remove it as well.
-# FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh!
-dist-clean: clean
- @($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers)
- @$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
- if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
- $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
- else \
- ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
- fi \
- )
- @$(ECHO) Cleaned everything, you will have to re-run configure.
-
-clean-langtools:
- $(call CleanComponent,langtools)
-clean-corba:
- $(call CleanComponent,corba)
-clean-jaxp:
- $(call CleanComponent,jaxp)
-clean-jaxws:
- $(call CleanComponent,jaxws)
-clean-hotspot:
- $(call CleanComponent,hotspot)
-clean-jdk:
- $(call CleanComponent,jdk)
-clean-nashorn:
- $(call CleanComponent,nashorn)
-clean-images:
- $(call CleanComponent,images)
-clean-overlay-images:
- $(call CleanComponent,overlay-images)
-clean-bootcycle-build:
- $(call CleanComponent,bootcycle-build)
-clean-docs:
- $(call CleanComponent,docs)
- $(call CleanComponent,docstemp)
-clean-test:
- $(call CleanComponent,testoutput)
-
-.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
-.PHONY: default all clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
-.PHONY: profiles profiles-only profiles-oscheck
-
-FRC: # Force target
diff --git a/common/makefiles/MakeBase.gmk b/common/makefiles/MakeBase.gmk
deleted file mode 100644
index 519abac..0000000
--- a/common/makefiles/MakeBase.gmk
+++ /dev/null
@@ -1,449 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-#
-# Check that GNU make and cygwin are recent enough.
-# Setup common utility functions.
-#
-################################################################
-
-ifndef _MAKEBASE_GMK
-_MAKEBASE_GMK := 1
-
-# If the variable that you want to send to stdout for piping into a file or otherwise,
-# is potentially long, for example the a list of file paths, eg a list of all package directories.
-# Then you need to use ListPathsSafely, which optimistically splits the output into several shell
-# calls as well as use compression on recurrent file paths segments, to get around the potential
-# command line length problem that exists in cygwin and other shells.
-compress_pre:=$(strip $(shell $(CAT) $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-pre-compress.incl))
-compress_post:=$(strip $(shell $(CAT) $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-post-compress.incl))
-compress_paths=$(compress_pre)\
-$(subst $(SRC_ROOT),X97,\
-$(subst $(OUTPUT_ROOT),X98,\
-$(subst X,X00,\
-$(subst $(SPACE),\n,$(strip $1)))))\
-$(compress_post)
-
-decompress_paths=$(SED) -f $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-uncompress.sed -e 's|X99|\\n|g' \
- -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
- -e 's|X00|X|g' | tr '\n' '$2'
-
-define ListPathsSafely_If
- $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
-endef
-
-define ListPathsSafely_Printf
- $(if $(strip $($1_LPS$4)),$(if $(findstring $(LOG_LEVEL),trace),,@)printf \
- -- "$(strip $($1_LPS$4))\n" | $(decompress_paths) $3)
-endef
-
-# Receipt example:
-# rm -f thepaths
-# $(call ListPathsSafely,THEPATHS,\n, >> thepaths)
-# The \n argument means translate spaces into \n
-# if instead , , (a space) is supplied, then spaces remain spaces.
-define ListPathsSafely
- $(if $(word 16001,$($1)),$(error Cannot list safely more than 16000 paths. $1 has $(words $($1)) paths!))
- $(ECHO) $(LOG_DEBUG) Writing $(words $($1)) paths to '$3'
- $(call ListPathsSafely_If,$1,$2,1,250)
- $(call ListPathsSafely_If,$1,$2,251,500)
- $(call ListPathsSafely_If,$1,$2,501,750)
- $(call ListPathsSafely_If,$1,$2,751,1000)
-
- $(call ListPathsSafely_If,$1,$2,1001,1250)
- $(call ListPathsSafely_If,$1,$2,1251,1500)
- $(call ListPathsSafely_If,$1,$2,1501,1750)
- $(call ListPathsSafely_If,$1,$2,1751,2000)
-
- $(call ListPathsSafely_If,$1,$2,2001,2250)
- $(call ListPathsSafely_If,$1,$2,2251,2500)
- $(call ListPathsSafely_If,$1,$2,2501,2750)
- $(call ListPathsSafely_If,$1,$2,2751,3000)
-
- $(call ListPathsSafely_If,$1,$2,3001,3250)
- $(call ListPathsSafely_If,$1,$2,3251,3500)
- $(call ListPathsSafely_If,$1,$2,3501,3750)
- $(call ListPathsSafely_If,$1,$2,3751,4000)
-
- $(call ListPathsSafely_If,$1,$2,4001,4250)
- $(call ListPathsSafely_If,$1,$2,4251,4500)
- $(call ListPathsSafely_If,$1,$2,4501,4750)
- $(call ListPathsSafely_If,$1,$2,4751,5000)
-
- $(call ListPathsSafely_If,$1,$2,5001,5250)
- $(call ListPathsSafely_If,$1,$2,5251,5500)
- $(call ListPathsSafely_If,$1,$2,5501,5750)
- $(call ListPathsSafely_If,$1,$2,5751,6000)
-
- $(call ListPathsSafely_If,$1,$2,6001,6250)
- $(call ListPathsSafely_If,$1,$2,6251,6500)
- $(call ListPathsSafely_If,$1,$2,6501,6750)
- $(call ListPathsSafely_If,$1,$2,6751,7000)
-
- $(call ListPathsSafely_If,$1,$2,7001,7250)
- $(call ListPathsSafely_If,$1,$2,7251,7500)
- $(call ListPathsSafely_If,$1,$2,7501,7750)
- $(call ListPathsSafely_If,$1,$2,7751,8000)
-
- $(call ListPathsSafely_If,$1,$2,8001,8250)
- $(call ListPathsSafely_If,$1,$2,8251,8500)
- $(call ListPathsSafely_If,$1,$2,8501,8750)
- $(call ListPathsSafely_If,$1,$2,8751,9000)
-
- $(call ListPathsSafely_If,$1,$2,9001,9250)
- $(call ListPathsSafely_If,$1,$2,9251,9500)
- $(call ListPathsSafely_If,$1,$2,9501,9750)
- $(call ListPathsSafely_If,$1,$2,9751,10000)
-
- $(call ListPathsSafely_If,$1,$2,10001,10250)
- $(call ListPathsSafely_If,$1,$2,10251,10500)
- $(call ListPathsSafely_If,$1,$2,10501,10750)
- $(call ListPathsSafely_If,$1,$2,10751,11000)
-
- $(call ListPathsSafely_If,$1,$2,11001,11250)
- $(call ListPathsSafely_If,$1,$2,11251,11500)
- $(call ListPathsSafely_If,$1,$2,11501,11750)
- $(call ListPathsSafely_If,$1,$2,11751,12000)
-
- $(call ListPathsSafely_If,$1,$2,12001,12250)
- $(call ListPathsSafely_If,$1,$2,12251,12500)
- $(call ListPathsSafely_If,$1,$2,12501,12750)
- $(call ListPathsSafely_If,$1,$2,12751,13000)
-
- $(call ListPathsSafely_If,$1,$2,13001,13250)
- $(call ListPathsSafely_If,$1,$2,13251,13500)
- $(call ListPathsSafely_If,$1,$2,13501,13750)
- $(call ListPathsSafely_If,$1,$2,13751,14000)
-
- $(call ListPathsSafely_If,$1,$2,14001,14250)
- $(call ListPathsSafely_If,$1,$2,14251,14500)
- $(call ListPathsSafely_If,$1,$2,14501,14750)
- $(call ListPathsSafely_If,$1,$2,14751,15000)
-
- $(call ListPathsSafely_If,$1,$2,15001,15250)
- $(call ListPathsSafely_If,$1,$2,15251,15500)
- $(call ListPathsSafely_If,$1,$2,15501,15750)
- $(call ListPathsSafely_If,$1,$2,15751,16000)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,1)
- $(call ListPathsSafely_Printf,$1,$2,$3,251)
- $(call ListPathsSafely_Printf,$1,$2,$3,501)
- $(call ListPathsSafely_Printf,$1,$2,$3,751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,1001)
- $(call ListPathsSafely_Printf,$1,$2,$3,1251)
- $(call ListPathsSafely_Printf,$1,$2,$3,1501)
- $(call ListPathsSafely_Printf,$1,$2,$3,1751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,2001)
- $(call ListPathsSafely_Printf,$1,$2,$3,2251)
- $(call ListPathsSafely_Printf,$1,$2,$3,2501)
- $(call ListPathsSafely_Printf,$1,$2,$3,2751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,3001)
- $(call ListPathsSafely_Printf,$1,$2,$3,3251)
- $(call ListPathsSafely_Printf,$1,$2,$3,3501)
- $(call ListPathsSafely_Printf,$1,$2,$3,3751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,4001)
- $(call ListPathsSafely_Printf,$1,$2,$3,4251)
- $(call ListPathsSafely_Printf,$1,$2,$3,4501)
- $(call ListPathsSafely_Printf,$1,$2,$3,4751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,5001)
- $(call ListPathsSafely_Printf,$1,$2,$3,5251)
- $(call ListPathsSafely_Printf,$1,$2,$3,5501)
- $(call ListPathsSafely_Printf,$1,$2,$3,5751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,6001)
- $(call ListPathsSafely_Printf,$1,$2,$3,6251)
- $(call ListPathsSafely_Printf,$1,$2,$3,6501)
- $(call ListPathsSafely_Printf,$1,$2,$3,6751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,7001)
- $(call ListPathsSafely_Printf,$1,$2,$3,7251)
- $(call ListPathsSafely_Printf,$1,$2,$3,7501)
- $(call ListPathsSafely_Printf,$1,$2,$3,7751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,8001)
- $(call ListPathsSafely_Printf,$1,$2,$3,8251)
- $(call ListPathsSafely_Printf,$1,$2,$3,8501)
- $(call ListPathsSafely_Printf,$1,$2,$3,8751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,9001)
- $(call ListPathsSafely_Printf,$1,$2,$3,9251)
- $(call ListPathsSafely_Printf,$1,$2,$3,9501)
- $(call ListPathsSafely_Printf,$1,$2,$3,9751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,10001)
- $(call ListPathsSafely_Printf,$1,$2,$3,10251)
- $(call ListPathsSafely_Printf,$1,$2,$3,10501)
- $(call ListPathsSafely_Printf,$1,$2,$3,10751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,11001)
- $(call ListPathsSafely_Printf,$1,$2,$3,11251)
- $(call ListPathsSafely_Printf,$1,$2,$3,11501)
- $(call ListPathsSafely_Printf,$1,$2,$3,11751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,12001)
- $(call ListPathsSafely_Printf,$1,$2,$3,12251)
- $(call ListPathsSafely_Printf,$1,$2,$3,12501)
- $(call ListPathsSafely_Printf,$1,$2,$3,12751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,13001)
- $(call ListPathsSafely_Printf,$1,$2,$3,13251)
- $(call ListPathsSafely_Printf,$1,$2,$3,13501)
- $(call ListPathsSafely_Printf,$1,$2,$3,13751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,14001)
- $(call ListPathsSafely_Printf,$1,$2,$3,14251)
- $(call ListPathsSafely_Printf,$1,$2,$3,14501)
- $(call ListPathsSafely_Printf,$1,$2,$3,14751)
-
- $(call ListPathsSafely_Printf,$1,$2,$3,15001)
- $(call ListPathsSafely_Printf,$1,$2,$3,15251)
- $(call ListPathsSafely_Printf,$1,$2,$3,15501)
- $(call ListPathsSafely_Printf,$1,$2,$3,15751)
-endef
-
-define ListPathsSafelyNow_IfPrintf
- ifneq (,$$(word $4,$$($1)))
- $$(eval $1_LPS$4:=$$(call compress_paths,$$(wordlist $4,$5,$$($1))))
- $$(shell printf -- "$$(strip $$($1_LPS$4))\n" | $(decompress_paths) $3)
- endif
-endef
-
-# And an non-receipt version:
-define ListPathsSafelyNow
- ifneq (,$$(word 10001,$$($1)))
- $$(error Cannot list safely more than 10000 paths. $1 has $$(words $$($1)) paths!)
- endif
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1,250)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,251,500)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,501,750)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,751,1000)
-
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1001,1250)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1251,1500)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1501,1750)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1751,2000)
-
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2001,2250)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2251,2500)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2501,2750)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2751,3000)
-
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3001,3250)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3251,3500)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3501,3750)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3751,4000)
-
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4001,4250)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4251,4500)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4501,4750)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4751,5000)
-
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5001,5250)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5251,5500)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5501,5750)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5751,6000)
-
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6001,6250)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6251,6500)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6501,6750)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6751,7000)
-
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7001,7250)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7251,7500)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7501,7750)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7751,8000)
-
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8001,8250)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8251,8500)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8501,8750)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8751,9000)
-
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9001,9250)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9251,9500)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9501,9750)
- $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9751,10000)
-
-endef
-
-# The source tips can come from the Mercurial repository, or in the files
-# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
-# directory as the original $(HGDIR) directory.
-# These should not be := assignments, only used from the root Makefile.
-HG_VERSION = $(shell $(HG) version 2> /dev/null)
-HG_DIRECTORY=.hg
-HGTIP_FILENAME=.hgtip
-HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO
-REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
- $(shell $(CD) $(SRC_ROOT) ; ( $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \
- $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
- 2> /dev/null)))))
-
-# Emit the repo:tip pairs to $@
-define GetSourceTips
- $(CD) $(SRC_ROOT) ; \
- for i in $(REPO_LIST) IGNORE ; do \
- if [ "$${i}" = "IGNORE" ] ; then \
- continue; \
- elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
- $(PRINTF) " %s:%s" \
- "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \
- elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
- $(PRINTF) " %s:%s" \
- "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
- fi; \
- done >> $@
- $(PRINTF) "\n" >> $@
-endef
-
-# Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk
-define CreateHgTip
- $(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \
- $(ECHO) $1/$(HGTIP_FILENAME)
-endef
-
-define SetupLogging
- ifeq ($$(LOG_LEVEL),trace)
- # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
- # For each target executed, will print
- # Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer)
- # but with a limit of 20 on <ALL NEWER PREREQUISITES>, to avoid cluttering logs too much
- # (and causing a crash on Cygwin).
- # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
- # Only use time if it's GNU time which supports format and output file.
- WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash
- SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
- endif
- # Never remove warning messages; this is just for completeness
- LOG_WARN=
- ifneq ($$(findstring $$(LOG_LEVEL),info debug trace),)
- LOG_INFO=
- else
- LOG_INFO=> /dev/null
- endif
- ifneq ($$(findstring $$(LOG_LEVEL),debug trace),)
- LOG_DEBUG=
- else
- LOG_DEBUG=> /dev/null
- endif
- ifneq ($$(findstring $$(LOG_LEVEL),trace),)
- LOG_TRACE=
- else
- LOG_TRACE=> /dev/null
- endif
-endef
-
-# Make sure logging is setup for everyone that includes MakeBase.gmk.
-$(eval $(call SetupLogging))
-
-# This is to be called by all SetupFoo macros
-define LogSetupMacroEntry
- $(if $(27),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
- $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
-endef
-
-# Make directory without forking mkdir if not needed
-define MakeDir
- ifneq ($$(wildcard $1 $2 $3 $4 $5 $6 $7 $8 $9),$$(strip $1 $2 $3 $4 $5 $6 $7 $8 $9))
- $$(shell $(MKDIR) -p $1 $2 $3 $4 $5 $6 $7 $8 $9)
- endif
-endef
-
-ifeq ($(OPENJDK_TARGET_OS),solaris)
- # On Solaris, if the target is a symlink and exists, cp won't overwrite.
- # Cp has to operate in recursive mode to allow for -P flag, to preserve soft links. If the
- # name of the target file differs from the source file, rename after copy.
- define install-file
- $(MKDIR) -p $(@D)
- $(RM) '$@'
- $(CP) -f -r -P '$<' '$(@D)'
- if [ "$(@F)" != "$(<F)" ]; then $(MV) '$(@D)/$(<F)' '$@'; fi
- endef
-else ifeq ($(OPENJDK_TARGET_OS),macosx)
- # On mac, extended attributes sometimes creep into the source files, which may later
- # cause the creation of ._* files which confuses testing. Clear these with xattr if
- # set. Some files get their write permissions removed after being copied to the
- # output dir. When these are copied again to images, xattr would fail. By only clearing
- # attributes when they are present, failing on this is avoided.
- define install-file
- $(MKDIR) -p $(@D)
- $(CP) -fRP '$<' '$@'
- if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi
- endef
-else
- define install-file
- $(MKDIR) -p $(@D)
- $(CP) -fP '$<' '$@'
- endef
-endif
-
-# Convenience functions for working around make's limitations with $(filter ).
-containing = $(foreach v,$2,$(if $(findstring $1,$v),$v))
-not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
-
-################################################################################
-# In Cygwin, finds are very costly, both because of expensive forks and because
-# of bad file system caching. Find is used extensively in $(shell) commands to
-# find source files. This makes rerunning make with no or few changes rather
-# expensive. To speed this up, these two macros are used to cache the results
-# of simple find commands for reuse.
-#
-# Runs a find and stores both the directories where it was run and the results.
-# This macro can be called multiple times to add to the cache. Only finds files
-# with no filters.
-#
-# Needs to be called with $(eval )
-#
-# Param 1 - Dir to find in
-ifeq ($(OPENJDK_BUILD_OS),windows)
- define FillCacheFind
- FIND_CACHE_DIR += $1
- FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $1 -type f -o -type l))
- endef
-else
- define FillCacheFind
- endef
-endif
-
-# Mimics find by looking in the cache if all of the directories have been cached.
-# Otherwise reverts to shell find. This is safe to call on all platforms, even if
-# cache is deactivated.
-#
-# The extra - is needed when FIND_CACHE_DIR is empty but should be harmless.
-# Param 1 - Dirs to find in
-define CacheFind
- $(if $(filter-out $(addsuffix %,- $(FIND_CACHE_DIR)),$1), \
- $(shell $(FIND) $1 -type f -o -type l), \
- $(filter $(addsuffix %,$1),$(FIND_CACHE)))
-endef
-
-################################################################################
-
-endif # _MAKEBASE_GMK
diff --git a/common/makefiles/Makefile b/common/makefiles/Makefile
deleted file mode 100644
index 279106b..0000000
--- a/common/makefiles/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include ../../NewMakefile.gmk
diff --git a/common/makefiles/javadoc/Javadoc.gmk b/common/makefiles/javadoc/Javadoc.gmk
deleted file mode 100644
index 5c5b5fe..0000000
--- a/common/makefiles/javadoc/Javadoc.gmk
+++ /dev/null
@@ -1,1188 +0,0 @@
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include $(SPEC)
-include MakeBase.gmk
-
-.SUFFIXES: # Delete the default suffixes
-.SUFFIXES: .java
-
-#
-# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
-#
-
-DOCSDIR=$(OUTPUT_ROOT)/docs
-TEMPDIR=$(OUTPUT_ROOT)/docstemp
-
-JDK_SHARE_SRC=$(JDK_TOPDIR)/src/share
-JDK_SHARE_CLASSES=$(JDK_SHARE_SRC)/classes
-
-JDK_IMPSRC = $(JDK_OUTPUTDIR)/impsrc
-
-JDK_GENSRC = $(JDK_OUTPUTDIR)/gensrc
-
-HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
-
-BUILD_NUMBER=$(JDK_BUILD_NUMBER)
-
-JAVADOC_CMD = $(JAVA) \
- -Xmx1024m \
- -Djava.awt.headless=true \
- $(NEW_JAVADOC) \
- -bootclasspath $(JDK_OUTPUTDIR)/classes
-
-# Copyright year for beginning of Java and some of the apis
-# (Needed when creating the javadocs)
-FIRST_COPYRIGHT_YEAR = 1993
-DOMAPI_FIRST_COPYRIGHT_YEAR = 2005
-MIRROR_FIRST_COPYRIGHT_YEAR = 2004
-DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993
-TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993
-JDI_FIRST_COPYRIGHT_YEAR = 1999
-JAAS_FIRST_COPYRIGHT_YEAR = 1998
-JGSS_FIRST_COPYRIGHT_YEAR = 2000
-SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005
-HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005
-MGMT_FIRST_COPYRIGHT_YEAR = 2003
-ATTACH_FIRST_COPYRIGHT_YEAR = 2005
-JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006
-SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
-TRACING_FIRST_COPYRIGHT_YEAR = 2008
-TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
-JNLP_FIRST_COPYRIGHT_YEAR = 1998
-PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
-
-# Oracle name
-FULL_COMPANY_NAME = Oracle and/or its affiliates
-
-# Copyright address
-COMPANY_ADDRESS = 500 Oracle Parkway<br>Redwood Shores, CA 94065 USA.
-
-# The trademark symbol
-TRADEMARK = ™
-
-# Common copyright lines used
-# The word "Copyright" might optionally be a link to the file cpyr.html.
-# The first year of copyright may vary or not be available.
-# The address to the company might be optional.
-COMMA:= ,
-EMPTY:=
-SPACE:=$(EMPTY) $(EMPTY)
-COPYRIGHT_SYMBOL = &\#x00a9;
-# Macro to construct the copyright line
-# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
-define CopyrightLine # optionalurl optionalfirstyear optionaladdress
-$(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
-$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
-$(FULL_COMPANY_NAME). $3 All rights reserved.
-endef
-
-# Url to root of documents
-DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
-
-# Url to copyright html file
-COPYRIGHT_URL-7 = $(DOCSDIR_URL)/legal/cpyr.html
-# This isn't added in old build yet.
-#COPYRIGHT_URL-8 = $(DOCSDIR_URL)/legal/cpyr.html
-COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
-
-# Url to bug filing site
-BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/
-
-# Common line for how to submit a bug or rfe
-BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
-
-# Url to devdocs page
-# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
-DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
-DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
-DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
-DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
-
-# Common Java trademark line
-JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
-$(FULL_COMPANY_NAME) in the US and other countries.
-
-#################################################################
-# Macros:
-
-
-# List of all possible directories for javadoc to look for sources
-# NOTE: Quotes are required around sourcepath argument only on Windows.
-# Otherwise, you get "No packages or classes specified." due
-# to $(PATH_SEP) being interpreted as an end of
-# command (newline or shell ; character)
-ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
- $(JDK_IMPSRC) \
- $(JDK_GENSRC) \
- $(JDK_OUTPUTDIR)/gendocsrc_rmic \
- $(JDK_TOPDIR)/src/solaris/classes \
- $(JDK_TOPDIR)/src/windows/classes \
- $(JDK_SHARE_SRC)/doc/stub
-
-# List of directories that actually exist
-ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
-
-# List with classpath separator between them
-EMPTY:=
-SPACE:= $(EMPTY) $(EMPTY)
-RELEASEDOCS_SOURCEPATH = \
- $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS)))
-
-define prep-target
- $(MKDIR) -p $(@D)
- $(RM) $@
-endef
-
-# Prep for javadoc creation, assumes $@ is an index.html file
-define prep-javadoc
- @if [ -f "$@" -a "$?" != "" ] ; then \
- $(ECHO) "# Dependencies have changed: $?"; \
- fi
- $(RM) -r $(@D)
- $(MKDIR) -p $(@D)
-endef
-
-# A cache of the directories in ALL_SOURCE_DIRS
-DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
-
-# Given a list of packages, return a list of files or dirs to be dependent on
-# (Currently only returning a list of directories)
-define PackageDependencies # packages
- $(shell \
- if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
- for p in $1 ; do \
- pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
- $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
- done; \
- fi \
- )
-endef
-
-# Given a list of packages, add packages that exist to $@, print summary
-define PackageFilter # packages
- @if [ "$1" != "" ] ; then \
- for p in $1 ; do \
- pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
- found="false"; \
- for cp in $(ALL_SOURCE_DIRS) ; do \
- if [ -d $${cp}/$${pd} ] ; then \
- $(ECHO) "$${p}" >> $@; \
- found="true"; \
- break; \
- fi; \
- done; \
- if [ "$${found}" = "false" ] ; then \
- $(ECHO) "WARNING: Package not found: $${p}"; \
- fi; \
- done; \
- fi
-endef
-
-# Print out a summary of the javadoc command about to be run
-define JavadocSummary # optionsfile packagesfile
- @$(ECHO) "# Summary for $@"; \
- $(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@# @' $1; \
- $(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@# @' $2
-endef
-
-#
-# Temporary directory for javadoc creation
-#
-DOCSTMPDIR = $(TEMPDIR)/doctmp
-
-#
-# Different api directories created from root directory
-#
-COREAPI_DOCSDIR = $(DOCSDIR)/api
-JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
-JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
-PLATFORM_DOCSDIR = $(DOCSDIR)/platform
-
-# The non-core api javadocs need to be able to access the root of the core
-# api directory, so for jdk/api or jre/api to get to the core api/
-# directory we would use this:
-JDKJRE2COREAPI = ../../api
-
-# Common bottom argument
-define CommonBottom # year
-<font size="-1"><br> $(call CopyrightLine,,$1,)</font>
-endef
-
-# Common trademark bottom argument (Not sure why this is used sometimes)
-define CommonTrademarkBottom # year
-<font size="-1">\
-$(BUG_SUBMIT_LINE)<br>$(JAVA_TRADEMARK_LINE)<br>\
-$(call CopyrightLine,,$1,$(COMPANY_ADDRESS))\
-</font>
-endef
-
-# Common echo of option
-define OptionOnly # opt
- $(PRINTF) "%s\n" "$1"
-endef
-define OptionPair # opt arg
- $(PRINTF) "%s '%s'\n" "$1" '$2'
-endef
-define OptionTrip # opt arg arg
- $(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
-endef
-
-# Core api bottom argument (with special sauce)
-COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\
-<br>For further API reference and developer documentation, \
-see <a href="$(DEV_DOCS_URL)" target="_blank">Java SE Documentation</a>. \
-That documentation contains more detailed, developer-targeted descriptions, \
-with conceptual overviews, definitions of terms, workarounds, \
-and working code examples.<br>\
-$(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
-</font>
-
-# Common javadoc options used by all
-COMMON_JAVADOCFLAGS = \
- -XDignore.symbol.file=true \
- -quiet \
- -use \
- -keywords \
- -Xdoclint:none \
- -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \
- $(ADDITIONAL_JAVADOCFLAGS)
-
-ifdef OPENJDK
- ADDITIONAL_JAVADOCFLAGS = \
- -Xdocrootparent $(DOCS_BASE_URL)
-else
- ADDITIONAL_JAVADOCFLAGS =
-endif
-
-# Draft used for non-fcs documents
-DRAFT_HEADER =
-ifneq ($(MILESTONE), fcs)
- DRAFT_HEADER = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
- DRAFT_BOTTOM = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
- DRAFT_WINTITLE = $(BUILD_NUMBER)
- # Early access top text (not used in FCS releases)
- COREAPI_TOP_EARLYACCESS = \
-<div style="background-color: \#EEEEEE"> \
-<div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
-margin-left: 6px; margin-right: 6px; text-align: justify; \
-font-size: 80%; font-family: Helvetica, Arial, sans-serif; \
-font-weight: normal;"> \
-Please note that the specifications and other information \
-contained herein are not final and are subject to change. \
-The information is being made available to you solely for purpose of \
-evaluation. \
-</div> </div>
-
-endif
-
-#################################################################
-
-#
-# CORE_PKGS environment variable has been moved to the following file
-#
-include CORE_PKGS.gmk
-
-#
-# Load environment variables for API package names that are not part of
-# the Java SE platform
-#
-include NON_CORE_PKGS.gmk
-
-#################################################################
-
-#
-# Default target is same as docs target, create core api and all others it can
-#
-
-all: docs
-docs: coredocs otherdocs
-
-#################################################################
-# Production Targets -- USE THESE TARGETS WHEN:
-# a) You're generating docs outside of release engineering's
-# standard control build.
-# b) The docs will be pushed to the web and/or included in
-# the downloaded doc bundle.
-#
-# See: Notes.html#releaseTargets
-# Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
-#
-
-sanitycheckcoredocs:
- @$(ECHO) ""
- @$(ECHO) "Building core api docs with these values:"
- @$(ECHO) " BUILD_NUMBER = $(BUILD_NUMBER)"
- @$(ECHO) " MILESTONE = $(MILESTONE)"
- @$(ECHO) ""
- ifeq ($(BUILD_NUMBER), b00)
- @$(ECHO) "ERROR: Build number must be defined"
- @$(ECHO) "MILESTONE is set to $(MILESTONE)"
- @$(ECHO) ""
- exit 1
- endif
-
-#############################################################
-#
-# coredocs
-#
-COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
-$(JDK_MINOR_VERSION)<br>API Specification
-COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
-COREAPI_HEADER = \
-<strong>Java$(TRADEMARK) Platform<br>Standard Ed. $(JDK_MINOR_VERSION)</strong>
-
-# Java language specification cite
-TAG_JLS = jls:a:See <cite> \
-The Java™ Language Specification</cite>:
-
-# Overview file for core apis
-COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html
-
-# The index.html, options, and packages files
-COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
-COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
-COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
-
-coredocs: $(COREAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(COREAPI_INDEX_FILE): GET2DOCSDIR=..
-
-# Run javadoc if the index file is out of date or missing
-$(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ISO-8859-1) ; \
- $(call OptionPair,-tag,beaninfo:X) ; \
- $(call OptionPair,-tag,revised:X) ; \
- $(call OptionPair,-tag,since.unbundled:X) ; \
- $(call OptionPair,-tag,spec:X) ; \
- $(call OptionPair,-tag,specdefault:X) ; \
- $(call OptionPair,-tag,Note:X) ; \
- $(call OptionPair,-tag,ToDo:X) ; \
- $(call OptionPair,-tag,apiNote:a:API Note:) ; \
- $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \
- $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \
- $(call OptionPair,-tag,param) ; \
- $(call OptionPair,-tag,return) ; \
- $(call OptionPair,-tag,throws) ; \
- $(call OptionPair,-tag,since) ; \
- $(call OptionPair,-tag,version) ; \
- $(call OptionPair,-tag,serialData) ; \
- $(call OptionPair,-tag,factory) ; \
- $(call OptionPair,-tag,see) ; \
- $(call OptionPair,-tag,$(TAG_JLS)) ; \
- $(call OptionOnly,-splitIndex) ; \
- $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ; \
- $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- ) >> $@
- ifdef COREAPI_TOP_EARLYACCESS
- @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
- endif
-
-# Create a file with the package names in it
-$(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
- $(prep-target)
- $(call PackageFilter,$(CORE_PKGS))
-
-#############################################################
-#
-# docletapidocs
-#
-
-ALL_OTHER_TARGETS += docletapidocs
-
-DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
-DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOCLETAPI_DOCTITLE := Doclet API
-DOCLETAPI_WINDOWTITLE := Doclet API
-DOCLETAPI_HEADER := <strong>Doclet API</strong>
-DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
-DOCLETAPI_GROUPNAME := Packages
-DOCLETAPI_REGEXP := com.sun.javadoc
-# DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
-DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
-DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages
-
-docletapidocs: $(DOCLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOCLETAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-breakiterator) ; \
- $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
- $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(DOCLETAPI_PKGS))
-
-#############################################################
-#
-# tagletapidocs
-#
-
-ALL_OTHER_TARGETS += tagletapidocs
-TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
-TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
-# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
-
-# Temporary directory (special generation rules)
-TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
-
-# The index.html, options, and packages files
-TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
-TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
-TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
-
-tagletapidocs: $(TAGLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(RM) -r $(TAGLETAPI_TEMPDIR)
- $(MKDIR) -p $(TAGLETAPI_TEMPDIR)
- $(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \
- @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
- cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
- cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
- $(RM) -r $(TAGLETAPI_TEMPDIR)
-
-# Create file with javadoc options in it
-$(TAGLETAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nonavbar) ; \
- $(call OptionOnly,-noindex) ; \
- $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS))
- $(prep-target)
- @($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
-
-#############################################################
-#
-# domapidocs
-#
-
-ALL_OTHER_TARGETS += domapidocs
-
-DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
-DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOMAPI_DOCTITLE := Common DOM API
-DOMAPI_WINDOWTITLE := Common DOM API
-DOMAPI_HEADER := <strong>Common DOM API</strong>
-DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
-DOMAPI_GROUPNAME := Packages
-DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
-# DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
-DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
-DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages
-
-domapidocs: $(DOMAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOMAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-splitIndex) ; \
- $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
- $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(DOMAPI_PKGS))
-
-#############################################################
-#
-# jpdadocs
-#
-
-ALL_OTHER_TARGETS += jpdadocs
-
-jpdadocs: jdidocs jdwpdocs jvmtidocs
-
-#############################################################
-#
-# jdidocs
-#
-
-ALL_OTHER_TARGETS += jdidocs
-
-JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
-JDI2COREAPI := ../../$(JDKJRE2COREAPI)
-JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
-JDI_WINDOWTITLE := Java Debug Interface
-JDI_HEADER := <strong>Java Debug Interface</strong>
-JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
-JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
-# JDI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
-JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
-JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages
-
-jdidocs: $(JDI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JDI_PKGS))
-
-#############################################################
-#
-# jdwpdocs
-#
-
-ALL_OTHER_TARGETS += jdwpdocs
-
-JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
-
-jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
-$(JDWP_DOCDIR)/jdwp-protocol.html : $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
- $(MKDIR) -p $(@D)
- $(RM) $@
- $(CP) $< $@
-
-#############################################################
-#
-# jvmtidocs
-#
-
-ALL_OTHER_TARGETS += jvmtidocs
-
-JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
-JVMTI_HTML = $(HOTSPOT_DIST)/docs/platform/jvmti/jvmti.html
-
-jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
-$(JVMTI_DOCDIR)/jvmti.html:
- @$(prep-javadoc)
- @if [ -f $(JVMTI_HTML) ] ; then \
- $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
- $(CP) $(JVMTI_HTML) $@; \
- else \
- $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
- fi
-
-#############################################################
-#
-# jaasdocs
-#
-
-ALL_OTHER_TARGETS += jaasdocs
-
-JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
-JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
-JAAS_WINDOWTITLE := Java Authentication and Authorization Service
-JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
-JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
-# JAAS_PKGS is located in NON_CORE_PKGS.gmk
-JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
-
-# The index.html, options, and packages files
-JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
-JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
-JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages
-
-jaasdocs: $(JAAS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JAAS_PKGS))
-
-#############################################################
-#
-# jgssdocs
-#
-
-ALL_OTHER_TARGETS += jgssdocs
-
-JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
-JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
-JGSS_WINDOWTITLE := Java GSS-API Utilities
-JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
-JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
-JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
-# JGSS_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
-JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
-JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages
-
-jgssdocs: $(JGSS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JGSS_PKGS))
-
-#############################################################
-#
-# smartcardiodocs
-#
-
-ALL_OTHER_TARGETS += smartcardiodocs
-
-SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
-SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
-SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
-SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O
-SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
-SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
-# SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
-SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
-SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages
-
-smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
-
-# Set relative location to core api document root
-$(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SMARTCARDIO_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
- $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
- $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
- $(prep-target)
- $(call PackageFilter,$(SMARTCARDIO_PKGS))
-
-#############################################################
-#
-# httpserverdocs
-#
-
-ALL_OTHER_TARGETS += httpserverdocs
-
-HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
-HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
-HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
-HTTPSERVER_WINDOWTITLE := Java HTTP Server
-HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
-HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
-# HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
-
-HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
-HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
-HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages
-
-httpserverdocs: $(HTTPSERVER_INDEX_HTML)
-
-# Set relative location to core api document root
-$(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(HTTPSERVER_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
- $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
- $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
- $(prep-target)
- $(call PackageFilter,$(HTTPSERVER_PKGS))
-
-#############################################################
-#
-# mgmtdocs
-#
-
-ALL_OTHER_TARGETS += mgmtdocs
-
-MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
-MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
-JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
-JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
-MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
-MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
-MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
-MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
-MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
-# MGMT_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
-MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
-MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages
-
-mgmtdocs: $(MGMT_INDEX_FILE)
-
-# Set relative location to core api document root
-$(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- @if [ -f $(JVM_MIB_SRC) ] ; then \
- $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
- $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
- else \
- $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
- fi
- $(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
- $(prep-target)
- $(call PackageFilter,$(MGMT_PKGS))
-
-#############################################################
-#
-# attachdocs
-#
-
-ALL_OTHER_TARGETS += attachdocs
-
-ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
-ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
-ATTACH_DOCTITLE := Attach API
-ATTACH_WINDOWTITLE := Attach API
-ATTACH_HEADER := <strong>Attach API</strong>
-ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
-# ATTACH_PKGS is located in NON_CORE_PKGS.gmk
-
-ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
-ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
-ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages
-
-attachdocs: $(ATTACH_INDEX_HTML)
-
-# Set relative location to core api document root
-$(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(ATTACH_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
- $(prep-target)
- $(call PackageFilter,$(ATTACH_PKGS))
-
-#############################################################
-#
-# jconsoledocs
-#
-
-ALL_OTHER_TARGETS += jconsoledocs
-
-JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
-JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
-JCONSOLE_DOCTITLE := JConsole API
-JCONSOLE_WINDOWTITLE := JConsole API
-JCONSOLE_HEADER := <strong>JConsole API</strong>
-JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
-# JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk
-
-JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
-JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
-JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages
-
-jconsoledocs: $(JCONSOLE_INDEX_HTML)
-
-# Set relative location to core api document root
-$(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JCONSOLE_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JCONSOLE_PKGS))
-
-#############################################################
-#
-# treeapidocs
-#
-
-ALL_OTHER_TARGETS += treeapidocs
-
-TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
-TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TREEAPI_DOCTITLE := Compiler Tree API
-TREEAPI_WINDOWTITLE := Compiler Tree API
-TREEAPI_HEADER := <strong>Compiler Tree API</strong>
-TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
-TREEAPI_GROUPNAME := Packages
-TREEAPI_REGEXP := com.sun.source.*
-# TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
-TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
-TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
-
-treeapidocs: $(TREEAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(TREEAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-tag,$(TAG_JLS)) ; \
- $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
- $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(TREEAPI_PKGS))
-
-#############################################################
-#
-# sctpdocs
-#
-
-ALL_OTHER_TARGETS += sctpdocs
-
-SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
-SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
-SCTPAPI_DOCTITLE := SCTP API
-SCTPAPI_WINDOWTITLE := SCTP API
-SCTPAPI_HEADER := <strong>SCTP API</strong>
-SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
-# SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
-SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
-SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages
-
-sctpdocs: $(SCTPAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(SCTPAPI_INDEX_HTML): GET2DOCSDIR=$(SCTPAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) coredocs
- $(prep-javadoc)
- $(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) -d $(@D) \
- @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SCTPAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(SCTPAPI_PKGS))
-
-#############################################################
-#
-# Get a cache of all the directories
-
-$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
- $(prep-target)
- @for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
- $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
- $(FIND) $${cp} -type f >> $@; \
- done
-
-#############################################################
-#release version of core packages ########
-# Maximize performance and ensure that build number & milestone are set.
-
-rel-coredocs: sanitycheckcoredocs
- $(MAKE) coredocs
-
-rel-docs: rel-coredocs $(ALL_OTHER_TARGETS)
-#
-# end of production targets
-
-otherdocs: $(ALL_OTHER_TARGETS)
-
-clean:
- $(RM) -r $(DOCSDIR) $(DOCSTMPDIR)
-
-#############################################################
-# DEBUG TARGET
-# List the values defined in the makefile hierarchy, to make sure everything
-# is set properly, and to help identify values we can use instead of making new ones.
-# (Most of them come from common/shared/Defs.gmk)
-#
-# Notes:
-# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
-# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
-#
-
-#############################################################
-.PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
- sanitycheckcoredocs $(ALL_OTHER_TARGETS)
diff --git a/common/makefiles/javadoc/Notes.html b/common/makefiles/javadoc/Notes.html
deleted file mode 100644
index 2705d76..0000000
--- a/common/makefiles/javadoc/Notes.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Doc Process Notes</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h3><a name="REGEXP"></a><br>
-REGEXP</h3>
-<p> REGEXP is a list of wildcard patterns that determines which packages listed
- in CORE_PKGS.gmk go into which summary-table on the main API index page. It
- was motivated by the need to divide the world into "core packages"
- (java.*) and "extension packages" (javax.*). In time, the distinction
- went away. The whole table is now called "Platform Packages"--which
- eliminated the need for this list of regular expressions. But it lingered on,
- accreting all of the packages in the JVM, one by one. I pruned it back to "*",
- so it now covers every package in the Java platform API docs. If some separation
- is needed in the future, it can grow back into a colon-separated list, starting
- with this, which is in all respects equivalent to "*" at this point
- in time:</p>
-<blockquote>
- <pre>REGEXP = "java.*:javax.*:org.ietf*:org.omg.</pre>
-</blockquote>
-<h3><a name="releaseTargets"></a><br>
- Release Targets</h3>
-<p> (Thanks to Kelly O'Hair for this info.)</p>
-<p> The <tt>rel-coredocs</tt> and <tt>rel-docs</tt> targets were added by Eric
- Armstrong. <tt>rel-coredocs</tt> assumes the kind of large, 32-bit machine used
- in the javapubs group's docs-release process. It specifies memory settings accordingly
- to maximize performance.</p>
-<p> The performance settings, like the sanity check, are most important for the
- core docs--the platform APIs. Running javadoc on those APIs takes a significant
- amount of time and memory. Setting the initial heap size as large as possible
- is important to prevent thrashing as the heap grows. Setting the maximum as
- large as necessary is also important to keep the job from failing.</p>
-<blockquote>
- <p> <tt>-J-Xmx512</tt> sets a maximum of 512, which became necessary in 6.0<br>
- <tt>-J-Xms256</tt> sets starting size to 256 (default is 8)</p>
-</blockquote>
-<p> <tt>rel-coredocs</tt> also includes a sanity check to help ensure that <tt>BUILD_NUMBER</tt>
- and <tt>MILESTONE</tt> are specified properly when docs are built outside of
- the normal release engineering process, with the intention of releasing them
- on the web or in a downloaded docs bundle. (When invoked in release engineering's
- control build, the values are always set properly. But when the targets are
- run by themselves, they default to b00 and "internal"--which silently
- sabotage the result of a build that can take many hours to complete.</p>
-</body>
-</html>
diff --git a/common/nb_native/nbproject/configurations.xml b/common/nb_native/nbproject/configurations.xml
index b976a43..d2beed0 100644
--- a/common/nb_native/nbproject/configurations.xml
+++ b/common/nb_native/nbproject/configurations.xml
@@ -4987,7 +4987,7 @@
<pElem>../../jdk/src/share/back</pElem>
<pElem>../../jdk/src/solaris/back</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -5064,7 +5064,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</ccTool>
</folder>
@@ -5074,7 +5074,7 @@
<pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -5083,7 +5083,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
@@ -5095,7 +5095,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="gctest.c"</Elem>
@@ -5108,7 +5108,7 @@
<pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="heapTracker.c"</Elem>
@@ -5120,7 +5120,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="heapViewer.c"</Elem>
@@ -5135,7 +5135,7 @@
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="debug_malloc.c"</Elem>
@@ -5150,7 +5150,7 @@
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="java_crw_demo.c"</Elem>
@@ -5163,7 +5163,7 @@
<pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="minst.c"</Elem>
@@ -5176,7 +5176,7 @@
<pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="mtrace.c"</Elem>
@@ -5188,7 +5188,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="versionCheck.c"</Elem>
@@ -5208,7 +5208,7 @@
<pElem>../../jdk/src/share/instrument</pElem>
<pElem>../../jdk/src/solaris/instrument</pElem>
<pElem>../../jdk/src/share/bin</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -5250,7 +5250,7 @@
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
<pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -5342,7 +5342,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5373,7 +5373,7 @@
<cTool>
<incDir>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -5395,7 +5395,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5425,7 +5425,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5452,7 +5452,7 @@
<pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="DatagramPacket.c"</Elem>
@@ -5484,7 +5484,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5521,7 +5521,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5565,7 +5565,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5601,7 +5601,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -5673,7 +5673,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -5702,7 +5702,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -5745,7 +5745,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -5781,7 +5781,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -5817,7 +5817,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -5864,7 +5864,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -5900,7 +5900,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -5949,7 +5949,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS</Elem>
@@ -5988,7 +5988,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -6011,7 +6011,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -6041,7 +6041,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -6072,7 +6072,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -6094,7 +6094,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/management</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -6136,7 +6136,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -6161,7 +6161,7 @@
<folder path="$SRC/jdk/src/share/native/sun/nio">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
@@ -6193,7 +6193,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -6244,7 +6244,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/ec</pElem>
<pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
@@ -6256,7 +6256,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/ec</pElem>
<pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MP_API_COMPATIBLE</Elem>
@@ -6269,7 +6269,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="GSSLibStub.c"</Elem>
@@ -6283,7 +6283,7 @@
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
<pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="p11_convert.c"</Elem>
@@ -6296,7 +6296,7 @@
<pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="pcsc.c"</Elem>
@@ -6315,7 +6315,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -6344,7 +6344,7 @@
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -6375,7 +6375,7 @@
<pElem>../../jdk/src/solaris/transport/socket</pElem>
<pElem>../../jdk/src/share/back/export</pElem>
<pElem>../../jdk/src/share/back</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -6427,7 +6427,7 @@
<pElem>../../jdk/src/share/back</pElem>
<pElem>../../jdk/src/solaris/back</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>JDWP_LOGGING</Elem>
@@ -6463,7 +6463,7 @@
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="hprof_md.c"</Elem>
@@ -6483,7 +6483,7 @@
<pElem>../../jdk/src/share/instrument</pElem>
<pElem>../../jdk/src/solaris/instrument</pElem>
<pElem>../../jdk/src/share/bin</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_JPLIS_LOGGING</Elem>
@@ -6515,7 +6515,7 @@
<cTool>
<incDir>
<pElem>../../jdk/src/share/native/sun/management</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -6524,7 +6524,7 @@
<incDir>
<pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
<pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
@@ -6541,7 +6541,7 @@
<folder path="$SRC/jdk/src/solaris/native/com/sun/security">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Unix.c"</Elem>
@@ -6573,7 +6573,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6619,7 +6619,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6648,7 +6648,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6668,7 +6668,7 @@
<pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
@@ -6682,7 +6682,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
@@ -6707,7 +6707,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6744,7 +6744,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -6773,7 +6773,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS</Elem>
@@ -6808,7 +6808,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -6838,7 +6838,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/management</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="FileSystemImpl.c"</Elem>
@@ -6860,7 +6860,7 @@
<pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
@@ -6909,7 +6909,7 @@
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -6941,7 +6941,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -6952,7 +6952,7 @@
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
<pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="p11_md.c"</Elem>
@@ -6965,7 +6965,7 @@
<pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="pcsc_md.c"</Elem>
@@ -6983,7 +6983,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
@@ -7001,7 +7001,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
@@ -7033,7 +7033,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -7071,7 +7071,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -7095,7 +7095,7 @@
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="utf_md.c"</Elem>
@@ -7116,7 +7116,7 @@
<pElem>../../jdk/src/solaris/transport/socket</pElem>
<pElem>../../jdk/src/share/back/export</pElem>
<pElem>../../jdk/src/share/back</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="socket_md.c"</Elem>
@@ -10455,7 +10455,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</item>
@@ -10466,7 +10466,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="jli_util.c"</Elem>
@@ -10479,7 +10479,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/linux/bin</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
@@ -10504,7 +10504,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="parse_manifest.c"</Elem>
@@ -10521,7 +10521,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="splashscreen_stubs.c"</Elem>
@@ -10538,7 +10538,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="version_comp.c"</Elem>
@@ -10552,7 +10552,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="wildcard.c"</Elem>
@@ -10992,7 +10992,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -11013,7 +11013,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -11035,7 +11035,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -11057,7 +11057,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -11079,7 +11079,7 @@
<pElem>../../jdk/src/solaris/javavm/export</pElem>
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="main.cpp"</Elem>
@@ -11099,7 +11099,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -11121,7 +11121,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -11143,7 +11143,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -11307,7 +11307,7 @@
flavor2="0">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</item>
@@ -11317,7 +11317,7 @@
flavor2="0">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="check_format.c"</Elem>
@@ -11345,7 +11345,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11378,7 +11378,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11411,7 +11411,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11444,7 +11444,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11477,7 +11477,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11565,7 +11565,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11598,7 +11598,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11631,7 +11631,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11664,7 +11664,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11697,7 +11697,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11730,7 +11730,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11763,7 +11763,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11796,7 +11796,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11829,7 +11829,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11862,7 +11862,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11895,7 +11895,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11928,7 +11928,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11961,7 +11961,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11994,7 +11994,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12027,7 +12027,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12060,7 +12060,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12800,7 +12800,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12833,7 +12833,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Adler32.c"</Elem>
@@ -12860,7 +12860,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="CRC32.c"</Elem>
@@ -12887,7 +12887,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Deflater.c"</Elem>
@@ -12914,7 +12914,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Inflater.c"</Elem>
@@ -12941,7 +12941,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="ZipFile.c"</Elem>
@@ -12968,7 +12968,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="zip_util.c"</Elem>
@@ -13213,7 +13213,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -13253,7 +13253,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -13293,7 +13293,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -13333,7 +13333,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -13388,7 +13388,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -13433,7 +13433,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -13458,7 +13458,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</item>
@@ -13483,7 +13483,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13514,7 +13514,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13545,7 +13545,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13576,7 +13576,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13607,7 +13607,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13638,7 +13638,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13669,7 +13669,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13700,7 +13700,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13731,7 +13731,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13762,7 +13762,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13793,7 +13793,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13824,7 +13824,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13855,7 +13855,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13886,7 +13886,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13917,7 +13917,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13948,7 +13948,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -13979,7 +13979,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14010,7 +14010,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14041,7 +14041,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14072,7 +14072,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14103,7 +14103,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14134,7 +14134,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14165,7 +14165,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14196,7 +14196,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14227,7 +14227,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14258,7 +14258,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14289,7 +14289,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14320,7 +14320,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14351,7 +14351,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14382,7 +14382,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14413,7 +14413,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14444,7 +14444,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14475,7 +14475,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14506,7 +14506,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14537,7 +14537,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14568,7 +14568,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14599,7 +14599,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14630,7 +14630,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14661,7 +14661,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14692,7 +14692,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14723,7 +14723,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14747,7 +14747,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="jpegdecoder.c"</Elem>
@@ -14775,7 +14775,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14806,7 +14806,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -14837,7 +14837,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -15014,7 +15014,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -15029,7 +15029,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15045,7 +15045,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15061,7 +15061,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15077,7 +15077,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15093,7 +15093,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15109,7 +15109,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15125,7 +15125,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15141,7 +15141,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15157,7 +15157,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15173,7 +15173,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15189,7 +15189,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15205,7 +15205,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15221,7 +15221,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15237,7 +15237,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15253,7 +15253,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15269,7 +15269,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15285,7 +15285,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15301,7 +15301,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15317,7 +15317,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15333,7 +15333,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15349,7 +15349,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15365,7 +15365,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15381,7 +15381,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15397,7 +15397,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15413,7 +15413,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15429,7 +15429,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15445,7 +15445,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15461,7 +15461,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15477,7 +15477,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15493,7 +15493,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15509,7 +15509,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15525,7 +15525,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15541,7 +15541,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15557,7 +15557,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15573,7 +15573,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15589,7 +15589,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15605,7 +15605,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15621,7 +15621,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15637,7 +15637,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15653,7 +15653,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15669,7 +15669,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15685,7 +15685,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15701,7 +15701,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15717,7 +15717,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15733,7 +15733,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15749,7 +15749,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15765,7 +15765,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15781,7 +15781,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15797,7 +15797,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15813,7 +15813,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15829,7 +15829,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15845,7 +15845,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15861,7 +15861,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15877,7 +15877,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15893,7 +15893,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_OS64BIT</Elem>
@@ -15983,7 +15983,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -16010,7 +16010,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS</Elem>
@@ -16045,7 +16045,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS</Elem>
@@ -16805,7 +16805,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS</Elem>
@@ -16836,7 +16836,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -16869,7 +16869,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -16902,7 +16902,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -18449,7 +18449,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>LIBARCHNAME="amd64"</Elem>
@@ -18466,7 +18466,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>LIBARCHNAME="amd64"</Elem>
@@ -18484,7 +18484,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>LIBARCHNAME="amd64"</Elem>
@@ -18502,7 +18502,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>LIBARCHNAME="amd64"</Elem>
@@ -18514,7 +18514,7 @@
<cTool>
<incDir>
<pElem>../../jdk/src/share/bin</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="jexec.c"</Elem>
@@ -18895,7 +18895,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -18934,7 +18934,7 @@
<pElem>../../jdk/src/solaris/native/sun/awt</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS=true</Elem>
@@ -18971,7 +18971,7 @@
<pElem>../../jdk/src/solaris/native/sun/awt</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS=true</Elem>
@@ -19010,7 +19010,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19051,7 +19051,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19092,7 +19092,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19133,7 +19133,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19174,7 +19174,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19215,7 +19215,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19256,7 +19256,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19297,7 +19297,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19338,7 +19338,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19378,7 +19378,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19418,7 +19418,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19459,7 +19459,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19500,7 +19500,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19541,7 +19541,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19582,7 +19582,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19623,7 +19623,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19664,7 +19664,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19705,7 +19705,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19746,7 +19746,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19787,7 +19787,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19828,7 +19828,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19869,7 +19869,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19915,7 +19915,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19956,7 +19956,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -19997,7 +19997,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -20133,7 +20133,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
@@ -20149,7 +20149,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
@@ -20165,7 +20165,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="EPoll.c"</Elem>
@@ -20181,7 +20181,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="EPollArrayWrapper.c"</Elem>
@@ -20197,7 +20197,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="EPollPort.c"</Elem>
@@ -20213,7 +20213,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="FileChannelImpl.c"</Elem>
@@ -20229,7 +20229,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
@@ -20245,7 +20245,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="FileKey.c"</Elem>
@@ -20261,7 +20261,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="IOUtil.c"</Elem>
@@ -20277,7 +20277,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="InheritedChannel.c"</Elem>
@@ -20293,7 +20293,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="NativeThread.c"</Elem>
@@ -20309,7 +20309,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Net.c"</Elem>
@@ -20325,7 +20325,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
@@ -20341,7 +20341,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
@@ -20357,7 +20357,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
@@ -20373,7 +20373,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="SocketDispatcher.c"</Elem>
@@ -20389,7 +20389,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
@@ -20405,7 +20405,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
@@ -20454,7 +20454,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</item>
@@ -20475,7 +20475,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="LinuxNativeDispatcher.c"</Elem>
@@ -20499,7 +20499,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="LinuxWatchService.c"</Elem>
@@ -20523,7 +20523,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="MagicFileTypeDetector.c"</Elem>
@@ -20547,7 +20547,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="UnixCopyFile.c"</Elem>
@@ -20571,7 +20571,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="UnixNativeDispatcher.c"</Elem>
@@ -20584,7 +20584,7 @@
flavor2="0">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="genUnixConstants.c"</Elem>
@@ -21464,7 +21464,7 @@
<pElem>../../jdk/src/share/back</pElem>
<pElem>../../jdk/src/solaris/back</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -21541,7 +21541,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</ccTool>
</folder>
@@ -21551,7 +21551,7 @@
<pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -21560,7 +21560,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
@@ -21572,7 +21572,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="gctest.c"</Elem>
@@ -21585,7 +21585,7 @@
<pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="heapTracker.c"</Elem>
@@ -21597,7 +21597,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="heapViewer.c"</Elem>
@@ -21612,7 +21612,7 @@
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="debug_malloc.c"</Elem>
@@ -21627,7 +21627,7 @@
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="java_crw_demo.c"</Elem>
@@ -21640,7 +21640,7 @@
<pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="minst.c"</Elem>
@@ -21653,7 +21653,7 @@
<pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="mtrace.c"</Elem>
@@ -21665,7 +21665,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="versionCheck.c"</Elem>
@@ -21685,7 +21685,7 @@
<pElem>../../jdk/src/share/instrument</pElem>
<pElem>../../jdk/src/solaris/instrument</pElem>
<pElem>../../jdk/src/share/bin</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -21727,7 +21727,7 @@
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
<pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -21820,7 +21820,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21851,7 +21851,7 @@
<cTool>
<incDir>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -21873,7 +21873,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21903,7 +21903,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21930,7 +21930,7 @@
<pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="DatagramPacket.c"</Elem>
@@ -21962,7 +21962,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21999,7 +21999,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -22043,7 +22043,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -22079,7 +22079,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -22151,7 +22151,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -22180,7 +22180,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -22223,7 +22223,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -22259,7 +22259,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -22295,7 +22295,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -22342,7 +22342,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -22378,7 +22378,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -22427,7 +22427,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS</Elem>
@@ -22466,7 +22466,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -22489,7 +22489,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -22519,7 +22519,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -22550,7 +22550,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -22572,7 +22572,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/management</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -22614,7 +22614,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -22639,7 +22639,7 @@
<folder path="$SRC/jdk/src/share/native/sun/nio">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
@@ -22671,7 +22671,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -22722,7 +22722,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/ec</pElem>
<pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
@@ -22734,7 +22734,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/ec</pElem>
<pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MP_API_COMPATIBLE</Elem>
@@ -22747,7 +22747,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="GSSLibStub.c"</Elem>
@@ -22761,7 +22761,7 @@
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
<pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="p11_convert.c"</Elem>
@@ -22774,7 +22774,7 @@
<pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="pcsc.c"</Elem>
@@ -22793,7 +22793,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -22822,7 +22822,7 @@
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -22853,7 +22853,7 @@
<pElem>../../jdk/src/solaris/transport/socket</pElem>
<pElem>../../jdk/src/share/back/export</pElem>
<pElem>../../jdk/src/share/back</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -22905,7 +22905,7 @@
<pElem>../../jdk/src/share/back</pElem>
<pElem>../../jdk/src/solaris/back</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>JDWP_LOGGING</Elem>
@@ -22941,7 +22941,7 @@
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="hprof_md.c"</Elem>
@@ -22961,7 +22961,7 @@
<pElem>../../jdk/src/share/instrument</pElem>
<pElem>../../jdk/src/solaris/instrument</pElem>
<pElem>../../jdk/src/share/bin</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_JPLIS_LOGGING</Elem>
@@ -22993,7 +22993,7 @@
<cTool>
<incDir>
<pElem>../../jdk/src/share/native/sun/management</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -23002,7 +23002,7 @@
<incDir>
<pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
<pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
@@ -23019,7 +23019,7 @@
<folder path="$SRC/jdk/src/solaris/native/com/sun/security">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Unix.c"</Elem>
@@ -23051,7 +23051,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23097,7 +23097,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23126,7 +23126,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23146,7 +23146,7 @@
<pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
@@ -23160,7 +23160,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
@@ -23185,7 +23185,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23222,7 +23222,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -23251,7 +23251,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS</Elem>
@@ -23286,7 +23286,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -23316,7 +23316,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/management</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="FileSystemImpl.c"</Elem>
@@ -23338,7 +23338,7 @@
<pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
@@ -23387,7 +23387,7 @@
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -23419,7 +23419,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -23430,7 +23430,7 @@
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
<pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="p11_md.c"</Elem>
@@ -23443,7 +23443,7 @@
<pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="pcsc_md.c"</Elem>
@@ -23461,7 +23461,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
@@ -23479,7 +23479,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
@@ -23511,7 +23511,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23549,7 +23549,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -23573,7 +23573,7 @@
<pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="utf_md.c"</Elem>
@@ -23594,7 +23594,7 @@
<pElem>../../jdk/src/solaris/transport/socket</pElem>
<pElem>../../jdk/src/share/back/export</pElem>
<pElem>../../jdk/src/share/back</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="socket_md.c"</Elem>
@@ -28097,7 +28097,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>LIBARCH32NAME="i386"</Elem>
@@ -28112,7 +28112,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>LIBARCH32NAME="i386"</Elem>
@@ -28126,7 +28126,7 @@
<incDir>
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
@@ -28152,7 +28152,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>LIBARCH32NAME="i386"</Elem>
@@ -28171,7 +28171,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>LIBARCH32NAME="i386"</Elem>
@@ -28190,7 +28190,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>LIBARCH32NAME="i386"</Elem>
@@ -28206,7 +28206,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>LIBARCH32NAME="i386"</Elem>
@@ -28648,7 +28648,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -28669,7 +28669,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -28691,7 +28691,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -28713,7 +28713,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -28735,7 +28735,7 @@
<pElem>../../jdk/src/solaris/javavm/export</pElem>
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="main.cpp"</Elem>
@@ -28755,7 +28755,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -28777,7 +28777,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -28799,7 +28799,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>NO_ZLIB</Elem>
@@ -28919,7 +28919,7 @@
flavor2="0">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</item>
@@ -28929,7 +28929,7 @@
flavor2="0">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="check_format.c"</Elem>
@@ -28957,7 +28957,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -28990,7 +28990,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29023,7 +29023,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29056,7 +29056,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29089,7 +29089,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29177,7 +29177,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29210,7 +29210,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29243,7 +29243,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29276,7 +29276,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29309,7 +29309,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29342,7 +29342,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29375,7 +29375,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29408,7 +29408,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29441,7 +29441,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29474,7 +29474,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29507,7 +29507,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29540,7 +29540,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29573,7 +29573,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29606,7 +29606,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29639,7 +29639,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29672,7 +29672,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -30412,7 +30412,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -30445,7 +30445,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Adler32.c"</Elem>
@@ -30472,7 +30472,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="CRC32.c"</Elem>
@@ -30499,7 +30499,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Deflater.c"</Elem>
@@ -30526,7 +30526,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Inflater.c"</Elem>
@@ -30553,7 +30553,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="ZipFile.c"</Elem>
@@ -30580,7 +30580,7 @@
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/solaris/native/java/io</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="zip_util.c"</Elem>
@@ -30825,7 +30825,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -30864,7 +30864,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -30903,7 +30903,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -30942,7 +30942,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -30996,7 +30996,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -31040,7 +31040,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -31064,7 +31064,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</item>
@@ -31089,7 +31089,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31120,7 +31120,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31151,7 +31151,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31182,7 +31182,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31213,7 +31213,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31244,7 +31244,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31275,7 +31275,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31306,7 +31306,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31337,7 +31337,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31368,7 +31368,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31399,7 +31399,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31430,7 +31430,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31461,7 +31461,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31492,7 +31492,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31523,7 +31523,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31554,7 +31554,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31585,7 +31585,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31616,7 +31616,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31647,7 +31647,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31678,7 +31678,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31709,7 +31709,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31740,7 +31740,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31771,7 +31771,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31802,7 +31802,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31833,7 +31833,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31864,7 +31864,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31895,7 +31895,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31926,7 +31926,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31957,7 +31957,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -31988,7 +31988,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32019,7 +32019,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32050,7 +32050,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32081,7 +32081,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32112,7 +32112,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32143,7 +32143,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32174,7 +32174,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32205,7 +32205,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32236,7 +32236,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32267,7 +32267,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32298,7 +32298,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32329,7 +32329,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32353,7 +32353,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="jpegdecoder.c"</Elem>
@@ -32381,7 +32381,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32412,7 +32412,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32443,7 +32443,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -32620,7 +32620,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -32635,7 +32635,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32652,7 +32652,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32669,7 +32669,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32686,7 +32686,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32703,7 +32703,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32720,7 +32720,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32737,7 +32737,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32754,7 +32754,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32771,7 +32771,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32788,7 +32788,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32805,7 +32805,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32822,7 +32822,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32839,7 +32839,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32856,7 +32856,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32873,7 +32873,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32890,7 +32890,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32907,7 +32907,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32924,7 +32924,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32941,7 +32941,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32958,7 +32958,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32975,7 +32975,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32992,7 +32992,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33009,7 +33009,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33026,7 +33026,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33043,7 +33043,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33060,7 +33060,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33077,7 +33077,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33094,7 +33094,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33111,7 +33111,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33128,7 +33128,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33145,7 +33145,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33162,7 +33162,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33179,7 +33179,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33196,7 +33196,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33213,7 +33213,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33230,7 +33230,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33247,7 +33247,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33264,7 +33264,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33281,7 +33281,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33298,7 +33298,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33315,7 +33315,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33332,7 +33332,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33349,7 +33349,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33366,7 +33366,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33383,7 +33383,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33400,7 +33400,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33417,7 +33417,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33434,7 +33434,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33451,7 +33451,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33468,7 +33468,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33485,7 +33485,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33502,7 +33502,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33519,7 +33519,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33536,7 +33536,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33553,7 +33553,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
<pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33644,7 +33644,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -33672,7 +33672,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS</Elem>
@@ -33707,7 +33707,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS</Elem>
@@ -34467,7 +34467,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS</Elem>
@@ -34498,7 +34498,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -34530,7 +34530,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -34562,7 +34562,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -36472,7 +36472,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -36512,7 +36512,7 @@
<pElem>../../jdk/src/solaris/native/sun/awt</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS=true</Elem>
@@ -36549,7 +36549,7 @@
<pElem>../../jdk/src/solaris/native/sun/awt</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS=true</Elem>
@@ -36588,7 +36588,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -36630,7 +36630,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -36672,7 +36672,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -36714,7 +36714,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -36756,7 +36756,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -36798,7 +36798,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -36840,7 +36840,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -36882,7 +36882,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -36924,7 +36924,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -36963,7 +36963,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -37002,7 +37002,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37044,7 +37044,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37086,7 +37086,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37128,7 +37128,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37170,7 +37170,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37212,7 +37212,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37254,7 +37254,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37296,7 +37296,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37338,7 +37338,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37380,7 +37380,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37422,7 +37422,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37464,7 +37464,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37511,7 +37511,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37553,7 +37553,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37595,7 +37595,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -37732,7 +37732,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
@@ -37748,7 +37748,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
@@ -37764,7 +37764,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="DevPollArrayWrapper.c"</Elem>
@@ -37780,7 +37780,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="FileChannelImpl.c"</Elem>
@@ -37796,7 +37796,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
@@ -37812,7 +37812,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="FileKey.c"</Elem>
@@ -37828,7 +37828,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="IOUtil.c"</Elem>
@@ -37844,7 +37844,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="InheritedChannel.c"</Elem>
@@ -37860,7 +37860,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="NativeThread.c"</Elem>
@@ -37876,7 +37876,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Net.c"</Elem>
@@ -37892,7 +37892,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
@@ -37908,7 +37908,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
@@ -37924,7 +37924,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
@@ -37940,7 +37940,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="SocketDispatcher.c"</Elem>
@@ -37956,7 +37956,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="SolarisEventPort.c"</Elem>
@@ -37972,7 +37972,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
@@ -37988,7 +37988,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
@@ -38037,7 +38037,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -38073,7 +38073,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -38110,7 +38110,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -38147,7 +38147,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -38184,7 +38184,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -38210,7 +38210,7 @@
flavor2="0">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="genSolarisConstants.c"</Elem>
@@ -38223,7 +38223,7 @@
flavor2="0">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -39157,7 +39157,7 @@
<folder path="$SRC/jdk/make">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -39192,7 +39192,7 @@
<pElem>../../jdk/src/share/back</pElem>
<pElem>../../jdk/src/solaris/back</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -39278,7 +39278,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</ccTool>
</folder>
@@ -39288,7 +39288,7 @@
<pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -39297,7 +39297,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
@@ -39309,7 +39309,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="gctest.c"</Elem>
@@ -39322,7 +39322,7 @@
<pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="heapTracker.c"</Elem>
@@ -39334,7 +39334,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="heapViewer.c"</Elem>
@@ -39349,7 +39349,7 @@
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="debug_malloc.c"</Elem>
@@ -39364,7 +39364,7 @@
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="java_crw_demo.c"</Elem>
@@ -39377,7 +39377,7 @@
<pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="minst.c"</Elem>
@@ -39390,7 +39390,7 @@
<pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="mtrace.c"</Elem>
@@ -39402,7 +39402,7 @@
<incDir>
<pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
<pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="versionCheck.c"</Elem>
@@ -39422,7 +39422,7 @@
<pElem>../../jdk/src/share/instrument</pElem>
<pElem>../../jdk/src/solaris/instrument</pElem>
<pElem>../../jdk/src/share/bin</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -39467,7 +39467,7 @@
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
<pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -39571,7 +39571,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39602,7 +39602,7 @@
<cTool>
<incDir>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -39624,7 +39624,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39654,7 +39654,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39681,7 +39681,7 @@
<pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="DatagramPacket.c"</Elem>
@@ -39713,7 +39713,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39750,7 +39750,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39794,7 +39794,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39830,7 +39830,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -39905,7 +39905,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -39935,7 +39935,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -39978,7 +39978,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -40013,7 +40013,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -40048,7 +40048,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -40094,7 +40094,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -40130,7 +40130,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -40183,7 +40183,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>HEADLESS</Elem>
@@ -40225,7 +40225,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -40248,7 +40248,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -40277,7 +40277,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>FUNCPROTO=15</Elem>
@@ -40309,7 +40309,7 @@
<pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
<pElem>../../jdk/src/share/native/sun/font</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>INTERNAL_BUILD</Elem>
@@ -40330,7 +40330,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/management</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -40375,7 +40375,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -40403,7 +40403,7 @@
<folder path="$SRC/jdk/src/share/native/sun/nio">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
@@ -40435,7 +40435,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -40492,7 +40492,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/ec</pElem>
<pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
@@ -40504,7 +40504,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/ec</pElem>
<pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>MP_API_COMPATIBLE</Elem>
@@ -40517,7 +40517,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="GSSLibStub.c"</Elem>
@@ -40531,7 +40531,7 @@
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
<pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="p11_convert.c"</Elem>
@@ -40544,7 +40544,7 @@
<pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="pcsc.c"</Elem>
@@ -40563,7 +40563,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -40595,7 +40595,7 @@
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -40629,7 +40629,7 @@
<pElem>../../jdk/src/solaris/transport/socket</pElem>
<pElem>../../jdk/src/share/back/export</pElem>
<pElem>../../jdk/src/share/back</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -40674,7 +40674,7 @@
<pElem>../../jdk/src/share/back</pElem>
<pElem>../../jdk/src/solaris/back</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -40707,7 +40707,7 @@
<pElem>../../jdk/src/share/bin</pElem>
<pElem>../../jdk/src/solaris/bin</pElem>
<pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -40762,7 +40762,7 @@
<cTool>
<incDir>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/democlasses/jni/Poller</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -40774,7 +40774,7 @@
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
<pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="hprof_md.c"</Elem>
@@ -40794,7 +40794,7 @@
<pElem>../../jdk/src/share/instrument</pElem>
<pElem>../../jdk/src/solaris/instrument</pElem>
<pElem>../../jdk/src/share/bin</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -40854,7 +40854,7 @@
<cTool>
<incDir>
<pElem>../../jdk/src/share/native/sun/management</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -40863,7 +40863,7 @@
<incDir>
<pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
<pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>EXTRA_SOUND_JNI_LIBS=""</Elem>
@@ -40878,7 +40878,7 @@
<folder path="$SRC/jdk/src/solaris/native/com/sun/security">
<cTool>
<incDir>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Solaris.c"</Elem>
@@ -40910,7 +40910,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -40982,7 +40982,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -41011,7 +41011,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -41031,7 +41031,7 @@
<pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
@@ -41045,7 +41045,7 @@
<pElem>../../jdk/src/share/native/java/io</pElem>
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
@@ -41070,7 +41070,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCHPROPNAME="amd64"</Elem>
@@ -41126,7 +41126,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>PNG_NO_MMX_CODE</Elem>
@@ -41155,7 +41155,7 @@
<pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
<pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
<pElem>../../jdk/src/share/native/sun/java2d</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -41203,7 +41203,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -41247,7 +41247,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/management</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -41282,7 +41282,7 @@
<pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
<pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -41359,7 +41359,7 @@
<pElem>../../jdk/src/share/native/java/net</pElem>
<pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
<pElem>../../jdk/src/solaris/native/java/net</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -41404,7 +41404,7 @@
<incDir>
<pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
@@ -41415,7 +41415,7 @@
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
<pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="p11_md.c"</Elem>
@@ -41428,7 +41428,7 @@
<pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
<pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="pcsc_md.c"</Elem>
@@ -41446,7 +41446,7 @@
<pElem>../../jdk/src/share/native/common</pElem>
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -41477,7 +41477,7 @@
<pElem>../../jdk/src/solaris/native/common</pElem>
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -41522,7 +41522,7 @@
<pElem>../../jdk/src/solaris/native/java/util</pElem>
<pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
<pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -41573,7 +41573,7 @@
<pElem>../../jdk/src/share/native/sun/awt/image</pElem>
<pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
<pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -41611,7 +41611,7 @@
<pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
<pElem>../../jdk/src/share/npt</pElem>
<pElem>../../jdk/src/solaris/npt</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
@@ -41645,7 +41645,7 @@
<pElem>../../jdk/src/solaris/transport/socket</pElem>
<pElem>../../jdk/src/share/back/export</pElem>
<pElem>../../jdk/src/share/back</pElem>
- <pElem>../../jdk/makefiles</pElem>
+ <pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>ARCH="amd64"</Elem>
diff --git a/corba/.hgtags b/corba/.hgtags
index a4817b2..17aa59f 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -239,3 +239,4 @@
8d07115924b7d703a5048adb24e8aba751442f13 jdk8-b115
5fdc4465208933ba704825b2b05e1afd062235fb jdk8-b116
e53d1ee4d2ae898f1cf58688d45a5afe7c482173 jdk8-b117
+d6820a414f182a011a53a29a52370c696cd58dab jdk8-b118
diff --git a/corba/makefiles/BuildCorba.gmk b/corba/make/BuildCorba.gmk
similarity index 100%
rename from corba/makefiles/BuildCorba.gmk
rename to corba/make/BuildCorba.gmk
diff --git a/corba/make/Makefile b/corba/make/Makefile
index aef5c1b..4570070 100644
--- a/corba/make/Makefile
+++ b/corba/make/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,171 +23,27 @@
# questions.
#
-#
-# Makefile for building the corba workspace.
-#
-
-BUILDDIR=.
-include $(BUILDDIR)/common/Defs.gmk
-include $(BUILDDIR)/common/CancelImplicits.gmk
-
-#----- commands
-
-CHMOD = chmod
-CP = cp
-ECHO = echo # FIXME
-FIND = find
-MKDIR = mkdir
-SED = sed
-ZIP = zip
-
-#----- locations and deliverables
-
-TOPDIR=..
-SRC_BIN_DIR = $(TOPDIR)/src/share/bin
-SRC_CLASSES_DIR = $(TOPDIR)/src/share/classes
-
-ifdef ALT_OUTPUTDIR
- OUTPUTDIR = $(ALT_OUTPUTDIR)
- BUILD_DIR = $(ALT_OUTPUTDIR)
- DIST_DIR = $(ALT_OUTPUTDIR)/dist
+# Locate this Makefile
+ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
+ makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
else
- OUTPUTDIR = ..
- BUILD_DIR = $(TOPDIR)/build/$(PLATFORM)-$(ARCH)
- DIST_DIR = $(TOPDIR)/dist
+ makefile_path := $(lastword $(MAKEFILE_LIST))
endif
-ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR))
+repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path))
-CLASSES_DIR = $(BUILD_DIR)/classes
-GENSRC_DIR = $(BUILD_DIR)/gensrc
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name := $(notdir $(repo_dir))
-LIB_DIR = $(DIST_DIR)/lib
-
-#-----
-
-ifndef JDK_MAJOR_VERSION
- JDK_MAJOR_VERSION = 1
-endif
-
-ifndef JDK_MINOR_VERSION
- JDK_MINOR_VERSION = 7
-endif
-
-ifndef JDK_MICRO_VERSION
- JDK_MICRO_VERSION = 0
-endif
-
-ifndef JDK_VERSION
- JDK_VERSION = $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
-endif
-
-ifndef MILESTONE
- MILESTONE = internal
-endif
-
-# RELEASE is JDK_VERSION and -MILESTONE if MILESTONE is set
-ifneq ($(MILESTONE),fcs)
- RELEASE = $(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
+# Try to locate top-level makefile
+top_level_makefile := $(repo_dir)/../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 ===================================================)
else
- RELEASE = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
+ $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+ $(error Build from top-level Makefile instead)
endif
-# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
-ifdef BUILD_NUMBER
- FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
-else
- BUILD_NUMBER = b00
- USER_RELEASE_SUFFIX := $(shell echo $(USER)_`date '+%d_%b_%Y_%H_%M' | tr "A-Z" "a-z"`)
- FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
-endif
-
-#----- useful macros
-
-SOURCE_LEVEL = 5
-BOOTSTRAP_TARGET_LEVEL = 5
-
-ifdef TARGET_CLASS_VERSION
- TARGET_LEVEL = $(TARGET_CLASS_VERSION)
-else
- TARGET_LEVEL = 7
-endif
-
-ifndef TARGET_JAVA
- TARGET_JAVA = java
-endif
-
-SELF = $(lastword $(MAKEFILE_LIST))
-
-# for jdk, we generate the following:
-# dist/lib/classes.jar:
-# corba recompiled to run on the target JDK,
-# ready for inclusion in rt.jar
-# dist/lib/src.zip
-# .properties and .java files for classes in classes.jar,
-# ready for jdk src.zip
-# dist/lib/bin.zip
-# corba specific binaries: orb.idl, ir.idl
-
-# Default target
-default: all
-
-#----- classes.jar
-
-CLASSES_JAR = $(LIB_DIR)/classes.jar
-$(CLASSES_JAR):
- $(MKDIR) -p $(@D)
- $(BOOT_JAR_CMD) -cf $@ -C $(CLASSES_DIR) .
-
-#----- src.zip
-
-SRC_ZIP_FILES = $(shell $(FIND) $(SRC_CLASSES_DIR) \( -name \*-template \) -prune -o -type f -print )
-
-SRC_ZIP = $(LIB_DIR)/src.zip
-$(SRC_ZIP): $(SRC_ZIP_FILES)
- abs_src_zip=`cd $(@D) ; pwd`/$(@F) ; \
- ( cd $(SRC_CLASSES_DIR) ; $(FIND) . \( -name \*-template \) -prune -o -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ; \
- ( cd $(GENSRC_DIR) ; $(FIND) . -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ;
-
-#----- bin.zip
-
-BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
-
-BIN_ZIP = $(LIB_DIR)/bin.zip
-$(BIN_ZIP): $(BIN_ZIP_FILES)
- abs_bin_zip=`cd $(@D) ; pwd`/$(@F) ; \
- ( cd $(BUILD_DIR) ; $(FIND) lib -name "*.idl" -print | $(ZIP) -q $$abs_bin_zip -@ ) ;
-
-#
-# CORBA
-#
-SUBDIRS = tools javax org sun com
-
-build:
- $(SUBDIRS-loop)
-
-all : build $(CLASSES_JAR) $(SRC_ZIP) $(BIN_ZIP)
-
-clean clobber:
- $(RM) -r $(BUILD_DIR)
- $(RM) -r $(DIST_DIR)
-
-#-------------------------------------------------------------------
-#
-# Targets for Sun's internal JPRT build system
-
-CD = cd
-ZIP = zip
-
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
-
-jprt_build_product jprt_build_debug jprt_build_fastdebug: all
- ( $(CD) $(OUTPUTDIR) && \
- $(ZIP) -q -r $(JPRT_ARCHIVE_BUNDLE) build dist )
-
-#-------------------------------------------------------------------
-
-
-#
-# Phonies to avoid accidents.
-#
-.PHONY: all build clean clobber debug jprt_build_product jprt_build_debug jprt_build_fastdebug
+all:
+ @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/corba/make/com/Makefile b/corba/make/com/Makefile
deleted file mode 100644
index 5f5950b..0000000
--- a/corba/make/com/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ..
-PRODUCT = com
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = sun
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/corba/make/com/sun/Makefile b/corba/make/com/sun/Makefile
deleted file mode 100644
index 96e7487..0000000
--- a/corba/make/com/sun/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building com/sun
-#
-
-BUILDDIR = ../..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = corba
-
-all build clean clobber::
- $(SUBDIRS-loop)
diff --git a/corba/make/com/sun/corba/Makefile b/corba/make/com/sun/corba/Makefile
deleted file mode 100644
index d315a0a..0000000
--- a/corba/make/com/sun/corba/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ../../..
-PRODUCT = corba
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = se
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_PortableActivationIDL.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_PortableActivationIDL.jmk
deleted file mode 100644
index a3f66ea..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_PortableActivationIDL.jmk
+++ /dev/null
@@ -1,137 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Server Activation IDL Generated Files
-#
-# REVISIT: consider separating out the holder and helpers that are
-# not used and deleting them in the make
-
-com_sun_corba_se_PortableActivationIDL_java = \
- com/sun/corba/se/PortableActivationIDL/Activator.java \
- com/sun/corba/se/PortableActivationIDL/ActivatorHelper.java \
- com/sun/corba/se/PortableActivationIDL/ActivatorHolder.java \
- com/sun/corba/se/PortableActivationIDL/ActivatorOperations.java \
- com/sun/corba/se/PortableActivationIDL/BadServerDefinition.java \
- com/sun/corba/se/PortableActivationIDL/BadServerDefinitionHelper.java \
- com/sun/corba/se/PortableActivationIDL/BadServerDefinitionHolder.java \
- com/sun/corba/se/PortableActivationIDL/EndPointInfo.java \
- com/sun/corba/se/PortableActivationIDL/EndPointInfoHelper.java \
- com/sun/corba/se/PortableActivationIDL/EndPointInfoHolder.java \
- com/sun/corba/se/PortableActivationIDL/EndpointInfoListHelper.java \
- com/sun/corba/se/PortableActivationIDL/EndpointInfoListHolder.java \
- com/sun/corba/se/PortableActivationIDL/IIOP_CLEAR_TEXT.java \
- com/sun/corba/se/PortableActivationIDL/InitialNameService.java \
- com/sun/corba/se/PortableActivationIDL/InitialNameServiceHelper.java \
- com/sun/corba/se/PortableActivationIDL/InitialNameServiceHolder.java \
- com/sun/corba/se/PortableActivationIDL/InitialNameServiceOperations.java \
- com/sun/corba/se/PortableActivationIDL/InvalidORBid.java \
- com/sun/corba/se/PortableActivationIDL/InvalidORBidHelper.java \
- com/sun/corba/se/PortableActivationIDL/InvalidORBidHolder.java \
- com/sun/corba/se/PortableActivationIDL/Locator.java \
- com/sun/corba/se/PortableActivationIDL/LocatorHelper.java \
- com/sun/corba/se/PortableActivationIDL/LocatorHolder.java \
- com/sun/corba/se/PortableActivationIDL/LocatorOperations.java \
- com/sun/corba/se/PortableActivationIDL/NoSuchEndPoint.java \
- com/sun/corba/se/PortableActivationIDL/NoSuchEndPointHelper.java \
- com/sun/corba/se/PortableActivationIDL/NoSuchEndPointHolder.java \
- com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegistered.java \
- com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegisteredHelper.java \
- com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegisteredHolder.java \
- com/sun/corba/se/PortableActivationIDL/ORBidListHelper.java \
- com/sun/corba/se/PortableActivationIDL/ORBidListHolder.java \
- com/sun/corba/se/PortableActivationIDL/ORBPortInfo.java \
- com/sun/corba/se/PortableActivationIDL/ORBPortInfoHelper.java \
- com/sun/corba/se/PortableActivationIDL/ORBPortInfoHolder.java \
- com/sun/corba/se/PortableActivationIDL/ORBPortInfoListHelper.java \
- com/sun/corba/se/PortableActivationIDL/ORBPortInfoListHolder.java \
- com/sun/corba/se/PortableActivationIDL/ORBProxy.java \
- com/sun/corba/se/PortableActivationIDL/ORBProxyHelper.java \
- com/sun/corba/se/PortableActivationIDL/ORBProxyHolder.java \
- com/sun/corba/se/PortableActivationIDL/ORBProxyOperations.java \
- com/sun/corba/se/PortableActivationIDL/Repository.java \
- com/sun/corba/se/PortableActivationIDL/RepositoryHelper.java \
- com/sun/corba/se/PortableActivationIDL/RepositoryHolder.java \
- com/sun/corba/se/PortableActivationIDL/RepositoryOperations.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyActive.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyActiveHelper.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyActiveHolder.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalled.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalledHelper.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalledHolder.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegistered.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegisteredHelper.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegisteredHolder.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalled.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalledHelper.java \
- com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalledHolder.java \
- com/sun/corba/se/PortableActivationIDL/ServerHeldDown.java \
- com/sun/corba/se/PortableActivationIDL/ServerHeldDownHelper.java \
- com/sun/corba/se/PortableActivationIDL/ServerHeldDownHolder.java \
- com/sun/corba/se/PortableActivationIDL/ServerIdsHelper.java \
- com/sun/corba/se/PortableActivationIDL/ServerIdsHolder.java \
- com/sun/corba/se/PortableActivationIDL/ServerManager.java \
- com/sun/corba/se/PortableActivationIDL/ServerManagerHelper.java \
- com/sun/corba/se/PortableActivationIDL/ServerManagerHolder.java \
- com/sun/corba/se/PortableActivationIDL/ServerManagerOperations.java \
- com/sun/corba/se/PortableActivationIDL/ServerNotActive.java \
- com/sun/corba/se/PortableActivationIDL/ServerNotActiveHelper.java \
- com/sun/corba/se/PortableActivationIDL/ServerNotActiveHolder.java \
- com/sun/corba/se/PortableActivationIDL/ServerNotRegistered.java \
- com/sun/corba/se/PortableActivationIDL/ServerNotRegisteredHelper.java \
- com/sun/corba/se/PortableActivationIDL/ServerNotRegisteredHolder.java \
- com/sun/corba/se/PortableActivationIDL/ServerProxy.java \
- com/sun/corba/se/PortableActivationIDL/ServerProxyHelper.java \
- com/sun/corba/se/PortableActivationIDL/ServerProxyHolder.java \
- com/sun/corba/se/PortableActivationIDL/ServerProxyOperations.java \
- com/sun/corba/se/PortableActivationIDL/TCPPortHelper.java \
- com/sun/corba/se/PortableActivationIDL/_ActivatorImplBase.java \
- com/sun/corba/se/PortableActivationIDL/_ActivatorStub.java \
- com/sun/corba/se/PortableActivationIDL/_InitialNameServiceImplBase.java \
- com/sun/corba/se/PortableActivationIDL/_InitialNameServiceStub.java \
- com/sun/corba/se/PortableActivationIDL/_LocatorImplBase.java \
- com/sun/corba/se/PortableActivationIDL/_LocatorStub.java \
- com/sun/corba/se/PortableActivationIDL/_ORBProxyImplBase.java \
- com/sun/corba/se/PortableActivationIDL/_ORBProxyStub.java \
- com/sun/corba/se/PortableActivationIDL/_RepositoryImplBase.java \
- com/sun/corba/se/PortableActivationIDL/_RepositoryStub.java \
- com/sun/corba/se/PortableActivationIDL/_ServerManagerImplBase.java \
- com/sun/corba/se/PortableActivationIDL/_ServerManagerStub.java \
- com/sun/corba/se/PortableActivationIDL/_ServerProxyImplBase.java \
- com/sun/corba/se/PortableActivationIDL/_ServerProxyStub.java \
- com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBound.java \
- com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBoundHelper.java \
- com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBoundHolder.java \
- com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORB.java \
- com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORBHelper.java \
- com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORBHolder.java \
- com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerType.java \
- com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerTypeHelper.java \
- com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerTypeHolder.java \
- com/sun/corba/se/PortableActivationIDL/RepositoryPackage/AppNamesHelper.java \
- com/sun/corba/se/PortableActivationIDL/RepositoryPackage/AppNamesHolder.java \
- com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDef.java \
- com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDefHelper.java \
- com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDefHolder.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_activation.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_activation.jmk
deleted file mode 100644
index 43178f5..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_activation.jmk
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Java IDL Server Activation Files
-#
-
-com_sun_corba_se_impl_activation_java = \
- com/sun/corba/se/impl/activation/ProcessMonitorThread.java \
- com/sun/corba/se/impl/activation/RepositoryImpl.java \
- com/sun/corba/se/impl/activation/ServerTool.java \
- com/sun/corba/se/impl/activation/ORBD.java \
- com/sun/corba/se/impl/activation/CommandHandler.java \
- com/sun/corba/se/impl/activation/ServerManagerImpl.java \
- com/sun/corba/se/impl/activation/ServerTableEntry.java \
- com/sun/corba/se/impl/activation/NameServiceStartThread.java \
- com/sun/corba/se/impl/activation/ServerMain.java
-
-FILES_java = $(com_sun_corba_se_impl_activation_java)
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_corba.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_corba.jmk
deleted file mode 100644
index 8b3b92a..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_corba.jmk
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-com_sun_corba_se_impl_corba_java = \
- com/sun/corba/se/impl/corba/AnyImpl.java \
- com/sun/corba/se/impl/corba/AnyImplHelper.java \
- com/sun/corba/se/impl/corba/AsynchInvoke.java \
- com/sun/corba/se/impl/corba/CORBAObjectImpl.java \
- com/sun/corba/se/impl/corba/ContextImpl.java \
- com/sun/corba/se/impl/corba/ContextListImpl.java \
- com/sun/corba/se/impl/corba/EnvironmentImpl.java \
- com/sun/corba/se/impl/corba/ExceptionListImpl.java \
- com/sun/corba/se/impl/corba/NVListImpl.java \
- com/sun/corba/se/impl/corba/NamedValueImpl.java \
- com/sun/corba/se/impl/corba/PrincipalImpl.java \
- com/sun/corba/se/impl/corba/RequestImpl.java \
- com/sun/corba/se/impl/corba/ServerRequestImpl.java \
- com/sun/corba/se/impl/corba/TCUtility.java \
- com/sun/corba/se/impl/corba/TypeCodeFactory.java \
- com/sun/corba/se/impl/corba/TypeCodeImpl.java \
- com/sun/corba/se/impl/corba/TypeCodeImplHelper.java
-
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_core.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_core.jmk
deleted file mode 100644
index af687c3..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_core.jmk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_impl_core_java = \
- org/omg/stub/java/rmi/_Remote_Stub.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk
deleted file mode 100644
index 7e0b2a6..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for DynamicAny implementation
-#
-
-com_sun_corba_se_impl_dynamicany_java = \
- com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java \
- com/sun/corba/se/impl/dynamicany/DynAnyCollectionImpl.java \
- com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java \
- com/sun/corba/se/impl/dynamicany/DynAnyConstructedImpl.java \
- com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java \
- com/sun/corba/se/impl/dynamicany/DynAnyImpl.java \
- com/sun/corba/se/impl/dynamicany/DynAnyUtil.java \
- com/sun/corba/se/impl/dynamicany/DynArrayImpl.java \
- com/sun/corba/se/impl/dynamicany/DynEnumImpl.java \
- com/sun/corba/se/impl/dynamicany/DynFixedImpl.java \
- com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java \
- com/sun/corba/se/impl/dynamicany/DynStructImpl.java \
- com/sun/corba/se/impl/dynamicany/DynUnionImpl.java \
- com/sun/corba/se/impl/dynamicany/DynValueImpl.java \
- com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java \
- com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk
deleted file mode 100644
index 131d1ad..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_impl_encoding_java = \
- com/sun/corba/se/impl/encoding/BufferManagerFactory.java \
- com/sun/corba/se/impl/encoding/BufferQueue.java \
- com/sun/corba/se/impl/encoding/BufferManagerReadStream.java \
- com/sun/corba/se/impl/encoding/BufferManagerWrite.java \
- com/sun/corba/se/impl/encoding/BufferManagerRead.java \
- com/sun/corba/se/impl/encoding/BufferManagerReadGrow.java \
- com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java \
- com/sun/corba/se/impl/encoding/BufferManagerWriteCollect.java \
- com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java \
- com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java \
- com/sun/corba/se/impl/encoding/CDRInputObject.java \
- com/sun/corba/se/impl/encoding/CDRInputStream.java \
- com/sun/corba/se/impl/encoding/CDRInputStreamBase.java \
- com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java \
- com/sun/corba/se/impl/encoding/CDRInputStream_1_1.java \
- com/sun/corba/se/impl/encoding/CDRInputStream_1_2.java \
- com/sun/corba/se/impl/encoding/CDROutputObject.java \
- com/sun/corba/se/impl/encoding/CDROutputStream.java \
- com/sun/corba/se/impl/encoding/CDROutputStreamBase.java \
- com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java \
- com/sun/corba/se/impl/encoding/CDROutputStream_1_1.java \
- com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java \
- com/sun/corba/se/impl/encoding/CachedCodeBase.java \
- com/sun/corba/se/impl/encoding/CodeSetCache.java \
- com/sun/corba/se/impl/encoding/CodeSetConversion.java \
- com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java \
- com/sun/corba/se/impl/encoding/EncapsInputStream.java \
- com/sun/corba/se/impl/encoding/EncapsOutputStream.java \
- com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \
- com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java \
- com/sun/corba/se/impl/encoding/MarkAndResetHandler.java \
- com/sun/corba/se/impl/encoding/MarshalInputStream.java \
- com/sun/corba/se/impl/encoding/MarshalOutputStream.java \
- com/sun/corba/se/impl/encoding/OSFCodeSetRegistry.java \
- com/sun/corba/se/impl/encoding/RestorableInputStream.java \
- com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \
- com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \
- com/sun/corba/se/impl/encoding/TypeCodeReader.java \
- com/sun/corba/se/impl/encoding/WrapperInputStream.java
-
-
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_interceptors.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_interceptors.jmk
deleted file mode 100644
index 70f700c..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_interceptors.jmk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Portable Interceptors Files
-#
-# com/sun/corba/se/impl/interceptors/PIORB.java \
-
-com_sun_corba_se_impl_interceptors_java = \
- com/sun/corba/se/impl/interceptors/CDREncapsCodec.java \
- com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java \
- com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java \
- com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java \
- com/sun/corba/se/impl/interceptors/InterceptorInvoker.java \
- com/sun/corba/se/impl/interceptors/InterceptorList.java \
- com/sun/corba/se/impl/interceptors/IORInfoImpl.java \
- com/sun/corba/se/impl/interceptors/PICurrent.java \
- com/sun/corba/se/impl/interceptors/RequestInfoImpl.java \
- com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java \
- com/sun/corba/se/impl/interceptors/SlotTable.java \
- com/sun/corba/se/impl/interceptors/SlotTableStack.java \
- com/sun/corba/se/impl/interceptors/PIHandlerImpl.java \
- com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java
-
-
-
-FILES_java = $(com_sun_corba_se_impl_interceptors_java)
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_io.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_io.jmk
deleted file mode 100644
index b8de62d..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_io.jmk
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-#d11638 moved FVDCodeBaseDelegate to com.sun.rmi.iiop
-com_sun_corba_se_impl_io_java = \
- com/sun/corba/se/impl/io/FVDCodeBaseImpl.java \
- com/sun/corba/se/impl/io/ValueUtility.java \
- com/sun/corba/se/impl/io/ObjectStreamClass.java \
- com/sun/corba/se/impl/io/ObjectStreamClassCorbaExt.java \
- com/sun/corba/se/impl/io/ObjectStreamField.java \
- com/sun/corba/se/impl/io/OptionalDataException.java \
- com/sun/corba/se/impl/io/ValueHandlerImpl.java \
- com/sun/corba/se/impl/io/IIOPInputStream.java \
- com/sun/corba/se/impl/io/IIOPOutputStream.java \
- com/sun/corba/se/impl/io/TypeMismatchException.java \
- com/sun/corba/se/impl/io/InputStreamHook.java \
- com/sun/corba/se/impl/io/OutputStreamHook.java
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk
deleted file mode 100644
index 57e79bd..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_impl_ior_java = \
- com/sun/corba/se/impl/ior/ByteBuffer.java \
- com/sun/corba/se/impl/ior/EncapsulationUtility.java \
- com/sun/corba/se/impl/ior/FreezableList.java \
- com/sun/corba/se/impl/ior/GenericIdentifiable.java \
- com/sun/corba/se/impl/ior/GenericTaggedComponent.java \
- com/sun/corba/se/impl/ior/GenericTaggedProfile.java \
- com/sun/corba/se/impl/ior/IORImpl.java \
- com/sun/corba/se/impl/ior/IORTemplateImpl.java \
- com/sun/corba/se/impl/ior/IORTemplateListImpl.java \
- com/sun/corba/se/impl/ior/IdentifiableFactoryFinderBase.java \
- com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java \
- com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java \
- com/sun/corba/se/impl/ior/ObjectAdapterIdArray.java \
- com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java \
- com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java \
- com/sun/corba/se/impl/ior/ObjectIdImpl.java \
- com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java \
- com/sun/corba/se/impl/ior/ObjectKeyImpl.java \
- com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java \
- com/sun/corba/se/impl/ior/ObjectReferenceProducerBase.java \
- com/sun/corba/se/impl/ior/ObjectReferenceTemplateImpl.java \
- com/sun/corba/se/impl/ior/ObjectReferenceFactoryImpl.java \
- com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java \
- com/sun/corba/se/impl/ior/OldObjectKeyTemplateBase.java \
- com/sun/corba/se/impl/ior/OldPOAObjectKeyTemplate.java \
- com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java \
- com/sun/corba/se/impl/ior/StubIORImpl.java \
- com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java \
- com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java \
- com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java \
- com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java \
- com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java \
- com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java \
- com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java \
- com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java \
- com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java \
- com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java \
- com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java \
- com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java \
- com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \
- com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \
- com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \
- com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_legacy.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_legacy.jmk
deleted file mode 100644
index baee35a..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_legacy.jmk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_impl_legacy_java = \
- com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java \
- com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java \
- com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java \
- com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java \
- com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java \
- com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java \
- com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java \
- com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java \
- com/sun/corba/se/impl/legacy/connection/USLPort.java
-
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_logging.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_logging.jmk
deleted file mode 100644
index fe6a76b..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_logging.jmk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for logging implementation
-#
-
-# The following files are generated from the .mc files that describe system exceptions:
-com_sun_corba_se_impl_logging_java = \
- com/sun/corba/se/impl/logging/ActivationSystemException.java \
- com/sun/corba/se/impl/logging/IORSystemException.java \
- com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
- com/sun/corba/se/impl/logging/NamingSystemException.java \
- com/sun/corba/se/impl/logging/OMGSystemException.java \
- com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
- com/sun/corba/se/impl/logging/POASystemException.java \
- com/sun/corba/se/impl/logging/UtilSystemException.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_monitoring.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_monitoring.jmk
deleted file mode 100644
index 205f1ae..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_monitoring.jmk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_java = \
- com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java \
- com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java \
- com/sun/corba/se/impl/monitoring/MonitoredObjectFactoryImpl.java \
- com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java \
- com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java \
- com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_cosnaming.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_cosnaming.jmk
deleted file mode 100644
index decc56f..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_cosnaming.jmk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-
-com_sun_corba_se_impl_naming_cosnaming_java = \
- com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java \
- com/sun/corba/se/impl/naming/cosnaming/InterOperableNamingImpl.java \
- com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey.java \
- com/sun/corba/se/impl/naming/cosnaming/InternalBindingValue.java \
- com/sun/corba/se/impl/naming/cosnaming/NamingContextDataStore.java \
- com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java \
- com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java \
- com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java \
- com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java \
- com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java \
- com/sun/corba/se/impl/naming/cosnaming/TransientNamingContext.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_namingutil.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_namingutil.jmk
deleted file mode 100644
index 3e58bec..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_namingutil.jmk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_impl_naming_namingutil_java = \
- com/sun/corba/se/impl/naming/namingutil/INSURL.java \
- com/sun/corba/se/impl/naming/namingutil/INSURLBase.java \
- com/sun/corba/se/impl/naming/namingutil/CorbalocURL.java \
- com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java \
- com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java \
- com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java \
- com/sun/corba/se/impl/naming/namingutil/NamingConstants.java \
- com/sun/corba/se/impl/naming/namingutil/Utility.java
-
-FILES_java = $(com_sun_corba_se_impl_naming_namingutil_java)
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_pcosnaming.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_pcosnaming.jmk
deleted file mode 100644
index 150a283..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_pcosnaming.jmk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for Persistent CosNaming
-#
-
-com_sun_corba_se_impl_naming_pcosnaming_java = \
- com/sun/corba/se/impl/naming/pcosnaming/NameServer.java \
- com/sun/corba/se/impl/naming/pcosnaming/NameService.java \
- com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java \
- com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java \
- com/sun/corba/se/impl/naming/pcosnaming/InternalBindingKey.java \
- com/sun/corba/se/impl/naming/pcosnaming/InternalBindingValue.java \
- com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java
-
-FILES_java = $(com_sun_corba_se_impl_naming_pcosnaming_java)
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_oa_poa.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_oa_poa.jmk
deleted file mode 100644
index 7b9e97c..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_oa_poa.jmk
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for POA implementation
-#
-
-com_sun_corba_se_impl_oa_poa_java = \
- com/sun/corba/se/impl/oa/NullServantImpl.java \
- com/sun/corba/se/impl/oa/poa/AOMEntry.java \
- com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java \
- com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java \
- com/sun/corba/se/impl/oa/poa/DelegateImpl.java \
- com/sun/corba/se/impl/oa/poa/IdAssignmentPolicyImpl.java \
- com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java \
- com/sun/corba/se/impl/oa/poa/ImplicitActivationPolicyImpl.java \
- com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java \
- com/sun/corba/se/impl/oa/poa/POACurrent.java \
- com/sun/corba/se/impl/oa/poa/POAFactory.java \
- com/sun/corba/se/impl/oa/poa/POAImpl.java \
- com/sun/corba/se/impl/oa/poa/POAManagerImpl.java \
- com/sun/corba/se/impl/oa/poa/POAPolicyMediator.java \
- com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase.java \
- com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java \
- com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java \
- com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java \
- com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java \
- com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java \
- com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java \
- com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java \
- com/sun/corba/se/impl/oa/poa/Policies.java \
- com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java \
- com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.java \
- com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java
-
-FILES_java = $(com_sun_corba_se_impl_oa_poa_java)
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_oa_toa.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_oa_toa.jmk
deleted file mode 100644
index cd27eac..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_oa_toa.jmk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for TOA implementation
-#
-
-com_sun_corba_se_impl_oa_toa_java = \
- com/sun/corba/se/impl/oa/toa/TOA.java \
- com/sun/corba/se/impl/oa/toa/TOAImpl.java \
- com/sun/corba/se/impl/oa/toa/TOAFactory.java \
- com/sun/corba/se/impl/oa/toa/TransientObjectManager.java
-
-FILES_java = $(com_sun_corba_se_impl_oa_toa_java)
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orb.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orb.jmk
deleted file mode 100644
index 30d4f94..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orb.jmk
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_impl_orb_java = \
- com/sun/corba/se/impl/orb/AppletDataCollector.java \
- com/sun/corba/se/impl/orb/DataCollectorBase.java \
- com/sun/corba/se/impl/orb/DataCollectorFactory.java \
- com/sun/corba/se/impl/orb/NormalDataCollector.java \
- com/sun/corba/se/impl/orb/NormalParserAction.java \
- com/sun/corba/se/impl/orb/NormalParserData.java \
- com/sun/corba/se/impl/orb/ORBConfiguratorImpl.java \
- com/sun/corba/se/impl/orb/ORBDataParserImpl.java \
- com/sun/corba/se/impl/orb/ORBImpl.java \
- com/sun/corba/se/impl/orb/ORBSingleton.java \
- com/sun/corba/se/impl/orb/ORBVersionImpl.java \
- com/sun/corba/se/impl/orb/ParserAction.java \
- com/sun/corba/se/impl/orb/ParserActionBase.java \
- com/sun/corba/se/impl/orb/ParserActionFactory.java \
- com/sun/corba/se/impl/orb/ParserDataBase.java \
- com/sun/corba/se/impl/orb/ParserTable.java \
- com/sun/corba/se/impl/orb/PrefixParserAction.java \
- com/sun/corba/se/impl/orb/PrefixParserData.java \
- com/sun/corba/se/impl/orb/PropertyOnlyDataCollector.java
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk
deleted file mode 100644
index d007b4e..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_impl_orbutil_java = \
- com/sun/corba/se/impl/orbutil/CacheTable.java \
- com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java \
- com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java \
- com/sun/corba/se/impl/orbutil/GetPropertyAction.java \
- com/sun/corba/se/impl/orbutil/HexOutputStream.java \
- com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java \
- com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java \
- com/sun/corba/se/impl/orbutil/LogKeywords.java \
- com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java \
- com/sun/corba/se/impl/orbutil/ObjectStreamField.java \
- com/sun/corba/se/impl/orbutil/ObjectWriter.java \
- com/sun/corba/se/impl/orbutil/ObjectUtility.java \
- com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java \
- com/sun/corba/se/impl/orbutil/ORBConstants.java \
- com/sun/corba/se/impl/orbutil/ORBUtility.java \
- com/sun/corba/se/impl/orbutil/RepIdDelegator.java \
- com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \
- com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \
- com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java \
- com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java \
- com/sun/corba/se/impl/orbutil/StackImpl.java \
- com/sun/corba/se/impl/orbutil/closure/Future.java \
- com/sun/corba/se/impl/orbutil/closure/Constant.java \
- com/sun/corba/se/impl/orbutil/concurrent/Sync.java \
- com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java \
- com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java \
- com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java \
- com/sun/corba/se/impl/orbutil/concurrent/Mutex.java \
- com/sun/corba/se/impl/orbutil/concurrent/CondVar.java \
- com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java \
- com/sun/corba/se/impl/orbutil/fsm/NameBase.java \
- com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java \
- com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java \
- com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolManagerImpl.java \
- com/sun/corba/se/impl/orbutil/threadpool/TimeoutException.java \
- com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java \
- com/sun/corba/se/impl/copyobject/CopierManagerImpl.java \
- com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java \
- com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java \
- com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java \
- com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java \
- com/sun/corba/se/impl/orbutil/graph/Node.java \
- com/sun/corba/se/impl/orbutil/graph/NodeData.java \
- com/sun/corba/se/impl/orbutil/graph/Graph.java \
- com/sun/corba/se/impl/orbutil/graph/GraphImpl.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_presentation_rmi.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_presentation_rmi.jmk
deleted file mode 100644
index 491e41c..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_presentation_rmi.jmk
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_impl_presentation_rmi_java = \
- com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java \
- com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java \
- com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java \
- com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.java \
- com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java \
- com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java \
- com/sun/corba/se/impl/presentation/rmi/IDLType.java \
- com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java \
- com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil.java \
- com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java \
- com/sun/corba/se/impl/presentation/rmi/PresentationManagerImpl.java \
- com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java \
- com/sun/corba/se/impl/presentation/rmi/StubConnectImpl.java \
- com/sun/corba/se/impl/presentation/rmi/StubFactoryBase.java \
- com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java \
- com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryBase.java \
- com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java \
- com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java \
- com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java \
- com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java \
- com/sun/corba/se/impl/presentation/rmi/StubFactoryStaticImpl.java \
- com/sun/corba/se/impl/presentation/rmi/StubInvocationHandlerImpl.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk
deleted file mode 100644
index f0be1d8..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_impl_protocol_java = \
- com/sun/corba/se/impl/protocol/AddressingDispositionException.java \
- com/sun/corba/se/impl/protocol/BootstrapServerRequestDispatcher.java \
- com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java \
- com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java \
- com/sun/corba/se/impl/protocol/CorbaInvocationInfo.java \
- com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java \
- com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java \
- com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java \
- com/sun/corba/se/impl/protocol/INSServerRequestDispatcher.java \
- com/sun/corba/se/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java \
- com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java \
- com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java \
- com/sun/corba/se/impl/protocol/MinimalServantCacheLocalCRDImpl.java \
- com/sun/corba/se/impl/protocol/NotLocalLocalCRDImpl.java \
- com/sun/corba/se/impl/protocol/POALocalCRDImpl.java \
- com/sun/corba/se/impl/protocol/RequestCanceledException.java \
- com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java \
- com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java \
- com/sun/corba/se/impl/protocol/SpecialMethod.java \
- com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/AddressingDispositionHelper.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfo.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/KeyAddr.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_0.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_1.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_2.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/ProfileAddr.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/ReferenceAddr.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_resolver.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_resolver.jmk
deleted file mode 100644
index c6f3418..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_resolver.jmk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_impl_resolver_java = \
- com/sun/corba/se/impl/resolver/BootstrapResolverImpl.java \
- com/sun/corba/se/impl/resolver/CompositeResolverImpl.java \
- com/sun/corba/se/impl/resolver/INSURLOperationImpl.java \
- com/sun/corba/se/impl/resolver/LocalResolverImpl.java \
- com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java \
- com/sun/corba/se/impl/resolver/ORBInitRefResolverImpl.java \
- com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java \
- com/sun/corba/se/impl/resolver/FileResolverImpl.java
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_transport.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_transport.jmk
deleted file mode 100644
index 9047d2c..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_transport.jmk
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_impl_transport_java = \
- com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java \
- com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java \
- com/sun/corba/se/impl/transport/CorbaContactInfoBase.java \
- com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java \
- com/sun/corba/se/impl/transport/CorbaContactInfoListIteratorImpl.java \
- com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java \
- com/sun/corba/se/impl/transport/CorbaOutboundConnectionCacheImpl.java \
- com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java \
- com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java \
- com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java \
- com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java \
- com/sun/corba/se/impl/transport/EventHandlerBase.java \
- com/sun/corba/se/impl/transport/ListenerThreadImpl.java \
- com/sun/corba/se/impl/transport/ReaderThreadImpl.java \
- com/sun/corba/se/impl/transport/ReadTCPTimeoutsImpl.java \
- com/sun/corba/se/impl/transport/SelectorImpl.java \
- com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java \
- com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java \
- com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java \
- com/sun/corba/se/impl/transport/SocketOrChannelContactInfoImpl.java \
- com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java \
- com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java \
- com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java \
- com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java \
- com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java \
- com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java \
- com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java \
- com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java \
- com/sun/corba/se/impl/legacy/connection/USLPort.java
-
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_util.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_util.jmk
deleted file mode 100644
index 1bd9700..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_util.jmk
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-com_sun_corba_se_impl_util_java = \
- com/sun/corba/se/impl/util/IdentityHashtable.java \
- com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java \
- com/sun/corba/se/impl/util/RepositoryId.java \
- com/sun/corba/se/impl/util/RepositoryIdCache.java \
- com/sun/corba/se/impl/util/SUNVMCID.java \
- com/sun/corba/se/impl/util/Utility.java \
- com/sun/corba/se/impl/util/Version.java \
- com/sun/corba/se/impl/util/ORBProperties.java \
- com/sun/corba/se/impl/util/JDKBridge.java \
- com/sun/corba/se/impl/util/PackagePrefixChecker.java \
- com/sun/corba/se/impl/util/JDKClassLoader.java \
- com/sun/corba/se/impl/javax/rmi/PortableRemoteObject.java\
- com/sun/corba/se/impl/javax/rmi/CORBA/Util.java \
- com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_internal_LegacyFiles.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_internal_LegacyFiles.jmk
deleted file mode 100644
index f2ce791..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_internal_LegacyFiles.jmk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_internal_LegacyFiles_java = \
- com/sun/corba/se/internal/CosNaming/BootstrapServer.java \
- com/sun/corba/se/internal/Interceptors/PIORB.java \
- com/sun/corba/se/internal/POA/POAORB.java \
- com/sun/corba/se/internal/corba/ORBSingleton.java \
- com/sun/corba/se/internal/iiop/ORB.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_pept.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_pept.jmk
deleted file mode 100644
index 02a7e4e..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_pept.jmk
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for the PEPt architecture (Presentation, Encoding, Protocol, transport)
-#
-com_sun_corba_se_pept_java = \
- $(com_sun_corba_se_pept_broker_java) \
- $(com_sun_corba_se_pept_encoding_java) \
- $(com_sun_corba_se_pept_protocol_java) \
- $(com_sun_corba_se_pept_transport_java)
-
-com_sun_corba_se_pept_broker_java = \
- com/sun/corba/se/pept/broker/Broker.java
-
-com_sun_corba_se_pept_encoding_java = \
- com/sun/corba/se/pept/encoding/InputObject.java \
- com/sun/corba/se/pept/encoding/OutputObject.java
-
-com_sun_corba_se_pept_protocol_java = \
- com/sun/corba/se/pept/protocol/ClientDelegate.java \
- com/sun/corba/se/pept/protocol/ClientInvocationInfo.java \
- com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java \
- com/sun/corba/se/pept/protocol/MessageMediator.java \
- com/sun/corba/se/pept/protocol/ProtocolHandler.java \
- com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java
-
-com_sun_corba_se_pept_transport_java = \
- com/sun/corba/se/pept/transport/Acceptor.java \
- com/sun/corba/se/pept/transport/ByteBufferPool.java \
- com/sun/corba/se/pept/transport/Connection.java \
- com/sun/corba/se/pept/transport/ConnectionCache.java \
- com/sun/corba/se/pept/transport/ContactInfo.java \
- com/sun/corba/se/pept/transport/ContactInfoList.java \
- com/sun/corba/se/pept/transport/ContactInfoListIterator.java \
- com/sun/corba/se/pept/transport/EventHandler.java \
- com/sun/corba/se/pept/transport/InboundConnectionCache.java \
- com/sun/corba/se/pept/transport/ListenerThread.java \
- com/sun/corba/se/pept/transport/OutboundConnectionCache.java \
- com/sun/corba/se/pept/transport/ReaderThread.java \
- com/sun/corba/se/pept/transport/ResponseWaitingRoom.java \
- com/sun/corba/se/pept/transport/Selector.java \
- com/sun/corba/se/pept/transport/TransportManager.java
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_activation.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_activation.jmk
deleted file mode 100644
index 83d7878..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_activation.jmk
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Server Activation IDL Generated Files
-#
-
-com_sun_corba_se_spi_activation_java = \
- com/sun/corba/se/spi/activation/IIOP_CLEAR_TEXT.java \
- com/sun/corba/se/spi/activation/ORBidHelper.java \
- com/sun/corba/se/spi/activation/ServerIdHelper.java \
- com/sun/corba/se/spi/activation/POANameHolder.java \
- com/sun/corba/se/spi/activation/POANameHelper.java \
- com/sun/corba/se/spi/activation/NoSuchEndPointHelper.java \
- com/sun/corba/se/spi/activation/NoSuchEndPointHolder.java \
- com/sun/corba/se/spi/activation/NoSuchEndPoint.java \
- com/sun/corba/se/spi/activation/InvalidORBidHelper.java \
- com/sun/corba/se/spi/activation/InvalidORBidHolder.java \
- com/sun/corba/se/spi/activation/InvalidORBid.java \
- com/sun/corba/se/spi/activation/ServerNotRegisteredHelper.java \
- com/sun/corba/se/spi/activation/ServerNotRegisteredHolder.java \
- com/sun/corba/se/spi/activation/ServerNotRegistered.java \
- com/sun/corba/se/spi/activation/ServerNotActiveHelper.java \
- com/sun/corba/se/spi/activation/ServerNotActiveHolder.java \
- com/sun/corba/se/spi/activation/ServerNotActive.java \
- com/sun/corba/se/spi/activation/ServerHeldDownHelper.java \
- com/sun/corba/se/spi/activation/ServerHeldDownHolder.java \
- com/sun/corba/se/spi/activation/ServerHeldDown.java \
- com/sun/corba/se/spi/activation/ServerAlreadyActiveHelper.java \
- com/sun/corba/se/spi/activation/ServerAlreadyActiveHolder.java \
- com/sun/corba/se/spi/activation/ServerAlreadyActive.java \
- com/sun/corba/se/spi/activation/ServerAlreadyRegisteredHelper.java \
- com/sun/corba/se/spi/activation/ServerAlreadyRegisteredHolder.java \
- com/sun/corba/se/spi/activation/ServerAlreadyRegistered.java \
- com/sun/corba/se/spi/activation/ServerAlreadyInstalledHelper.java \
- com/sun/corba/se/spi/activation/ServerAlreadyInstalledHolder.java \
- com/sun/corba/se/spi/activation/ServerAlreadyInstalled.java \
- com/sun/corba/se/spi/activation/ServerAlreadyUninstalledHelper.java \
- com/sun/corba/se/spi/activation/ServerAlreadyUninstalledHolder.java \
- com/sun/corba/se/spi/activation/ServerAlreadyUninstalled.java \
- com/sun/corba/se/spi/activation/BadServerDefinitionHelper.java \
- com/sun/corba/se/spi/activation/BadServerDefinitionHolder.java \
- com/sun/corba/se/spi/activation/BadServerDefinition.java \
- com/sun/corba/se/spi/activation/ORBAlreadyRegisteredHelper.java \
- com/sun/corba/se/spi/activation/ORBAlreadyRegisteredHolder.java \
- com/sun/corba/se/spi/activation/ORBAlreadyRegistered.java \
- com/sun/corba/se/spi/activation/TCPPortHelper.java \
- com/sun/corba/se/spi/activation/ServerIdsHolder.java \
- com/sun/corba/se/spi/activation/ServerIdsHelper.java \
- com/sun/corba/se/spi/activation/Server.java \
- com/sun/corba/se/spi/activation/EndPointInfoHelper.java \
- com/sun/corba/se/spi/activation/EndPointInfoHolder.java \
- com/sun/corba/se/spi/activation/EndPointInfo.java \
- com/sun/corba/se/spi/activation/EndpointInfoListHolder.java \
- com/sun/corba/se/spi/activation/EndpointInfoListHelper.java \
- com/sun/corba/se/spi/activation/ORBPortInfoHelper.java \
- com/sun/corba/se/spi/activation/ORBPortInfoHolder.java \
- com/sun/corba/se/spi/activation/ORBPortInfo.java \
- com/sun/corba/se/spi/activation/ORBPortInfoListHolder.java \
- com/sun/corba/se/spi/activation/ORBPortInfoListHelper.java \
- com/sun/corba/se/spi/activation/ORBidListHolder.java \
- com/sun/corba/se/spi/activation/ORBidListHelper.java \
- com/sun/corba/se/spi/activation/_ServerImplBase.java \
- com/sun/corba/se/spi/activation/_ServerStub.java \
- com/sun/corba/se/spi/activation/ServerHolder.java \
- com/sun/corba/se/spi/activation/ServerHelper.java \
- com/sun/corba/se/spi/activation/ServerOperations.java \
- com/sun/corba/se/spi/activation/_ActivatorImplBase.java \
- com/sun/corba/se/spi/activation/_ActivatorStub.java \
- com/sun/corba/se/spi/activation/ActivatorHolder.java \
- com/sun/corba/se/spi/activation/ActivatorHelper.java \
- com/sun/corba/se/spi/activation/Activator.java \
- com/sun/corba/se/spi/activation/ActivatorOperations.java \
- com/sun/corba/se/spi/activation/_LocatorImplBase.java \
- com/sun/corba/se/spi/activation/_LocatorStub.java \
- com/sun/corba/se/spi/activation/LocatorHolder.java \
- com/sun/corba/se/spi/activation/LocatorHelper.java \
- com/sun/corba/se/spi/activation/Locator.java \
- com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHelper.java \
- com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHolder.java \
- com/sun/corba/se/spi/activation/LocatorPackage/ServerLocation.java \
- com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHelper.java \
- com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHolder.java \
- com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORB.java \
- com/sun/corba/se/spi/activation/LocatorOperations.java \
- com/sun/corba/se/spi/activation/_ServerManagerImplBase.java \
- com/sun/corba/se/spi/activation/_ServerManagerStub.java \
- com/sun/corba/se/spi/activation/ServerManager.java \
- com/sun/corba/se/spi/activation/ServerManagerHolder.java \
- com/sun/corba/se/spi/activation/ServerManagerHelper.java \
- com/sun/corba/se/spi/activation/ServerManagerOperations.java \
- com/sun/corba/se/spi/activation/_InitialNameServiceImplBase.java \
- com/sun/corba/se/spi/activation/_InitialNameServiceStub.java \
- com/sun/corba/se/spi/activation/InitialNameServiceHolder.java \
- com/sun/corba/se/spi/activation/InitialNameServiceHelper.java \
- com/sun/corba/se/spi/activation/InitialNameService.java \
- com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHelper.java \
- com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHolder.java \
- com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBound.java \
- com/sun/corba/se/spi/activation/InitialNameServiceOperations.java \
- com/sun/corba/se/spi/activation/_RepositoryImplBase.java \
- com/sun/corba/se/spi/activation/_RepositoryStub.java \
- com/sun/corba/se/spi/activation/RepositoryHolder.java \
- com/sun/corba/se/spi/activation/Repository.java \
- com/sun/corba/se/spi/activation/RepositoryHelper.java \
- com/sun/corba/se/spi/activation/RepositoryPackage/ServerDefHelper.java \
- com/sun/corba/se/spi/activation/RepositoryPackage/ServerDefHolder.java \
- com/sun/corba/se/spi/activation/RepositoryPackage/ServerDef.java \
- com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHolder.java \
- com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHelper.java \
- com/sun/corba/se/spi/activation/RepositoryOperations.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_copyobject.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_copyobject.jmk
deleted file mode 100644
index 019f77d..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_copyobject.jmk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for copyobject
-#
-
-com_sun_corba_se_spi_copyobject_java = \
- com/sun/corba/se/spi/copyobject/CopierManager.java \
- com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java \
- com/sun/corba/se/spi/copyobject/ObjectCopier.java \
- com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java \
- com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java
-
-FILES_java = $(com_sun_corba_se_spi_copyobject_java)
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_encoding.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_encoding.jmk
deleted file mode 100644
index 06bcc92..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_encoding.jmk
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_spi_encoding= \
- com/sun/corba/se/spi/encoding/CorbaInputObject.java \
- com/sun/corba/se/spi/encoding/CorbaOutputObject.java
-
-FILES_java = $(com_sun_corba_se_spi_encoding)
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_extension.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_extension.jmk
deleted file mode 100644
index 50493f9..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_extension.jmk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for extension
-#
-
-com_sun_corba_se_spi_extension_java = \
- com/sun/corba/se/spi/extension/ServantCachingPolicy.java \
- com/sun/corba/se/spi/extension/ZeroPortPolicy.java \
- com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java \
- com/sun/corba/se/spi/extension/CopyObjectPolicy.java
-
-FILES_java = $(com_sun_corba_se_spi_extension_java)
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_ior.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_ior.jmk
deleted file mode 100644
index 9c9d528..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_ior.jmk
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_spi_ior_java = \
- com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java \
- com/sun/corba/se/spi/ior/IOR.java \
- com/sun/corba/se/spi/ior/IORFactory.java \
- com/sun/corba/se/spi/ior/IORFactories.java \
- com/sun/corba/se/spi/ior/IORTemplate.java \
- com/sun/corba/se/spi/ior/IORTemplateList.java \
- com/sun/corba/se/spi/ior/Identifiable.java \
- com/sun/corba/se/spi/ior/IdentifiableBase.java \
- com/sun/corba/se/spi/ior/IdentifiableContainerBase.java \
- com/sun/corba/se/spi/ior/IdentifiableFactory.java \
- com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java \
- com/sun/corba/se/spi/ior/MakeImmutable.java \
- com/sun/corba/se/spi/ior/ObjectAdapterId.java \
- com/sun/corba/se/spi/ior/ObjectId.java \
- com/sun/corba/se/spi/ior/ObjectKey.java \
- com/sun/corba/se/spi/ior/ObjectKeyFactory.java \
- com/sun/corba/se/spi/ior/ObjectKeyTemplate.java \
- com/sun/corba/se/spi/ior/TaggedComponent.java \
- com/sun/corba/se/spi/ior/TaggedComponentBase.java \
- com/sun/corba/se/spi/ior/TaggedComponentFactoryFinder.java \
- com/sun/corba/se/spi/ior/TaggedProfile.java \
- com/sun/corba/se/spi/ior/TaggedProfileTemplate.java \
- com/sun/corba/se/spi/ior/TaggedProfileTemplateBase.java \
- com/sun/corba/se/spi/ior/WriteContents.java \
- com/sun/corba/se/spi/ior/Writeable.java \
- com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java \
- com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java \
- com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java \
- com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java \
- com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java \
- com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java \
- com/sun/corba/se/spi/ior/iiop/GIOPVersion.java \
- com/sun/corba/se/spi/ior/iiop/IIOPAddress.java \
- com/sun/corba/se/spi/ior/iiop/IIOPFactories.java \
- com/sun/corba/se/spi/ior/iiop/IIOPProfile.java \
- com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_connection.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_connection.jmk
deleted file mode 100644
index 107c257..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_connection.jmk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for connection
-#
-
-com_sun_corba_se_spi_legacy_connection_java = \
- com/sun/corba/se/spi/legacy/connection/Connection.java \
- com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java \
- com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java \
- com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java \
- com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java
-
-FILES_java = $(com_sun_corba_se_spi_legacy_connection_java)
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk
deleted file mode 100644
index 69d74ae..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for interceptor
-#
-
-com_sun_corba_se_spi_legacy_interceptor_java = \
- com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java \
- com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java \
- com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java \
- com/sun/corba/se/spi/legacy/interceptor/UnknownType.java
-
-FILES_java = $(com_sun_corba_se_spi_legacy_interceptor_java)
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_logging.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_logging.jmk
deleted file mode 100644
index 9c9946b..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_logging.jmk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for logging
-#
-
-com_sun_corba_se_spi_logging_java = \
- com/sun/corba/se/spi/logging/LogWrapperFactory.java \
- com/sun/corba/se/spi/logging/LogWrapperBase.java \
- com/sun/corba/se/spi/logging/CORBALogDomains.java
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk
deleted file mode 100644
index 5c21758..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_java = \
- com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java \
- com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java \
- com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java \
- com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \
- com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \
- com/sun/corba/se/spi/monitoring/MonitoringFactories.java \
- com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \
- com/sun/corba/se/spi/monitoring/MonitoredObject.java \
- com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \
- com/sun/corba/se/spi/monitoring/MonitoredAttribute.java \
- com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java \
- com/sun/corba/se/spi/monitoring/MonitoringConstants.java \
- com/sun/corba/se/spi/monitoring/MonitoringManager.java \
- com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_oa.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_oa.jmk
deleted file mode 100644
index a63dc87..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_oa.jmk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_spi_oa_java = \
- com/sun/corba/se/spi/oa/NullServant.java \
- com/sun/corba/se/spi/oa/OADefault.java \
- com/sun/corba/se/spi/oa/OADestroyed.java \
- com/sun/corba/se/spi/oa/OAInvocationInfo.java \
- com/sun/corba/se/spi/oa/ObjectAdapter.java \
- com/sun/corba/se/spi/oa/ObjectAdapterFactory.java \
- com/sun/corba/se/spi/oa/ObjectAdapterBase.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_orb.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_orb.jmk
deleted file mode 100644
index 16e5cd8..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_orb.jmk
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_spi_orb_java = \
- com/sun/corba/se/spi/orb/DataCollector.java \
- com/sun/corba/se/spi/orb/ORBConfigurator.java \
- com/sun/corba/se/spi/orb/ORBData.java \
- com/sun/corba/se/spi/orb/Operation.java \
- com/sun/corba/se/spi/orb/ORB.java \
- com/sun/corba/se/spi/orb/ORBVersion.java \
- com/sun/corba/se/spi/orb/ORBVersionFactory.java \
- com/sun/corba/se/spi/orb/OperationFactory.java \
- com/sun/corba/se/spi/orb/ParserData.java \
- com/sun/corba/se/spi/orb/ParserDataFactory.java \
- com/sun/corba/se/spi/orb/ParserImplBase.java \
- com/sun/corba/se/spi/orb/ParserImplTableBase.java \
- com/sun/corba/se/spi/orb/PropertyParser.java \
- com/sun/corba/se/spi/orb/StringPair.java
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_orbutil.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_orbutil.jmk
deleted file mode 100644
index 6aa7c8b..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_orbutil.jmk
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_spi_orbutil_java = \
- com/sun/corba/se/spi/orbutil/fsm/Action.java \
- com/sun/corba/se/spi/orbutil/fsm/ActionBase.java \
- com/sun/corba/se/spi/orbutil/fsm/Guard.java \
- com/sun/corba/se/spi/orbutil/fsm/GuardBase.java \
- com/sun/corba/se/spi/orbutil/fsm/Input.java \
- com/sun/corba/se/spi/orbutil/fsm/InputImpl.java \
- com/sun/corba/se/spi/orbutil/fsm/State.java \
- com/sun/corba/se/spi/orbutil/fsm/StateEngine.java \
- com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java \
- com/sun/corba/se/spi/orbutil/fsm/StateImpl.java \
- com/sun/corba/se/spi/orbutil/fsm/FSM.java \
- com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java \
- com/sun/corba/se/spi/orbutil/fsm/FSMTest.java \
- com/sun/corba/se/spi/orbutil/closure/Closure.java \
- com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java \
- com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java \
- com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java \
- com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java \
- com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java \
- com/sun/corba/se/spi/orbutil/threadpool/Work.java \
- com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java \
- com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java \
- com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java \
- com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java \
- com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java \
- com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java \
- com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk
deleted file mode 100644
index 04a6cce..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_spi_presentation_rmi_java = \
- com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java \
- com/sun/corba/se/spi/presentation/rmi/DynamicStub.java \
- com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \
- com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \
- com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \
- com/sun/corba/se/spi/presentation/rmi/StubAdapter.java
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_protocol.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_protocol.jmk
deleted file mode 100644
index 45409b9..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_protocol.jmk
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_spi_protocol_java = \
- com/sun/corba/se/spi/protocol/ClientDelegateFactory.java \
- com/sun/corba/se/spi/protocol/CorbaClientDelegate.java \
- com/sun/corba/se/spi/protocol/CorbaMessageMediator.java \
- com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java \
- com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java \
- com/sun/corba/se/spi/protocol/ForwardException.java \
- com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java \
- com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java \
- com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java \
- com/sun/corba/se/spi/protocol/PIHandler.java \
- com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java \
- com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_resolver.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_resolver.jmk
deleted file mode 100644
index 46c268b..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_resolver.jmk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_spi_resolver_java = \
- com/sun/corba/se/spi/resolver/Resolver.java \
- com/sun/corba/se/spi/resolver/LocalResolver.java \
- com/sun/corba/se/spi/resolver/ResolverDefault.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_servicecontext.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_servicecontext.jmk
deleted file mode 100644
index 129af0e..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_servicecontext.jmk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_spi_servicecontext_java = \
- com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java \
- com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java \
- com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java \
- com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java \
- com/sun/corba/se/spi/servicecontext/ServiceContext.java \
- com/sun/corba/se/spi/servicecontext/ServiceContextData.java \
- com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java \
- com/sun/corba/se/spi/servicecontext/ServiceContexts.java \
- com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java \
- com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java
-
diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk
deleted file mode 100644
index ecf0e49..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-com_sun_corba_se_spi_transport_java = \
- com/sun/corba/se/spi/transport/CorbaAcceptor.java \
- com/sun/corba/se/spi/transport/CorbaConnection.java \
- com/sun/corba/se/spi/transport/CorbaConnectionCache.java \
- com/sun/corba/se/spi/transport/CorbaContactInfo.java \
- com/sun/corba/se/spi/transport/CorbaContactInfoList.java \
- com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java \
- com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java \
- com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java \
- com/sun/corba/se/spi/transport/CorbaTransportManager.java \
- com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java \
- com/sun/corba/se/spi/transport/IORToSocketInfo.java \
- com/sun/corba/se/spi/transport/IORTransformer.java \
- com/sun/corba/se/spi/transport/ORBSocketFactory.java \
- com/sun/corba/se/spi/transport/ReadTimeouts.java \
- com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java \
- com/sun/corba/se/spi/transport/SocketInfo.java \
- com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java \
- com/sun/corba/se/spi/transport/TransportDefault.java
diff --git a/corba/make/com/sun/corba/minclude/com_sun_tools_corba_se_idl_toJavaPortable.jmk b/corba/make/com/sun/corba/minclude/com_sun_tools_corba_se_idl_toJavaPortable.jmk
deleted file mode 100644
index 1bcace7..0000000
--- a/corba/make/com/sun/corba/minclude/com_sun_tools_corba_se_idl_toJavaPortable.jmk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-COM_SUN_CORBA_SE_INTERNAL_IDL_TOJAVAPORTABLE_java = \
- com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java \
- com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Compile.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Factories.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Helper.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Holder.java \
- com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java \
- com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java \
- com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java \
- com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java \
- com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Stub.java \
- com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java \
- com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Util.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java
diff --git a/corba/make/com/sun/corba/minclude/javax_activity.jmk b/corba/make/com/sun/corba/minclude/javax_activity.jmk
deleted file mode 100644
index 41f8825..0000000
--- a/corba/make/com/sun/corba/minclude/javax_activity.jmk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-javax_activity_java = \
- $(GROUP0)
-
-GROUP0 = \
- javax/activity/InvalidActivityException.java \
- javax/activity/ActivityRequiredException.java \
- javax/activity/ActivityCompletedException.java
-
diff --git a/corba/make/com/sun/corba/minclude/javax_rmi.jmk b/corba/make/com/sun/corba/minclude/javax_rmi.jmk
deleted file mode 100644
index 7655793..0000000
--- a/corba/make/com/sun/corba/minclude/javax_rmi.jmk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-javax_rmi_java = \
- javax/rmi/PortableRemoteObject.java
-
-
diff --git a/corba/make/com/sun/corba/minclude/javax_rmi_CORBA.jmk b/corba/make/com/sun/corba/minclude/javax_rmi_CORBA.jmk
deleted file mode 100644
index 9c8e2e2..0000000
--- a/corba/make/com/sun/corba/minclude/javax_rmi_CORBA.jmk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-javax_rmi_CORBA_java = \
- javax/rmi/CORBA/Stub.java \
- javax/rmi/CORBA/StubDelegate.java \
- javax/rmi/CORBA/Tie.java \
- javax/rmi/CORBA/Util.java \
- javax/rmi/CORBA/UtilDelegate.java \
- javax/rmi/CORBA/ValueHandler.java \
- javax/rmi/CORBA/ValueHandlerMultiFormat.java \
- javax/rmi/CORBA/ClassDesc.java \
- javax/rmi/CORBA/PortableRemoteObjectDelegate.java \
- javax/rmi/CORBA/GetORBPropertiesFileAction.java \
-
diff --git a/corba/make/com/sun/corba/minclude/javax_transaction.jmk b/corba/make/com/sun/corba/minclude/javax_transaction.jmk
deleted file mode 100644
index ebc08da..0000000
--- a/corba/make/com/sun/corba/minclude/javax_transaction.jmk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-javax_transaction_java = \
- $(GROUP0)
-
-GROUP0 = \
- javax/transaction/InvalidTransactionException.java \
- javax/transaction/TransactionRequiredException.java \
- javax/transaction/TransactionRolledbackException.java
-
diff --git a/corba/make/com/sun/corba/minclude/org_omg_CORBA.jmk b/corba/make/com/sun/corba/minclude/org_omg_CORBA.jmk
deleted file mode 100644
index bf9cc81..0000000
--- a/corba/make/com/sun/corba/minclude/org_omg_CORBA.jmk
+++ /dev/null
@@ -1,263 +0,0 @@
-#
-# Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files
-
-org_omg_CORBA_java_1_2 = \
- org/omg/CORBA/ARG_IN.java \
- org/omg/CORBA/ARG_INOUT.java \
- org/omg/CORBA/ARG_OUT.java \
- org/omg/CORBA/Any.java \
- org/omg/CORBA/AnyHolder.java \
- org/omg/CORBA/BAD_CONTEXT.java \
- org/omg/CORBA/BAD_INV_ORDER.java \
- org/omg/CORBA/BAD_OPERATION.java \
- org/omg/CORBA/BAD_PARAM.java \
- org/omg/CORBA/BAD_POLICY.java \
- org/omg/CORBA/BAD_POLICY_TYPE.java \
- org/omg/CORBA/BAD_POLICY_VALUE.java \
- org/omg/CORBA/BAD_TYPECODE.java \
- org/omg/CORBA/BooleanHolder.java \
- org/omg/CORBA/Bounds.java \
- org/omg/CORBA/ByteHolder.java \
- org/omg/CORBA/COMM_FAILURE.java \
- org/omg/CORBA/CTX_RESTRICT_SCOPE.java \
- org/omg/CORBA/CharHolder.java \
- org/omg/CORBA/CompletionStatus.java \
- org/omg/CORBA/Context.java \
- org/omg/CORBA/ContextList.java \
- org/omg/CORBA/Current.java \
- org/omg/CORBA/DATA_CONVERSION.java \
- org/omg/CORBA/DefinitionKind.java \
- org/omg/CORBA/DomainManager.java \
- org/omg/CORBA/DomainManagerOperations.java \
- org/omg/CORBA/DoubleHolder.java \
- org/omg/CORBA/DynAny.java \
- org/omg/CORBA/DynAnyPackage/Invalid.java \
- org/omg/CORBA/DynAnyPackage/InvalidSeq.java \
- org/omg/CORBA/DynAnyPackage/InvalidValue.java \
- org/omg/CORBA/DynAnyPackage/TypeMismatch.java \
- org/omg/CORBA/DynArray.java \
- org/omg/CORBA/DynEnum.java \
- org/omg/CORBA/DynFixed.java \
- org/omg/CORBA/DynSequence.java \
- org/omg/CORBA/DynStruct.java \
- org/omg/CORBA/DynUnion.java \
- org/omg/CORBA/DynValue.java \
- org/omg/CORBA/DynamicImplementation.java \
- org/omg/CORBA/Environment.java \
- org/omg/CORBA/ExceptionList.java \
- org/omg/CORBA/FREE_MEM.java \
- org/omg/CORBA/FixedHolder.java \
- org/omg/CORBA/FloatHolder.java \
- org/omg/CORBA/IDLType.java \
- org/omg/CORBA/IMP_LIMIT.java \
- org/omg/CORBA/INITIALIZE.java \
- org/omg/CORBA/INTERNAL.java \
- org/omg/CORBA/INTF_REPOS.java \
- org/omg/CORBA/INVALID_TRANSACTION.java \
- org/omg/CORBA/INV_FLAG.java \
- org/omg/CORBA/INV_IDENT.java \
- org/omg/CORBA/INV_OBJREF.java \
- org/omg/CORBA/INV_POLICY.java \
- org/omg/CORBA/IRObject.java \
- org/omg/CORBA/IntHolder.java \
- org/omg/CORBA/LongHolder.java \
- org/omg/CORBA/MARSHAL.java \
- org/omg/CORBA/NO_IMPLEMENT.java \
- org/omg/CORBA/NO_MEMORY.java \
- org/omg/CORBA/NO_PERMISSION.java \
- org/omg/CORBA/NO_RESOURCES.java \
- org/omg/CORBA/NO_RESPONSE.java \
- org/omg/CORBA/NVList.java \
- org/omg/CORBA/NameValuePair.java \
- org/omg/CORBA/NamedValue.java \
- org/omg/CORBA/OBJECT_NOT_EXIST.java \
- org/omg/CORBA/OBJ_ADAPTER.java \
- org/omg/CORBA/ORB.java \
- org/omg/CORBA/ORBPackage/InconsistentTypeCode.java \
- org/omg/CORBA/ORBPackage/InvalidName.java \
- org/omg/CORBA/Object.java \
- org/omg/CORBA/ObjectHolder.java \
- org/omg/CORBA/OMGVMCID.java \
- org/omg/CORBA/PERSIST_STORE.java \
- org/omg/CORBA/PRIVATE_MEMBER.java \
- org/omg/CORBA/PUBLIC_MEMBER.java \
- org/omg/CORBA/Policy.java \
- org/omg/CORBA/PolicyError.java \
- org/omg/CORBA/Principal.java \
- org/omg/CORBA/PrincipalHolder.java \
- org/omg/CORBA/Request.java \
- org/omg/CORBA/ServerRequest.java \
- org/omg/CORBA/ServiceDetail.java \
- org/omg/CORBA/ServiceDetailHelper.java \
- org/omg/CORBA/ServiceInformation.java \
- org/omg/CORBA/ServiceInformationHelper.java \
- org/omg/CORBA/ServiceInformationHolder.java \
- org/omg/CORBA/SetOverrideType.java \
- org/omg/CORBA/ShortHolder.java \
- org/omg/CORBA/StringHolder.java \
- org/omg/CORBA/StructMember.java \
- org/omg/CORBA/SystemException.java \
- org/omg/CORBA/TCKind.java \
- org/omg/CORBA/TRANSACTION_REQUIRED.java \
- org/omg/CORBA/TRANSACTION_ROLLEDBACK.java \
- org/omg/CORBA/TRANSIENT.java \
- org/omg/CORBA/TypeCode.java \
- org/omg/CORBA/TypeCodeHolder.java \
- org/omg/CORBA/TypeCodePackage/BadKind.java \
- org/omg/CORBA/TypeCodePackage/Bounds.java \
- org/omg/CORBA/UNKNOWN.java \
- org/omg/CORBA/UNSUPPORTED_POLICY.java \
- org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java \
- org/omg/CORBA/UnionMember.java \
- org/omg/CORBA/UnknownUserException.java \
- org/omg/CORBA/UserException.java \
- org/omg/CORBA/VM_ABSTRACT.java \
- org/omg/CORBA/VM_CUSTOM.java \
- org/omg/CORBA/VM_NONE.java \
- org/omg/CORBA/VM_TRUNCATABLE.java \
- org/omg/CORBA/ValueMember.java \
- org/omg/CORBA/WrongTransaction.java \
- org/omg/CORBA/portable/ApplicationException.java \
- org/omg/CORBA/portable/Delegate.java \
- org/omg/CORBA/portable/IDLEntity.java \
- org/omg/CORBA/portable/InputStream.java \
- org/omg/CORBA/portable/InvokeHandler.java \
- org/omg/CORBA/portable/ObjectImpl.java \
- org/omg/CORBA/portable/OutputStream.java \
- org/omg/CORBA/portable/RemarshalException.java \
- org/omg/CORBA/portable/ResponseHandler.java \
- org/omg/CORBA/portable/ServantObject.java \
- org/omg/CORBA/portable/Streamable.java \
- org/omg/CORBA/portable/ValueOutputStream.java \
- org/omg/CORBA/portable/ValueInputStream.java
-
-# org/omg/CORBA/AttributeMode.java \
-# org/omg/CORBA/AttributeModeHelper.java \
-
-org_omg_CORBA_java_1_3 = \
- org/omg/CORBA/AnySeqHelper.java \
- org/omg/CORBA/AnySeqHolder.java \
- org/omg/CORBA/BooleanSeqHelper.java \
- org/omg/CORBA/BooleanSeqHolder.java \
- org/omg/CORBA/CharSeqHelper.java \
- org/omg/CORBA/CharSeqHolder.java \
- org/omg/CORBA/CompletionStatusHelper.java \
- org/omg/CORBA/CurrentOperations.java \
- org/omg/CORBA/CurrentHelper.java \
- org/omg/CORBA/CurrentHolder.java \
- org/omg/CORBA/CustomMarshal.java \
- org/omg/CORBA/DataInputStream.java \
- org/omg/CORBA/DataOutputStream.java \
- org/omg/CORBA/DefinitionKindHelper.java \
- org/omg/CORBA/DoubleSeqHelper.java \
- org/omg/CORBA/DoubleSeqHolder.java \
- org/omg/CORBA/FieldNameHelper.java \
- org/omg/CORBA/FloatSeqHelper.java \
- org/omg/CORBA/FloatSeqHolder.java \
- org/omg/CORBA/IDLTypeHelper.java \
- org/omg/CORBA/IDLTypeOperations.java \
- org/omg/CORBA/IRObjectOperations.java \
- org/omg/CORBA/IdentifierHelper.java \
- org/omg/CORBA/LongLongSeqHelper.java \
- org/omg/CORBA/LongLongSeqHolder.java \
- org/omg/CORBA/LongSeqHelper.java \
- org/omg/CORBA/LongSeqHolder.java \
- org/omg/CORBA/NameValuePairHelper.java \
- org/omg/CORBA/ObjectHelper.java \
- org/omg/CORBA/OctetSeqHelper.java \
- org/omg/CORBA/OctetSeqHolder.java \
- org/omg/CORBA/PolicyOperations.java \
- org/omg/CORBA/PolicyHelper.java \
- org/omg/CORBA/PolicyHolder.java \
- org/omg/CORBA/PolicyTypeHelper.java \
- org/omg/CORBA/PolicyListHelper.java \
- org/omg/CORBA/PolicyListHolder.java \
- org/omg/CORBA/RepositoryIdHelper.java \
- org/omg/CORBA/SetOverrideTypeHelper.java \
- org/omg/CORBA/ShortSeqHelper.java \
- org/omg/CORBA/ShortSeqHolder.java \
- org/omg/CORBA/StringValueHelper.java \
- org/omg/CORBA/StructMemberHelper.java \
- org/omg/CORBA/ULongLongSeqHelper.java \
- org/omg/CORBA/ULongLongSeqHolder.java \
- org/omg/CORBA/ULongSeqHelper.java \
- org/omg/CORBA/ULongSeqHolder.java \
- org/omg/CORBA/UShortSeqHelper.java \
- org/omg/CORBA/UShortSeqHolder.java \
- org/omg/CORBA/UnionMemberHelper.java \
- org/omg/CORBA/ValueBaseHelper.java \
- org/omg/CORBA/ValueBaseHolder.java \
- org/omg/CORBA/ValueMemberHelper.java \
- org/omg/CORBA/VersionSpecHelper.java \
- org/omg/CORBA/VisibilityHelper.java \
- org/omg/CORBA/WCharSeqHelper.java \
- org/omg/CORBA/WCharSeqHolder.java \
- org/omg/CORBA/WStringValueHelper.java \
- org/omg/CORBA/_IDLTypeStub.java \
- org/omg/CORBA/_PolicyStub.java \
- org/omg/CORBA/portable/BoxedValueHelper.java \
- org/omg/CORBA/portable/CustomValue.java \
- org/omg/CORBA/portable/IndirectionException.java \
- org/omg/CORBA/portable/StreamableValue.java \
- org/omg/CORBA/portable/UnknownException.java \
- org/omg/CORBA/portable/ValueBase.java \
- org/omg/CORBA/portable/ValueFactory.java
-
-org_omg_CORBA_java_new = \
- org/omg/CORBA/LocalObject.java \
- org/omg/CORBA/ParameterMode.java \
- org/omg/CORBA/ParameterModeHelper.java \
- org/omg/CORBA/ParameterModeHolder.java \
- org/omg/CORBA/PolicyErrorCodeHelper.java \
- org/omg/CORBA/PolicyErrorHelper.java \
- org/omg/CORBA/PolicyErrorHolder.java \
- org/omg/CORBA/StringSeqHelper.java \
- org/omg/CORBA/StringSeqHolder.java \
- org/omg/CORBA/UnknownUserExceptionHelper.java \
- org/omg/CORBA/UnknownUserExceptionHolder.java \
- org/omg/CORBA/WStringSeqHelper.java \
- org/omg/CORBA/WStringSeqHolder.java \
- org/omg/CORBA/WrongTransactionHelper.java \
- org/omg/CORBA/WrongTransactionHolder.java
-
-org_omg_CORBA_TSIdentification_java = \
- org/omg/CORBA/TSIdentification.java \
- org/omg/CORBA/TSIdentificationPackage/AlreadyIdentified.java \
- org/omg/CORBA/TSIdentificationPackage/NotAvailable.java
-
-org_omg_CORBA30_java = \
- org/omg/CORBA/ACTIVITY_COMPLETED.java \
- org/omg/CORBA/ACTIVITY_REQUIRED.java \
- org/omg/CORBA/BAD_QOS.java \
- org/omg/CORBA/CODESET_INCOMPATIBLE.java \
- org/omg/CORBA/INVALID_ACTIVITY.java \
- org/omg/CORBA/REBIND.java \
- org/omg/CORBA/TIMEOUT.java \
- org/omg/CORBA/TRANSACTION_MODE.java \
- org/omg/CORBA/TRANSACTION_UNAVAILABLE.java
-
diff --git a/corba/make/com/sun/corba/minclude/org_omg_CORBAX.jmk b/corba/make/com/sun/corba/minclude/org_omg_CORBAX.jmk
deleted file mode 100644
index 563fec8..0000000
--- a/corba/make/com/sun/corba/minclude/org_omg_CORBAX.jmk
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# CORBA IDL Generated Files
-#
-
-CORBA_java = \
- org/omg/CORBA/ParameterMode.java \
- org/omg/CORBA/ParameterModeHelper.java \
- org/omg/CORBA/ParameterModeHolder.java \
- org/omg/CORBA/PolicyErrorCodeHelper.java \
- org/omg/CORBA/PolicyErrorHelper.java \
- org/omg/CORBA/PolicyErrorHolder.java \
- org/omg/CORBA/StringSeqHelper.java \
- org/omg/CORBA/StringSeqHolder.java \
- org/omg/CORBA/WStringSeqHelper.java \
- org/omg/CORBA/WStringSeqHolder.java
-
-CORBA_DUPLICATE_java = \
- org/omg/CORBA/OctetSeqHelper.java \
- org/omg/CORBA/OctetSeqHolder.java \
- org/omg/CORBA/PolicyError.java \
- org/omg/CORBA/RepositoryIdHelper.java
diff --git a/corba/make/com/sun/corba/minclude/org_omg_CORBA_2_3.jmk b/corba/make/com/sun/corba/minclude/org_omg_CORBA_2_3.jmk
deleted file mode 100644
index d4e52d0..0000000
--- a/corba/make/com/sun/corba/minclude/org_omg_CORBA_2_3.jmk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-org_omg_CORBA_2_3_java = \
- org/omg/CORBA_2_3/ORB.java \
- org/omg/CORBA_2_3/portable/InputStream.java \
- org/omg/CORBA_2_3/portable/OutputStream.java \
- org/omg/CORBA_2_3/portable/Delegate.java \
- org/omg/CORBA_2_3/portable/ObjectImpl.java
-
diff --git a/corba/make/com/sun/corba/minclude/org_omg_CosNaming.jmk b/corba/make/com/sun/corba/minclude/org_omg_CosNaming.jmk
deleted file mode 100644
index c7d77ae..0000000
--- a/corba/make/com/sun/corba/minclude/org_omg_CosNaming.jmk
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-NS_GENERATED_java = \
- org/omg/CosNaming/IstringHelper.java \
- org/omg/CosNaming/Binding.java \
- org/omg/CosNaming/BindingHelper.java \
- org/omg/CosNaming/BindingHolder.java \
- org/omg/CosNaming/BindingIterator.java \
- org/omg/CosNaming/BindingIteratorPOA.java \
- org/omg/CosNaming/BindingIteratorOperations.java \
- org/omg/CosNaming/BindingIteratorHelper.java \
- org/omg/CosNaming/BindingIteratorHolder.java \
- org/omg/CosNaming/_BindingIteratorStub.java \
- org/omg/CosNaming/BindingListHelper.java \
- org/omg/CosNaming/BindingListHolder.java \
- org/omg/CosNaming/BindingType.java \
- org/omg/CosNaming/BindingTypeHelper.java \
- org/omg/CosNaming/BindingTypeHolder.java \
- org/omg/CosNaming/NameComponent.java \
- org/omg/CosNaming/NameComponentHelper.java \
- org/omg/CosNaming/NameComponentHolder.java \
- org/omg/CosNaming/NameHelper.java \
- org/omg/CosNaming/NameHolder.java \
- org/omg/CosNaming/NamingContext.java \
- org/omg/CosNaming/NamingContextHelper.java \
- org/omg/CosNaming/NamingContextHolder.java \
- org/omg/CosNaming/NamingContextOperations.java \
- org/omg/CosNaming/_NamingContextStub.java \
- org/omg/CosNaming/NamingContextPackage/AlreadyBound.java \
- org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java \
- org/omg/CosNaming/NamingContextPackage/AlreadyBoundHolder.java \
- org/omg/CosNaming/NamingContextPackage/CannotProceed.java \
- org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java \
- org/omg/CosNaming/NamingContextPackage/CannotProceedHolder.java \
- org/omg/CosNaming/NamingContextPackage/InvalidName.java \
- org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java \
- org/omg/CosNaming/NamingContextPackage/InvalidNameHolder.java \
- org/omg/CosNaming/NamingContextPackage/NotEmpty.java \
- org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java \
- org/omg/CosNaming/NamingContextPackage/NotEmptyHolder.java \
- org/omg/CosNaming/NamingContextPackage/NotFound.java \
- org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java \
- org/omg/CosNaming/NamingContextPackage/NotFoundHolder.java \
- org/omg/CosNaming/NamingContextPackage/NotFoundReason.java \
- org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java \
- org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java \
- org/omg/CosNaming/NamingContextPOA.java \
- org/omg/CosNaming/NamingContextExt.java \
- org/omg/CosNaming/NamingContextExtOperations.java \
- org/omg/CosNaming/NamingContextExtHelper.java \
- org/omg/CosNaming/NamingContextExtHolder.java \
- org/omg/CosNaming/NamingContextExtPOA.java \
- org/omg/CosNaming/_NamingContextExtStub.java \
- org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java \
- org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.java \
- org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java \
- org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java \
- org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java \
- org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java
-
-
-LEGACY_FILES_java = \
- org/omg/CosNaming/_NamingContextImplBase.java \
- org/omg/CosNaming/_BindingIteratorImplBase.java
diff --git a/corba/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk b/corba/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk
deleted file mode 100644
index 2a1c6fe..0000000
--- a/corba/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files
-# Please keep this sorted.
-#
-
-DYNANY_GENERATED_java = \
- org/omg/DynamicAny/DynAny.java \
- org/omg/DynamicAny/DynAnyFactory.java \
- org/omg/DynamicAny/DynAnyFactoryOperations.java \
- org/omg/DynamicAny/DynAnyOperations.java \
- org/omg/DynamicAny/DynArray.java \
- org/omg/DynamicAny/DynArrayOperations.java \
- org/omg/DynamicAny/DynEnum.java \
- org/omg/DynamicAny/DynEnumOperations.java \
- org/omg/DynamicAny/DynFixed.java \
- org/omg/DynamicAny/DynFixedOperations.java \
- org/omg/DynamicAny/DynSequence.java \
- org/omg/DynamicAny/DynSequenceOperations.java \
- org/omg/DynamicAny/DynStruct.java \
- org/omg/DynamicAny/DynStructOperations.java \
- org/omg/DynamicAny/DynUnion.java \
- org/omg/DynamicAny/DynUnionOperations.java \
- org/omg/DynamicAny/DynValue.java \
- org/omg/DynamicAny/DynValueOperations.java \
- org/omg/DynamicAny/DynValueBox.java \
- org/omg/DynamicAny/DynValueBoxOperations.java \
- org/omg/DynamicAny/DynValueCommon.java \
- org/omg/DynamicAny/DynValueCommonOperations.java \
- org/omg/DynamicAny/NameDynAnyPair.java \
- org/omg/DynamicAny/NameValuePair.java \
- org/omg/DynamicAny/DynAnyPackage/InvalidValue.java \
- org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java \
- org/omg/DynamicAny/DynAnyPackage/TypeMismatch.java \
- org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java \
- org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.java \
- org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java \
- org/omg/DynamicAny/AnySeqHelper.java \
- org/omg/DynamicAny/DynStructHelper.java \
- org/omg/DynamicAny/DynAnyFactoryHelper.java \
- org/omg/DynamicAny/DynUnionHelper.java \
- org/omg/DynamicAny/DynAnyHelper.java \
- org/omg/DynamicAny/DynValueHelper.java \
- org/omg/DynamicAny/DynArrayHelper.java \
- org/omg/DynamicAny/DynAnySeqHelper.java \
- org/omg/DynamicAny/DynEnumHelper.java \
- org/omg/DynamicAny/DynFixedHelper.java \
- org/omg/DynamicAny/FieldNameHelper.java \
- org/omg/DynamicAny/NameDynAnyPairHelper.java \
- org/omg/DynamicAny/DynSequenceHelper.java \
- org/omg/DynamicAny/NameDynAnyPairSeqHelper.java \
- org/omg/DynamicAny/NameValuePairHelper.java \
- org/omg/DynamicAny/NameValuePairSeqHelper.java \
- org/omg/DynamicAny/_DynAnyFactoryStub.java \
- org/omg/DynamicAny/_DynAnyStub.java \
- org/omg/DynamicAny/_DynArrayStub.java \
- org/omg/DynamicAny/_DynEnumStub.java \
- org/omg/DynamicAny/_DynFixedStub.java \
- org/omg/DynamicAny/_DynSequenceStub.java \
- org/omg/DynamicAny/_DynStructStub.java \
- org/omg/DynamicAny/_DynUnionStub.java \
- org/omg/DynamicAny/_DynValueStub.java
-
-DYNANY_HELP_HOLD_java = \
- org/omg/DynamicAny/AnySeqHolder.java \
- org/omg/DynamicAny/DynStructHolder.java \
- org/omg/DynamicAny/DynAnyFactoryHolder.java \
- org/omg/DynamicAny/DynUnionHolder.java \
- org/omg/DynamicAny/DynAnyHolder.java \
- org/omg/DynamicAny/DynValueHolder.java \
- org/omg/DynamicAny/DynArrayHolder.java \
- org/omg/DynamicAny/DynAnySeqHolder.java \
- org/omg/DynamicAny/DynEnumHolder.java \
- org/omg/DynamicAny/DynFixedHolder.java \
- org/omg/DynamicAny/DynSequenceHolder.java \
- org/omg/DynamicAny/NameDynAnyPairHelper.java \
- org/omg/DynamicAny/NameDynAnyPairHolder.java \
- org/omg/DynamicAny/NameDynAnyPairSeqHolder.java \
- org/omg/DynamicAny/NameValuePairHolder.java \
- org/omg/DynamicAny/NameValuePairSeqHolder.java \
- org/omg/DynamicAny/DynAnyPackage/InvalidValueHolder.java \
- org/omg/DynamicAny/DynAnyPackage/TypeMismatchHolder.java \
- org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHolder.java
-
-
-DYNANY_TO_DELETE_FILES = \
- org/omg/DynamicAny/DynValueBoxHelper.java \
- org/omg/DynamicAny/DynValueCommonHelper.java \
- org/omg/DynamicAny/_DynValueCommonStub.java \
- org/omg/DynamicAny/_DynValueBoxStub.java \
- org/omg/DynamicAny/DynAnyPackage/TypeMismatchHolder.java \
- org/omg/DynamicAny/DynAnyPackage/InvalidValueHolder.java \
- org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHolder.java
diff --git a/corba/make/com/sun/corba/minclude/org_omg_IOP.jmk b/corba/make/com/sun/corba/minclude/org_omg_IOP.jmk
deleted file mode 100644
index 655e7cb..0000000
--- a/corba/make/com/sun/corba/minclude/org_omg_IOP.jmk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# IOP IDL Generated Files
-#
-
-IOP_java = \
- org/omg/IOP/CodeSets.java \
- org/omg/IOP/ComponentIdHelper.java \
- org/omg/IOP/IOR.java \
- org/omg/IOP/IORHelper.java \
- org/omg/IOP/IORHolder.java \
- org/omg/IOP/MultipleComponentProfileHelper.java \
- org/omg/IOP/MultipleComponentProfileHolder.java \
- org/omg/IOP/ProfileIdHelper.java \
- org/omg/IOP/RMICustomMaxStreamFormat.java \
- org/omg/IOP/ServiceContext.java \
- org/omg/IOP/ServiceContextHelper.java \
- org/omg/IOP/ServiceContextHolder.java \
- org/omg/IOP/ServiceContextListHelper.java \
- org/omg/IOP/ServiceContextListHolder.java \
- org/omg/IOP/ServiceIdHelper.java \
- org/omg/IOP/TAG_INTERNET_IOP.java \
- org/omg/IOP/TAG_MULTIPLE_COMPONENTS.java \
- org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.java \
- org/omg/IOP/TAG_CODE_SETS.java \
- org/omg/IOP/TAG_JAVA_CODEBASE.java \
- org/omg/IOP/TAG_ORB_TYPE.java \
- org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.java \
- org/omg/IOP/TAG_POLICIES.java \
- org/omg/IOP/TaggedComponent.java \
- org/omg/IOP/TaggedComponentHelper.java \
- org/omg/IOP/TaggedComponentHolder.java \
- org/omg/IOP/TaggedProfile.java \
- org/omg/IOP/TaggedProfileHelper.java \
- org/omg/IOP/TaggedProfileHolder.java \
- org/omg/IOP/TransactionService.java
-
-IOP_TO_DELETE_FILES = \
- org/omg/IOP/BI_DIR_IIOP.java \
- org/omg/IOP/ChainBypassCheck.java \
- org/omg/IOP/ChainBypassInfo.java \
- org/omg/IOP/FORWARDED_IDENTITY.java \
- org/omg/IOP/INVOCATION_POLICIES.java \
- org/omg/IOP/LogicalThreadId.java \
- org/omg/IOP/SendingContextRunTime.java \
- org/omg/IOP/UnknownExceptionInfo.java \
- org/omg/IOP/TaggedComponentSeqHolder.java
diff --git a/corba/make/com/sun/corba/minclude/org_omg_Messaging.jmk b/corba/make/com/sun/corba/minclude/org_omg_Messaging.jmk
deleted file mode 100644
index 3fd09cf..0000000
--- a/corba/make/com/sun/corba/minclude/org_omg_Messaging.jmk
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Messaging IDL Generated Files
-#
-
-Messaging_java = \
- org/omg/Messaging/SYNC_WITH_TRANSPORT.java \
- org/omg/Messaging/SyncScopeHelper.java
diff --git a/corba/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk b/corba/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk
deleted file mode 100644
index d5e584b..0000000
--- a/corba/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk
+++ /dev/null
@@ -1,162 +0,0 @@
-#
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Interceptors IDL Generated Files
-#
-
-# List of files that must be present after a build:
-PI_GENERATED_java = \
- org/omg/PortableInterceptor/ACTIVE.java \
- org/omg/PortableInterceptor/AdapterManagerIdHelper.java \
- org/omg/PortableInterceptor/AdapterNameHelper.java \
- org/omg/PortableInterceptor/AdapterStateHelper.java \
- org/omg/PortableInterceptor/ClientRequestInfo.java \
- org/omg/PortableInterceptor/ClientRequestInfoOperations.java \
- org/omg/PortableInterceptor/ClientRequestInterceptor.java \
- org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java \
- org/omg/PortableInterceptor/Current.java \
- org/omg/PortableInterceptor/CurrentHelper.java \
- org/omg/PortableInterceptor/CurrentOperations.java \
- org/omg/PortableInterceptor/DISCARDING.java \
- org/omg/PortableInterceptor/ForwardRequest.java \
- org/omg/PortableInterceptor/ForwardRequestHelper.java \
- org/omg/PortableInterceptor/HOLDING.java \
- org/omg/PortableInterceptor/IORInfo.java \
- org/omg/PortableInterceptor/IORInfoOperations.java \
- org/omg/PortableInterceptor/IORInterceptor.java \
- org/omg/PortableInterceptor/IORInterceptorOperations.java \
- org/omg/PortableInterceptor/IORInterceptor_3_0.java \
- org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java \
- org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java \
- org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java \
- org/omg/PortableInterceptor/INACTIVE.java \
- org/omg/PortableInterceptor/Interceptor.java \
- org/omg/PortableInterceptor/InvalidSlotHelper.java \
- org/omg/PortableInterceptor/InterceptorOperations.java \
- org/omg/PortableInterceptor/InvalidSlot.java \
- org/omg/PortableInterceptor/NON_EXISTENT.java \
- org/omg/PortableInterceptor/ObjectIdHelper.java \
- org/omg/PortableInterceptor/ObjectReferenceFactory.java \
- org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java \
- org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java \
- org/omg/PortableInterceptor/ObjectReferenceTemplate.java \
- org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java \
- org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java \
- org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java \
- org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java \
- org/omg/PortableInterceptor/ORBIdHelper.java \
- org/omg/PortableInterceptor/ORBInitInfo.java \
- org/omg/PortableInterceptor/ORBInitInfoOperations.java \
- org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java \
- org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java \
- org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java \
- org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java \
- org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java \
- org/omg/PortableInterceptor/ORBInitializer.java \
- org/omg/PortableInterceptor/ORBInitializerOperations.java \
- org/omg/PortableInterceptor/PolicyFactory.java \
- org/omg/PortableInterceptor/PolicyFactoryOperations.java \
- org/omg/PortableInterceptor/RequestInfo.java \
- org/omg/PortableInterceptor/RequestInfoOperations.java \
- org/omg/PortableInterceptor/SUCCESSFUL.java \
- org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java \
- org/omg/PortableInterceptor/USER_EXCEPTION.java \
- org/omg/PortableInterceptor/LOCATION_FORWARD.java \
- org/omg/PortableInterceptor/TRANSPORT_RETRY.java \
- org/omg/PortableInterceptor/ServerIdHelper.java \
- org/omg/PortableInterceptor/ServerRequestInfo.java \
- org/omg/PortableInterceptor/ServerRequestInfoOperations.java \
- org/omg/PortableInterceptor/ServerRequestInterceptor.java \
- org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java \
- org/omg/IOP/Codec.java \
- org/omg/IOP/CodecFactory.java \
- org/omg/IOP/CodecFactoryHelper.java \
- org/omg/IOP/CodecFactoryOperations.java \
- org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java \
- org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java \
- org/omg/IOP/CodecOperations.java \
- org/omg/IOP/CodecPackage/FormatMismatch.java \
- org/omg/IOP/CodecPackage/FormatMismatchHelper.java \
- org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java \
- org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java \
- org/omg/IOP/CodecPackage/TypeMismatch.java \
- org/omg/IOP/CodecPackage/TypeMismatchHelper.java \
- org/omg/IOP/ENCODING_CDR_ENCAPS.java \
- org/omg/IOP/Encoding.java \
- org/omg/IOP/ExceptionDetailMessage.java \
- org/omg/Dynamic/Parameter.java
-
-# Helper and Holder files to be removed:
-PI_GENERATED_HELP_HOL_java = \
- org/omg/PortableInterceptor/ClientRequestInfoHelper.java \
- org/omg/PortableInterceptor/ClientRequestInterceptorHelper.java \
- org/omg/PortableInterceptor/IORInfoHelper.java \
- org/omg/PortableInterceptor/IORInterceptorHelper.java \
- org/omg/PortableInterceptor/InterceptorHelper.java \
- org/omg/PortableInterceptor/ORBInitInfoHelper.java \
- org/omg/PortableInterceptor/ORBInitializerHelper.java \
- org/omg/PortableInterceptor/PolicyFactoryHelper.java \
- org/omg/PortableInterceptor/ReplyStatusHelper.java \
- org/omg/PortableInterceptor/RequestInfoHelper.java \
- org/omg/PortableInterceptor/ServerRequestInfoHelper.java \
- org/omg/PortableInterceptor/ServerRequestInterceptorHelper.java \
- org/omg/PortableInterceptor/SlotIdHelper.java \
- org/omg/PortableInterceptor/ClientRequestInfoHolder.java \
- org/omg/PortableInterceptor/ClientRequestInterceptorHolder.java \
- org/omg/PortableInterceptor/CurrentHolder.java \
- org/omg/PortableInterceptor/ForwardRequestHolder.java \
- org/omg/PortableInterceptor/IORInfoHolder.java \
- org/omg/PortableInterceptor/IORInterceptorHolder.java \
- org/omg/PortableInterceptor/InterceptorHolder.java \
- org/omg/PortableInterceptor/InvalidSlotHolder.java \
- org/omg/PortableInterceptor/ORBInitInfoHolder.java \
- org/omg/PortableInterceptor/ORBInitializerHolder.java \
- org/omg/PortableInterceptor/PolicyFactoryHolder.java \
- org/omg/PortableInterceptor/RequestInfoHolder.java \
- org/omg/PortableInterceptor/ServerRequestInfoHolder.java \
- org/omg/PortableInterceptor/ServerRequestInterceptorHolder.java \
- org/omg/PortableInterceptor/TaggedComponentSeqHolder.java \
- org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHolder.java \
- org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHolder.java \
- org/omg/IOP/CodecPackage/FormatMismatchHolder.java \
- org/omg/IOP/CodecPackage/InvalidTypeForEncodingHolder.java \
- org/omg/IOP/CodecPackage/TypeMismatchHolder.java \
- org/omg/IOP/CodecHelper.java \
- org/omg/IOP/EncodingFormatHelper.java \
- org/omg/IOP/EncodingHelper.java \
- org/omg/IOP/CodecFactoryPackage/UnknownEncodingHolder.java \
- org/omg/IOP/CodecFactoryHolder.java \
- org/omg/IOP/CodecHolder.java \
- org/omg/IOP/EncodingHolder.java \
- org/omg/IOP/TaggedComponentSeqHelper.java \
- org/omg/Dynamic/ContextListHelper.java \
- org/omg/Dynamic/ExceptionListHelper.java \
- org/omg/Dynamic/ParameterHolder.java \
- org/omg/Dynamic/ParameterListHolder.java \
- org/omg/Dynamic/ExceptionListHolder.java \
- org/omg/Dynamic/ParameterHelper.java \
- org/omg/Dynamic/ParameterListHelper.java \
- org/omg/Dynamic/RequestContextHelper.java
diff --git a/corba/make/com/sun/corba/minclude/org_omg_PortableServer.jmk b/corba/make/com/sun/corba/minclude/org_omg_PortableServer.jmk
deleted file mode 100644
index 377986b..0000000
--- a/corba/make/com/sun/corba/minclude/org_omg_PortableServer.jmk
+++ /dev/null
@@ -1,146 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-PortableServer_java = \
- org/omg/PortableServer/Servant.java \
- org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java \
- org/omg/PortableServer/DynamicImplementation.java \
- org/omg/PortableServer/portable/Delegate.java
-
-POA_GENERATED_java = \
- org/omg/PortableServer/AdapterActivator.java \
- org/omg/PortableServer/AdapterActivatorOperations.java \
- org/omg/PortableServer/Current.java \
- org/omg/PortableServer/CurrentHelper.java \
- org/omg/PortableServer/CurrentOperations.java \
- org/omg/PortableServer/CurrentPackage/NoContext.java \
- org/omg/PortableServer/CurrentPackage/NoContextHelper.java \
- org/omg/PortableServer/ForwardRequest.java \
- org/omg/PortableServer/ForwardRequestHelper.java \
- org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java \
- org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java \
- org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java \
- org/omg/PortableServer/IdAssignmentPolicy.java \
- org/omg/PortableServer/IdAssignmentPolicyOperations.java \
- org/omg/PortableServer/IdAssignmentPolicyValue.java \
- org/omg/PortableServer/IdUniquenessPolicy.java \
- org/omg/PortableServer/IdUniquenessPolicyOperations.java \
- org/omg/PortableServer/IdUniquenessPolicyValue.java \
- org/omg/PortableServer/ImplicitActivationPolicy.java \
- org/omg/PortableServer/ImplicitActivationPolicyOperations.java \
- org/omg/PortableServer/ImplicitActivationPolicyValue.java \
- org/omg/PortableServer/LIFESPAN_POLICY_ID.java \
- org/omg/PortableServer/LifespanPolicy.java \
- org/omg/PortableServer/LifespanPolicyOperations.java \
- org/omg/PortableServer/LifespanPolicyValue.java \
- org/omg/PortableServer/POA.java \
- org/omg/PortableServer/POAHelper.java \
- org/omg/PortableServer/POAOperations.java \
- org/omg/PortableServer/POAManager.java \
- org/omg/PortableServer/POAManagerOperations.java \
- org/omg/PortableServer/POAManagerPackage/AdapterInactive.java \
- org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java \
- org/omg/PortableServer/POAManagerPackage/State.java \
- org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java \
- org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java \
- org/omg/PortableServer/POAPackage/AdapterNonExistent.java \
- org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java \
- org/omg/PortableServer/POAPackage/InvalidPolicy.java \
- org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java \
- org/omg/PortableServer/POAPackage/NoServant.java \
- org/omg/PortableServer/POAPackage/NoServantHelper.java \
- org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java \
- org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java \
- org/omg/PortableServer/POAPackage/ObjectNotActive.java \
- org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java \
- org/omg/PortableServer/POAPackage/ServantAlreadyActive.java \
- org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java \
- org/omg/PortableServer/POAPackage/ServantNotActive.java \
- org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java \
- org/omg/PortableServer/POAPackage/WrongAdapter.java \
- org/omg/PortableServer/POAPackage/WrongAdapterHelper.java \
- org/omg/PortableServer/POAPackage/WrongPolicy.java \
- org/omg/PortableServer/POAPackage/WrongPolicyHelper.java \
- org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java \
- org/omg/PortableServer/RequestProcessingPolicy.java \
- org/omg/PortableServer/RequestProcessingPolicyOperations.java \
- org/omg/PortableServer/RequestProcessingPolicyValue.java \
- org/omg/PortableServer/ServantActivator.java \
- org/omg/PortableServer/ServantActivatorHelper.java \
- org/omg/PortableServer/ServantActivatorOperations.java \
- org/omg/PortableServer/ServantActivatorPOA.java \
- org/omg/PortableServer/_ServantActivatorStub.java \
- org/omg/PortableServer/ServantLocator.java \
- org/omg/PortableServer/ServantLocatorHelper.java \
- org/omg/PortableServer/ServantLocatorOperations.java \
- org/omg/PortableServer/ServantLocatorPOA.java \
- org/omg/PortableServer/_ServantLocatorStub.java \
- org/omg/PortableServer/ServantManager.java \
- org/omg/PortableServer/ServantManagerOperations.java \
- org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java \
- org/omg/PortableServer/ServantRetentionPolicy.java \
- org/omg/PortableServer/ServantRetentionPolicyOperations.java \
- org/omg/PortableServer/ServantRetentionPolicyValue.java \
- org/omg/PortableServer/THREAD_POLICY_ID.java \
- org/omg/PortableServer/ThreadPolicy.java \
- org/omg/PortableServer/ThreadPolicyOperations.java \
- org/omg/PortableServer/ThreadPolicyValue.java
-
-POA_GENERATED_HELP_HOL_java = \
- org/omg/PortableServer/CurrentPackage/NoContextHolder.java \
- org/omg/PortableServer/ForwardRequestHolder.java \
- org/omg/PortableServer/IdAssignmentPolicyValueHelper.java \
- org/omg/PortableServer/IdAssignmentPolicyValueHolder.java \
- org/omg/PortableServer/IdUniquenessPolicyValueHelper.java \
- org/omg/PortableServer/IdUniquenessPolicyValueHolder.java \
- org/omg/PortableServer/ImplicitActivationPolicyValueHelper.java \
- org/omg/PortableServer/ImplicitActivationPolicyValueHolder.java \
- org/omg/PortableServer/LifespanPolicyValueHelper.java \
- org/omg/PortableServer/LifespanPolicyValueHolder.java \
- org/omg/PortableServer/ServantRetentionPolicyValueHelper.java \
- org/omg/PortableServer/ServantRetentionPolicyValueHolder.java \
- org/omg/PortableServer/ObjectIdHelper.java \
- org/omg/PortableServer/ObjectIdHolder.java \
- org/omg/PortableServer/POAListHelper.java \
- org/omg/PortableServer/POAListHolder.java \
- org/omg/PortableServer/POAManagerPackage/AdapterInactiveHolder.java \
- org/omg/PortableServer/POAManagerPackage/StateHelper.java \
- org/omg/PortableServer/POAManagerPackage/StateHolder.java \
- org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHolder.java \
- org/omg/PortableServer/POAPackage/AdapterNonExistentHolder.java \
- org/omg/PortableServer/POAPackage/InvalidPolicyHolder.java \
- org/omg/PortableServer/POAPackage/NoServantHolder.java \
- org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHolder.java \
- org/omg/PortableServer/POAPackage/ObjectNotActiveHolder.java \
- org/omg/PortableServer/POAPackage/ServantAlreadyActiveHolder.java \
- org/omg/PortableServer/POAPackage/ServantNotActiveHolder.java \
- org/omg/PortableServer/POAPackage/WrongAdapterHolder.java \
- org/omg/PortableServer/POAPackage/WrongPolicyHolder.java \
- org/omg/PortableServer/RequestProcessingPolicyValueHelper.java \
- org/omg/PortableServer/RequestProcessingPolicyValueHolder.java \
- org/omg/PortableServer/ServantActivatorHolder.java \
- org/omg/PortableServer/ServantLocatorHolder.java \
- org/omg/PortableServer/ThreadPolicyValueHelper.java \
- org/omg/PortableServer/ThreadPolicyValueHolder.java
diff --git a/corba/make/com/sun/corba/minclude/org_omg_SendingContext.jmk b/corba/make/com/sun/corba/minclude/org_omg_SendingContext.jmk
deleted file mode 100644
index 15e2e89..0000000
--- a/corba/make/com/sun/corba/minclude/org_omg_SendingContext.jmk
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-org_omg_SendingContext_java = \
- org/omg/SendingContext/RunTime.java \
- org/omg/SendingContext/RunTimeOperations.java
diff --git a/corba/make/com/sun/corba/minclude/sun_corba.jmk b/corba/make/com/sun/corba/minclude/sun_corba.jmk
deleted file mode 100644
index a693206..0000000
--- a/corba/make/com/sun/corba/minclude/sun_corba.jmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-sun_corba_java = \
- sun/corba/BridgePermission.java \
- sun/corba/Bridge.java
diff --git a/corba/make/com/sun/corba/se/Makefile b/corba/make/com/sun/corba/se/Makefile
deleted file mode 100644
index 7bf4ab5..0000000
--- a/corba/make/com/sun/corba/se/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ../../../..
-PRODUCT = se
-include $(BUILDDIR)/common/Defs.gmk
-
-# IDL code generation is moved out to an extra step before the
-# actual classes are compiled
-# the files should be compiled in the following order, core to be built
-# before connection
-
-# Note that sources generates the logging wrappers, and pept compiles
-# them, because pept is the earliest build target that can use
-# the log wrappers. Note that rmi is moved here after pept because
-# the rmic iiop backend needs some classes that are part of the impl/util
-# package. These classes use log wrappers, so they must be built after
-# pept and before rmi.
-SUBDIRS = sources pept corespi core spi impl rmi
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/corba/make/com/sun/corba/se/PortableActivationIDL/Makefile b/corba/make/com/sun/corba/se/PortableActivationIDL/Makefile
deleted file mode 100644
index 2e84d11..0000000
--- a/corba/make/com/sun/corba/se/PortableActivationIDL/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../..
-PACKAGE = com.sun.corba.se.PortableActivation
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-
-include $(MINCLUDES)com_sun_corba_se_PortableActivationIDL.jmk
-
-FILES_java=$(com_sun_corba_se_PortableActivationIDL_java)
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/connection/FILES_java.gmk b/corba/make/com/sun/corba/se/connection/FILES_java.gmk
deleted file mode 100644
index 655fd6f..0000000
--- a/corba/make/com/sun/corba/se/connection/FILES_java.gmk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for connection
-#
-
-com_sun_corba_se_spi_legacy_connection_java = \
- com/sun/corba/se/spi/legacy/connection/Connection.java \
- com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java \
- com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java \
- com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java \
- com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java
-
-FILES_java = $(com_sun_corba_se_spi_legacy_connection_java)
diff --git a/corba/make/com/sun/corba/se/connection/Makefile b/corba/make/com/sun/corba/se/connection/Makefile
deleted file mode 100644
index abffabc..0000000
--- a/corba/make/com/sun/corba/se/connection/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../..
-
-PACKAGE = com.sun.corba.se.connection
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-
-include FILES_java.gmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/core/Makefile b/corba/make/com/sun/corba/se/core/Makefile
deleted file mode 100644
index 65d9e5c..0000000
--- a/corba/make/com/sun/corba/se/core/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../..
-
-PACKAGE = com.sun.corba.se.impl.core
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_corba.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_core.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_dynamicany.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_encoding.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_legacy.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_servicecontext.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_ior.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_orb.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_orbutil.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_protocol.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_resolver.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_transport.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_util.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_io.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_presentation_rmi.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_internal_LegacyFiles.jmk
-
-
-
-#
-# Include
-#
-
-FILES_java = $(com_sun_corba_se_impl_corba_java) \
- $(com_sun_corba_se_impl_core_java) \
- $(com_sun_corba_se_impl_dynamicany_java) \
- $(com_sun_corba_se_impl_encoding_java) \
- $(com_sun_corba_se_impl_legacy_java) \
- $(com_sun_corba_se_spi_servicecontext_java) \
- $(com_sun_corba_se_impl_ior_java) \
- $(com_sun_corba_se_impl_orb_java) \
- $(com_sun_corba_se_impl_orbutil_java) \
- $(com_sun_corba_se_impl_protocol_java) \
- $(com_sun_corba_se_impl_resolver_java) \
- $(com_sun_corba_se_impl_transport_java) \
- $(com_sun_corba_se_impl_util_java) \
- $(com_sun_corba_se_impl_io_java) \
- $(com_sun_corba_se_impl_presentation_rmi_java) \
- $(com_sun_corba_se_internal_LegacyFiles_java)
-
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/corespi/Makefile b/corba/make/com/sun/corba/se/corespi/Makefile
deleted file mode 100644
index 4e7d7e84..0000000
--- a/corba/make/com/sun/corba/se/corespi/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../..
-
-PACKAGE = com.sun.corba.se.impl.corespi
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_ior.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_oa.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_orb.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_protocol.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_resolver.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_transport.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_orbutil.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_presentation_rmi.jmk
-
-#
-# Include
-#
-
-FILES_java = $(com_sun_corba_se_spi_ior_java) \
- $(com_sun_corba_se_spi_oa_java) \
- $(com_sun_corba_se_spi_orb_java) \
- $(com_sun_corba_se_spi_protocol_java) \
- $(com_sun_corba_se_spi_resolver_java) \
- $(com_sun_corba_se_spi_transport_java) \
- $(com_sun_corba_se_spi_orbutil_java) \
- $(com_sun_corba_se_spi_presentation_rmi_java)
-
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/impl/Makefile b/corba/make/com/sun/corba/se/impl/Makefile
deleted file mode 100644
index f1aa670..0000000
--- a/corba/make/com/sun/corba/se/impl/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ../../../../..
-PRODUCT = impl
-include $(BUILDDIR)/common/Defs.gmk
-
-# order is important
-
-ifdef STANDALONE_CORBA_WS
-SUBDIRS = oa naming activation txpoa interceptors logging monitoring
-else
-SUBDIRS = oa naming activation interceptors logging monitoring
-endif
-
-LOG_GENDIRECTORY = $(GENSRCDIR)/com/sun/corba/se/impl/logging
-LOG_CLASS_OUTPUTDIRECTORY = $(CLASSBINDIR)/com/sun/corba/se/impl/logging
-LOGSTRINGS_PROPERTIES = LogStrings.properties
-all build clean clobber::
- $(SUBDIRS-loop)
-
-# Copy the generated LogStrings.properties to the Classes directory
-all build:: $(LOG_CLASS_OUTPUTDIRECTORY)/$(LOGSTRINGS_PROPERTIES)
-
-$(LOG_CLASS_OUTPUTDIRECTORY)/$(LOGSTRINGS_PROPERTIES): $(LOG_GENDIRECTORY)/$(LOGSTRINGS_PROPERTIES)
- $(install-file)
-
diff --git a/corba/make/com/sun/corba/se/impl/activation/Makefile b/corba/make/com/sun/corba/se/impl/activation/Makefile
deleted file mode 100644
index da0642f..0000000
--- a/corba/make/com/sun/corba/se/impl/activation/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.impl.activation
-PRODUCT = Activation
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = orbd servertool
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/corba/make/com/sun/corba/se/impl/activation/orbd/Makefile b/corba/make/com/sun/corba/se/impl/activation/orbd/Makefile
deleted file mode 100644
index 587d19e..0000000
--- a/corba/make/com/sun/corba/se/impl/activation/orbd/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.activation
-PRODUCT = Activation
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_activation.jmk
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/corba/make/com/sun/corba/se/impl/activation/servertool/Makefile b/corba/make/com/sun/corba/se/impl/activation/servertool/Makefile
deleted file mode 100644
index 587d19e..0000000
--- a/corba/make/com/sun/corba/se/impl/activation/servertool/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.activation
-PRODUCT = Activation
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_activation.jmk
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/corba/make/com/sun/corba/se/impl/interceptors/Makefile b/corba/make/com/sun/corba/se/impl/interceptors/Makefile
deleted file mode 100644
index f855b34..0000000
--- a/corba/make/com/sun/corba/se/impl/interceptors/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../..
-
-PACKAGE = com.sun.corba.se.impl.interceptors
-PRODUCT = com
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_interceptors.jmk
-
-#
-# Include
-#
-
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/corba/make/com/sun/corba/se/impl/logging/Makefile b/corba/make/com/sun/corba/se/impl/logging/Makefile
deleted file mode 100644
index 8536c2e..0000000
--- a/corba/make/com/sun/corba/se/impl/logging/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.impl.logging
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/impl/monitoring/Makefile b/corba/make/com/sun/corba/se/impl/monitoring/Makefile
deleted file mode 100644
index bd0d57f..0000000
--- a/corba/make/com/sun/corba/se/impl/monitoring/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.impl.monitoring
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_monitoring.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/impl/naming/Makefile b/corba/make/com/sun/corba/se/impl/naming/Makefile
deleted file mode 100644
index 41c18d8..0000000
--- a/corba/make/com/sun/corba/se/impl/naming/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../..
-PRODUCT = se
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = namingutil cosnaming pcosnaming
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/corba/make/com/sun/corba/se/impl/naming/cosnaming/Makefile b/corba/make/com/sun/corba/se/impl/naming/cosnaming/Makefile
deleted file mode 100644
index 3405fef..0000000
--- a/corba/make/com/sun/corba/se/impl/naming/cosnaming/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build the tnameserv executable.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.naming.cosnaming
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files.
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_naming_cosnaming.jmk
-FILES_java = $(com_sun_corba_se_impl_naming_cosnaming_java)
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/corba/make/com/sun/corba/se/impl/naming/namingutil/Makefile b/corba/make/com/sun/corba/se/impl/naming/namingutil/Makefile
deleted file mode 100644
index 4b9555c..0000000
--- a/corba/make/com/sun/corba/se/impl/naming/namingutil/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.namingutil
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_naming_namingutil.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/impl/naming/pcosnaming/Makefile b/corba/make/com/sun/corba/se/impl/naming/pcosnaming/Makefile
deleted file mode 100644
index 5360b67..0000000
--- a/corba/make/com/sun/corba/se/impl/naming/pcosnaming/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build the Persistent CosNaming Classes
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.naming.pcosnaming
-PRODUCT = PCosNaming
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_naming_pcosnaming.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/impl/oa/Makefile b/corba/make/com/sun/corba/se/impl/oa/Makefile
deleted file mode 100644
index 5a7acfd..0000000
--- a/corba/make/com/sun/corba/se/impl/oa/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../..
-PRODUCT = impl
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# order is important
-
-SUBDIRS = poa toa
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/corba/make/com/sun/corba/se/impl/oa/poa/Makefile b/corba/make/com/sun/corba/se/impl/oa/poa/Makefile
deleted file mode 100644
index 6dead7f..0000000
--- a/corba/make/com/sun/corba/se/impl/oa/poa/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.oa.poa
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_oa_poa.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/impl/oa/toa/Makefile b/corba/make/com/sun/corba/se/impl/oa/toa/Makefile
deleted file mode 100644
index 79a6825..0000000
--- a/corba/make/com/sun/corba/se/impl/oa/toa/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.oa.toa
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_oa_toa.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/corba/make/com/sun/corba/se/interceptor/FILES_java.gmk b/corba/make/com/sun/corba/se/interceptor/FILES_java.gmk
deleted file mode 100644
index c37aef0..0000000
--- a/corba/make/com/sun/corba/se/interceptor/FILES_java.gmk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files for interceptor
-#
-
-com_sun_corba_se_spi_legacy_interceptor_java = \
- com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java \
- com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java \
- com/sun/corba/se/spi/legacy/interceptor/UnknownType.java
-
-FILES_java = $(com_sun_corba_se_spi_legacy_interceptor_java)
diff --git a/corba/make/com/sun/corba/se/interceptor/Makefile b/corba/make/com/sun/corba/se/interceptor/Makefile
deleted file mode 100644
index 98a8104..0000000
--- a/corba/make/com/sun/corba/se/interceptor/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../..
-
-PACKAGE = com.sun.corba.se.interceptor
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-
-include FILES_java.gmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/pept/Makefile b/corba/make/com/sun/corba/se/pept/Makefile
deleted file mode 100644
index 98ed4de..0000000
--- a/corba/make/com/sun/corba/se/pept/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../..
-PACKAGE = com.sun.corba.se.pept
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_pept.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_logging.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
-
-FILES_java=\
- $(com_sun_corba_se_pept_java) \
- $(com_sun_corba_se_impl_logging_java) \
- $(com_sun_corba_se_spi_logging_java)
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/rmi/Makefile b/corba/make/com/sun/corba/se/rmi/Makefile
deleted file mode 100644
index 92adab3..0000000
--- a/corba/make/com/sun/corba/se/rmi/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build rmi tools, and sun.rmi.* implementation classes
-
-BUILDDIR = ../../../../..
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = rmic
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clean clobber::
- $(RM) -r $(CLASSBINDIR)/sun/rmi $(CLASSBINDIR)/com/sun/rmi
diff --git a/corba/make/com/sun/corba/se/rmi/rmic/Makefile b/corba/make/com/sun/corba/se/rmi/rmic/Makefile
deleted file mode 100644
index 6a90057..0000000
--- a/corba/make/com/sun/corba/se/rmi/rmic/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building sun.rmi.rmic.* and the "rmic" command
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = sun.rmi.rmic
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-include SUN_RMI_RMIC_IIOP_java.gmk
-ifdef PARTNERS_CORBA
- FILES_java = \
- $(IIOP_java) \
- $(PARTNERS_EDITION_java)
-else
- FILES_java = \
- $(IIOP_java)
-endif
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/corba/make/com/sun/corba/se/rmi/rmic/SUN_RMI_RMIC_IIOP_java.gmk b/corba/make/com/sun/corba/se/rmi/rmic/SUN_RMI_RMIC_IIOP_java.gmk
deleted file mode 100644
index a83ce22..0000000
--- a/corba/make/com/sun/corba/se/rmi/rmic/SUN_RMI_RMIC_IIOP_java.gmk
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-SUN_RMI_RMIC_IIOP_java = \
- $(Group0)\
- $(Group1)\
- $(Group2)\
- $(Group3)
-
-Group0 = \
- sun/rmi/rmic/iiop/AbstractType.java \
- sun/rmi/rmic/iiop/ArrayType.java \
- sun/rmi/rmic/iiop/BatchEnvironment.java \
- sun/rmi/rmic/iiop/ClassType.java \
- sun/rmi/rmic/iiop/CompoundType.java \
- sun/rmi/rmic/iiop/Constants.java \
- sun/rmi/rmic/iiop/DirectoryLoader.java \
- sun/rmi/rmic/iiop/ClassPathLoader.java \
- sun/rmi/rmic/iiop/Generator.java \
- sun/rmi/rmic/iiop/Util.java
-
-Group1 = \
- sun/rmi/rmic/iiop/IDLGenerator.java \
- sun/rmi/rmic/iiop/IDLNames.java \
- sun/rmi/rmic/iiop/ImplementationType.java \
- sun/rmi/rmic/iiop/InterfaceType.java \
- sun/rmi/rmic/iiop/NCClassType.java \
- sun/rmi/rmic/iiop/NCInterfaceType.java \
- sun/rmi/rmic/iiop/NameContext.java
-
-Group2 = \
- sun/rmi/rmic/iiop/PrimitiveType.java \
- sun/rmi/rmic/iiop/PrintGenerator.java \
- sun/rmi/rmic/iiop/RemoteType.java \
- sun/rmi/rmic/iiop/SpecialClassType.java \
- sun/rmi/rmic/iiop/SpecialInterfaceType.java \
- sun/rmi/rmic/iiop/StubGenerator.java \
- sun/rmi/rmic/iiop/Type.java \
- sun/rmi/rmic/iiop/ValueType.java
-
-Group3 = \
- sun/rmi/rmic/iiop/StaticStringsHash.java \
- sun/rmi/rmic/iiop/ContextStack.java \
- sun/rmi/rmic/iiop/ContextElement.java
-
-
-# rmic has dependency on the following com.sun packages
-
-REQUIRED_Group = \
- com/sun/corba/se/impl/util/IdentityHashtable.java \
- com/sun/corba/se/impl/util/Utility.java \
- com/sun/corba/se/impl/util/JDKBridge.java \
- com/sun/corba/se/impl/io/ObjectStreamClass.java \
- com/sun/corba/se/impl/io/TypeMismatchException.java \
- com/sun/corba/se/impl/util/RepositoryId.java
diff --git a/corba/make/com/sun/corba/se/sources/Makefile b/corba/make/com/sun/corba/se/sources/Makefile
deleted file mode 100644
index 7b0666c..0000000
--- a/corba/make/com/sun/corba/se/sources/Makefile
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../..
-
-PACKAGE = com.sun.corba.se
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Rules
-#
-all: build
-
-build: portableactivation.idl.compile logwrapper.generate logresource.generate
-
-clean clobber:: portableactivation.idl.clean
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
-
-FILES_java += com/sun/corba/se/org/omg/CORBA/ORB.java
-
-#
-# Dirs
-#
-
-SRC_DIR = $(SHARE_SRC)/classes
-CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer
-PI_IDL_DIR = $(SRC_DIR)/org/omg/PortableInterceptor
-
-ACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/spi/activation
-PORTABLEACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/PortableActivationIDL
-LOG_GENDIRECTORY = $(GENSRCDIR)/com/sun/corba/se/impl/logging
-
-#
-# IDLs
-#
-
-ACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/spi/activation/activation.idl
-PORTABLEACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/PortableActivationIDL/activation.idl
-
-
-#
-# .mc files
-#
-ACTIVATION.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Activation.mc
-IOR.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/IOR.mc
-INTERCEPTORS.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Interceptors.mc
-NAMING.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Naming.mc
-OMG.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/OMG.mc
-ORBUTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/ORBUtil.mc
-POA.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc
-UTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc
-
-MC_GENERATE_CLASS = make-class
-MC_GENERATE_LOG_RB = make-resource
-
-JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS)
-JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB)
-
-
-#
-# Activation
-#
-
-ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
-
-$(ACTIVATIONFILES): $(ACTIVATION.IDL)
- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
-
-activation.idl.compile: $(ACTIVATIONFILES)
-
-activation.idl.clean:
- $(RM) -f $(ACTIVATIONFILES)
-
-#
-# PortableActivationIDL
-#
-
-PORTABLEACTIVATIONFILES = $(com_sun_corba_se_PortableActivationIDL_java:%=$(GENSRCDIR)/%)
-
-PORTABLEACTIVATION_INCLUDES = -i $(CORBA_IDL_DIR) -i $(PI_IDL_DIR)
-
-PORTABLEACTIVATION_PKG_PREFIXES = -pkgPrefix PortableInterceptor org.omg \
- -pkgPrefix PortableActivationIDL com.sun.corba.se \
- -pkgPrefix Dynamic org.omg \
- -pkgPrefix IOP org.omg
-
-# REVISIT: remove -oldImplBase
-$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
-
-portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
-
-portableactivation.idl.clean:
- $(RM) -f $(PORTABLEACTIVATIONFILES)
-
-#
-# Generate LogWrapper classes
-#
-logwrapper.generate: \
- $(LOG_GENDIRECTORY)/ActivationSystemException.java \
- $(LOG_GENDIRECTORY)/IORSystemException.java \
- $(LOG_GENDIRECTORY)/InterceptorsSystemException.java \
- $(LOG_GENDIRECTORY)/NamingSystemException.java \
- $(LOG_GENDIRECTORY)/OMGSystemException.java \
- $(LOG_GENDIRECTORY)/ORBUtilSystemException.java \
- $(LOG_GENDIRECTORY)/POASystemException.java \
- $(LOG_GENDIRECTORY)/UtilSystemException.java
-
-$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/UtilSystemException.java : $(UTIL.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY)
-
-logresource.generate: $(LOG_GENDIRECTORY)/LogStrings.properties
-
-$(LOG_GENDIRECTORY)/LogStrings.properties: \
- $(LOG_GENDIRECTORY)/ActivationSystemException.resource \
- $(LOG_GENDIRECTORY)/IORSystemException.resource \
- $(LOG_GENDIRECTORY)/InterceptorsSystemException.resource \
- $(LOG_GENDIRECTORY)/NamingSystemException.resource \
- $(LOG_GENDIRECTORY)/OMGSystemException.resource \
- $(LOG_GENDIRECTORY)/ORBUtilSystemException.resource \
- $(LOG_GENDIRECTORY)/POASystemException.resource \
- $(LOG_GENDIRECTORY)/UtilSystemException.resource
- $(CAT) $(LOG_GENDIRECTORY)/*.resource > $(LOG_GENDIRECTORY)/LogStrings.properties
-
-$(LOG_GENDIRECTORY)/ActivationSystemException.resource : $(ACTIVATION.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/IORSystemException.resource : $(IOR.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource : $(INTERCEPTORS.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/NamingSystemException.resource : $(NAMING.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/OMGSystemException.resource : $(OMG.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource : $(ORBUTIL.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/POASystemException.resource : $(POA.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/UtilSystemException.resource : $(UTIL.MC)
- $(prep-target)
- $(JSCHEME_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY)
-
-
-.PHONY: all build clean clobber \
- activation.idl.compile activation.idl.clean \
- portableactivation.idl.compile portableactivation.idl.clean
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Rules.gmk
diff --git a/corba/make/com/sun/corba/se/spi/Makefile b/corba/make/com/sun/corba/se/spi/Makefile
deleted file mode 100644
index df1056f..0000000
--- a/corba/make/com/sun/corba/se/spi/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ../../../../..
-PRODUCT = spi
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# IDL code generation is moved out to an extra step before the
-# actual classes are compiled
-# the files should be compiled in the following order, core to be built
-# before connection
-
-ifdef STANDALONE_CORBA_WS
-SUBDIRS = activation costransactions encoding extension legacy logging monitoring copyobject
-else
-SUBDIRS = activation encoding extension legacy logging monitoring copyobject
-endif
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/corba/make/com/sun/corba/se/spi/activation/Makefile b/corba/make/com/sun/corba/se/spi/activation/Makefile
deleted file mode 100644
index 08b4d71..0000000
--- a/corba/make/com/sun/corba/se/spi/activation/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.activation
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_activation.jmk
-
-FILES_java=$(com_sun_corba_se_spi_activation_java)
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/spi/copyobject/Makefile b/corba/make/com/sun/corba/se/spi/copyobject/Makefile
deleted file mode 100644
index f75a7ce..0000000
--- a/corba/make/com/sun/corba/se/spi/copyobject/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build the copyobject files
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.copyobject
-PRODUCT = copyobject
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_copyobject.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/spi/encoding/Makefile b/corba/make/com/sun/corba/se/spi/encoding/Makefile
deleted file mode 100644
index 4748339..0000000
--- a/corba/make/com/sun/corba/se/spi/encoding/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.encoding
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_encoding.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/spi/extension/Makefile b/corba/make/com/sun/corba/se/spi/extension/Makefile
deleted file mode 100644
index 0df496f..0000000
--- a/corba/make/com/sun/corba/se/spi/extension/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.extension
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_extension.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/spi/legacy/Makefile b/corba/make/com/sun/corba/se/spi/legacy/Makefile
deleted file mode 100644
index 960a134..0000000
--- a/corba/make/com/sun/corba/se/spi/legacy/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ../../../../../..
-PRODUCT = legacy
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = connection interceptor
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/corba/make/com/sun/corba/se/spi/legacy/connection/Makefile b/corba/make/com/sun/corba/se/spi/legacy/connection/Makefile
deleted file mode 100644
index a8ba1c5..0000000
--- a/corba/make/com/sun/corba/se/spi/legacy/connection/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.spi.legacy.connection
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_legacy_connection.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/spi/legacy/interceptor/Makefile b/corba/make/com/sun/corba/se/spi/legacy/interceptor/Makefile
deleted file mode 100644
index f048f3b..0000000
--- a/corba/make/com/sun/corba/se/spi/legacy/interceptor/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.spi.legacy.interceptor
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_legacy_interceptor.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/spi/logging/Makefile b/corba/make/com/sun/corba/se/spi/logging/Makefile
deleted file mode 100644
index 7180675..0000000
--- a/corba/make/com/sun/corba/se/spi/logging/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build the logging files
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.logging
-PRODUCT = logging
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_logging.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/com/sun/corba/se/spi/monitoring/Makefile b/corba/make/com/sun/corba/se/spi/monitoring/Makefile
deleted file mode 100644
index fec2282..0000000
--- a/corba/make/com/sun/corba/se/spi/monitoring/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build the Monitoring files
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.monitoring
-PRODUCT = monitoring
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_monitoring.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/common/BuildToolJar.gmk b/corba/make/common/BuildToolJar.gmk
deleted file mode 100644
index 5b78dd2..0000000
--- a/corba/make/common/BuildToolJar.gmk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Input: BUILDDIR PACKAGE PKGDIR PROGRAM BUILDTOOL_SOURCE_ROOT BUILDTOOL_MAIN
-
-# All subdirectories under the package root for the tool (max depth 4)
-_WC_DIRS = * */* */*/* */*/*/*
-
-BUILDTOOL_MAIN_SOURCE_FILE = $(BUILDTOOL_SOURCE_ROOT)/$(BUILDTOOL_MAIN)
-BUILDTOOL_MANIFEST_FILE = $(BUILDTOOLCLASSDIR)/$(PROGRAM)_manifest.mf
-BUILDTOOL_JAR_FILE = $(BUILDTOOLJARDIR)/$(PROGRAM).jar
-BUILTTOOL_MAINCLASS = $(subst /,.,$(BUILDTOOL_MAIN:%.java=%))
-
-# Wildcard patterns that find all the sources for this build tool
-BUILDTOOL_WC_PATTERNS = $(BUILDTOOL_SOURCE_ROOT)/$(PKGDIR)/*.java \
- $(patsubst %, $(BUILDTOOL_SOURCE_ROOT)/$(PKGDIR)/%/*.java, $(_WC_DIRS))
-
-# Wildcard expansion that finds all the files
-BUILDTOOL_SRC_FILES := $(wildcard $(BUILDTOOL_WC_PATTERNS))
-
-all build: $(BUILDTOOL_JAR_FILE)
-
-$(BUILDTOOL_MANIFEST_FILE): $(BUILDTOOL_MAIN_SOURCE_FILE)
- @$(prep-target)
- $(ECHO) "Main-Class: $(BUILTTOOL_MAINCLASS)" > $@
-
-$(BUILDTOOL_JAR_FILE): $(BUILDTOOL_MANIFEST_FILE) $(BUILDTOOL_SRC_FILES)
- @$(prep-target)
- @$(MKDIR) -p $(BUILDTOOLCLASSDIR)
- $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
- -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
- $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
- -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
- $(JAR_JFLAGS) || $(RM) $@
- @$(java-vm-cleanup)
-
-clean clobber::
- $(RM) -r $(BUILDTOOLCLASSDIR)/$(PKGDIR) \
- $(BUILDTOOL_MANIFEST_FILE) \
- $(BUILDTOOL_JAR_FILE)
-
diff --git a/corba/make/common/CancelImplicits.gmk b/corba/make/common/CancelImplicits.gmk
deleted file mode 100644
index 7f84a42..0000000
--- a/corba/make/common/CancelImplicits.gmk
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Cancel some GNU make implicit rules. This causes far fewer stats
-# (crucial in incremental builds, when all that is being done is stats -- I
-# notice upto 20% speedup on local disk). See sections "10.2 Catalogue of
-# Implicit Rules" and "10.5.6 Canceling Implicit Rules" in make.dvi; see
-# also the output of gnumake -p.
-#
-# CAUTION! This is the first thing included in our makefiles, so you must
-# not add any targets here. Canceling %.f: %.F doesn't make any sense
-# because we don't have any targets ending with .f.
-#
-
-#
-# We don't make binaries directly from .{source} files with implicit
-# rules, so disable all of them.
-#
-ifndef USE_IMPLICITS
-%: %.o
-%: %.obj
-%: %.dll
-%: %.c
-%: %.cc
-%: %.C
-%: %.p
-%: %.f
-%: %.s
-%: %.F
-%: %.r
-%: %.S
-%: %.mod
-%: %.sh
-endif
-
diff --git a/corba/make/common/Classes.gmk b/corba/make/common/Classes.gmk
deleted file mode 100644
index e3e410a..0000000
--- a/corba/make/common/Classes.gmk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include $(BUILDDIR)/common/Rules.gmk
-
-#
-# Say you built classes into $(ALT_CLASSBINDIR) and then at the end of
-# the build you might want to copy them over to $(ALT_CLASSDESTDIR);
-# this rule takes care of that. No one should really set these
-# variables except the bootstrap/recompile stage of the java compiler.
-#
-ifdef ALT_CLASSBINDIR
-
-# By default post-processing is copying. Suppose you want to build
-# a jar file then set ALT_CLASSES_DISPOSITION to '../../dest/nameof.jar'
-# before including this file.
-ifndef ALT_CLASSES_DISPOSITION
-ALT_CLASSES_DISPOSITION = copy-classes
-endif
-
-build : $(ALT_CLASSES_DISPOSITION)
-
-copy-classes:
-ifneq ($(ALT_CLASSBINDIR), $(ALT_CLASSDESTDIR))
- @if [ -s $(TEMPDIR)/.classes.list ]; then \
- $(MKDIR) -p $(ALT_CLASSDESTDIR); \
- $(ECHO) "Copying $(ALT_CLASSBINDIR)..."; \
- $(ECHO) "($(CD) $(ALT_CLASSBINDIR); $(TAR) cf - .) | \
- ($(CD) $(ALT_CLASSDESTDIR); $(TAR) xf -)"; \
- ($(CD) $(ALT_CLASSBINDIR); $(TAR) cf - .) | \
- ($(CD) $(ALT_CLASSDESTDIR); $(TAR) xf -); \
- fi
-else # ALT_CLASSBINDIR
- @if [ -s $(TEMPDIR)/.classes.list ]; then \
- $(ECHO) "Copy source and destination are the same: $(ALT_CLASSBINDIR) -- Copy skipped..."; \
- fi
-endif # ALT_CLASSBINDIR
-
-.PHONY: copy-classes
-endif # ALT_CLASSBINDIR
-
diff --git a/corba/make/common/Defs-bsd.gmk b/corba/make/common/Defs-bsd.gmk
deleted file mode 100644
index 99b3737..0000000
--- a/corba/make/common/Defs-bsd.gmk
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to specify compiler flags for programs and libraries
-# targeted to BSD. Should not contain any rules.
-#
-
-# Warning: the following variables are overriden by Defs.gmk. Set
-# values will be silently ignored:
-# CFLAGS (set $(OTHER_CFLAGS) instead)
-# CPPFLAGS (set $(OTHER_CPPFLAGS) instead)
-# CXXFLAGS (set $(OTHER_CXXFLAGS) instead)
-# LDFLAGS (set $(OTHER_LDFAGS) instead)
-# LDLIBS (set $(EXTRA_LIBS) instead)
-# LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
-
-# Get shared JDK settings
-include $(BUILDDIR)/common/shared/Defs.gmk
-
-ifndef PLATFORM_SRC
- PLATFORM_SRC = $(TOPDIR)/src/solaris
-endif # PLATFORM_SRC
-
diff --git a/corba/make/common/Defs-linux.gmk b/corba/make/common/Defs-linux.gmk
deleted file mode 100644
index f65cfe8..0000000
--- a/corba/make/common/Defs-linux.gmk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to specify compiler flags for programs and libraries
-# targeted to Linux. Should not contain any rules.
-#
-
-# Get shared JDK settings
-include $(BUILDDIR)/common/shared/Defs.gmk
-
-ifndef PLATFORM_SRC
- PLATFORM_SRC = $(TOPDIR)/src/solaris
-endif # PLATFORM_SRC
-
diff --git a/corba/make/common/Defs-solaris.gmk b/corba/make/common/Defs-solaris.gmk
deleted file mode 100644
index 3237978..0000000
--- a/corba/make/common/Defs-solaris.gmk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to specify compiler flags for programs and libraries
-# targeted to Solaris. Should not contain any rules.
-#
-
-# Get shared JDK settings
-include $(BUILDDIR)/common/shared/Defs.gmk
-
-ifndef PLATFORM_SRC
-PLATFORM_SRC = $(TOPDIR)/src/solaris
-endif # PLATFORM_SRC
-
diff --git a/corba/make/common/Defs-windows.gmk b/corba/make/common/Defs-windows.gmk
deleted file mode 100644
index 75823af..0000000
--- a/corba/make/common/Defs-windows.gmk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to specify compiler flags for programs and libraries
-# targeted to Windows builds. Should not contain any rules.
-#
-
-# Get shared JDK settings
-include $(BUILDDIR)/common/shared/Defs.gmk
-
-ifndef PLATFORM_SRC
- PLATFORM_SRC = $(TOPDIR)/src/windows
-endif # PLATFORM_SRC
-
diff --git a/corba/make/common/Defs.gmk b/corba/make/common/Defs.gmk
deleted file mode 100644
index ade12fb..0000000
--- a/corba/make/common/Defs.gmk
+++ /dev/null
@@ -1,273 +0,0 @@
-#
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Common variables used by all the Java makefiles. This file should
-# not contain rules.
-#
-
-#
-# On Solaris, the 'make' utility from Sun will not work with these makefiles.
-# This little rule is only understood by Sun's make, and is harmless
-# when seen by the GNU make tool. If using Sun's make, this causes the
-# make command to fail.
-#
-SUN_MAKE_TEST:sh = echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
-
-include $(BUILDDIR)/common/shared/Platform.gmk
-
-TOPDIR=$(BUILDDIR)/..
-
-include $(TOPDIR)/make/common/CancelImplicits.gmk
-
-# Historically PLATFORM_SRC used to be src/$(PLATFORM), but we switched it to
-# src/solaris so if you want to build on Linux you didn't need a src/linux
-# directory. In an ideal world it would be called src/genunix but we are not
-# there yet.
-#
-ifndef SHARE_SRC
- SHARE_SRC = $(TOPDIR)/src/share
-endif
-
-_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
-
-#
-# Get platform definitions
-#
-
-include $(TOPDIR)/make/common/Defs-$(PLATFORM).gmk
-
-#
-# Localizations for the different parts of the product beyond English
-#
-
-JRE_LOCALES = de es fr it ja ko pt_BR sv zh_CN zh_TW zh_HK
-PLUGIN_LOCALES = de es fr it ja ko pt_BR sv zh_CN zh_TW zh_HK
-JDK_LOCALES = ja zh_CN
-
-#
-# A list of locales we support but don't have resource files.
-# This is defined to optimize the search of resource bundles.
-#
-JRE_NONEXIST_LOCALES = en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh
-
-LIBDIR = $(OUTPUTDIR)/lib
-ABS_LIBDIR = $(ABS_OUTPUTDIR)/lib
-# for ext jre files
-EXTDIR = $(LIBDIR)/ext
-# for generated class files
-CLASSBINDIR = $(OUTPUTDIR)/classes
-DEMOCLASSDIR = $(OUTPUTDIR)/democlasses
-# for generated tool class files
-BUILDTOOLCLASSDIR = $(OUTPUTDIR)/btclasses
-# for build tool jar files
-BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars
-ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
-# for generated java source files
-GENSRCDIR = $(OUTPUTDIR)/gensrc
-# for imported source files
-IMPORTSRCDIR = $(OUTPUTDIR)/impsrc
-# for imported documents
-IMPORTDOCDIR = $(OUTPUTDIR)/impdoc
-# for generated demo
-DEMODIR = $(OUTPUTDIR)/demo
-# for sample code
-SAMPLEDIR = $(OUTPUTDIR)/sample
-# for generated documentation
-DOCSDIR = $(OUTPUTDIR)/docs$(DOCSDIRSUFFIX)
-DOCSDIRSUFFIX =
-
-# An attempt is made to generate unique enough directories for the
-# generated files to not have name collisisons. Most build units
-# defines PRODUCT (except Release.gmk), but then they may or may
-# not define PACKAGE, THREADIR (only HPI uses this), PROGRAM, and
-# LIBRARY. This code chunk attempts to generate a unique
-# OBJDIR/CLASSHDRDIR for each build unit based on which of those
-# values are set within each build unit.
-
-UNIQUE_LOCATION_STRING = tmp
-
-ifneq ($(PRODUCT),)
- UNIQUE_LOCATION_STRING += /$(PRODUCT)
-endif
-
-ifneq ($(PACKAGE),)
- UNIQUE_LOCATION_STRING += /$(PACKAGE)
-endif
-
-ifneq ($(PROGRAM),)
- UNIQUE_LOCATION_STRING += /$(PROGRAM)
-endif
-
-ifneq ($(LIBRARY),)
- ifneq ($(LIBRARY_OUTPUT),)
- UNIQUE_LOCATION_STRING += /$(LIBRARY_OUTPUT)
- else
- UNIQUE_LOCATION_STRING += /$(LIBRARY)
- endif
-endif
-
-ifneq ($(THREADDIR),)
- UNIQUE_LOCATION_STRING += /$(THREADDIR)
-endif
-
-# the use of += above makes a space separated list which we need to
-# remove for filespecs.
-#
-NULLSTRING :=
-ONESPACE := $(NULLSTRING) # space before this comment is required.
-UNIQUE_PATH = $(subst $(ONESPACE),,$(UNIQUE_LOCATION_STRING))
-
-# TEMPDIR is a unique general purpose directory
-# need to use 'override' because GNU Make on Linux exports the wrong
-# value.
-override TEMPDIR = $(OUTPUTDIR)/$(UNIQUE_PATH)
-override ABS_TEMPDIR = $(ABS_OUTPUTDIR)/$(UNIQUE_PATH)
-
-# This must be created right away for pattern rules in Sanity.gmk to work.
-dummy1:=$(shell $(MKDIR) -p $(TEMPDIR))
-dummy2:=$(shell $(MKDIR) -p $(TEMP_DISK))
-
-#
-# CLASSDESTDIR can be used to specify the directory where generated classes
-# are to be placed. The default is CLASSBINDIR.
-#
-ifndef CLASSDESTDIR
-CLASSDESTDIR = $(CLASSBINDIR)
-endif
-
-#
-# vpaths. These are the default locations searched for source files.
-# GNUmakefiles of individual areas often override the default settings.
-# There are no longer default vpath entries for C and assembler files
-# so we can ensure that libraries don't get their hands on JVM files.
-#
-# We define an intermediate variable for Java files because
-# we use its value later to help define $SOURCEPATH
-
-VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
-VPATH.java = $(VPATH0.java)
-vpath %.java $(VPATH.java)
-vpath %.class $(CLASSBINDIR)
-
-#
-# Classpath seen by javac (different from the one seen by the VM
-# running javac), and useful variables.
-#
-SOURCEPATH = $(VPATH.java)
-PKG = $(shell $(EXPR) $(PACKAGE) : '\([a-z]*\)')
-PKGDIR = $(subst .,/,$(PACKAGE))
-
-#
-# The java/javac/jdk variables (JAVAC_CMD, JAVA_CMD, etc.)
-#
-include $(BUILDDIR)/common/shared/Defs-java.gmk
-
-#
-# Set opt level to ALT_OPT if set otherwise _OPT
-#
-POPT = $(_OPT$(ALT_OPT))$(ALT_OPT)
-
-#
-# Convenient macros
-#
-
-# Prepare $@ target, remove old one and making sure directory exists
-define prep-target
-$(MKDIR) -p $(@D)
-$(RM) $@
-endef
-
-# Simple install of $< file to $@
-define install-file
-$(prep-target)
-$(CP) $< $@
-endef
-
-# Cleanup rule for after debug java run (hotspot.log file is left around)
-# (This could be an old leftover file in a read-only area, use the @- prefix)
-HOTSPOT_LOG_NAME = hotspot.log
-define java-vm-cleanup
-if [ -w $(HOTSPOT_LOG_NAME) ] ; then $(RM) $(HOTSPOT_LOG_NAME); fi
-endef
-
-# Default make settings for processing SUBDIRS with clobber or clean names
-SUBDIRS_MAKEFLAGS-clobber = INCREMENTAL_BUILD=false
-SUBDIRS_MAKEFLAGS-clean = INCREMENTAL_BUILD=false
-
-# Given a SUBDIRS list, cd into them and make them
-# SUBDIRS_MAKEFLAGS Make settings for a subdir make
-# SUBDIRS_MAKEFLAGS-$@ Make settings specific to this target
-define SUBDIRS-loop
-@for i in DUMMY $(SUBDIRS) ; do \
- if [ "$$i" != "DUMMY" ] ; then \
- $(MAKE) -C $${i} $@ \
- $(SUBDIRS_MAKEFLAGS) \
- $(SUBDIRS_MAKEFLAGS-$@) \
- FULL_VERSION=$(FULL_VERSION) \
- RELEASE=$(RELEASE) || exit 1; \
- fi ; \
-done
-endef
-
-# Given a OTHERSUBDIRS list, cd into them and make them (extra loop define)
-# OTHERSUBDIRS_MAKEFLAGS Make settings for a subdir make
-define OTHERSUBDIRS-loop
-@for i in DUMMY $(OTHERSUBDIRS) ; do \
- if [ "$$i" != "DUMMY" ] ; then \
- $(MAKE) -C $${i} $@ \
- $(OTHERSUBDIRS_MAKEFLAGS) \
- FULL_VERSION=$(FULL_VERSION) \
- RELEASE=$(RELEASE) || exit 1; \
- fi ; \
-done
-endef
-
-# Prevent the use of many default suffix rules we do not need
-.SUFFIXES:
-.SUFFIXES: .java .class
-
-# Make sure we are all insane
-ifdef INSANE
- export INSANE
-endif
-
-# Make sure we have the current year
-ifndef COPYRIGHT_YEAR
- ifdef ALT_COPYRIGHT_YEAR
- COPYRIGHT_YEAR := $(ALT_COPYRIGHT_YEAR)
- else
- COPYRIGHT_YEAR := $(shell $(DATE) '+%Y')
- endif
- export COPYRIGHT_YEAR
-endif
-
-# Install of imported file (JDK_IMPORT_PATH, or some other external location)
-define install-import-file
-@$(ECHO) "ASSEMBLY_IMPORT: $@"
-$(install-file)
-endef
-
-.PHONY: all build clean clobber
diff --git a/corba/make/common/Rules.gmk b/corba/make/common/Rules.gmk
deleted file mode 100644
index 7080e5b..0000000
--- a/corba/make/common/Rules.gmk
+++ /dev/null
@@ -1,229 +0,0 @@
-#
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-#
-# Rules shared by all Java makefiles.
-#
-
-# Make sure the default rule is all
-rules_default_rule: all
-
-#
-# Directory set up. (Needed by deploy workspace)
-#
-$(CLASSDESTDIR) $(OUTPUTDIR) $(TEMPDIR) $(EXTDIR):
- $(MKDIR) -p $@
-
-#
-# All source tree areas for java/properties files
-#
-ALL_CLASSES_SRC = $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
-
-#
-# If AUTO_FILES_PROPERTIES_DIRS used, automatically find properties files
-#
-ifdef AUTO_FILES_PROPERTIES_DIRS
- AUTO_FILES_PROPERTIES_FILTERS1 = $(SCM_DIRs) 'X-*' '*-X-*' ',*'
- AUTO_FILES_PROPERTIES_FILTERS1 += $(AUTO_PROPERTIES_PRUNE)
- FILES_properties_find_filters1 = $(AUTO_FILES_PROPERTIES_FILTERS1:%=-name % -prune -o)
- FILES_properties_auto1 := \
- $(shell \
- for dir in $(ALL_CLASSES_SRC) ; do \
- if [ -d $$dir ] ; then \
- ( $(CD) $$dir; \
- for sdir in $(AUTO_FILES_PROPERTIES_DIRS); do \
- if [ -d $$sdir ] ; then \
- $(FIND) $$sdir $(FILES_properties_find_filters1) \
- -name '*.properties' -print ; \
- fi ; \
- done \
- ); \
- fi; \
- done \
- )
-else
- FILES_properties_auto1 =
-endif # AUTO_FILES_PROPERTIES_DIRS
-
-# Add any automatically found properties files to the properties file list
-FILES_properties += $(FILES_properties_auto1)
-
-#
-# Get Resources help
-#
-include $(TOPDIR)/make/common/internal/Resources.gmk
-
-#
-# Compiling .java files.
-#
-
-#
-# Automatically add to FILES_java if AUTO_FILES_JAVA_DIRS is defined
-#
-# There are two basic types of sources, normal source files and the
-# generated ones. The Normal sources will be located in:
-# $(ALL_CLASSES_SRC)
-# The generated sources, which might show up late to dinner, are at:
-# $(GENSRCDIR)
-# and since they could be generated late, we need to be careful that
-# we look for these sources late and not use the ':=' assignment which
-# might miss their generation.
-
-ifdef AUTO_FILES_JAVA_DIRS
- # Filter out these files or directories
- AUTO_FILES_JAVA_SOURCE_FILTERS1 = $(SCM_DIRs) 'X-*' '*-X-*' '*-template.java' ',*'
- AUTO_FILES_JAVA_SOURCE_FILTERS2 =
- AUTO_FILES_JAVA_SOURCE_FILTERS1 += $(AUTO_JAVA_PRUNE)
- AUTO_FILES_JAVA_SOURCE_FILTERS2 += $(AUTO_JAVA_PRUNE)
-
- # First list is the normal sources that should always be there,
- # by using the ':=', which means we do this processing once.
- FILES_java_find_filters1 = $(AUTO_FILES_JAVA_SOURCE_FILTERS1:%=-name % -prune -o)
- FILES_java_auto1 := \
- $(shell \
- for dir in $(ALL_CLASSES_SRC) ; do \
- if [ -d $$dir ] ; then \
- ( $(CD) $$dir; \
- for sdir in $(AUTO_FILES_JAVA_DIRS); do \
- if [ -d $$sdir ] ; then \
- $(FIND) $$sdir $(FILES_java_find_filters1) \
- -name '*.java' -print ; \
- fi ; \
- done \
- ); \
- fi; \
- done \
- )
- # Second list is the generated sources that should be rare, but will likely
- # show up late and we need to look for them at the last minute, so we
- # cannot use the ':=' assigment here. But if this gets expanded multiple
- # times, the if tests should make them relatively cheap.
- FILES_java_find_filters2 = $(AUTO_FILES_JAVA_SOURCE_FILTERS2:%=-name % -prune -o)
- FILES_java_auto2 = \
- $(shell \
- for dir in $(GENSRCDIR); do \
- if [ -d $$dir ] ; then \
- ( $(CD) $$dir; \
- for sdir in $(AUTO_FILES_JAVA_DIRS); do \
- if [ -d $$sdir ] ; then \
- $(FIND) $$sdir $(FILES_java_find_filters2) \
- -name '*.java' -print ; \
- fi ; \
- done \
- ); \
- fi; \
- done \
- )
-else
- FILES_java_auto1 =
- FILES_java_auto2 =
-endif
-
-# Add all found java sources to FILES_java macro (if AUTO_FILES_JAVA_DIRS used)
-FILES_java += $(FILES_java_auto1) $(FILES_java_auto2)
-
-# File that will hold java source names that need compiling
-JAVA_SOURCE_LIST=$(TEMPDIR)/.classes.list
-
-# Add a java source to the list
-define add-java-file
-$(ECHO) "$?" >> $(JAVA_SOURCE_LIST)
-endef
-
-$(CLASSDESTDIR)/%.class: $(GENSRCDIR)/%.java
- @$(add-java-file)
-$(CLASSDESTDIR)/%.class: $(PLATFORM_SRC)/classes/%.java
- @$(add-java-file)
-$(CLASSDESTDIR)/%.class: $(SHARE_SRC)/classes/%.java
- @$(add-java-file)
-
-# List of class files needed
-FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
-
-# Construct list of java sources we need to compile
-source_list_prime:
- @$(MKDIR) -p $(TEMPDIR)
-# Note that we slip resources in so that compiled properties files get created:
-$(JAVA_SOURCE_LIST) : source_list_prime resources $(FILES_class)
- @$(TOUCH) $@
-
-.delete.classlist:
- @$(RM) $(JAVA_SOURCE_LIST)
-
-# Make sure all newer sources are compiled (in a batch)
-classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
-
-# Use this javac option to force it to favor the sourcepath file classes
-# rather than any bootclasspath classes.
-JAVAC_PREFER_SOURCE = -Xprefer:source
-
-.compile.classlist : $(JAVA_SOURCE_LIST)
- @$(MKDIR) -p $(CLASSDESTDIR)
- if [ -s $(JAVA_SOURCE_LIST) ] ; then \
- $(CAT) $(JAVA_SOURCE_LIST); \
- $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- fi
- @$(java-vm-cleanup)
-
-clobber clean::
- $(RM) $(JAVA_SOURCE_LIST)
-
-ifndef DONT_CLOBBER_CLASSES
- ifndef PACKAGE
- DONT_CLOBBER_CLASSES = true
- else
- DONT_CLOBBER_CLASSES = false
- endif
-endif
-
-packages.clean:
-ifeq ($(DONT_CLOBBER_CLASSES),false)
- ifdef AUTO_FILES_JAVA_DIRS
- $(RM) -r $(patsubst %, $(CLASSDESTDIR)/%, $(AUTO_FILES_JAVA_DIRS))
- else
- $(RM) -r $(CLASSDESTDIR)/$(PKGDIR)
- endif
-endif
-
-classes.clean: packages.clean
- $(RM) $(JAVA_SOURCE_LIST)
-
-clean clobber:: classes.clean .delete.classlist
-
-#
-# Default dependencies
-#
-
-all: build
-
-build: classes
-
-default: all
-
-.PHONY: all build clean clobber \
- .delete.classlist classes .compile.classlist classes.clean \
- batch_compile
-
diff --git a/corba/make/common/internal/Resources.gmk b/corba/make/common/internal/Resources.gmk
deleted file mode 100644
index e7ccb1b..0000000
--- a/corba/make/common/internal/Resources.gmk
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Generic mechanism for installing properties files, resource bundles,
-# and other resource files.
-#
-# FILES_properties should be defined.
-# FILES_compiled_properties should be defined.
-#
-# If COMPILED_PROPERTIES_SUPERCLASS is defined, ALL the FILES_properties
-# files will be compiled into java with this super class.
-#
-# You can add locales to LOCALE_SUFFIXES explicitly, or use the
-# LOCALE_SET_DEFINITION variable to add some pre-defined locale lists.
-# The LOCALE_SET_DEFINITION can have the value: jre, plugin, or jdk.
-#
-# Resource bundles to be installed are identified using the following variables.
-# Note that only the file name of the base bundle is given; localized versions
-# are added automatically. For Java files, use a format suitable for inclusion
-# in the FILES_java list; dito for properties, all relative paths.
-#
-# NEW_RESOURCE_BUNDLES_JAVA - new resource bundles implemented in
-# Java, not localized
-# NEW_RESOURCE_BUNDLES_PROPERTIES - new resource bundles implemented as
-# properties files, not localized
-# RESOURCE_BUNDLES_JAVA - resource bundles implemented in
-# Java, localized
-# RESOURCE_BUNDLES_PROPERTIES - new resource bundles implemented as
-# properties files, localized
-#
-# The following variable is now used for most .properties files in the JDK.
-# These properties files are converted into java and compiled with javac.
-# The resulting .class files are usually smaller and are always faster to load.
-# The relative path to the properties file becomes a relative path to a
-# java source file.
-#
-# RESOURCE_BUNDLES_COMPILED_PROPERTIES - resource bundles implemented as
-# properties files, localized
-# NEW_RESOURCE_BUNDLES_COMPILED_PROPERTIES - same as above, not localized
-#
-# Other properties files to be installed are identified using the variable:
-#
-# OTHER_PROPERTIES
-#
-
-# Compile properties files into java source?
-ifdef COMPILED_PROPERTIES_SUPERCLASS
- # Add all properties files to the compiled properties list (all or nothing)
- COMPILED_PROPERTIES += $(FILES_compiled_properties) $(FILES_properties)
-else
- COMPILED_PROPERTIES_SUPERCLASS = ListResourceBundle
- COMPILED_PROPERTIES += $(FILES_compiled_properties)
-endif
-
-# Determine the locale suffixes needed beyond the base bundle
-
-ifeq ($(LOCALE_SET_DEFINITION), plugin)
- LOCALE_SUFFIXES += $(PLUGIN_LOCALES)
-endif
-ifeq ($(LOCALE_SET_DEFINITION), jdk)
- LOCALE_SUFFIXES += $(JDK_LOCALES)
-endif
-ifeq ($(LOCALE_SET_DEFINITION), jre)
- LOCALE_SUFFIXES += $(JRE_LOCALES)
-endif
-
-# Java files get tacked onto the standard list of files to compile
-RESOURCE_BUNDLE_FILES_java += $(NEW_RESOURCE_BUNDLES_JAVA)
-RESOURCE_BUNDLE_FILES_java += $(RESOURCE_BUNDLES_JAVA) \
- $(foreach file,$(RESOURCE_BUNDLES_JAVA), \
- $(foreach locale,$(LOCALE_SUFFIXES), \
- $(basename $(file))_$(locale).java))
-
-# Add to java sources list
-FILES_java += $(RESOURCE_BUNDLE_FILES_java)
-
-# Compiled properties files are translated to .java.
-# The .java files are generated into GENSRCDIR.
-COMPILED_PROPERTIES += $(NEW_RESOURCE_BUNDLES_COMPILED_PROPERTIES)
-COMPILED_PROPERTIES += $(RESOURCE_BUNDLES_COMPILED_PROPERTIES) \
- $(foreach file,$(RESOURCE_BUNDLES_COMPILED_PROPERTIES),\
- $(foreach locale,$(LOCALE_SUFFIXES),\
- $(basename $(file))_$(locale)$(suffix $(file))))
-
-# Add to java sources list
-FILES_java += $(COMPILED_PROPERTIES:%.properties=%.java)
-
-# Non-compiled files
-PROPERTIES_FILES += $(NEW_RESOURCE_BUNDLES_PROPERTIES)
-PROPERTIES_FILES += $(RESOURCE_BUNDLES_PROPERTIES) \
- $(foreach file,$(RESOURCE_BUNDLES_PROPERTIES), \
- $(foreach locale,$(LOCALE_SUFFIXES), \
- $(basename $(file))_$(locale)$(suffix $(file))))
-PROPERTIES_FILES += $(OTHER_PROPERTIES)
-
-#
-# Compile Properties tool
-#
-COMPILEPROPERTIES_JARFILE = $(BUILDTOOLJARDIR)/compileproperties.jar
-
-#
-# Strip Properties tool
-#
-STRIPPROPERTIES_JARFILE = $(BUILDTOOLJARDIR)/stripproperties.jar
-
-#
-# Process and strip all non-compiled properties files (in a batch mode)
-#
-STRIP_PROP_FILES = $(PROPERTIES_FILES:%=$(CLASSDESTDIR)/%)
-# To efficiently strip properties we use one run of StripProperties.
-# This macro gathers an option for use later.
-STRIP_PROP_options=$(TEMPDIR)/strip_prop_options
-define install-properties-file
-$(install-file)
-$(CHMOD) a+rw $@
-@$(ECHO) "# Adding to strip properties list: $@"
-$(ECHO) "$@" >> $(STRIP_PROP_options)
-endef
-
-# Constructs command line options file
-$(STRIP_PROP_options): $(STRIP_PROP_FILES)
- @$(TOUCH) $@
-strip_prop_options_clean:
- @$(RM) $(STRIP_PROP_options)
-
-# Strip the properties files
-strip_all_props: $(STRIPPROPERTIES_JARFILE) $(STRIP_PROP_options)
- @if [ -s $(STRIP_PROP_options) ] ; then \
- $(ECHO) "$(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) @$(STRIP_PROP_options)" ; \
- $(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) @$(STRIP_PROP_options) ; \
- fi
- @$(java-vm-cleanup)
-
-#
-# Creates files in CLASSDESTDIR
-#
-
-# In some cases, we move files from package to resources subdir
-$(CLASSDESTDIR)/$(PKGDIR)/resources/%.properties: \
- $(SHARE_SRC)/classes/$(PKGDIR)/%.properties
- $(install-properties-file)
-$(CLASSDESTDIR)/%.properties: $(SHARE_SRC)/classes/%.properties
- $(install-properties-file)
-$(CLASSDESTDIR)/%.res: $(SHARE_SRC)/classes/%.res
- $(install-file)
-$(CLASSDESTDIR)/%.dtd: $(SHARE_SRC)/classes/%.dtd
- $(install-file)
-$(CLASSDESTDIR)/%.xml: $(SHARE_SRC)/classes/%.xml
- $(install-file)
-$(CLASSDESTDIR)/%.prp: $(SHARE_SRC)/classes/%.prp
- $(install-file)
-
-$(GENSRCDIR)/%.java: $(PLATFORM_SRC)/classes/%.properties
- $(add-property-java-file)
-$(GENSRCDIR)/%.java: $(SHARE_SRC)/classes/%.properties
- $(add-property-java-file)
-$(GENSRCDIR)/%.java: $(GENSRCDIR)/%.properties
- $(add-property-java-file)
-
-# Create HK java file from zh_TW (explicit resource bundles only)
-define create-hk-java-file
-@$(prep-target)
-$(CAT) $< | $(SED) -e '/class/s/_zh_TW/_zh_HK/' > $@
-endef
-
-# Explicit resource bundles
-$(GENSRCDIR)/%_zh_HK.java: $(PLATFORM_SRC)/classes/%_zh_TW.java
- $(create-hk-java-file)
-$(GENSRCDIR)/%_zh_HK.java: $(SHARE_SRC)/classes/%_zh_TW.java
- $(create-hk-java-file)
-
-# Compile of zh_HK properties just uses the zh_TW properties files
-$(GENSRCDIR)/%_zh_HK.java: $(PLATFORM_SRC)/classes/%_zh_TW.properties
- $(add-property-java-file)
-$(GENSRCDIR)/%_zh_HK.java: $(SHARE_SRC)/classes/%_zh_TW.properties
- $(add-property-java-file)
-
-# Simple delivery of zh_HK properties files just copies zh_TW properties files
-$(CLASSDESTDIR)/%_zh_HK.properties: \
- $(PLATFORM_SRC)/classes/%_zh_TW.properties
- $(install-properties-file)
-$(CLASSDESTDIR)/%_zh_HK.properties: \
- $(SHARE_SRC)/classes/%_zh_TW.properties
- $(install-properties-file)
-
-# List of java files converted from properties files needed
-COMPILE_PROP_JAVA_FILES = $(COMPILED_PROPERTIES:%.properties=$(GENSRCDIR)/%.java)
-
-# Make sure the build rule creates all the properties
-resources:
-
-ifneq ($(PROPERTIES_FILES),)
- resources: strip_prop_options_clean strip_all_props
- clobber clean::
- $(RM) $(STRIP_PROP_FILES)
- $(RM) $(STRIP_PROP_options)
-endif
-
-.PHONY: resources \
- strip_prop_options_clean strip_all_props
-
diff --git a/corba/make/common/shared/Defs-bsd.gmk b/corba/make/common/shared/Defs-bsd.gmk
deleted file mode 100644
index 2d48947..0000000
--- a/corba/make/common/shared/Defs-bsd.gmk
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Definitions for Bsd.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Bsd (C & C++ compiler warnings)
-ifndef COMPILER_WARNINGS_FATAL
- COMPILER_WARNINGS_FATAL=false
-endif
-
-# Bsd should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
- COMPILE_APPROACH = parallel
-endif
-
-# Indication that we are doing an incremental build.
-# This may trigger the creation of make depend files.
-ifndef INCREMENTAL_BUILD
- INCREMENTAL_BUILD = false
-endif
-
-# FullPath just makes sure it never ends with a / and no duplicates
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# OptFullPath: Absolute path name of a dir that might not initially exist.
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-
-# Location on system where jdk installs might be
-USRJDKINSTANCES_PATH =$(PACKAGE_PATH)
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
-else
- UNIXCOMMAND_PATH = /bin/
-endif
-
-# USRBIN_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_USRBIN_PATH)" "undefined"
- USRBIN_PATH :=$(call PrefixPath,$(ALT_USRBIN_PATH))
-else
- USRBIN_PATH = /usr/bin/
-endif
-
-# UNIXCCS_PATH: path to where the Solaris ported UNIX commands can be found
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
- UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
-else
- UNIXCCS_PATH = /usr/ccs/bin/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-ifdef ALT_SLASH_JAVA
- SLASH_JAVA :=$(ALT_SLASH_JAVA)
-else
- SLASH_JAVA := $(call DirExists,/java,/java,/NOT-SET)
-endif
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifdef ALT_JDK_DEVTOOLS_DIR
- JDK_DEVTOOLS_DIR =$(ALT_JDK_DEVTOOLS_DIR)
-else
- JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-endif
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
- DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
-else
- DEVTOOLS_PATH =$(PACKAGE_PATH)/bin/
-endif
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-ifndef ALT_BOOTDIR
- _BOOTDIR1 =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
- _BOOTDIR2 =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-endif
-
-# Import JDK images allow for partial builds, components not built are
-# imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
-# multiple platforms, e.g. windows-i586, solaris-sparc, bsd-586, etc.
-ifdef ALT_BUILD_JDK_IMPORT_PATH
- BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-else
- BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
-endif
-BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-
-# JDK_IMPORT_PATH: location of JDK install tree (this version) to import
-ifdef ALT_JDK_IMPORT_PATH
- JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-else
- JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-endif
-JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-
diff --git a/corba/make/common/shared/Defs-java.gmk b/corba/make/common/shared/Defs-java.gmk
deleted file mode 100644
index f45a7a1..0000000
--- a/corba/make/common/shared/Defs-java.gmk
+++ /dev/null
@@ -1,209 +0,0 @@
-#
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Common java/javac/jdk variables used by all the Java makefiles.
-# This file should not contain rules.
-#
-
-#
-# Memory related -J flags that all uses of java tools should use.
-#
-JAVA_MEM_FLAGS = -Xmx$(MAX_VM_MEMORY)m
-ifeq ($(ARCH), ia64)
- # Special flags for javac on ia64 to work around a VM problem with
- # bad code generation during inlining (what version had this problem?):
- # Suspect this may not be needed anymore.
- JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
-else
- JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m
-endif
-
-#
-# All java tools (javac and javadoc) run faster with certain java
-# options, this macro should be used with all these tools.
-# In particular, the client VM makes these tools run faster when
-# it's available.
-#
-ADD_CLIENT_VM_OPTION = false
-ifeq ($(PLATFORM), solaris)
- ADD_CLIENT_VM_OPTION = true
-else
- ifeq ($(ARCH_DATA_MODEL), 32)
- ADD_CLIENT_VM_OPTION = true
- endif
-endif
-
-# Options for hotspot to turn off printing of options with fastdebug version
-# and creating the hotspot.log file.
-JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
- -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
-
-# JVM options
-JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
-
-ifeq ($(ADD_CLIENT_VM_OPTION), true)
- JAVA_JVM_FLAGS += -client
-endif
-ifdef USE_HOTSPOT_INTERPRETER_MODE
- JAVA_JVM_FLAGS += -Xint
-endif
-
-# Various VM flags
-JAVA_TOOLS_FLAGS = $(JAVA_JVM_FLAGS) $(JAVA_MEM_FLAGS)
-
-# The VM flags for javac
-JAVAC_JVM_FLAGS =
-
-# 64-bit builds require a larger thread stack size.
-ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
-else
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
-endif
-JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
-
-# The jar -J options are special, must be added at the end of the command line
-JAR_JFLAGS = $(JAVA_TOOLS_FLAGS:%=-J%)
-
-# JAVA_TOOLS_DIR is the default location to find Java tools to run, if
-# langtools is not available.
-# This should be the latest promoted JDK javac.
-ifndef JAVA_TOOLS_DIR
- JAVA_TOOLS_DIR = $(JDK_IMPORT_PATH)/bin
-endif
-
-#
-# Invoking the Java compiler. In leaf makefiles, choose as follows:
-# -- Use JAVAC if you want to take full control of what options get
-# passed to javac.
-# -- Use JAVAC_CMD if you want to take the defaults given to you.
-#
-
-ifndef DEBUG_CLASSFILES
- ifeq ($(VARIANT), DBG)
- DEBUG_CLASSFILES = true
- endif
-endif
-JAVACFLAGS =
-ifeq ($(DEBUG_CLASSFILES),true)
- JAVACFLAGS += -g
-endif
-ifeq ($(JAVAC_MAX_WARNINGS), true)
- JAVACFLAGS += -Xlint:all
-endif
-ifeq ($(JAVAC_WARNINGS_FATAL), true)
- JAVACFLAGS += -Werror
-endif
-
-NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
-JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS)
-
-# Add the source level
-SOURCE_LANGUAGE_VERSION = 7
-LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION)
-JAVACFLAGS += $(LANGUAGE_VERSION)
-
-# Add the class version we want
-TARGET_CLASS_VERSION = 7
-CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
-JAVACFLAGS += $(CLASS_VERSION)
-JAVACFLAGS += -encoding ascii
-JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar
-JAVACFLAGS += $(OTHER_JAVACFLAGS)
-
-# Langtools
-ifdef LANGTOOLS_DIST
- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
- JAVAC_CMD = $(BOOT_JAVA_CMD) \
- "-Xbootclasspath/p:$(JAVAC_JAR)" \
- -jar $(JAVAC_JAR) $(JAVACFLAGS)
- JAVADOC_CMD = $(BOOT_JAVA_CMD) \
- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
- -jar $(JAVADOC_JAR)
-else
- # If no explicit tools, use boot tools (add VM flags in this case)
- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- $(JAVACFLAGS)
- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
-endif
-
-# Override of what javac to use (see deploy workspace)
-ifdef JAVAC
- JAVAC_CMD = $(JAVAC)
-endif
-
-#
-# The bootstrap java compiler (defined as the javac in the ALT_BOOTDIR jdk).
-# Will be used to compile java code used to build the jdk, e.g. class files
-# created by this compiler will NOT become part of this built jdk, but just
-# used to build this jdk, e.g. run with the java in the ALT_BOOTDIR jdk.
-#
-# The javac supplied with the LANGTOOLS_DIST should be used to build the
-# classes that will be put into the built jdk. But note that this javac
-# will use the ALT_BOOTDIR java runtime. Any classes created by the
-# LANGTOOLS_DIST javac should not be run during this jdk build and indeed
-# may not even run with the ALT_BOOTDIR jdk because they may be a newer
-# class file version that the ALT_BOOTDIR jdk doesn't understand.
-#
-# The important observation here is that the built jdk is NOT run during
-# the build. If the built jdk needs to be verified that it can build this
-# same jdk, then it should be supplied to the build process as the ALT_BOOTDIR
-# jdk, and this resulting built jdk should be compared to the first one.
-# (They should be the same). Re-using this built jdk as the ALT_BOOTDIR
-# jdk will be the only way and the recommeneded way to verify the built jdk
-# can bootstrap itself.
-#
-
-# The javac options supplied to the boot javac is limited. This compiler
-# should only be used to build the 'make/tools' sources, which are not
-# class files that end up in the classes directory.
-ifeq ($(JAVAC_MAX_WARNINGS), true)
- BOOT_JAVACFLAGS += -Xlint:all
-endif
-ifeq ($(JAVAC_WARNINGS_FATAL), true)
- BOOT_JAVACFLAGS += -Werror
-endif
-
-BOOT_SOURCE_LANGUAGE_VERSION = 6
-BOOT_TARGET_CLASS_VERSION = 6
-BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
-
-BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
-BOOT_JAVAC_CMD = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
-BOOT_JAR_CMD = $(BOOTDIR)/bin/jar
-BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner
-
-# Various tools we need to run (FIXUP: Are these the right ones?)
-NATIVE2ASCII = $(BOOTDIR)/bin/native2ascii $(JAVA_TOOLS_FLAGS:%=-J%)
-RMIC = $(BOOTDIR)/bin/rmic $(JAVA_TOOLS_FLAGS:%=-J%)
-IDLJ = $(BOOTDIR)/bin/idlj $(JAVA_TOOLS_FLAGS:%=-J%)
-
-# Should not be used
-JAVA = /should/not/be/used
-
diff --git a/corba/make/common/shared/Defs-linux.gmk b/corba/make/common/shared/Defs-linux.gmk
deleted file mode 100644
index c8a3e35..0000000
--- a/corba/make/common/shared/Defs-linux.gmk
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Definitions for Linux.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Linux (C & C++ compiler warnings)
-ifndef COMPILER_WARNINGS_FATAL
- COMPILER_WARNINGS_FATAL=false
-endif
-
-# Linux should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
- COMPILE_APPROACH = parallel
-endif
-
-# Indication that we are doing an incremental build.
-# This may trigger the creation of make depend files.
-ifndef INCREMENTAL_BUILD
- INCREMENTAL_BUILD = false
-endif
-
-# FullPath just makes sure it never ends with a / and no duplicates
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# OptFullPath: Absolute path name of a dir that might not initially exist.
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-
-# Location on system where jdk installs might be
-USRJDKINSTANCES_PATH =/opt/java
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
-else
- UNIXCOMMAND_PATH = /bin/
-endif
-
-# USRBIN_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_USRBIN_PATH)" "undefined"
- USRBIN_PATH :=$(call PrefixPath,$(ALT_USRBIN_PATH))
-else
- USRBIN_PATH = /usr/bin/
-endif
-
-# UNIXCCS_PATH: path to where the Solaris ported UNIX commands can be found
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
- UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
-else
- UNIXCCS_PATH = /usr/ccs/bin/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-ifdef ALT_SLASH_JAVA
- SLASH_JAVA :=$(ALT_SLASH_JAVA)
-else
- SLASH_JAVA := $(call DirExists,/java,/java,/NOT-SET)
-endif
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifdef ALT_JDK_DEVTOOLS_DIR
- JDK_DEVTOOLS_DIR =$(ALT_JDK_DEVTOOLS_DIR)
-else
- JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-endif
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
- DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
-else
- DEVTOOLS_PATH =/usr/bin/
-endif
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-ifndef ALT_BOOTDIR
- _BOOTDIR1 =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
- _BOOTDIR2 =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-endif
-
-# Import JDK images allow for partial builds, components not built are
-# imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
-# multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
-ifdef ALT_BUILD_JDK_IMPORT_PATH
- BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-else
- BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
-endif
-BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-
-# JDK_IMPORT_PATH: location of JDK install tree (this version) to import
-ifdef ALT_JDK_IMPORT_PATH
- JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-else
- JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-endif
-JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-
diff --git a/corba/make/common/shared/Defs-solaris.gmk b/corba/make/common/shared/Defs-solaris.gmk
deleted file mode 100644
index 416e868..0000000
--- a/corba/make/common/shared/Defs-solaris.gmk
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Definitions for Solaris.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Solaris (C & C++ compiler warnings)
-ifndef COMPILER_WARNINGS_FATAL
- COMPILER_WARNINGS_FATAL=false
-endif
-
-# Solaris should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
- COMPILE_APPROACH = parallel
-endif
-
-# Indication that we are doing an incremental build.
-# This may trigger the creation of make depend files.
-ifndef INCREMENTAL_BUILD
- INCREMENTAL_BUILD = false
-endif
-
-# FullPath just makes sure it never ends with a / and no duplicates
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# OptFullPath: Absolute path name of a dir that might not initially exist.
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-
-# Location on system where jdk installs might be
-USRJDKINSTANCES_PATH =/usr/jdk/instances
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
-else
- UNIXCOMMAND_PATH = /usr/bin/
-endif
-
-# UNIXCCS_PATH: path to where the less common UNIX commands can be found
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
- UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
-else
- UNIXCCS_PATH = /usr/ccs/bin/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-ifdef ALT_SLASH_JAVA
- SLASH_JAVA :=$(ALT_SLASH_JAVA)
-else
- SLASH_JAVA := $(call DirExists,/java,/java,/NOT-SET)
-endif
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifdef ALT_JDK_DEVTOOLS_DIR
- JDK_DEVTOOLS_DIR =$(ALT_JDK_DEVTOOLS_DIR)
-else
- JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-endif
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
- DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
-else
- ifdef ALT_JDK_DEVTOOLS_DIR
- DEVTOOLS_PATH =$(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/bin/
- else
- DEVTOOLS_PATH =$(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/bin/
- endif
-endif
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-ifndef ALT_BOOTDIR
- _BOOTDIR1 =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
- _BOOTDIR2 =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-endif
-
-# Import JDK images allow for partial builds, components not built are
-# imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
-# multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
-ifdef ALT_BUILD_JDK_IMPORT_PATH
- BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-else
- BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
-endif
-BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-
-# JDK_IMPORT_PATH: location of previously built JDK (this version) to import
-ifdef ALT_JDK_IMPORT_PATH
- JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-else
- JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-endif
-JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-
diff --git a/corba/make/common/shared/Defs-utils.gmk b/corba/make/common/shared/Defs-utils.gmk
deleted file mode 100644
index 00fab5b..0000000
--- a/corba/make/common/shared/Defs-utils.gmk
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Shared variables for standard unix utilties on all platforms.
-#
-# Assumes Platform.gmk has been included before this file.
-#
-# These input UTILS_* variables can be defined at anytime, ideally once.
-# Unix Commands: Normally /bin/, /usr/bin/. or C:/mksnt/mksnt/
-# UTILS_COMMAND_PATH
-# /usr/bin/
-# UTILS_USR_BIN_PATH
-# /usr/ccs/bin/ (sccs, m4, lex, yacc, as, ar, strip, mcs)
-# UTILS_CCS_BIN_PATH
-# Dev Tools: zip, unzip, etc that we may have special versions of
-# UTILS_DEVTOOL_PATH
-#
-# WARNING: This file cannot assume that any of these utilties are available
-# to be run via their variable names defined here.
-# The paths inside the UTILS_* variables may not be defined yet.
-#
-# Note: There is no guarantee that all these exist on all platforms.
-# Some only make sense for one platform, but are harmless.
-#
-
-ifeq ($(PLATFORM),linux)
- UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
- UTILS_USR_BIN_PATH=$(USRBIN_PATH)
- UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
- UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
-endif
-
-ifeq ($(PLATFORM),bsd)
- UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
- UTILS_USR_BIN_PATH=$(USRBIN_PATH)
- UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
- UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
-endif
-
-ifeq ($(PLATFORM),solaris)
- UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
- UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
- UTILS_CCS_BIN_PATH=$(UNIXCCS_PATH)
- UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
-endif
-
-ifeq ($(PLATFORM),windows)
- UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
- UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
- UTILS_CCS_BIN_PATH=$(UNIXCOMMAND_PATH)
- UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
-endif
-
-# Utilities
-ADB = $(UTILS_COMMAND_PATH)adb
-AR = $(UTILS_CCS_BIN_PATH)ar
-AS = $(UTILS_CCS_BIN_PATH)as
-BASENAME = $(UTILS_COMMAND_PATH)basename
-CAT = $(UTILS_COMMAND_PATH)cat
-CHMOD = $(UTILS_COMMAND_PATH)chmod
-CMP = $(UTILS_USR_BIN_PATH)cmp
-COMM = $(UTILS_USR_BIN_PATH)comm
-COMPRESS = $(UTILS_USR_BIN_PATH)compress
-CP = $(UTILS_COMMAND_PATH)cp
-CPIO = $(UTILS_COMMAND_PATH)cpio
-CUT = $(UTILS_USR_BIN_PATH)cut
-DATE = $(UTILS_COMMAND_PATH)date
-DF = $(UTILS_COMMAND_PATH)df
-DIFF = $(UTILS_USR_BIN_PATH)diff
-DIRNAME = $(UTILS_USR_BIN_PATH)dirname
-ECHO = $(UTILS_COMMAND_PATH)echo
-EGREP = $(UTILS_COMMAND_PATH)egrep
-EXPR = $(UTILS_USR_BIN_PATH)expr
-FILE = $(UTILS_USR_BIN_PATH)file
-FIND = $(UTILS_USR_BIN_PATH)find
-FMT = $(UTILS_COMMAND_PATH)fmt
-GDB = $(UTILS_USR_BIN_PATH)gdb
-GREP = $(UTILS_COMMAND_PATH)grep
-GUNZIP = $(UTILS_COMMAND_PATH)gunzip
-HEAD = $(UTILS_USR_BIN_PATH)head
-ID = $(UTILS_COMMAND_PATH)id
-ISAINFO = $(UTILS_COMMAND_PATH)isainfo
-KSH = $(UTILS_COMMAND_PATH)ksh
-LD = $(UTILS_CCS_BIN_PATH)ld
-LEX = $(UTILS_CCS_BIN_PATH)lex
-LN = $(UTILS_COMMAND_PATH)ln
-LS = $(UTILS_COMMAND_PATH)ls
-MCS = $(UTILS_CCS_BIN_PATH)mcs
-M4 = $(UTILS_CCS_BIN_PATH)m4
-MKDIR = $(UTILS_COMMAND_PATH)mkdir
-MKSINFO = $(UTILS_COMMAND_PATH)mksinfo
-MSGFMT = $(UTILS_USR_BIN_PATH)msgfmt
-MV = $(UTILS_COMMAND_PATH)mv
-NAWK = $(UTILS_USR_BIN_PATH)nawk
-NM = $(UTILS_CCS_BIN_PATH)nm
-PKGMK = $(UTILS_COMMAND_PATH)pkgmk
-PRINTF = $(UTILS_USR_BIN_PATH)printf
-PWD = $(UTILS_COMMAND_PATH)pwd
-RC = $(UTILS_COMMAND_PATH)rc
-RMDIR = $(UTILS_COMMAND_PATH)rmdir
-RPM = $(UTILS_COMMAND_PATH)rpm
-RPMBUILD = $(UTILS_COMMAND_PATH)rpmbuild
-SED = $(UTILS_COMMAND_PATH)sed
-SH = $(UTILS_COMMAND_PATH)sh
-SHOWREV = $(UTILS_USR_BIN_PATH)showrev
-SORT = $(UTILS_COMMAND_PATH)sort
-STRIP = $(UTILS_CCS_BIN_PATH)strip
-TAIL = $(UTILS_USR_BIN_PATH)tail
-TAR = $(UTILS_COMMAND_PATH)tar
-TEST = $(UTILS_USR_BIN_PATH)test
-TOUCH = $(UTILS_COMMAND_PATH)touch
-TR = $(UTILS_USR_BIN_PATH)tr
-TRUE = $(UTILS_COMMAND_PATH)true
-UNAME = $(UTILS_COMMAND_PATH)uname
-UNIQ = $(UTILS_USR_BIN_PATH)uniq
-UNZIP = $(UTILS_USR_BIN_PATH)unzip
-UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
-WC = $(UTILS_USR_BIN_PATH)wc
-WHICH = $(UTILS_USR_BIN_PATH)which
-YACC = $(UTILS_CCS_BIN_PATH)yacc
-ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
-
-# Special cases
-#RM is defined by GNU Make as 'rm -f'
-CD = cd # intrinsic unix command
-
-# Windows specific
-ifeq ($(PLATFORM),windows)
- ifdef USING_CYGWIN
- # Intrinsic unix command, with backslash-escaped character interpretation
- ECHO = $(UNIXCOMMAND_PATH)echo -e
- ZIPEXE = $(UNIXCOMMAND_PATH)zip
- UNZIP = $(UNIXCOMMAND_PATH)unzip
- # Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
- NAWK = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
- else
- ifdef USING_MSYS
- ECHO = $(UTILS_COMMAND_PATH)echo -e
- ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
- UNZIP = $(UTILS_DEVTOOL_PATH)unzip
- NAWK = $(UNIXCOMMAND_PATH)awk
- else
- ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
- UNZIP = $(UTILS_DEVTOOL_PATH)unzip
- NAWK = $(UNIXCOMMAND_PATH)awk
- endif
- endif
- # Re-define some utilities
- LEX =# override GNU Make intrinsic: no lex on windows
- SHA1SUM = $(UNIXCOMMAND_PATH)openssl sha1
-endif
-
-# Linux specific
-ifeq ($(PLATFORM),linux)
- # A few redefines
- # Allows for builds on Debian GNU Linux, basename is in a different place
- BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
- $(wildcard $(UTILS_USR_BIN_PATH)basename))
- # RPM 4 has replaced "rpm -b" with an entirely new utility "rpmbuild".
- # Also, some distribution (Ubuntu, Debian, others?) place the rpm command
- # itself in /usr/bin rather than it's traditional home in /bin.
- RPM=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpm) \
- $(wildcard $(UTILS_USR_BIN_PATH)rpm))
- RPMBUILD=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpmbuild) \
- $(wildcard $(UTILS_USR_BIN_PATH)rpmbuild) \
- $(wildcard $(UTILS_COMMAND_PATH)rpm) \
- $(wildcard $(UTILS_USR_BIN_PATH)rpm))
- # Most Linux distros have "sort" in /bin. Ubuntu, Debian and perhaps
- # others have it in /usr/bin.
- SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- $(wildcard $(UTILS_USR_BIN_PATH)sort))
- NAWK = $(USRBIN_PATH)gawk
- # Intrinsic unix command, with backslash-escaped character interpretation
- ECHO = /bin/echo -e
- # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
- AR = $(UTILS_USR_BIN_PATH)ar
- AS = $(UTILS_USR_BIN_PATH)as
- LD = $(UTILS_USR_BIN_PATH)ld
- LEX = $(UTILS_USR_BIN_PATH)lex
- MCS = $(UTILS_USR_BIN_PATH)mcs
- M4 = $(UTILS_USR_BIN_PATH)m4
- NM = $(UTILS_USR_BIN_PATH)nm
- STRIP = $(UTILS_USR_BIN_PATH)strip
- YACC = $(UTILS_USR_BIN_PATH)yacc
-endif
-
-# Solaris specific
-ifeq ($(PLATFORM),solaris)
- # Intrinsic unix command, with backslash-escaped character interpretation
- # (not using -e will cause build failure when using /bin/bash)
- # (using -e breaks something else)
- ECHO = /usr/bin/echo
-endif
-
-# BSD specific
-ifeq ($(PLATFORM),bsd)
- BASENAME = $(UTILS_USR_BIN_PATH)basename
- EGREP = $(UTILS_USR_BIN_PATH)egrep
- EXPR = $(UTILS_COMMAND_PATH)expr
- FMT = $(UTILS_USR_BIN_PATH)fmt
- GREP = $(UTILS_USR_BIN_PATH)grep
- GUNZIP = $(UTILS_USR_BIN_PATH)gunzip
- ID = $(UTILS_USR_BIN_PATH)id
- MSGFMT = $(UTILS_DEVTOOL_PATH)msgfmt
- SED = $(UTILS_USR_BIN_PATH)sed
- SORT = $(UTILS_USR_BIN_PATH)sort
- TEST = $(UTILS_COMMAND_PATH)test
- TOUCH = $(UTILS_USR_BIN_PATH)touch
- TRUE = $(UTILS_USR_BIN_PATH)true
- UNAME = $(UTILS_USR_BIN_PATH)uname
- # BSD OS_VENDOR specific
- ifeq ($(OS_VENDOR), Apple)
- NAWK = $(UTILS_USR_BIN_PATH)awk
- UNZIPSFX = $(UTILS_USR_BIN_PATH)unzipsfx
- ZIPEXE = $(UTILS_USR_BIN_PATH)zip
- else
- UNZIP = $(UTILS_DEVTOOL_PATH)unzip
- endif
- ifeq ($(OS_VENDOR), OpenBSD)
- NAWK = $(UTILS_USR_BIN_PATH)awk
- else
- CPIO = $(UTILS_USR_BIN_PATH)cpio
- TAR = $(UTILS_USR_BIN_PATH)tar
- endif
-endif
diff --git a/corba/make/common/shared/Defs-windows.gmk b/corba/make/common/shared/Defs-windows.gmk
deleted file mode 100644
index 812e603..0000000
--- a/corba/make/common/shared/Defs-windows.gmk
+++ /dev/null
@@ -1,311 +0,0 @@
-#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Definitions for Windows.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Windows (C++ compiler warnings)
-# Level: Default is 3, 0 means none, 4 is the most but may be unreliable
-# Some makefiles may have set this to 0 to turn off warnings completely,
-# which also effectively creates a COMPILER_WARNINGS_FATAL=false situation.
-# Windows 64bit platforms are less likely to be warning free.
-# Historically, Windows 32bit builds should be mostly warning free.
-ifndef COMPILER_WARNING_LEVEL
- COMPILER_WARNING_LEVEL=3
-endif
-ifndef COMPILER_WARNINGS_FATAL
- COMPILER_WARNINGS_FATAL=false
-endif
-
-# Windows should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
- COMPILE_APPROACH = normal
-endif
-
-# Indication that we are doing an incremental build.
-# This may trigger the creation of make depend files.
-# (This may not be working on windows yet, always force to false.)
-override INCREMENTAL_BUILD = false
-
-# WARNING: This is extremely touch stuff, between CYGWIN vs. MKS and all
-# variations of MKS and CYGWIN releases, and 32bit vs 64bit,
-# this file can give you nightmares.
-#
-# Notes:
-# Keep all paths in the windows "mixed" style except CYGWIN UNXIXCOMMAND_PATH.
-# Use of PrefixPath is critical, some variables must end with / (see NOTE).
-# Use of quotes is critical due to possible spaces in paths coming from
-# the environment variables, be careful.
-# First convert \ to / with subst, keep it quoted due to blanks, then
-# use cygpath -s or dosname -s to get the short non-blank name.
-# If the MKS is old and doesn't have a dosname -s, you will be forced
-# to set ALT variables with the short non-space directory names.
-# If dosname doesn't appear to work, we won't use it.
-# The dosname utility also wants to accept stdin if it is not supplied
-# any path on the command line, this is really dangerous when using
-# make variables that can easily become empty, so I use:
-# echo $1 | dosname -s instead of dosname -s $1
-# to prevent dosname from hanging up the make process when $1 is empty.
-# The cygpath utility does not have this problem.
-# The ALT values should never really have spaces or use \.
-# Suspect these environment variables to have spaces and/or \ characters:
-# SYSTEMROOT, SystemRoot, WINDIR, windir, PROGRAMFILES, ProgramFiles,
-# VC71COMNTOOLS,
-# MSVCDIR, MSVCDir.
-# So use $(subst \,/,) on them first adding quotes and placing them in
-# their own variable assigned with :=, then use FullPath.
-#
-
-# Use FullPath to get C:/ style non-spaces path. Never ends with a /!
-ifdef USING_CYGWIN
-# We assume cygpath is available in the search path
-# NOTE: Use of 'pwd' with CYGWIN will not get you a mixed style path!
-CYGPATH_CMD=cygpath -a -s -m
-define FullPath
-$(shell $(CYGPATH_CMD) $1 2> $(DEV_NULL))
-endef
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then $(CYGPATH_CMD) "$1"; else echo "$1"; fi)
-endef
-else
-ifdef USING_MSYS
-DOSPATH_CMD:=$(shell cd $(JDK_TOPDIR) 2> $(DEV_NULL) && pwd)/make/tools/msys_build_scripts/dospath.sh
-define FullPath
-$(subst \,/,$(shell $(DOSPATH_CMD) $1))
-endef
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-else
-# Temporary until we upgrade to MKS 8.7, MKS pwd returns mixed mode path
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-endif
-endif
-
-# System drive
-ifdef SYSTEMDRIVE
- _system_drive =$(SYSTEMDRIVE)
-else
- ifdef SystemDrive
- _system_drive =$(SystemDrive)
- endif
-endif
-_system_drive:=$(call CheckValue,_system_drive,C:)
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-# With cygwin, use this as is; don't use FullPath on it.
-ifdef ALT_UNIXCOMMAND_PATH
- ifdef USING_CYGWIN
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
- else
- xALT_UNIXCOMMAND_PATH :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))"
- fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH))
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
- endif
-else
- ifdef USING_CYGWIN
- UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
- else
- ifdef USING_MSYS
- UNIXCOMMAND_PATH :=$(call PrefixPath,/bin)
- else
- ifdef ROOTDIR
- xROOTDIR :="$(subst \,/,$(ROOTDIR))"
- _rootdir :=$(call FullPath,$(xROOTDIR))
- else
- xROOTDIR :="$(_system_drive)/mksnt"
- _rootdir :=$(call FullPath,$(xROOTDIR))
- endif
- ifneq ($(_rootdir),)
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt)
- endif
- endif # USING_MSYS
- endif # USING_CYGWIN
-endif
-UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
-export UNIXCOMMAND_PATH
-
-# Get version of MKS or CYGWIN
-ifdef USING_MKS
- _MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@')
- MKS_VER :=$(call GetVersion,$(_MKS_VER))
- # At this point, we can re-define FullPath to use DOSNAME_CMD
- CHECK_MKS87:=$(call CheckVersions,$(MKS_VER),8.7)
- TRY_DOSNAME:=false
- ifeq ($(CHECK_MKS87),same)
- TRY_DOSNAME:=true
- endif
- # Newer should be ok
- ifeq ($(CHECK_MKS87),newer)
- TRY_DOSNAME:=true
- endif
- ifeq ($(TRY_DOSNAME),true)
- ifeq ($(shell $(UNIXCOMMAND_PATH)dosname -s $(_system_drive)/ 2> $(DEV_NULL)),$(_system_drive)/)
- _DOSNAME=$(UNIXCOMMAND_PATH)dosname
- DOSNAME_CMD:=$(_DOSNAME) -s
-define FullPath
-$(subst //,/,$(shell echo $1 | $(DOSNAME_CMD) 2> $(DEV_NULL)))
-endef
- endif # test dosname -s
- endif # TRY_DOSNAME
-endif # MKS
-
-# We try to get references to what we need via the default component
-# environment variables, or what was used historically.
-
-# Process Windows values into FullPath values, these paths may have \ chars
-
-# Program Files directory
-ifndef SHORTPROGRAMFILES
- ifdef PROGRAMFILES
- xPROGRAMFILES :="$(subst \,/,$(PROGRAMFILES))"
- else
- ifeq ($(ARCH_DATA_MODEL), 32)
- xPROGRAMFILES :="$(_system_drive)/Program Files"
- else
- xPROGRAMFILES :="$(_system_drive)/Program Files (x86)"
- endif
- endif
- ifeq ($(ARCH_DATA_MODEL), 32)
- SHORTPROGRAMFILES :=$(call FullPath,$(xPROGRAMFILES))
- else
- ifdef PROGRAMW6432
- xPROGRAMW6432 :="$(subst \,/,$(PROGRAMW6432))"
- else
- xPROGRAMW6432 :="$(_system_drive)/Program Files"
- endif
- SHORTPROGRAMFILES :=$(call FullPath,$(xPROGRAMW6432))
- endif
- ifneq ($(word 1,$(SHORTPROGRAMFILES)),$(SHORTPROGRAMFILES))
- SHORTPROGRAMFILES :=
- endif
- export SHORTPROGRAMFILES
-endif
-
-# Location on system where jdk installs might be
-ifneq ($(SHORTPROGRAMFILES),)
- USRJDKINSTANCES_PATH =$(SHORTPROGRAMFILES)/Java
-else
- USRJDKINSTANCES_PATH =$(_system_drive)/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-ifndef SLASH_JAVA
- ifdef ALT_SLASH_JAVA
- xALT_SLASH_JAVA :="$(subst \,/,$(ALT_SLASH_JAVA))"
- SLASH_JAVA :=$(call FullPath,$(xALT_SLASH_JAVA))
- else
- ifdef ALT_JDK_JAVA_DRIVE
- SLASH_JAVA =$(JDK_JAVA_DRIVE)
- else
- SLASH_JAVA =J:
- endif
- endif
- SLASH_JAVA:=$(call AltCheckSpaces,SLASH_JAVA)
- SLASH_JAVA:=$(call AltCheckValue,SLASH_JAVA)
- export SLASH_JAVA
-endif
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifndef JDK_DEVTOOLS_DIR
- ifdef ALT_JDK_DEVTOOLS_DIR
- xALT_JDK_DEVTOOLS_DIR :="$(subst \,/,$(ALT_JDK_DEVTOOLS_DIR))"
- JDK_DEVTOOLS_DIR :=$(call FullPath,$(xALT_JDK_DEVTOOLS_DIR))
- else
- JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
- endif
- JDK_DEVTOOLS_DIR:=$(call AltCheckSpaces,JDK_DEVTOOLS_DIR)
- JDK_DEVTOOLS_DIR:=$(call AltCheckValue,JDK_DEVTOOLS_DIR)
- export JDK_DEVTOOLS_DIR
-endif
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifndef DEVTOOLS_PATH
- # DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
- # NOTE: Must end with / so that it could be empty, allowing PATH usage.
- ifdef ALT_DEVTOOLS_PATH
- xALT_DEVTOOLS_PATH :="$(subst \,/,$(ALT_DEVTOOLS_PATH))"
- fxALT_DEVTOOLS_PATH :=$(call FullPath,$(xALT_DEVTOOLS_PATH))
- DEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_DEVTOOLS_PATH))
- else
- ifdef USING_CYGWIN
- DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
- else
- ifdef USING_MSYS
- DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
- else
- xDEVTOOLS_PATH :="$(_system_drive)/utils"
- fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
- DEVTOOLS_PATH :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
- endif # USING_MSYS
- endif # USING_CYGWIN
- endif
- DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH)
- export DEVTOOLS_PATH
-endif
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-ifndef ALT_BOOTDIR
- _BOOTDIR1 =$(_system_drive)/jdk$(PREVIOUS_JDK_VERSION)
- _BOOTDIR2 =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-endif
-
-# Import JDK images allow for partial builds, components not built are
-# imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
-# multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
-ifndef BUILD_JDK_IMPORT_PATH
- ifdef ALT_BUILD_JDK_IMPORT_PATH
- BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
- else
- BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
- endif
- BUILD_JDK_IMPORT_PATH:=$(call AltCheckSpaces,BUILD_JDK_IMPORT_PATH)
- BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
- export BUILD_JDK_IMPORT_PATH
-endif
-
-# JDK_IMPORT_PATH: location of previously built JDK (this version) to import
-ifndef JDK_IMPORT_PATH
- ifdef ALT_JDK_IMPORT_PATH
- JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
- else
- JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
- endif
- JDK_IMPORT_PATH:=$(call AltCheckSpaces,JDK_IMPORT_PATH)
- JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
- export JDK_IMPORT_PATH
-endif
-
diff --git a/corba/make/common/shared/Defs.gmk b/corba/make/common/shared/Defs.gmk
deleted file mode 100644
index 1619dcb..0000000
--- a/corba/make/common/shared/Defs.gmk
+++ /dev/null
@@ -1,326 +0,0 @@
-#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Defnitions for all platforms.
-#
-# Normally the convention is that these alternate definitions of
-# primary make variables are never defined inside the Makefiles anywhere
-# but are defined via environment variables or set on the make command
-# line. So you should never see an ALT_* variable defined in any
-# makefiles, just used. This is the convention and there are some
-# exceptions, either mistakes or unusual circumstances.
-#
-# The naming convention for the default value of one of these variables
-# that has an ALT_* override capability is to name the default value with a
-# leading underscore (_). So for XXX you would have:
-# _XXX default value
-# ALT_XXX any override the user is providing if any
-# XXX the final value, either the default _XXX or the ALT_XXX value.
-#
-
-# On Directory names. In very rare cases should the Windows directory
-# names use the backslash, please use the C:/ style of windows paths.
-# Avoid duplicating the // characters in paths, this has known to cause
-# strange problems with jar and other utilities, e.g. /a//b/ != /a/b/.
-# Some of these variables have an explicit trailing / character, but in
-# general, they should NOT have the trailing / character.
-
-# Get shared system utilities macros defined
-include $(BUILDDIR)/common/shared/Defs-utils.gmk
-
-# Assumes ARCH, PLATFORM, etc. have been defined.
-
-# Simple pwd path
-define PwdPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# Checks an ALT value for spaces (should be one word),
-# warns and returns Check_ALT_$1 if spaces
-define AltCheckSpaces
-$(if $(word 2,$($1)),$(warning "WARNING: Value of $1 contains a space: '$($1)', check or set ALT_$1")Check_ALT_$1,$($1))
-endef
-
-# Checks an ALT value for empty, warns and returns Check_ALT_$1 if empty
-define AltCheckValue
-$(if $($1),$($1),$(warning "WARNING: Value of $1 cannot be empty, check or set ALT_$1")Check_ALT_$1)
-endef
-
-# Checks any value for empty, warns and returns $2 if empty
-define CheckValue
-$(if $($1),$($1),$(warning "WARNING: Value of $1 cannot be empty, will use '$2'")$2)
-endef
-
-# Prefix for a utility prefix path, if empty leave alone, otherwise end with a /
-define PrefixPath
-$(if $1,$(subst //,/,$1/),)
-endef
-
-# Select a directory if it exists, or the alternate 2 or the alternate 3
-define DirExists
-$(shell \
- if [ -d "$1" ]; then \
- echo "$1"; \
- elif [ -d "$2" ]; then \
- echo "$2"; \
- else \
- echo "$3"; \
- fi)
-endef
-
-# Select a writable directory if it exists and is writable, or the alternate
-define WriteDirExists
-$(shell \
- if [ -d "$1" -a -w "$1" ]; then \
- echo "$1"; \
- else \
- echo "$2"; \
- fi)
-endef
-
-# Select a file if it exists, or the alternate 1, or the alternate 2
-define FileExists
-$(shell \
- if [ -r "$1" ]; then \
- echo "$1"; \
- elif [ -r "$2" ]; then \
- echo "$2"; \
- else \
- echo "NO_FILE_EXISTS"; \
- fi)
-endef
-
-# Given a line of text, get the major.minor version number from it
-define GetVersion
-$(shell echo $1 | sed -e 's@[^1-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*@\1@' )
-endef
-
-# Given a major.minor.micro version, return the major, minor, or micro number
-define MajorVersion
-$(if $(word 1, $(subst ., ,$1)),$(word 1, $(subst ., ,$1)),0)
-endef
-define MinorVersion
-$(if $(word 2, $(subst ., ,$1)),$(word 2, $(subst ., ,$1)),0)
-endef
-define MicroVersion
-$(if $(word 3, $(subst ., ,$1)),$(word 3, $(subst ., ,$1)),0)
-endef
-
-# Macro that returns missing, same, newer, or older $1=version $2=required
-# (currently does not check the micro number)
-define CheckVersions
-$(shell \
- if [ "$1" = "" -o "$2" = "" ]; then \
- echo missing; \
- else \
- if [ "$1" = "$2" ]; then \
- echo same; \
- else \
- if [ $(call MajorVersion,$1) -lt $(call MajorVersion,$2) ] ; then \
- echo older; \
- else \
- if [ $(call MajorVersion,$1) -eq $(call MajorVersion,$2) -a \
- $(call MinorVersion,$1) -lt $(call MinorVersion,$2) ]; then \
- echo older; \
- else \
- echo newer; \
- fi; \
- fi; \
- fi; \
- fi)
-endef
-
-# Make sure certain variables are non-empty at this point
-_check_values:=\
-$(call CheckValue,ARCH,),\
-$(call CheckValue,ARCH_DATA_MODEL,),\
-$(call CheckValue,VARIANT,),\
-$(call CheckValue,PLATFORM,)
-
-# Misc common settings for all workspaces
-# This determines the version of the product, and the previous version or boot
-ifndef JDK_MAJOR_VERSION
- JDK_MAJOR_VERSION = 1
- PREVIOUS_MAJOR_VERSION = 1
-endif
-
-ifndef JDK_MINOR_VERSION
- JDK_MINOR_VERSION = 7
- PREVIOUS_MINOR_VERSION = 6
-endif
-
-ifndef JDK_MICRO_VERSION
- JDK_MICRO_VERSION = 0
- PREVIOUS_MICRO_VERSION = 0
-endif
-
-ifndef MILESTONE
- MILESTONE = internal
-endif
-
-ifndef BUILD_NUMBER
- JDK_BUILD_NUMBER = b00
-else
- ifndef JDK_BUILD_NUMBER
- JDK_BUILD_NUMBER = $(BUILD_NUMBER)
- endif
-endif
-
-# Default variant is the optimized version of everything
-# can be OPT or DBG, default is OPT
-# Determine the extra pattern to add to the release name for debug/fastdebug.
-# Determine the JDK_IMPORT_VARIANT, so we get the right VM files copied over.
-#
-ifeq ($(VARIANT), DBG)
- BUILD_VARIANT_RELEASE=-debug
-else
- BUILD_VARIANT_RELEASE=
-endif
-ifeq ($(FASTDEBUG), true)
- VARIANT=DBG
- BUILD_VARIANT_RELEASE=-fastdebug
- _JDK_IMPORT_VARIANT=/fastdebug
-endif
-
-# Depending on the flavor of the build, add a -debug or -fastdebug to the name
-ifdef DEBUG_NAME
- BUILD_VARIANT_RELEASE=-$(DEBUG_NAME)
-endif
-
-JDK_VERSION = $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
-JDK_UNDERSCORE_VERSION = $(subst .,_,$(JDK_VERSION))
-
-# RELEASE is JDK_VERSION and -MILESTONE if MILESTONE is set
-ifneq ($(MILESTONE),fcs)
- RELEASE = $(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
-else
- RELEASE = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
-endif
-
-# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
-ifndef FULL_VERSION
- ifdef BUILD_NUMBER
- FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
- else
- BUILD_NUMBER = b00
- USER_RELEASE_SUFFIX := $(shell echo $(USER)_`date '+%d_%b_%Y_%H_%M' | tr "A-Z" "a-z"`)
- FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
- endif
- export FULL_VERSION
-endif
-
-# Promoted build location
-PROMOTED_RE_AREA = $(SLASH_JAVA)/re/jdk/$(JDK_VERSION)/promoted
-PROMOTED_BUILD_LATEST = latest
-PROMOTED_BUILD_BASEDIR = $(PROMOTED_RE_AREA)/$(PROMOTED_BUILD_LATEST)
-PROMOTED_BUILD_BINARIES = $(PROMOTED_BUILD_BASEDIR)/binaries
-
-# OPT: Changes what the optimizations settings (in _OPT)
-POPT = $(_OPT$(ALT_OPT))$(ALT_OPT)
-
-# PARALLEL_COMPILE_JOBS: is the number of compiles done in parallel.
-# If the user sets ALT_PARALLEL_COMPILE_JOBS, then COMPILE_APPROACH is set
-# to parallel.
-#
-# Recommended setting: 2 seems to be ideal for single cpu machines,
-# 2 times the number of CPU's is a basic formula,
-# but probably not more than 4 if the machine is
-# being shared by others, or the machine is limited
-# in RAM or swap.
-#
-ifdef ALT_PARALLEL_COMPILE_JOBS
- PARALLEL_COMPILE_JOBS=$(ALT_PARALLEL_COMPILE_JOBS)
-else
- PARALLEL_COMPILE_JOBS=2
-endif
-
-# Previous JDK release (version of BOOTDIR version)
-ifdef ALT_PREVIOUS_JDK_VERSION
- PREVIOUS_JDK_VERSION = $(ALT_PREVIOUS_JDK_VERSION)
-else
- PREVIOUS_JDK_VERSION = $(PREVIOUS_MAJOR_VERSION).$(PREVIOUS_MINOR_VERSION).$(PREVIOUS_MICRO_VERSION)
-endif
-export PREVIOUS_JDK_VERSION
-PREVIOUS_JDK_VERSION:=$(call AltCheckSpaces,PREVIOUS_JDK_VERSION)
-PREVIOUS_JDK_VERSION:=$(call AltCheckValue,PREVIOUS_JDK_VERSION)
-
-# Version with _ instead of . in number
-ifeq ($(PREVIOUS_MINOR_VERSION),5)
- PREVIOUS_JDK_UNDERSCORE_VERSION = $(subst .,_,$(PREVIOUS_JDK_VERSION))
-else
- PREVIOUS_JDK_UNDERSCORE_VERSION = $(PREVIOUS_MINOR_VERSION)
-endif
-
-# Get platform specific settings
-include $(BUILDDIR)/common/shared/Defs-$(PLATFORM).gmk
-
-# Components
-ifdef ALT_LANGTOOLS_DIST
- LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST))
-else
- LANGTOOLS_DIST =
-endif
-
-# These are the same on all platforms but require the above platform include 1st
-
-# BOOTDIR: Bootstrap JDK, previous released JDK.
-# _BOOTDIR1 and _BOOTDIR2 picked by platform
-ifdef ALT_BOOTDIR
- BOOTDIR =$(ALT_BOOTDIR)
-else
- BOOTDIR :=$(call DirExists,$(_BOOTDIR1),$(_BOOTDIR2),/NO_BOOTDIR)
-endif
-export BOOTDIR
-BOOTDIR:=$(call AltCheckSpaces,BOOTDIR)
-BOOTDIR:=$(call AltCheckValue,BOOTDIR)
-
-# OUTPUTDIR: Location of all output for the build
-_BACKUP_OUTPUTDIR = $(TEMP_DISK)/$(USER)/jdk-outputdir
-ifdef ALT_OUTPUTDIR
- _POSSIBLE_OUTPUTDIR =$(subst \,/,$(ALT_OUTPUTDIR))
-else
- ifndef _OUTPUTDIR
- _OUTPUTDIR = $(_BACKUP_OUTPUTDIR)
- endif
- _POSSIBLE_OUTPUTDIR =$(_OUTPUTDIR)
-endif
-_create_outputdir1:=$(shell mkdir -p $(_POSSIBLE_OUTPUTDIR) > $(DEV_NULL) 2>&1)
-OUTPUTDIR:=$(call WriteDirExists,$(_POSSIBLE_OUTPUTDIR),$(_BACKUP_OUTPUTDIR))
-_create_outputdir2:=$(shell mkdir -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1)
-ifeq "$(OUTPUTDIR)" "$(_BACKUP_OUTPUTDIR)"
- _outputdir_warning:=$(warning "WARNING: OUTPUTDIR '$(_POSSIBLE_OUTPUTDIR)' not writable, will use '$(_BACKUP_OUTPUTDIR)'")
-endif
-OUTPUTDIR:=$(call AltCheckSpaces,OUTPUTDIR)
-OUTPUTDIR:=$(call AltCheckValue,OUTPUTDIR)
-
-# Bin directory
-# NOTE: ISA_DIR is usually empty, on Solaris it might be /sparcv9 or /amd64
-BINDIR = $(OUTPUTDIR)/bin$(ISA_DIR)
-
-# Absolute path to output directory
-ABS_OUTPUTDIR:=$(call FullPath,$(OUTPUTDIR))
-
-
diff --git a/corba/make/common/shared/Platform.gmk b/corba/make/common/shared/Platform.gmk
deleted file mode 100644
index 0b3edf4..0000000
--- a/corba/make/common/shared/Platform.gmk
+++ /dev/null
@@ -1,519 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Shared platform (OS/ARCH) variable settings for the JDK builds.
-#
-# Includes basic system requirements, versions of utilities required,
-# suffixes on files, and basic defaults attributed to the build platform.
-#
-
-#
-# Assumes some basic unix system utilities (e.g. uname) are in the search path
-# in order to figure out the system.
-#
-
-ifndef PLATFORM_SHARED
-
-PLATFORM_SHARED=done
-
-# Possible Input variables:
-# ARCH_DATA_MODEL 32 or 64, default to 32
-# USER, LOGNAME user name (runs logname, or id if not set)
-# PROCESSOR_IDENTIFIER windows only: needed in environment
-#
-# (Also gets input by running the utilities uname, logname, isainfo, or id.)
-#
-# Variables set by this file:
-# SYSTEM_UNAME what 'uname' says this system is
-# USER login name of user (minus blanks)
-# PLATFORM windows, solaris, or linux
-# VARIANT OPT or DBG, OPT is the default
-# OS_NAME solaris, linux, or nt
-# OS_VERSION specific version of os, 5.10, 2.4.9-e.3, etc.
-# TEMP_DISK /tmp or C:/temp
-# ARCH_DATA_MODEL 32 or 64
-# ARCH sparc, sparcv9, i586, amd64, or ia64
-# ARCH_FAMILY sparc or i586
-# ARCHPROP sparc or x86
-# DEV_NULL destination of /dev/null, NUL or /dev/NULL
-# CLASSPATH_SEPARATOR separator in classpath, ; or :
-# BUNDLE_FILE_SUFFIX suffix for bundles: .tar or .tar.gz
-# ISA_DIR solaris only: /sparcv9 or /amd64
-# REQUIRED_WINDOWS_NAME windows only: basic name of windows
-# REQUIRED_WINDOWS_VERSION windows only: specific version of windows
-# USING_CYGWIN windows only: true or false
-# USING_MSYS windows only: true or false
-# USING_MKS windows only: true or false
-# WINDOWS_NT_VERSION_STRING windows only: long version name
-# REQUIRED_OS_VERSION required OS version, e.g. 5.10, 2.4
-# REQUIRED_FREE_SPACE minimum disk space needed for outputdir
-# REQUIRED_ZIP_VER required version of zip
-# REQUIRED_UNZIP_VER required version of unzip
-# LINUX_VERSION_INFO linux only: location of linux release file
-# REQUIRED_LINUX_VER linux only: required version of linux
-# REQUIRED_LINUX_FULLVER linux only: required full version of linux
-
-ifndef SYSTEM_UNAME
- SYSTEM_UNAME := $(shell uname)
- export SYSTEM_UNAME
-endif
-
-# Normal boot jdk is previous release, but a hard requirement is a 1.5 boot
-REQUIRED_BOOT_VER = 1.5
-
-# Don't define this unless it's not defined
-ifndef VARIANT
- VARIANT=OPT
-endif
-
-# Platform settings specific to Solaris
-ifeq ($(SYSTEM_UNAME), SunOS)
- PLATFORM = solaris
- OS_NAME = solaris
- OS_VERSION := $(shell uname -r)
- # Solaris sparc build can be either 32-bit or 64-bit.
- # Default to 32, but allow explicit setting to 32 or 64.
- ifndef ARCH_DATA_MODEL
- ARCH_DATA_MODEL=32
- endif
- ifeq ($(ARCH_DATA_MODEL), 32)
- processor := $(shell uname -p)
- archExpr = case "$(processor)" in \
- i[3-9]86) \
- echo i586 \
- ;; \
- sparc*) \
- echo sparc \
- ;; \
- *) \
- echo $(processor) \
- ;; \
- esac
- ARCH := $(shell $(archExpr))
- else
- ARCH := $(shell isainfo -n)
- # ISA_DIR is used to locate 64-bit specific libraries which are generally
- # in the same general place as other libraries under the ./$(ARCH) directory
- ISA_DIR = /$(ARCH)
- endif
- # Need to maintain the jre/lib/i386 location for 32-bit Intel
- ifeq ($(ARCH), i586)
- ARCH_FAMILY = $(ARCH)
- # Value of Java os.arch property
- ARCHPROP = x86
- else
- ifeq ($(ARCH), amd64)
- ARCH_FAMILY = i586
- else
- ARCH_FAMILY = sparc
- endif
- # Value of Java os.arch property
- ARCHPROP = $(ARCH)
- endif
- # Suffix for file bundles used in previous release
- BUNDLE_FILE_SUFFIX=.tar
- # Required Solaris version
- REQUIRED_OS_VERSION = 5.10
- # Minimum disk space needed as determined by running 'du -sk' on
- # a fully built workspace.
- ifeq ($(ARCH_FAMILY), sparc)
- REQUIRED_FREE_SPACE=1300000
- else
- REQUIRED_FREE_SPACE=1040000
- endif
- # How much RAM does this machine have:
- MB_OF_MEMORY:=$(shell /usr/sbin/prtconf 2>/dev/null | fgrep 'Memory size:' | expand | cut -d' ' -f3)
-endif
-
-# Platform settings specific to Linux
-ifeq ($(SYSTEM_UNAME), Linux)
- PLATFORM = linux
- OS_NAME = linux
- OS_VERSION := $(shell uname -r)
- # Arch and OS name/version
- mach := $(shell uname -m)
- archExpr = case "$(mach)" in \
- i[3-9]86) \
- echo i586 \
- ;; \
- ia64) \
- echo ia64 \
- ;; \
- x86_64) \
- echo amd64 \
- ;; \
- sparc*) \
- echo sparc \
- ;; \
- arm*) \
- echo arm \
- ;; \
- *) \
- echo $(mach) \
- ;; \
- esac
- ARCH := $(shell $(archExpr) )
- ARCH_FAMILY := $(ARCH)
-
- # Linux builds may be 32-bit or 64-bit data model.
- ifeq ($(ARCH), sparc)
- # Linux sparc build can be either 32-bit or 64-bit.
- # Default to 32, but allow explicit setting to 32 or 64.
- ifndef ARCH_DATA_MODEL
- ARCH_DATA_MODEL=32
- endif
- ifeq ($(ARCH_DATA_MODEL), 32)
- ARCH=sparc
- else
- ARCH=sparcv9
- endif
- else
- # i586 is 32-bit, amd64 is 64-bit
- ifndef ARCH_DATA_MODEL
- ifeq ($(ARCH), i586)
- ARCH_DATA_MODEL=32
- else
- ARCH_DATA_MODEL=64
- endif
- endif
- endif
-
- ifeq ($(ARCH), i586)
- ARCHPROP = i386
- else
- ARCHPROP = $(ARCH)
- endif
-
- # Suffix for file bundles used in previous release
- BUNDLE_FILE_SUFFIX=.tar.gz
- # Minimum disk space needed as determined by running 'du -sk' on
- # a fully built workspace.
- REQUIRED_FREE_SPACE=1460000
- LINUX_VERSION_INFO = /etc/redhat-release
- ifeq ($(ARCH_DATA_MODEL), 32)
- REQUIRED_LINUX_VER = Advanced Server
- REQUIRED_LINUX_FULLVER = Advanced Server release 2.1AS
- REQUIRED_OS_VERSION = 2.4.9-e.3
- else
- ifeq ($(ARCH), amd64)
- LINUX_VERSION_INFO = /etc/SuSE-release
- REQUIRED_LINUX_VER = 8.1
- REQUIRED_LINUX_FULLVER = $(REQUIRED_LINUX_VER) SLSE AMD64
- REQUIRED_OS_VERSION = 2.4.19-SMP
- else
- REQUIRED_LINUX_VER = Advanced Server
- REQUIRED_LINUX_FULLVER = Advanced Server release 2.1AS 64 bit
- REQUIRED_OS_VERSION = 2.4.19-SMP
- endif
- endif
- # How much RAM does this machine have:
- MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
-endif
-
-ifeq ($(SYSTEM_UNAME), FreeBSD)
- PLATFORM = bsd
- OS_NAME = freebsd
- OS_VENDOR = FreeBSD
- REQUIRED_OS_VERSION = 6.0
-endif
-
-ifeq ($(SYSTEM_UNAME), Darwin)
- PLATFORM = bsd
- OS_NAME = darwin
- OS_VENDOR = Apple
- REQUIRED_OS_VERSION = 8.0
-endif
-
-ifeq ($(SYSTEM_UNAME), NetBSD)
- PLATFORM = bsd
- OS_NAME = netbsd
- OS_VENDOR = NetBSD
- REQUIRED_OS_VERSION = 3.0
-endif
-
-ifeq ($(SYSTEM_UNAME), OpenBSD)
- PLATFORM = bsd
- OS_NAME = openbsd
- OS_VENDOR = OpenBSD
- REQUIRED_OS_VERSION = 4.9
-endif
-
-# Platform settings specific to BSD
-ifeq ($(PLATFORM), bsd)
- OS_VERSION := $(shell uname -r)
- # Arch and OS name/version
- mach := $(shell uname -m)
- archExpr = case "$(mach)" in \
- i[3-9]86) \
- echo i586 \
- ;; \
- sparc64) \
- echo sparcv9 \
- ;; \
- sparc*) \
- echo sparc \
- ;; \
- x86_64) \
- echo x86_64 \
- ;; \
- "Power Macintosh") \
- echo ppc \
- ;; \
- *) \
- echo $(mach) \
- ;; \
- esac
- ARCH := $(shell $(archExpr) )
- ARCH_FAMILY := $(ARCH)
-
- # Darwin builds are currently universal but only include 64-bit
- #
- # ifeq ($(SYSTEM_UNAME), Darwin)
- # ifneq ($(ARCH), ppc)
- # ARCH=universal
- # endif
- # endif
-
- # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
- ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))
- ARCH_DATA_MODEL=32
- else
- ARCH_DATA_MODEL=64
- endif
-
- ifeq ($(ARCH), i586)
- LIBARCH = i386
- else
- LIBARCH = $(ARCH)
- endif
-
- # Value of Java os.arch property
- ARCHPROP = $(LIBARCH)
-
- # Suffix for file bundles used in previous release
- BUNDLE_FILE_SUFFIX=.tar.gz
- # Minimum disk space needed as determined by running 'du -sk' on
- # a fully built workspace.
- REQUIRED_FREE_SPACE=1500000
- # How much RAM does this machine have:
- ifeq ($(OS_VENDOR), OpenBSD)
- MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' )
- else
- MB_OF_MEMORY=$(shell (sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' )
- endif
-endif
-
-# Windows with and without CYGWIN will be slightly different
-ifeq ($(SYSTEM_UNAME), Windows_NT)
- PLATFORM = windows
- USING_MKS = true
- export USING_MKS
- OS_VERSION := $(shell uname -r)
- WINDOWS_NT_VERSION_STRING=Windows_NT
- REQUIRED_MKS_VER=6.1
-endif
-ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
- PLATFORM = windows
- OS_VERSION := 5
- USING_CYGWIN = true
- export USING_CYGWIN
- WINDOWS_NT_VERSION_STRING=CYGWIN_NT
- REQUIRED_CYGWIN_VER=4.0
-endif
-ifneq (,$(findstring MINGW,$(SYSTEM_UNAME)))
- PLATFORM = windows
- USING_MSYS = true
- export USING_MSYS
-endif
-
-# Platform settings specific to Windows
-ifeq ($(PLATFORM), windows)
- OS_NAME = nt
- REQUIRED_OS_VERSION=5
- # Windows builds default to the appropriate for the underlaying
- # architecture.
- # Temporary disk area
- TEMP_DISK=C:/temp
- # GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
- # return "x86". Use the first word of $(PROCESSOR_IDENTIFIER) instead.
- PROC_ARCH:=$(word 1, $(PROCESSOR_IDENTIFIER))
- PROC_ARCH:=$(subst x86,X86,$(PROC_ARCH))
- PROC_ARCH:=$(subst x64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(subst intel64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(subst Intel64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(subst INTEL64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(subst em64t,X64,$(PROC_ARCH))
- PROC_ARCH:=$(subst EM64T,X64,$(PROC_ARCH))
- PROC_ARCH:=$(subst amd64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(subst AMD64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(subst ia64,IA64,$(PROC_ARCH))
- ifndef ARCH_DATA_MODEL
- ifeq ($(PROC_ARCH),IA64)
- ARCH_DATA_MODEL=64
- else
- ifeq ($(PROC_ARCH),X64)
- ARCH_DATA_MODEL=64
- else
- ARCH_DATA_MODEL=32
- endif
- endif
- endif
- export ARCH_DATA_MODEL
- ARCH=i586
- # Value of Java os.arch property
- ARCHPROP=x86
- REQUIRED_WINDOWS_NAME=Windows Professional 2000
- REQUIRED_WINDOWS_VERSION=5 0 Service Pack 4
- ifeq ($(ARCH_DATA_MODEL), 64)
- # If the user wants to perform a cross compile build then they must
- # - set ARCH_DATA_MODEL=64 and either
- # + set ARCH to ia64 or amd64, or
- REQUIRED_WINDOWS_NAME=Windows Server 2003
- REQUIRED_WINDOWS_VERSION=5 2 Service Pack 1
- ifeq ($(PROC_ARCH),X64)
- ARCH=amd64
- else
- ifeq ($(PROC_ARCH),IA64)
- ARCH=ia64
- endif
- endif
- # Value of Java os.arch property
- ARCHPROP=$(ARCH)
- endif
- ARCH_FAMILY = $(ARCH)
- # Where is unwanted output to be delivered?
- ifeq ($(USING_CYGWIN),true)
- DEV_NULL = /dev/null
- else
- DEV_NULL = NUL
- endif
- export DEV_NULL
- # Classpath separator
- CLASSPATH_SEPARATOR = ;
- # User name determination (set _USER)
- ifndef USER
- ifdef USERNAME
- _USER := $(USERNAME)
- else
- ifdef LOGNAME
- _USER := $(LOGNAME)
- else
- _USER := $(shell id -un)
- endif
- endif
- else
- _USER:=$(USER)
- endif
- # Suffix for file bundles used in previous release
- BUNDLE_FILE_SUFFIX=.tar
- # Minimum disk space needed as determined by running 'du -sk' on
- # a fully built workspace.
- REQUIRED_FREE_SPACE=500000
- # How much RAM does this machine have:
- ifndef MB_OF_MEMORY
- MB_OF_MEMORY := $(shell \
- if [ -f "C:/cygwin/bin/free.exe" ] ; then \
- ( C:/cygwin/bin/bash.exe -c "C:/cygwin/bin/free.exe -m" ) | \
- grep Mem: | \
- sed -e 's@\ \ *@ @g' | cut -d' ' -f2 ; \
- else \
- echo "512"; \
- fi)
- export MB_OF_MEMORY
- endif
-endif
-
-# Machines with 512Mb or less of real memory are considered low memory
-# build machines and adjustments will be made to prevent excessing
-# system swapping during the build.
-# If we don't know, assume 512. Subtract 128 from MB for VM MAX.
-# Don't set VM max over 1024-128=896.
-ifndef MAX_VM_MEMORY
- ifneq ($(MB_OF_MEMORY),)
- LOW_MEMORY_MACHINE := $(shell \
- if [ $(MB_OF_MEMORY) -le 512 ] ; then \
- echo "true"; \
- else \
- echo "false"; \
- fi)
- MAX_VM_MEMORY := $(shell \
- if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
- expr $(MB_OF_MEMORY) '-' 128 ; \
- else \
- echo "896"; \
- fi)
- MIN_VM_MEMORY := $(shell \
- if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
- expr $(MAX_VM_MEMORY) '-' 8 ; \
- else \
- echo "128"; \
- fi)
- else
- MB_OF_MEMORY := unknown
- LOW_MEMORY_MACHINE := true
- MAX_VM_MEMORY := 384
- MIN_VM_MEMORY := 128
- endif
- export MAX_VM_MEMORY
- export MIN_VM_MEMORY
- export LOW_MEMORY_MACHINE
- export MAX_VM_MEMORY
-endif
-
-REQUIRED_ZIP_VER = 2.2
-REQUIRED_UNZIP_VER = 5.12
-REQUIRED_MAKE_VER = 3.81
-
-# Unix type settings (same for all unix platforms)
-ifneq ($(PLATFORM), windows)
- # Temporary disk area
- TEMP_DISK=/tmp
- # Where is unwanted output to be delivered?
- DEV_NULL = /dev/null
- export DEV_NULL
- # Character used between entries in classpath
- CLASSPATH_SEPARATOR = :
- # User name determination (set _USER)
- ifndef USER
- ifdef LOGNAME
- _USER := $(LOGNAME)
- else
- _USER := $(shell logname)
- endif
- else
- _USER:=$(USER)
- endif
-endif
-
-# If blanks in the username, use the first 4 words and pack them together
-_USER1:=$(subst ', ,$(_USER))
-_USER2:=$(subst ", ,$(_USER1))
-USER:=$(word 1,$(_USER2))$(word 2,$(_USER2))$(word 3,$(_USER2))$(word 4,$(_USER2))
-export USER
-
-export PLATFORM
-endif
-
diff --git a/corba/make/javax/Makefile b/corba/make/javax/Makefile
deleted file mode 100644
index 31e2173..0000000
--- a/corba/make/javax/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building javax
-#
-
-BUILDDIR = ..
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = xa
-
-all build clean clobber::
- $(SUBDIRS-loop)
diff --git a/corba/make/javax/xa/Makefile b/corba/make/javax/xa/Makefile
deleted file mode 100644
index 762defa..0000000
--- a/corba/make/javax/xa/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JDBC javax.sql
-#
-
-BUILDDIR = ../..
-PACKAGE = javax.transaction.xa
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = javax/transaction
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/corba/make/jprt.properties b/corba/make/jprt.properties
deleted file mode 100644
index 5dfce3c..0000000
--- a/corba/make/jprt.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Properties for jprt
-
-# Locked down to jdk8
-jprt.tools.default.release=jdk8
-
-# The different build flavors we want, we override here so we just get these 2
-jprt.build.flavors=product,fastdebug
-
-# Standard list of jprt build targets for this source tree
-jprt.build.targets= \
- solaris_sparcv9_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}
-
-# Directories to be excluded from the source bundles
-jprt.bundle.exclude.src.dirs=build dist webrev
-
diff --git a/corba/make/org/Makefile b/corba/make/org/Makefile
deleted file mode 100644
index 16446ee..0000000
--- a/corba/make/org/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ..
-PRODUCT = org
-include $(BUILDDIR)/common/Defs.gmk
-
-ifdef STANDALONE_CORBA_WS
-SUBDIRS = omg se
-else
-SUBDIRS = omg
-endif
-
-all build clean clobber::
- $(SUBDIRS-loop)
diff --git a/corba/make/org/omg/CORBA/Makefile b/corba/make/org/omg/CORBA/Makefile
deleted file mode 100644
index e8a8e9c..0000000
--- a/corba/make/org/omg/CORBA/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-
-PACKAGE = org.omg.CORBA
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-
-include $(CORBA_JMK_DIRECTORY)org_omg_CORBA.jmk
-include $(CORBA_JMK_DIRECTORY)org_omg_SendingContext.jmk
-include $(CORBA_JMK_DIRECTORY)org_omg_CORBA_2_3.jmk
-
-
-ifdef STANDALONE_CORBA_WS
- ORG_OMG_CORBA_java = $(org_omg_CORBA_java_1_2) $(org_omg_CORBA_java_1_3) $(org_omg_CORBA_java_new) $(org_omg_CORBA30_java) $(org_omg_CORBA_TSIdentification_java)
-else
- ORG_OMG_CORBA_java = $(org_omg_CORBA_java_1_2) $(org_omg_CORBA_java_1_3) $(org_omg_CORBA_java_new) $(org_omg_CORBA30_java)
-endif
-
-FILES_java = \
- $(org_omg_SendingContext_java) \
- $(org_omg_CORBA_2_3_java) \
- $(ORG_OMG_CORBA_java)
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/corba/make/org/omg/CORBAX_java.gmk b/corba/make/org/omg/CORBAX_java.gmk
deleted file mode 100644
index c6fa07b..0000000
--- a/corba/make/org/omg/CORBAX_java.gmk
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# CORBA IDL Generated Files
-#
-
-CORBA_java = \
- org/omg/CORBA/ParameterMode.java \
- org/omg/CORBA/ParameterModeHelper.java \
- org/omg/CORBA/ParameterModeHolder.java \
- org/omg/CORBA/PolicyErrorCodeHelper.java \
- org/omg/CORBA/PolicyErrorHelper.java \
- org/omg/CORBA/PolicyErrorHolder.java \
- org/omg/CORBA/StringSeqHelper.java \
- org/omg/CORBA/StringSeqHolder.java \
- org/omg/CORBA/WStringSeqHelper.java \
- org/omg/CORBA/WStringSeqHolder.java
-
-CORBA_Duplicate_java = \
- org/omg/CORBA/OctetSeqHelper.java \
- org/omg/CORBA/OctetSeqHolder.java \
- org/omg/CORBA/PolicyError.java \
- org/omg/CORBA/RepositoryIdHelper.java
diff --git a/corba/make/org/omg/CosNaming/Makefile b/corba/make/org/omg/CosNaming/Makefile
deleted file mode 100644
index c7daf51..0000000
--- a/corba/make/org/omg/CosNaming/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-
-PACKAGE = org.omg.CosNaming
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)org_omg_CosNaming.jmk
-
-FILES_java = $(NS_GENERATED_java) $(LEGACY_FILES_java)
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/org/omg/DynamicAny/Makefile b/corba/make/org/omg/DynamicAny/Makefile
deleted file mode 100644
index d0f4c8b..0000000
--- a/corba/make/org/omg/DynamicAny/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This makefile generates the classes defined in DynamicAny.idl.
-# It doesn't override the existing ones because we are adding javadoc manually
-# and therefore we have checked the files into the workspace.
-# Ultimately we want to generate those files from idl with javadoc generated from
-# idl comments.
-
-BUILDDIR = ../../..
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# What to compile?
-#
-
-PACKAGE = org.omg.DynamicAny
-PRODUCT = org
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)org_omg_DynamicAny.jmk
-
-FILES_java = $(DYNANY_GENERATED_java)
-
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/org/omg/Makefile b/corba/make/org/omg/Makefile
deleted file mode 100644
index 01d9c46..0000000
--- a/corba/make/org/omg/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of org.omg.*
-#
-
-BUILDDIR = ../..
-PACKAGE = org.omg
-PRODUCT = org
-include $(BUILDDIR)/common/Defs.gmk
-
-ifdef STANDALONE_CORBA_WS
-# idl compiler needs to be built before any other idl files can be compiled
-SUBDIRS = idl sources PortableServer CosTransactions CosTSPortability CORBA CosNaming DynamicAny PortableInterceptor
-else
-SUBDIRS = idl sources PortableServer CORBA CosNaming DynamicAny PortableInterceptor
-endif
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/corba/make/org/omg/PortableInterceptor/Makefile b/corba/make/org/omg/PortableInterceptor/Makefile
deleted file mode 100644
index 436c015..0000000
--- a/corba/make/org/omg/PortableInterceptor/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-
-PACKAGE = org.omg.PortableInterceptor
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)org_omg_Messaging.jmk
-include $(CORBA_JMK_DIRECTORY)org_omg_IOP.jmk
-include $(CORBA_JMK_DIRECTORY)org_omg_CORBAX.jmk
-include $(CORBA_JMK_DIRECTORY)org_omg_PortableInterceptor.jmk
-
-FILES_java = $(PI_GENERATED_java) $(Messaging_java) $(IOP_java) $(CORBA_java)
-
-#
-# Include
-#
-
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/corba/make/org/omg/PortableServer/Makefile b/corba/make/org/omg/PortableServer/Makefile
deleted file mode 100644
index d6b3b32..0000000
--- a/corba/make/org/omg/PortableServer/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-
-PACKAGE = org.omg.PortableServer
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)org_omg_PortableServer.jmk
-
-
-# order of building files is important
-
-FILES_java = $(PortableServer_java) $(POA_GENERATED_java)
-
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/org/omg/idl/FILES_java.gmk b/corba/make/org/omg/idl/FILES_java.gmk
deleted file mode 100644
index 96e2738..0000000
--- a/corba/make/org/omg/idl/FILES_java.gmk
+++ /dev/null
@@ -1,177 +0,0 @@
-#
-# Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-IDL = \
- com/sun/tools/corba/se/idl/Arguments.java \
- com/sun/tools/corba/se/idl/AttributeEntry.java \
- com/sun/tools/corba/se/idl/AttributeGen.java \
- com/sun/tools/corba/se/idl/Comment.java \
- com/sun/tools/corba/se/idl/Compile.java \
- com/sun/tools/corba/se/idl/ConstEntry.java \
- com/sun/tools/corba/se/idl/ConstGen.java \
- com/sun/tools/corba/se/idl/DefaultSymtabFactory.java \
- com/sun/tools/corba/se/idl/EnumEntry.java \
- com/sun/tools/corba/se/idl/EnumGen.java \
- com/sun/tools/corba/se/idl/ExceptionEntry.java \
- com/sun/tools/corba/se/idl/ExceptionGen.java \
- com/sun/tools/corba/se/idl/Factories.java \
- com/sun/tools/corba/se/idl/ForwardEntry.java \
- com/sun/tools/corba/se/idl/ForwardGen.java \
- com/sun/tools/corba/se/idl/ForwardValueEntry.java \
- com/sun/tools/corba/se/idl/ForwardValueGen.java \
- com/sun/tools/corba/se/idl/GenFactory.java \
- com/sun/tools/corba/se/idl/GenFileStream.java \
- com/sun/tools/corba/se/idl/Generator.java \
- com/sun/tools/corba/se/idl/IDLID.java \
- com/sun/tools/corba/se/idl/IncludeEntry.java \
- com/sun/tools/corba/se/idl/IncludeGen.java \
- com/sun/tools/corba/se/idl/InterfaceEntry.java \
- com/sun/tools/corba/se/idl/InterfaceGen.java \
- com/sun/tools/corba/se/idl/InterfaceState.java \
- com/sun/tools/corba/se/idl/InterfaceType.java \
- com/sun/tools/corba/se/idl/InvalidArgument.java \
- com/sun/tools/corba/se/idl/InvalidCharacter.java \
- com/sun/tools/corba/se/idl/MethodEntry.java \
- com/sun/tools/corba/se/idl/MethodGen.java \
- com/sun/tools/corba/se/idl/ModuleEntry.java \
- com/sun/tools/corba/se/idl/ModuleGen.java \
- com/sun/tools/corba/se/idl/NativeEntry.java \
- com/sun/tools/corba/se/idl/NativeGen.java \
- com/sun/tools/corba/se/idl/NoPragma.java \
- com/sun/tools/corba/se/idl/Noop.java \
- com/sun/tools/corba/se/idl/ParameterEntry.java \
- com/sun/tools/corba/se/idl/ParameterGen.java \
- com/sun/tools/corba/se/idl/ParseException.java \
- com/sun/tools/corba/se/idl/Parser.java \
- com/sun/tools/corba/se/idl/PragmaEntry.java \
- com/sun/tools/corba/se/idl/PragmaGen.java \
- com/sun/tools/corba/se/idl/PragmaHandler.java \
- com/sun/tools/corba/se/idl/Preprocessor.java \
- com/sun/tools/corba/se/idl/PrimitiveEntry.java \
- com/sun/tools/corba/se/idl/PrimitiveGen.java \
- com/sun/tools/corba/se/idl/RepositoryID.java \
- com/sun/tools/corba/se/idl/Scanner.java \
- com/sun/tools/corba/se/idl/SequenceEntry.java \
- com/sun/tools/corba/se/idl/SequenceGen.java \
- com/sun/tools/corba/se/idl/StringEntry.java \
- com/sun/tools/corba/se/idl/StringGen.java \
- com/sun/tools/corba/se/idl/StructEntry.java \
- com/sun/tools/corba/se/idl/StructGen.java \
- com/sun/tools/corba/se/idl/SymtabEntry.java \
- com/sun/tools/corba/se/idl/SymtabFactory.java \
- com/sun/tools/corba/se/idl/Token.java \
- com/sun/tools/corba/se/idl/TokenBuffer.java \
- com/sun/tools/corba/se/idl/TypedefEntry.java \
- com/sun/tools/corba/se/idl/TypedefGen.java \
- com/sun/tools/corba/se/idl/UnionBranch.java \
- com/sun/tools/corba/se/idl/UnionEntry.java \
- com/sun/tools/corba/se/idl/UnionGen.java \
- com/sun/tools/corba/se/idl/Util.java \
- com/sun/tools/corba/se/idl/ValueBoxEntry.java \
- com/sun/tools/corba/se/idl/ValueBoxGen.java \
- com/sun/tools/corba/se/idl/ValueEntry.java \
- com/sun/tools/corba/se/idl/ValueGen.java \
- com/sun/tools/corba/se/idl/ValueRepositoryId.java
-
-CONSTEXPR = \
- com/sun/tools/corba/se/idl/constExpr/And.java \
- com/sun/tools/corba/se/idl/constExpr/BinaryExpr.java \
- com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java \
- com/sun/tools/corba/se/idl/constExpr/BooleanNot.java \
- com/sun/tools/corba/se/idl/constExpr/BooleanOr.java \
- com/sun/tools/corba/se/idl/constExpr/DefaultExprFactory.java \
- com/sun/tools/corba/se/idl/constExpr/Divide.java \
- com/sun/tools/corba/se/idl/constExpr/Equal.java \
- com/sun/tools/corba/se/idl/constExpr/EvaluationException.java \
- com/sun/tools/corba/se/idl/constExpr/ExprFactory.java \
- com/sun/tools/corba/se/idl/constExpr/Expression.java \
- com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java \
- com/sun/tools/corba/se/idl/constExpr/GreaterThan.java \
- com/sun/tools/corba/se/idl/constExpr/LessEqual.java \
- com/sun/tools/corba/se/idl/constExpr/LessThan.java \
- com/sun/tools/corba/se/idl/constExpr/Minus.java \
- com/sun/tools/corba/se/idl/constExpr/Modulo.java \
- com/sun/tools/corba/se/idl/constExpr/Negative.java \
- com/sun/tools/corba/se/idl/constExpr/Not.java \
- com/sun/tools/corba/se/idl/constExpr/NotEqual.java \
- com/sun/tools/corba/se/idl/constExpr/Or.java \
- com/sun/tools/corba/se/idl/constExpr/Plus.java \
- com/sun/tools/corba/se/idl/constExpr/Positive.java \
- com/sun/tools/corba/se/idl/constExpr/ShiftLeft.java \
- com/sun/tools/corba/se/idl/constExpr/ShiftRight.java \
- com/sun/tools/corba/se/idl/constExpr/Terminal.java \
- com/sun/tools/corba/se/idl/constExpr/Times.java \
- com/sun/tools/corba/se/idl/constExpr/UnaryExpr.java \
- com/sun/tools/corba/se/idl/constExpr/Xor.java
-
-TOJAVAPORTABLE = \
- com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java \
- com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Compile.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Factories.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Helper.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Holder.java \
- com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java \
- com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java \
- com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java \
- com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java \
- com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Stub.java \
- com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java \
- com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Util.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java \
- com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java
-
-CFF = \
- com/sun/tools/corba/se/idl/som/cff/FileLocator.java \
- com/sun/tools/corba/se/idl/som/cff/Messages.java
-
-IDLEMIT = \
- com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java
-
-FILES_java = $(IDL) $(CONSTEXPR) $(TOJAVAPORTABLE) $(CFF) $(IDLEMIT)
diff --git a/corba/make/org/omg/idl/Makefile b/corba/make/org/omg/idl/Makefile
deleted file mode 100644
index 3687eb0..0000000
--- a/corba/make/org/omg/idl/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.sun.tools.corba.se.idl
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_java.gmk
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_PROPERTIES = \
- $(PKGDIR)/idl.prp \
- $(PKGDIR)/toJavaPortable/toJavaPortable.prp
-
-#
-# IDL files
-#
-
-IDL_FILES = orb.idl ir.idl
-
-IDL_SRC_DIR = $(SHARE_SRC)/classes/com/sun/tools/corba/se/idl
-IDL_DEST_DIR = $(LIBDIR)
-
-IFILES = $(IDL_FILES:%=$(IDL_DEST_DIR)/%)
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-build: $(IFILES)
-
-$(IDL_DEST_DIR)/%: $(IDL_SRC_DIR)/%
- $(install-file)
-
diff --git a/corba/make/org/omg/sources/Makefile b/corba/make/org/omg/sources/Makefile
deleted file mode 100644
index 92f5355..0000000
--- a/corba/make/org/omg/sources/Makefile
+++ /dev/null
@@ -1,213 +0,0 @@
-#
-# Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-
-PACKAGE = org.omg
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)org_omg_PortableServer.jmk
-include $(CORBA_JMK_DIRECTORY)org_omg_DynamicAny.jmk
-include $(CORBA_JMK_DIRECTORY)org_omg_CosNaming.jmk
-include $(CORBA_JMK_DIRECTORY)org_omg_IOP.jmk
-include $(CORBA_JMK_DIRECTORY)org_omg_Messaging.jmk
-include $(CORBA_JMK_DIRECTORY)org_omg_CORBAX.jmk
-include $(CORBA_JMK_DIRECTORY)org_omg_PortableInterceptor.jmk
-
-ifdef STANDALONE_CORBA_WS
-include $(CORBA_JMK_DIRECTORY)org_omg_CosTransactions.jmk
-endif
-
-#
-# Rules
-#
-
-ifdef STANDALONE_CORBA_WS
-build: poa.compile iop.compile corbax.compile messaging.compile pi.compile dynany.compile ns.compile tr.compile
-clean clobber:: pi.clean iop.clean corbax.clean messaging.clean poa.clean dynany.clean ns.clean tr.clean
-else
-build: poa.compile iop.compile corbax.compile messaging.compile pi.compile ns.compile dynany.compile
-clean clobber:: iop.clean corbax.clean messaging.clean pi.clean poa.clean ns.clean dynany.clean
-endif
-
-
-#
-# These rules are for compiling/cleaning the POA generated stuff
-#
-
-SRC_DIR = $(SHARE_SRC)/classes
-CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer
-
-# IDL Files
-
-POA.IDL = $(SRC_DIR)/org/omg/PortableServer/poa.idl
-DYNAMIC_ANY.IDL = $(SRC_DIR)/org/omg/DynamicAny/DynamicAny.idl
-COSTRANSACTIONS.IDL = $(SRC_DIR)/org/omg/CosTransactions/CosTransactions.idl
-COSTSINTEROP.IDL = $(SRC_DIR)/org/omg/CosTransactions/CosTSInteroperation.idl
-NAMESERVICE.IDL = $(SRC_DIR)/org/omg/CosNaming/nameservice.idl
-# The following 4 files are for Portable Interceptors
-IOP.IDL = $(SRC_DIR)/org/omg/PortableInterceptor/IOP.idl
-CORBAX.IDL = $(SRC_DIR)/org/omg/PortableInterceptor/CORBAX.idl
-MESSAGING.IDL = $(SRC_DIR)/org/omg/PortableInterceptor/Messaging.idl
-INTERCEPTORS.IDL = $(SRC_DIR)/org/omg/PortableInterceptor/Interceptors.idl
-
-# IDL Directories
-
-POAFILEDIR = $(GENSRCDIR)/org/omg/PortableServer
-POASRCDIR = $(SRC_DIR)/org/omg/PortableServer
-DYNANY_DIR = $(GENSRCDIR)/org/omg/DynamicAny
-NAMESERVICEDIR = $(GENSRCDIR)/org/omg/CosNaming
-INTERCEPTORSDIR = $(GENSRCDIR)/org/omg/PortableInterceptor
-
-# POA files and Rules
-
-POAGENERATEDFILES = $(POA_GENERATED_java:%=$(GENSRCDIR)/%)
-POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
-
-$(POAGENERATEDFILES):: $(POA.IDL)
- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL)
- $(RM) -r $(POAHELHOLFILES)
-
-poa.compile: $(POAGENERATEDFILES)
-
-poa.clean:
- $(RM) -r $(POAFILEDIR)
-
-# DynAny Files and Rules
-
-DYNANY_IDLJ_FLAGS=-i "$(SRC_DIR)/org/omg/CORBA" -corba 3.0 -fall -pkgPrefix DynamicAny org.omg
-
-DYNANYFILES = $(DYNANY_GENERATED_java:%=$(GENSRCDIR)/%)
-DYNANYDELETEFILES = $(DYNANY_TO_DELETE_FILES:%=$(GENSRCDIR)/%)
-
-# Generating and deleting unused files to reduce images size
-$(DYNANYFILES): $(DYNAMIC_ANY.IDL)
- $(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL)
- $(RM) $(DYNANY_DIR)/*POA*
- $(RM) $(DYNANY_DIR)/*Holder*
- $(RM) $(DYNANYDELETEFILES)
-
-dynany.compile: $(DYNANYFILES)
-
-dynany.clean:
- $(RM) -r $(DYNANY_DIR)
-
-# CosTransactions Files
-TRGENERATEDFILES = $(TR_GENERATED_java:%=$(GENSRCDIR)/%)
-TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions"
-
-$(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL)
- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL)
- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL)
-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
-
-tr.compile: $(TRGENERATEDFILES)
-
-tr.clean:
- $(RM) -f $(TRGENERATEDFILES)
-
-#CosNaming Files
-NSGENERATEDFILES = $(NS_GENERATED_java:%=$(GENSRCDIR)/%)
-
-# Compile NameService IDL file and then copy
-# _NamingContextImplBase.java and _BindingIteratorImplBase.java files
-# to GENSRC directory. Note that these two classes are deprecated.
-$(NSGENERATEDFILES): $(NAMESERVICE.IDL)
- $(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL)
-
-ns.compile: $(NSGENERATEDFILES)
-
-ns.clean:
- $(RM) -f $(NSGENERATEDFILES)
-
-#IOP compile
-IOPGENERATEDFILES = $(IOP_java:%=$(GENSRCDIR)/%)
-IOPDELETEFILES = $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%)
-
-$(IOPGENERATEDFILES):: $(IOP.IDL)
- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL)
- $(RM) -r $(IOPDELETEFILES)
-
-iop.compile: $(IOPGENERATEDFILES)
-
-iop.clean:
- $(RM) $(IOPGENERATEDFILES)
-
-#CORBAX compile
-CORBAXGENERATEDFILES = $(CORBA_java:%=$(GENSRCDIR)/%)
-CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%)
-
-$(CORBAXGENERATEDFILES):: $(CORBAX.IDL)
- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL)
- $(RM) $(CORBAXDUPLICATEFILES)
-
-corbax.compile: $(CORBAXGENERATEDFILES)
-
-corbax.clean:
- $(RM) $(CORBAXGENERATEDFILES)
-
-#Messaging compile
-MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%)
-
-$(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL)
- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL)
-
-messaging.compile: $(MESSAGINGGENERATEDFILES)
-
-messaging.clean:
- $(RM) $(MESSAGINGGENERATEDFILES)
-
-
-
-#PortableInterceptor Files
-PIGENERATEDFILES = $(PI_GENERATED_java:%=$(GENSRCDIR)/%)
-PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
-
-$(PIGENERATEDFILES):: $(INTERCEPTORS.IDL)
- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -pkgPrefix PortableInterceptor org.omg -pkgPrefix Dynamic org.omg -pkgPrefix IOP org.omg -corba 3.0 -D CORBA3 $(INTERCEPTORS.IDL)
- $(RM) $(PIHELHOLFILES)
-
-pi.compile: $(PIGENERATEDFILES)
-
-pi.clean:
- $(RM) -f $(PIGENERATEDFILES)
-
-
-ifdef STANDALONE_CORBA_WS
-.PHONY : poa.compile poa.clean iop.compile iop.clean messaging.compile messaging.clean corbax.compile corbax.clean pi.compile pi.clean dynany.clean dynany.compile ns.compile ns.clean tr.compile tr.clean
-else
-.PHONY : poa.compile poa.clean iop.compile iop.clean messaging.compile messaging.clean corbax.compile corbax.clean pi.compile pi.clean ns.compile ns.clean dynany.clean dynany.compile
-endif
-
-include $(BUILDDIR)/common/Rules.gmk
diff --git a/corba/make/sun/Makefile b/corba/make/sun/Makefile
deleted file mode 100644
index 9057987..0000000
--- a/corba/make/sun/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of sun tools
-#
-
-BUILDDIR = ..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# corba must always be built before rmi, due to rmi-iiop support
-#
-SUBDIRS = corba rmi
-
-all build clean clobber::
- $(SUBDIRS-loop)
diff --git a/corba/make/sun/corba/Makefile b/corba/make/sun/corba/Makefile
deleted file mode 100644
index 5b7dfd0..0000000
--- a/corba/make/sun/corba/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build corba core classes that are required for rmic compiler
-#
-
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = org core
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/corba/make/sun/corba/core/Makefile b/corba/make/sun/corba/core/Makefile
deleted file mode 100644
index 7075e86..0000000
--- a/corba/make/sun/corba/core/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building RMI/IIOP
-#
-
-BUILDDIR = ../../..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)javax_rmi.jmk
-include $(CORBA_JMK_DIRECTORY)javax_rmi_CORBA.jmk
-include $(CORBA_JMK_DIRECTORY)javax_transaction.jmk
-include $(CORBA_JMK_DIRECTORY)javax_activity.jmk
-include $(CORBA_JMK_DIRECTORY)sun_corba.jmk
-
-FILES_java = \
- $(javax_rmi_java) \
- $(javax_rmi_CORBA_java) \
- $(javax_transaction_java) \
- $(javax_activity_java) \
- $(sun_corba_java)
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_PROPERTIES = \
- com/sun/corba/se/impl/orbutil/resources/sunorb.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-
-#
-# Extra clean rules because we build more than one package.
-#
-clean:: classheaders.clean objects.clean
- $(RM) -r $(CLASSBINDIR)/javax/rmi
- $(RM) -r $(CLASSBINDIR)/javax/transaction
- $(RM) -r $(CLASSBINDIR)/javax/activity
- $(RM) -r $(CLASSBINDIR)/com/sun/corba/se/impl
-
diff --git a/corba/make/sun/corba/org/Makefile b/corba/make/sun/corba/org/Makefile
deleted file mode 100644
index 7b6a5f4..0000000
--- a/corba/make/sun/corba/org/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ../../..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = omg
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/corba/make/sun/corba/org/omg/FILES_java.gmk b/corba/make/sun/corba/org/omg/FILES_java.gmk
deleted file mode 100644
index c3e2075..0000000
--- a/corba/make/sun/corba/org/omg/FILES_java.gmk
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-SENDINGCONTEXT = \
- com/sun/org/omg/SendingContext/_CodeBaseStub.java \
- com/sun/org/omg/SendingContext/CodeBase.java \
- com/sun/org/omg/SendingContext/CodeBaseHelper.java \
- com/sun/org/omg/SendingContext/CodeBaseOperations.java \
- com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java \
- com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java \
- com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java \
- \
- com/sun/org/omg/SendingContext/_CodeBaseImplBase.java
-
-CORBA = \
- com/sun/org/omg/CORBA/_IDLTypeStub.java \
- com/sun/org/omg/CORBA/AttrDescriptionSeqHelper.java \
- com/sun/org/omg/CORBA/AttributeDescription.java \
- com/sun/org/omg/CORBA/AttributeDescriptionHelper.java \
- com/sun/org/omg/CORBA/AttributeMode.java \
- com/sun/org/omg/CORBA/AttributeModeHelper.java \
- com/sun/org/omg/CORBA/ContextIdentifierHelper.java \
- com/sun/org/omg/CORBA/ContextIdSeqHelper.java \
- com/sun/org/omg/CORBA/DefinitionKindHelper.java \
- com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java \
- com/sun/org/omg/CORBA/ExceptionDescription.java \
- com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java \
- com/sun/org/omg/CORBA/IdentifierHelper.java \
- com/sun/org/omg/CORBA/IDLTypeHelper.java \
- com/sun/org/omg/CORBA/Initializer.java \
- com/sun/org/omg/CORBA/InitializerHelper.java \
- com/sun/org/omg/CORBA/InitializerSeqHelper.java \
- com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java \
- com/sun/org/omg/CORBA/OperationDescription.java \
- com/sun/org/omg/CORBA/OperationDescriptionHelper.java \
- com/sun/org/omg/CORBA/OperationMode.java \
- com/sun/org/omg/CORBA/OperationModeHelper.java \
- com/sun/org/omg/CORBA/ParameterDescription.java \
- com/sun/org/omg/CORBA/ParameterDescriptionHelper.java \
- com/sun/org/omg/CORBA/ParameterMode.java \
- com/sun/org/omg/CORBA/ParameterModeHelper.java \
- com/sun/org/omg/CORBA/ParDescriptionSeqHelper.java \
- com/sun/org/omg/CORBA/Repository.java \
- com/sun/org/omg/CORBA/RepositoryHelper.java \
- com/sun/org/omg/CORBA/RepositoryIdHelper.java \
- com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java \
- com/sun/org/omg/CORBA/StructMemberHelper.java \
- com/sun/org/omg/CORBA/StructMemberSeqHelper.java \
- com/sun/org/omg/CORBA/ValueMemberHelper.java \
- com/sun/org/omg/CORBA/ValueMemberSeqHelper.java \
- com/sun/org/omg/CORBA/VersionSpecHelper.java \
- com/sun/org/omg/CORBA/VisibilityHelper.java \
- com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java \
- com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java \
- com/sun/org/omg/CORBA/portable/ValueHelper.java
-
-FILES_java = $(SENDINGCONTEXT) $(CORBA)
diff --git a/corba/make/sun/corba/org/omg/Makefile b/corba/make/sun/corba/org/omg/Makefile
deleted file mode 100644
index cf18d6088..0000000
--- a/corba/make/sun/corba/org/omg/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of org.omg.*
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.org.omg
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_java.gmk
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/corba/make/sun/rmi/Makefile b/corba/make/sun/rmi/Makefile
deleted file mode 100644
index 14ec693..0000000
--- a/corba/make/sun/rmi/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build rmi tools, and sun.rmi.* implementation classes
-#
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-
-LOG_GENDIRECTORY = $(GENSRCDIR)/com/sun/corba/se/impl/logging
-LOG_CLASS_OUTPUTDIRECTORY = $(CLASSBINDIR)/com/sun/corba/se/impl/logging
-LOGSTRINGS_PROPERTIES = LogStrings.properties
-#
-# Order is important -- you can't build stubs without building rmic first.
-# We need corbalogsources to be built first, since it builds LogWrappers to
-# log the exceptions and generate the right minorcodes. These classes are
-# references in com/sun/corba/se/impl/io and util classes which in turn will
-# be built from rmic Makefile.
-#
-CORBALOG_SUBDIRS = corbalogsources corbalogcompile rmic
-
-# Do these subdirs first
-OTHERSUBDIRS=$(CORBALOG_SUBDIRS)
-all build clean clobber ::
- $(OTHERSUBDIRS-loop)
-
-$(LOG_CLASS_OUTPUTDIRECTORY)/$(LOGSTRINGS_PROPERTIES): $(LOG_GENDIRECTORY)/$(LOGSTRINGS_PROPERTIES)
- $(install-file)
-
-# Then do the rest
-all build clean clobber :: $(LOG_CLASS_OUTPUTDIRECTORY)/$(LOGSTRINGS_PROPERTIES)
- $(SUBDIRS-loop)
-
-clean::
- $(RM) -r $(CLASSBINDIR)/sun/rmi $(CLASSBINDIR)/com/sun/rmi
diff --git a/corba/make/sun/rmi/corbalogcompile/Makefile b/corba/make/sun/rmi/corbalogcompile/Makefile
deleted file mode 100644
index 023eec2..0000000
--- a/corba/make/sun/rmi/corbalogcompile/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.sun.corba.se.impl.logging
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
-FILES_java=$(com_sun_corba_se_impl_logging_java)
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/corba/make/sun/rmi/corbalogsources/Makefile b/corba/make/sun/rmi/corbalogsources/Makefile
deleted file mode 100644
index fabc3b9..0000000
--- a/corba/make/sun/rmi/corbalogsources/Makefile
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-
-PACKAGE = com.sun.corba.se
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Rules
-#
-build: logwrapper.generate logresource.generate activation.idl.compile portableactivation.idl.compile
-
-clean clobber:: activation.idl.clean portableactivation.idl.clean
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_activation.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk
-
-#
-# Dirs
-#
-
-SRC_DIR = $(SHARE_SRC)/classes
-CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer
-PI_IDL_DIR = $(SRC_DIR)/org/omg/PortableInterceptor
-
-ACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/spi/activation
-LOG_GENDIRECTORY = $(GENSRCDIR)/com/sun/corba/se/impl/logging
-LOG_CLASS_OUTPUTDIRECTORY = $(CLASSBINDIR)/com/sun/corba/se/impl/logging
-LOGSTRINGS_PROPERTIES = LogStrings.properties
-PORTABLEACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/PortableActivationIDL
-
-#
-# IDLs
-#
-
-ACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/spi/activation/activation.idl
-PORTABLEACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/PortableActivationIDL/activation.idl
-
-ACTIVATION.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Activation.mc
-IOR.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/IOR.mc
-INTERCEPTORS.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Interceptors.mc
-NAMING.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Naming.mc
-OMG.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/OMG.mc
-ORBUTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/ORBUtil.mc
-POA.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc
-UTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc
-
-MC_GENERATE_CLASS = make-class
-MC_GENERATE_LOG_RB = make-resource
-
-MC_CLASSPATH=$(BUILDTOOLJARDIR)/MC.jar
-MCJ_GENERATE_CLASS = $(BOOT_JAVA_CMD) \
- -cp "$(MC_CLASSPATH)" com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS)
-MCJ_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) \
- -cp "$(MC_CLASSPATH)" com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB)
-
-
-#
-# Generate LogWrapper classes
-#
-logwrapper.generate: \
- $(LOG_GENDIRECTORY) \
- $(LOG_GENDIRECTORY)/ActivationSystemException.java \
- $(LOG_GENDIRECTORY)/IORSystemException.java \
- $(LOG_GENDIRECTORY)/InterceptorsSystemException.java \
- $(LOG_GENDIRECTORY)/NamingSystemException.java \
- $(LOG_GENDIRECTORY)/OMGSystemException.java \
- $(LOG_GENDIRECTORY)/ORBUtilSystemException.java \
- $(LOG_GENDIRECTORY)/POASystemException.java \
- $(LOG_GENDIRECTORY)/UtilSystemException.java
-
-$(LOG_GENDIRECTORY):
- $(MKDIR) -p $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC)
- $(MCJ_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC)
- $(MCJ_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC)
- $(MCJ_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC)
- $(MCJ_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC)
- $(MCJ_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC)
- $(MCJ_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC)
- $(MCJ_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/UtilSystemException.java : $(UTIL.MC)
- $(MCJ_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY)
-
-logresource.generate: $(LOG_GENDIRECTORY)/LogStrings.properties
-
-$(LOG_GENDIRECTORY)/LogStrings.properties: \
- $(LOG_GENDIRECTORY) \
- $(LOG_GENDIRECTORY)/ActivationSystemException.resource \
- $(LOG_GENDIRECTORY)/IORSystemException.resource \
- $(LOG_GENDIRECTORY)/InterceptorsSystemException.resource \
- $(LOG_GENDIRECTORY)/NamingSystemException.resource \
- $(LOG_GENDIRECTORY)/OMGSystemException.resource \
- $(LOG_GENDIRECTORY)/ORBUtilSystemException.resource \
- $(LOG_GENDIRECTORY)/POASystemException.resource \
- $(LOG_GENDIRECTORY)/UtilSystemException.resource
- $(CAT) $(LOG_GENDIRECTORY)/*.resource > $(LOG_GENDIRECTORY)/LogStrings.properties
-
-$(LOG_GENDIRECTORY)/ActivationSystemException.resource : $(ACTIVATION.MC)
- $(MCJ_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/IORSystemException.resource : $(IOR.MC)
- $(MCJ_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource : $(INTERCEPTORS.MC)
- $(MCJ_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/NamingSystemException.resource : $(NAMING.MC)
- $(MCJ_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/OMGSystemException.resource : $(OMG.MC)
- $(MCJ_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource : $(ORBUTIL.MC)
- $(MCJ_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/POASystemException.resource : $(POA.MC)
- $(MCJ_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/UtilSystemException.resource : $(UTIL.MC)
- $(MCJ_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY)
-
-
-#
-# Activation
-#
-
-ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
-
-$(ACTIVATIONFILES): $(ACTIVATION.IDL)
- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
-
-activation.idl.compile: $(ACTIVATIONFILES)
-
-activation.idl.clean:
- $(RM) -f $(ACTIVATIONFILES)
-
-
-#
-# PortableActivationIDL
-#
-
-PORTABLEACTIVATIONFILES = $(com_sun_corba_se_PortableActivationIDL_java:%=$(GENSRCDIR)/%)
-
-PORTABLEACTIVATION_INCLUDES = -i $(CORBA_IDL_DIR) -i $(PI_IDL_DIR)
-
-PORTABLEACTIVATION_PKG_PREFIXES = -pkgPrefix PortableInterceptor org.omg \
- -pkgPrefix PortableActivationIDL com.sun.corba.se \
- -pkgPrefix Dynamic org.omg \
- -pkgPrefix IOP org.omg
-
-# REVISIT: remove -oldImplBase
-$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
-
-portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
-
-portableactivation.idl.clean:
- $(RM) -f $(PORTABLEACTIVATIONFILES)
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Rules.gmk
diff --git a/corba/make/sun/rmi/rmic/FILES.gmk b/corba/make/sun/rmi/rmic/FILES.gmk
deleted file mode 100644
index 9ad7901..0000000
--- a/corba/make/sun/rmi/rmic/FILES.gmk
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-IIOP_java = \
- sun/rmi/rmic/iiop/AbstractType.java \
- sun/rmi/rmic/iiop/ArrayType.java \
- sun/rmi/rmic/iiop/BatchEnvironment.java \
- sun/rmi/rmic/iiop/ClassType.java \
- sun/rmi/rmic/iiop/CompoundType.java \
- sun/rmi/rmic/iiop/Constants.java \
- sun/rmi/rmic/iiop/DirectoryLoader.java \
- sun/rmi/rmic/iiop/ClassPathLoader.java \
- sun/rmi/rmic/iiop/Generator.java \
- sun/rmi/rmic/iiop/Util.java \
- \
- sun/rmi/rmic/iiop/IDLGenerator.java \
- sun/rmi/rmic/iiop/IDLNames.java \
- sun/rmi/rmic/iiop/ImplementationType.java \
- sun/rmi/rmic/iiop/InterfaceType.java \
- sun/rmi/rmic/iiop/NCClassType.java \
- sun/rmi/rmic/iiop/NCInterfaceType.java \
- sun/rmi/rmic/iiop/NameContext.java \
- \
- sun/rmi/rmic/iiop/PrimitiveType.java \
- sun/rmi/rmic/iiop/PrintGenerator.java \
- sun/rmi/rmic/iiop/RemoteType.java \
- sun/rmi/rmic/iiop/SpecialClassType.java \
- sun/rmi/rmic/iiop/SpecialInterfaceType.java \
- sun/rmi/rmic/iiop/StubGenerator.java \
- sun/rmi/rmic/iiop/Type.java \
- sun/rmi/rmic/iiop/ValueType.java \
- \
- sun/rmi/rmic/iiop/StaticStringsHash.java \
- sun/rmi/rmic/iiop/ContextStack.java \
- sun/rmi/rmic/iiop/ContextElement.java
-
-# partners edition
-
-PARTNERS_EDITION_java = \
- sun/rmi/rmic/iiop/PEStubGenerator.java
-
-
-# rmic has dependency on the following com.sun packages
-
-REQUIRED_Group = \
- com/sun/corba/se/internal/util/IdentityHashtable.java \
- com/sun/corba/se/internal/util/Utility.java \
- com/sun/corba/se/internal/util/JDKBridge.java \
- com/sun/corba/se/internal/util/RepositoryId.java
diff --git a/corba/make/sun/rmi/rmic/Makefile b/corba/make/sun/rmi/rmic/Makefile
deleted file mode 100644
index b96a8ea..0000000
--- a/corba/make/sun/rmi/rmic/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building sun.rmi.rmic.* and the "rmic" command
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.rmi.rmic
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES.gmk
-
-ifdef PARTNERS_CORBA
-FILES_java = \
- $(IIOP_java) \
- $(PARTNERS_EDITION_java)
-else
-FILES_java = \
- $(IIOP_java)
-endif
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/corba/make/tools/Makefile b/corba/make/tools/Makefile
deleted file mode 100644
index 2ed021e..0000000
--- a/corba/make/tools/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Create all the build tools
-#
-
-BUILDDIR = ..
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = \
- strip_properties \
- idlj \
- logutil \
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clean clobber::
- $(RM) -r $(BUILDTOOLCLASSDIR)
- $(RM) -r $(BUILDTOOLJARDIR)
-
diff --git a/corba/make/tools/idlj/Makefile b/corba/make/tools/idlj/Makefile
deleted file mode 100644
index 70709bc..0000000
--- a/corba/make/tools/idlj/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the idlj tool
-#
-
-BUILDDIR = ../..
-PACKAGE = com.sun.tools.corba.se.idl.toJavaPortable
-PRODUCT = tools
-PROGRAM = idlj
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(SHARE_SRC)/classes
-BUILDTOOL_MAIN = $(PKGDIR)/Compile.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/corba/make/tools/logutil/Makefile b/corba/make/tools/logutil/Makefile
deleted file mode 100644
index 7534e0e..0000000
--- a/corba/make/tools/logutil/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the idlj tool
-#
-
-BUILDDIR = ../..
-PACKAGE = com.sun.tools.corba.se.logutil
-PRODUCT = tools
-PROGRAM = MC
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(SHARE_SRC)/classes
-BUILDTOOL_MAIN = $(PKGDIR)/MC.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/corba/make/tools/strip_properties/Makefile b/corba/make/tools/strip_properties/Makefile
deleted file mode 100644
index e74d44c..0000000
--- a/corba/make/tools/strip_properties/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the stripproperties tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.stripproperties
-PRODUCT = tools
-PROGRAM = stripproperties
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/StripPropertiesCorba.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/corba/makefiles/Makefile b/corba/makefiles/Makefile
deleted file mode 100644
index c7d0dd0..0000000
--- a/corba/makefiles/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Locate this Makefile
-ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
- makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
- makefile_path := $(lastword $(MAKEFILE_LIST))
-endif
-repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path))
-
-# What is the name of this subsystem (langtools, corba, etc)?
-subsystem_name := $(notdir $(repo_dir))
-
-# Try to locate 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 ===================================================)
-else
- $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
- $(error Build from top-level Makefile instead)
-endif
-
-all:
- @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/corba/src/share/classes/org/omg/CORBA/ORB.java b/corba/src/share/classes/org/omg/CORBA/ORB.java
index 5b43409..58649f0 100644
--- a/corba/src/share/classes/org/omg/CORBA/ORB.java
+++ b/corba/src/share/classes/org/omg/CORBA/ORB.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -285,7 +285,8 @@
String className = getSystemProperty(ORBSingletonClassKey);
if (className == null)
className = getPropertyFromFile(ORBSingletonClassKey);
- if (className == null) {
+ if ((className == null) ||
+ (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
} else {
singleton = create_impl(className);
@@ -339,7 +340,8 @@
className = getSystemProperty(ORBClassKey);
if (className == null)
className = getPropertyFromFile(ORBClassKey);
- if (className == null) {
+ if ((className == null) ||
+ (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) {
orb = new com.sun.corba.se.impl.orb.ORBImpl();
} else {
orb = create_impl(className);
@@ -369,7 +371,8 @@
className = getSystemProperty(ORBClassKey);
if (className == null)
className = getPropertyFromFile(ORBClassKey);
- if (className == null) {
+ if ((className == null) ||
+ (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) {
orb = new com.sun.corba.se.impl.orb.ORBImpl();
} else {
orb = create_impl(className);
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 63b7788..85c0435 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -397,3 +397,5 @@
c78d517c7ea47501b456e707afd4b78e7b5b202e hs25-b59
f573d00213b7170c2ff856f9cd83cd148437f5b9 jdk8-b117
abad3b2d905d9e1ad767c94baa94aba6ed5b207b hs25-b60
+c9f439732b18ea16f7e65815327d5ea7092cc258 jdk8-b118
+b2426da30009cd3069d03de073f351e6432c7682 hs25-b61
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index 501e9e6..f2c98d1 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -35,7 +35,7 @@
HS_MAJOR_VER=25
HS_MINOR_VER=0
-HS_BUILD_NUMBER=60
+HS_BUILD_NUMBER=61
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp
index 8990cc3..db41756 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp
@@ -4483,8 +4483,8 @@
for (int index = 0; index < num_methods; index++) {
Method* m = methods->at(index);
- // skip static and <init> methods
- if ((!m->is_static()) &&
+ // skip private, static, and <init> methods
+ if ((!m->is_private() && !m->is_static()) &&
(m->name() != vmSymbols::object_initializer_name())) {
Symbol* name = m->name();
diff --git a/hotspot/src/share/vm/classfile/classLoaderData.cpp b/hotspot/src/share/vm/classfile/classLoaderData.cpp
index e3209ae..273e018 100644
--- a/hotspot/src/share/vm/classfile/classLoaderData.cpp
+++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp
@@ -62,13 +62,13 @@
#include "runtime/safepoint.hpp"
#include "runtime/synchronizer.hpp"
#include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
#include "utilities/ostream.hpp"
#if INCLUDE_TRACE
#include "trace/tracing.hpp"
#endif
-
ClassLoaderData * ClassLoaderData::_the_null_class_loader_data = NULL;
ClassLoaderData::ClassLoaderData(Handle h_class_loader, bool is_anonymous, Dependencies dependencies) :
@@ -754,7 +754,7 @@
if (Tracing::enabled()) {
if (Tracing::is_event_enabled(TraceClassUnloadEvent)) {
assert(_unloading != NULL, "need class loader data unload list!");
- _class_unload_time = Tracing::time();
+ _class_unload_time = Ticks::now();
classes_unloading_do(&class_unload_event);
}
Tracing::on_unloading_classes();
@@ -832,7 +832,7 @@
#if INCLUDE_TRACE
-TracingTime ClassLoaderDataGraph::_class_unload_time;
+Ticks ClassLoaderDataGraph::_class_unload_time;
void ClassLoaderDataGraph::class_unload_event(Klass* const k) {
diff --git a/hotspot/src/share/vm/classfile/classLoaderData.hpp b/hotspot/src/share/vm/classfile/classLoaderData.hpp
index cee114c..2cb2180 100644
--- a/hotspot/src/share/vm/classfile/classLoaderData.hpp
+++ b/hotspot/src/share/vm/classfile/classLoaderData.hpp
@@ -33,7 +33,7 @@
#include "utilities/growableArray.hpp"
#if INCLUDE_TRACE
-# include "trace/traceTime.hpp"
+# include "utilities/ticks.hpp"
#endif
//
@@ -98,7 +98,7 @@
#if INCLUDE_TRACE
private:
- static TracingTime _class_unload_time;
+ static Ticks _class_unload_time;
static void class_unload_event(Klass* const k);
#endif
};
diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp
index b4dfe74..ee311b6 100644
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp
@@ -55,13 +55,13 @@
#include "runtime/signature.hpp"
#include "services/classLoadingService.hpp"
#include "services/threadService.hpp"
+#include "utilities/macros.hpp"
+#include "utilities/ticks.hpp"
#if INCLUDE_TRACE
#include "trace/tracing.hpp"
- #include "trace/traceMacros.hpp"
#endif
-
Dictionary* SystemDictionary::_dictionary = NULL;
PlaceholderTable* SystemDictionary::_placeholders = NULL;
Dictionary* SystemDictionary::_shared_dictionary = NULL;
@@ -598,7 +598,7 @@
assert(name != NULL && !FieldType::is_array(name) &&
!FieldType::is_obj(name), "invalid class name");
- TracingTime class_load_start_time = Tracing::time();
+ Ticks class_load_start_time = Ticks::now();
// UseNewReflection
// Fix for 4474172; see evaluation for more details
@@ -1006,7 +1006,7 @@
TRAPS) {
TempNewSymbol parsed_name = NULL;
- TracingTime class_load_start_time = Tracing::time();
+ Ticks class_load_start_time = Ticks::now();
ClassLoaderData* loader_data;
if (host_klass.not_null()) {
@@ -2665,13 +2665,12 @@
}
// utility function for class load event
-void SystemDictionary::post_class_load_event(TracingTime start_time,
+void SystemDictionary::post_class_load_event(const Ticks& start_time,
instanceKlassHandle k,
Handle initiating_loader) {
#if INCLUDE_TRACE
EventClassLoad event(UNTIMED);
if (event.should_commit()) {
- event.set_endtime(Tracing::time());
event.set_starttime(start_time);
event.set_loadedClass(k());
oop defining_class_loader = k->class_loader();
diff --git a/hotspot/src/share/vm/classfile/systemDictionary.hpp b/hotspot/src/share/vm/classfile/systemDictionary.hpp
index 1bf9867..b0e914f 100644
--- a/hotspot/src/share/vm/classfile/systemDictionary.hpp
+++ b/hotspot/src/share/vm/classfile/systemDictionary.hpp
@@ -31,7 +31,6 @@
#include "oops/symbol.hpp"
#include "runtime/java.hpp"
#include "runtime/reflectionUtils.hpp"
-#include "trace/traceTime.hpp"
#include "utilities/hashtable.hpp"
#include "utilities/hashtable.inline.hpp"
@@ -78,6 +77,7 @@
template <MEMFLAGS F> class HashtableBucket;
class ResolutionErrorTable;
class SymbolPropertyTable;
+class Ticks;
// Certain classes are preloaded, such as java.lang.Object and java.lang.String.
// They are all "well-known", in the sense that no class loader is allowed
@@ -165,6 +165,7 @@
\
do_klass(StringBuffer_klass, java_lang_StringBuffer, Pre ) \
do_klass(StringBuilder_klass, java_lang_StringBuilder, Pre ) \
+ do_klass(misc_Unsafe_klass, sun_misc_Unsafe, Pre ) \
\
/* It's NULL in non-1.4 JDKs. */ \
do_klass(StackTraceElement_klass, java_lang_StackTraceElement, Opt ) \
@@ -637,7 +638,7 @@
static void add_to_hierarchy(instanceKlassHandle k, TRAPS);
// event based tracing
- static void post_class_load_event(TracingTime start_time, instanceKlassHandle k,
+ static void post_class_load_event(const Ticks& start_time, instanceKlassHandle k,
Handle initiating_loader);
// We pass in the hashtable index so we can calculate it outside of
// the SystemDictionary_lock.
diff --git a/hotspot/src/share/vm/classfile/verifier.cpp b/hotspot/src/share/vm/classfile/verifier.cpp
index 62ccf295..2e64747 100644
--- a/hotspot/src/share/vm/classfile/verifier.cpp
+++ b/hotspot/src/share/vm/classfile/verifier.cpp
@@ -2302,6 +2302,24 @@
}
}
+bool ClassVerifier::is_same_or_direct_interface(
+ instanceKlassHandle klass,
+ VerificationType klass_type,
+ VerificationType ref_class_type) {
+ if (ref_class_type.equals(klass_type)) return true;
+ Array<Klass*>* local_interfaces = klass->local_interfaces();
+ if (local_interfaces != NULL) {
+ for (int x = 0; x < local_interfaces->length(); x++) {
+ Klass* k = local_interfaces->at(x);
+ assert (k != NULL && k->is_interface(), "invalid interface");
+ if (ref_class_type.equals(VerificationType::reference_type(k->name()))) {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
void ClassVerifier::verify_invoke_instructions(
RawBytecodeStream* bcs, u4 code_length, StackMapFrame* current_frame,
bool *this_uninit, VerificationType return_type,
@@ -2432,23 +2450,38 @@
return;
}
} else if (opcode == Bytecodes::_invokespecial
- && !ref_class_type.equals(current_type())
+ && !is_same_or_direct_interface(current_class(), current_type(), ref_class_type)
&& !ref_class_type.equals(VerificationType::reference_type(
current_class()->super()->name()))) {
bool subtype = false;
+ bool have_imr_indirect = cp->tag_at(index).value() == JVM_CONSTANT_InterfaceMethodref;
if (!current_class()->is_anonymous()) {
subtype = ref_class_type.is_assignable_from(
current_type(), this, CHECK_VERIFY(this));
} else {
- subtype = ref_class_type.is_assignable_from(VerificationType::reference_type(
- current_class()->host_klass()->name()), this, CHECK_VERIFY(this));
+ VerificationType host_klass_type =
+ VerificationType::reference_type(current_class()->host_klass()->name());
+ subtype = ref_class_type.is_assignable_from(host_klass_type, this, CHECK_VERIFY(this));
+
+ // If invokespecial of IMR, need to recheck for same or
+ // direct interface relative to the host class
+ have_imr_indirect = (have_imr_indirect &&
+ !is_same_or_direct_interface(
+ InstanceKlass::cast(current_class()->host_klass()),
+ host_klass_type, ref_class_type));
}
if (!subtype) {
verify_error(ErrorContext::bad_code(bci),
"Bad invokespecial instruction: "
"current class isn't assignable to reference class.");
return;
+ } else if (have_imr_indirect) {
+ verify_error(ErrorContext::bad_code(bci),
+ "Bad invokespecial instruction: "
+ "interface method reference is in an indirect superinterface.");
+ return;
}
+
}
// Match method descriptor with operand stack
for (int i = nargs - 1; i >= 0; i--) { // Run backwards
diff --git a/hotspot/src/share/vm/classfile/verifier.hpp b/hotspot/src/share/vm/classfile/verifier.hpp
index 9da0ac3..74143a6 100644
--- a/hotspot/src/share/vm/classfile/verifier.hpp
+++ b/hotspot/src/share/vm/classfile/verifier.hpp
@@ -345,6 +345,9 @@
// that a class has been verified and prepared for execution.
bool was_recursively_verified() { return _klass->is_rewritten(); }
+ bool is_same_or_direct_interface(instanceKlassHandle klass,
+ VerificationType klass_type, VerificationType ref_class_type);
+
public:
enum {
BYTECODE_OFFSET = 1,
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp
index 5d32b15..9a06792 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp
@@ -331,6 +331,7 @@
template(findNative_name, "findNative") \
template(deadChild_name, "deadChild") \
template(addClass_name, "addClass") \
+ template(throwIllegalAccessError_name, "throwIllegalAccessError") \
template(getFromClass_name, "getFromClass") \
template(dispatch_name, "dispatch") \
template(getSystemClassLoader_name, "getSystemClassLoader") \
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
index ffe87d5..0c6397a 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
@@ -1993,7 +1993,7 @@
GenCollectedHeap* gch = GenCollectedHeap::heap();
STWGCTimer* gc_timer = GenMarkSweep::gc_timer();
- gc_timer->register_gc_start(os::elapsed_counter());
+ gc_timer->register_gc_start();
SerialOldTracer* gc_tracer = GenMarkSweep::gc_tracer();
gc_tracer->report_gc_start(gch->gc_cause(), gc_timer->gc_start());
@@ -2089,7 +2089,7 @@
size_policy()->msc_collection_end(gch->gc_cause());
}
- gc_timer->register_gc_end(os::elapsed_counter());
+ gc_timer->register_gc_end();
gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
@@ -2475,7 +2475,7 @@
void CMSCollector::register_gc_start(GCCause::Cause cause) {
_cms_start_registered = true;
- _gc_timer_cm->register_gc_start(os::elapsed_counter());
+ _gc_timer_cm->register_gc_start();
_gc_tracer_cm->report_gc_start(cause, _gc_timer_cm->gc_start());
}
@@ -2483,7 +2483,7 @@
if (_cms_start_registered) {
report_heap_summary(GCWhen::AfterGC);
- _gc_timer_cm->register_gc_end(os::elapsed_counter());
+ _gc_timer_cm->register_gc_end();
_gc_tracer_cm->report_gc_end(_gc_timer_cm->gc_end(), _gc_timer_cm->time_partitions());
_cms_start_registered = false;
}
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp
index 3e24c24..24ca71c 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp
@@ -145,7 +145,7 @@
);
#endif /* USDT2 */
- _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark", os::elapsed_counter());
+ _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark");
GenCollectedHeap* gch = GenCollectedHeap::heap();
GCCauseSetter gccs(gch, GCCause::_cms_initial_mark);
@@ -157,7 +157,7 @@
VM_CMS_Operation::verify_after_gc();
- _collector->_gc_timer_cm->register_gc_pause_end(os::elapsed_counter());
+ _collector->_gc_timer_cm->register_gc_pause_end();
#ifndef USDT2
HS_DTRACE_PROBE(hs_private, cms__initmark__end);
@@ -182,7 +182,7 @@
);
#endif /* USDT2 */
- _collector->_gc_timer_cm->register_gc_pause_start("Final Mark", os::elapsed_counter());
+ _collector->_gc_timer_cm->register_gc_pause_start("Final Mark");
GenCollectedHeap* gch = GenCollectedHeap::heap();
GCCauseSetter gccs(gch, GCCause::_cms_final_remark);
@@ -195,7 +195,7 @@
VM_CMS_Operation::verify_after_gc();
_collector->save_heap_summary();
- _collector->_gc_timer_cm->register_gc_pause_end(os::elapsed_counter());
+ _collector->_gc_timer_cm->register_gc_pause_end();
#ifndef USDT2
HS_DTRACE_PROBE(hs_private, cms__remark__end);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
index 4b82d5b..5ae273b 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
@@ -56,6 +56,7 @@
#include "oops/oop.inline.hpp"
#include "oops/oop.pcgc.inline.hpp"
#include "runtime/vmThread.hpp"
+#include "utilities/ticks.hpp"
size_t G1CollectedHeap::_humongous_object_threshold_in_words = 0;
@@ -1284,7 +1285,7 @@
}
STWGCTimer* gc_timer = G1MarkSweep::gc_timer();
- gc_timer->register_gc_start(os::elapsed_counter());
+ gc_timer->register_gc_start();
SerialOldTracer* gc_tracer = G1MarkSweep::gc_tracer();
gc_tracer->report_gc_start(gc_cause(), gc_timer->gc_start());
@@ -1552,7 +1553,7 @@
post_full_gc_dump(gc_timer);
- gc_timer->register_gc_end(os::elapsed_counter());
+ gc_timer->register_gc_end();
gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
}
@@ -2482,7 +2483,7 @@
FullGCCount_lock->notify_all();
}
-void G1CollectedHeap::register_concurrent_cycle_start(jlong start_time) {
+void G1CollectedHeap::register_concurrent_cycle_start(const Ticks& start_time) {
_concurrent_cycle_started = true;
_gc_timer_cm->register_gc_start(start_time);
@@ -2496,7 +2497,7 @@
_gc_tracer_cm->report_concurrent_mode_failure();
}
- _gc_timer_cm->register_gc_end(os::elapsed_counter());
+ _gc_timer_cm->register_gc_end();
_gc_tracer_cm->report_gc_end(_gc_timer_cm->gc_end(), _gc_timer_cm->time_partitions());
_concurrent_cycle_started = false;
@@ -3887,7 +3888,7 @@
return false;
}
- _gc_timer_stw->register_gc_start(os::elapsed_counter());
+ _gc_timer_stw->register_gc_start();
_gc_tracer_stw->report_gc_start(gc_cause(), _gc_timer_stw->gc_start());
@@ -4265,7 +4266,7 @@
_gc_tracer_stw->report_evacuation_info(&evacuation_info);
_gc_tracer_stw->report_tenuring_threshold(_g1_policy->tenuring_threshold());
- _gc_timer_stw->register_gc_end(os::elapsed_counter());
+ _gc_timer_stw->register_gc_end();
_gc_tracer_stw->report_gc_end(_gc_timer_stw->gc_end(), _gc_timer_stw->time_partitions());
}
// It should now be safe to tell the concurrent mark thread to start
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
index 689814d..69aa325 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
@@ -72,6 +72,7 @@
class G1OldTracer;
class EvacuationFailedInfo;
class nmethod;
+class Ticks;
typedef OverflowTaskQueue<StarTask, mtGC> RefToScanQueue;
typedef GenericTaskQueueSet<RefToScanQueue, mtGC> RefToScanQueueSet;
@@ -746,7 +747,7 @@
return _old_marking_cycles_completed;
}
- void register_concurrent_cycle_start(jlong start_time);
+ void register_concurrent_cycle_start(const Ticks& start_time);
void register_concurrent_cycle_end();
void trace_heap_after_concurrent_cycle();
diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
index 1d4ef41..5ecb60c 100644
--- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
@@ -915,7 +915,7 @@
GenCollectedHeap* gch = GenCollectedHeap::heap();
- _gc_timer->register_gc_start(os::elapsed_counter());
+ _gc_timer->register_gc_start();
assert(gch->kind() == CollectedHeap::GenCollectedHeap,
"not a CMS generational heap");
@@ -1091,7 +1091,7 @@
gch->trace_heap_after_gc(&gc_tracer);
gc_tracer.report_tenuring_threshold(tenuring_threshold());
- _gc_timer->register_gc_end(os::elapsed_counter());
+ _gc_timer->register_gc_end();
gc_tracer.report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
}
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
index 5cbd2b4..65f9ece 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
@@ -114,7 +114,7 @@
assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
GCCause::Cause gc_cause = heap->gc_cause();
- _gc_timer->register_gc_start(os::elapsed_counter());
+ _gc_timer->register_gc_start();
_gc_tracer->report_gc_start(gc_cause, _gc_timer->gc_start());
PSAdaptiveSizePolicy* size_policy = heap->size_policy();
@@ -390,7 +390,7 @@
ParallelTaskTerminator::print_termination_counts();
#endif
- _gc_timer->register_gc_end(os::elapsed_counter());
+ _gc_timer->register_gc_end();
_gc_tracer->report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
index bd3be22..8e9dd8d 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
@@ -2006,7 +2006,7 @@
ParallelScavengeHeap* heap = gc_heap();
- _gc_timer.register_gc_start(os::elapsed_counter());
+ _gc_timer.register_gc_start();
_gc_tracer.report_gc_start(heap->gc_cause(), _gc_timer.gc_start());
TimeStamp marking_start;
@@ -2244,7 +2244,7 @@
ParallelTaskTerminator::print_termination_counts();
#endif
- _gc_timer.register_gc_end(os::elapsed_counter());
+ _gc_timer.register_gc_end();
_gc_tracer.report_dense_prefix(dense_prefix(old_space_id));
_gc_tracer.report_gc_end(_gc_timer.gc_end(), _gc_timer.time_partitions());
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
index 026b1a0..66b23c4 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
@@ -263,7 +263,7 @@
assert(_preserved_mark_stack.is_empty(), "should be empty");
assert(_preserved_oop_stack.is_empty(), "should be empty");
- _gc_timer.register_gc_start(os::elapsed_counter());
+ _gc_timer.register_gc_start();
TimeStamp scavenge_entry;
TimeStamp scavenge_midpoint;
@@ -691,7 +691,7 @@
#endif
- _gc_timer.register_gc_end(os::elapsed_counter());
+ _gc_timer.register_gc_end();
_gc_tracer.report_gc_end(_gc_timer.gc_end(), _gc_timer.time_partitions());
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp b/hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp
index 6d01170..246be3e 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp
@@ -25,52 +25,55 @@
#include "precompiled.hpp"
#include "gc_implementation/shared/gcTimer.hpp"
#include "utilities/growableArray.hpp"
+#include "utilities/ticks.inline.hpp"
-void GCTimer::register_gc_start(jlong time) {
+// the "time" parameter for most functions
+// has a default value set by Ticks::now()
+
+void GCTimer::register_gc_start(const Ticks& time) {
_time_partitions.clear();
_gc_start = time;
}
-void GCTimer::register_gc_end(jlong time) {
+void GCTimer::register_gc_end(const Ticks& time) {
assert(!_time_partitions.has_active_phases(),
"We should have ended all started phases, before ending the GC");
_gc_end = time;
}
-void GCTimer::register_gc_pause_start(const char* name, jlong time) {
+void GCTimer::register_gc_pause_start(const char* name, const Ticks& time) {
_time_partitions.report_gc_phase_start(name, time);
}
-void GCTimer::register_gc_pause_end(jlong time) {
+void GCTimer::register_gc_pause_end(const Ticks& time) {
_time_partitions.report_gc_phase_end(time);
}
-void GCTimer::register_gc_phase_start(const char* name, jlong time) {
+void GCTimer::register_gc_phase_start(const char* name, const Ticks& time) {
_time_partitions.report_gc_phase_start(name, time);
}
-void GCTimer::register_gc_phase_end(jlong time) {
+void GCTimer::register_gc_phase_end(const Ticks& time) {
_time_partitions.report_gc_phase_end(time);
}
-
-void STWGCTimer::register_gc_start(jlong time) {
+void STWGCTimer::register_gc_start(const Ticks& time) {
GCTimer::register_gc_start(time);
register_gc_pause_start("GC Pause", time);
}
-void STWGCTimer::register_gc_end(jlong time) {
+void STWGCTimer::register_gc_end(const Ticks& time) {
register_gc_pause_end(time);
GCTimer::register_gc_end(time);
}
-void ConcurrentGCTimer::register_gc_pause_start(const char* name, jlong time) {
- GCTimer::register_gc_pause_start(name, time);
+void ConcurrentGCTimer::register_gc_pause_start(const char* name) {
+ GCTimer::register_gc_pause_start(name);
}
-void ConcurrentGCTimer::register_gc_pause_end(jlong time) {
- GCTimer::register_gc_pause_end(time);
+void ConcurrentGCTimer::register_gc_pause_end() {
+ GCTimer::register_gc_pause_end();
}
void PhasesStack::clear() {
@@ -111,11 +114,11 @@
void TimePartitions::clear() {
_phases->clear();
_active_phases.clear();
- _sum_of_pauses = 0;
- _longest_pause = 0;
+ _sum_of_pauses = Tickspan();
+ _longest_pause = Tickspan();
}
-void TimePartitions::report_gc_phase_start(const char* name, jlong time) {
+void TimePartitions::report_gc_phase_start(const char* name, const Ticks& time) {
assert(_phases->length() <= 1000, "Too many recored phases?");
int level = _active_phases.count();
@@ -133,13 +136,13 @@
void TimePartitions::update_statistics(GCPhase* phase) {
// FIXME: This should only be done for pause phases
if (phase->level() == 0) {
- jlong pause = phase->end() - phase->start();
+ const Tickspan pause = phase->end() - phase->start();
_sum_of_pauses += pause;
_longest_pause = MAX2(pause, _longest_pause);
}
}
-void TimePartitions::report_gc_phase_end(jlong time) {
+void TimePartitions::report_gc_phase_end(const Ticks& time) {
int phase_index = _active_phases.pop();
GCPhase* phase = _phases->adr_at(phase_index);
phase->set_end(time);
@@ -157,14 +160,6 @@
return _phases->adr_at(index);
}
-jlong TimePartitions::sum_of_pauses() {
- return _sum_of_pauses;
-}
-
-jlong TimePartitions::longest_pause() {
- return _longest_pause;
-}
-
bool TimePartitions::has_active_phases() {
return _active_phases.count() > 0;
}
@@ -194,7 +189,7 @@
max_nested_pause_phases();
}
- static void validate_pause_phase(GCPhase* phase, int level, const char* name, jlong start, jlong end) {
+ static void validate_pause_phase(GCPhase* phase, int level, const char* name, const Ticks& start, const Ticks& end) {
assert(phase->level() == level, "Incorrect level");
assert(strcmp(phase->name(), name) == 0, "Incorrect name");
assert(phase->start() == start, "Incorrect start");
@@ -209,8 +204,8 @@
TimePartitionPhasesIterator iter(&time_partitions);
validate_pause_phase(iter.next(), 0, "PausePhase", 2, 8);
- assert(time_partitions.sum_of_pauses() == 8-2, "Incorrect");
- assert(time_partitions.longest_pause() == 8-2, "Incorrect");
+ assert(time_partitions.sum_of_pauses() == Ticks(8) - Ticks(2), "Incorrect");
+ assert(time_partitions.longest_pause() == Ticks(8) - Ticks(2), "Incorrect");
assert(!iter.has_next(), "Too many elements");
}
@@ -227,8 +222,8 @@
validate_pause_phase(iter.next(), 0, "PausePhase1", 2, 3);
validate_pause_phase(iter.next(), 0, "PausePhase2", 4, 6);
- assert(time_partitions.sum_of_pauses() == 3, "Incorrect");
- assert(time_partitions.longest_pause() == 2, "Incorrect");
+ assert(time_partitions.sum_of_pauses() == Ticks(3) - Ticks(0), "Incorrect");
+ assert(time_partitions.longest_pause() == Ticks(2) - Ticks(0), "Incorrect");
assert(!iter.has_next(), "Too many elements");
}
@@ -245,8 +240,8 @@
validate_pause_phase(iter.next(), 0, "PausePhase", 2, 5);
validate_pause_phase(iter.next(), 1, "SubPhase", 3, 4);
- assert(time_partitions.sum_of_pauses() == 3, "Incorrect");
- assert(time_partitions.longest_pause() == 3, "Incorrect");
+ assert(time_partitions.sum_of_pauses() == Ticks(3) - Ticks(0), "Incorrect");
+ assert(time_partitions.longest_pause() == Ticks(3) - Ticks(0), "Incorrect");
assert(!iter.has_next(), "Too many elements");
}
@@ -269,8 +264,8 @@
validate_pause_phase(iter.next(), 2, "SubPhase2", 4, 7);
validate_pause_phase(iter.next(), 3, "SubPhase3", 5, 6);
- assert(time_partitions.sum_of_pauses() == 7, "Incorrect");
- assert(time_partitions.longest_pause() == 7, "Incorrect");
+ assert(time_partitions.sum_of_pauses() == Ticks(7) - Ticks(0), "Incorrect");
+ assert(time_partitions.longest_pause() == Ticks(7) - Ticks(0), "Incorrect");
assert(!iter.has_next(), "Too many elements");
}
@@ -298,8 +293,8 @@
validate_pause_phase(iter.next(), 1, "SubPhase3", 7, 8);
validate_pause_phase(iter.next(), 1, "SubPhase4", 9, 10);
- assert(time_partitions.sum_of_pauses() == 9, "Incorrect");
- assert(time_partitions.longest_pause() == 9, "Incorrect");
+ assert(time_partitions.sum_of_pauses() == Ticks(9) - Ticks(0), "Incorrect");
+ assert(time_partitions.longest_pause() == Ticks(9) - Ticks(0), "Incorrect");
assert(!iter.has_next(), "Too many elements");
}
@@ -336,8 +331,8 @@
validate_pause_phase(iter.next(), 2, "SubPhase22", 12, 13);
validate_pause_phase(iter.next(), 1, "SubPhase3", 15, 16);
- assert(time_partitions.sum_of_pauses() == 15, "Incorrect");
- assert(time_partitions.longest_pause() == 15, "Incorrect");
+ assert(time_partitions.sum_of_pauses() == Ticks(15) - Ticks(0), "Incorrect");
+ assert(time_partitions.longest_pause() == Ticks(15) - Ticks(0), "Incorrect");
assert(!iter.has_next(), "Too many elements");
}
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp b/hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp
index b29e7c5..3826515 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp
@@ -28,6 +28,7 @@
#include "memory/allocation.hpp"
#include "prims/jni_md.h"
#include "utilities/macros.hpp"
+#include "utilities/ticks.hpp"
class ConcurrentPhase;
class GCPhase;
@@ -45,21 +46,21 @@
class GCPhase {
const char* _name;
int _level;
- jlong _start;
- jlong _end;
+ Ticks _start;
+ Ticks _end;
public:
void set_name(const char* name) { _name = name; }
- const char* name() { return _name; }
+ const char* name() const { return _name; }
- int level() { return _level; }
+ int level() const { return _level; }
void set_level(int level) { _level = level; }
- jlong start() { return _start; }
- void set_start(jlong time) { _start = time; }
+ const Ticks start() const { return _start; }
+ void set_start(const Ticks& time) { _start = time; }
- jlong end() { return _end; }
- void set_end(jlong time) { _end = time; }
+ const Ticks end() const { return _end; }
+ void set_end(const Ticks& time) { _end = time; }
virtual void accept(PhaseVisitor* visitor) = 0;
};
@@ -102,22 +103,22 @@
GrowableArray<PausePhase>* _phases;
PhasesStack _active_phases;
- jlong _sum_of_pauses;
- jlong _longest_pause;
+ Tickspan _sum_of_pauses;
+ Tickspan _longest_pause;
public:
TimePartitions();
~TimePartitions();
void clear();
- void report_gc_phase_start(const char* name, jlong time);
- void report_gc_phase_end(jlong time);
+ void report_gc_phase_start(const char* name, const Ticks& time);
+ void report_gc_phase_end(const Ticks& time);
int num_phases() const;
GCPhase* phase_at(int index) const;
- jlong sum_of_pauses();
- jlong longest_pause();
+ const Tickspan sum_of_pauses() const { return _sum_of_pauses; }
+ const Tickspan longest_pause() const { return _longest_pause; }
bool has_active_phases();
private:
@@ -133,40 +134,37 @@
class GCTimer : public ResourceObj {
NOT_PRODUCT(friend class GCTimerTest;)
protected:
- jlong _gc_start;
- jlong _gc_end;
+ Ticks _gc_start;
+ Ticks _gc_end;
TimePartitions _time_partitions;
public:
- virtual void register_gc_start(jlong time);
- virtual void register_gc_end(jlong time);
+ virtual void register_gc_start(const Ticks& time = Ticks::now());
+ virtual void register_gc_end(const Ticks& time = Ticks::now());
- void register_gc_phase_start(const char* name, jlong time);
- void register_gc_phase_end(jlong time);
+ void register_gc_phase_start(const char* name, const Ticks& time);
+ void register_gc_phase_end(const Ticks& time);
- jlong gc_start() { return _gc_start; }
- jlong gc_end() { return _gc_end; }
+ const Ticks gc_start() const { return _gc_start; }
+ const Ticks gc_end() const { return _gc_end; }
TimePartitions* time_partitions() { return &_time_partitions; }
- long longest_pause();
- long sum_of_pauses();
-
protected:
- void register_gc_pause_start(const char* name, jlong time);
- void register_gc_pause_end(jlong time);
+ void register_gc_pause_start(const char* name, const Ticks& time = Ticks::now());
+ void register_gc_pause_end(const Ticks& time = Ticks::now());
};
class STWGCTimer : public GCTimer {
public:
- virtual void register_gc_start(jlong time);
- virtual void register_gc_end(jlong time);
+ virtual void register_gc_start(const Ticks& time = Ticks::now());
+ virtual void register_gc_end(const Ticks& time = Ticks::now());
};
class ConcurrentGCTimer : public GCTimer {
public:
- void register_gc_pause_start(const char* name, jlong time);
- void register_gc_pause_end(jlong time);
+ void register_gc_pause_start(const char* name);
+ void register_gc_pause_end();
};
class TimePartitionPhasesIterator {
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp b/hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp
index 555e2ed..5e533d3 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp
@@ -32,6 +32,7 @@
#include "memory/referenceProcessorStats.hpp"
#include "runtime/os.hpp"
#include "utilities/globalDefinitions.hpp"
+#include "utilities/ticks.inline.hpp"
#if INCLUDE_ALL_GCS
#include "gc_implementation/g1/evacuationInfo.hpp"
@@ -45,7 +46,7 @@
return GCTracer_next_gc_id++;
}
-void GCTracer::report_gc_start_impl(GCCause::Cause cause, jlong timestamp) {
+void GCTracer::report_gc_start_impl(GCCause::Cause cause, const Ticks& timestamp) {
assert_unset_gc_id();
GCId gc_id = create_new_gc_id();
@@ -54,7 +55,7 @@
_shared_gc_info.set_start_timestamp(timestamp);
}
-void GCTracer::report_gc_start(GCCause::Cause cause, jlong timestamp) {
+void GCTracer::report_gc_start(GCCause::Cause cause, const Ticks& timestamp) {
assert_unset_gc_id();
report_gc_start_impl(cause, timestamp);
@@ -64,7 +65,7 @@
return _shared_gc_info.id() != SharedGCInfo::UNSET_GCID;
}
-void GCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
+void GCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
assert_set_gc_id();
_shared_gc_info.set_sum_of_pauses(time_partitions->sum_of_pauses());
@@ -75,7 +76,7 @@
send_garbage_collection_event();
}
-void GCTracer::report_gc_end(jlong timestamp, TimePartitions* time_partitions) {
+void GCTracer::report_gc_end(const Ticks& timestamp, TimePartitions* time_partitions) {
assert_set_gc_id();
report_gc_end_impl(timestamp, time_partitions);
@@ -97,10 +98,10 @@
const GCId _gc_id;
const double _size_threshold_percentage;
const size_t _total_size_in_words;
- const jlong _timestamp;
+ const Ticks _timestamp;
public:
- ObjectCountEventSenderClosure(GCId gc_id, size_t total_size_in_words, jlong timestamp) :
+ ObjectCountEventSenderClosure(GCId gc_id, size_t total_size_in_words, const Ticks& timestamp) :
_gc_id(gc_id),
_size_threshold_percentage(ObjectCountCutOffPercent / 100),
_total_size_in_words(total_size_in_words),
@@ -131,9 +132,7 @@
if (!cit.allocation_failed()) {
HeapInspection hi(false, false, false, NULL);
hi.populate_table(&cit, is_alive_cl);
-
- jlong timestamp = os::elapsed_counter();
- ObjectCountEventSenderClosure event_sender(_shared_gc_info.id(), cit.size_of_instances_in_words(), timestamp);
+ ObjectCountEventSenderClosure event_sender(_shared_gc_info.id(), cit.size_of_instances_in_words(), Ticks::now());
cit.iterate(&event_sender);
}
}
@@ -147,7 +146,7 @@
send_meta_space_summary_event(when, meta_space_summary);
}
-void YoungGCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
+void YoungGCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
assert_set_gc_id();
assert(_tenuring_threshold != UNSET_TENURING_THRESHOLD, "Tenuring threshold has not been reported");
@@ -167,14 +166,14 @@
_tenuring_threshold = tenuring_threshold;
}
-void OldGCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
+void OldGCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
assert_set_gc_id();
GCTracer::report_gc_end_impl(timestamp, time_partitions);
send_old_gc_event();
}
-void ParallelOldTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
+void ParallelOldTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
assert_set_gc_id();
OldGCTracer::report_gc_end_impl(timestamp, time_partitions);
@@ -200,7 +199,7 @@
_g1_young_gc_info.set_type(type);
}
-void G1NewTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
+void G1NewTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
assert_set_gc_id();
YoungGCTracer::report_gc_end_impl(timestamp, time_partitions);
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp b/hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp
index c157d86..fda51e8 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp
@@ -35,6 +35,7 @@
#include "gc_implementation/g1/g1YCTypes.hpp"
#endif
#include "utilities/macros.hpp"
+#include "utilities/ticks.hpp"
typedef uint GCId;
@@ -47,8 +48,6 @@
class BoolObjectClosure;
class SharedGCInfo VALUE_OBJ_CLASS_SPEC {
- static const jlong UNSET_TIMESTAMP = -1;
-
public:
static const GCId UNSET_GCID = (GCId)-1;
@@ -56,23 +55,30 @@
GCId _id;
GCName _name;
GCCause::Cause _cause;
- jlong _start_timestamp;
- jlong _end_timestamp;
- jlong _sum_of_pauses;
- jlong _longest_pause;
+ Ticks _start_timestamp;
+ Ticks _end_timestamp;
+ Tickspan _sum_of_pauses;
+ Tickspan _longest_pause;
public:
- SharedGCInfo(GCName name) : _id(UNSET_GCID), _name(name), _cause(GCCause::_last_gc_cause),
- _start_timestamp(UNSET_TIMESTAMP), _end_timestamp(UNSET_TIMESTAMP), _sum_of_pauses(0), _longest_pause(0) {}
+ SharedGCInfo(GCName name) :
+ _id(UNSET_GCID),
+ _name(name),
+ _cause(GCCause::_last_gc_cause),
+ _start_timestamp(),
+ _end_timestamp(),
+ _sum_of_pauses(),
+ _longest_pause() {
+ }
void set_id(GCId id) { _id = id; }
GCId id() const { return _id; }
- void set_start_timestamp(jlong timestamp) { _start_timestamp = timestamp; }
- jlong start_timestamp() const { return _start_timestamp; }
+ void set_start_timestamp(const Ticks& timestamp) { _start_timestamp = timestamp; }
+ const Ticks start_timestamp() const { return _start_timestamp; }
- void set_end_timestamp(jlong timestamp) { _end_timestamp = timestamp; }
- jlong end_timestamp() const { return _end_timestamp; }
+ void set_end_timestamp(const Ticks& timestamp) { _end_timestamp = timestamp; }
+ const Ticks end_timestamp() const { return _end_timestamp; }
void set_name(GCName name) { _name = name; }
GCName name() const { return _name; }
@@ -80,11 +86,11 @@
void set_cause(GCCause::Cause cause) { _cause = cause; }
GCCause::Cause cause() const { return _cause; }
- void set_sum_of_pauses(jlong duration) { _sum_of_pauses = duration; }
- jlong sum_of_pauses() const { return _sum_of_pauses; }
+ void set_sum_of_pauses(const Tickspan& duration) { _sum_of_pauses = duration; }
+ const Tickspan sum_of_pauses() const { return _sum_of_pauses; }
- void set_longest_pause(jlong duration) { _longest_pause = duration; }
- jlong longest_pause() const { return _longest_pause; }
+ void set_longest_pause(const Tickspan& duration) { _longest_pause = duration; }
+ const Tickspan longest_pause() const { return _longest_pause; }
};
class ParallelOldGCInfo VALUE_OBJ_CLASS_SPEC {
@@ -116,8 +122,8 @@
SharedGCInfo _shared_gc_info;
public:
- void report_gc_start(GCCause::Cause cause, jlong timestamp);
- void report_gc_end(jlong timestamp, TimePartitions* time_partitions);
+ void report_gc_start(GCCause::Cause cause, const Ticks& timestamp);
+ void report_gc_end(const Ticks& timestamp, TimePartitions* time_partitions);
void report_gc_heap_summary(GCWhen::Type when, const GCHeapSummary& heap_summary, const MetaspaceSummary& meta_space_summary) const;
void report_gc_reference_stats(const ReferenceProcessorStats& rp) const;
void report_object_count_after_gc(BoolObjectClosure* object_filter) NOT_SERVICES_RETURN;
@@ -125,8 +131,8 @@
protected:
GCTracer(GCName name) : _shared_gc_info(name) {}
- virtual void report_gc_start_impl(GCCause::Cause cause, jlong timestamp);
- virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
+ virtual void report_gc_start_impl(GCCause::Cause cause, const Ticks& timestamp);
+ virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
private:
void send_garbage_collection_event() const;
@@ -143,7 +149,7 @@
protected:
YoungGCTracer(GCName name) : GCTracer(name), _tenuring_threshold(UNSET_TENURING_THRESHOLD) {}
- virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
+ virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
public:
void report_promotion_failed(const PromotionFailedInfo& pf_info);
@@ -157,7 +163,7 @@
class OldGCTracer : public GCTracer {
protected:
OldGCTracer(GCName name) : GCTracer(name) {}
- virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
+ virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
public:
void report_concurrent_mode_failure();
@@ -175,7 +181,7 @@
void report_dense_prefix(void* dense_prefix);
protected:
- void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
+ void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
private:
void send_parallel_old_event() const;
@@ -209,7 +215,7 @@
G1NewTracer() : YoungGCTracer(G1New) {}
void report_yc_type(G1YCType type);
- void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
+ void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
void report_evacuation_info(EvacuationInfo* info);
void report_evacuation_failed(EvacuationFailedInfo& ef_info);
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp b/hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp
index f08b7d1..ecf0731 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp
@@ -55,12 +55,11 @@
}
void GCTracer::send_reference_stats_event(ReferenceType type, size_t count) const {
- EventGCReferenceStatistics e(UNTIMED);
+ EventGCReferenceStatistics e;
if (e.should_commit()) {
e.set_gcId(_shared_gc_info.id());
e.set_type((u1)type);
e.set_count(count);
- e.set_endtime(os::elapsed_counter());
e.commit();
}
}
@@ -107,22 +106,20 @@
}
void YoungGCTracer::send_promotion_failed_event(const PromotionFailedInfo& pf_info) const {
- EventPromotionFailed e(UNTIMED);
+ EventPromotionFailed e;
if (e.should_commit()) {
e.set_gcId(_shared_gc_info.id());
e.set_data(to_trace_struct(pf_info));
e.set_thread(pf_info.thread()->thread_id());
- e.set_endtime(os::elapsed_counter());
e.commit();
}
}
// Common to CMS and G1
void OldGCTracer::send_concurrent_mode_failure_event() {
- EventConcurrentModeFailure e(UNTIMED);
+ EventConcurrentModeFailure e;
if (e.should_commit()) {
e.set_gcId(_shared_gc_info.id());
- e.set_endtime(os::elapsed_counter());
e.commit();
}
}
@@ -140,7 +137,7 @@
}
void G1NewTracer::send_evacuation_info_event(EvacuationInfo* info) {
- EventEvacuationInfo e(UNTIMED);
+ EventEvacuationInfo e;
if (e.should_commit()) {
e.set_gcId(_shared_gc_info.id());
e.set_cSetRegions(info->collectionset_regions());
@@ -151,17 +148,15 @@
e.set_allocRegionsUsedAfter(info->alloc_regions_used_before() + info->bytes_copied());
e.set_bytesCopied(info->bytes_copied());
e.set_regionsFreed(info->regions_freed());
- e.set_endtime(os::elapsed_counter());
e.commit();
}
}
void G1NewTracer::send_evacuation_failed_event(const EvacuationFailedInfo& ef_info) const {
- EventEvacuationFailed e(UNTIMED);
+ EventEvacuationFailed e;
if (e.should_commit()) {
e.set_gcId(_shared_gc_info.id());
e.set_data(to_trace_struct(ef_info));
- e.set_endtime(os::elapsed_counter());
e.commit();
}
}
@@ -195,13 +190,12 @@
void visit(const GCHeapSummary* heap_summary) const {
const VirtualSpaceSummary& heap_space = heap_summary->heap();
- EventGCHeapSummary e(UNTIMED);
+ EventGCHeapSummary e;
if (e.should_commit()) {
e.set_gcId(_id);
e.set_when((u1)_when);
e.set_heapSpace(to_trace_struct(heap_space));
e.set_heapUsed(heap_summary->used());
- e.set_endtime(os::elapsed_counter());
e.commit();
}
}
@@ -216,7 +210,7 @@
const SpaceSummary& from_space = ps_heap_summary->from();
const SpaceSummary& to_space = ps_heap_summary->to();
- EventPSHeapSummary e(UNTIMED);
+ EventPSHeapSummary e;
if (e.should_commit()) {
e.set_gcId(_id);
e.set_when((u1)_when);
@@ -227,7 +221,6 @@
e.set_edenSpace(to_trace_struct(ps_heap_summary->eden()));
e.set_fromSpace(to_trace_struct(ps_heap_summary->from()));
e.set_toSpace(to_trace_struct(ps_heap_summary->to()));
- e.set_endtime(os::elapsed_counter());
e.commit();
}
}
@@ -249,14 +242,13 @@
}
void GCTracer::send_meta_space_summary_event(GCWhen::Type when, const MetaspaceSummary& meta_space_summary) const {
- EventMetaspaceSummary e(UNTIMED);
+ EventMetaspaceSummary e;
if (e.should_commit()) {
e.set_gcId(_shared_gc_info.id());
e.set_when((u1) when);
e.set_metaspace(to_trace_struct(meta_space_summary.meta_space()));
e.set_dataSpace(to_trace_struct(meta_space_summary.data_space()));
e.set_classSpace(to_trace_struct(meta_space_summary.class_space()));
- e.set_endtime(os::elapsed_counter());
e.commit();
}
}
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp b/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp
index 1c13704..033ca6b 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp
@@ -31,12 +31,13 @@
#include "runtime/thread.inline.hpp"
#include "runtime/timer.hpp"
#include "utilities/ostream.hpp"
+#include "utilities/ticks.inline.hpp"
GCTraceTime::GCTraceTime(const char* title, bool doit, bool print_cr, GCTimer* timer) :
- _title(title), _doit(doit), _print_cr(print_cr), _timer(timer) {
+ _title(title), _doit(doit), _print_cr(print_cr), _timer(timer), _start_counter() {
if (_doit || _timer != NULL) {
- _start_counter = os::elapsed_counter();
+ _start_counter.stamp();
}
if (_timer != NULL) {
@@ -57,10 +58,10 @@
}
GCTraceTime::~GCTraceTime() {
- jlong stop_counter = 0;
+ Ticks stop_counter;
if (_doit || _timer != NULL) {
- stop_counter = os::elapsed_counter();
+ stop_counter.stamp();
}
if (_timer != NULL) {
@@ -68,11 +69,12 @@
}
if (_doit) {
- double seconds = TimeHelper::counter_to_seconds(stop_counter - _start_counter);
+ const Tickspan duration = stop_counter - _start_counter;
+ double duration_in_seconds = TicksToTimeHelper::seconds(duration);
if (_print_cr) {
- gclog_or_tty->print_cr(", %3.7f secs]", seconds);
+ gclog_or_tty->print_cr(", %3.7f secs]", duration_in_seconds);
} else {
- gclog_or_tty->print(", %3.7f secs]", seconds);
+ gclog_or_tty->print(", %3.7f secs]", duration_in_seconds);
}
gclog_or_tty->flush();
}
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp b/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp
index 5d92b4d..83df182 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp
@@ -26,6 +26,7 @@
#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTRACETIME_HPP
#include "prims/jni_md.h"
+#include "utilities/ticks.hpp"
class GCTimer;
@@ -34,7 +35,7 @@
bool _doit;
bool _print_cr;
GCTimer* _timer;
- jlong _start_counter;
+ Ticks _start_counter;
public:
GCTraceTime(const char* title, bool doit, bool print_cr, GCTimer* timer);
diff --git a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp b/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp
index 289c458..7504a21 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp
@@ -28,10 +28,11 @@
#include "memory/heapInspection.hpp"
#include "trace/tracing.hpp"
#include "utilities/globalDefinitions.hpp"
+#include "utilities/ticks.hpp"
#if INCLUDE_SERVICES
-void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp) {
+void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, const Ticks& timestamp) {
#if INCLUDE_TRACE
assert(Tracing::is_event_enabled(EventObjectCountAfterGC::eventId),
"Only call this method if the event is enabled");
diff --git a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp b/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp
index b83e1fa..b68e86d 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp
@@ -32,10 +32,11 @@
#if INCLUDE_SERVICES
class KlassInfoEntry;
+class Ticks;
class ObjectCountEventSender : public AllStatic {
public:
- static void send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp);
+ static void send(const KlassInfoEntry* entry, GCId gc_id, const Ticks& timestamp);
static bool should_send_event();
};
diff --git a/hotspot/src/share/vm/interpreter/linkResolver.cpp b/hotspot/src/share/vm/interpreter/linkResolver.cpp
index f829a96..da5a1e7 100644
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp
@@ -915,6 +915,25 @@
return;
}
+ // check if invokespecial's interface method reference is in an indirect superinterface
+ if (!current_klass.is_null() && resolved_klass->is_interface()) {
+ Klass *klass_to_check = !InstanceKlass::cast(current_klass())->is_anonymous() ?
+ current_klass() :
+ InstanceKlass::cast(current_klass())->host_klass();
+
+ if (!InstanceKlass::cast(klass_to_check)->is_same_or_direct_interface(resolved_klass())) {
+ ResourceMark rm(THREAD);
+ char buf[200];
+ jio_snprintf(buf, sizeof(buf),
+ "Interface method reference: %s, is in an indirect superinterface of %s",
+ Method::name_and_sig_as_C_string(resolved_klass(),
+ resolved_method->name(),
+ resolved_method->signature()),
+ current_klass->external_name());
+ THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
+ }
+ }
+
// check if not static
if (resolved_method->is_static()) {
ResourceMark rm(THREAD);
diff --git a/hotspot/src/share/vm/memory/defNewGeneration.cpp b/hotspot/src/share/vm/memory/defNewGeneration.cpp
index ca3ff46..f5fdb44 100644
--- a/hotspot/src/share/vm/memory/defNewGeneration.cpp
+++ b/hotspot/src/share/vm/memory/defNewGeneration.cpp
@@ -562,7 +562,7 @@
GenCollectedHeap* gch = GenCollectedHeap::heap();
- _gc_timer->register_gc_start(os::elapsed_counter());
+ _gc_timer->register_gc_start();
DefNewTracer gc_tracer;
gc_tracer.report_gc_start(gch->gc_cause(), _gc_timer->gc_start());
@@ -709,7 +709,7 @@
gch->trace_heap_after_gc(&gc_tracer);
gc_tracer.report_tenuring_threshold(tenuring_threshold());
- _gc_timer->register_gc_end(os::elapsed_counter());
+ _gc_timer->register_gc_end();
gc_tracer.report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
}
diff --git a/hotspot/src/share/vm/memory/generation.cpp b/hotspot/src/share/vm/memory/generation.cpp
index f9c986f..5ea4486 100644
--- a/hotspot/src/share/vm/memory/generation.cpp
+++ b/hotspot/src/share/vm/memory/generation.cpp
@@ -635,16 +635,16 @@
x(ref_processor(), gch->reserved_region());
STWGCTimer* gc_timer = GenMarkSweep::gc_timer();
- gc_timer->register_gc_start(os::elapsed_counter());
+ gc_timer->register_gc_start();
SerialOldTracer* gc_tracer = GenMarkSweep::gc_tracer();
gc_tracer->report_gc_start(gch->gc_cause(), gc_timer->gc_start());
GenMarkSweep::invoke_at_safepoint(_level, ref_processor(), clear_all_soft_refs);
- gc_timer->register_gc_end(os::elapsed_counter());
+ gc_timer->register_gc_end();
- gc_tracer->report_gc_end(os::elapsed_counter(), gc_timer->time_partitions());
+ gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
SpecializationStats::print();
}
diff --git a/hotspot/src/share/vm/memory/universe.cpp b/hotspot/src/share/vm/memory/universe.cpp
index b393272..d022ae1 100644
--- a/hotspot/src/share/vm/memory/universe.cpp
+++ b/hotspot/src/share/vm/memory/universe.cpp
@@ -120,6 +120,7 @@
oop Universe::_arithmetic_exception_instance = NULL;
oop Universe::_virtual_machine_error_instance = NULL;
oop Universe::_vm_exception = NULL;
+Method* Universe::_throw_illegal_access_error = NULL;
Array<int>* Universe::_the_empty_int_array = NULL;
Array<u2>* Universe::_the_empty_short_array = NULL;
Array<Klass*>* Universe::_the_empty_klass_array = NULL;
@@ -1096,6 +1097,18 @@
Universe::_finalizer_register_cache->init(
SystemDictionary::Finalizer_klass(), m);
+ InstanceKlass::cast(SystemDictionary::misc_Unsafe_klass())->link_class(CHECK_false);
+ m = InstanceKlass::cast(SystemDictionary::misc_Unsafe_klass())->find_method(
+ vmSymbols::throwIllegalAccessError_name(),
+ vmSymbols::void_method_signature());
+ if (m != NULL && !m->is_static()) {
+ // Note null is okay; this method is used in itables, and if it is null,
+ // then AbstractMethodError is thrown instead.
+ tty->print_cr("Unable to link/verify Unsafe.throwIllegalAccessError method");
+ return false; // initialization failed (cannot throw exception yet)
+ }
+ Universe::_throw_illegal_access_error = m;
+
// Setup method for registering loaded classes in class loader vector
InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->link_class(CHECK_false);
m = InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
diff --git a/hotspot/src/share/vm/memory/universe.hpp b/hotspot/src/share/vm/memory/universe.hpp
index a891d2a..ec3b59f 100644
--- a/hotspot/src/share/vm/memory/universe.hpp
+++ b/hotspot/src/share/vm/memory/universe.hpp
@@ -149,6 +149,8 @@
static LatestMethodCache* _loader_addClass_cache; // method for registering loaded classes in class loader vector
static LatestMethodCache* _pd_implies_cache; // method for checking protection domain attributes
+ static Method* _throw_illegal_access_error;
+
// preallocated error objects (no backtrace)
static oop _out_of_memory_error_java_heap;
static oop _out_of_memory_error_metaspace;
@@ -305,6 +307,7 @@
static oop arithmetic_exception_instance() { return _arithmetic_exception_instance; }
static oop virtual_machine_error_instance() { return _virtual_machine_error_instance; }
static oop vm_exception() { return _vm_exception; }
+ static Method* throw_illegal_access_error() { return _throw_illegal_access_error; }
static Array<int>* the_empty_int_array() { return _the_empty_int_array; }
static Array<u2>* the_empty_short_array() { return _the_empty_short_array; }
diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/hotspot/src/share/vm/oops/instanceKlass.cpp
index ae7ea80..5077f12 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp
@@ -1051,6 +1051,18 @@
return false;
}
+bool InstanceKlass::is_same_or_direct_interface(Klass *k) const {
+ // Verify direct super interface
+ if (this == k) return true;
+ assert(k->is_interface(), "should be an interface class");
+ for (int i = 0; i < local_interfaces()->length(); i++) {
+ if (local_interfaces()->at(i) == k) {
+ return true;
+ }
+ }
+ return false;
+}
+
objArrayOop InstanceKlass::allocate_objArray(int n, int length, TRAPS) {
if (length < 0) THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
if (length > arrayOopDesc::max_array_length(T_OBJECT)) {
diff --git a/hotspot/src/share/vm/oops/instanceKlass.hpp b/hotspot/src/share/vm/oops/instanceKlass.hpp
index 283caa0..c667f2c 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp
@@ -777,6 +777,7 @@
// subclass/subinterface checks
bool implements_interface(Klass* k) const;
+ bool is_same_or_direct_interface(Klass* k) const;
// Access to the implementor of an interface.
Klass* implementor() const
diff --git a/hotspot/src/share/vm/oops/klassVtable.cpp b/hotspot/src/share/vm/oops/klassVtable.cpp
index 07a1c75..1399a41 100644
--- a/hotspot/src/share/vm/oops/klassVtable.cpp
+++ b/hotspot/src/share/vm/oops/klassVtable.cpp
@@ -1076,7 +1076,12 @@
LinkResolver::lookup_instance_method_in_klasses(target, _klass, m->name(), m->signature(), CHECK);
}
if (target == NULL || !target->is_public() || target->is_abstract()) {
- // Entry do not resolve. Leave it empty
+ // Entry does not resolve. Leave it empty for AbstractMethodError.
+ if (!(target == NULL) && !target->is_public()) {
+ // Stuff an IllegalAccessError throwing method in there instead.
+ itableOffsetEntry::method_entry(_klass(), method_table_offset)[m->itable_index()].
+ initialize(Universe::throw_illegal_access_error());
+ }
} else {
// Entry did resolve, check loader constraints before initializing
// if checkconstraints requested
diff --git a/hotspot/src/share/vm/opto/compile.hpp b/hotspot/src/share/vm/opto/compile.hpp
index 5ad53e5..d248d9d 100644
--- a/hotspot/src/share/vm/opto/compile.hpp
+++ b/hotspot/src/share/vm/opto/compile.hpp
@@ -42,6 +42,7 @@
#include "runtime/deoptimization.hpp"
#include "runtime/vmThread.hpp"
#include "trace/tracing.hpp"
+#include "utilities/ticks.hpp"
class Block;
class Bundle;
@@ -597,20 +598,19 @@
bool has_method_handle_invokes() const { return _has_method_handle_invokes; }
void set_has_method_handle_invokes(bool z) { _has_method_handle_invokes = z; }
- jlong _latest_stage_start_counter;
+ Ticks _latest_stage_start_counter;
void begin_method() {
#ifndef PRODUCT
if (_printer) _printer->begin_method(this);
#endif
- C->_latest_stage_start_counter = os::elapsed_counter();
+ C->_latest_stage_start_counter.stamp();
}
void print_method(CompilerPhaseType cpt, int level = 1) {
- EventCompilerPhase event(UNTIMED);
+ EventCompilerPhase event;
if (event.should_commit()) {
event.set_starttime(C->_latest_stage_start_counter);
- event.set_endtime(os::elapsed_counter());
event.set_phase((u1) cpt);
event.set_compileID(C->_compile_id);
event.set_phaseLevel(level);
@@ -621,14 +621,13 @@
#ifndef PRODUCT
if (_printer) _printer->print_method(this, CompilerPhaseTypeHelper::to_string(cpt), level);
#endif
- C->_latest_stage_start_counter = os::elapsed_counter();
+ C->_latest_stage_start_counter.stamp();
}
void end_method(int level = 1) {
- EventCompilerPhase event(UNTIMED);
+ EventCompilerPhase event;
if (event.should_commit()) {
event.set_starttime(C->_latest_stage_start_counter);
- event.set_endtime(os::elapsed_counter());
event.set_phase((u1) PHASE_END);
event.set_compileID(C->_compile_id);
event.set_phaseLevel(level);
diff --git a/hotspot/src/share/vm/runtime/sweeper.cpp b/hotspot/src/share/vm/runtime/sweeper.cpp
index b1eba67..9034428 100644
--- a/hotspot/src/share/vm/runtime/sweeper.cpp
+++ b/hotspot/src/share/vm/runtime/sweeper.cpp
@@ -38,6 +38,7 @@
#include "runtime/vm_operations.hpp"
#include "trace/tracing.hpp"
#include "utilities/events.hpp"
+#include "utilities/ticks.inline.hpp"
#include "utilities/xmlstream.hpp"
#ifdef ASSERT
@@ -144,10 +145,10 @@
// 3) zombie -> marked_for_reclamation
int NMethodSweeper::_total_nof_methods_reclaimed = 0; // Accumulated nof methods flushed
-jlong NMethodSweeper::_total_time_sweeping = 0; // Accumulated time sweeping
-jlong NMethodSweeper::_total_time_this_sweep = 0; // Total time this sweep
-jlong NMethodSweeper::_peak_sweep_time = 0; // Peak time for a full sweep
-jlong NMethodSweeper::_peak_sweep_fraction_time = 0; // Peak time sweeping one fraction
+Tickspan NMethodSweeper::_total_time_sweeping; // Accumulated time sweeping
+Tickspan NMethodSweeper::_total_time_this_sweep; // Total time this sweep
+Tickspan NMethodSweeper::_peak_sweep_time; // Peak time for a full sweep
+Tickspan NMethodSweeper::_peak_sweep_fraction_time; // Peak time sweeping one fraction
int NMethodSweeper::_hotness_counter_reset_val = 0;
@@ -209,7 +210,7 @@
_sweep_fractions_left = NmethodSweepFraction;
_current = CodeCache::first_nmethod();
_traversals += 1;
- _total_time_this_sweep = 0;
+ _total_time_this_sweep = Tickspan();
if (PrintMethodFlushing) {
tty->print_cr("### Sweep: stack traversal %d", _traversals);
@@ -303,7 +304,7 @@
}
void NMethodSweeper::sweep_code_cache() {
- jlong sweep_start_counter = os::elapsed_counter();
+ Ticks sweep_start_counter = Ticks::now();
_flushed_count = 0;
_zombified_count = 0;
@@ -367,8 +368,8 @@
assert(_sweep_fractions_left > 1 || _current == NULL, "must have scanned the whole cache");
- jlong sweep_end_counter = os::elapsed_counter();
- jlong sweep_time = sweep_end_counter - sweep_start_counter;
+ const Ticks sweep_end_counter = Ticks::now();
+ const Tickspan sweep_time = sweep_end_counter - sweep_start_counter;
_total_time_sweeping += sweep_time;
_total_time_this_sweep += sweep_time;
_peak_sweep_fraction_time = MAX2(sweep_time, _peak_sweep_fraction_time);
@@ -389,7 +390,8 @@
#ifdef ASSERT
if(PrintMethodFlushing) {
- tty->print_cr("### sweeper: sweep time(%d): " INT64_FORMAT, _sweep_fractions_left, (jlong)sweep_time);
+ tty->print_cr("### sweeper: sweep time(%d): "
+ INT64_FORMAT, _sweep_fractions_left, (jlong)sweep_time.value());
}
#endif
diff --git a/hotspot/src/share/vm/runtime/sweeper.hpp b/hotspot/src/share/vm/runtime/sweeper.hpp
index 83040c7..9b11264 100644
--- a/hotspot/src/share/vm/runtime/sweeper.hpp
+++ b/hotspot/src/share/vm/runtime/sweeper.hpp
@@ -25,6 +25,7 @@
#ifndef SHARE_VM_RUNTIME_SWEEPER_HPP
#define SHARE_VM_RUNTIME_SWEEPER_HPP
+#include "utilities/ticks.hpp"
// An NmethodSweeper is an incremental cleaner for:
// - cleanup inline caches
// - reclamation of nmethods
@@ -71,10 +72,10 @@
// 3) zombie -> marked_for_reclamation
// Stat counters
static int _total_nof_methods_reclaimed; // Accumulated nof methods flushed
- static jlong _total_time_sweeping; // Accumulated time sweeping
- static jlong _total_time_this_sweep; // Total time this sweep
- static jlong _peak_sweep_time; // Peak time for a full sweep
- static jlong _peak_sweep_fraction_time; // Peak time sweeping one fraction
+ static Tickspan _total_time_sweeping; // Accumulated time sweeping
+ static Tickspan _total_time_this_sweep; // Total time this sweep
+ static Tickspan _peak_sweep_time; // Peak time for a full sweep
+ static Tickspan _peak_sweep_fraction_time; // Peak time sweeping one fraction
static int process_nmethod(nmethod *nm);
static void release_nmethod(nmethod* nm);
@@ -87,9 +88,9 @@
public:
static long traversal_count() { return _traversals; }
static int total_nof_methods_reclaimed() { return _total_nof_methods_reclaimed; }
- static jlong total_time_sweeping() { return _total_time_sweeping; }
- static jlong peak_sweep_time() { return _peak_sweep_time; }
- static jlong peak_sweep_fraction_time() { return _peak_sweep_fraction_time; }
+ static const Tickspan total_time_sweeping() { return _total_time_sweeping; }
+ static const Tickspan peak_sweep_time() { return _peak_sweep_time; }
+ static const Tickspan peak_sweep_fraction_time() { return _peak_sweep_fraction_time; }
static void log_sweep(const char* msg, const char* format = NULL, ...);
diff --git a/hotspot/src/share/vm/trace/noTraceBackend.hpp b/hotspot/src/share/vm/trace/noTraceBackend.hpp
index 4755487..52a7f2c 100644
--- a/hotspot/src/share/vm/trace/noTraceBackend.hpp
+++ b/hotspot/src/share/vm/trace/noTraceBackend.hpp
@@ -25,9 +25,7 @@
#define SHARE_VM_TRACE_NOTRACEBACKEND_HPP
#include "prims/jni.h"
-
-typedef jlong TracingTime;
-typedef jlong RelativeTracingTime;
+#include "trace/traceTime.hpp"
class NoTraceBackend {
public:
@@ -44,5 +42,3 @@
typedef NoTraceBackend Tracing;
#endif
-
-
diff --git a/hotspot/src/share/vm/trace/trace.xml b/hotspot/src/share/vm/trace/trace.xml
index a428611..218207b 100644
--- a/hotspot/src/share/vm/trace/trace.xml
+++ b/hotspot/src/share/vm/trace/trace.xml
@@ -176,8 +176,8 @@
<value type="UINT" field="gcId" label="GC ID" relation="GC_ID" />
<value type="GCNAME" field="name" label="Name" description="The name of the Garbage Collector" />
<value type="GCCAUSE" field="cause" label="Cause" description="The reason for triggering this Garbage Collection" />
- <value type="RELATIVE_TICKS" field="sumOfPauses" label="Sum of Pauses" description="Sum of all the times in which Java execution was paused during the garbage collection" />
- <value type="RELATIVE_TICKS" field="longestPause" label="Longest Pause" description="Longest individual pause during the garbage collection" />
+ <value type="TICKSPAN" field="sumOfPauses" label="Sum of Pauses" description="Sum of all the times in which Java execution was paused during the garbage collection" />
+ <value type="TICKSPAN" field="longestPause" label="Longest Pause" description="Longest individual pause during the garbage collection" />
</event>
<event id="GCParallelOld" path="vm/gc/collector/parold_garbage_collection" label="Parallel Old Garbage Collection"
diff --git a/hotspot/src/share/vm/trace/traceBackend.hpp b/hotspot/src/share/vm/trace/traceBackend.hpp
index cd348df..471d1b0 100644
--- a/hotspot/src/share/vm/trace/traceBackend.hpp
+++ b/hotspot/src/share/vm/trace/traceBackend.hpp
@@ -47,10 +47,6 @@
return os::elapsed_counter();
}
- static TracingTime time_adjustment(jlong time) {
- return time;
- }
-
static void on_unloading_classes(void) {
}
};
diff --git a/hotspot/src/share/vm/trace/traceEvent.hpp b/hotspot/src/share/vm/trace/traceEvent.hpp
index 364c2df..33abd67 100644
--- a/hotspot/src/share/vm/trace/traceEvent.hpp
+++ b/hotspot/src/share/vm/trace/traceEvent.hpp
@@ -25,26 +25,23 @@
#ifndef SHARE_VM_TRACE_TRACEEVENT_HPP
#define SHARE_VM_TRACE_TRACEEVENT_HPP
+#include "utilities/macros.hpp"
+
enum EventStartTime {
UNTIMED,
TIMED
};
-#include "utilities/macros.hpp"
-
#if INCLUDE_TRACE
#include "trace/traceBackend.hpp"
#include "trace/tracing.hpp"
#include "tracefiles/traceEventIds.hpp"
#include "tracefiles/traceTypes.hpp"
+#include "utilities/ticks.hpp"
template<typename T>
class TraceEvent : public StackObj {
- protected:
- jlong _startTime;
- jlong _endTime;
-
private:
bool _started;
#ifdef ASSERT
@@ -54,6 +51,18 @@
bool _ignore_check;
#endif
+ protected:
+ jlong _startTime;
+ jlong _endTime;
+
+ void set_starttime(const TracingTime& time) {
+ _startTime = time;
+ }
+
+ void set_endtime(const TracingTime& time) {
+ _endTime = time;
+ }
+
public:
TraceEvent(EventStartTime timing=TIMED) :
_startTime(0),
@@ -100,12 +109,12 @@
set_commited();
}
- void set_starttime(jlong time) {
- _startTime = time;
+ void set_starttime(const Ticks& time) {
+ _startTime = time.value();
}
- void set_endtime(jlong time) {
- _endTime = time;
+ void set_endtime(const Ticks& time) {
+ _endTime = time.value();
}
TraceEventId id() const {
diff --git a/hotspot/src/share/vm/trace/traceEventClasses.xsl b/hotspot/src/share/vm/trace/traceEventClasses.xsl
index d9d2cf2..b213ea2 100644
--- a/hotspot/src/share/vm/trace/traceEventClasses.xsl
+++ b/hotspot/src/share/vm/trace/traceEventClasses.xsl
@@ -40,6 +40,7 @@
#include "tracefiles/traceTypes.hpp"
#include "trace/traceEvent.hpp"
#include "utilities/macros.hpp"
+#include "utilities/ticks.hpp"
#if INCLUDE_TRACE
@@ -55,8 +56,8 @@
class TraceEvent {
public:
TraceEvent() {}
- void set_starttime(jlong time) const {}
- void set_endtime(jlong time) const {}
+ void set_starttime(const Ticks& time) {}
+ void set_endtime(const Ticks& time) {}
bool should_commit() const { return false; }
void commit() const {}
};
@@ -170,23 +171,23 @@
</xsl:if>
</xsl:template>
-
<xsl:template match="value[@type='TICKS']" mode="write-setters">
#if INCLUDE_TRACE
- <xsl:value-of select="concat('void set_', @field, '(jlong time) { _', @field, ' = time; }')"/>
+<xsl:value-of select="concat(' void set_', @field, '(const Ticks& time) { _', @field, ' = time; }')"/>
#else
- <xsl:value-of select="concat('void set_', @field, '(jlong ignore) {}')"/>
+<xsl:value-of select="concat(' void set_', @field, '(const Ticks& ignore) {}')"/>
#endif
</xsl:template>
-<xsl:template match="value[@type='RELATIVE_TICKS']" mode="write-setters">
+<xsl:template match="value[@type='TICKSPAN']" mode="write-setters">
#if INCLUDE_TRACE
- <xsl:value-of select="concat('void set_', @field, '(jlong time) { _', @field, ' = time; }')"/>
+ <xsl:value-of select="concat(' void set_', @field, '(const Tickspan& time) { _', @field, ' = time; }')"/>
#else
- <xsl:value-of select="concat('void set_', @field, '(jlong ignore) {}')"/>
+ <xsl:value-of select="concat(' void set_', @field, '(const Tickspan& ignore) {}')"/>
#endif
</xsl:template>
+
<xsl:template match="value" mode="write-fields">
<xsl:variable name="type" select="@type"/>
<xsl:variable name="wt" select="//primary_type[@symbol=$type]/@type"/>
@@ -226,7 +227,17 @@
<xsl:template match="value" mode="write-data">
<xsl:variable name="type" select="@type"/>
<xsl:variable name="wt" select="//primary_type[@symbol=$type]/@writetype"/>
- <xsl:value-of select="concat(' ts.print_val("', @label, '", _', @field, ');')"/>
+ <xsl:choose>
+ <xsl:when test="@type='TICKSPAN'">
+ <xsl:value-of select="concat(' ts.print_val("', @label, '", _', @field, '.value());')"/>
+ </xsl:when>
+ <xsl:when test="@type='TICKS'">
+ <xsl:value-of select="concat(' ts.print_val("', @label, '", _', @field, '.value());')"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat(' ts.print_val("', @label, '", _', @field, ');')"/>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:if test="position() != last()">
<xsl:text>
ts.print(", ");
diff --git a/hotspot/src/share/vm/trace/traceTime.hpp b/hotspot/src/share/vm/trace/traceTime.hpp
index 3a0fe20..c37e0b5 100644
--- a/hotspot/src/share/vm/trace/traceTime.hpp
+++ b/hotspot/src/share/vm/trace/traceTime.hpp
@@ -28,6 +28,5 @@
#include "prims/jni.h"
typedef jlong TracingTime;
-typedef jlong RelativeTracingTime;
-#endif
+#endif // SHARE_VM_TRACE_TRACETIME_HPP
diff --git a/hotspot/src/share/vm/trace/traceTypes.xsl b/hotspot/src/share/vm/trace/traceTypes.xsl
index 278720d..c7f9c0a 100644
--- a/hotspot/src/share/vm/trace/traceTypes.xsl
+++ b/hotspot/src/share/vm/trace/traceTypes.xsl
@@ -32,9 +32,11 @@
#ifndef TRACEFILES_JFRTYPES_HPP
#define TRACEFILES_JFRTYPES_HPP
+#include "oops/symbol.hpp"
#include "trace/traceDataTypes.hpp"
#include "utilities/globalDefinitions.hpp"
-#include "oops/symbol.hpp"
+#include "utilities/ticks.hpp"
+
enum JVMContentType {
_not_a_content_type = (JVM_CONTENT_TYPES_START - 1),
diff --git a/hotspot/src/share/vm/trace/tracetypes.xml b/hotspot/src/share/vm/trace/tracetypes.xml
index 22fd505..ab9a95b 100644
--- a/hotspot/src/share/vm/trace/tracetypes.xml
+++ b/hotspot/src/share/vm/trace/tracetypes.xml
@@ -249,13 +249,13 @@
<primary_type symbol="NANOS" datatype="LONG" contenttype="NANOS"
type="s8" sizeop="sizeof(s8)"/>
- <!-- 64-bit signed integer, SEMANTIC value ABSOLUTE TICKS -->
+ <!-- 64-bit signed integer, SEMANTIC value TICKS -->
<primary_type symbol="TICKS" datatype="LONG" contenttype="TICKS"
- type="s8" sizeop="sizeof(s8)"/>
+ type="Ticks" sizeop="sizeof(s8)"/>
- <!-- 64-bit signed integer, SEMANTIC value RELATIVE TICKS -->
- <primary_type symbol="RELATIVE_TICKS" datatype="LONG" contenttype="TICKS"
- type="s8" sizeop="sizeof(s8)"/>
+ <!-- 64-bit signed integer, SEMANTIC value TICKS duration -->
+ <primary_type symbol="TICKSPAN" datatype="LONG" contenttype="TICKS"
+ type="Tickspan" sizeop="sizeof(s8)"/>
<!-- 64-bit unsigned integer, SEMANTIC value ADDRESS (mem loc) -->
<primary_type symbol="ADDRESS" datatype="U8" contenttype="ADDRESS"
diff --git a/hotspot/src/share/vm/utilities/ticks.cpp b/hotspot/src/share/vm/utilities/ticks.cpp
new file mode 100644
index 0000000..00e7f9b
--- /dev/null
+++ b/hotspot/src/share/vm/utilities/ticks.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/os.hpp"
+#include "utilities/ticks.inline.hpp"
+
+#ifdef ASSERT
+ const jlong Ticks::invalid_time_stamp = -2; // 0xFFFF FFFF`FFFF FFFE
+#endif
+
+void Ticks::stamp() {
+ _stamp_ticks = os::elapsed_counter();
+}
+
+const Ticks Ticks::now() {
+ Ticks t;
+ t.stamp();
+ return t;
+}
+
+Tickspan::Tickspan(const Ticks& end, const Ticks& start) {
+ assert(end.value() != Ticks::invalid_time_stamp, "end is unstamped!");
+ assert(start.value() != Ticks::invalid_time_stamp, "start is unstamped!");
+
+ assert(end >= start, "negative time!");
+
+ _span_ticks = end.value() - start.value();
+}
+
+template <typename ReturnType>
+static ReturnType time_conversion(const Tickspan& span, TicksToTimeHelper::Unit unit) {
+ assert(TicksToTimeHelper::SECONDS == unit ||
+ TicksToTimeHelper::MILLISECONDS == unit, "invalid unit!");
+
+ ReturnType frequency_per_unit = (ReturnType)os::elapsed_frequency() / (ReturnType)unit;
+
+ return (ReturnType) ((ReturnType)span.value() / frequency_per_unit);
+}
+
+double TicksToTimeHelper::seconds(const Tickspan& span) {
+ return time_conversion<double>(span, SECONDS);
+}
+
+jlong TicksToTimeHelper::milliseconds(const Tickspan& span) {
+ return time_conversion<jlong>(span, MILLISECONDS);
+}
diff --git a/hotspot/src/share/vm/utilities/ticks.hpp b/hotspot/src/share/vm/utilities/ticks.hpp
new file mode 100644
index 0000000..417f274
--- /dev/null
+++ b/hotspot/src/share/vm/utilities/ticks.hpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_UTILITIES_TICKS_HPP
+#define SHARE_VM_UTILITIES_TICKS_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class Ticks;
+
+class Tickspan VALUE_OBJ_CLASS_SPEC {
+ friend class Ticks;
+ friend Tickspan operator-(const Ticks& end, const Ticks& start);
+
+ private:
+ jlong _span_ticks;
+
+ Tickspan(const Ticks& end, const Ticks& start);
+
+ public:
+ Tickspan() : _span_ticks(0) {}
+
+ Tickspan& operator+=(const Tickspan& rhs) {
+ _span_ticks += rhs._span_ticks;
+ return *this;
+ }
+
+ jlong value() const {
+ return _span_ticks;
+ }
+
+};
+
+class Ticks VALUE_OBJ_CLASS_SPEC {
+ private:
+ jlong _stamp_ticks;
+
+ public:
+ Ticks() : _stamp_ticks(0) {
+ assert((_stamp_ticks = invalid_time_stamp) == invalid_time_stamp,
+ "initial unstamped time value assignment");
+ }
+
+ Ticks& operator+=(const Tickspan& span) {
+ _stamp_ticks += span.value();
+ return *this;
+ }
+
+ Ticks& operator-=(const Tickspan& span) {
+ _stamp_ticks -= span.value();
+ return *this;
+ }
+
+ void stamp();
+
+ jlong value() const {
+ return _stamp_ticks;
+ }
+
+ static const Ticks now();
+
+#ifdef ASSERT
+ static const jlong invalid_time_stamp;
+#endif
+
+#ifndef PRODUCT
+ // only for internal use by GC VM tests
+ friend class TimePartitionPhasesIteratorTest;
+ friend class GCTimerTest;
+
+ private:
+ // implicit type conversion
+ Ticks(int ticks) : _stamp_ticks(ticks) {}
+
+#endif // !PRODUCT
+
+};
+
+class TicksToTimeHelper : public AllStatic {
+ public:
+ enum Unit {
+ SECONDS = 1,
+ MILLISECONDS = 1000
+ };
+ static double seconds(const Tickspan& span);
+ static jlong milliseconds(const Tickspan& span);
+};
+
+#endif // SHARE_VM_UTILITIES_TICKS_HPP
diff --git a/hotspot/src/share/vm/utilities/ticks.inline.hpp b/hotspot/src/share/vm/utilities/ticks.inline.hpp
new file mode 100644
index 0000000..7929cea
--- /dev/null
+++ b/hotspot/src/share/vm/utilities/ticks.inline.hpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_UTILITIES_TICKS_INLINE_HPP
+#define SHARE_VM_UTILITIES_TICKS_INLINE_HPP
+
+#include "utilities/ticks.hpp"
+
+inline Tickspan operator+(Tickspan lhs, const Tickspan& rhs) {
+ lhs += rhs;
+ return lhs;
+}
+
+inline bool operator==(const Tickspan& lhs, const Tickspan& rhs) {
+ return lhs.value() == rhs.value();
+}
+
+inline bool operator!=(const Tickspan& lhs, const Tickspan& rhs) {
+ return !operator==(lhs,rhs);
+}
+
+inline bool operator<(const Tickspan& lhs, const Tickspan& rhs) {
+ return lhs.value() < rhs.value();
+}
+
+inline bool operator>(const Tickspan& lhs, const Tickspan& rhs) {
+ return operator<(rhs,lhs);
+}
+
+inline bool operator<=(const Tickspan& lhs, const Tickspan& rhs) {
+ return !operator>(lhs,rhs);
+}
+
+inline bool operator>=(const Tickspan& lhs, const Tickspan& rhs) {
+ return !operator<(lhs,rhs);
+}
+
+inline Ticks operator+(Ticks lhs, const Tickspan& span) {
+ lhs += span;
+ return lhs;
+}
+
+inline Ticks operator-(Ticks lhs, const Tickspan& span) {
+ lhs -= span;
+ return lhs;
+}
+
+inline Tickspan operator-(const Ticks& end, const Ticks& start) {
+ return Tickspan(end, start);
+}
+
+inline bool operator==(const Ticks& lhs, const Ticks& rhs) {
+ return lhs.value() == rhs.value();
+}
+
+inline bool operator!=(const Ticks& lhs, const Ticks& rhs) {
+ return !operator==(lhs,rhs);
+}
+
+inline bool operator<(const Ticks& lhs, const Ticks& rhs) {
+ return lhs.value() < rhs.value();
+}
+
+inline bool operator>(const Ticks& lhs, const Ticks& rhs) {
+ return operator<(rhs,lhs);
+}
+
+inline bool operator<=(const Ticks& lhs, const Ticks& rhs) {
+ return !operator>(lhs,rhs);
+}
+
+inline bool operator>=(const Ticks& lhs, const Ticks& rhs) {
+ return !operator<(lhs,rhs);
+}
+
+#endif // SHARE_VM_UTILITIES_TICKS_INLINE_HPP
diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/ByteClassLoader.java b/hotspot/test/compiler/jsr292/methodHandleExceptions/ByteClassLoader.java
index de257ad..3903f6f 100644
--- a/hotspot/test/compiler/jsr292/methodHandleExceptions/ByteClassLoader.java
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/ByteClassLoader.java
@@ -1,3 +1,12 @@
+import java.io.BufferedOutputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -23,12 +32,63 @@
*/
/**
- * A minimal classloader for loading bytecodes that could not result from
- * properly compiled Java.
+ * A ByteClassLoader is used to define classes from collections of bytes, as
+ * well as loading classes in the usual way. It includes options to write the
+ * classes to files in a jar, or to read the classes from jars in a later or
+ * debugging run.
*
- * @author dr2chase
+ * If Boolean property byteclassloader.verbose is true, be chatty about jar
+ * file operations.
+ *
*/
-public class ByteClassLoader extends ClassLoader {
+public class ByteClassLoader extends URLClassLoader {
+
+ final static boolean verbose
+ = Boolean.getBoolean("byteclassloader.verbose");
+
+ final boolean read;
+ final JarOutputStream jos;
+ final String jar_name;
+
+ /**
+ * Make a new ByteClassLoader.
+ *
+ * @param jar_name Basename of jar file to be read/written by this classloader.
+ * @param read If true, read classes from jar file instead of from parameter.
+ * @param write If true, write classes to jar files for offline study/use.
+ *
+ * @throws FileNotFoundException
+ * @throws IOException
+ */
+ public ByteClassLoader(String jar_name, boolean read, boolean write)
+ throws FileNotFoundException, IOException {
+ super(read
+ ? new URL[]{new URL("file:" + jar_name + ".jar")}
+ : new URL[0]);
+ this.read = read;
+ this.jar_name = jar_name;
+ this.jos = write
+ ? new JarOutputStream(
+ new BufferedOutputStream(
+ new FileOutputStream(jar_name + ".jar"))) : null;
+ if (read && write) {
+ throw new Error("At most one of read and write may be true.");
+ }
+ }
+
+ private static void writeJarredFile(JarOutputStream jos, String file, String suffix, byte[] bytes) {
+ String fileName = file.replace(".", "/") + "." + suffix;
+ JarEntry ze = new JarEntry(fileName);
+ try {
+ ze.setSize(bytes.length);
+ jos.putNextEntry(ze);
+ jos.write(bytes);
+ jos.closeEntry();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
/**
* (pre)load class name using classData for the definition.
*
@@ -36,9 +96,36 @@
* @param classData
* @return
*/
- public Class<?> loadBytes(String name, byte[] classData) {
- Class<?> clazz = defineClass(name, classData, 0, classData.length);
- resolveClass(clazz);
- return clazz;
+ public Class<?> loadBytes(String name, byte[] classData) throws ClassNotFoundException {
+ if (jos != null) {
+ if (verbose) {
+ System.out.println("ByteClassLoader: writing " + name);
+ }
+ writeJarredFile(jos, name, "class", classData);
+ }
+
+ Class<?> clazz = null;
+ if (read) {
+ if (verbose) {
+ System.out.println("ByteClassLoader: reading " + name + " from " + jar_name);
+ }
+ clazz = loadClass(name);
+ } else {
+ clazz = defineClass(name, classData, 0, classData.length);
+ resolveClass(clazz);
+ }
+ return clazz;
+ }
+
+ public void close() {
+ if (jos != null) {
+ try {
+ if (verbose) {
+ System.out.println("ByteClassLoader: closing " + jar_name);
+ }
+ jos.close();
+ } catch (IOException ex) {
+ }
+ }
}
}
diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/C.java b/hotspot/test/compiler/jsr292/methodHandleExceptions/C.java
deleted file mode 100644
index 8667896..0000000
--- a/hotspot/test/compiler/jsr292/methodHandleExceptions/C.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/**
- * Test class -- implements I, which provides default for m, but this class
- * declares it abstract which (should) hide the interface default, and throw
- * an abstract method error if it is called (calling it requires bytecode hacking
- * or inconsistent compilation).
- */
-public abstract class C implements I {
- public abstract int m();
-}
diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/I.java b/hotspot/test/compiler/jsr292/methodHandleExceptions/I.java
deleted file mode 100644
index f4cc27e..0000000
--- a/hotspot/test/compiler/jsr292/methodHandleExceptions/I.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-public interface I {
- default public int m() { return 1; }
-}
diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java b/hotspot/test/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java
index 2b41c15..0e525de 100644
--- a/hotspot/test/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java
@@ -21,50 +21,127 @@
* questions.
*
*/
-
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.Handle;
import jdk.internal.org.objectweb.asm.MethodVisitor;
import jdk.internal.org.objectweb.asm.Opcodes;
+import p.Dok;
/**
- * @test
- * @bug 8025260
- * @summary Ensure that AbstractMethodError is thrown, not NullPointerException, through MethodHandles::jump_from_method_handle code path
+ * @test @bug 8025260 8016839
+ * @summary Ensure that AbstractMethodError and IllegalAccessError are thrown appropriately, not NullPointerException
*
- * @compile -XDignore.symbol.file ByteClassLoader.java I.java C.java TestAMEnotNPE.java
+ * @compile -XDignore.symbol.file TestAMEnotNPE.java ByteClassLoader.java p/C.java p/Dok.java p/E.java p/F.java p/I.java p/Tdirect.java p/Treflect.java
+ *
* @run main/othervm TestAMEnotNPE
+ * @run main/othervm -Xint TestAMEnotNPE
+ * @run main/othervm -Xcomp TestAMEnotNPE
*/
-
public class TestAMEnotNPE implements Opcodes {
+ static boolean writeJarFiles = false;
+ static boolean readJarFiles = false;
+
/**
- * The bytes for D, a NOT abstract class extending abstract class C
- * without supplying an implementation for abstract method m.
- * There is a default method in the interface I, but it should lose to
- * the abstract class.
+ * Optional command line parameter (any case-insensitive prefix of)
+ * "writejarfiles" or "readjarfiles".
+ *
+ * "Writejarfiles" creates a jar file for each different set of tested classes.
+ * "Readjarfiles" causes the classloader to use the copies of the classes
+ * found in the corresponding jar files.
+ *
+ * Jarfilenames look something like pD_ext_pF (p.D extends p.F)
+ * and qD_m_pp_imp_pI (q.D with package-private m implements p.I)
+ *
+ */
+ public static void main(String args[]) throws Throwable {
+ ArrayList<Throwable> lt = new ArrayList<Throwable>();
- class D extends C {
- D() { super(); }
- // does not define m
- }
+ if (args.length > 0) {
+ String a0 = args[0].toLowerCase();
+ if (a0.length() > 0) {
+ writeJarFiles = ("writejarfiles").startsWith(a0);
+ readJarFiles = ("readjarfiles").startsWith(a0);
+ }
+ if (!(writeJarFiles || readJarFiles)) {
+ throw new Error("Command line parameter (if any) should be prefix of writeJarFiles or readJarFiles");
+ }
+ }
+ try {
+ System.out.println("TRYING p.D.m PRIVATE interface-invoked as p.I.m, p.D extends p.F, p.F.m FINAL");
+ tryAndCheckThrown(lt, bytesForDprivateSubWhat("p/F"),
+ "p.D extends p.F (p.F implements p.I, FINAL public m), private m",
+ IllegalAccessError.class, "pD_ext_pF");
+ // We'll take either a VerifyError (pre 2013-11-30)
+ // or an IllegalAccessError (post 2013-11-22)
+ } catch (VerifyError ve) {
+ System.out.println("Saw expected VerifyError " + ve);
+ }
+ System.out.println();
+
+ System.out.println("TRYING p.D.m PRIVATE interface-invoked as p.I.m, p.D extends p.E");
+ tryAndCheckThrown(lt, bytesForDprivateSubWhat("p/E"),
+ "p.D extends p.E (p.E implements p.I, public m), private m",
+ IllegalAccessError.class, "pD_ext_pE");
+
+ System.out.println("TRYING p.D.m ABSTRACT interface-invoked as p.I.m");
+ tryAndCheckThrown(lt, bytesForD(),
+ "D extends abstract C, no m",
+ AbstractMethodError.class, "pD_ext_pC");
+
+ System.out.println("TRYING q.D.m PACKAGE interface-invoked as p.I.m");
+ tryAndCheckThrown(lt, "q.D", bytesForDsomeAccess("q/D", 0),
+ "q.D implements p.I, protected m", IllegalAccessError.class,
+ "qD_m_pp_imp_pI");
+
+ // Note jar file name is used in the plural-arg case.
+ System.out.println("TRYING p.D.m PRIVATE interface-invoked as p.I.m");
+ tryAndCheckThrown(lt, bytesForDsomeAccess("p/D", ACC_PRIVATE),
+ "p.D implements p.I, private m",
+ IllegalAccessError.class, "pD_m_pri_imp_pI");
+
+ // Plural-arg test.
+ System.out.println("TRYING p.D.m PRIVATE MANY ARG interface-invoked as p.I.m");
+ tryAndCheckThrownMany(lt, bytesForDsomeAccess("p/D", ACC_PRIVATE),
+ "p.D implements p.I, private m", IllegalAccessError.class);
+
+ if (lt.size() > 0) {
+ System.out.flush();
+ Thread.sleep(250); // This de-interleaves output and error in Netbeans, sigh.
+ for (Throwable th : lt)
+ System.err.println(th);
+ throw new Error("Test failed, there were " + lt.size() + " failures listed above");
+ } else {
+ System.out.println("ALL PASS, HOORAY!");
+ }
+ }
+
+ /**
+ * The bytes for D, a NOT abstract class extending abstract class C without
+ * supplying an implementation for abstract method m. There is a default
+ * method in the interface I, but it should lose to the abstract class.
+ *
* @return
* @throws Exception
*/
public static byte[] bytesForD() throws Exception {
- ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
+ ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES
+ | ClassWriter.COMPUTE_MAXS);
MethodVisitor mv;
- cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, "D", null, "C", null);
+ cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, "p/D", null, "p/C", null);
{
mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
mv.visitCode();
mv.visitVarInsn(ALOAD, 0);
- mv.visitMethodInsn(INVOKESPECIAL, "C", "<init>", "()V");
+ mv.visitMethodInsn(INVOKESPECIAL, "p/C", "<init>", "()V");
mv.visitInsn(RETURN);
mv.visitMaxs(0, 0);
mv.visitEnd();
@@ -74,70 +151,346 @@
return cw.toByteArray();
}
-
/**
- * The bytecodes for an invokeExact of a particular methodHandle, I.m, invoked on a D
-
- class T {
- T() { super(); } // boring constructor
- int test() {
- MethodHandle mh = `I.m():int`;
- D d = new D();
- return mh.invokeExact(d); // Should explode here, AbstractMethodError
- }
- }
-
+ * The bytes for D, implements I, does not extend C, declares m()I with
+ * access method_acc.
+ *
+ * @param d_name Name of class defined
+ * @param method_acc Accessibility of that class's method m.
* @return
* @throws Exception
*/
- public static byte[] bytesForT() throws Exception {
+ public static byte[] bytesForDsomeAccess(String d_name, int method_acc) throws Exception {
+ return bytesForSomeDsubSomethingSomeAccess(d_name, "java/lang/Object", method_acc);
+ }
- ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
+ /**
+ * The bytes for D implements I, extends some class, declares m()I as
+ * private.
+ *
+ * Invokeinterface of I.m applied to this D should throw IllegalAccessError
+ *
+ * @param sub_what The name of the class that D will extend.
+ * @return
+ * @throws Exception
+ */
+ public static byte[] bytesForDprivateSubWhat(String sub_what) throws Exception {
+ return bytesForSomeDsubSomethingSomeAccess("p/D", sub_what, ACC_PRIVATE);
+ }
+
+ /**
+ * Returns the bytes for a class with name d_name (presumably "D" in some
+ * package), extending some class with name sub_what, implementing p.I,
+ * and defining two methods m() and m(11args) with access method_acc.
+ *
+ * @param d_name Name of class that is defined
+ * @param sub_what Name of class that it extends
+ * @param method_acc Accessibility of method(s) m in defined class.
+ * @return
+ * @throws Exception
+ */
+ public static byte[] bytesForSomeDsubSomethingSomeAccess
+ (String d_name, String sub_what, int method_acc)
+ throws Exception {
+
+ ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES
+ | ClassWriter.COMPUTE_MAXS);
MethodVisitor mv;
+ String[] interfaces = {"p/I"};
- cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, "T", null, "java/lang/Object", null);
+ cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, d_name, null, sub_what, interfaces);
{
mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
mv.visitCode();
mv.visitVarInsn(ALOAD, 0);
- mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
+ mv.visitMethodInsn(INVOKESPECIAL, sub_what, "<init>", "()V");
mv.visitInsn(RETURN);
- mv.visitMaxs(0,0);
+ mv.visitMaxs(0, 0);
mv.visitEnd();
}
+ // int m() {return 3;}
{
- mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "test", "()I", null, null);
+ mv = cw.visitMethod(method_acc, "m", "()I", null, null);
mv.visitCode();
- mv.visitLdcInsn(new Handle(Opcodes.H_INVOKEINTERFACE, "I", "m", "()I"));
- mv.visitTypeInsn(NEW, "D");
- mv.visitInsn(DUP);
- mv.visitMethodInsn(INVOKESPECIAL, "D", "<init>", "()V");
- mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandle", "invokeExact", "(LI;)I");
+ mv.visitLdcInsn(new Integer(3));
mv.visitInsn(IRETURN);
- mv.visitMaxs(0,0);
+ mv.visitMaxs(0, 0);
+ mv.visitEnd();
+ }
+ // int m(11args) {return 3;}
+ {
+ mv = cw.visitMethod(method_acc, "m", "(BCSIJ"
+ + "Ljava/lang/Object;"
+ + "Ljava/lang/Object;"
+ + "Ljava/lang/Object;"
+ + "Ljava/lang/Object;"
+ + "Ljava/lang/Object;"
+ + "Ljava/lang/Object;"
+ + ")I", null, null);
+ mv.visitCode();
+ mv.visitLdcInsn(new Integer(3));
+ mv.visitInsn(IRETURN);
+ mv.visitMaxs(0, 0);
mv.visitEnd();
}
cw.visitEnd();
return cw.toByteArray();
}
- public static void main(String args[] ) throws Throwable {
- ByteClassLoader bcl = new ByteClassLoader();
- Class<?> d = bcl.loadBytes("D", bytesForD());
- Class<?> t = bcl.loadBytes("T", bytesForT());
+ /**
+ * The bytecodes for a class p/T defining a methods test() and test(11args)
+ * that contain an invokeExact of a particular methodHandle, I.m.
+ *
+ * Test will be passed values that may imperfectly implement I,
+ * and thus may in turn throw exceptions.
+ *
+ * @return
+ * @throws Exception
+ */
+ public static byte[] bytesForT() throws Exception {
+
+ ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES
+ | ClassWriter.COMPUTE_MAXS);
+ MethodVisitor mv;
+
+ cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, "p/T", null, "java/lang/Object", null);
+ {
+ mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+ mv.visitCode();
+ mv.visitVarInsn(ALOAD, 0);
+ mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
+ mv.visitInsn(RETURN);
+ mv.visitMaxs(0, 0);
+ mv.visitEnd();
+ }
+ // static int test(I)
+ {
+ mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "test", "(Lp/I;)I", null, null);
+ mv.visitCode();
+ mv.visitLdcInsn(new Handle(Opcodes.H_INVOKEINTERFACE, "p/I", "m", "()I"));
+ mv.visitVarInsn(ALOAD, 0);
+ mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandle",
+ "invokeExact", "(Lp/I;)I");
+ mv.visitInsn(IRETURN);
+ mv.visitMaxs(0, 0);
+ mv.visitEnd();
+ }
+ // static int test(I,11args)
+ {
+ mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "test", "(Lp/I;BCSIJLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)I", null, null);
+ mv.visitCode();
+ mv.visitLdcInsn(new Handle(Opcodes.H_INVOKEINTERFACE, "p/I", "m", "(BCSIJLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)I"));
+ mv.visitVarInsn(ALOAD, 0);
+ mv.visitVarInsn(ILOAD, 1);
+ mv.visitVarInsn(ILOAD, 2);
+ mv.visitVarInsn(ILOAD, 3);
+ mv.visitVarInsn(ILOAD, 4);
+ mv.visitVarInsn(LLOAD, 5);
+ mv.visitVarInsn(ALOAD, 7);
+ mv.visitVarInsn(ALOAD, 8);
+ mv.visitVarInsn(ALOAD, 9);
+ mv.visitVarInsn(ALOAD, 10);
+ mv.visitVarInsn(ALOAD, 11);
+ mv.visitVarInsn(ALOAD, 12);
+ mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandle",
+ "invokeExact", "(Lp/I;BCSIJLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)I");
+ mv.visitInsn(IRETURN);
+ mv.visitMaxs(0, 0);
+ mv.visitEnd();
+ }
+ cw.visitEnd();
+ return cw.toByteArray();
+ }
+
+ private static void tryAndCheckThrown(
+ List<Throwable> lt, byte[] dBytes, String what, Class<?> expected, String jar_name)
+ throws Throwable {
+ tryAndCheckThrown(lt, "p.D", dBytes, what, expected, jar_name);
+ }
+
+ private static void tryAndCheckThrown(List<Throwable> lt, String d_name, byte[] dBytes, String what, Class<?> expected, String jar_name)
+ throws Throwable {
+
+ System.out.println("Methodhandle invokeExact I.m() for instance of " + what);
+ ByteClassLoader bcl1 = new ByteClassLoader(jar_name, readJarFiles, writeJarFiles);
try {
- Object result = t.getMethod("test").invoke(null);
- System.out.println("Expected AbstractMethodError wrapped in InvocationTargetException, saw no exception");
- throw new Error("Missing expected exception");
+ Class<?> d1 = bcl1.loadBytes(d_name, dBytes);
+ Class<?> t1 = bcl1.loadBytes("p.T", bytesForT());
+ invokeTest(t1, d1, expected, lt);
+ } finally {
+ // Not necessary for others -- all class files are written in this call.
+ // (unless the VM crashes first).
+ bcl1.close();
+ }
+
+ System.out.println("Reflection invoke I.m() for instance of " + what);
+ ByteClassLoader bcl3 = new ByteClassLoader(jar_name, readJarFiles, false);
+ Class<?> d3 = bcl3.loadBytes(d_name, dBytes);
+ Class<?> t3 = bcl3.loadClass("p.Treflect");
+ invokeTest(t3, d3, expected, lt);
+
+ System.out.println("Bytecode invokeInterface I.m() for instance of " + what);
+ ByteClassLoader bcl2 = new ByteClassLoader(jar_name, readJarFiles, false);
+ Class<?> d2 = bcl2.loadBytes(d_name, dBytes);
+ Class<?> t2 = bcl2.loadClass("p.Tdirect");
+ badGoodBadGood(t2, d2, expected, lt);
+ }
+
+ private static void invokeTest(Class<?> t, Class<?> d, Class<?> expected, List<Throwable> lt)
+ throws Throwable {
+ try {
+ Method m = t.getMethod("test", p.I.class);
+ Object o = d.newInstance();
+ Object result = m.invoke(null, o);
+ if (expected != null) {
+ System.out.println("FAIL, Expected " + expected.getName()
+ + " wrapped in InvocationTargetException, but nothing was thrown");
+ lt.add(new Error("Exception " + expected.getName() + " was not thrown"));
+ } else {
+ System.out.println("PASS, saw expected return.");
+ }
} catch (InvocationTargetException e) {
Throwable th = e.getCause();
- if (th instanceof AbstractMethodError) {
- th.printStackTrace(System.out);
- System.out.println("PASS, saw expected exception (AbstractMethodError, wrapped in InvocationTargetException).");
+ th.printStackTrace(System.out);
+ if (expected != null) {
+ if (expected.isInstance(th)) {
+ System.out.println("PASS, saw expected exception (" + expected.getName() + ").");
+ } else {
+ System.out.println("FAIL, Expected " + expected.getName()
+ + " wrapped in InvocationTargetException, saw " + th);
+ lt.add(th);
+ }
} else {
- System.out.println("Expected AbstractMethodError wrapped in InvocationTargetException, saw " + th);
- throw th;
+ System.out.println("FAIL, expected no exception, saw " + th);
+ lt.add(th);
}
}
+ System.out.println();
+ }
+
+ /* Many-arg versions of above */
+ private static void tryAndCheckThrownMany(List<Throwable> lt, byte[] dBytes, String what, Class<?> expected)
+ throws Throwable {
+
+ System.out.println("Methodhandle invokeExact I.m(11params) for instance of " + what);
+ ByteClassLoader bcl1 = new ByteClassLoader("p.D", readJarFiles, false);
+ try {
+ Class<?> d1 = bcl1.loadBytes("p.D", dBytes);
+ Class<?> t1 = bcl1.loadBytes("p.T", bytesForT());
+ invokeTestMany(t1, d1, expected, lt);
+ } finally {
+ bcl1.close(); // Not necessary for others -- all class files are written in this call.
+ }
+
+ {
+ System.out.println("Bytecode invokeInterface I.m(11params) for instance of " + what);
+ ByteClassLoader bcl2 = new ByteClassLoader("pD_m_pri_imp_pI", readJarFiles, false);
+ Class<?> d2 = bcl2.loadBytes("p.D", dBytes);
+ Class<?> t2 = bcl2.loadClass("p.Tdirect");
+ badGoodBadGoodMany(t2, d2, expected, lt);
+
+ }
+ {
+ System.out.println("Reflection invokeInterface I.m(11params) for instance of " + what);
+ ByteClassLoader bcl2 = new ByteClassLoader("pD_m_pri_imp_pI", readJarFiles, false);
+ Class<?> d2 = bcl2.loadBytes("p.D", dBytes);
+ Class<?> t2 = bcl2.loadClass("p.Treflect");
+ invokeTestMany(t2, d2, expected, lt);
+ }
+ }
+
+ private static void invokeTestMany(Class<?> t, Class<?> d, Class<?> expected, List<Throwable> lt)
+ throws Throwable {
+ try {
+ Method m = t.getMethod("test", p.I.class,
+ Byte.TYPE, Character.TYPE, Short.TYPE, Integer.TYPE, Long.TYPE,
+ Object.class, Object.class, Object.class,
+ Object.class, Object.class, Object.class);
+ Object o = d.newInstance();
+ Byte b = 1;
+ Character c = 2;
+ Short s = 3;
+ Integer i = 4;
+ Long j = 5L;
+ Object o1 = b;
+ Object o2 = c;
+ Object o3 = s;
+ Object o4 = i;
+ Object o5 = j;
+ Object o6 = "6";
+
+ Object result = m.invoke(null, o, b, c, s, i, j,
+ o1, o2, o3, o4, o5, o6);
+ if (expected != null) {
+ System.out.println("FAIL, Expected " + expected.getName()
+ + " wrapped in InvocationTargetException, but nothing was thrown");
+ lt.add(new Error("Exception " + expected.getName()
+ + " was not thrown"));
+ } else {
+ System.out.println("PASS, saw expected return.");
+ }
+ } catch (InvocationTargetException e) {
+ Throwable th = e.getCause();
+ th.printStackTrace(System.out);
+ if (expected != null) {
+ if (expected.isInstance(th)) {
+ System.out.println("PASS, saw expected exception ("
+ + expected.getName() + ").");
+ } else {
+ System.out.println("FAIL, Expected " + expected.getName()
+ + " wrapped in InvocationTargetException, saw " + th);
+ lt.add(th);
+ }
+ } else {
+ System.out.println("FAIL, expected no exception, saw " + th);
+ lt.add(th);
+ }
+ }
+ System.out.println();
+ }
+
+ /**
+ * This tests a peculiar idiom for tickling the bug on older VMs that lack
+ * methodhandles. The bug (if not fixed) acts in the following way:
+ *
+ * When a broken receiver is passed to the first execution of an invokeinterface
+ * bytecode, the illegal access is detected before the effects of resolution are
+ * cached for later use, and so repeated calls with a broken receiver will always
+ * throw the correct error.
+ *
+ * If, however, a good receiver is passed to the invokeinterface, the effects of
+ * resolution will be successfully cached. A subsequent execution with a broken
+ * receiver will reuse the cached information, skip the detailed resolution work,
+ * and instead encounter a null pointer. By convention, that is the encoding for a
+ * missing abstract method, and an AbstractMethodError is thrown -- not the expected
+ * IllegalAccessError.
+ *
+ * @param t2 Test invocation class
+ * @param d2 Test receiver class
+ * @param expected expected exception type
+ * @param lt list of unexpected throwables seen
+ */
+ private static void badGoodBadGood(Class<?> t2, Class<?> d2, Class<?> expected, List<Throwable> lt)
+ throws Throwable {
+ System.out.println(" Error input 1st time");
+ invokeTest(t2, d2, expected, lt);
+ System.out.println(" Good input (instance of Dok)");
+ invokeTest(t2, Dok.class, null, lt);
+ System.out.println(" Error input 2nd time");
+ invokeTest(t2, d2, expected, lt);
+ System.out.println(" Good input (instance of Dok)");
+ invokeTest(t2, Dok.class, null, lt);
+ }
+
+ private static void badGoodBadGoodMany(Class<?> t2, Class<?> d2, Class<?> expected, List<Throwable> lt)
+ throws Throwable {
+ System.out.println(" Error input 1st time");
+ invokeTestMany(t2, d2, expected, lt);
+ System.out.println(" Good input (instance of Dok)");
+ invokeTestMany(t2, Dok.class, null, lt);
+ System.out.println(" Error input 2nd time");
+ invokeTestMany(t2, d2, expected, lt);
+ System.out.println(" Good input (instance of Dok)");
+ invokeTestMany(t2, Dok.class, null, lt);
}
}
diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/C.java b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/C.java
new file mode 100644
index 0000000..ab0e1aa
--- /dev/null
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/C.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package p;
+
+/**
+ * Test class -- implements I, which provides default for m, but this class
+ * declares it abstract which (should) hide the interface default, and throw
+ * an abstract method error if called.
+ *
+ */
+public abstract class C implements p.I {
+ public abstract int m();
+}
diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Dok.java b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Dok.java
new file mode 100644
index 0000000..f9fa4c2
--- /dev/null
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Dok.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package p;
+
+/**
+ * Test class -- implements I, extends E, both define m, so all should be well.
+ */
+public class Dok extends p.E {
+
+}
diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/E.java b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/E.java
new file mode 100644
index 0000000..6b1f8f9
--- /dev/null
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/E.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package p;
+
+/**
+ * Test class -- implements I, which provides default for m, but this class
+ * redeclares it so that all its non-overriding descendants should call its
+ * method instead (with no error, assuming no descendant monkey business, which
+ * of course is NOT usually the case in this test).
+ *
+ */
+public abstract class E implements p.I {
+ public int m() {
+ return 2;
+ }
+}
diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/F.java b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/F.java
new file mode 100644
index 0000000..86b6c65
--- /dev/null
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/F.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package p;
+
+/**
+ * Test class -- implements I, which provides default for m, but this class
+ * redeclares it so that all its non-overriding descendants should call its
+ * method instead (with no error, assuming no descendant monkey business, which
+ * of course is NOT usually the case in this test).
+ *
+ * Note that m is final -- one form of monkey business is attempting to redefine
+ * m.
+ *
+ */
+public abstract class F implements p.I {
+ final public int m() {
+ return 2;
+ }
+}
diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/I.java b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/I.java
new file mode 100644
index 0000000..0e28475
--- /dev/null
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/I.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package p;
+
+/**
+ * Test interface I, provides default implementations for m() and m(11args).
+ */
+
+public interface I {
+ default public int m() { return 1; }
+ default public int m(byte b, char c, short s, int i, long l,
+ Object o1, Object o2, Object o3, Object o4, Object o5, Object o6) {
+ return 2;
+ }
+}
diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Tdirect.java b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Tdirect.java
new file mode 100644
index 0000000..088e1fa
--- /dev/null
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Tdirect.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package p;
+
+/**
+ * Invokes I.m directly using invokeInterface bytecodes.
+ */
+public class Tdirect {
+ public static int test(p.I i) {
+ int accum = 0;
+ for (int j = 0; j < 100000; j++) {
+ accum += i.m();
+ }
+ return accum;
+ }
+
+ public static int test(p.I ii, byte b, char c, short s, int i, long l,
+ Object o1, Object o2, Object o3, Object o4, Object o5, Object o6) {
+ int accum = 0;
+ for (int j = 0; j < 100000; j++) {
+ accum += ii.m(b,c,s,i,l,o1,o2,o3,o4,o5,o6);
+ }
+ return accum;
+ }
+}
diff --git a/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Treflect.java b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Treflect.java
new file mode 100644
index 0000000..a4f754a
--- /dev/null
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Treflect.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package p;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Invokes I.m using reflection.
+ */
+public class Treflect {
+
+ public static int test(p.I ii) throws Throwable {
+ int accum = 0;
+ Method m = p.I.class.getMethod("m");
+ try {
+ for (int j = 0; j < 100000; j++) {
+ Object o = m.invoke(ii);
+ accum += ((Integer) o).intValue();
+ }
+ } catch (InvocationTargetException ite) {
+ throw ite.getCause();
+ }
+ return accum;
+ }
+
+ public static int test(p.I ii, byte b, char c, short s, int i, long l,
+ Object o1, Object o2, Object o3, Object o4, Object o5, Object o6)
+ throws Throwable {
+ Method m = p.I.class.getMethod("m", Byte.TYPE, Character.TYPE,
+ Short.TYPE, Integer.TYPE, Long.TYPE,
+ Object.class, Object.class, Object.class,
+ Object.class, Object.class, Object.class);
+ int accum = 0;
+ try {
+ for (int j = 0; j < 100000; j++) {
+ Object o = m.invoke(ii, b, c, s, i, l, o1, o2, o3, o4, o5, o6);
+ accum += ((Integer) o).intValue();
+ }
+ } catch (InvocationTargetException ite) {
+ throw ite.getCause();
+ }
+ return accum;
+ }
+}
diff --git a/hotspot/test/runtime/6626217/Test6626217.sh b/hotspot/test/runtime/6626217/Test6626217.sh
index ae34079..1b975f0 100644
--- a/hotspot/test/runtime/6626217/Test6626217.sh
+++ b/hotspot/test/runtime/6626217/Test6626217.sh
@@ -21,7 +21,8 @@
# questions.
#
-
+
+# @ignore 8028733
# @test @(#)Test6626217.sh
# @bug 6626217
# @summary Loader-constraint table allows arrays instead of only the base-classes
diff --git a/hotspot/test/runtime/6929067/Test6929067.sh b/hotspot/test/runtime/6929067/Test6929067.sh
index 90b96d5..4f21bcf 100644
--- a/hotspot/test/runtime/6929067/Test6929067.sh
+++ b/hotspot/test/runtime/6929067/Test6929067.sh
@@ -1,6 +1,7 @@
#!/bin/sh
##
+## @ignore 8028740
## @test Test6929067.sh
## @bug 6929067
## @bug 8021296
diff --git a/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java b/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java
index 9bd68e1..480905f 100644
--- a/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java
+++ b/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java
@@ -22,6 +22,7 @@
*/
/*
+ * @ignore 8026154
* @test
* @bug 8005933
* @summary Test that -Xshare:auto uses CDS when explicitly specified with -server.
diff --git a/hotspot/test/runtime/InitialThreadOverflow/testme.sh b/hotspot/test/runtime/InitialThreadOverflow/testme.sh
index b7154dc..8bdd702 100644
--- a/hotspot/test/runtime/InitialThreadOverflow/testme.sh
+++ b/hotspot/test/runtime/InitialThreadOverflow/testme.sh
@@ -21,6 +21,7 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
+# @ignore 8029139
# @test testme.sh
# @bug 8009062
# @summary Poor performance of JNI AttachCurrentThread after fix for 7017193
diff --git a/hotspot/test/runtime/LoadClass/LoadClassNegative.java b/hotspot/test/runtime/LoadClass/LoadClassNegative.java
index 9955bca..02b7c8c 100644
--- a/hotspot/test/runtime/LoadClass/LoadClassNegative.java
+++ b/hotspot/test/runtime/LoadClass/LoadClassNegative.java
@@ -22,6 +22,7 @@
*/
/*
+ * @ignore 8028095
* @test
* @key regression
* @bug 8020675
diff --git a/hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java b/hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java
index ae0ad73..aeed6d4 100644
--- a/hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java
+++ b/hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java
@@ -22,6 +22,7 @@
*/
/*
+ * @ignore 8023735
* @test
* @bug 7051189 8023393
* @summary Need to suppress info message if -Xcheck:jni is used with libjsig.so
diff --git a/hotspot/test/runtime/jsig/Test8017498.sh b/hotspot/test/runtime/jsig/Test8017498.sh
index fadb01d..bcf0520 100644
--- a/hotspot/test/runtime/jsig/Test8017498.sh
+++ b/hotspot/test/runtime/jsig/Test8017498.sh
@@ -24,6 +24,7 @@
#
##
+## @ignore 8028806
## @test Test8017498.sh
## @bug 8017498
## @bug 8020791
diff --git a/hotspot/test/runtime/memory/ReadFromNoaccessArea.java b/hotspot/test/runtime/memory/ReadFromNoaccessArea.java
index 1078dd2..c80fab9 100644
--- a/hotspot/test/runtime/memory/ReadFromNoaccessArea.java
+++ b/hotspot/test/runtime/memory/ReadFromNoaccessArea.java
@@ -22,6 +22,7 @@
*/
/*
+ * @ignore 8028398
* @test
* @summary Test that touching noaccess area in class ReservedHeapSpace results in SIGSEGV/ACCESS_VIOLATION
* @library /testlibrary /testlibrary/whitebox
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index c894b9c..db5acb1 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -239,3 +239,4 @@
f610fd46463e6b0533dd92bce11a1e7d84984e64 jdk8-b115
e757eb9aee3d6bec7da074c47e07616104a8df33 jdk8-b116
c1d234d4f16472a5163464420fa00b25ffa5298a jdk8-b117
+e4e5069250e717defcb556e2f6be291460988c51 jdk8-b118
diff --git a/jaxp/makefiles/BuildJaxp.gmk b/jaxp/make/BuildJaxp.gmk
similarity index 100%
rename from jaxp/makefiles/BuildJaxp.gmk
rename to jaxp/make/BuildJaxp.gmk
diff --git a/jaxp/make/Makefile b/jaxp/make/Makefile
index 12f1328..4570070 100644
--- a/jaxp/make/Makefile
+++ b/jaxp/make/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,172 +23,27 @@
# questions.
#
-# Makefile wrapper around Ant build.xml file
-
-#
-# On Solaris, the 'make' utility from Sun will not work with these makefiles.
-# This little rule is only understood by Sun's make, and is harmless
-# when seen by the GNU make tool. If using Sun's make, this causes the
-# make command to fail.
-#
-SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
-
-ifdef QUIET
- ANT_OPTIONS += -quiet
-endif
-
-ifdef VERBOSE
- ANT_OPTIONS += -verbose
-endif
-
-ifeq ($(VARIANT), OPT)
- ifneq ($(DEBUG_CLASSFILES), true)
- ANT_OPTIONS += -Djavac.debug=false
- endif
-endif
-
-# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
-# and the somewhat misnamed CLASS_VERSION (-target NN)
-ifdef TARGET_CLASS_VERSION
- ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION)
+# Locate this Makefile
+ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
+ makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
else
- ifdef JAVAC_TARGET_ARG
- ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG)
- endif
+ makefile_path := $(lastword $(MAKEFILE_LIST))
endif
+repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path))
-ifdef SOURCE_LANGUAGE_VERSION
- ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name := $(notdir $(repo_dir))
+
+# Try to locate top-level makefile
+top_level_makefile := $(repo_dir)/../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 ===================================================)
else
- ifdef JAVAC_SOURCE_ARG
- ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
- endif
-endif
-
-# If downloads are allowed
-ifeq ($(ALLOW_DOWNLOADS),true)
- ANT_OPTIONS += -Dallow.downloads=true
+ $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+ $(error Build from top-level Makefile instead)
endif
-# Figure out the platform we are using
-_SYSTEM_UNAME := $(shell uname)
-_PLATFORM_KIND = unix
-ifeq ($(_SYSTEM_UNAME), Windows_NT)
- _PLATFORM_KIND = windows
-endif
-ifneq (,$(findstring CYGWIN,$(_SYSTEM_UNAME)))
- _PLATFORM_KIND = windows
-endif
-
-# Where is /java in case we need it
-ifdef ALT_SLASH_JAVA
- _SLASHJAVA = $(ALT_SLASH_JAVA)
-else
- ifeq ($(_PLATFORM_KIND), windows)
- _SLASHJAVA=J:/
- else
- _SLASHJAVA=/java
- endif
-endif
-
-ifdef ALT_OUTPUTDIR
- OUTPUTDIR = $(ALT_OUTPUTDIR)
- ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR)
-else
- OUTPUTDIR = ..
-endif
-
-ifdef ALT_LANGTOOLS_DIST
- ifdef ALT_BOOTDIR
- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
- ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
- endif
- ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
-else
- ifdef ALT_JDK_IMPORT_PATH
- ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
- ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH)
- endif
-endif
-
-ifdef ANT_HOME
- ANT = $(ANT_HOME)/bin/ant
- ifneq ($(shell test -x $(ANT); echo $$?), 0)
- $(error "$(ANT) not found; please update ANT_HOME")
- endif
-else
- ANT = ant
- ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0)
- $(error "'ant' not found; please set ANT_HOME or put 'ant' on your PATH")
- endif
-endif
-
-# Default target and expected 'do everything' target
-default: all
-
-# All ant targets of interest
-ANT_TARGETS = all build dist clobber clean sanity
-
-# Create a make target for each
-$(ANT_TARGETS):
- cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version
- cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
-
-# Just for compat reasons, delete in future.
-drop_included:
-source:
-
-# Help target
-define helpenvline
-@echo " $1";echo " $2"
-endef
-help:
- @echo "----------------------------------------------------------"
- @echo " "
- @echo "Help information for this Makefile:"
- @echo " "
- @echo " Targets (see ant project information for descriptions):"
- @echo " $(ANT_TARGETS)"
- @echo " "
- @echo " Environment or command line variables (all optional):"
- $(call helpenvline, ALT_BOOTDIR,\
- "JAVA_HOME to use when running ant")
- $(call helpenvline, ALT_LANGTOOLS_DIST,\
- "path to langtools repository dist directory")
- $(call helpenvline, ALT_OUTPUTDIR,\
- "path to root of output")
- $(call helpenvline, DEBUG_CLASSFILES,\
- "if set makes sure ant property javac.debug is true")
- $(call helpenvline, JAVAC_SOURCE_ARG,\
- "if SOURCE_LANGUAGE_VERSION not set uses this to set ant property javac.source")
- $(call helpenvline, JAVAC_TARGET_ARG,\
- "if TARGET_CLASS_VERSION not set uses this to set ant property javac.target")
- $(call helpenvline, SOURCE_LANGUAGE_VERSION,\
- "if set uses this to set ant property javac.source")
- $(call helpenvline, QUIET,\
- "if set will pass -quiet to ant")
- $(call helpenvline, TARGET_CLASS_VERSION,\
- "JAVA_HOME to use when running ant")
- $(call helpenvline, VARIANT,\
- "if set to OPT means optimized build will set javac.debug to false")
- $(call helpenvline, VERBOSE,\
- "if set will pass -verbose to ant")
- @echo " "
- @echo "----------------------------------------------------------"
- @echo " "
- @echo "Ant project file help information:"
- @echo " "
- @$(ANT_JAVA_HOME) cd .. && $(ANT) $(ANT_OPTIONS) -p
- @echo " "
- @echo "----------------------------------------------------------"
-
-# Targets for Sun's internal JPRT build system
-JPRT_ARCHIVE_BUNDLE=$(OUTPUTDIR)/jprt.zip
-jprt_build_product jprt_build_debug jprt_build_fastdebug: all
- $(RM) $(JPRT_ARCHIVE_BUNDLE)
- ( cd $(OUTPUTDIR)/dist && \
- zip -q -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-# Declare these phony (not filenames)
-.PHONY: $(ANT_TARGETS) \
- jprt_build_product jprt_build_debug jprt_build_fastdebug
+all:
+ @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/jaxp/make/jprt.properties b/jaxp/make/jprt.properties
deleted file mode 100644
index 5dfce3c..0000000
--- a/jaxp/make/jprt.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Properties for jprt
-
-# Locked down to jdk8
-jprt.tools.default.release=jdk8
-
-# The different build flavors we want, we override here so we just get these 2
-jprt.build.flavors=product,fastdebug
-
-# Standard list of jprt build targets for this source tree
-jprt.build.targets= \
- solaris_sparcv9_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}
-
-# Directories to be excluded from the source bundles
-jprt.bundle.exclude.src.dirs=build dist webrev
-
diff --git a/jaxp/make/scripts/update_src.sh b/jaxp/make/scripts/update_src.sh
deleted file mode 100644
index edd4315..0000000
--- a/jaxp/make/scripts/update_src.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This script was used to copy the former drop source bundle source into
-# the repository. Exists as a form of documentation.
-
-curdir="`(cd . && pwd)`"
-
-# Whitespace normalizer script is in the top repository.
-normalizer="perl ${curdir}/../make/scripts/normalizer.pl"
-
-# Locations for bundle and root of source tree
-tmp=/tmp
-srcroot=${curdir}/src
-mkdir -p ${srcroot}
-
-# Bundle information
-drops_dir="/java/devtools/share/jdk8-drops"
-url1="http://download.java.net/jaxp/1.4.5"
-bundle1="jaxp145_01.zip"
-srcdir1="${srcroot}"
-
-# Function to get a bundle and explode it and normalize the source files.
-getBundle() # drops_dir url bundlename bundledestdir srcrootdir
-{
- # Get the bundle from drops_dir or downloaded
- mkdir -p $4
- rm -f $4/$3
- if [ -f $1/$3 ] ; then
- echo "Copy over bundle: $1/$3"
- cp $1/$3 $4
- else
- echo "Downloading bundle: $2/$3"
- (cd $4 && wget $2/$3)
- fi
- # Fail if it does not exist
- if [ ! -f $4/$3 ] ; then
- echo "ERROR: Could not get $3"
- exit 1
- fi
- # Wipe it out completely
- echo "Cleaning up $5"
- rm -f -r $5
- mkdir -p $5
- echo "Unzipping $4/$3"
- ( cd $5 && unzip -q $4/$3 && mv src/* . && rmdir src && rm LICENSE )
- # Run whitespace normalizer
- echo "Normalizing the sources in $5"
- ( cd $5 && ${normalizer} . )
- # Delete the bundle and leftover files
- rm -f $4/$3 $5/filelist
-}
-
-# Process the bundles.
-getBundle "${drops_dir}" "${url1}" "${bundle1}" ${tmp} ${srcdir1}
-echo "Completed bundle extraction."
-echo " "
-
-# Appropriate Mercurial commands needed to run:
-echo "Run: hg addremove src"
-echo "Run: ksh ../make/scripts/webrev.ksh -N -o ${HOME}/webrev"
-echo "Get reviewer, get CR, then..."
-echo "Run: hg commit"
-
diff --git a/jaxp/makefiles/Makefile b/jaxp/makefiles/Makefile
deleted file mode 100644
index c7d0dd0..0000000
--- a/jaxp/makefiles/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Locate this Makefile
-ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
- makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
- makefile_path := $(lastword $(MAKEFILE_LIST))
-endif
-repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path))
-
-# What is the name of this subsystem (langtools, corba, etc)?
-subsystem_name := $(notdir $(repo_dir))
-
-# Try to locate 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 ===================================================)
-else
- $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
- $(error Build from top-level Makefile instead)
-endif
-
-all:
- @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
index 3c45440..cb336ab 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: XSLTErrorResources_zh_CN.java /st_wptg_1.8.0.0.0jdk/2 2013/09/16 04:44:25 gmolloy Exp $
+ * $Id: XSLTErrorResources_zh_CN.java /st_wptg_1.8.0.0.0jdk/3 2013/11/11 11:39:28 gmolloy Exp $
*/
package com.sun.org.apache.xalan.internal.res;
@@ -630,7 +630,7 @@
"\u65E0\u6CD5\u5904\u7406\u6837\u5F0F\u8868!"},
{ ER_COULDNT_PARSE_DOC,
- "\u65E0\u6CD5\u5BF9{0}\u6587\u6863\u8FDB\u884C\u8BED\u6CD5\u5206\u6790!"},
+ "\u65E0\u6CD5\u89E3\u6790{0}\u6587\u6863!"},
{ ER_COULDNT_FIND_FRAGMENT,
"\u627E\u4E0D\u5230\u7247\u6BB5: {0}"},
@@ -968,7 +968,7 @@
//in locale specific files like XSLTErrorResources_de.java, XSLTErrorResources_fr.java etc.
//NOTE: Not only the key name but message has also been changed.
{ ER_VALUE_SHOULD_BE_NUMBER,
- "{0}\u7684\u503C\u5E94\u5305\u542B\u53EF\u8BED\u6CD5\u5206\u6790\u7684\u6570\u5B57"},
+ "{0}\u7684\u503C\u5E94\u5305\u542B\u53EF\u89E3\u6790\u7684\u6570\u5B57"},
{ ER_VALUE_SHOULD_EQUAL,
"{0}\u7684\u503C\u5E94\u7B49\u4E8E\u201C\u662F\u201D\u6216\u201C\u5426\u201D"},
@@ -1016,7 +1016,7 @@
"\u672A\u6307\u5B9A\u7CFB\u7EDF\u5C5E\u6027 org.xml.sax.parser"},
{ ER_PARSER_ARG_CANNOT_BE_NULL,
- "\u8BED\u6CD5\u5206\u6790\u5668\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A\u503C"},
+ "\u89E3\u6790\u5668\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A\u503C"},
{ ER_FEATURE,
"\u529F\u80FD: {0}"},
@@ -1253,7 +1253,7 @@
"\u53D1\u73B0\u7279\u5F81\u51B2\u7A81: \u5C06\u4F7F\u7528\u4E0A\u6B21\u5728\u6837\u5F0F\u8868\u4E2D\u627E\u5230\u7684{0}\u3002"},
{ WG_PARSING_AND_PREPARING,
- "========= \u8BED\u6CD5\u5206\u6790\u548C\u51C6\u5907{0} =========="},
+ "========= \u89E3\u6790\u548C\u51C6\u5907{0} =========="},
{ WG_ATTR_TEMPLATE,
"\u5C5E\u6027\u6A21\u677F{0}"},
@@ -1379,7 +1379,7 @@
{ "optionHTML", " [-HTML (\u4F7F\u7528 HTML \u683C\u5F0F\u8BBE\u7F6E\u5DE5\u5177\u3002)]"},
{ "optionPARAM", " [-PARAM \u540D\u79F0\u8868\u8FBE\u5F0F (\u8BBE\u7F6E\u6837\u5F0F\u8868\u53C2\u6570)]"},
{ "noParsermsg1", "XSL \u8FDB\u7A0B\u672A\u6210\u529F\u3002"},
- { "noParsermsg2", "** \u627E\u4E0D\u5230\u8BED\u6CD5\u5206\u6790\u5668 **"},
+ { "noParsermsg2", "** \u627E\u4E0D\u5230\u89E3\u6790\u5668 **"},
{ "noParsermsg3", "\u8BF7\u68C0\u67E5\u60A8\u7684\u7C7B\u8DEF\u5F84\u3002"},
{ "noParsermsg4", "\u5982\u679C\u6CA1\u6709 IBM \u63D0\u4F9B\u7684 XML Parser for Java, \u5219\u53EF\u4EE5\u4ECE"},
{ "noParsermsg5", "IBM AlphaWorks \u8FDB\u884C\u4E0B\u8F7D, \u7F51\u5740\u4E3A: http://www.alphaworks.ibm.com/formula/xml"},
diff --git a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
index c673f2b..becb972 100644
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: ErrorMessages_zh_CN.java,v 1.2.4.1 2005/09/14 05:52:21 pvedula Exp $
+ * $Id: ErrorMessages_zh_CN.java /st_wptg_1.8.0.0.0jdk/3 2013/11/11 11:39:28 gmolloy Exp $
*/
package com.sun.org.apache.xalan.internal.xsltc.runtime;
@@ -212,7 +212,7 @@
* DTD.
*/
{BasisLibrary.PARSER_DTD_SUPPORT_ERR,
- "\u4F7F\u7528\u7684 SAX \u8BED\u6CD5\u5206\u6790\u5668\u4E0D\u4F1A\u5904\u7406 DTD \u58F0\u660E\u4E8B\u4EF6\u3002"},
+ "\u4F7F\u7528\u7684 SAX \u89E3\u6790\u5668\u4E0D\u4F1A\u5904\u7406 DTD \u58F0\u660E\u4E8B\u4EF6\u3002"},
/*
* Note to translators: The following message indicates that the XML
@@ -221,7 +221,7 @@
* declarations.
*/
{BasisLibrary.NAMESPACES_SUPPORT_ERR,
- "\u4F7F\u7528\u7684 SAX \u8BED\u6CD5\u5206\u6790\u5668\u4E0D\u652F\u6301 XML \u540D\u79F0\u7A7A\u95F4\u3002"},
+ "\u4F7F\u7528\u7684 SAX \u89E3\u6790\u5668\u4E0D\u652F\u6301 XML \u540D\u79F0\u7A7A\u95F4\u3002"},
/*
* Note to translators: The substitution text is the URI that was in
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
index 8a349c5..51417ac 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
@@ -27,7 +27,7 @@
#
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
-# @version $Id: JAXPValidationMessages_de.properties /st_wptg_1.8.0.0.0jdk/2 2013/05/29 01:16:51 gmolloy Exp $
+# @version $Id: JAXPValidationMessages_de.properties /st_wptg_1.8.0.0.0jdk/4 2013/11/10 07:44:26 gmolloy Exp $
# Messages for message reporting
BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
@@ -36,8 +36,8 @@
# SchemaFactory error messages
SchemaLanguageNull = Angegebene Schemasprache darf nicht null sein.
SchemaLanguageLengthZero = Angegebene Schemasprache darf nicht null Zeichen lang sein.
-SchemaSourceArrayNull = Quell-Array-Parameter darf nicht null sein.
-SchemaSourceArrayMemberNull = Quell-Array-Parameter darf keine Nullelemente enthalten.
+SchemaSourceArrayNull = Quellarrayparameter darf nicht null sein.
+SchemaSourceArrayMemberNull = Quellarrayparameter darf keine Nullelemente enthalten.
SchemaFactorySourceUnrecognized = Quellparameter des Typs "{0}" ist in dieser SchemaFactory unbekannt.
# Validator error messages
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
index 2a44dc0..c82bc5b 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
# This file contains error and warning messages related to XML
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
@@ -69,6 +44,7 @@
# 2.9 Standalone Document Declaration
SDDeclInvalid = Standalone-Dokumentdeklarationswert muss "Ja" oder "Nein" und nicht "{0}" sein.
+ SDDeclNameInvalid = Der Standalone-Name in der XML-Deklaration ist m\u00F6glicherweise falsch geschrieben.
# 2.12 Language Identification
XMLLangInvalid = xml:lang-Attributwert "{0}" ist eine ung\u00FCltige Sprach-ID.
# 3. Logical Structures
@@ -317,8 +293,10 @@
InvalidCharInLiteral=InvalidCharInLiteral
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=Parser hat mehr als "{0}" Entit\u00E4tserweiterungen in diesem Dokument gefunden. Dies ist der durch die Anwendung vorgeschriebene Grenzwert.
+# Implementation limits
+ EntityExpansionLimitExceeded=JAXP00010001: Der Parser hat mehr als {0} Entit\u00E4tserweiterungen in diesem Dokument gefunden. Dies ist der von JDK vorgeschriebene Grenzwert.
+ ElementAttributeLimit=JAXP00010002: Element "{0}" hat mehr als {1} Attribute. "{1}" ist der von JDK vorgeschriebene Grenzwert.
+ MaxEntitySizeLimit=JAXP00010003: Die L\u00E4nge von Entit\u00E4t "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
+ TotalEntitySizeLimit=JAXP00010004: Die akkumulierte Gr\u00F6\u00DFe "{0}" der Entit\u00E4ten \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
+ MaxXMLNameLimit=JAXP00010005: Der Name "{0}" \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= Element "{0}" hat mehr als "{1}" Attribute. "{1}" ist der durch die Anwendung vorgeschriebene Grenzwert.
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
index 860f862..1243b21 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
# This file contains error and warning messages related to XML
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
@@ -69,6 +44,7 @@
# 2.9 Standalone Document Declaration
SDDeclInvalid = El valor de declaraci\u00F3n del documento aut\u00F3nomo debe ser "yes" o "no", pero nunca "{0}".
+ SDDeclNameInvalid = Puede que el nombre aut\u00F3nomo de la declaraci\u00F3n XML est\u00E9 mal escrito.
# 2.12 Language Identification
XMLLangInvalid = El valor del atributo xml:lang "{0}" es un identificador de idioma no v\u00E1lido.
# 3. Logical Structures
@@ -317,8 +293,10 @@
InvalidCharInLiteral=InvalidCharInLiteral
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=El analizador ha encontrado m\u00E1s de "{0}"ampliaciones de entidad en este documento; \u00E9ste es el l\u00EDmite impuesto por la aplicaci\u00F3n.
+# Implementation limits
+ EntityExpansionLimitExceeded=JAXP00010001: el analizador ha encontrado m\u00E1s de "{0}"ampliaciones de entidad en este documento; \u00E9ste es el l\u00EDmite impuesto por el JDK.
+ ElementAttributeLimit=JAXP00010002: el elemento "{0}" tiene m\u00E1s de "{1}" atributos, "{1}" es el l\u00EDmite impuesto por el JDK.
+ MaxEntitySizeLimit=JAXP00010003: la longitud de la entidad "{0}" es "{1}", que excede el l\u00EDmite de "{2}" que ha definido "{3}".
+ TotalEntitySizeLimit=JAXP00010004: el tama\u00F1o acumulado "{0}" de las entidades ha excedido el l\u00EDmite de "{1}" que ha definido "{2}".
+ MaxXMLNameLimit=JAXP00010005: el nombre "{0}" ha excedido el l\u00EDmite de "{1}" que ha definido "{2}".
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= El elemento "{0}" tiene m\u00E1s de "{1}" atributos, "{1}" es el l\u00EDmite impuesto por la aplicaci\u00F3n.
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
index a7a2c4c..5a2b76c 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
# This file contains error and warning messages related to XML
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
@@ -69,6 +44,7 @@
# 2.9 Standalone Document Declaration
SDDeclInvalid = La valeur de d\u00E9claration de document autonome doit \u00EAtre "oui" ou "non", mais pas "{0}".
+ SDDeclNameInvalid = Le nom de document autonome contenu dans la d\u00E9claration XML est peut-\u00EAtre mal orthographi\u00E9.
# 2.12 Language Identification
XMLLangInvalid = La valeur d''attribut xml:lang "{0}" est un identificateur de langue non valide.
# 3. Logical Structures
@@ -317,8 +293,10 @@
InvalidCharInLiteral=InvalidCharInLiteral
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=L''analyseur a rencontr\u00E9 plus de "{0}" d\u00E9veloppements d''entit\u00E9 dans ce document. Il s''agit de la limite impos\u00E9e par l''application.
+# Implementation limits
+ EntityExpansionLimitExceeded=JAXP00010001 : L''analyseur a rencontr\u00E9 plus de "{0}" d\u00E9veloppements d''entit\u00E9 dans ce document. Il s''agit de la limite impos\u00E9e par le JDK.
+ ElementAttributeLimit=JAXP00010002 : L''\u00E9l\u00E9ment "{0}" a plus de "{1}" attributs. "{1}" est la limite impos\u00E9e par le JDK.
+ MaxEntitySizeLimit=JAXP00010003 : La longueur de l''entit\u00E9 "{0}" est de "{1}". Cette valeur d\u00E9passe la limite de "{2}" d\u00E9finie par "{3}".
+ TotalEntitySizeLimit=JAXP00010004 : La taille cumul\u00E9e des entit\u00E9s ("{0}") d\u00E9passe la limite de "{1}" d\u00E9finie par "{2}".
+ MaxXMLNameLimit=JAXP00010005 : le nom "{0}" d\u00E9passe la limite de "{1}" d\u00E9finie par "{2}".
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= L''\u00E9l\u00E9ment "{0}" a plus de "{1}" attributs. "{1}" est la limite impos\u00E9e par l''application.
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
index 8bf8837..1f8ec89 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
# This file contains error and warning messages related to XML
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
@@ -69,6 +44,7 @@
# 2.9 Standalone Document Declaration
SDDeclInvalid = Il valore della dichiarazione del documento standalone deve essere "yes" o "no", non "{0}".
+ SDDeclNameInvalid = Il nome standalone nella dichiarazione XML potrebbe essere stato digitato in modo errato.
# 2.12 Language Identification
XMLLangInvalid = Il valore dell''attributo xml:lang "{0}" \u00E8 un identificativo di lingua non valido.
# 3. Logical Structures
@@ -317,8 +293,10 @@
InvalidCharInLiteral=InvalidCharInLiteral
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=Il parser ha rilevato pi\u00F9 "{0}" espansioni di entit\u00E0 nel documento. Questo \u00E8 il limite imposto dall''applicazione.
+# Implementation limits
+ EntityExpansionLimitExceeded=JAXP00010001: il parser ha rilevato pi\u00F9 "{0}" espansioni di entit\u00E0 nel documento. Questo \u00E8 il limite imposto dal kit JDK.
+ ElementAttributeLimit=JAXP00010002: l''elemento "{0}" contiene pi\u00F9 di "{1}" attributi. "{1}" \u00E8 il limite imposto dal kit JDK.
+ MaxEntitySizeLimit=JAXP00010003: la lunghezza dell''entit\u00E0 "{0}" \u00E8 "{1}". Tale valore supera il limite "{2}" definito da "{3}".
+ TotalEntitySizeLimit=JAXP00010004: le dimensioni accumulate "{0}" delle entit\u00E0 supera il limite "{1}" definito da "{2}".
+ MaxXMLNameLimit=JAXP00010005: il nome "{0}" supera il limite "{1}" definito da "{2}".
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= L''elemento "{0}" contiene pi\u00F9 di "{1}" attributi. "{1}" \u00E8 il limite imposto dall''applicazione.
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
index 567376a..6330e9f 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
# This file contains error and warning messages related to XML
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
@@ -69,6 +44,7 @@
# 2.9 Standalone Document Declaration
SDDeclInvalid = \u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5BA3\u8A00\u306E\u5024\u306F\u3001"{0}"\u3067\u306F\u306A\u304F\u3001"yes"\u307E\u305F\u306F"no"\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ SDDeclNameInvalid = XML\u5BA3\u8A00\u306E\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u540D\u304C\u9593\u9055\u3063\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
# 2.12 Language Identification
XMLLangInvalid = xml:lang\u5C5E\u6027\u306E\u5024"{0}"\u306F\u7121\u52B9\u306A\u8A00\u8A9E\u8B58\u5225\u5B50\u3067\u3059\u3002
# 3. Logical Structures
@@ -261,7 +237,7 @@
MSG_DUPLICATE_ATTDEF = \u5C5E\u6027"{1}"\u306F\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002
MSG_ELEMENT_ALREADY_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306F\u8907\u6570\u56DE\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
MSG_ELEMENT_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- MSG_GRAMMAR_NOT_FOUND = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u7121\u52B9\u3067\u3059\u3002\u69CB\u6587\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
+ MSG_GRAMMAR_NOT_FOUND = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u7121\u52B9\u3067\u3059: \u69CB\u6587\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
MSG_ELEMENT_WITH_ID_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u8B58\u5225\u5B50"{0}"\u3092\u6301\u3064\u8981\u7D20\u304C\u5FC5\u8981\u3067\u3059\u3002
MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
MSG_FIXED_ATTVALUE_INVALID = \u5024"{2}"\u3092\u6301\u3064\u5C5E\u6027"{1}"\u306B\u306F\u3001"{3}"\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
@@ -317,8 +293,10 @@
InvalidCharInLiteral=InvalidCharInLiteral
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=\u30D1\u30FC\u30B5\u30FC\u306B\u3088\u3063\u3066\u3001\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067"{0}"\u3092\u8D85\u3048\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u62E1\u5F35\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u3053\u308C\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
+# Implementation limits
+ EntityExpansionLimitExceeded=JAXP00010001: \u30D1\u30FC\u30B5\u30FC\u306B\u3088\u3063\u3066\u3001\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067"{0}"\u3092\u8D85\u3048\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u62E1\u5F35\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u3053\u308C\u306F\u3001JDK\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
+ ElementAttributeLimit=JAXP00010002: \u8981\u7D20"{0}"\u306B"{1}"\u3092\u8D85\u3048\u308B\u5C5E\u6027\u304C\u5B58\u5728\u3057\u307E\u3059\u3002"{1}"\u306F\u3001JDK\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
+ MaxEntitySizeLimit=JAXP00010003: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u9577\u3055\u306F"{1}"\u3067\u3001"{3}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{2}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
+ TotalEntitySizeLimit=JAXP00010004: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u7D2F\u7A4D\u30B5\u30A4\u30BA"{0}"\u306F\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u307E\u3057\u305F\u3002
+ MaxXMLNameLimit=JAXP00010005: \u540D\u524D"{0}"\u306F\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= \u8981\u7D20"{0}"\u306B"{1}"\u3092\u8D85\u3048\u308B\u5C5E\u6027\u304C\u5B58\u5728\u3057\u307E\u3059\u3002"{1}"\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
index b7f1872..fc7533a 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
# This file contains error and warning messages related to XML
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
@@ -69,6 +44,7 @@
# 2.9 Standalone Document Declaration
SDDeclInvalid = \uB3C5\uB9BD\uD615 \uBB38\uC11C \uC120\uC5B8 \uAC12\uC740 "{0}"\uC774(\uAC00) \uC544\uB2CC "yes" \uB610\uB294 "no"\uC5EC\uC57C \uD569\uB2C8\uB2E4.
+ SDDeclNameInvalid = XML \uC120\uC5B8\uC758 \uB3C5\uB9BD\uD615 \uC774\uB984\uC758 \uCCA0\uC790\uAC00 \uC798\uBABB\uB418\uC5C8\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
# 2.12 Language Identification
XMLLangInvalid = xml:lang \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uC5B8\uC5B4 \uC2DD\uBCC4\uC790\uC785\uB2C8\uB2E4.
# 3. Logical Structures
@@ -317,8 +293,10 @@
InvalidCharInLiteral=InvalidCharInLiteral
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=\uAD6C\uBB38 \uBD84\uC11D\uAE30\uAC00 \uC774 \uBB38\uC11C\uC5D0\uC11C "{0}"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC5D4\uD2F0\uD2F0 \uD655\uC7A5\uC744 \uBC1C\uACAC\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB294 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
+# Implementation limits
+ EntityExpansionLimitExceeded=JAXP00010001: \uAD6C\uBB38 \uBD84\uC11D\uAE30\uAC00 \uC774 \uBB38\uC11C\uC5D0\uC11C "{0}"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC5D4\uD2F0\uD2F0 \uD655\uC7A5\uC744 \uBC1C\uACAC\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB294 JDK\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
+ ElementAttributeLimit=JAXP00010002: "{0}" \uC694\uC18C\uC5D0 "{1}"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC18D\uC131\uC774 \uC788\uC2B5\uB2C8\uB2E4. "{1}"\uC740(\uB294) JDK\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
+ MaxEntitySizeLimit=JAXP00010003: "{0}" \uC5D4\uD2F0\uD2F0\uC758 \uAE38\uC774\uAC00 "{3}"\uC5D0\uC11C \uC124\uC815\uB41C "{2}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{1}"\uC785\uB2C8\uB2E4.
+ TotalEntitySizeLimit=JAXP00010004: \uC5D4\uD2F0\uD2F0\uC758 \uB204\uC801 \uD06C\uAE30 "{0}"\uC774(\uAC00) "{2}"\uC5D0\uC11C \uC124\uC815\uB41C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4.
+ MaxXMLNameLimit=JAXP00010005: "{0}" \uC774\uB984\uC774 "{2}"\uC5D0\uC11C \uC124\uC815\uB41C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4.
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= "{0}" \uC694\uC18C\uC5D0 "{1}"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC18D\uC131\uC774 \uC788\uC2B5\uB2C8\uB2E4. "{1}"\uC740(\uB294) \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
index f76f863..8481a1e 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
# This file contains error and warning messages related to XML
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
@@ -69,6 +44,7 @@
# 2.9 Standalone Document Declaration
SDDeclInvalid = O valor da declara\u00E7\u00E3o do documento stand-alone deve ser "sim" ou "n\u00E3o", mas n\u00E3o deve ser "{0}".
+ SDDeclNameInvalid = O nome standalone na declara\u00E7\u00E3o XML pode estar grafado incorretamente.
# 2.12 Language Identification
XMLLangInvalid = O valor do atributo xml:lang "{0}" \u00E9 um identificador de idioma inv\u00E1lido.
# 3. Logical Structures
@@ -317,8 +293,10 @@
InvalidCharInLiteral=InvalidCharInLiteral
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=O parser detectou mais de "{0}" expans\u00F5es da entidade neste documento. Este \u00E9 o limite imposto pela aplica\u00E7\u00E3o.
+# Implementation limits
+ EntityExpansionLimitExceeded=JAXP00010001: O parser detectou mais de "{0}" expans\u00F5es da entidade neste documento. Este \u00E9 o limite imposto pelo JDK.
+ ElementAttributeLimit=JAXP00010002: o elemento "{0}" tem mais de "{1}" atributos. "{1}" \u00E9 o limite imposto pelo JDK.
+ MaxEntitySizeLimit=JAXP00010003: o tamanho da entidade "{0}" \u00E9 "{1}", o que excede o limite de "{2}" definido por "{3}".
+ TotalEntitySizeLimit=JAXP00010004: o tamanho acumulado "{0}" de entidades excedeu o limite de "{1}" definido por "{2}".
+ MaxXMLNameLimit=JAXP00010005: o nome "{0}" excedeu o limite de "{1}" definido por "{2}".
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= O elemento "{0}" tem mais de "{1}" atributos. "{1}" \u00E9 o limite imposto pela aplica\u00E7\u00E3o.
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
index 2aa0899..bbc5db4 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
# This file contains error and warning messages related to XML
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
@@ -69,6 +44,7 @@
# 2.9 Standalone Document Declaration
SDDeclInvalid = Deklarationsv\u00E4rdet f\u00F6r frist\u00E5ende dokument m\u00E5ste vara "yes" eller "no", inte "{0}".
+ SDDeclNameInvalid = Det frist\u00E5ende namnet i XML-deklarationen kan vara felstavat.
# 2.12 Language Identification
XMLLangInvalid = Attributv\u00E4rdet "{0}" f\u00F6r xml:lang \u00E4r en ogiltig spr\u00E5kidentifierare.
# 3. Logical Structures
@@ -317,8 +293,10 @@
InvalidCharInLiteral=InvalidCharInLiteral
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=Parsern har p\u00E5tr\u00E4ffat fler \u00E4n "{0}" enhetstill\u00E4gg i dokumentet - applikationens gr\u00E4nsv\u00E4rde har uppn\u00E5tts.
+# Implementation limits
+ EntityExpansionLimitExceeded=JAXP00010001: Parsern har p\u00E5tr\u00E4ffat fler \u00E4n "{0}" enhetstill\u00E4gg i dokumentet - gr\u00E4nsv\u00E4rdet f\u00F6r JDK har uppn\u00E5tts.
+ ElementAttributeLimit=JAXP00010002: Elementet "{0}" har fler \u00E4n "{1}" attribut, "{1}" \u00E4r gr\u00E4nsv\u00E4rdet f\u00F6r JDK.
+ MaxEntitySizeLimit=JAXP00010003: L\u00E4ngden p\u00E5 enheten "{0}" \u00E4r "{1}" som \u00F6verskriver gr\u00E4nsv\u00E4rdet p\u00E5 "{2}" som anges av "{3}".
+ TotalEntitySizeLimit=JAXP00010004: Den ackumulerade storleken "{0}" f\u00F6r enheter \u00F6verskred gr\u00E4nsv\u00E4rdet p\u00E5 "{1}" som anges av "{2}".
+ MaxXMLNameLimit=JAXP00010005: Namnet "{0}" \u00F6verskred gr\u00E4nsv\u00E4rdet p\u00E5 "{1}" som anges av "{2}".
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= Elementet "{0}" har fler \u00E4n "{1}" attribut, "{1}" \u00E4r applikationens gr\u00E4nsv\u00E4rde.
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
index 3bbcd1c..bb02a0d 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
# This file contains error and warning messages related to XML
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
@@ -69,6 +44,7 @@
# 2.9 Standalone Document Declaration
SDDeclInvalid = \u72EC\u7ACB\u6587\u6863\u58F0\u660E\u503C\u5FC5\u987B\u4E3A "\u662F" \u6216 "\u5426", \u4E0D\u80FD\u4E3A "{0}"\u3002
+ SDDeclNameInvalid = XML \u58F0\u660E\u4E2D\u7684\u72EC\u7ACB\u540D\u79F0\u53EF\u80FD\u62FC\u5199\u6709\u8BEF\u3002
# 2.12 Language Identification
XMLLangInvalid = xml:lang \u5C5E\u6027\u503C "{0}" \u662F\u65E0\u6548\u7684\u8BED\u8A00\u6807\u8BC6\u7B26\u3002
# 3. Logical Structures
@@ -317,8 +293,10 @@
InvalidCharInLiteral=InvalidCharInLiteral
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=\u89E3\u6790\u5668\u5728\u6B64\u6587\u6863\u4E2D\u9047\u5230\u591A\u4E2A "{0}" \u5B9E\u4F53\u6269\u5C55; \u8FD9\u662F\u5E94\u7528\u7A0B\u5E8F\u65BD\u52A0\u7684\u9650\u5236\u3002
+# Implementation limits
+ EntityExpansionLimitExceeded=JAXP00010001: \u89E3\u6790\u5668\u5728\u6B64\u6587\u6863\u4E2D\u9047\u5230\u591A\u4E2A "{0}" \u5B9E\u4F53\u6269\u5C55; \u8FD9\u662F JDK \u65BD\u52A0\u7684\u9650\u5236\u3002
+ ElementAttributeLimit=JAXP00010002: \u5143\u7D20 "{0}" \u5177\u6709\u591A\u4E2A "{1}" \u5C5E\u6027, "{1}" \u662F JDK \u65BD\u52A0\u7684\u9650\u5236\u3002
+ MaxEntitySizeLimit=JAXP00010003: \u5B9E\u4F53 "{0}" \u7684\u957F\u5EA6\u4E3A "{1}", \u8D85\u8FC7\u4E86 "{3}" \u8BBE\u7F6E\u7684 "{2}" \u9650\u5236\u3002
+ TotalEntitySizeLimit=JAXP00010004: \u5B9E\u4F53\u7684\u7D2F\u8BA1\u5927\u5C0F "{0}" \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684 "{1}" \u9650\u5236\u3002
+ MaxXMLNameLimit=JAXP00010005: \u540D\u79F0 "{0}" \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684 "{1}" \u9650\u5236\u3002
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= \u5143\u7D20 "{0}" \u5177\u6709\u591A\u4E2A "{1}" \u5C5E\u6027, "{1}" \u662F\u5E94\u7528\u7A0B\u5E8F\u65BD\u52A0\u7684\u9650\u5236\u3002
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
index 3ddcf4d..2f2e1a3 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
# This file contains error and warning messages related to XML
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
@@ -69,6 +44,7 @@
# 2.9 Standalone Document Declaration
SDDeclInvalid = \u7368\u7ACB\u6587\u4EF6\u5BA3\u544A\u503C\u5FC5\u9808\u662F "yes" \u6216 "no"\uFF0C\u800C\u975E "{0}"\u3002
+ SDDeclNameInvalid = XML \u5BA3\u544A\u4E2D\u7684\u7368\u7ACB\u540D\u7A31\u53EF\u80FD\u62FC\u932F\u4E86\u3002
# 2.12 Language Identification
XMLLangInvalid = xml:lang \u5C6C\u6027\u503C "{0}" \u70BA\u7121\u6548\u7684\u8A9E\u8A00 ID\u3002
# 3. Logical Structures
@@ -317,8 +293,10 @@
InvalidCharInLiteral=InvalidCharInLiteral
-#Application can set the limit of number of entities that should be expanded by the parser.
-EntityExpansionLimitExceeded=\u5256\u6790\u5668\u5728\u6B64\u6587\u4EF6\u4E2D\u906D\u9047 "{0}" \u500B\u4EE5\u4E0A\u7684\u5BE6\u9AD4\u64F4\u5145; \u6B64\u70BA\u61C9\u7528\u7A0B\u5F0F\u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
+# Implementation limits
+ EntityExpansionLimitExceeded=JAXP00010001: \u5256\u6790\u5668\u5728\u6B64\u6587\u4EF6\u4E2D\u9047\u5230 "{0}" \u500B\u4EE5\u4E0A\u7684\u5BE6\u9AD4\u64F4\u5145; \u9019\u662F JDK \u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
+ ElementAttributeLimit=JAXP00010002: \u5143\u7D20 "{0}" \u5177\u6709\u8D85\u904E "{1}" \u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\uFF0C"{1}" \u662F JDK \u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
+ MaxEntitySizeLimit=JAXP00010003: \u5BE6\u9AD4 "{0}" \u7684\u9577\u5EA6\u70BA "{1}"\uFF0C\u8D85\u904E "{3}" \u6240\u8A2D\u5B9A\u7684 "{2}" \u9650\u5236\u3002
+ TotalEntitySizeLimit=JAXP00010004: \u5BE6\u9AD4\u7684\u7D2F\u7A4D\u5927\u5C0F "{0}" \u8D85\u904E "{2}" \u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002
+ MaxXMLNameLimit=JAXP00010005: \u540D\u7A31 "{0}" \u8D85\u904E "{2}" \u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002
-# Application can set the limit of number of attributes of entity that should be expanded by the parser.
-ElementAttributeLimit= \u5143\u7D20 "{0}" \u5177\u6709\u8D85\u904E "{1}" \u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\uFF0C"{1}" \u70BA\u61C9\u7528\u7A0B\u5F0F\u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
index 1074338..839c0da 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties
@@ -26,7 +26,7 @@
# This file contains error and warning messages related to XML Schema
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
-# @version $Id: XMLSchemaMessages_it.properties /st_wptg_1.8.0.0.0jdk/3 2013/09/16 07:02:00 gmolloy Exp $
+# @version $Id: XMLSchemaMessages_it.properties /st_wptg_1.8.0.0.0jdk/4 2013/11/06 08:14:00 gmolloy Exp $
BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
@@ -183,7 +183,7 @@
cos-particle-restrict.b = cos-particle-restrict.b: la parte della base \u00E8 vuota, mente la parte derivata non lo \u00E8.
cos-particle-restrict.2 = cos-particle-restrict.2: limitazione di parte vietata: ''{0}''.
cos-st-restricts.1.1 = cos-st-restricts.1.1: il tipo ''{1}'' \u00E8 indivisibile, quindi la ''{''base type definition''}'' "{0}" deve essere una definizione di tipo semplice indivisibile o un tipo di dati predefinito incorporato.
- cos-st-restricts.2.1 = cos-st-restricts.2.1: nella definizione del tipo di lista ''{0}'', il tipo ''{1}'' non \u00E8 valido poich\u00E9 \u00E8 un tipo di lista o un tipo di unione che contiene una lista).
+ cos-st-restricts.2.1 = cos-st-restricts.2.1: nella definizione del tipo di lista ''{0}'', il tipo ''{1}'' non \u00E8 valido poich\u00E9 \u00E8 un tipo di lista o un tipo di unione che contiene una lista.
cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: il componente ''{''final''}'' di ''{''item type definition''}'' ''{0}'' contiene ''list'', pertanto ''{0}'' non pu\u00F2 essere utilizzato come tipo di elemento per il tipo di lista ''{1}''.
cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: il componente ''{''final''}'' di ''{''member type definitions''}'' ''{0}'' contiene ''union'', pertanto ''{0}'' non pu\u00F2 essere utilizzato come tipo di membro per il tipo di unione ''{1}''.
cos-valid-default.2.1 = cos-valid-default.2.1: l''elemento "{0}" ha un vincolo di valore e deve avere un modello di contenuto misto o semplice.
diff --git a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java b/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java
index e846740..e8a6c9a 100644
--- a/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java
+++ b/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: XMLErrorResources_zh_CN.java /st_wptg_1.8.0.0.0jdk/2 2013/09/16 04:44:25 gmolloy Exp $
+ * $Id: XMLErrorResources_zh_CN.java /st_wptg_1.8.0.0.0jdk/3 2013/11/11 11:39:28 gmolloy Exp $
*/
package com.sun.org.apache.xml.internal.res;
@@ -212,10 +212,10 @@
"Coroutine \u53C2\u6570\u9519\u8BEF ({0})"},
{ ER_PARSER_DOTERMINATE_ANSWERS,
- "\n\u610F\u5916: \u8BED\u6CD5\u5206\u6790\u5668\u5BF9\u7B54\u590D{0}\u6267\u884C doTerminate"},
+ "\n\u610F\u5916: \u89E3\u6790\u5668\u5BF9\u7B54\u590D{0}\u6267\u884C doTerminate"},
{ ER_NO_PARSE_CALL_WHILE_PARSING,
- "\u65E0\u6CD5\u5728\u6267\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u8C03\u7528 parse"},
+ "\u65E0\u6CD5\u5728\u89E3\u6790\u65F6\u8C03\u7528 parse"},
{ ER_TYPED_ITERATOR_AXIS_NOT_IMPLEMENTED,
"\u9519\u8BEF: \u672A\u5B9E\u73B0\u8F74{0}\u7684\u7C7B\u578B\u5316\u8FED\u4EE3\u5668"},
@@ -245,13 +245,13 @@
"\u65E0\u6CD5\u5C06\u8282\u70B9\u89E3\u6790\u4E3A\u53E5\u67C4"},
{ ER_STARTPARSE_WHILE_PARSING,
- "\u65E0\u6CD5\u5728\u6267\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u8C03\u7528 startParse"},
+ "\u65E0\u6CD5\u5728\u89E3\u6790\u65F6\u8C03\u7528 startParse"},
{ ER_STARTPARSE_NEEDS_SAXPARSER,
"startParse \u9700\u8981\u975E\u7A7A SAXParser"},
{ ER_COULD_NOT_INIT_PARSER,
- "\u65E0\u6CD5\u4F7F\u7528\u4EE5\u4E0B\u5BF9\u8C61\u521D\u59CB\u5316\u8BED\u6CD5\u5206\u6790\u5668"},
+ "\u65E0\u6CD5\u4F7F\u7528\u4EE5\u4E0B\u5BF9\u8C61\u521D\u59CB\u5316\u89E3\u6790\u5668"},
{ ER_EXCEPTION_CREATING_POOL,
"\u4E3A\u6C60\u521B\u5EFA\u65B0\u5B9E\u4F8B\u65F6\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF"},
@@ -296,10 +296,10 @@
"\u7247\u6BB5\u5305\u542B\u65E0\u6548\u7684\u5B57\u7B26"},
{ ER_PARSER_IN_USE,
- "\u8BED\u6CD5\u5206\u6790\u5668\u5DF2\u5728\u4F7F\u7528"},
+ "\u89E3\u6790\u5668\u5DF2\u5728\u4F7F\u7528"},
{ ER_CANNOT_CHANGE_WHILE_PARSING,
- "\u65E0\u6CD5\u5728\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u66F4\u6539{0} {1}"},
+ "\u65E0\u6CD5\u5728\u89E3\u6790\u65F6\u66F4\u6539{0} {1}"},
{ ER_SELF_CAUSATION_NOT_PERMITTED,
"\u4E0D\u5141\u8BB8\u4F7F\u7528\u81EA\u56E0"},
diff --git a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java b/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
index 2618e59..9965c4c 100644
--- a/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
+++ b/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
@@ -3,7 +3,7 @@
* DO NOT REMOVE OR ALTER!
*/
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
- * $Id: XPATHErrorResources_zh_CN.java,v 1.2.4.1 2005/09/15 00:39:21 jeffsuttor Exp $
+ * $Id: XPATHErrorResources_zh_CN.java /st_wptg_1.8.0.0.0jdk/3 2013/11/11 11:39:28 gmolloy Exp $
*/
package com.sun.org.apache.xpath.internal.res;
@@ -855,7 +855,7 @@
"\u65E0\u6CD5\u6839\u636E{0}\u751F\u6210 URL"},
{ WG_EXPAND_ENTITIES_NOT_SUPPORTED,
- "DTM \u8BED\u6CD5\u5206\u6790\u5668\u4E0D\u652F\u6301 -E \u9009\u9879"},
+ "DTM \u89E3\u6790\u5668\u4E0D\u652F\u6301 -E \u9009\u9879"},
{ WG_ILLEGAL_VARIABLE_REFERENCE,
"\u4E3A\u53D8\u91CF\u7ED9\u5B9A\u7684 VariableReference \u8131\u79BB\u4E0A\u4E0B\u6587\u6216\u6CA1\u6709\u5B9A\u4E49! \u540D\u79F0 = {0}"},
@@ -883,7 +883,7 @@
{ "optionMatch", " [-match match pattern (for match diagnostics)]"},
{ "optionAnyExpr", "\u6216\u8005\u4EC5 xpath \u8868\u8FBE\u5F0F\u6267\u884C\u8BCA\u65AD\u8F6C\u50A8"},
{ "noParsermsg1", "XSL \u8FDB\u7A0B\u672A\u6210\u529F\u3002"},
- { "noParsermsg2", "** \u627E\u4E0D\u5230\u8BED\u6CD5\u5206\u6790\u5668 **"},
+ { "noParsermsg2", "** \u627E\u4E0D\u5230\u89E3\u6790\u5668 **"},
{ "noParsermsg3", "\u8BF7\u68C0\u67E5\u60A8\u7684\u7C7B\u8DEF\u5F84\u3002"},
{ "noParsermsg4", "\u5982\u679C\u6CA1\u6709 IBM \u63D0\u4F9B\u7684 XML Parser for Java, \u5219\u53EF\u4EE5\u4ECE"},
{ "noParsermsg5", "IBM AlphaWorks \u8FDB\u884C\u4E0B\u8F7D, \u7F51\u5740\u4E3A: http://www.alphaworks.ibm.com/formula/xml"},
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 45cc1bb..3565808 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -239,3 +239,4 @@
e126d8eca69b83a1cc159c2375b7c33140346d2b jdk8-b115
587560c222a2476066852224ed02d39b5090a299 jdk8-b116
fe56ba456fd32758c72db629938d69067468d89c jdk8-b117
+76a598cf50c4e1dc1fc8adc08b451943aa1a3179 jdk8-b118
diff --git a/jaxws/makefiles/BuildJaxws.gmk b/jaxws/make/BuildJaxws.gmk
similarity index 100%
rename from jaxws/makefiles/BuildJaxws.gmk
rename to jaxws/make/BuildJaxws.gmk
diff --git a/jaxws/make/Makefile b/jaxws/make/Makefile
index 12f1328..4570070 100644
--- a/jaxws/make/Makefile
+++ b/jaxws/make/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,172 +23,27 @@
# questions.
#
-# Makefile wrapper around Ant build.xml file
-
-#
-# On Solaris, the 'make' utility from Sun will not work with these makefiles.
-# This little rule is only understood by Sun's make, and is harmless
-# when seen by the GNU make tool. If using Sun's make, this causes the
-# make command to fail.
-#
-SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
-
-ifdef QUIET
- ANT_OPTIONS += -quiet
-endif
-
-ifdef VERBOSE
- ANT_OPTIONS += -verbose
-endif
-
-ifeq ($(VARIANT), OPT)
- ifneq ($(DEBUG_CLASSFILES), true)
- ANT_OPTIONS += -Djavac.debug=false
- endif
-endif
-
-# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
-# and the somewhat misnamed CLASS_VERSION (-target NN)
-ifdef TARGET_CLASS_VERSION
- ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION)
+# Locate this Makefile
+ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
+ makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
else
- ifdef JAVAC_TARGET_ARG
- ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG)
- endif
+ makefile_path := $(lastword $(MAKEFILE_LIST))
endif
+repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path))
-ifdef SOURCE_LANGUAGE_VERSION
- ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name := $(notdir $(repo_dir))
+
+# Try to locate top-level makefile
+top_level_makefile := $(repo_dir)/../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 ===================================================)
else
- ifdef JAVAC_SOURCE_ARG
- ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
- endif
-endif
-
-# If downloads are allowed
-ifeq ($(ALLOW_DOWNLOADS),true)
- ANT_OPTIONS += -Dallow.downloads=true
+ $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+ $(error Build from top-level Makefile instead)
endif
-# Figure out the platform we are using
-_SYSTEM_UNAME := $(shell uname)
-_PLATFORM_KIND = unix
-ifeq ($(_SYSTEM_UNAME), Windows_NT)
- _PLATFORM_KIND = windows
-endif
-ifneq (,$(findstring CYGWIN,$(_SYSTEM_UNAME)))
- _PLATFORM_KIND = windows
-endif
-
-# Where is /java in case we need it
-ifdef ALT_SLASH_JAVA
- _SLASHJAVA = $(ALT_SLASH_JAVA)
-else
- ifeq ($(_PLATFORM_KIND), windows)
- _SLASHJAVA=J:/
- else
- _SLASHJAVA=/java
- endif
-endif
-
-ifdef ALT_OUTPUTDIR
- OUTPUTDIR = $(ALT_OUTPUTDIR)
- ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR)
-else
- OUTPUTDIR = ..
-endif
-
-ifdef ALT_LANGTOOLS_DIST
- ifdef ALT_BOOTDIR
- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
- ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
- endif
- ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
-else
- ifdef ALT_JDK_IMPORT_PATH
- ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
- ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH)
- endif
-endif
-
-ifdef ANT_HOME
- ANT = $(ANT_HOME)/bin/ant
- ifneq ($(shell test -x $(ANT); echo $$?), 0)
- $(error "$(ANT) not found; please update ANT_HOME")
- endif
-else
- ANT = ant
- ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0)
- $(error "'ant' not found; please set ANT_HOME or put 'ant' on your PATH")
- endif
-endif
-
-# Default target and expected 'do everything' target
-default: all
-
-# All ant targets of interest
-ANT_TARGETS = all build dist clobber clean sanity
-
-# Create a make target for each
-$(ANT_TARGETS):
- cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version
- cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
-
-# Just for compat reasons, delete in future.
-drop_included:
-source:
-
-# Help target
-define helpenvline
-@echo " $1";echo " $2"
-endef
-help:
- @echo "----------------------------------------------------------"
- @echo " "
- @echo "Help information for this Makefile:"
- @echo " "
- @echo " Targets (see ant project information for descriptions):"
- @echo " $(ANT_TARGETS)"
- @echo " "
- @echo " Environment or command line variables (all optional):"
- $(call helpenvline, ALT_BOOTDIR,\
- "JAVA_HOME to use when running ant")
- $(call helpenvline, ALT_LANGTOOLS_DIST,\
- "path to langtools repository dist directory")
- $(call helpenvline, ALT_OUTPUTDIR,\
- "path to root of output")
- $(call helpenvline, DEBUG_CLASSFILES,\
- "if set makes sure ant property javac.debug is true")
- $(call helpenvline, JAVAC_SOURCE_ARG,\
- "if SOURCE_LANGUAGE_VERSION not set uses this to set ant property javac.source")
- $(call helpenvline, JAVAC_TARGET_ARG,\
- "if TARGET_CLASS_VERSION not set uses this to set ant property javac.target")
- $(call helpenvline, SOURCE_LANGUAGE_VERSION,\
- "if set uses this to set ant property javac.source")
- $(call helpenvline, QUIET,\
- "if set will pass -quiet to ant")
- $(call helpenvline, TARGET_CLASS_VERSION,\
- "JAVA_HOME to use when running ant")
- $(call helpenvline, VARIANT,\
- "if set to OPT means optimized build will set javac.debug to false")
- $(call helpenvline, VERBOSE,\
- "if set will pass -verbose to ant")
- @echo " "
- @echo "----------------------------------------------------------"
- @echo " "
- @echo "Ant project file help information:"
- @echo " "
- @$(ANT_JAVA_HOME) cd .. && $(ANT) $(ANT_OPTIONS) -p
- @echo " "
- @echo "----------------------------------------------------------"
-
-# Targets for Sun's internal JPRT build system
-JPRT_ARCHIVE_BUNDLE=$(OUTPUTDIR)/jprt.zip
-jprt_build_product jprt_build_debug jprt_build_fastdebug: all
- $(RM) $(JPRT_ARCHIVE_BUNDLE)
- ( cd $(OUTPUTDIR)/dist && \
- zip -q -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-# Declare these phony (not filenames)
-.PHONY: $(ANT_TARGETS) \
- jprt_build_product jprt_build_debug jprt_build_fastdebug
+all:
+ @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/jaxws/make/jprt.properties b/jaxws/make/jprt.properties
deleted file mode 100644
index 8afa531..0000000
--- a/jaxws/make/jprt.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Properties for jprt
-
-# Locked down to jdk8
-jprt.tools.default.release=jdk8
-
-# The different build flavors we want, we override here so we just get these 2
-jprt.build.flavors=product,fastdebug
-
-# Standard list of jprt build targets for this source tree
-jprt.build.targets= \
- solaris_sparcv9_5.10-{product|fastdebug}, \
- solaris_x64_5.10-{product|fastdebug}, \
- linux_i586_2.6-{product|fastdebug}, \
- linux_x64_2.6-{product|fastdebug}, \
- macosx_x64_10.7-{product|fastdebug}, \
- windows_i586_6.1-{product|fastdebug}, \
- windows_x64_6.1-{product|fastdebug}
-
-# Directories to be excluded from the source bundles
-jprt.bundle.exclude.src.dirs=build dist webrev
-
diff --git a/jaxws/make/scripts/update_src.sh b/jaxws/make/scripts/update_src.sh
deleted file mode 100644
index 6a642fb..0000000
--- a/jaxws/make/scripts/update_src.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This script was used to copy the former drop source bundle source into
-# the repository. Exists as a form of documentation.
-
-curdir="`(cd . && pwd)`"
-
-# Whitespace normalizer script is in the top repository.
-normalizer="perl ${curdir}/../make/scripts/normalizer.pl"
-
-# Locations for bundle and root of source tree
-tmp=/tmp
-srcroot=${curdir}/src
-mkdir -p ${srcroot}
-
-# Bundle information
-drops_dir="/java/devtools/share/jdk8-drops"
-url1="http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8"
-bundle1="jdk8-jaxws-2_2-SNAPSHOT-2012_01_11-patched.zip"
-srcdir1="${srcroot}/share/jaxws_classes"
-url2="http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8"
-bundle2="jdk8-jaf-2011_07_22.zip"
-srcdir2="${srcroot}/share/jaf_classes"
-
-# Function to get a bundle and explode it and normalize the source files.
-getBundle() # drops_dir url bundlename bundledestdir srcrootdir
-{
- # Get the bundle from drops_dir or downloaded
- mkdir -p $4
- rm -f $4/$3
- if [ -f $1/$3 ] ; then
- echo "Copy over bundle: $1/$3"
- cp $1/$3 $4
- else
- echo "Downloading bundle: $2/$3"
- (cd $4 && wget $2/$3)
- fi
- # Fail if it does not exist
- if [ ! -f $4/$3 ] ; then
- echo "ERROR: Could not get $3"
- exit 1
- fi
- # Wipe it out completely
- echo "Cleaning up $5"
- rm -f -r $5
- mkdir -p $5
- echo "Unzipping $4/$3"
- ( cd $5 && unzip -q $4/$3 && mv src/* . && rmdir src && rm LICENSE )
- # Run whitespace normalizer
- echo "Normalizing the sources in $5"
- ( cd $5 && ${normalizer} . )
- # Delete the bundle and leftover files
- rm -f $4/$3 $5/filelist
-}
-
-# Process the bundles.
-getBundle "${drops_dir}" "${url1}" "${bundle1}" ${tmp} ${srcdir1}
-getBundle "${drops_dir}" "${url2}" "${bundle2}" ${tmp} ${srcdir2}
-echo "Completed bundle extraction."
-echo " "
-
-# Appropriate Mercurial commands needed to run:
-echo "Run: hg addremove src"
-echo "Run: ksh ../make/scripts/webrev.ksh -N -o ${HOME}/webrev"
-echo "Get reviewer, get CR, then..."
-echo "Run: hg commit"
-
diff --git a/jaxws/makefiles/Makefile b/jaxws/makefiles/Makefile
deleted file mode 100644
index c7d0dd0..0000000
--- a/jaxws/makefiles/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Locate this Makefile
-ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
- makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
- makefile_path := $(lastword $(MAKEFILE_LIST))
-endif
-repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path))
-
-# What is the name of this subsystem (langtools, corba, etc)?
-subsystem_name := $(notdir $(repo_dir))
-
-# Try to locate 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 ===================================================)
-else
- $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
- $(error Build from top-level Makefile instead)
-endif
-
-all:
- @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 2ea9aff..5cda4ed 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -239,3 +239,4 @@
f82b730c798b6bf38946baaba8a7d80fd5efaa70 jdk8-b115
0dc0067f3b8efb299a4c23f76ee26ea64df9e1d7 jdk8-b116
fc4ac66aa657e09de5f8257c3174f240ed0cbaf7 jdk8-b117
+28ca338366ff2774ac9002f9f6eaff4101a3ea3b jdk8-b118
diff --git a/jdk/makefiles/BuildJdk.gmk b/jdk/make/BuildJdk.gmk
similarity index 100%
rename from jdk/makefiles/BuildJdk.gmk
rename to jdk/make/BuildJdk.gmk
diff --git a/jdk/makefiles/Bundles.gmk b/jdk/make/Bundles.gmk
similarity index 100%
rename from jdk/makefiles/Bundles.gmk
rename to jdk/make/Bundles.gmk
diff --git a/jdk/make/CompileDemos.gmk b/jdk/make/CompileDemos.gmk
new file mode 100644
index 0000000..cbd83c0
--- /dev/null
+++ b/jdk/make/CompileDemos.gmk
@@ -0,0 +1,466 @@
+
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+include NativeCompilation.gmk
+
+# Setup the java compilers for the JDK build.
+include Setup.gmk
+
+# Prepare the find cache. Only used if running on windows.
+$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src))
+
+# Append demo goals to this variable.
+BUILD_DEMOS =
+
+# The demo structure and contents should really be cleaned up.
+# Now every other demo has its own quirks where to put the
+# READMEs and other files.
+
+##################################################################################################
+
+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)
+endef
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ $(eval $(call SetupAppletDemo,ArcTest))
+ $(eval $(call SetupAppletDemo,BarChart))
+ $(eval $(call SetupAppletDemo,Blink))
+ $(eval $(call SetupAppletDemo,CardTest))
+ $(eval $(call SetupAppletDemo,Clock))
+ $(eval $(call SetupAppletDemo,DitherTest))
+ $(eval $(call SetupAppletDemo,DrawTest))
+ $(eval $(call SetupAppletDemo,Fractal))
+ $(eval $(call SetupAppletDemo,GraphicsTest))
+ $(eval $(call SetupAppletDemo,NervousText))
+ $(eval $(call SetupAppletDemo,SimpleGraph))
+ $(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/))
+ endif
+endif
+
+##################################################################################################
+
+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
+
+ # 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
+
+ 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/data/mainmanifest/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
+
+ # 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
+
+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
+ (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)
+ $(RM) -r $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.tmp
+ $(TOUCH) $@
+
+BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ $(eval $(call SetupDemo,MoleculeViewer,applets,,XYZChemModel,,,example*.html *.java))
+ $(eval $(call SetupDemo,WireFrame,applets,,ThreeD,,,example*.html *.java))
+ $(eval $(call SetupDemo,SwingApplet,jfc,,SwingApplet,,,README* *.html))
+endif
+$(eval $(call SetupDemo,FileChooserDemo,jfc,,FileChooserDemo,,,README*))
+$(eval $(call SetupDemo,Font2DTest,jfc,,Font2DTest,,,*.html *.txt))
+$(eval $(call SetupDemo,Metalworks,jfc,,Metalworks,,,README*))
+$(eval $(call SetupDemo,Notepad,jfc,,Notepad,,,README*))
+$(eval $(call SetupDemo,SampleTree,jfc,,SampleTree,,,README*))
+$(eval $(call SetupDemo,TableExample,jfc,,TableExample,,,README*))
+$(eval $(call SetupDemo,TransparentRuler,jfc,,transparentruler.Ruler,,,README*))
+$(eval $(call SetupDemo,jconsole-plugin,scripting,,,,,*.xml *.txt,,,,Main-Class: \n))
+$(eval $(call SetupDemo,FullThreadDump,management,,FullThreadDump,,,README*))
+$(eval $(call SetupDemo,JTop,management,,JTop,,,README*))
+$(eval $(call SetupDemo,MemoryMonitor,management,,MemoryMonitor,,,README*))
+$(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,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 $@
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ $(RM) -r $(JDK_OUTPUTDIR)/demo/nbproject/jfc/SwingApplet
+ endif
+endif
+
+##################################################################################################
+
+# 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.
+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
+
+ $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
+
+ # 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))
+
+ $(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/data/mainmanifest/manifest.mf))
+
+ 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
+
+ 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 $$@
+
+ 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,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)
+# 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))
+
+$(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)
+ $(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/data/mainmanifest/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/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
+ $(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/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
+ $(call install-file)
+ $(CHMOD) -f ug+w $@
+
+BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/management/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))
+
+$(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/share/demo/nbproject/%
+ $(call install-file)
+ $(CHMOD) -f ug+w $@
+
+##################################################################################################
+
+$(JDK_OUTPUTDIR)/demo/README: $(JDK_TOPDIR)/src/share/demo/README
+ $(call install-file)
+
+BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/README
+
+##################################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+
+ $(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
+ $(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
+
+ $(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/data/mainmanifest/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
+
+ $(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
+
+ $(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)
+
+endif
+
+##################################################################################################
+
+ifndef OPENJDK
+ DB_DEMO_ZIPFILE := $(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip)
+
+ $(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 $<
+ $(MV) $(JDK_OUTPUTDIR)/demo/db-derby-*-bin/demo $(JDK_OUTPUTDIR)/demo/db
+ $(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
+ $(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
+endif
+
+##################################################################################################
+
+all: $(BUILD_DEMOS)
+
+.PHONY: all
diff --git a/jdk/make/CompileJavaClasses.gmk b/jdk/make/CompileJavaClasses.gmk
new file mode 100644
index 0000000..a06c415
--- /dev/null
+++ b/jdk/make/CompileJavaClasses.gmk
@@ -0,0 +1,438 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+# Setup the java compilers for the JDK build.
+include Setup.gmk
+
+JARS :=
+EXFILES :=
+EXCLUDES :=
+
+##########################################################################################
+
+EXCLUDES += com/sun/pept \
+ com/sun/tools/example/trace \
+ com/sun/tools/example/debug/bdi \
+ com/sun/tools/example/debug/event \
+ com/sun/tools/example/debug/gui
+
+ifdef OPENJDK
+ 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
+
+ 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
+
+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
+
+ EXCLUDES += com/oracle/security
+endif
+
+EXFILES += WrapperGenerator.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
+endif
+
+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
+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
+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
+
+# TODO: Add BUILD_HEADLESS_ONLY to configure?
+ifdef BUILD_HEADLESS_ONLY
+ EXCLUDES += sun/applet
+endif
+
+ifdef OPENJDK
+ EXCLUDES += sun/java2d/cmm/kcms
+endif
+
+# Used on windows and macosx
+ifeq (, $(filter $(OPENJDK_TARGET_OS), windows macosx))
+ EXFILES += sun/awt/AWTCharset.java
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ # exclude all X11 on Mac, we can't exclude some like below or we'll have compilation errors
+ EXCLUDES += sun/awt/X11
+else
+ # TBD: figure out how to eliminate this long list
+ 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
+
+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
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ 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
+# 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
+# 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
+
+# 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
+endif
+
+MACOSX_SRC_DIRS :=
+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 \
+ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
+ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
+ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.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
+
+ EXCLUDES += com/apple/jobjc
+endif
+
+# The security classes should not end up in the classes directory as that will prevent them
+# from working when running the exploded jdk image. Compile them separately to a different
+# directory from where the jars can be created.
+SECURITY_PKGS := \
+ com/oracle/security/ucrypto \
+ com/sun/crypto/provider \
+ javax/crypto \
+ sun/security/ec \
+ sun/security/internal \
+ sun/security/mscapi \
+ sun/security/pkcs11 \
+ #
+
+# The exception handling of swing beaninfo
+# These resources violates the convention of having code and resources together under
+# $(JDK_TOPDIR)/src/.../classes directories
+$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/data/swingbeaninfo/images/%.gif
+ $(call install-file)
+
+# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
+# 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)))
+
+ifeq ($(ENABLE_SJAVAC),yes)
+ # With sjavac enabled, excluded sources are not even considered for linking.
+ # Explicitly add the security sources to sourcepath for linking.
+ BUILD_JDK_SOURCEPATH:=$(patsubst %,-i$(SPACE)%.*,$(subst /,.,$(SECURITY_PKGS))) \
+ -sourcepath $(JDK_TOPDIR)/src/share/classes
+endif
+
+$(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) $(SECURITY_PKGS),\
+ EXCLUDE_FILES:=$(EXFILES),\
+ BIN:=$(JDK_OUTPUTDIR)/classes,\
+ COPY:=$(COPY_PATTERNS),\
+ COPY_FILES:=$(COPY_FILES),\
+ HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers,\
+ ADD_JAVAC_FLAGS:=$(BUILD_JDK_SOURCEPATH)))
+
+##########################################################################################
+
+$(eval $(call SetupJavaCompilation,BUILD_SECURITY, \
+ SETUP := GENERATE_JDKBYTECODE, \
+ SRC := $(JDK_TOPDIR)/src/share/classes \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
+ $(MACOSX_SRC_DIRS) \
+ $(CLOSED_SRC_DIRS), \
+ INCLUDES := $(SECURITY_PKGS), \
+ EXCLUDES := $(EXCLUDES), \
+ EXCLUDE_FILES := $(EXFILES), \
+ BIN := $(JDK_OUTPUTDIR)/classes_security, \
+ HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers))
+
+$(BUILD_SECURITY): $(BUILD_JDK)
+
+##########################################################################################
+
+$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin:
+ $(MKDIR) -p $(@D)
+ $(TOUCH) $@
+
+##########################################################################################
+
+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))
+
+ $(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))
+
+$(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))
+
+ $(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))
+
+ $(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK)
+
+ 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))
+
+ $(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK)
+
+ endif
+ endif
+endif
+
+##########################################################################################
+
+all: $(BUILD_JDK) $(BUILD_SECURITY) $(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)
+
+.PHONY: all
diff --git a/jdk/make/CompileLaunchers.gmk b/jdk/make/CompileLaunchers.gmk
new file mode 100644
index 0000000..6935da8
--- /dev/null
+++ b/jdk/make/CompileLaunchers.gmk
@@ -0,0 +1,668 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include NativeCompilation.gmk
+
+# Setup the java compilers for the JDK build.
+include Setup.gmk
+
+# Prepare the find cache. Only used on windows.
+$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/share/bin))
+
+# Build tools
+include Tools.gmk
+
+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)
+else
+ ORIGIN_ROOT := /..
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
+else
+ ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
+endif
+
+#
+# Applications expect to be able to link against libjawt without invoking
+# 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))
+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.
+
+ $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 += -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
+
+ 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
+
+ # 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
+
+ ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), )
+ $1_MAPFILE := $(JDK_TOPDIR)/make/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))
+
+ BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
+
+ 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
+endef
+
+##########################################################################################
+
+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"
+else
+ 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))
+
+$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) $@
+
+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))
+endif
+
+
+ifndef BUILD_HEADLESS_ONLY
+ $(eval $(call SetupLauncher,appletviewer, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',, \
+ $(XLIBS)))
+endif
+
+$(eval $(call SetupLauncher,extcheck, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.extcheck.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,idlj, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.corba.se.idl.toJavaPortable.Compile"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,jar, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,jarsigner, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }'))
+
+$(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) }'))
+endif
+
+$(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, \
+ -DEXPAND_CLASSPATH_WILDCARDS \
+ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javah.Main"$(COMMA) }'))
+
+$(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, \
+ -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
+
+$(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, \
+ -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, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.hat.Main"$(COMMA) }'))
+
+$(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) }' \
+ -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
+ ,,,,,,,,,Info-privileged.plist))
+
+$(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) }' \
+ -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
+ ,,,,,,,,,Info-privileged.plist))
+
+$(eval $(call SetupLauncher,jps, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jps.Jps"$(COMMA) }'))
+
+$(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,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, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(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, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstat.Jstat"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,jstatd, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstatd.Jstatd"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,keytool, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.keytool.Main"$(COMMA) }'))
+
+$(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)))
+endif
+
+$(eval $(call SetupLauncher,rmic, \
+ -DEXPAND_CLASSPATH_WILDCARDS \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.rmic.Main"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,schemagen, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.jxc.SchemaGenerator"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,serialver, \
+ -DEXPAND_CLASSPATH_WILDCARDS \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.serialver.SerialVer"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,xjc, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.xjc.Driver"$(COMMA) }'))
+
+$(eval $(call SetupLauncher,wsgen, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsGen"$(COMMA) }'))
+
+$(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,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,pack200, \
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.java.util.jar.pack.Driver"$(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,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) }'))
+
+ $(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) }'))
+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
+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)
+
+endif
+
+ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+ UNPACKEXE_CFLAGS += -xregs=no%appl
+ UNPACKEXE_LDFLAGS_solaris += -xmemalign=4s
+endif
+
+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
+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)/make/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)
+endif
+
+ifneq ($(USE_EXTERNAL_LIBZ), true)
+
+ $(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS)
+
+endif
+
+# Build into object dir and copy executable afterwards to avoid .ilk file in
+# image. The real fix would be clean up linking of unpack200 using
+# -link -incremental:no
+# like all other launchers.
+$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE)
+ $(call install-file)
+
+BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX)
+
+##########################################################################################
+
+
+BUILD_JEXEC :=
+BUILD_JEXEC_SRC :=
+BUILD_JEXEC_INC :=
+BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
+
+#
+# UNHANDLED:
+# - COMPILE_APPROACH = normal
+#
+
+#
+# jdk/make/java/Makefile
+#
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+ BUILD_JEXEC := 1
+ endif
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_JEXEC := 1
+endif # OPENJDK_TARGET_OS
+
+#
+# jdk/make/java/jexec/Makefile
+#
+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), 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
+#
+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)
+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
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
+endif
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
+endif
+
+# TODO:
+# On windows java-rmi.cgi shouldn't be bundled since Java 1.2, but has been built all
+# this time anyway. Since jdk6, it has been built from the wrong source and resulted
+# in a (almost) copy of the standard java launcher named "java-rmi.exe" ending up in
+# 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)/make/java/main/java/mapfile-$(OPENJDK_TARGET_CPU))))
+else
+ $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh
+ $(call install-file)
+ $(CHMOD) a+x $@
+endif
+
+##########################################################################################
+
+BUILD_JSPAWNHELPER :=
+BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/solaris/native/java/lang
+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
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib
+endif
+
+ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+ 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))
+
+ $(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS)
+
+ BUILD_LAUNCHERS += $(BUILD_JSPAWNHELPER)
+endif
+
+##########################################################################################
+# jabswitch
+
+ifndef OPENJDK
+ 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))
+
+ BUILD_LAUNCHERS += $(BUILD_JABSWITCH)
+
+ endif
+endif
+
+##########################################################################################
+
+$(BUILD_LAUNCHERS): $(JDK_TOPDIR)/make/CompileLaunchers.gmk
+
+all: $(BUILD_LAUNCHERS)
+
+.PHONY: all
diff --git a/jdk/makefiles/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk
similarity index 100%
rename from jdk/makefiles/CompileNativeLibraries.gmk
rename to jdk/make/CompileNativeLibraries.gmk
diff --git a/jdk/makefiles/CopyFiles.gmk b/jdk/make/CopyFiles.gmk
similarity index 100%
rename from jdk/makefiles/CopyFiles.gmk
rename to jdk/make/CopyFiles.gmk
diff --git a/jdk/make/CopyIntoClasses.gmk b/jdk/make/CopyIntoClasses.gmk
new file mode 100644
index 0000000..c57cc1d
--- /dev/null
+++ b/jdk/make/CopyIntoClasses.gmk
@@ -0,0 +1,250 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Copy icu and _dict files used by the text break iterator
+
+COPY_PATTERNS = .icu _dict
+
+# Copy config files for com.sun.org.apache.xml.internal.security
+
+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
+
+# 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
+
+# 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
+
+# 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
+
+# Extra jvmstat files
+COPY_FILES += \
+ $(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)
+
+# Print resources
+PRINT_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/print/resources
+COPY_FILES += \
+ $(wildcard $(PRINT_RESOURCES_DIR)/*.png)
+
+# IDN resources
+COPY_FILES += \
+ $(JDK_TOPDIR)/src/share/classes/sun/net/idn/uidna.spp
+
+#
+# Swing plaf resources
+#
+SWING_PLAF_WINDOWS_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows
+COPY_FILES += \
+ $(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.gif) \
+ $(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.png)
+
+ifndef OPENJDK
+ SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/windows
+ # Filter out JavaCup32.png from OpenJDK
+ COPY_FILES := $(filter-out $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/JavaCup32.png, $(COPY_FILES))
+ # Alter JavaCup32.png from ClosedJDK
+ COPY_FILES += \
+ $(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png
+endif
+
+ifeq ($(ENABLE_JFR), true)
+ JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
+ COPY_FILES += \
+ $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
+endif
+
+SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic
+COPY_FILES += \
+ $(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png)
+
+ifndef OPENJDK
+ SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/javax/swing/plaf/basic
+ # Filter out JavaCup16.png from OpenJDK
+ COPY_FILES := $(filter-out $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/JavaCup16.png, $(COPY_FILES))
+ # Alter JavaCup16.png from ClosedJDK
+ COPY_FILES += \
+ $(SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED)/icons/JavaCup16.png
+endif
+
+ifdef OPENJDK
+ SWING_PLAF_MOTIF_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif
+ COPY_FILES += \
+ $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \
+ $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png)
+else
+ SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/motif
+ COPY_FILES += \
+ $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.gif) \
+ $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.png)
+endif
+
+SWING_PLAF_METAL_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/metal
+COPY_FILES += \
+ $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.gif) \
+ $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.png) \
+ $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.gif) \
+ $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.png) \
+ $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/sounds/*.wav)
+
+ifneq ($(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)
+endif
+# END: Swing plaf resources
+
+SWING_BEANINFO_RESOURCES_SRC_DIR = $(JDK_TOPDIR)/make/data/swingbeaninfo/images
+SWING_BEANINFO_RESOURCES_SRC = $(wildcard $(SWING_BEANINFO_RESOURCES_SRC_DIR)/*.gif)
+OUT_BEANINFO_RESOURCES = $(patsubst $(SWING_BEANINFO_RESOURCES_SRC_DIR)%, \
+ $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%, \
+ $(SWING_BEANINFO_RESOURCES_SRC))
+
+COPY_EXTRA += $(OUT_BEANINFO_RESOURCES)
+# END: Swing beaninfo resources
+
+# Swing text resources
+SWING_TEXT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/text
+COPY_FILES += \
+ $(SWING_TEXT_RESOURCEDIR)/html/default.css \
+ $(wildcard $(SWING_TEXT_RESOURCEDIR)/rtf/charsets/*.txt)
+
+##########################################################################################
+#
+# Copy the META-INF/services configuration files that are scattered around the source tree
+# into classes/META-INF/services. Be aware that META-INF directories that are located at a
+# source root (.../classes/META-INF) are automatically copied verbatim by the
+# SetupJavaCompilation macro.
+#
+# Any other META-INF/services configuration file is found here and platform specific comments
+# are uncommented and the configuration file is stored in the output META-INF directory.
+
+# Make sure the output directory is created.
+$(eval $(call MakeDir, $(JDK_OUTPUTDIR)/classes/META-INF/services))
+# Find all META-INF/services/* files
+ALL_META-INF_DIRS_share := $(shell $(FIND) $(JDK_TOPDIR)/src/share/classes -type d -a -name META-INF)
+ALL_META-INF_DIRS_targetapi := $(shell $(FIND) $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes -type d -a -name META-INF)
+# Platform specific overrides shared
+ifneq ($(ALL_META-INF_DIRS_targetapi), )
+ ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_targetapi) \
+ $(filter-out %$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes%,%,$(ALL_META-INF_DIRS_targetapi)), \
+ $(ALL_META-INF_DIRS_share))
+else
+ ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share)
+endif
+
+ifndef OPENJDK
+ ALL_META-INF_DIRS += $(JDK_TOPDIR)/src/closed/share/classes/sun/java2d/cmm/kcms/META-INF
+endif
+
+SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS)))
+
+ifdef OPENJDK
+ SRC_SERVICES_FILES := $(filter-out %sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES))
+ SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.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))
+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))
+# Exception handling for print services with no META-INF directory
+SRC_SERVICES_FILES_PRINT = $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/*)
+OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \
+ $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/%, %, \
+ $(SRC_SERVICES_FILES_PRINT)))
+OUT_SERVICES_FILES_PRINT_COLON = $(addsuffix :, $(OUT_SERVICES_FILES_PRINT))
+RULES_SERVICES_PRINT = $(join $(OUT_SERVICES_FILES_PRINT_COLON), $(SRC_SERVICES_FILES_PRINT))
+
+# Now setup the dependency rules to generate a META-INF/services/... from the correct source.
+META-INF_RULES_SERVICES := $(RULES_SERVICES_PRINT) $(join $(OUT_SERVICES_FILES_COLON), $(SRC_SERVICES_FILES))
+# Eval the newly created rules to incorporate them into the make tree.
+define addto_meta-inf_services
+ $1
+ echo $(LOG_INFO) Installing META-INF/services/$$(@F)
+ $(CAT) $$< | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $$@
+endef
+$(foreach i, $(META-INF_RULES_SERVICES), $(eval $(call addto_meta-inf_services, $i)))
+# Here is the generic rule, whose receipt the above rules will trigger.
+
+COPY_EXTRA += $(OUT_SERVICES_FILES)
+COPY_EXTRA += $(OUT_SERVICES_FILES_PRINT)
+
+###
+
+$(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
+
+###
+
+JAVAX_SOUND_SRC := $(JDK_TOPDIR)/src/share/classes/com/sun/media/sound/services
+
+JAVAX_SOUND_SRC_FILES := \
+ javax.sound.midi.spi.MidiDeviceProvider \
+ javax.sound.midi.spi.MidiFileReader \
+ javax.sound.midi.spi.MidiFileWriter \
+ javax.sound.midi.spi.SoundbankReader \
+ javax.sound.sampled.spi.AudioFileReader \
+ javax.sound.sampled.spi.AudioFileWriter \
+ javax.sound.sampled.spi.FormatConversionProvider \
+ javax.sound.sampled.spi.MixerProvider
+
+COPY_EXTRA += $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, $(JAVAX_SOUND_SRC_FILES))
+
+JAVAX_SOUND_RULES := $(foreach F, $(JAVAX_SOUND_SRC_FILES), $(JDK_OUTPUTDIR)/classes/META-INF/services/$(notdir $F):$(JAVAX_SOUND_SRC)/$F)
+
+$(foreach R, $(JAVAX_SOUND_RULES), $(eval $(call addto_meta-inf_services, $R)))
diff --git a/jdk/makefiles/CopySamples.gmk b/jdk/make/CopySamples.gmk
similarity index 100%
rename from jdk/makefiles/CopySamples.gmk
rename to jdk/make/CopySamples.gmk
diff --git a/jdk/make/CreateJars.gmk b/jdk/make/CreateJars.gmk
new file mode 100644
index 0000000..1c02063
--- /dev/null
+++ b/jdk/make/CreateJars.gmk
@@ -0,0 +1,786 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+include Setup.gmk
+
+default: all
+
+# Prepare the find cache. Only used if running on windows.
+$(eval $(call FillCacheFind, $(JDK_OUTPUTDIR)/classes))
+
+include Tools.gmk
+
+include Profiles.gmk
+
+#
+# This makefile...so that altering will trigger rebuilding include/exclude-lists => jars
+#
+MAKEFILE = $(JDK_TOPDIR)/make/CreateJars.gmk
+#
+# And similarly for the Profiles
+PROFILE_MAKEFILES = $(JDK_TOPDIR)/make/Profiles.gmk $(JDK_TOPDIR)/make/profile-rtjar-includes.txt
+
+MAINMANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf
+BEANMANIFEST := $(JDK_TOPDIR)/make/data/swingbeaninfo/manifest.mf
+
+$(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/lib))
+
+##########################################################################################
+
+$(eval $(call SetupArchive,BUILD_JCONSOLE_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes, \
+ SUFFIXES := .class .gif .png .properties, \
+ INCLUDES := sun/tools/jconsole com/sun/tools/jconsole, \
+ JARMAIN := sun.tools.jconsole.JConsole, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/jconsole.jar, \
+ SKIP_METAINF := true))
+
+
+##########################################################################################
+
+$(eval $(call SetupArchive,BUILD_DNS_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes, \
+ INCLUDES := sun/net/spi/nameservice/dns, \
+ EXTRA_FILES := META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar, \
+ SKIP_METAINF := true))
+
+
+##########################################################################################
+
+LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \
+ iw ja ko lt lv mk ms mt nl no pl pt ro ru sk sl sq sr sv \
+ th tr uk vi zh
+
+LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/, $(LOCALEDATA_INCLUDE_LOCALES)) \
+ $(addprefix sun/util/resources/, $(LOCALEDATA_INCLUDE_LOCALES))
+
+$(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes, \
+ SUFFIXES := .class _dict _th, \
+ INCLUDES := $(LOCALEDATA_INCLUDES), \
+ EXCLUDES := sun/text/resources/th/BreakIteratorRules_th.class, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar, \
+ SKIP_METAINF := true))
+
+##########################################################################################
+#
+# Different variants of rt.jar are built based on the current profile. The output
+# directory is augmented with the profile name so that the final jar file and all the
+# intermediary list files will be in directory. This has the form lib$PROFILE rather than
+# lib/$PROFILE so that it won't get copied as part of the image generation process.
+# Each profile customizes the RT_JAR_EXCLUDES variable.
+#
+##########################################################################################
+
+# Full JRE exclude list for rt.jar and resources.jar
+# This value should exclude types destined for jars other than rt.jar and resources.jar.
+# When building a Profile this value augments the profile specific exclusions
+RT_JAR_EXCLUDES += \
+ com/sun/codemodel \
+ com/sun/crypto/provider \
+ com/sun/istack/internal/tools \
+ com/sun/jarsigner \
+ com/sun/java/accessibility \
+ com/sun/javadoc \
+ com/sun/jdi \
+ com/sun/net/ssl/internal/ssl \
+ com/sun/source \
+ com/sun/tools \
+ com/sun/xml/internal/dtdparser \
+ com/sun/xml/internal/rngom \
+ com/sun/xml/internal/xsom \
+ javax/crypto \
+ javax/swing/AbstractButtonBeanInfo.class \
+ javax/swing/beaninfo \
+ javax/swing/BoxBeanInfo.class \
+ javax/swing/JAppletBeanInfo.class \
+ javax/swing/JButtonBeanInfo.class \
+ javax/swing/JCheckBoxBeanInfo.class \
+ javax/swing/JCheckBoxMenuItemBeanInfo.class \
+ javax/swing/JColorChooserBeanInfo.class \
+ javax/swing/JComboBoxBeanInfo.class \
+ javax/swing/JComponentBeanInfo.class \
+ javax/swing/JDesktopPaneBeanInfo.class \
+ javax/swing/JDialogBeanInfo.class \
+ javax/swing/JEditorPaneBeanInfo.class \
+ javax/swing/JFileChooserBeanInfo.class \
+ javax/swing/JFormattedTextFieldBeanInfo.class \
+ javax/swing/JFrameBeanInfo.class \
+ javax/swing/JInternalFrameBeanInfo.class \
+ javax/swing/JLabelBeanInfo.class \
+ javax/swing/JLayeredPaneBeanInfo.class \
+ javax/swing/JListBeanInfo.class \
+ javax/swing/JMenuBarBeanInfo.class \
+ javax/swing/JMenuBeanInfo.class \
+ javax/swing/JMenuItemBeanInfo.class \
+ javax/swing/JOptionPaneBeanInfo.class \
+ javax/swing/JPanelBeanInfo.class \
+ javax/swing/JPasswordFieldBeanInfo.class \
+ javax/swing/JPopupMenuBeanInfo.class \
+ javax/swing/JProgressBarBeanInfo.class \
+ javax/swing/JRadioButtonBeanInfo.class \
+ javax/swing/JRadioButtonMenuItemBeanInfo.class \
+ javax/swing/JScrollBarBeanInfo.class \
+ javax/swing/JScrollPaneBeanInfo.class \
+ javax/swing/JSeparatorBeanInfo.class \
+ javax/swing/JSliderBeanInfo.class \
+ javax/swing/JSpinnerBeanInfo.class \
+ javax/swing/JSplitPaneBeanInfo.class \
+ javax/swing/JTabbedPaneBeanInfo.class \
+ javax/swing/JTableBeanInfo.class \
+ javax/swing/JTextAreaBeanInfo.class \
+ javax/swing/JTextFieldBeanInfo.class \
+ javax/swing/JTextPaneBeanInfo.class \
+ javax/swing/JToggleButtonBeanInfo.class \
+ javax/swing/JToolBarBeanInfo.class \
+ javax/swing/JTreeBeanInfo.class \
+ javax/swing/JWindowBeanInfo.class \
+ javax/swing/SwingBeanInfoBase.class \
+ javax/swing/text/JTextComponentBeanInfo.class \
+ META-INF/services/com.sun.jdi.connect.Connector \
+ META-INF/services/com.sun.jdi.connect.spi.TransportService \
+ META-INF/services/com.sun.tools.attach.spi.AttachProvider \
+ META-INF/services/com.sun.tools.xjc.Plugin \
+ META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \
+ org/relaxng/datatype \
+ sun/awt/HKSCS.class \
+ sun/awt/motif/X11GB2312.class \
+ sun/awt/motif/X11GB2312\$$$$Decoder.class \
+ sun/awt/motif/X11GB2312\$$$$Encoder.class \
+ sun/awt/motif/X11GBK.class \
+ sun/awt/motif/X11GBK\$$$$Encoder.class \
+ sun/awt/motif/X11KSC5601.class \
+ sun/awt/motif/X11KSC5601\$$$$Decoder.class \
+ sun/awt/motif/X11KSC5601\$$$$Encoder.class \
+ sun/jvmstat \
+ sun/net/spi/nameservice/dns \
+ sun/nio/cs/ext \
+ sun/rmi/rmic \
+ sun/security/ec \
+ sun/security/internal \
+ sun/security/mscapi \
+ sun/security/pkcs11 \
+ sun/security/provider/Sun.class \
+ sun/security/rsa/SunRsaSign.class \
+ sun/security/ssl \
+ sun/security/tools/jarsigner \
+ sun/swing/BeanInfoUtils.class \
+ sun/text/resources/cldr \
+ sun/tools/asm \
+ sun/tools/attach \
+ sun/tools/java \
+ sun/tools/javac \
+ sun/tools/jcmd \
+ sun/tools/jconsole \
+ sun/tools/jinfo \
+ sun/tools/jmap \
+ sun/tools/jps \
+ sun/tools/jstack \
+ sun/tools/jstat \
+ sun/tools/jstatd \
+ sun/tools/native2ascii \
+ sun/tools/serialver \
+ sun/tools/tree \
+ sun/tools/util \
+ sun/util/cldr/CLDRLocaleDataMetaInfo.class \
+ sun/util/resources/cldr \
+ $(LOCALEDATA_INCLUDES) \
+ com/oracle/jrockit/jfr \
+ oracle/jrockit/jfr \
+ jdk/jfr
+
+# Find all files in the classes dir to use as dependencies. This could be more fine granular.
+ALL_FILES_IN_CLASSES := $(call not-containing, _the., $(filter-out %javac_state, \
+ $(call CacheFind, $(JDK_OUTPUTDIR)/classes)))
+
+RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar_manifest
+RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar_manifest
+
+$(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
+ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
+ $(MAINMANIFEST) >> $@.tmp
+ $(ECHO) >> $@.tmp
+ $(CAT) $(BEANMANIFEST) >> $@.tmp
+ $(MV) $@.tmp $@
+
+$(RESOURCE_JAR_MANIFEST_FILE): $(MAINMANIFEST)
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
+ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
+ $(MAINMANIFEST) >> $@.tmp
+ $(MV) $@.tmp $@
+
+$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude: $(MAKEFILE) $(PROFILE_MAKEFILES)
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp)
+ $(MV) $@.tmp $@
+
+$(IMAGES_OUTPUTDIR)/lib/classlist: $(JDK_TOPDIR)/make/data/classlist/classlist.$(OPENJDK_TARGET_OS) \
+ $(MAKEFILE)
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(TOOL_ADDJSUM) $< $@.tmp
+ $(MV) $@.tmp $@
+
+$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude \
+ $(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ ($(CD) $(JDK_OUTPUTDIR)/classes && \
+ $(TOOL_JARREORDER) \
+ -o $@.tmp $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude . )
+ $(MV) $@.tmp $@
+
+$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
+ ifneq ($(PROFILE), )
+ # # Add back classes from excluded packages (fixing the $ substitution in the process)
+ for type in $(subst \$$,\, $(RT_JAR_INCLUDE_TYPES)) ; do \
+ $(ECHO) $$type >> $@.tmp ; \
+ done
+ endif
+ $(MV) $@.tmp $@
+
+$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(GREP) -v -e '\.class$$' \
+ -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
+ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
+ ifneq ($(PROFILE), )
+ # # Strip out all META-INF/services/ entries
+ $(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2
+ # # Add back the required services
+ # # FIXME: On Solaris if PROFILE_INCLUDE_METAINF_SERVICES is not defined
+ # # we get a syntax error from sh. That doesn't happen on linux
+ for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \
+ $(ECHO) $$service >> $@.tmp2; \
+ done
+ $(MV) $@.tmp2 $@.tmp
+ endif
+ $(MV) $@.tmp $@
+
+# This is a hack but I don't know how to make this fit into the existing scheme
+$(PROFILE_VERSION_CLASS_TARGETS): $(PROFILE_VERSION_JAVA_TARGETS)
+ @$(JAVAC) -d $(@D)/../../ $(@D)/$(VERSION_JAVA_FILE)
+
+
+# Support for removing the addPropertyChangeListener and removePropertyChangeListener
+# methods from classes that only go into the profile builds.
+BEANLESS_CLASSES = $(IMAGES_OUTPUTDIR)/beanless
+
+# When there are $ characters in filenames we have some very subtle interactions between
+# make expansion and shell expansion. In this particular case $< will contain a single $ while
+# $@ will contain \$. So we have to pass $< in single-quotes to avoid shell expansion
+$(BEANLESS_CLASSES)/%: $(JDK_OUTPUTDIR)/classes/%
+ $(MKDIR) -p $(@D)
+ $(TOOL_REMOVEMETHODS) '$<' $@ addPropertyChangeListener removePropertyChangeListener
+
+CLASSES_TO_DEBEAN = \
+ java/util/logging/LogManager.class \
+ java/util/jar/Pack200\$$Packer.class \
+ java/util/jar/Pack200\$$Unpacker.class \
+ com/sun/java/util/jar/pack/PackerImpl.class \
+ com/sun/java/util/jar/pack/UnpackerImpl.class
+
+ifneq ($(PROFILE), )
+ BEANLESS_CLASSES_TARGETS := $(addprefix $(BEANLESS_CLASSES)/, $(CLASSES_TO_DEBEAN))
+endif
+
+
+RT_JAR_CREATE_OPTIONS := c0fm
+RT_JAR_UPDATE_OPTIONS := u0f
+ifeq ($(COMPRESS_JARS), true)
+ RT_JAR_CREATE_OPTIONS := cfm
+ RT_JAR_UPDATE_OPTIONS := uf
+endif
+
+# This defines a target-specific variables to make the shell logic easier to see.
+# We need to find the Version.class file for the profile currently being built
+$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: \
+ CLASS_FILE = $(if $(PROFILE), $(strip $(foreach class, $(PROFILE_VERSION_CLASS_TARGETS), $(if $(findstring $(PROFILE), $(class)), $(class)))), NO_SUCH_FILE)
+# This is the real target
+$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE) $(PROFILE_VERSION_CLASS_TARGETS) $(BEANLESS_CLASSES_TARGETS)
+ $(ECHO) Creating rt.jar $(PROFILE) Compressed=$(COMPRESS_JARS)
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(CD) $(JDK_OUTPUTDIR)/classes && \
+ $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \
+ @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents && \
+ if [ -f $(CLASS_FILE) ]; then \
+ $(ECHO) Updating rt.jar $(PROFILE) && \
+ $(CD) $(patsubst %$(VERSION_CLASS_PATH), %, $(CLASS_FILE)) && \
+ $(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(VERSION_CLASS_PATH); \
+ $(CD) $(BEANLESS_CLASSES) && \
+ $(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(CLASSES_TO_DEBEAN); \
+ fi
+ $(MV) $@.tmp $@
+
+$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents \
+ $(RESOURCE_JAR_MANIFEST_FILE)
+ $(ECHO) Creating resources.jar
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(CD) $(JDK_OUTPUTDIR)/classes && \
+ $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \
+ @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents
+ $(MV) $@.tmp $@
+
+##########################################################################################
+
+ifneq ($(OPENJDK_TARGET_OS), windows)
+ CHARSETS_EXTRA_FILES := sun/awt/motif/X11GBK.class \
+ sun/awt/motif/X11GB2312\$$$$Decoder.class \
+ sun/awt/motif/X11GB2312.class \
+ sun/awt/motif/X11KSC5601\$$$$Decoder.class \
+ sun/awt/motif/X11KSC5601\$$$$Encoder.class \
+ sun/awt/motif/X11GB2312\$$$$Encoder.class \
+ sun/awt/motif/X11GBK\$$$$Encoder.class \
+ sun/awt/motif/X11KSC5601.class
+endif
+
+$(eval $(call SetupArchive,BUILD_CHARSETS_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes, \
+ SUFFIXES := .class .dat, \
+ INCLUDES := sun/nio/cs/ext, \
+ EXTRA_FILES := sun/awt/HKSCS.class \
+ $(CHARSETS_EXTRA_FILES), \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/charsets.jar, \
+ SKIP_METAINF := true, \
+ CHECK_COMPRESS_JAR := true))
+
+##########################################################################################
+
+ifndef OPENJDK
+ ifeq ($(ENABLE_JFR), true)
+ $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes, \
+ SUFFIXES := .class .jfc .xsd, \
+ INCLUDES := com/oracle/jrockit/jfr \
+ oracle/jrockit/jfr \
+ jdk/jfr, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/jfr.jar, \
+ SKIP_METAINF := true, \
+ MANIFEST := $(MAINMANIFEST), \
+ CHECK_COMPRESS_JAR := true))
+
+ endif
+endif
+
+##########################################################################################
+
+$(eval $(call SetupArchive,BUILD_JSSE_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes, \
+ INCLUDES := sun/security/provider/Sun.class \
+ sun/security/rsa/SunRsaSign.class \
+ sun/security/ssl \
+ com/sun/net/ssl/internal/ssl, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/jsse.jar, \
+ SKIP_METAINF := true, \
+ MANIFEST := $(MAINMANIFEST), \
+ CHECK_COMPRESS_JAR := true))
+
+##########################################################################################
+
+$(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes, \
+ SUFFIXES := BeanInfo.class .gif, \
+ INCLUDES := javax/swing sun/swing, \
+ EXCLUDES := javax/swing/plaf, \
+ EXTRA_FILES := javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/dt.jar, \
+ SKIP_METAINF := true))
+
+##########################################################################################
+
+# Get the CLDRVERSION
+include gensrc/GensrcCLDR.gmk
+
+CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar
+
+$(eval $(call SetupArchive,BUILD_CLDRDATA_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes, \
+ SUFFIXES := .class, \
+ INCLUDES := sun/text/resources/cldr \
+ sun/util/cldr \
+ sun/util/resources/cldr, \
+ EXCLUDES := sun/util/cldr/CLDRLocaleProviderAdapter, \
+ JAR := $(CLDRDATA_JAR_DST), \
+ EXTRA_MANIFEST_ATTR := CLDR-Version: $(CLDRVERSION), \
+ SKIP_METAINF := true))
+
+##########################################################################################
+
+TOOLS_JAR_INCLUDES := \
+ com/sun/codemodel \
+ com/sun/istack/internal/tools \
+ com/sun/jarsigner \
+ com/sun/javadoc \
+ com/sun/jdi \
+ com/sun/source \
+ com/sun/tools/attach \
+ com/sun/tools/classfile \
+ com/sun/tools/corba \
+ com/sun/tools/doclets \
+ com/sun/tools/doclint \
+ com/sun/tools/example/debug/expr \
+ com/sun/tools/example/debug/tty \
+ com/sun/tools/extcheck \
+ com/sun/tools/hat \
+ com/sun/tools/internal/jxc \
+ com/sun/tools/internal/jxc/ap \
+ com/sun/tools/internal/ws \
+ com/sun/tools/internal/ws/wscompile/plugin/at_generated \
+ com/sun/tools/internal/xjc \
+ com/sun/tools/javac \
+ com/sun/tools/javadoc \
+ com/sun/tools/javah \
+ com/sun/tools/javap \
+ com/sun/tools/jdeps \
+ com/sun/tools/jdi \
+ com/sun/tools/script/shell \
+ com/sun/xml/internal/dtdparser \
+ com/sun/xml/internal/rngom \
+ com/sun/xml/internal/xsom \
+ org/relaxng/datatype \
+ sun/applet \
+ sun/jvmstat \
+ sun/rmi/rmic \
+ sun/security/tools/jarsigner \
+ sun/tools/asm \
+ sun/tools/attach \
+ sun/tools/jar \
+ sun/tools/java \
+ sun/tools/javac \
+ sun/tools/jcmd \
+ sun/tools/jinfo \
+ sun/tools/jmap \
+ sun/tools/jps \
+ sun/tools/jstack \
+ sun/tools/jstat \
+ sun/tools/jstatd \
+ sun/tools/native2ascii \
+ sun/tools/serialver \
+ sun/tools/tree \
+ sun/tools/util
+
+# The sjavac tools is not ready for public consumption.
+TOOLS_JAR_EXCLUDES = com/sun/tools/sjavac
+
+$(eval $(call SetupArchive,BUILD_TOOLS_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes, \
+ SUFFIXES := .class .prp .gif .properties .xml .css .xsd .js .html .txt .java \
+ Tool aliasmap options, \
+ INCLUDES := $(TOOLS_JAR_INCLUDES), \
+ EXCLUDES := $(TOOLS_JAR_EXCLUDES), \
+ EXTRA_FILES := META-INF/services/com.sun.jdi.connect.Connector \
+ META-INF/services/com.sun.jdi.connect.spi.TransportService \
+ META-INF/services/com.sun.tools.attach.spi.AttachProvider \
+ META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
+ META-INF/services/com.sun.tools.internal.xjc.Plugin, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/tools.jar, \
+ SKIP_METAINF := true, \
+ CHECK_COMPRESS_JAR := true))
+
+
+##########################################################################################
+
+include CORE_PKGS.gmk
+include NON_CORE_PKGS.gmk
+
+# The compiler should not issue a "Proprietary" warning when compiling
+# classes in the com.sun.java.swing.plaf packages, since we've always
+# allowed, and even advocated, extending them (see bug 6476749).
+#
+# This approach is NOT to be used as a general purpose way to avoid such
+# compiler warnings for non-core packages. The correct way is to document
+# the packages in NON_CORE_PKGS.gmk, and include them in the NON_CORE_PKGS
+# definition.
+#
+# Swing has taken this approach only as a temporary measure to avoid
+# the compiler warnings until we can properly document these packages.
+# This is covered under 6491853.
+EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \
+ com.sun.java.swing.plaf.motif \
+ com.sun.java.swing.plaf.gtk
+
+#
+# Include the exported private packages in ct.sym.
+# This is an interim solution until the ct.sym is replaced
+# with a new module system (being discussed for JDK 8).
+#
+EXPORTED_PRIVATE_PKGS = com.oracle.net \
+ com.oracle.nio
+
+$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar
+ $(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
+ $(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
+ $(JAVA) $(NEW_JAVAC) \
+ -bootclasspath $(JDK_OUTPUTDIR)/classes \
+ -XDprocess.packages -proc:only \
+ -processor com.sun.tools.javac.sym.CreateSymbols \
+ -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \
+ -Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
+ -Acom.sun.tools.javac.sym.Profiles=profile-rtjar-includes.txt \
+ $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
+ $(TOUCH) $@
+
+$(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/symbols))
+$(eval $(call SetupArchive,BUILD_CT_SYM, $(IMAGES_OUTPUTDIR)/symbols/_the.symbols, \
+ SRCS := $(IMAGES_OUTPUTDIR)/symbols, \
+ INCLUDES := META-INF/sym, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/ct.sym, \
+ CHECK_COMPRESS_JAR := true))
+
+
+##########################################################################################
+
+SRC_ZIP_INCLUDES = \
+ com/sun/corba \
+ com/sun/image/codec/jpeg \
+ com/sun/imageio \
+ com/sun/java_cup \
+ com/sun/javadoc \
+ com/sun/java/swing \
+ com/sun/jmx \
+ com/sun/naming \
+ com/sun/org/apache \
+ com/sun/security/auth \
+ com/sun/security/jgss \
+ com/sun/source \
+ java \
+ javax/accessibility \
+ javax/annotation \
+ javax/imageio \
+ javax/lang \
+ javax/management \
+ javax/naming \
+ javax/print \
+ javax/rmi \
+ javax/script \
+ javax/security \
+ javax/sound \
+ javax/sql \
+ javax/swing \
+ javax/tools \
+ javax/xml \
+ org/ietf \
+ org/omg \
+ org/w3c/dom \
+ org/xml/sax \
+ #
+
+SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
+SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
+SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/impsrc
+SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gendocsrc_rmic
+ifndef OPENJDK
+ SRC_ZIP_SRCS += $(JDK_TOPDIR)/src/closed/share/classes
+endif
+
+# Need to copy launcher src files into desired directory structure
+# before zipping the sources.
+LAUNCHER_SRC_FILES := $(wildcard $(JDK_TOPDIR)/src/share/bin/*) \
+ $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/java_md*)
+LAUNCHER_ZIP_SRC := $(patsubst $(JDK_TOPDIR)/src/share/bin/%, $(IMAGES_OUTPUTDIR)/src/launcher/%, \
+ $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%, $(IMAGES_OUTPUTDIR)/src/launcher/%, \
+ $(LAUNCHER_SRC_FILES)))
+
+$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/share/bin/%
+ $(install-file)
+
+$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%
+ $(install-file)
+
+$(IMAGES_OUTPUTDIR)/src.zip: $(LAUNCHER_ZIP_SRC)
+
+# This dir needs to exist before macro is evaluated to avoid warning from find.
+$(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/src))
+$(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
+ SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
+ INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
+ EXCLUDES := javax/swing/beaninfo, \
+ SUFFIXES := .java .c .h, \
+ ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
+ EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
+
+##########################################################################################
+
+ifndef OPENJDK
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+
+ $(eval $(call SetupArchive,BUILD_JACCESS_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes, \
+ INCLUDES := com/sun/java/accessibility/util, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar, \
+ SKIP_METAINF := true))
+
+ JARS += $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar
+
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes_ab/32bit, \
+ INCLUDES := com/sun/java/accessibility, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar, \
+ SKIP_METAINF := true))
+
+ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_LEGACY_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes_ab/legacy, \
+ INCLUDES := com/sun/java/accessibility, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar, \
+ SKIP_METAINF := true))
+
+ JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar \
+ $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar
+ else
+ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_64_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes_ab/64bit, \
+ INCLUDES := com/sun/java/accessibility, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar, \
+ SKIP_METAINF := true))
+
+ JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar
+ endif
+ endif
+endif
+
+##########################################################################################
+
+#
+# This is an empty jar (only contains manifest) and fits poorly into framework...
+# create simple rule instead
+#
+$(IMAGES_OUTPUTDIR)/lib/management-agent.jar: $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
+ $(JAR) cfm $@ $<
+
+##########################################################################################
+
+$(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar: $(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar
+ $(install-file)
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ $(eval $(call SetupArchive,BUILD_JOBJC_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/jobjc_classes, \
+ JAR := $(IMAGES_OUTPUTDIR)/lib/JObjC.jar, \
+ JARINDEX := true))
+endif
+
+# This file is imported from hotspot in Import.gmk. Copying it into images/lib so that
+# all jars can be found in one place when creating images in Images.gmk. It needs to be
+# done here so that clean targets can be simple and accurate.
+$(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar
+ $(install-file)
+
+##########################################################################################
+#
+# sec-bin.zip is used by builds where the corresponding sources are not available
+#
+$(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \
+ SRC := $(JDK_OUTPUTDIR), \
+ INCLUDES := classes/javax/net \
+ classes/javax/security/cert \
+ classes/com/sun/net/ssl \
+ classes/com/sun/security/cert \
+ classes/sun/net/www/protocol/https \
+ classes/sun/security/pkcs12 \
+ classes/sun/security/ssl \
+ classes/sun/security/krb5 \
+ classes/sun/security/krb5/internal \
+ classes/sun/security/krb5/internal/ccache \
+ classes/sun/security/krb5/internal/crypto \
+ classes/sun/security/krb5/internal/ktab \
+ classes/sun/security/krb5/internal/rcache \
+ classes/sun/security/krb5/internal/util, \
+ INCLUDE_FILES := classes/sun/security/jgss/spi/GSSContextSpi.class, \
+ EXCLUDES := classes/sun/security/krb5/internal/tools, \
+ ZIP := $(IMAGES_OUTPUTDIR)/sec-bin.zip))
+
+JARS += $(IMAGES_OUTPUTDIR)/sec-bin.zip
+
+##########################################################################################
+#
+# Windows specific binary security packages.
+#
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ # sec-windows-bin.zip is used by builds where the corresponding sources are not available
+ $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP, \
+ SRC := $(JDK_OUTPUTDIR), \
+ INCLUDES := classes/sun/security/krb5/internal/tools, \
+ ZIP := $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip))
+
+ JARS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip
+
+ # JGSS files contain the native Kerberos library
+ ifeq ($(OPENJDK_TARGET_CPU), x86_64)
+ JGSS_ZIP_NAME = jgss-windows-x64-bin.zip
+ else
+ JGSS_ZIP_NAME = jgss-windows-i586-bin.zip
+ endif
+
+ $(eval $(call SetupZipArchive,BUILD_JGSS_BIN_ZIP, \
+ SRC := $(JDK_OUTPUTDIR), \
+ INCLUDE_FILES := bin/w2k_lsa_auth.dll \
+ bin/w2k_lsa_auth.map \
+ bin/w2k_lsa_auth.pdb, \
+ ZIP := $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)))
+
+ JARS += $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)
+endif
+
+##########################################################################################
+
+# This rule copies all jars from jdk/lib/... to images/lib/... to avoid having to track
+# which jars are where
+$(IMAGES_OUTPUTDIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
+ $(install-file)
+
+##########################################################################################
+
+# Import nashorn.jar from nashorn dist dir.
+$(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar: $(NASHORN_DIST)/nashorn.jar
+ $(install-file)
+
+##########################################################################################
+
+-include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
+
+##########################################################################################
+
+all: $(JARS)
+
+.PHONY: default all
diff --git a/jdk/make/CreateSecurityJars.gmk b/jdk/make/CreateSecurityJars.gmk
new file mode 100644
index 0000000..337ea5f
--- /dev/null
+++ b/jdk/make/CreateSecurityJars.gmk
@@ -0,0 +1,329 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+include Setup.gmk
+
+# The jars created in this file are required for the exploded jdk image to function and
+# cannot wait to be built in the images target.
+
+##########################################################################################
+# Create manifest for security jars
+#
+# Include these extra attributes for now, should probably take out.
+#
+MAINMANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf
+JCE_MANIFEST := $(JDK_OUTPUTDIR)/lib/_the.security.manifest.mf
+
+$(JCE_MANIFEST): $(MAINMANIFEST)
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(SED) -e "s#@@RELEASE@@#$(JDK_VERSION)#" \
+ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
+ $(MAINMANIFEST) >> $@.tmp
+ $(ECHO) "Extension-Name: javax.crypto" >> $@.tmp
+ $(ECHO) "Implementation-Vendor-Id: com.sun" >> $@.tmp
+ $(MV) $@.tmp $@
+
+##########################################################################################
+# For security and crypto jars, always build the jar, but for closed, install the prebuilt
+# signed version instead of the newly built jar. Unsigned jars are treated as intermediate
+# targets and explicitly added to the JARS list. For open, signing is not needed. See
+# SignJars.gmk for more information.
+#
+# The source for the crypto jars is not available for all licensees. The BUILD_CRYPTO
+# variable is set to no if these jars can't be built to skip that step of the build.
+# Note that for OPENJDK, the build will fail if BUILD_CRYPTO=no since then there is no
+# other way to get the jars than to build them.
+
+SUNPKCS11_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunpkcs11.jar
+SUNPKCS11_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/sunpkcs11.jar
+
+$(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes_security, \
+ SUFFIXES := .class, \
+ INCLUDES := sun/security/pkcs11, \
+ JAR := $(SUNPKCS11_JAR_UNSIGNED), \
+ MANIFEST := $(JCE_MANIFEST), \
+ SKIP_METAINF := true))
+
+$(SUNPKCS11_JAR_UNSIGNED): $(JCE_MANIFEST)
+
+ifndef OPENJDK
+ SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar
+ $(SUNPKCS11_JAR_DST): $(SUNPKCS11_JAR_SRC)
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunPKCS11 provider..."
+ $(install-file)
+else
+ $(SUNPKCS11_JAR_DST): $(SUNPKCS11_JAR_UNSIGNED)
+ $(install-file)
+endif
+
+JARS += $(SUNPKCS11_JAR_UNSIGNED) $(SUNPKCS11_JAR_DST)
+
+##########################################################################################
+
+SUNEC_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunec.jar
+SUNEC_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/sunec.jar
+
+$(eval $(call SetupArchive,BUILD_SUNEC_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes_security, \
+ SUFFIXES := .class, \
+ INCLUDES := sun/security/ec, \
+ JAR := $(SUNEC_JAR_UNSIGNED), \
+ MANIFEST := $(JCE_MANIFEST), \
+ SKIP_METAINF := true))
+
+$(SUNEC_JAR_UNSIGNED): $(JCE_MANIFEST)
+
+ifndef OPENJDK
+ SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar
+ $(SUNEC_JAR_DST): $(SUNEC_JAR_SRC)
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunEC provider..."
+ $(install-file)
+else
+ $(SUNEC_JAR_DST): $(SUNEC_JAR_UNSIGNED)
+ $(install-file)
+endif
+
+JARS += $(SUNEC_JAR_UNSIGNED) $(SUNEC_JAR_DST)
+
+##########################################################################################
+
+SUNJCE_PROVIDER_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunjce_provider.jar
+SUNJCE_PROVIDER_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/sunjce_provider.jar
+
+ifneq ($(BUILD_CRYPTO), no)
+ $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes_security, \
+ SUFFIXES := .class, \
+ INCLUDES := com/sun/crypto/provider, \
+ JAR := $(SUNJCE_PROVIDER_JAR_UNSIGNED), \
+ MANIFEST := $(JCE_MANIFEST), \
+ SKIP_METAINF := true))
+
+ $(SUNJCE_PROVIDER_JAR_UNSIGNED): $(JCE_MANIFEST)
+
+ JARS += $(SUNJCE_PROVIDER_JAR_UNSIGNED)
+endif
+
+ifndef OPENJDK
+ SUNJCE_PROVIDER_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/sunjce_provider.jar
+ $(SUNJCE_PROVIDER_JAR_DST): $(SUNJCE_PROVIDER_JAR_SRC)
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunJCE provider..."
+ $(install-file)
+else
+ $(SUNJCE_PROVIDER_JAR_DST): $(SUNJCE_PROVIDER_JAR_UNSIGNED)
+ $(install-file)
+endif
+
+JARS += $(SUNJCE_PROVIDER_JAR_DST)
+
+##########################################################################################
+
+JCE_JAR_DST := $(JDK_OUTPUTDIR)/lib/jce.jar
+JCE_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/jce.jar
+
+ifneq ($(BUILD_CRYPTO), no)
+ $(eval $(call SetupArchive,BUILD_JCE_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes_security, \
+ SUFFIXES := .class, \
+ INCLUDES := javax/crypto sun/security/internal, \
+ JAR := $(JCE_JAR_UNSIGNED), \
+ MANIFEST := $(JCE_MANIFEST), \
+ SKIP_METAINF := true))
+
+ $(JCE_JAR_UNSIGNED): $(JCE_MANIFEST)
+
+ JARS += $(JCE_JAR_UNSIGNED)
+endif
+
+ifndef OPENJDK
+ JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar
+ $(JCE_JAR_DST): $(JCE_JAR_SRC)
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt jce.jar..."
+ $(install-file)
+else
+ $(JCE_JAR_DST): $(JCE_JAR_UNSIGNED)
+ $(install-file)
+endif
+
+JARS += $(JCE_JAR_DST)
+
+##########################################################################################
+
+US_EXPORT_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar
+US_EXPORT_POLICY_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/US_export_policy.jar
+
+ifneq ($(BUILD_CRYPTO), no)
+ #
+ # TODO fix so that SetupArchive does not write files into SRCS
+ # then we don't need this extra copying
+ #
+ # NOTE: We currently do not place restrictions on our limited export
+ # policy. This was not a typo.
+ #
+ US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited
+ US_EXPORT_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/US_export_policy_jar.tmp
+
+ $(US_EXPORT_POLICY_JAR_TMP)/%: $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
+ $(install-file)
+
+ US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy
+
+ $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR, $(US_EXPORT_POLICY_JAR_DEPS), \
+ SRCS := $(US_EXPORT_POLICY_JAR_TMP), \
+ SUFFIXES := .policy, \
+ JAR := $(US_EXPORT_POLICY_JAR_UNSIGNED), \
+ EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \
+ SKIP_METAINF := true))
+
+ JARS += $(US_EXPORT_POLICY_JAR_UNSIGNED)
+endif
+
+ifndef OPENJDK
+ $(US_EXPORT_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar
+ $(ECHO) $(LOG_INFO) Copying $(@F)
+ $(install-file)
+else
+ $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_UNSIGNED)
+ $(install-file)
+endif
+
+JARS += $(US_EXPORT_POLICY_JAR_DST)
+
+##########################################################################################
+
+LOCAL_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/local_policy.jar
+LOCAL_POLICY_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/local_policy.jar
+
+ifneq ($(BUILD_CRYPTO), no)
+ #
+ # TODO fix so that SetupArchive does not write files into SRCS
+ # then we don't need this extra copying
+ #
+ LOCAL_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/local_policy_jar.tmp
+
+ ifeq ($(UNLIMITED_CRYPTO), true)
+ LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited
+ LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/default_local.policy
+ LOCAL_POLICY_JAR_ATTR := Crypto-Strength: unlimited
+ else
+ LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/data/cryptopolicy/limited
+ LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \
+ $(LOCAL_POLICY_JAR_TMP)/default_local.policy
+ LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited
+ endif
+
+ $(LOCAL_POLICY_JAR_TMP)/%: $(LOCAL_POLICY_JAR_SRC_DIR)/%
+ $(install-file)
+
+ $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR, $(LOCAL_POLICY_JAR_DEPS), \
+ SRCS := $(LOCAL_POLICY_JAR_TMP), \
+ SUFFIXES := .policy, \
+ JAR := $(LOCAL_POLICY_JAR_UNSIGNED), \
+ EXTRA_MANIFEST_ATTR := $(LOCAL_POLICY_JAR_ATTR), \
+ SKIP_METAINF := true))
+
+ JARS += $(LOCAL_POLICY_JAR_UNSIGNED)
+endif
+
+ifndef OPENJDK
+ $(LOCAL_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar
+ $(ECHO) $(LOG_INFO) Copying $(@F)
+ $(install-file)
+else
+ $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_UNSIGNED)
+ $(install-file)
+endif
+
+JARS += $(LOCAL_POLICY_JAR_DST)
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+
+ SUNMSCAPI_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunmscapi.jar
+ SUNMSCAPI_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/sunmscapi.jar
+
+ $(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes_security, \
+ SUFFIXES := .class, \
+ INCLUDES := sun/security/mscapi, \
+ JAR := $(SUNMSCAPI_JAR_UNSIGNED), \
+ MANIFEST := $(JCE_MANIFEST), \
+ SKIP_METAINF := true))
+
+ $(SUNMSCAPI_JAR_UNSIGNED): $(JCE_MANIFEST)
+
+ ifndef OPENJDK
+ SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar
+ $(SUNMSCAPI_JAR_DST): $(SUNMSCAPI_JAR_SRC)
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunMSCAPI provider..."
+ $(install-file)
+ else
+ $(SUNMSCAPI_JAR_DST): $(SUNMSCAPI_JAR_UNSIGNED)
+ $(install-file)
+ endif
+
+ JARS += $(SUNMSCAPI_JAR_UNSIGNED) $(SUNMSCAPI_JAR_DST)
+
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifndef OPENJDK
+
+ UCRYPTO_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/ucrypto.jar
+ UCRYPTO_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/ucrypto.jar
+ UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
+
+ $(eval $(call SetupArchive,BUILD_UCRYPTO_JAR, , \
+ SRCS := $(JDK_OUTPUTDIR)/classes_security, \
+ SUFFIXES := .class, \
+ INCLUDES := com/oracle/security/ucrypto, \
+ JAR := $(UCRYPTO_JAR_UNSIGNED), \
+ MANIFEST := $(JCE_MANIFEST), \
+ SKIP_METAINF := true))
+
+ $(UCRYPTO_JAR_UNSIGNED): $(JCE_MANIFEST)
+
+ $(UCRYPTO_JAR_DST): $(UCRYPTO_JAR_SRC)
+ @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..."
+ $(install-file)
+
+ JARS += $(UCRYPTO_JAR_UNSIGNED) $(UCRYPTO_JAR_DST)
+
+ endif
+endif
+
+all: $(JARS)
+
+.PHONY: default all
diff --git a/jdk/makefiles/GenerateClasses.gmk b/jdk/make/GenerateClasses.gmk
similarity index 100%
rename from jdk/makefiles/GenerateClasses.gmk
rename to jdk/make/GenerateClasses.gmk
diff --git a/jdk/make/GenerateData.gmk b/jdk/make/GenerateData.gmk
new file mode 100644
index 0000000..4411440
--- /dev/null
+++ b/jdk/make/GenerateData.gmk
@@ -0,0 +1,85 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+# Setup the java compilers for the JDK build.
+include Setup.gmk
+# We need the tools.
+include Tools.gmk
+
+# Now include all the rules that generate data resources.
+# These are written directly into classes dir.
+GENDATA :=
+
+include gendata/GendataBreakIterator.gmk
+GENDATA += $(BREAK_ITERATOR)
+
+include gendata/GendataFontConfig.gmk
+GENDATA += $(GENDATA_FONT_CONFIG)
+
+include gendata/GendataTZDB.gmk
+GENDATA += $(GENDATA_TZDB)
+
+include gendata/GendataHtml32dtd.gmk
+GENDATA += $(GENDATA_HTML32DTD)
+
+##########################################################################################
+
+GENDATA_UNINAME := $(JDK_OUTPUTDIR)/classes/java/lang/uniName.dat
+
+$(GENDATA_UNINAME): $(JDK_TOPDIR)/make/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS)
+ $(MKDIR) -p $(@D)
+ $(TOOL_CHARACTERNAME) $< $@
+
+GENDATA += $(GENDATA_UNINAME)
+
+##########################################################################################
+
+GENDATA_CURDATA := $(JDK_OUTPUTDIR)/lib/currency.data
+
+$(GENDATA_CURDATA): $(JDK_TOPDIR)/src/share/classes/java/util/CurrencyData.properties $(BUILD_TOOLS)
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(TOOL_GENERATECURRENCYDATA) -o $@.tmp < $<
+ $(MV) $@.tmp $@
+ $(CHMOD) 444 $@
+
+GENDATA += $(GENDATA_CURDATA)
+
+##########################################################################################
+
+$(GENDATA): $(BUILD_TOOLS)
+
+$(JDK_OUTPUTDIR)/classes/_the.gendata: $(GENDATA)
+ $(TOUCH) $@
+
+all: $(JDK_OUTPUTDIR)/classes/_the.gendata
+
+.PHONY: all
diff --git a/jdk/makefiles/GenerateSources.gmk b/jdk/make/GenerateSources.gmk
similarity index 100%
rename from jdk/makefiles/GenerateSources.gmk
rename to jdk/make/GenerateSources.gmk
diff --git a/jdk/makefiles/Images.gmk b/jdk/make/Images.gmk
similarity index 100%
rename from jdk/makefiles/Images.gmk
rename to jdk/make/Images.gmk
diff --git a/jdk/makefiles/Import.gmk b/jdk/make/Import.gmk
similarity index 100%
rename from jdk/makefiles/Import.gmk
rename to jdk/make/Import.gmk
diff --git a/jdk/make/Makefile b/jdk/make/Makefile
index e82edd7..4570070 100644
--- a/jdk/make/Makefile
+++ b/jdk/make/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,369 +23,27 @@
# questions.
#
-#
-# Makefile for building and packaging all of the JDK and the JRE. See
-# also included files.
-#
-
-BUILDDIR=.
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Make sure we are clear what the default target is
-#
-default_target: all
-
-#
-# Check target
-#
-
-check: variable_check
-
-#
-# Help target
-#
-help: intro_help target_help variable_help notes_help examples_help
-
-# Intro help message
-intro_help:
- @$(ECHO) "\
-Makefile for the main JDK workspace. \n\
-Default behavior is to use the BOOTDIR javac to bootstrap the build and \n\
-import in pre-built components like the VM from the JDK_IMPORT_PATH. \n\
-"
-
-# Target help
-target_help:
- @$(ECHO) "\
---- Common Targets --- \n\
-all -- build the core JDK (default target) \n\
-help -- Print out help information \n\
-check -- Check make variable values for correctness \n\
-sanity -- Perform detailed sanity checks on system and settings \n\
-openjdk -- synonym for 'OPENJDK=true all' \n\
-fastdebug -- build the core JDK in 'fastdebug' mode (-g -O) \n\
-debug -- build the core JDK in 'debug' mode (-g) \n\
-clean -- remove all built and imported files \n\
-clobber -- same as clean \n\
-docs -- run javadoc to generate the JDK documentation \n\
-images -- build the jdk and jre image directories \n\
-import -- copy in the pre-built components (e.g. VM) \n\
-import_product -- copy in the product components \n\
-import_fastdebug -- copy in the fastdebug components \n\
-import_debug -- copy in the debug components \n\
-create_links -- create softlinks in Solaris 32bit build to 64bit dirs \n\
-"
-
-# Variable help (only common ones used by this workspace)
-variable_help: variable_help_intro variable_list variable_help_end
-variable_help_intro:
- @$(ECHO) "--- Common Variables ---"
-variable_help_end:
- @$(ECHO) " "
-
-# One line descriptions for the variables
-OUTPUTDIR.desc = Output directory
-PARALLEL_COMPILE_JOBS.desc = Solaris/Linux parallel compile run count
-SLASH_JAVA.desc = Root of all build tools, e.g. /java or J:
-BOOTDIR.desc = JDK used to boot the build
-LANGTOOLS_DIST.desc = langtools dist area used to build
-CORBA_DIST.desc = corba dist area
-JAXP_DIST.desc = jaxp dist area
-JAXWS_DIST.desc = jaxws dist area
-JDK_IMPORT_PATH.desc = JDK used to import components of the build
-COMPILER_PATH.desc = Compiler install directory
-CACERTS_FILE.desc = Location of certificates file
-DEVTOOLS_PATH.desc = Directory containing zip and unzip
-CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files
-
-# Make variables to print out (description and value)
-VARIABLE_PRINTVAL_LIST += \
- OUTPUTDIR \
- PARALLEL_COMPILE_JOBS \
- SLASH_JAVA \
- BOOTDIR \
- LANGTOOLS_DIST \
- JAXWS_DIST \
- CORBA_DIST \
- JAXP_DIST \
- JDK_IMPORT_PATH \
- COMPILER_PATH \
- CACERTS_FILE \
- DEVTOOLS_PATH
-
-# Make variables that should refer to directories that exist
-VARIABLE_CHECKDIR_LIST += \
- SLASH_JAVA \
- BOOTDIR \
- JDK_IMPORT_PATH \
- COMPILER_PATH \
- DEVTOOLS_PATH
-
-# Make variables that should refer to files that exist
-VARIABLE_CHECKFIL_LIST += \
- CACERTS_FILE
-
-# For pattern rules below, so all are treated the same
-DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval)
-DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)
-DO_CHECKFIL_LIST=$(VARIABLE_CHECKFIL_LIST:%=%.checkfil)
-
-# Complete variable check
-variable_check: $(DO_CHECKDIR_LIST) $(DO_CHECKFIL_LIST)
-variable_list: $(DO_PRINTVAL_LIST) variable_check
-
-# Pattern rule for printing out a variable
-%.printval:
- @$(ECHO) " ALT_$* - $($*.desc)"
- @$(ECHO) " \t $*=$($*)"
-
-# Pattern rule for checking to see if a variable with a directory exists
-%.checkdir:
- @if [ ! -d $($*) ] ; then \
- $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \
- fi
-
-# Pattern rule for checking to see if a variable with a file exists
-%.checkfil:
- @if [ ! -f $($*) ] ; then \
- $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \
- fi
-
-# Misc notes on help
-notes_help:
- @$(ECHO) "\
---- Notes --- \n\
-- All builds use same output directory unless overridden with \n\
- \t ALT_OUTPUTDIR=<dir>, changing from product to fastdebug you may want \n\
- \t to use the clean target first. \n\
-- LANGTOOLS_DIST must refer to a langtools dist area, used to build. \n\
-- CORBA_DIST must refer to a corba dist area. \n\
-- JAXP_DIST must refer to a jaxp dist area. \n\
-- JAXWS_DIST must refer to a jaxws dist area. \n\
-- JDK_IMPORT_PATH must refer to a compatible build, not all past promoted \n\
- \t builds or previous release JDK builds will work. \n\
-- The 'debug' target and 'import_debug' only works when a debug promoted \n\
- \t build is available, and they currently are not. \n\
-- The fastest builds have been when the workspace and the BOOTDIR are on \n\
- \t local disk. \n\
-"
-
-examples_help:
- @$(ECHO) "\
---- Examples --- \n\
- $(MAKE) fastdebug \n\
- $(MAKE) ALT_OUTPUTDIR=/tmp/foobar all \n\
- $(MAKE) ALT_OUTPUTDIR=/tmp/foobar fastdebug images \n\
- $(MAKE) ALT_OUTPUTDIR=/tmp/foobar all docs images \n\
- $(MAKE) ALT_BOOTDIR=/opt/java/jdk1.6.0 \n\
- $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk1.7.0 \n\
-"
-
-#
-# 'all' target intro
-#
-all::
- @$(ECHO) $(PLATFORM) $(ARCH) $(RELEASE) build started: $(shell $(DATE) '+%y-%m-%d %H:%M')
-
-# Just in case anyone uses this old name, same as 'build'
-optimized: build
-
-openjdk:
- $(MAKE) OPENJDK=true all
-
-#
-# Special debug rules (You may also want to set ALT_OUTPUTDIR)
-#
-debug:
- $(MAKE) VARIANT=DBG all
-fastdebug:
- $(MAKE) VARIANT=DBG FASTDEBUG=true all
-
-#
-# Rules to re-import VM and other JDK files
-#
-import:
- $(CD) java/redist; $(MAKE) clean all
-
-import_fastdebug:
- $(MAKE) VARIANT=DBG FASTDEBUG=true import
-
-import_product:
- $(MAKE) VARIANT=OPT FASTDEBUG=false import
-
-#
-# Core.
-#
-
-all build:: sanity-all post-sanity-all
-
-SUBDIRS = tools java javax sun com jdk
-ifeq ($(PLATFORM), macosx)
- SUBDIRS += apple
-endif
-ifeq ($(PLATFORM), windows)
- SUBDIRS += bridge
-endif
-SUBDIRS_tools = launchers
-SUBDIRS_misc = org jpda
-
-# demos
-ifndef NO_DEMOS
- SUBDIRS_misc += mkdemo
-endif
-
-# samples
-ifndef NO_SAMPLES
- SUBDIRS_misc += mksample
-endif
-
-# Alternate classes implementation
-ifndef OPENJDK
- SUBDIRS_misc += altclasses
-endif
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build::
- $(SUBDIRS-loop)
-
-clean clobber::
- $(RM) -r $(OUTPUTDIR)
-
-#
-# Docs
-#
-OTHERSUBDIRS = docs
-docs:: sanity-docs post-sanity-docs
- $(OTHERSUBDIRS-loop)
-
-#
-# Release engineering targets.
-#
-include $(BUILDDIR)/common/Release.gmk
--include $(CUSTOM_MAKE_DIR)/Release.gmk
-
-#
-# Cscope targets.
-#
-include $(BUILDDIR)/common/Cscope.gmk
-
-#
-# Sanity checks.
-#
-include $(BUILDDIR)/common/Sanity.gmk
-
-$(OUTPUTDIR) $(TEMPDIR):
- $(MKDIR) -p $@
-
-# this should be the last rule in this file:
-all::
- @if [ -r $(WARNING_FILE) ]; then \
- $(CAT) $(WARNING_FILE) ; \
- fi
- @$(ECHO) $(PLATFORM) $(ARCH) $(RELEASE) build finished: $(shell $(DATE) '+%y-%m-%d %H:%M')
-
-#
-# Developer rule that links 32 and 64 bit builds on Solaris by creating
-# softlinks in the 32bit outputdir to the 64bit outputdir.
-#
-ifeq ($(PLATFORM), solaris)
- ifeq ($(ARCH_FAMILY), sparc)
- ARCH32 = sparc
- ARCH64 = sparcv9
- else
- ARCH32 = i586
- ARCH64 = amd64
- endif
- OUTPUTDIR32 = $(ABS_OUTPUTDIR)/../$(PLATFORM)-$(ARCH32)
- OUTPUTDIR64 = $(ABS_OUTPUTDIR)/../$(PLATFORM)-$(ARCH64)
-endif
-
-create_links:
-ifeq ($(PLATFORM), solaris)
- @if [ -d $(OUTPUTDIR32) -a -d $(OUTPUTDIR64) ] ; then \
- dirlist=`($(CD) $(OUTPUTDIR64); $(FIND) . -name $(ARCH64))`; \
- for sd in $$dirlist ; do \
- pdir=`$(DIRNAME) $$sd`; \
- if [ -d $(OUTPUTDIR32)/$$pdir ] ; then \
- echo "Creating link for $$sd"; \
- (cd $(OUTPUTDIR32)/$$pdir; $(RM) $(ARCH64); \
- $(LN) -s $(OUTPUTDIR64)/$$sd ); \
- fi; \
- done; \
- else \
- $(ECHO) "Build both 32 and 64 bit versions first"; \
- fi
+# Locate this Makefile
+ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
+ makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
else
- $(ECHO) "Rule $@ does not apply on $(PLATFORM)-$(ARCH)"
+ makefile_path := $(lastword $(MAKEFILE_LIST))
+endif
+repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path))
+
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name := $(notdir $(repo_dir))
+
+# Try to locate top-level makefile
+top_level_makefile := $(repo_dir)/../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 ===================================================)
+else
+ $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+ $(error Build from top-level Makefile instead)
endif
-#
-# Test rule
-#
-
-.NOTPARALLEL: test_run
-
-test:
- $(MAKE) test_run
-
-test_run: test_clean test_start test_summary
-
-test_start:
- @$(ECHO) "Tests started at `$(DATE)`"
-
-test_clean:
- $(RM) $(OUTPUTDIR)/test_failures.txt $(OUTPUTDIR)/test_log.txt
-
-test_summary: $(OUTPUTDIR)/test_failures.txt
- @$(ECHO) "#################################################"
- @$(ECHO) "Tests completed at `$(DATE)`"
- @( $(EGREP) '^TEST STATS:' $(OUTPUTDIR)/test_log.txt \
- || $(ECHO) "No TEST STATS seen in log" )
- @$(ECHO) "For complete details see: $(OUTPUTDIR)/test_log.txt"
- @$(ECHO) "#################################################"
- @if [ -s $< ] ; then \
- $(ECHO) "ERROR: Test failure count: `$(CAT) $< | $(WC) -l`"; \
- $(CAT) $<; \
- exit 1; \
- else \
- $(ECHO) "Success! No failures detected"; \
- fi
-
-# Get failure list from log
-$(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
- @$(RM) $@
- @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@
-
-# Get log file of all tests run
-JDK_TO_TEST := $(shell \
- if [ -d "$(ABS_OUTPUTDIR)/j2sdk-image" ] ; then \
- $(ECHO) "$(ABS_OUTPUTDIR)/j2sdk-image"; \
- elif [ -d "$(ABS_OUTPUTDIR)/bin" ] ; then \
- $(ECHO) "$(ABS_OUTPUTDIR)"; \
- elif [ "$(PRODUCT_HOME)" != "" -a -d "$(PRODUCT_HOME)/bin" ] ; then \
- $(ECHO) "$(PRODUCT_HOME)"; \
- fi \
-)
-
-TEST_TARGETS=jdk_all
-$(OUTPUTDIR)/test_log.txt:
- $(RM) $@
- ( $(CD) ../test && \
- $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) $(TEST_TARGETS) \
- ) | tee $@
-
-#
-# JPRT rules
-#
-
-include jprt.gmk
-
-#
-# Phonies to avoid accidents.
-#
-.PHONY: all build clean clobber optimized debug fastdebug create_links \
- import import_product import_fastdebug import_debug \
- test test_run test_start test_clean test_summary
+all:
+ @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/jdk/make/PatchList.solaris b/jdk/make/PatchList.solaris
deleted file mode 100644
index 173881e..0000000
--- a/jdk/make/PatchList.solaris
+++ /dev/null
@@ -1,31 +0,0 @@
-BUILD,RUNTIME 5.8 Sparc 109147-24 x86 109148-24 REQ "Linker patch"
-BUILD,RUNTIME 5.8 Sparc 108652-66 x86 108653-55 REQ "Xserver patch"
-BUILD,RUNTIME 5.8 Sparc 108940-52 x86 108941-52 REQ "Motif 2.1 patch"
-BUILD,RUNTIME 5.8 Sparc 108989-02 x86 108990-02 REQ "Accounting patch"
-BUILD,RUNTIME 5.8 Sparc none x86 111307-04 REQ "boot.bin, bootconf.exe, bootenv.rc and nbp patch"
-BUILD,RUNTIME 5.8 Sparc 111310-01 x86 111311-01 REQ "libhcpagent.so.l patch"
-BUILD,RUNTIME 5.8 Sparc 112396-02 x86 112397-02 REQ "fgrep patch"
-BUILD,RUNTIME 5.8 Sparc 108987-13 x86 108988-13 REQ "patchadd, patchrm patch"
-BUILD,RUNTIME 5.8 Sparc 111111-03 x86 111112-03 REQ "nawk patch"
-BUILD,RUNTIME 5.8 Sparc 108528-20 x86 108529-20 REQ "Kernel update"
-BUILD,RUNTIME 5.8 Sparc 108993-18 x86 none REQ "LDAP2 Patch"
-BUILD,RUNTIME 5.8 Sparc none x86 110400-01 REQ "RBAC Feature patch"
-BUILD,RUNTIME 5.8 Sparc none x86 111024-02 REQ "/kernel/fs/mntfs patch"
-BUILD,RUNTIME 5.8 Sparc none x86 108994-18 REQ "LDAP2 patch"
-BUILD,RUNTIME 5.8 Sparc 109147-23 x86 109148-23 REQ "linker patch"
-BUILD,RUNTIME 5.8 Sparc 111308-03 x86 111309-03 REQ "Performance for apps using memory alloc"
-RUNTIME 5.8 Sparc 112003-03 x86 none REQ "Fontset patch for sparcv9"
-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 112438-01 x86 112439-01 REQ "/kernel/drv/random patch"
-
-COMPILER 5.8 Sparc 109505-06 x86 109502-03 REQ "For C 5.0, C++ 5.0"
-COMPILER 5.8 Sparc 109513-05 x86 109514-03 REQ "For Forte Development 6 C compiler"
-COMPILER 5.8 Sparc 109508-03 x86 109509-03 REQ "For Forte Development 6 update 1 C++ compiler"
-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"
-
diff --git a/jdk/makefiles/ProfileNames.gmk b/jdk/make/ProfileNames.gmk
similarity index 100%
rename from jdk/makefiles/ProfileNames.gmk
rename to jdk/make/ProfileNames.gmk
diff --git a/jdk/makefiles/Profiles.gmk b/jdk/make/Profiles.gmk
similarity index 100%
rename from jdk/makefiles/Profiles.gmk
rename to jdk/make/Profiles.gmk
diff --git a/jdk/makefiles/Setup.gmk b/jdk/make/Setup.gmk
similarity index 100%
rename from jdk/makefiles/Setup.gmk
rename to jdk/make/Setup.gmk
diff --git a/jdk/make/SignJars.gmk b/jdk/make/SignJars.gmk
new file mode 100644
index 0000000..5365bb8
--- /dev/null
+++ b/jdk/make/SignJars.gmk
@@ -0,0 +1,119 @@
+#
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include $(SPEC)
+include MakeBase.gmk
+
+# (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
+# jar file is installed into JDK, things will break when the crypto
+# routines are called.
+#
+# All jars are created in CreateJars.gmk. This Makefile does the signing
+# of the jars for JDK.
+#
+# 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
+# separate from the JDK workspace to prevent its disclosure.
+#
+# SPECIAL NOTE TO JCE/JDK developers: The source files must eventually
+# be built, signed, and then the resulting jar files MUST BE CHECKED
+# INTO THE CLOSED PART OF THE WORKSPACE*. This separate step *MUST NOT
+# BE FORGOTTEN*, otherwise a bug fixed in the source code will not be
+# reflected in the shipped binaries.
+#
+# Please consult with Release Engineering, which is responsible for
+# creating the final JCE builds suitable for checkin.
+#
+
+# Default target
+all:
+
+ifndef OPENJDK
+
+README-MAKEFILE_WARNING := \
+ "\nPlease read jdk/make/SignJars.gmk for further build instructions.\n"
+
+#
+# Location for JCE codesigning key.
+#
+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
+
+#
+# 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; \
+ fi
+
+$(JCE_OUTPUTDIR)/%: $(JDK_OUTPUTDIR)/unsigned/%
+ $(call install-file)
+ $(JARSIGNER) -keystore $(SIGNING_KEYSTORE) \
+ $@ $(SIGNING_ALIAS) < $(SIGNING_PASSPHRASE)
+ @$(PRINTF) "\nJar codesigning finished.\n"
+
+JAR_LIST := \
+ jce.jar \
+ local_policy.jar \
+ sunec.jar \
+ sunjce_provider.jar \
+ sunpkcs11.jar \
+ US_export_policy.jar \
+ sunmscapi.jar \
+ ucrypto.jar \
+ #
+
+UNSIGNED_JARS := $(wildcard $(addprefix $(JDK_OUTPUTDIR)/unsigned/, $(JAR_LIST)))
+
+ifeq ($(UNSIGNED_JARS), )
+ $(error No jars found in $(JDK_OUTPUTDIR)/unsigned/)
+endif
+
+SIGNED_JARS := $(patsubst $(JDK_OUTPUTDIR)/unsigned/%,$(JCE_OUTPUTDIR)/%, $(UNSIGNED_JARS))
+
+$(SIGNED_JARS): check-keystore
+
+all: $(SIGNED_JARS)
+ @$(PRINTF) "\n*** The jar files built by the 'sign-jars' target are developer ***"
+ @$(PRINTF) "\n*** builds only and *MUST NOT* be checked into the closed workspace. ***"
+ @$(PRINTF) "\n*** ***"
+ @$(PRINTF) "\n*** Please consult with Release Engineering: they will generate ***"
+ @$(PRINTF) "\n*** the proper binaries for the closed workspace. ***"
+ @$(PRINTF) "\n"
+ @$(PRINTF) $(README-MAKEFILE_WARNING)
+
+endif # !OPENJDK
diff --git a/jdk/make/Tools.gmk b/jdk/make/Tools.gmk
new file mode 100644
index 0000000..aa61c1f
--- /dev/null
+++ b/jdk/make/Tools.gmk
@@ -0,0 +1,160 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Cache all finds needed for this file. Only used on windows.
+$(eval $(call FillCacheFind, $(JDK_TOPDIR)/make/src/classes))
+
+TOOLS_SRC := $(JDK_TOPDIR)/make/src/classes
+
+ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
+ 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))
+endif
+
+$(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))
+
+# Resource used by CheckDeps tool
+$(JDK_OUTPUTDIR)/btclasses/build/tools/deps/refs.allowed: \
+ $(JDK_TOPDIR)/make/data/checkdeps/refs.allowed
+ $(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
+
+# 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_COMPILEFONTCONFIG = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.compilefontconfig.CompileFontConfig
+
+TOOL_COMPILEPROPERTIES = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.compileproperties.CompileProperties
+
+TOOL_STRIPPROPERTIES = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.stripproperties.StripProperties
+
+TOOL_JARREORDER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.jarreorder.JarReorder
+
+TOOL_GENERATECHARACTER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.generatecharacter.GenerateCharacter
+
+TOOL_CHARACTERNAME = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.generatecharacter.CharacterName
+
+TOOL_DTDBUILDER = $(JAVA) -Ddtd_home=$(JDK_TOPDIR)/make/data/dtdbuilder \
+ -cp $(JDK_OUTPUTDIR)/btclasses build.tools.dtdbuilder.DTDBuilder
+
+TOOL_GENERATEBREAKITERATORDATA = $(JAVA) \
+ -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.generatebreakiteratordata.GenerateBreakIteratorData
+
+TOOL_GENERATECURRENCYDATA = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.generatecurrencydata.GenerateCurrencyData
+
+TOOL_HASHER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.hasher.Hasher
+
+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
+# and nbproject/project.properties in the same dir. Needs to be looked at.
+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_SPP = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses build.tools.spp.Spp
+
+# Nimbus is used somewhere in the swing build.
+TOOL_GENERATENIMBUS = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.generatenimbus.Generator
+
+TOOL_WRAPPERGENERATOR = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ WrapperGenerator
+
+TOOL_AWT_TOBIN = $(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.icondata.awt.ToBin
+
+TOOL_OSX_TOBIN = $(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.icondata.osxapp.ToBin
+
+TOOL_CLDRCONVERTER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.cldrconverter.CLDRConverter
+
+TOOL_REMOVEMETHODS = $(JAVA) -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
+ -cp $(JDK_OUTPUTDIR)/btclasses:$(JDK_OUTPUTDIR) \
+ build.tools.classfile.RemoveMethods
+
+TOOL_CHECKDEPS = $(JAVA) -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
+ -cp $(JDK_OUTPUTDIR)/btclasses:$(JDK_OUTPUTDIR) \
+ build.tools.deps.CheckDeps
+
+TOOL_ADDTORESTRICTEDPKGS=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
+ build.tools.addtorestrictedpkgs.AddToRestrictedPkgs
+
+##########################################################################################
+
+# Tools needed on solaris because OBJCOPY is broken.
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+$(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK, \
+ SRC := $(JDK_TOPDIR)/make/src/native/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/src/native/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))
+endif
diff --git a/jdk/make/altclasses/Makefile b/jdk/make/altclasses/Makefile
deleted file mode 100644
index 2017520..0000000
--- a/jdk/make/altclasses/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building alternate runtime classes (not used by default)
-#
-
-BUILDDIR = ..
-
-PRODUCT = altclasses
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# Root of alternate class sources
-
-ALTCLASSES_SRCDIR = $(CLOSED_SRC)/share/altclasses
-
-# Alternate runtime classes
-
-ALTRT_JAR_FILE = $(LIBDIR)/alt-rt.jar
-ALTRT_JAR_SOURCE_FILE = $(TEMPDIR)/alt-rt.jarsrclist
-ALTRT_JAR_SOURCES = $(wildcard $(ALTCLASSES_SRCDIR)/java/*/*.java)
-
-# Use a special file suffix for the file that holds the source list
-
-.SUFFIXES: .jarsrclist
-
-# Build rules
-
-all build:
- @if [ -d $(ALTCLASSES_SRCDIR) ] ; then \
- $(MAKE) $(ALTRT_JAR_FILE); \
- fi
-
-# Source list file creation
-
-$(ALTRT_JAR_SOURCE_FILE): $(ALTRT_JAR_SOURCES) FRC
- $(prep-target)
- $(ECHO) $(ALTRT_JAR_SOURCES) > $@
-
-clean clobber::
- $(RM) $(ALTRT_JAR_FILE) $(ALTRT_JAR_SOURCE_FILE)
- $(RM) -r $(ALTRT_JAR_SOURCE_FILE).classes
-
-include $(BUILDDIR)/common/Classes.gmk
-
-# Pattern rule to turn a source list file into a jar file
-$(LIBDIR)/%.jar : $(TEMPDIR)/%.jarsrclist
- $(prep-target)
- $(RM) -r $(<).classes
- $(MKDIR) -p $(<).classes
- $(JAVAC_CMD) -implicit:none -d $(<).classes @$<
- $(BOOT_JAR_CMD) cf $@ -C $(<).classes . $(BOOT_JAR_JFLAGS)
-
-# Force target
-
-FRC:
-
-# Non file targets
-
-.PHONY: all build clean clobber
-
diff --git a/jdk/make/apple/Makefile b/jdk/make/apple/Makefile
deleted file mode 100644
index aa60f86..0000000
--- a/jdk/make/apple/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building com/apple
-#
-
-BUILDDIR = ..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = applescript
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
diff --git a/jdk/make/apple/applescript/Makefile b/jdk/make/apple/applescript/Makefile
deleted file mode 100644
index a9a2a3d..0000000
--- a/jdk/make/apple/applescript/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = apple.applescript
-LIBRARY = AppleScriptEngine
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = apple/applescript
-
-FILES_objc = \
- $(TARGDIR)AppleScriptEngine.m \
- $(TARGDIR)AppleScriptExecutionContext.m \
- $(TARGDIR)AS_NS_ConversionUtils.m \
- $(TARGDIR)NS_Java_ConversionUtils.m
-
-
-FILES_export = \
- apple/applescript/AppleScriptEngine.java \
- apple/applescript/AppleScriptEngineFactory.java
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-
-#
-# Extra rules
-#
-
-#
-# Add to ambient vpath to get files in a subdirectory
-#
-vpath %.m $(call NativeSrcDirList,,native/apple/applescript)
-
-CPPFLAGS += \
- -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders
-
-OTHER_LDLIBS = \
- -framework Cocoa \
- -framework Carbon \
- -framework JavaNativeFoundation
diff --git a/jdk/make/bridge/AccessBridgeJava/Makefile b/jdk/make/bridge/AccessBridgeJava/Makefile
deleted file mode 100644
index bbba630..0000000
--- a/jdk/make/bridge/AccessBridgeJava/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building AccessBridge
-#
-BUILDDIR = ../..
-PRODUCT = java
-PACKAGE = com.sun.java.accessibility
-
-include $(BUILDDIR)/common/Defs.gmk
-JARFILE = $(EXTDIR)/access-bridge$(ABSUFFIX).jar
-
-ifeq ($(ARCH_DATA_MODEL), 64)
- ABPLATFORM = 64bit
- ABSUFFIX = -64
-else
-ifeq ($(ARCH_DATA_MODEL), 32)
-ifdef ABLEGACY
- ABSUFFIX =
- ABPLATFORM = legacy
-else
- ABPLATFORM = 32bit
- ABSUFFIX = -32
-endif
-endif
-endif
-
-#
-# Java files to compile.
-#
-FILES_java = com/sun/java/accessibility/AccessBridgeLoader.java com/sun/java/accessibility/AccessBridge.java
-
-#
-# Location for the newly built classfiles.
-#
-CLASSDESTDIR = $(TEMPDIR)/classes
-
-#
-# Rules
-#
-
-FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
-
-build: prebuild
-
-prebuild:
- $(CP) $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility/$(ABPLATFORM)/AccessBridgeLoader.java \
- $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility
-
-all : build $(JARFILE)
-
-#
-# JAR file
-#
-$(JARFILE): \
- $(FILES_class)
- $(BOOT_JAR_CMD) -cf $(JARFILE) \
- -C $(CLASSDESTDIR) com \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR) \
- $(EXTDIR)/$(JARFILE)
diff --git a/jdk/make/bridge/JAWTAccessBridge/Files_cpp.gmk b/jdk/make/bridge/JAWTAccessBridge/Files_cpp.gmk
deleted file mode 100644
index 5527f82..0000000
--- a/jdk/make/bridge/JAWTAccessBridge/Files_cpp.gmk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Native files to compile.
-FILES_cpp = \
- JAWTAccessBridge.cpp
diff --git a/jdk/make/bridge/JAWTAccessBridge/Makefile b/jdk/make/bridge/JAWTAccessBridge/Makefile
deleted file mode 100644
index 7ca80af..0000000
--- a/jdk/make/bridge/JAWTAccessBridge/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JAWTAccessBridge
-#
-
-BUILDDIR = ../..
-LIBRARY = JAWTAccessBridge$(ABSUFFIX)
-include $(BUILDDIR)/common/Defs.gmk
-
-# Indicate we want the C++ compiler to do the linking.
-CPLUSPLUSLIBRARY=true
-
-ifeq ($(ARCH_DATA_MODEL), 64)
- ABSUFFIX = -64
- ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_64
- ABRIDGE_MACHINE=X64
-else
-ifeq ($(ARCH_DATA_MODEL), 32)
- ABRIDGE_MACHINE=I386
-ifdef ABLEGACY
- ABSUFFIX =
- ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_LEGACY
-else
- ABSUFFIX = -32
- ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_32
-endif
-endif
-endif
-
-include FILES_cpp.gmk
-
-VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
-
-OTHER_CPPFLAGS += -D$(ACCESSBRIDGE_ARCH) -I "$(INCLUDEDIR)" -I "$(PLATFORM_INCLUDE)"
-LDLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
- uuid.lib odbc32.lib odbccp32.lib /subsystem:windows /dll /incremental:no /machine:$(ABRIDGE_MACHINE) \
- /def:$(CLOSED_PLATFORM_SRC)/native/sun/bridge/JAWTAccessBridge.DEF /libpath:"$(LIBDIR)"
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Library.gmk
-
-vpath %.cpp $(CLOSED_PLATFORM_SRC)/native/sun/bridge
-vpath %.RC $(CLOSED_PLATFORM_SRC)/native/sun/bridge
diff --git a/jdk/make/bridge/Jabswitch/Makefile b/jdk/make/bridge/Jabswitch/Makefile
deleted file mode 100644
index efd65e0..0000000
--- a/jdk/make/bridge/Jabswitch/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building jabswitch.exe
-#
-
-BUILDDIR = ../..
-PROGRAM = jabswitch
-include $(BUILDDIR)/common/Defs.gmk
-
-# Indicate we want the C++ compiler to do the linking.
-CPLUSPLUSLIBRARY=true
-
-VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
-VERSIONRES = $(TEMPDIR)/AccessBridgeStatusWindow.res
-
-JAB_EXE= $(TEMPDIR)/jabswitch.exe
-
-JAB_SRC = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/jabswitch.cpp
-
-JAB_MANIFEST_INP = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/jabswitch.manifest
-JAB_MANIFEST_OUT = $(TEMPDIR)/jabswitch.exe.intermediate.manifest
-
-RC_FLAGS += /fo "$(VERSIONRES)"
-OTHER_CPPFLAGS += /MD /Fo"$(TEMPDIR)/" /Fd"$(TEMPDIR)/" /analyze- /Od /Gd /nologo /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /RTC1 /W3 /ZI /Zc:wchar_t /EHsc
-LDDFLAGS += Advapi32.lib Version.lib User32.lib
-
-all: buildexe copyfilejab
-
-buildexe :
- $(CD) $(TEMPDIR)
- $(RC) $(RC_FLAGS) $(VERSIONINFO_RESOURCE)
- $(CC) $(CPPFLAGS) $(JAB_SRC) $(LDDFLAGS) $(VERSIONRES) -o $(JAB_EXE)
- $(MT) /nologo /verbose /manifest $(JAB_MANIFEST_INP) /outputresource:$(JAB_EXE)
-
-copyfilejab :
- $(CP) $(JAB_EXE) $(BINDIR)
-
-vpath %.cpp $(CLOSED_PLATFORM_SRC)/native/sun/bridge
-vpath %.rc $(CLOSED_PLATFORM_SRC)/native/sun/bridge
diff --git a/jdk/make/bridge/Jaccess/Makefile b/jdk/make/bridge/Jaccess/Makefile
deleted file mode 100644
index df57536..0000000
--- a/jdk/make/bridge/Jaccess/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building jaccess
-#
-BUILDDIR = ../..
-PRODUCT = java
-PACKAGE = com.sun.java.accessibility.jaccess
-
-include $(BUILDDIR)/common/Defs.gmk
-JARFILE = $(EXTDIR)/jaccess.jar
-
-#
-# Java files to compile.
-#
-#AUTO_FILES_JAVA_DIRS = $(CLOSED_PLATFORM_SRC)/bridge
-FILES_java = \
- com/sun/java/accessibility/util/AccessibilityEventMonitor.java \
- com/sun/java/accessibility/util/AccessibilityListenerList.java \
- com/sun/java/accessibility/util/AWTEventMonitor.java \
- com/sun/java/accessibility/util/EventID.java \
- com/sun/java/accessibility/util/EventQueueMonitor.java \
- com/sun/java/accessibility/util/GUIInitializedListener.java \
- com/sun/java/accessibility/util/GUIInitializedMulticaster.java \
- com/sun/java/accessibility/util/SwingEventMonitor.java \
- com/sun/java/accessibility/util/TopLevelWindowListener.java \
- com/sun/java/accessibility/util/TopLevelWindowMulticaster.java \
- com/sun/java/accessibility/util/Translator.java \
- com/sun/java/accessibility/util/java/awt/ButtonTranslator.java \
- com/sun/java/accessibility/util/java/awt/CheckboxTranslator.java \
- com/sun/java/accessibility/util/java/awt/LabelTranslator.java \
- com/sun/java/accessibility/util/java/awt/ListTranslator.java \
- com/sun/java/accessibility/util/java/awt/TextComponentTranslator.java
-
-#
-# Rules
-#
-CLASSDESTDIR = $(TEMPDIR)/classes
-
-FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
-
-all : build $(JARFILE)
-
-#
-# JAR file
-#
-$(JARFILE): \
- $(FILES_class)
- $(BOOT_JAR_CMD) -cf $(JARFILE) \
- -C $(CLASSDESTDIR) com \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR) \
- $(EXTDIR)/$(JARFILE)
diff --git a/jdk/make/bridge/JavaAccessBridge/Files_cpp.gmk b/jdk/make/bridge/JavaAccessBridge/Files_cpp.gmk
deleted file mode 100644
index 3d197be..0000000
--- a/jdk/make/bridge/JavaAccessBridge/Files_cpp.gmk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Native files to compile.
-FILES_cpp = \
- AccessBridgeATInstance.cpp \
- AccessBridgeDebug.cpp \
- AccessBridgeJavaEntryPoints.cpp \
- AccessBridgeMessages.cpp \
- JavaAccessBridge.cpp
diff --git a/jdk/make/bridge/JavaAccessBridge/Makefile b/jdk/make/bridge/JavaAccessBridge/Makefile
deleted file mode 100644
index 6637a77..0000000
--- a/jdk/make/bridge/JavaAccessBridge/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JavaAccessBridge.DLL
-#
-
-BUILDDIR = ../..
-LIBRARY = JavaAccessBridge$(ABSUFFIX)
-include $(BUILDDIR)/common/Defs.gmk
-
-# Indicate we want the C++ compiler to do the linking.
-CPLUSPLUSLIBRARY=true
-
-ifeq ($(ARCH_DATA_MODEL), 64)
- ABSUFFIX = -64
- ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_64
- ABRIDGE_MACHINE=X64
-else
-ifeq ($(ARCH_DATA_MODEL), 32)
- ABRIDGE_MACHINE=I386
-ifdef ABLEGACY
- ABSUFFIX =
- ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_LEGACY
-else
- ABSUFFIX = -32
- ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_32
-endif
-endif
-endif
-
-include FILES_cpp.gmk
-
-PLATFORM_INCLUDE_BRIDGE = $(PLATFORM_INCLUDE)/bridge
-
-VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
-
-OTHER_CPPFLAGS += -D$(ACCESSBRIDGE_ARCH) -I "$(INCLUDEDIR)" -I "$(PLATFORM_INCLUDE)"
-LDLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
- odbc32.lib odbccp32.lib /subsystem:windows /dll /incremental:no /machine:$(ABRIDGE_MACHINE) \
- /def:$(CLOSED_PLATFORM_SRC)/native/sun/bridge/JavaAccessBridge.DEF /libpath:"$(LIBDIR)"
-
-all : build postbuild
-
-postbuild :
- $(MKDIR) -p $(PLATFORM_INCLUDE_BRIDGE)
- $(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/accessibility.properties $(LIBDIR)
- $(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeCallbacks.h $(PLATFORM_INCLUDE_BRIDGE)
- $(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeCalls.h $(PLATFORM_INCLUDE_BRIDGE)
- $(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgePackages.h $(PLATFORM_INCLUDE_BRIDGE)
- $(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeCalls.c $(PLATFORM_INCLUDE_BRIDGE)
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Library.gmk
-
-vpath %.cpp $(CLOSED_PLATFORM_SRC)/native/sun/bridge
-vpath %.DEF $(CLOSED_PLATFORM_SRC)/native/sun/bridge
-vpath %.rc $(CLOSED_PLATFORM_SRC)/native/sun/bridge
-vpath %.c $(CLOSED_PLATFORM_SRC)/native/sun/bridge
-vpath %.h $(CLOSED_PLATFORM_SRC)/native/sun/bridge
-
-#
-# Extra clean rule.
-#
-clean clobber::
- $(RM) $(FILES_h)
diff --git a/jdk/make/bridge/Makefile b/jdk/make/bridge/Makefile
deleted file mode 100644
index 6703a21..0000000
--- a/jdk/make/bridge/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building Java Access Bridge
-#
-
-BUILDDIR = ..
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-#
-ifndef OPENJDK
-ifeq ($(PLATFORM), windows)
-include $(BUILDDIR)/common/Subdirs.gmk
-
-#
-# build for 32 and 64 bit (new api)
-#
-SUBDIRS = Jaccess JavaAccessBridge WindowsAccessBridge JAWTAccessBridge AccessBridgeJava Jabswitch
-#
-# build for legacy
-#
-ifeq ($(ARCH_DATA_MODEL), 32)
-OTHERSUBDIRS_MAKEFLAGS += ABLEGACY=true
-OTHERSUBDIRS = JavaAccessBridge WindowsAccessBridge JAWTAccessBridge AccessBridgeJava
-endif
-
-ifeq ($(ARCH_DATA_MODEL), 32)
-all build clean clobber ::
- $(SUBDIRS-loop)
- $(OTHERSUBDIRS-loop)
-else
-all build clean clobber ::
- $(SUBDIRS-loop)
-endif
-
-clean::
- $(RM) -r $(CLASSBINDIR) $(CLASSBINDIR)
-
-endif # PLATFORM
-endif #OPENJDK
-
diff --git a/jdk/make/bridge/WindowsAccessBridge/Files_cpp.gmk b/jdk/make/bridge/WindowsAccessBridge/Files_cpp.gmk
deleted file mode 100644
index 411e283..0000000
--- a/jdk/make/bridge/WindowsAccessBridge/Files_cpp.gmk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Native files to compile.
-FILES_cpp = \
- AccessBridgeJavaVMInstance.cpp \
- AccessBridgeMessageQueue.cpp \
- AccessBridgeMessages.cpp \
- AccessBridgeWindowsEntryPoints.cpp \
- WinAccessBridge.cpp \
- AccessBridgeDebug.cpp \
- AccessBridgeEventHandler.cpp
diff --git a/jdk/make/bridge/WindowsAccessBridge/Makefile b/jdk/make/bridge/WindowsAccessBridge/Makefile
deleted file mode 100644
index f65f704..0000000
--- a/jdk/make/bridge/WindowsAccessBridge/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building WindowsAccessBridge.dll
-#
-
-BUILDDIR = ../..
-LIBRARY = WindowsAccessBridge$(ABSUFFIX)
-include $(BUILDDIR)/common/Defs.gmk
-
-# Indicate we want the C++ compiler to do the linking.
-CPLUSPLUSLIBRARY=true
-
-ifeq ($(ARCH_DATA_MODEL), 64)
- ABSUFFIX = -64
- ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_64
- ABRIDGE_MACHINE=X64
-else
-ifeq ($(ARCH_DATA_MODEL), 32)
- ABRIDGE_MACHINE=I386
-ifdef ABLEGACY
- ABSUFFIX =
- ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_LEGACY
-else
- ABSUFFIX = -32
- ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_32
-endif
-endif
-endif
-
-include FILES_cpp.gmk
-
-VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
-
-OTHER_CPPFLAGS += -MT -D$(ACCESSBRIDGE_ARCH) -I "$(INCLUDEDIR)" -I "$(PLATFORM_INCLUDE)"
-LDLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
- ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:windows /dll /incremental:no /machine:$(ABRIDGE_MACHINE) \
- /def:$(CLOSED_PLATFORM_SRC)/native/sun/bridge/WinAccessBridge.DEF /libpath:"$(LIBDIR)"
-
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Library.gmk
-
-vpath %.cpp $(CLOSED_PLATFORM_SRC)/native/sun/bridge
-vpath %.DEF $(CLOSED_PLATFORM_SRC)/native/sun/bridge
-vpath %.rc $(CLOSED_PLATFORM_SRC)/native/sun/bridge
diff --git a/jdk/make/com/Makefile b/jdk/make/com/Makefile
deleted file mode 100644
index ab6a499..0000000
--- a/jdk/make/com/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ..
-PRODUCT = com
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = sun oracle
-
-ifeq ($(PLATFORM), macosx)
- SUBDIRS += apple
-endif
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/com/apple/Makefile b/jdk/make/com/apple/Makefile
deleted file mode 100644
index b961f28c..0000000
--- a/jdk/make/com/apple/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building com/apple
-#
-
-BUILDDIR = ../..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = osx osxui
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
diff --git a/jdk/make/com/apple/osx/Makefile b/jdk/make/com/apple/osx/Makefile
deleted file mode 100644
index a98b922..0000000
--- a/jdk/make/com/apple/osx/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.apple.osx
-LIBRARY = osx
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = apple/launcher apple/security com/apple/concurrent com/apple/eio java/util/prefs
-
-FILES_objc += \
- $(TARGDIR)Dispatch.m \
- $(TARGDIR)CFileManager.m \
- $(TARGDIR)KeystoreImpl.m \
- $(TARGDIR)JavaAppLauncher.m \
- $(TARGDIR)MacOSXPreferencesFile.m \
- $(TARGDIR)SCDynamicStoreConfig.m
-
-FILES_export += \
- com/apple/concurrent/LibDispatchNative.java \
- com/apple/eio/FileManager.java \
- apple/security/KeychainStore.java \
- apple/launcher/JavaAppLauncher.java \
- java/util/prefs/MacOSXPreferencesFile.java
-
-# TODO: couldn't figure out how to get resources working
-#LOCALE_SET_DEFINITION = jre
-#RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = apple/launcher/appLauncherErrors.properties
-
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-
-#
-# Extra rules
-#
-
-#
-# Add to ambient vpath to get files in a subdirectory
-#
-vpath %.m $(call NativeSrcDirList,,native/com/apple/concurrent)
-vpath %.m $(call NativeSrcDirList,,native/com/apple/eio)
-vpath %.m $(call NativeSrcDirList,,native/apple/launcher)
-vpath %.m $(call NativeSrcDirList,,native/apple/security)
-vpath %.m $(call NativeSrcDirList,,native/java/util)
-
-CPPFLAGS += \
- $(call NativeSrcDirList,-I,native/com/apple/laf) \
- $(call NativeSrcDirList,-I,native/apple/awt) \
- $(call NativeSrcDirList,-I,native/sun/awt) \
- $(call NativeSrcDirList,-I,native/sun/osxapp)
-
-OTHER_LDLIBS = \
- -losxapp \
- -framework Cocoa \
- -framework ApplicationServices \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -framework Security \
- -framework SystemConfiguration
diff --git a/jdk/make/com/apple/osxui/Makefile b/jdk/make/com/apple/osxui/Makefile
deleted file mode 100644
index 286cbe0..0000000
--- a/jdk/make/com/apple/osxui/Makefile
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.apple.osxui
-LIBRARY = osxui
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = apple/laf com/apple/laf com/apple/eawt
-
-FILES_objc = \
- $(TARGDIR)AquaFileView.m \
- $(TARGDIR)AquaLookAndFeel.m \
- $(TARGDIR)AquaNativeResources.m \
- $(TARGDIR)JRSUIConstantSync.m \
- $(TARGDIR)JRSUIController.m \
- $(TARGDIR)JRSUIFocus.m \
- $(TARGDIR)ScreenPopupFactory.m \
- $(TARGDIR)ScreenMenu.m
-
-FILES_export = \
- apple/laf/AquaLookAndFeel.java \
- apple/laf/JRSUIConstants.java \
- apple/laf/JRSUIControl.java \
- apple/laf/JRSUIFocus.java \
- apple/laf/JRSUIState.java \
- apple/laf/JRSUIStateFactory.java \
- apple/laf/JRSUIUtils.java \
- com/apple/laf/AquaFileView.java \
- com/apple/laf/AquaNativeResources.java \
- com/apple/laf/ScreenPopupFactory.java \
- com/apple/laf/ScreenMenu.java \
- com/apple/laf/ScreenMenuBar.java \
- com/apple/laf/ScreenMenuBarProvider.java \
- com/apple/laf/ScreenMenuItem.java \
- com/apple/laf/ScreenMenuItemCheckbox.java \
- com/apple/laf/ScreenMenuItemUI.java \
- com/apple/laf/ScreenMenuPropertyHandler.java \
- com/apple/laf/ScreenMenuPropertyListener.java
-
-RESOURCE_BUNDLES_COMPILED_PROPERTIES += \
- com/apple/laf/resources/aqua.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-
-#
-# Extra rules
-#
-
-#
-# Add to ambient vpath to get files in a subdirectory
-#
-vpath %.m $(call NativeSrcDirList,,native/com/apple/laf)
-vpath %.m $(call NativeSrcDirList,,native/com/apple/eawt)
-
-CPPFLAGS += \
- $(call NativeSrcDirList,-I,native/com/apple/laf) \
- $(call NativeSrcDirList,-I,native/apple/awt) \
- $(call NativeSrcDirList,-I,native/sun/awt) \
- $(call NativeSrcDirList,-I,native/sun/osxapp) \
- -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders
-
-OTHER_LDLIBS = \
- -lawt -losxapp \
- -lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \
- -framework Cocoa \
- -framework Carbon \
- -framework ApplicationServices \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport
diff --git a/jdk/make/com/oracle/Makefile b/jdk/make/com/oracle/Makefile
deleted file mode 100644
index 6371886..0000000
--- a/jdk/make/com/oracle/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PRODUCT = oracle
-#SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
-#SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-#SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
-include $(BUILDDIR)/common/Defs.gmk
-
-JFR_SRCDIRS_EXIST := $(shell \
- if [ -d $(CLOSED_SHARE_SRC)/native/oracle/jfr ] ; then \
- echo true; \
- else \
- echo false; \
- fi)
-
-JFR =
-ifndef OPENJDK
- ifndef JAVASE_EMBEDDED
- ifeq ($(JFR_SRCDIRS_EXIST), true)
- JFR = jfr
- endif
- endif
-endif
-
-# build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds
-UCRYPTO =
-ifndef OPENJDK
- ifeq ($(PLATFORM), solaris)
- UCRYPTO = security/ucrypto
- endif
-endif
-
-SUBDIRS = $(JFR) net nio util $(UCRYPTO)
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/com/oracle/jfr/Makefile b/jdk/make/com/oracle/jfr/Makefile
deleted file mode 100644
index 3bd668f..0000000
--- a/jdk/make/com/oracle/jfr/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = oracle.jrockit.jfr
-LIBRARY = jfr
-PRODUCT = oracle
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Use mapfile
-#
-FILES_m = $(CLOSED_SHARE_SRC)/native/oracle/jfr/mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-#
-# Files to compile
-#
-FILES_c = VMJFR.c
-
-AUTO_FILES_JAVA_DIRS = com/oracle/jrockit/jfr oracle/jrockit/jfr
-
-JFC_XSD = oracle/jrockit/jfr/settings/jfc.xsd
-JFC_XSD_SRC = $(CLOSED_SHARE_SRC)/classes/$(JFC_XSD)
-JFC_XSD_FILE = $(CLASSDESTDIR)/$(JFC_XSD)
-
-
-# Find C source files
-#
-vpath %.c $(CLOSED_SHARE_SRC)/native/oracle/jfr
-
-#
-# Library to compile.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-JVMLIB =
-JAVALIB =
-OTHER_LDLIBS =
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR)/com/oracle/jrockit/jfr
- $(RM) -r $(CLASSDESTDIR)/oracle/jrockit/jfr
-
-# Copy pre-shipped .jfc files
-JFR_LIBDIR = $(LIBDIR)/jfr
-JFC_SRCDIR = $(CLOSED_SHARE_SRC)/classes/oracle/jrockit/jfr/settings
-
-$(JFR_LIBDIR)/%.jfc: $(JFC_SRCDIR)/%.jfc
- $(install-file)
-
-JFC_FILES := $(subst $(JFC_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFC_SRCDIR)/*.jfc))
-
-$(JFC_XSD_FILE) : $(JFC_XSD_SRC)
- $(install-file)
-
-all build : $(JFC_FILES) $(JFC_XSD_FILE)
-
diff --git a/jdk/make/com/oracle/net/Makefile b/jdk/make/com/oracle/net/Makefile
deleted file mode 100644
index 657a351..0000000
--- a/jdk/make/com/oracle/net/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.oracle.net
-PRODUCT = oracle
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = com/oracle/net
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/oracle/nio/Makefile b/jdk/make/com/oracle/nio/Makefile
deleted file mode 100644
index 41d841a..0000000
--- a/jdk/make/com/oracle/nio/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.oracle.nio
-PRODUCT = oracle
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = com/oracle/nio
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/oracle/security/ucrypto/FILES_c.gmk b/jdk/make/com/oracle/security/ucrypto/FILES_c.gmk
deleted file mode 100644
index 0c69755..0000000
--- a/jdk/make/com/oracle/security/ucrypto/FILES_c.gmk
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-ifndef OPENJDK
-FILES_c = \
- nativeFunc.c \
- nativeCrypto.c
-endif
diff --git a/jdk/make/com/oracle/security/ucrypto/Makefile b/jdk/make/com/oracle/security/ucrypto/Makefile
deleted file mode 100644
index f779bf4..0000000
--- a/jdk/make/com/oracle/security/ucrypto/Makefile
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building ucrypto.jar and its native libraries.
-#
-# This file was modified from make/sun/security/pkcs11/Makefile.
-#
-#
-# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Oracle
-# JDK builds respectively.)
-#
-# This Makefile does the "real" build of the Ucrypto provider files.
-# Since the sources are unavailable for OpenJDK, this Makefile is only
-# useful for JDK.
-#
-#
-# Main Targets (JDK on Solaris):
-#
-# all The usual, ucrypto.jar plus the native libraries.
-# builds and installs the prebuilt/signed jar.
-#
-# clobber/clean Cleans up the temp directory, ucrypto.jar, the
-# native libraries, and the config file from the
-# build area
-#
-# jar Builds, signs and installs ucrypto.jar
-# (Can only be done on machines with access to
-# the signing keystore)
-#
-# Other lesser-used Targets (JDK on Solaris):
-#
-# build-jar Builds ucrypto.jar (no sign/install)
-#
-# sign Builds/signs ucrypto.jar (no install)
-#
-# release Builds all targets in preparation
-# for workspace integration.
-# (Can only be done on machines with access to
-# the signing keystore)
-#
-# install-prebuilt Installs the pre-built jar files
-#
-# NOTE: None of the above target will update the prebuilt provider binary
-# under the closed workspace. To update it, you must explicitly copy the
-# binary from either the tmp/signed or lib/ext directory.
-#
-# This makefile was written to support parallel target execution.
-#
-
-BUILDDIR = ../../../..
-
-include $(BUILDDIR)/common/Defs.gmk
-
-ifndef OPENJDK
- ifneq ($(PLATFORM), solaris)
- all:
- else
- PACKAGE = com.oracle.security.ucrypto
- LIBRARY = j2ucrypto
- PRODUCT = oracle
-
- #
- # The following is for when we need to do postprocessing
- # (signing/obfuscation) against a read-only build. If the OUTPUTDIR
- # isn't writable, the build currently crashes out.
- #
- ifdef ALT_JCE_BUILD_DIR
- # =====================================================
- # Where to place the output, in case we're building from a read-only
- # build area. (e.g. a release engineering build.)
- JCE_BUILD_DIR=${ALT_JCE_BUILD_DIR}
- IGNORE_WRITABLE_OUTPUTDIR_TEST=true
- else
- JCE_BUILD_DIR=${TEMPDIR}
- endif
-
- JAVAC_MAX_WARNINGS=false
- JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation
- JAVAC_WARNINGS_FATAL=true
-
- #
- # C and Java Files
- #
- include FILES_c.gmk
-
- #
- # Subdirectories of these are automatically included.
- #
- AUTO_FILES_JAVA_DIRS = com/oracle/security/ucrypto
-
- #
- # Java files that define native methods
- #
- FILES_export = \
- com/oracle/security/ucrypto/UcryptoProvider.java \
- com/oracle/security/ucrypto/NativeCipher.java \
- com/oracle/security/ucrypto/NativeDigest.java \
- com/oracle/security/ucrypto/NativeKey.java \
- com/oracle/security/ucrypto/NativeRSASignature.java \
- com/oracle/security/ucrypto/NativeRSACipher.java
-
- #
- # Find native code
- #
- vpath %.c \
- $(CLOSED_PLATFORM_SRC)/native/com/oracle/security/ucrypto
-
- #
- # Find include files
- #
- OTHER_INCLUDES += \
- -I$(CLOSED_PLATFORM_SRC)/native/com/oracle/security/ucrypto
-
- #
- # Rules
- #
- CLASSDESTDIR = $(TEMPDIR)/classes
- JAVAHFLAGS = -bootclasspath \
- "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)"
-
- include $(BUILDDIR)/common/Mapfile-vers.gmk
- include $(BUILDDIR)/common/Library.gmk
-
- #
- # Libraries to link
- #
- OTHER_LDLIBS = -ldl
-
- # Default config file
- UCRYPTO_CFG_SRC = $(CLOSED_SRC)/share/lib/security/ucrypto-solaris.cfg
- UCRYPTO_CFG_BUILD = $(LIBDIR)/security/ucrypto-solaris.cfg
-
- #
- # We use a variety of subdirectories in the $(TEMPDIR) depending on what
- # part of the build we're doing. Build is initially done in the unsigned
- # area and when files are signed, they will be placed in the appropriate area.
- #
- UNSIGNED_DIR = $(TEMPDIR)/unsigned
-
- #
- # Rules
- #
- all: ucrypto-cfg build-jar install-prebuilt
- $(build-warning)
-
- ucrypto-cfg: $(UCRYPTO_CFG_BUILD)
-
- $(UCRYPTO_CFG_BUILD): $(UCRYPTO_CFG_SRC)
- $(install-file)
-
- include $(BUILDDIR)/javax/crypto/Defs-jce.gmk
-
-
- # =====================================================
- # Build the unsigned ucrypto.jar file.
- #
-
- JAR_DESTFILE = $(EXTDIR)/ucrypto.jar
-
- #
- # The ucrypto.jar needs to be in the extension class directory,
- # therefore none of its classes can appear in $(CLASSBINDIR).
- # Currently no one is using any of the internals, so these files
- # should not have been built.
- #
-
- #
- # Since the -C option to jar is used below, each directory entry must be
- # preceded with the appropriate directory to "cd" into.
- #
- JAR_DIRS = $(patsubst %, -C $(CLASSDESTDIR) %, $(AUTO_FILES_JAVA_DIRS))
-
- build-jar: $(UNSIGNED_DIR)/ucrypto.jar
-
- #
- # Build ucrypto.jar.
- #
- $(UNSIGNED_DIR)/ucrypto.jar: build $(JCE_MANIFEST_FILE)
- $(prep-target)
- $(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ $(JAR_DIRS) \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
- #
- # Sign ucrypto.jar
- #
- SIGNED_DIR = $(JCE_BUILD_DIR)/signed
-
- sign: $(SIGNED_DIR)/ucrypto.jar
-
- ifndef ALT_JCE_BUILD_DIR
- $(SIGNED_DIR)/ucrypto.jar: $(UNSIGNED_DIR)/ucrypto.jar
- else
- #
- # We have to remove the build dependency, otherwise, we'll try to rebuild it
- # which we can't do on a read-only filesystem.
- #
- $(SIGNED_DIR)/ucrypto.jar:
- @if [ ! -r $(UNSIGNED_DIR)/ucrypto.jar ] ; then \
- $(ECHO) "Couldn't find $(UNSIGNED_DIR)/ucrypto.jar"; \
- exit 1; \
- fi
- endif
- $(call sign-file, $(UNSIGNED_DIR)/ucrypto.jar)
-
-
- # =====================================================
- # Create the Release Engineering files. Signed builds, etc.
- #
-
- release: $(SIGNED_DIR)/ucrypto.jar
- $(RM) $(JCE_BUILD_DIR)/release/ucrypto.jar
- $(MKDIR) -p $(JCE_BUILD_DIR)/release
- $(CP) $(SIGNED_DIR)/ucrypto.jar $(JCE_BUILD_DIR)/release
- $(release-warning)
-
-
- # =====================================================
- # Install routines.
- #
-
- #
- # Install ucrypto.jar, depending on which type is requested.
- #
- jar: $(JAR_DESTFILE)
- $(release-warning)
-
- $(JAR_DESTFILE): $(SIGNED_DIR)/ucrypto.jar
- $(install-file)
-
- install-prebuilt:
- @$(ECHO) "\n>>>Installing prebuilt OracleUcrypto provider..."
- $(RM) $(JAR_DESTFILE)
- $(CP) $(PREBUILT_DIR)/ucrypto/ucrypto.jar $(JAR_DESTFILE)
-
-
- # =====================================================
- # Support routines.
- #
- clobber clean::
- $(RM) -r $(JAR_DESTFILE) $(TEMPDIR) $(JCE_BUILD_DIR)
- $(RM) -r $(UCRYPTO_CFG_BUILD)
-
- .PHONY: build-jar jar sign release install-prebuilt
-
- endif #ifneq ($(PLATFORM), solaris)
-endif #ifndef OPENJDK
diff --git a/jdk/make/com/oracle/security/ucrypto/mapfile-vers b/jdk/make/com/oracle/security/ucrypto/mapfile-vers
deleted file mode 100644
index 1891d77..0000000
--- a/jdk/make/com/oracle/security/ucrypto/mapfile-vers
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
- Java_com_oracle_security_ucrypto_UcryptoProvider_loadLibraries;
- Java_com_oracle_security_ucrypto_UcryptoProvider_getMechList;
- Java_com_oracle_security_ucrypto_NativeDigest_nativeInit;
- Java_com_oracle_security_ucrypto_NativeDigest_nativeUpdate;
- Java_com_oracle_security_ucrypto_NativeDigest_nativeDigest;
- Java_com_oracle_security_ucrypto_NativeDigest_nativeClone;
- Java_com_oracle_security_ucrypto_NativeDigest_nativeFree;
- Java_com_oracle_security_ucrypto_NativeCipher_nativeInit;
- Java_com_oracle_security_ucrypto_NativeCipher_nativeUpdate;
- Java_com_oracle_security_ucrypto_NativeCipher_nativeFinal;
- Java_com_oracle_security_ucrypto_NativeKey_nativeFree;
- Java_com_oracle_security_ucrypto_NativeKey_00024RSAPrivateCrt_nativeInit;
- Java_com_oracle_security_ucrypto_NativeKey_00024RSAPublic_nativeInit;
- Java_com_oracle_security_ucrypto_NativeRSASignature_nativeInit;
- Java_com_oracle_security_ucrypto_NativeRSASignature_nativeUpdate__JZ_3BII;
- Java_com_oracle_security_ucrypto_NativeRSASignature_nativeUpdate__JZJI;
- Java_com_oracle_security_ucrypto_NativeRSASignature_nativeFinal;
- Java_com_oracle_security_ucrypto_NativeRSACipher_nativeAtomic;
-
- JavaCritical_com_oracle_security_ucrypto_NativeDigest_nativeInit;
- JavaCritical_com_oracle_security_ucrypto_NativeDigest_nativeUpdate;
- JavaCritical_com_oracle_security_ucrypto_NativeDigest_nativeDigest;
- JavaCritical_com_oracle_security_ucrypto_NativeDigest_nativeClone;
- JavaCritical_com_oracle_security_ucrypto_NativeDigest_nativeFree;
- JavaCritical_com_oracle_security_ucrypto_NativeCipher_nativeInit;
- JavaCritical_com_oracle_security_ucrypto_NativeCipher_nativeUpdate;
- JavaCritical_com_oracle_security_ucrypto_NativeCipher_nativeFinal;
- JavaCritical_com_oracle_security_ucrypto_NativeKey_nativeFree;
- JavaCritical_com_oracle_security_ucrypto_NativeKey_00024RSAPrivateCrt_nativeInit;
- JavaCritical_com_oracle_security_ucrypto_NativeKey_00024RSAPublic_nativeInit;
- JavaCritical_com_oracle_security_ucrypto_NativeRSASignature_nativeInit;
- JavaCritical_com_oracle_security_ucrypto_NativeRSASignature_nativeUpdate__JZ_3BII;
- JavaCritical_com_oracle_security_ucrypto_NativeRSASignature_nativeUpdate__JZJI;
- JavaCritical_com_oracle_security_ucrypto_NativeRSASignature_nativeFinal;
- JavaCritical_com_oracle_security_ucrypto_NativeRSACipher_nativeAtomic;
-
- local:
- *;
-};
diff --git a/jdk/make/com/oracle/util/Makefile b/jdk/make/com/oracle/util/Makefile
deleted file mode 100644
index f4022ba..0000000
--- a/jdk/make/com/oracle/util/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.oracle.util
-PRODUCT = oracle
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = com/oracle/util
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/Makefile b/jdk/make/com/sun/Makefile
deleted file mode 100644
index e33b27f..0000000
--- a/jdk/make/com/sun/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building com/sun
-#
-
-BUILDDIR = ../..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-# jarsigner is part of JRE
-SUBDIRS = java security net/ssl jarsigner
-
-SUBDIRS_management = jmx
-SUBDIRS_desktop = image
-SUBDIRS_enterprise = crypto/provider jndi \
- org rowset net/httpserver
-SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing nio demo
-
-SUBDIRS_tools = tools
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/com/sun/crypto/provider/Makefile b/jdk/make/com/sun/crypto/provider/Makefile
deleted file mode 100644
index 93a0b13..0000000
--- a/jdk/make/com/sun/crypto/provider/Makefile
+++ /dev/null
@@ -1,275 +0,0 @@
-#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building sunjce_provider.jar.
-#
-# This file was derived from make/javax/crypto/Makefile.
-#
-
-#
-# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Sun JDK builds
-# respectively.)
-#
-# JCE builds are very different between OpenJDK and JDK. The OpenJDK JCE
-# jar files do not require signing, but those for JDK do. If an unsigned
-# jar file is installed into JDK, things will break when the crypto
-# routines are called.
-#
-# This Makefile does the "real" build of the JCE files. There are some
-# javac options currently specific to JCE, so we recompile now to make
-# sure any implicit compilations didn't use any incorrect flags.
-#
-# For OpenJDK, the jar files built here are installed directly into the
-# OpenJDK.
-#
-# For JDK, the binaries use pre-built/pre-signed binary files stored in
-# the closed workspace that are not shipped in the OpenJDK workspaces.
-# We still build the JDK files here to verify the files compile, and in
-# preparation for possible signing. Developers working on JCE in JDK
-# must sign the JCE files before testing. The JCE signing key is kept
-# separate from the JDK workspace to prevent its disclosure.
-#
-# SPECIAL NOTE TO JCE/JDK developers: The source files must eventually
-# be built and signed, and the resulting jar files MUST BE CHECKED INTO
-# THE CLOSED PART OF THE WORKSPACE*. This separate step *MUST NOT BE
-# FORGOTTEN*, otherwise a bug fixed in the source code will not be
-# reflected in the shipped binaries. The "release" target should be
-# used to generate the required files.
-#
-# There are a number of targets to help both JDK/OpenJDK developers.
-#
-# Main Targets (JDK/OPENJDK):
-#
-# all/clobber/clean The usual.
-# If OpenJDK, installs sunjce_provider.jar.
-# If JDK, installs prebuilt
-# sunjce_provider.jar.
-#
-# jar Builds/installs sunjce_provider.jar
-# If OpenJDK, does not sign.
-# If JDK, tries to sign.
-#
-# Other lesser-used Targets (JDK/OPENJDK):
-#
-# build-jar Builds sunjce_provider.jar
-# (does not sign/install)
-#
-# install-jar Alias for "jar" above.
-#
-# Other targets (JDK only):
-#
-# sign Alias for sign-jar
-# sign-jar Builds/signs sunjce_provider.jar (no install)
-#
-# release Builds all targets in preparation
-# for workspace integration.
-#
-# install-prebuilt Installs the pre-built jar files
-#
-# This makefile was written to support parallel target execution.
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.crypto.provider
-PRODUCT = sun
-
-#
-# The following is for when we need to do postprocessing
-# (signing) against a read-only build. If the OUTPUTDIR
-# isn't writable, the build currently crashes out.
-#
-ifndef OPENJDK
- ifdef ALT_JCE_BUILD_DIR
- # =====================================================
- # Where to place the output, in case we're building from a read-only
- # build area. (e.g. a release engineering build.)
- JCE_BUILD_DIR=${ALT_JCE_BUILD_DIR}
- IGNORE_WRITABLE_OUTPUTDIR_TEST=true
- else
- JCE_BUILD_DIR=${TEMPDIR}
- endif
-endif
-
-JAVAC_MAX_WARNINGS = false
-JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation
-JAVAC_WARNINGS_FATAL = true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Location for the newly built classfiles.
-#
-CLASSDESTDIR = $(TEMPDIR)/classes
-
-#
-# Subdirectories of these are automatically included.
-#
-AUTO_FILES_JAVA_DIRS = \
- com/sun/crypto/provider
-
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Rules
-#
-
-#
-# Some licensees do not get the security sources, but we still need to
-# be able to build "all" for them. Check here to see if the sources were
-# available. If not, then we don't need to continue this rule.
-#
-
-ifdef OPENJDK
-all: build-jar install-jar
-else # OPENJDK
-ifeq ($(strip $(FILES_java)),)
-all: install-prebuilt
- $(no-source-warning)
-else # FILES_java available
-all: build-jar install-prebuilt
- $(build-warning)
-endif # $(FILES_java) available
-endif # OPENJDK
-
-#
-# We use a variety of subdirectories in the $(TEMPDIR) depending on what
-# part of the build we're doing. Both OPENJDK/JDK builds are initially
-# done in the unsigned area. When files are signed in JDK, they will be
-# placed in the appropriate areas.
-#
-UNSIGNED_DIR = $(TEMPDIR)/unsigned
-
-include $(BUILDDIR)/javax/crypto/Defs-jce.gmk
-
-
-# =====================================================
-# Build the unsigned sunjce_provider.jar file.
-#
-
-JAR_DESTFILE = $(EXTDIR)/sunjce_provider.jar
-
-#
-# The sunjce_provider.jar needs to be in the extension class directory,
-# therefore none of its classes should appear in $(CLASSBINDIR).
-# Currently no one is using any of the SunJCE internals, so these files
-# should not have been built.
-#
-
-#
-# Since the -C option to jar is used below, each directory entry must be
-# preceded with the appropriate directory to "cd" into.
-#
-JAR_DIRS = $(patsubst %, -C $(CLASSDESTDIR) %, $(AUTO_FILES_JAVA_DIRS))
-
-build-jar: $(UNSIGNED_DIR)/sunjce_provider.jar
-
-#
-# Build sunjce_provider.jar.
-#
-$(UNSIGNED_DIR)/sunjce_provider.jar: build $(JCE_MANIFEST_FILE)
- $(prep-target)
- $(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ $(JAR_DIRS) \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-
-ifndef OPENJDK
-# =====================================================
-# Sign the provider jar file. Not needed for OpenJDK.
-#
-
-SIGNED_DIR = $(JCE_BUILD_DIR)/signed
-
-sign: sign-jar
-
-sign-jar: $(SIGNED_DIR)/sunjce_provider.jar
-
-ifndef ALT_JCE_BUILD_DIR
-$(SIGNED_DIR)/sunjce_provider.jar: $(UNSIGNED_DIR)/sunjce_provider.jar
-else
-#
-# We have to remove the build dependency, otherwise, we'll try to rebuild it
-# which we can't do on a read-only filesystem.
-#
-$(SIGNED_DIR)/sunjce_provider.jar:
- @if [ ! -r $(UNSIGNED_DIR)/sunjce_provider.jar ] ; then \
- $(ECHO) "Couldn't find $(UNSIGNED_DIR)/sunjce_provider.jar"; \
- exit 1; \
- fi
-endif
- $(call sign-file, $(UNSIGNED_DIR)/sunjce_provider.jar)
-
-
-# =====================================================
-# Create the Release Engineering files. Signed builds, etc.
-#
-
-release: $(SIGNED_DIR)/sunjce_provider.jar
- $(RM) $(JCE_BUILD_DIR)/release/sunjce_provider.jar
- $(MKDIR) -p $(JCE_BUILD_DIR)/release
- $(CP) $(SIGNED_DIR)/sunjce_provider.jar $(JCE_BUILD_DIR)/release
- $(release-warning)
-
-endif # OPENJDK
-
-
-# =====================================================
-# Install routines.
-#
-
-#
-# Install sunjce_provider.jar, depending on which type is requested.
-#
-install-jar jar: $(JAR_DESTFILE)
-ifndef OPENJDK
- $(release-warning)
-endif
-
-ifdef OPENJDK
-$(JAR_DESTFILE): $(UNSIGNED_DIR)/sunjce_provider.jar
-else
-$(JAR_DESTFILE): $(SIGNED_DIR)/sunjce_provider.jar
-endif
- $(install-file)
-
-ifndef OPENJDK
-install-prebuilt:
- @$(ECHO) "\n>>>Installing prebuilt SunJCE provider..."
- $(RM) $(JAR_DESTFILE)
- $(CP) $(PREBUILT_DIR)/jce/sunjce_provider.jar $(JAR_DESTFILE)
-endif
-
-
-# =====================================================
-# Support routines.
-#
-
-clobber clean::
- $(RM) -r $(JAR_DESTFILE) $(TEMPDIR) $(JCE_BUILD_DIR)
-
-.PHONY: build-jar jar install-jar
-ifndef OPENJDK
-.PHONY: sign sign-jar release install-prebuilt
-endif
diff --git a/jdk/make/com/sun/demo/Makefile b/jdk/make/com/sun/demo/Makefile
deleted file mode 100644
index e86dbbb..0000000
--- a/jdk/make/com/sun/demo/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# - Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# - Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# - Neither the name of Oracle nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# Makefile for building demo classes
-#
-
-BUILDDIR = ../../..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = jvmti
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/com/sun/demo/jvmti/Makefile b/jdk/make/com/sun/demo/jvmti/Makefile
deleted file mode 100644
index b657163..0000000
--- a/jdk/make/com/sun/demo/jvmti/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# - Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# - Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# - Neither the name of Oracle nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# Makefile for building demo jvmti classes
-#
-
-BUILDDIR = ../../../..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = hprof
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/com/sun/demo/jvmti/hprof/Makefile b/jdk/make/com/sun/demo/jvmti/hprof/Makefile
deleted file mode 100644
index c9006b0..0000000
--- a/jdk/make/com/sun/demo/jvmti/hprof/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# - Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# - Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# - Neither the name of Oracle nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-BUILDDIR = ../../../../..
-PACKAGE = com.sun.demo.jvmti.hprof
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = com/sun/demo/jvmti/hprof
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-all: classes
diff --git a/jdk/make/com/sun/image/Makefile b/jdk/make/com/sun/image/Makefile
deleted file mode 100644
index 3b163e1..0000000
--- a/jdk/make/com/sun/image/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# makefile for building JPEG classes
-
-BUILDDIR = ../../..
-PACKAGE = com.sun.image.codec.jpeg
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = com/sun/image/codec/jpeg
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/jarsigner/Makefile b/jdk/make/com/sun/jarsigner/Makefile
deleted file mode 100644
index b42dd90..0000000
--- a/jdk/make/com/sun/jarsigner/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.sun.jarsigner
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-AUTO_FILES_JAVA_DIRS = com/sun/jarsigner
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/java/Makefile b/jdk/make/com/sun/java/Makefile
deleted file mode 100644
index 1294f54..0000000
--- a/jdk/make/com/sun/java/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ../../..
-PRODUCT = plugin
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = pack
-SUBDIRS_misc = browser
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/com/sun/java/browser/Makefile b/jdk/make/com/sun/java/browser/Makefile
deleted file mode 100644
index 6efd52b..0000000
--- a/jdk/make/com/sun/java/browser/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ../../../..
-PRODUCT = plugin
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = dom net
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/com/sun/java/browser/dom/Makefile b/jdk/make/com/sun/java/browser/dom/Makefile
deleted file mode 100644
index f93df6c..0000000
--- a/jdk/make/com/sun/java/browser/dom/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# makefile for building Common DOM classes
-
-BUILDDIR = ../../../../..
-PACKAGE = com.sun.java.browser.dom
-PRODUCT = plugin
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = com/sun/java/browser/dom
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/java/browser/net/Makefile b/jdk/make/com/sun/java/browser/net/Makefile
deleted file mode 100644
index 6e281dd..0000000
--- a/jdk/make/com/sun/java/browser/net/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# makefile for building browser proxy service classes
-
-BUILDDIR = ../../../../..
-PACKAGE = com.sun.java.browser.net
-PRODUCT = plugin
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = com/sun/java/browser/net
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/java/pack/FILES_cpp.gmk b/jdk/make/com/sun/java/pack/FILES_cpp.gmk
deleted file mode 100644
index 77a1bf6..0000000
--- a/jdk/make/com/sun/java/pack/FILES_cpp.gmk
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-FILES_cpp = \
- bands.cpp \
- bytes.cpp \
- coding.cpp \
- jni.cpp \
- unpack.cpp \
- utils.cpp \
- zip.cpp
diff --git a/jdk/make/com/sun/java/pack/Makefile b/jdk/make/com/sun/java/pack/Makefile
deleted file mode 100644
index d51a142..0000000
--- a/jdk/make/com/sun/java/pack/Makefile
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building Pack200
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.java.util.jar.pack
-LIBRARY = unpack
-PRODUCT = sun
-PGRM = unpack200
-JAVAC_MAX_WARNINGS=true
-JAVAC_WARNINGS_FATAL=true
-include $(BUILDDIR)/common/Defs.gmk
-
-CPLUSPLUSLIBRARY=true
-
-FILES_m = mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = com/sun/java/util/jar/pack
-
-include FILES_cpp.gmk
-
-FILES_export = $(PKGDIR)/NativeUnpack.java
-
-#
-# Rules
-include $(BUILDDIR)/common/Library.gmk
-
-build: unpacker
-
-vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
-
-ifeq ($(STANDALONE),true)
- ifneq ($(SYSTEM_ZLIB),true)
- ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
-
- ZIPOBJS = $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
- $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
- $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
- $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
- $(ZIPOBJDIR)/compress.$(OBJECT_SUFFIX) \
- $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
- $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
- $(ZIPOBJDIR)/infback.$(OBJECT_SUFFIX) \
- $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
- $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
-
- ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
- OTHER_CXXFLAGS += $(ZINCLUDE)
- LDDFLAGS += $(ZIPOBJS)
- else
- LDDFLAGS += $(ZLIB_LIBS)
- OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB
- endif
-else
- OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
- OTHER_LDLIBS += $(JVMLIB)
-endif
-
-CXXFLAGS_DBG += -DFULL
-CXXFLAGS_OPT += -DPRODUCT
-CXXFLAGS_COMMON += -DFULL
-
-ifeq ($(PLATFORM), windows)
- CXXFLAGS_COMMON += $(MS_RUNTIME_OPTION)
- LDOUTPUT = -Fe
-
- # JDK name required here
- RC_FLAGS += -D "JDK_FNAME=$(PGRM).exe" \
- -D "JDK_INTERNAL_NAME=$(PGRM)" \
- -D "JDK_FTYPE=0x1L"
-
- RES = $(OBJDIR)/$(PGRM).res
-else
- LDOUTPUT = -o #Have a space
- LDDFLAGS += -lc
- OTHER_LDLIBS += $(LIBCXX)
-# setup the list of libraries to link in...
-ifeq ($(PLATFORM), linux)
-ifeq ("$(CC_VER_MAJOR)", "3")
- OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
-endif
-endif #LINUX
-endif #PLATFORM
-
-UNPACK_EXE = $(BINDIR)/unpack200$(EXE_SUFFIX)
-
-UNPACK_EXE_FILES_cpp = $(filter-out jni.cpp,$(FILES_cpp))
-
-UNPACK_EXE_FILES_cpp += main.cpp
-
-UNPACK_EXE_FILES_o = $(addprefix $(COBJDIR)/, \
- $(notdir \
- $(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(UNPACK_EXE_FILES_cpp)) \
- ))
-
-COBJDIR = $(strip $(subst unpack,unpack-cmd,$(OBJDIR)))
-
-all: build
-
-build: prop pack200-tool
-
-prop:
- $(MAKE) -C prop
-
-pack200-tool:
- $(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack)
-
-# ignore mapfile for non-product binary
-unpacker:
- $(MAKE) $(UNPACK_EXE) STANDALONE=true LDMAPFLAGS_DBG=
-
-ifeq ($(PLATFORM), windows)
-IMVERSIONVALUE=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
-SED_ALL_MANIFEST=$(SED) -e 's%IMVERSION%$(IMVERSIONVALUE)%g'
-updatefiles::
- $(CAT) $(TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest | $(SED_ALL_MANIFEST) > $(OBJDIR)/unpack200.exe.manifest
-winres:: $(RES)
-else
-updatefiles::
- $(ECHO) "Manifest not required for Unix"
-winres::
- $(ECHO) "Resource files not required for Unix"
-endif
-
-# Mapfile-vers.gmk, does not copy over the mapfile-vers-unpack200, when
-# the make utiliy is re-invoked, as in this case. In order to workaround
-# this special case, the mapfile required for the unpack200 command, is
-# explicitly copied over to the expected location.
-$(UNPACK_EXE): $(UNPACK_EXE_FILES_o) updatefiles winres
- $(prep-target)
- $(RM) $(TEMPDIR)/mapfile-vers
- $(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers
- $(LINKER) $(LDDFLAGS) $(sort $(UNPACK_EXE_FILES_o)) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
-ifdef MT
- $(MT) -manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest -outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
-endif
- $(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
- @$(call binary_file_verification,$@)
-
-ifeq ($(PLATFORM), windows)
-$(RES):: $(VERSIONINFO_RESOURCE)
- $(prep-target)
- $(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(@) $(VERSIONINFO_RESOURCE)
-endif
-
-$(COBJDIR)/%.$(OBJECT_SUFFIX): %.cpp
- $(prep-target)
- $(COMPILE.cc) $(CC_OBJECT_OUTPUT_FLAG)$(COBJDIR)/$*.$(OBJECT_SUFFIX) $<
-
-#
-# Clean up.
-#
-clean::
- $(RM) -r $(CLASSDESTDIR)/com/sun/java/util/jar/pack $(TEMPDIR)
- $(RM) -r $(OUTPUTDIR)/tmp/$(PRODUCT)/$(PACKAGE)
- $(MAKE) -C prop clean
-
-.PHONY: unpacker clean winres prop
diff --git a/jdk/make/com/sun/java/pack/mapfile-vers b/jdk/make/com/sun/java/pack/mapfile-vers
deleted file mode 100644
index d03332c..0000000
--- a/jdk/make/com/sun/java/pack/mapfile-vers
+++ /dev/null
@@ -1,40 +0,0 @@
-
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- global:
- Java_com_sun_java_util_jar_pack_NativeUnpack_finish;
- Java_com_sun_java_util_jar_pack_NativeUnpack_getNextFile;
- Java_com_sun_java_util_jar_pack_NativeUnpack_getOption;
- Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput;
- Java_com_sun_java_util_jar_pack_NativeUnpack_initIDs;
- Java_com_sun_java_util_jar_pack_NativeUnpack_setOption;
- Java_com_sun_java_util_jar_pack_NativeUnpack_start;
- local:
- *;
-};
diff --git a/jdk/make/com/sun/java/pack/mapfile-vers-unpack200 b/jdk/make/com/sun/java/pack/mapfile-vers-unpack200
deleted file mode 100644
index 8a659d3..0000000
--- a/jdk/make/com/sun/java/pack/mapfile-vers-unpack200
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- local:
- *;
-};
diff --git a/jdk/make/com/sun/java/pack/prop/Makefile b/jdk/make/com/sun/java/pack/prop/Makefile
deleted file mode 100644
index 0cb898d..0000000
--- a/jdk/make/com/sun/java/pack/prop/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building intrinsic.properties for Pack200
-# Unfortunately this file needs to be on its own due
-# to a collision of rules with Classes.gmk and Library.gmk
-
-BUILDDIR = ../../../../..
-PACKAGE = com.sun.java.util.jar.pack
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-OTHER_PROPERTIES = $(PKGDIR)/intrinsic.properties
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/jmx/Makefile b/jdk/make/com/sun/jmx/Makefile
deleted file mode 100644
index 02ef6b0..0000000
--- a/jdk/make/com/sun/jmx/Makefile
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building RMI stubs of JMX Remote
-#
-
-BUILDDIR = ../../..
-PACKAGE = javax.management
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-
-# NO java files to compile: already compiled in javax/management/Makefile
-
-# Note : some targets are double colon rules and some single colon rules
-# within common included gmk files : that is why the following for loop
-# has been duplicated.
-
-# When building the openjdk, no snmp
-ifndef OPENJDK
- SUBDIRS = snmp
-endif
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build:
- $(SUBDIRS-loop)
-
-clean clobber::
- $(SUBDIRS-loop)
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-build: stubs
-
-#
-# Clean up internal-use-only package.
-#
-clean ::
- $(RM) -r $(CLASSDESTDIR)/com/sun/jmx \
- $(CLASSDESTDIR)/com/sun/management/jmx \
- $(CLASSDESTDIR)/org/omg/stub/javax/management/remote/rmi \
-
-
-#
-# The remainder of this makefile contains defs and rules
-# for generating RMI stubs.
-# With inspiration from com/sun/jndi/rmi/registry
-#
-
-#
-# Full class names of implementations requiring stubs
-#
-REMOTE_impls = \
- javax.management.remote.rmi.RMIConnectionImpl \
- javax.management.remote.rmi.RMIServerImpl \
-
-
-REMOTE_files = $(subst .,/,$(REMOTE_impls))
-FILES_stubs = $(REMOTE_files:%=$(CLASSDESTDIR)/%_Stub.class)
-FILES_ties = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/_,$(REMOTE_files:%=$(CLASSDESTDIR)/%_Tie.class))
-
-
-#
-# Compile stubs and skeletons for remote implementations
-#
-# Keep generated RMI/JRMP Stub source files and copy them to GENSRCDIR
-# so that javadoc can include them in the API (4997471)
-#
-# 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)
-#
-# To ensure the latest stub generator files are picked up from corba repo
-# when available, we need to run with latest rmic version available. rmic
-# launch tool not built at this stage but we can invoke via rmi class.
-
-RMIC_JAVA = $(OUTPUTDIR)/bin/java
-# need to treat 64bit solaris differently
-ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
-RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
-endif
-ifeq ($(PLATFORM)-$(LIBARCH), solaris-sparcv9)
-RMIC_JAVA = $(OUTPUTDIR)/bin/sparcv9/java
-endif
-
-ifeq ($(CROSS_COMPILE_ARCH),)
-RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
-endif
-
-$(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
- $(prep-target)
- $(RMIC) -classpath "$(CLASSDESTDIR)" \
- -d $(CLASSDESTDIR) \
- -v1.2 \
- -keepgenerated \
- $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
- $(MKDIR) -p $(@D:$(CLASSDESTDIR)/%=$(GENSRCDIR)/%)
- $(CP) $(@:%.class=%.java) \
- $(@D:$(CLASSDESTDIR)/%=$(GENSRCDIR)/%)
- $(RMIC) -classpath "$(CLASSDESTDIR)" \
- -d $(CLASSDESTDIR) \
- -iiop -v1.2 \
- -emitPermissionCheck \
- $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
- $(RMIC) $(HOTSPOT_INTERPRETER_FLAG) -classpath "$(CLASSDESTDIR)" \
- -d $(CLASSDESTDIR) \
- -iiop -v1.2 \
- -standardPackage \
- -emitPermissionCheck \
- $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
- @$(java-vm-cleanup)
-
-stubs: $(FILES_stubs)
diff --git a/jdk/make/com/sun/jmx/snmp/Makefile b/jdk/make/com/sun/jmx/snmp/Makefile
deleted file mode 100644
index 453d76b..0000000
--- a/jdk/make/com/sun/jmx/snmp/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building SNMP runtime support for
-# Sun-specific JDK out of the box management support.
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.jmx.snmp
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = com/sun/jmx/snmp
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/jndi/Makefile b/jdk/make/com/sun/jndi/Makefile
deleted file mode 100644
index aa3780b..0000000
--- a/jdk/make/com/sun/jndi/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JNDI service providers
-#
-
-BUILDDIR = ../../..
-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
-SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = toolkit cosnaming ldap rmi dns
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR)/com/sun/jndi
diff --git a/jdk/make/com/sun/jndi/cosnaming/Makefile b/jdk/make/com/sun/jndi/cosnaming/Makefile
deleted file mode 100644
index f8e9bf8..0000000
--- a/jdk/make/com/sun/jndi/cosnaming/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JNDI COS Naming service provider
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.jndi.cosnaming
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Resources
-#
-OTHER_PROPERTIES = $(PKGDIR)/jndiprovider.properties
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = com/sun/jndi/cosnaming com/sun/jndi/url
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/jndi/dns/Makefile b/jdk/make/com/sun/jndi/dns/Makefile
deleted file mode 100644
index bc41218..0000000
--- a/jdk/make/com/sun/jndi/dns/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JNDI DNS Naming service provider
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.jndi.dns
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = com/sun/jndi/dns com/sun/jndi/url/dns
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/jndi/ldap/Makefile b/jdk/make/com/sun/jndi/ldap/Makefile
deleted file mode 100644
index 798ac6c..0000000
--- a/jdk/make/com/sun/jndi/ldap/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JNDI LDAP service provider
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.jndi.ldap
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Resources
-#
-OTHER_PROPERTIES = $(PKGDIR)/jndiprovider.properties
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = com/sun/jndi/ldap com/sun/jndi/url/ldap
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/jndi/rmi/Makefile b/jdk/make/com/sun/jndi/rmi/Makefile
deleted file mode 100644
index 3fc3a09..0000000
--- a/jdk/make/com/sun/jndi/rmi/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JNDI RMI registry service provider
-#
-
-BUILDDIR = ../../../..
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = registry
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR)/com/sun/jndi/rmi
diff --git a/jdk/make/com/sun/jndi/rmi/registry/Makefile b/jdk/make/com/sun/jndi/rmi/registry/Makefile
deleted file mode 100644
index 03dc25a..0000000
--- a/jdk/make/com/sun/jndi/rmi/registry/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JNDI RMI registry service provider
-#
-
-BUILDDIR = ../../../../..
-PACKAGE = com.sun.jndi.rmi.registry
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = com/sun/jndi/rmi/registry com/sun/jndi/url/rmi
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-build: stubs
-
-#
-# The remainder of this makefile contains defs and rules
-# for generating RMI stubs.
-# With inspiration from build/solaris/sun/rmi/rmi/GNUmakefile.
-#
-
-#
-# Full class names of implementations requiring stubs
-#
-REMOTE_impls = \
- $(PACKAGE).ReferenceWrapper
-
-REMOTE_files = $(subst .,/,$(REMOTE_impls))
-FILES_stubs = $(REMOTE_files:%=$(CLASSDESTDIR)/%_Stub.class)
-FILES_skels = $(REMOTE_files:%=$(CLASSDESTDIR)/%_Skel.class)
-
-#
-# Compile stubs and skeletons for remote implementations
-#
-$(CLASSDESTDIR)/%_Skel.class $(CLASSDESTDIR)/%_Stub.class: \
- $(CLASSDESTDIR)/%.class
- $(RMIC) -classpath "$(CLASSDESTDIR)" \
- -d $(CLASSDESTDIR) \
- $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
- @$(java-vm-cleanup)
-
-stubs: $(FILES_stubs) $(FILES_skels)
diff --git a/jdk/make/com/sun/jndi/toolkit/Makefile b/jdk/make/com/sun/jndi/toolkit/Makefile
deleted file mode 100644
index 160120d..0000000
--- a/jdk/make/com/sun/jndi/toolkit/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JNDI service provider toolkit
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.jndi.toolkit
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = com/sun/jndi/toolkit
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/com/sun/net/httpserver/Makefile b/jdk/make/com/sun/net/httpserver/Makefile
deleted file mode 100644
index 2d2e6b8..0000000
--- a/jdk/make/com/sun/net/httpserver/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.net.httpserver
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = com/sun/net/httpserver sun/net/httpserver
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/com/sun/net/ssl/Makefile b/jdk/make/com/sun/net/ssl/Makefile
deleted file mode 100644
index 47539d7..0000000
--- a/jdk/make/com/sun/net/ssl/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.net.ssl
-PRODUCT = sun
-JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-# Note that we implicitly includes the files in com/sun/net/ssl/internal/ssl.
-# They are also compiled by make/sun/security/other/Makefile and logically
-# belong there, but compiling them here as well is fine, too.
-#
-AUTO_FILES_JAVA_DIRS = \
- com/sun/security/cert \
- com/sun/net/ssl
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/com/sun/nio/Makefile b/jdk/make/com/sun/nio/Makefile
deleted file mode 100644
index 6fccab2..0000000
--- a/jdk/make/com/sun/nio/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for com.sun.nio packages.
-#
-
-BUILDDIR = ../../..
-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
-SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-include $(BUILDDIR)/common/Defs.gmk
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-ifneq ($(PLATFORM), macosx)
-SUBDIRS = sctp
-endif
-
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR)/com/sun/nio
diff --git a/jdk/make/com/sun/nio/sctp/Exportedfiles.gmk b/jdk/make/com/sun/nio/sctp/Exportedfiles.gmk
deleted file mode 100644
index f8ec6fb..0000000
--- a/jdk/make/com/sun/nio/sctp/Exportedfiles.gmk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# These are the names of Java classes for which we will make .h files.
-#
-
-ifneq ($(PLATFORM), windows)
-FILES_export = \
- sun/nio/ch/sctp/AssociationChange.java \
- sun/nio/ch/sctp/SctpChannelImpl.java \
- sun/nio/ch/sctp/SctpNet.java \
- sun/nio/ch/sctp/PeerAddrChange.java \
- sun/nio/ch/sctp/ResultContainer.java \
- sun/nio/ch/sctp/SctpServerChannelImpl.java \
- sun/nio/ch/sctp/SctpStdSocketOption.java
-endif
diff --git a/jdk/make/com/sun/nio/sctp/FILES_c.gmk b/jdk/make/com/sun/nio/sctp/FILES_c.gmk
deleted file mode 100644
index 4189abd..0000000
--- a/jdk/make/com/sun/nio/sctp/FILES_c.gmk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-ifneq ($(PLATFORM),windows)
-FILES_c = \
- SctpNet.c \
- SctpChannelImpl.c \
- SctpServerChannelImpl.c
-endif
diff --git a/jdk/make/com/sun/nio/sctp/FILES_java.gmk b/jdk/make/com/sun/nio/sctp/FILES_java.gmk
deleted file mode 100644
index aa59a78..0000000
--- a/jdk/make/com/sun/nio/sctp/FILES_java.gmk
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-FILES_java = \
- com/sun/nio/sctp/AbstractNotificationHandler.java \
- com/sun/nio/sctp/Association.java \
- com/sun/nio/sctp/AssociationChangeNotification.java \
- com/sun/nio/sctp/HandlerResult.java \
- com/sun/nio/sctp/IllegalReceiveException.java \
- com/sun/nio/sctp/IllegalUnbindException.java \
- com/sun/nio/sctp/InvalidStreamException.java \
- com/sun/nio/sctp/MessageInfo.java \
- com/sun/nio/sctp/Notification.java \
- com/sun/nio/sctp/NotificationHandler.java \
- com/sun/nio/sctp/PeerAddressChangeNotification.java \
- com/sun/nio/sctp/SctpChannel.java \
- com/sun/nio/sctp/SctpMultiChannel.java \
- com/sun/nio/sctp/SctpServerChannel.java \
- com/sun/nio/sctp/SctpSocketOption.java \
- com/sun/nio/sctp/SctpStandardSocketOptions.java \
- com/sun/nio/sctp/SendFailedNotification.java \
- com/sun/nio/sctp/ShutdownNotification.java \
- \
- sun/nio/ch/sctp/MessageInfoImpl.java \
- sun/nio/ch/sctp/SctpStdSocketOption.java
-
-ifneq ($(PLATFORM), windows)
-FILES_java += \
- sun/nio/ch/sctp/AssociationChange.java \
- sun/nio/ch/sctp/AssociationImpl.java \
- sun/nio/ch/sctp/PeerAddrChange.java \
- sun/nio/ch/sctp/ResultContainer.java \
- sun/nio/ch/sctp/SctpChannelImpl.java \
- sun/nio/ch/sctp/SctpMultiChannelImpl.java \
- sun/nio/ch/sctp/SctpNet.java \
- sun/nio/ch/sctp/SctpNotification.java \
- sun/nio/ch/sctp/SctpServerChannelImpl.java \
- sun/nio/ch/sctp/SendFailed.java \
- sun/nio/ch/sctp/Shutdown.java
-else
-FILES_java += \
- sun/nio/ch/sctp/SctpChannelImpl.java \
- sun/nio/ch/sctp/SctpMultiChannelImpl.java \
- sun/nio/ch/sctp/SctpServerChannelImpl.java
-endif
diff --git a/jdk/make/com/sun/nio/sctp/Makefile b/jdk/make/com/sun/nio/sctp/Makefile
deleted file mode 100644
index 47fcfa8d..0000000
--- a/jdk/make/com/sun/nio/sctp/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for com.sun.nio.sctp
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.nio.sctp
-LIBRARY = sctp
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-include FILES_c.gmk
-include FILES_java.gmk
-include Exportedfiles.gmk
-
-ifneq ($(PLATFORM), windows)
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Find platform-specific C source files
-#
-vpath %.c $(PLATFORM_SRC)/native/sun/nio/ch/sctp
-
-#
-# Include nio.h, net_util.h, sun_nio_ch_IOStatus.h, etc
-#
-OTHER_INCLUDES += \
- -I$(SHARE_SRC)/native/sun/nio/ch \
- -I$(SHARE_SRC)/native/sun/nio/ch/sctp \
- -I$(SHARE_SRC)/native/java/net \
- -I$(PLATFORM_SRC)/native/sun/nio/ch \
- -I$(PLATFORM_SRC)/native/java/net \
- -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
-
-ifeq ($(PLATFORM), linux)
-COMPILER_WARNINGS_FATAL=true
-#OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
-endif
-ifeq ($(PLATFORM), solaris)
-#LIBSCTP = -lsctp
-OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
-endif # PLATFORM
-
-else # windows
-include $(BUILDDIR)/common/Classes.gmk
-endif # ifneq windows
-
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR)/com/sun/nio/sctp
- $(RM) -r $(CLASSDESTDIR)/sun/nio/ch/sctp
-
diff --git a/jdk/make/com/sun/nio/sctp/mapfile-vers b/jdk/make/com/sun/nio/sctp/mapfile-vers
deleted file mode 100644
index 4cd4c06..0000000
--- a/jdk/make/com/sun/nio/sctp/mapfile-vers
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-SUNWprivate_1.1 {
- global:
- Java_sun_nio_ch_sctp_SctpNet_init;
- Java_sun_nio_ch_sctp_SctpNet_socket0;
- Java_sun_nio_ch_sctp_SctpNet_bindx;
- Java_sun_nio_ch_sctp_SctpNet_branch0;
- Java_sun_nio_ch_sctp_SctpNet_listen0;
- Java_sun_nio_ch_sctp_SctpNet_connect0;
- Java_sun_nio_ch_sctp_SctpNet_close0;
- Java_sun_nio_ch_sctp_SctpNet_preClose0;
- Java_sun_nio_ch_sctp_SctpNet_getLocalAddresses0;
- Java_sun_nio_ch_sctp_SctpNet_getRemoteAddresses0;
- Java_sun_nio_ch_sctp_SctpNet_getPrimAddrOption0;
- Java_sun_nio_ch_sctp_SctpNet_setPrimAddrOption0;
- Java_sun_nio_ch_sctp_SctpNet_setPeerPrimAddrOption0;
- Java_sun_nio_ch_sctp_SctpNet_getInitMsgOption0;
- Java_sun_nio_ch_sctp_SctpNet_setInitMsgOption0;
- Java_sun_nio_ch_sctp_SctpNet_getIntOption0;
- Java_sun_nio_ch_sctp_SctpNet_setIntOption0;
- Java_sun_nio_ch_sctp_SctpNet_shutdown0;
- Java_sun_nio_ch_sctp_SctpChannelImpl_initIDs;
- Java_sun_nio_ch_sctp_SctpChannelImpl_checkConnect;
- Java_sun_nio_ch_sctp_SctpChannelImpl_receive0;
- Java_sun_nio_ch_sctp_SctpChannelImpl_send0;
- Java_sun_nio_ch_sctp_SctpServerChannelImpl_initIDs;
- Java_sun_nio_ch_sctp_SctpServerChannelImpl_accept0;
- JNI_OnLoad;
- local:
- *;
-};
diff --git a/jdk/make/com/sun/org/Makefile b/jdk/make/com/sun/org/Makefile
deleted file mode 100644
index 1d1e45a..0000000
--- a/jdk/make/com/sun/org/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building apache implementations
-#
-
-BUILDDIR = ../../..
-PRODUCT = org
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = apache
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/com/sun/org/apache/Makefile b/jdk/make/com/sun/org/apache/Makefile
deleted file mode 100644
index 51a320b..0000000
--- a/jdk/make/com/sun/org/apache/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building com.sun.org.apache code
-#
-
-BUILDDIR = ../../../..
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = xml
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
diff --git a/jdk/make/com/sun/org/apache/xml/Makefile b/jdk/make/com/sun/org/apache/xml/Makefile
deleted file mode 100644
index b3568e4..0000000
--- a/jdk/make/com/sun/org/apache/xml/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building com.sun.org.apache.xml
-#
-
-BUILDDIR = ../../../../..
-PACKAGE = com.sun.org.apache.xml
-PRODUCT = xml
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-include $(BUILDDIR)/common/Defs.gmk
-
-JAVAC_LINT_OPTIONS += -Xlint:-overrides
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = com/sun/org/apache/xml
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-NEW_RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = \
- $(PKGDIR)/internal/security/resource/config.dtd \
- $(PKGDIR)/internal/security/resource/config.xml \
- $(PKGDIR)/internal/security/resource/xmlsecurity_de.properties \
- $(PKGDIR)/internal/security/resource/xmlsecurity_en.properties \
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/rowset/Makefile b/jdk/make/com/sun/rowset/Makefile
deleted file mode 100644
index 53bbf0f..0000000
--- a/jdk/make/com/sun/rowset/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JDBC API and JDBC RowSet
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.sun.rowset
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-AUTO_FILES_JAVA_DIRS = com/sun/rowset
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/RowSetResourceBundle.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/security/Makefile b/jdk/make/com/sun/security/Makefile
deleted file mode 100644
index 85a919b..0000000
--- a/jdk/make/com/sun/security/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for com.sun.security packages.
-#
-
-BUILDDIR = ../../..
-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=false
-# TODO: Workaround for CR 7063027. Remove -path eventually.
-SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
-SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = auth
-SUBDIRS_misc = jgss sasl auth/module ntlm
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR)/com/sun/security
diff --git a/jdk/make/com/sun/security/auth/FILES_java.gmk b/jdk/make/com/sun/security/auth/FILES_java.gmk
deleted file mode 100644
index fa4f7d4..0000000
--- a/jdk/make/com/sun/security/auth/FILES_java.gmk
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_java = \
- com/sun/security/auth/login/ConfigFile.java \
- com/sun/security/auth/NTDomainPrincipal.java \
- com/sun/security/auth/NTNumericCredential.java \
- com/sun/security/auth/NTSid.java \
- com/sun/security/auth/NTSidDomainPrincipal.java \
- com/sun/security/auth/NTSidGroupPrincipal.java \
- com/sun/security/auth/NTSidPrimaryGroupPrincipal.java \
- com/sun/security/auth/NTSidUserPrincipal.java \
- com/sun/security/auth/NTUserPrincipal.java \
- com/sun/security/auth/SolarisNumericUserPrincipal.java \
- com/sun/security/auth/SolarisPrincipal.java \
- com/sun/security/auth/SolarisNumericGroupPrincipal.java \
- com/sun/security/auth/UnixNumericUserPrincipal.java \
- com/sun/security/auth/UnixPrincipal.java \
- com/sun/security/auth/UnixNumericGroupPrincipal.java \
- com/sun/security/auth/X500Principal.java \
- com/sun/security/auth/UserPrincipal.java \
- com/sun/security/auth/LdapPrincipal.java \
- com/sun/security/auth/PolicyFile.java \
- com/sun/security/auth/PrincipalComparator.java \
- com/sun/security/auth/callback/TextCallbackHandler.java \
- com/sun/security/auth/callback/DialogCallbackHandler.java
diff --git a/jdk/make/com/sun/security/auth/Makefile b/jdk/make/com/sun/security/auth/Makefile
deleted file mode 100644
index 420b8c4..0000000
--- a/jdk/make/com/sun/security/auth/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.security.auth
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_java.gmk
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_JAVA = sun/security/util/AuthResources.java
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/security/auth/module/FILES_c_solaris.gmk b/jdk/make/com/sun/security/auth/module/FILES_c_solaris.gmk
deleted file mode 100644
index 95532fc..0000000
--- a/jdk/make/com/sun/security/auth/module/FILES_c_solaris.gmk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c += \
- Solaris.c
diff --git a/jdk/make/com/sun/security/auth/module/FILES_c_unix.gmk b/jdk/make/com/sun/security/auth/module/FILES_c_unix.gmk
deleted file mode 100644
index cd911bc..0000000
--- a/jdk/make/com/sun/security/auth/module/FILES_c_unix.gmk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- Unix.c
diff --git a/jdk/make/com/sun/security/auth/module/FILES_c_windows.gmk b/jdk/make/com/sun/security/auth/module/FILES_c_windows.gmk
deleted file mode 100644
index 6f19e67..0000000
--- a/jdk/make/com/sun/security/auth/module/FILES_c_windows.gmk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = nt.c
diff --git a/jdk/make/com/sun/security/auth/module/FILES_export_solaris.gmk b/jdk/make/com/sun/security/auth/module/FILES_export_solaris.gmk
deleted file mode 100644
index d8c9660..0000000
--- a/jdk/make/com/sun/security/auth/module/FILES_export_solaris.gmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_export += \
- com/sun/security/auth/module/SolarisLoginModule.java \
- com/sun/security/auth/module/SolarisSystem.java \
diff --git a/jdk/make/com/sun/security/auth/module/FILES_export_unix.gmk b/jdk/make/com/sun/security/auth/module/FILES_export_unix.gmk
deleted file mode 100644
index 3bd9978..0000000
--- a/jdk/make/com/sun/security/auth/module/FILES_export_unix.gmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_export = \
- com/sun/security/auth/module/UnixLoginModule.java \
- com/sun/security/auth/module/UnixSystem.java
diff --git a/jdk/make/com/sun/security/auth/module/FILES_export_windows.gmk b/jdk/make/com/sun/security/auth/module/FILES_export_windows.gmk
deleted file mode 100644
index aa2c6ea..0000000
--- a/jdk/make/com/sun/security/auth/module/FILES_export_windows.gmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_export = \
- com/sun/security/auth/module/NTLoginModule.java \
- com/sun/security/auth/module/NTSystem.java
diff --git a/jdk/make/com/sun/security/auth/module/FILES_java.gmk b/jdk/make/com/sun/security/auth/module/FILES_java.gmk
deleted file mode 100644
index 1253d2f..0000000
--- a/jdk/make/com/sun/security/auth/module/FILES_java.gmk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_java = \
- com/sun/security/auth/module/Krb5LoginModule.java \
- com/sun/security/auth/module/JndiLoginModule.java \
- com/sun/security/auth/module/LdapLoginModule.java \
- com/sun/security/auth/module/KeyStoreLoginModule.java \
- com/sun/security/auth/module/Crypt.java
diff --git a/jdk/make/com/sun/security/auth/module/Makefile b/jdk/make/com/sun/security/auth/module/Makefile
deleted file mode 100644
index 7a2343b..0000000
--- a/jdk/make/com/sun/security/auth/module/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Makefile for building auth modules.
-
-BUILDDIR = ../../../../..
-PACKAGE = com.sun.security.auth.module
-PRODUCT = sun
-
-# LIBRARY name changed later below, but it is important to tell Defs some name
-# upfront so that it knows it is building a library.
-LIBRARY = jaas
-
-# Force name of temp directory (needed due to LIBRARY change below)
-LIBRARY_OUTPUT = jaas
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-
-include FILES_java.gmk
-
-
-ifeq ($(PLATFORM), windows)
-
-LIBRARY = jaas_nt
- include FILES_export_windows.gmk
- include FILES_c_windows.gmk
-# We need some extra libs for windows
- ifneq ($(LIBRARY),fdlibm)
- EXTRA_LIBS += netapi32.lib user32.lib mpr.lib
- endif #fdlibm
- # code generates errors when compiled at warning level 3 and warnings are fatal
-endif # windows
-
-ifeq ($(PLATFORM), solaris)
- LIBRARY = jaas_unix
- FILES_m = mapfile-vers
- include $(BUILDDIR)/common/Mapfile-vers.gmk
- include FILES_export_unix.gmk
- include FILES_export_solaris.gmk
- include FILES_c_unix.gmk
- include FILES_c_solaris.gmk
-endif # solaris
-
-ifneq (,$(findstring $(PLATFORM), linux macosx))
- LIBRARY = jaas_unix
- include FILES_export_unix.gmk
- include FILES_c_unix.gmk
-endif # linux
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Library.gmk
-
diff --git a/jdk/make/com/sun/security/auth/module/mapfile-vers b/jdk/make/com/sun/security/auth/module/mapfile-vers
deleted file mode 100644
index b738708..0000000
--- a/jdk/make/com/sun/security/auth/module/mapfile-vers
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- global:
- Java_com_sun_security_auth_module_SolarisSystem_getSolarisInfo;
- Java_com_sun_security_auth_module_UnixSystem_getUnixInfo;
- local:
- *;
-};
-
diff --git a/jdk/make/com/sun/security/jgss/Makefile b/jdk/make/com/sun/security/jgss/Makefile
deleted file mode 100644
index 120f44c..0000000
--- a/jdk/make/com/sun/security/jgss/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.security.jgss
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = com/sun/security/jgss
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/com/sun/security/ntlm/Makefile b/jdk/make/com/sun/security/ntlm/Makefile
deleted file mode 100644
index 547092b..0000000
--- a/jdk/make/com/sun/security/ntlm/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.security.ntlm
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = com/sun/security/ntlm
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/com/sun/security/sasl/Makefile b/jdk/make/com/sun/security/sasl/Makefile
deleted file mode 100644
index 0737295..0000000
--- a/jdk/make/com/sun/security/sasl/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.security.sasl
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = com/sun/security/sasl
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/com/sun/sql/FILES_java.gmk b/jdk/make/com/sun/sql/FILES_java.gmk
deleted file mode 100644
index 9d17822..0000000
--- a/jdk/make/com/sun/sql/FILES_java.gmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_java = \
- com/sun/rowset/DataSetImpl.java \
- com/sun/rowset/QueryObjectGeneratorImpl.java
diff --git a/jdk/make/com/sun/sql/Makefile b/jdk/make/com/sun/sql/Makefile
deleted file mode 100644
index 245c9b9..0000000
--- a/jdk/make/com/sun/sql/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JDBC API and JDBC RowSet
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.sun.sql
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-AUTO_FILES_JAVA_DIRS = com/sun/sql
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/com/sun/tools/Makefile b/jdk/make/com/sun/tools/Makefile
deleted file mode 100644
index 85f2b28..0000000
--- a/jdk/make/com/sun/tools/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building com/sun/tools
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.sun.tools
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-AUTO_FILES_JAVA_DIRS = com/sun/tools/extcheck
-
-SUBDIRS = attach
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build:
- $(SUBDIRS-loop)
-clean clobber::
- $(SUBDIRS-loop)
-
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/com/sun/tools/attach/Exportedfiles.gmk b/jdk/make/com/sun/tools/attach/Exportedfiles.gmk
deleted file mode 100644
index 915786d..0000000
--- a/jdk/make/com/sun/tools/attach/Exportedfiles.gmk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# These are the names of Java classes for which we will make .h files.
-#
-
-ifeq ($(PLATFORM), windows)
-FILES_export = \
- sun/tools/attach/WindowsAttachProvider.java \
- sun/tools/attach/WindowsVirtualMachine.java
-endif
-
-ifeq ($(PLATFORM), solaris)
-FILES_export = \
- sun/tools/attach/SolarisVirtualMachine.java
-endif
-
-ifeq ($(PLATFORM), linux)
-FILES_export = \
- sun/tools/attach/LinuxVirtualMachine.java
-endif
-
-ifeq ($(PLATFORM), macosx)
-FILES_export = \
- sun/tools/attach/BsdVirtualMachine.java
-endif
diff --git a/jdk/make/com/sun/tools/attach/FILES_c.gmk b/jdk/make/com/sun/tools/attach/FILES_c.gmk
deleted file mode 100644
index 4684731..0000000
--- a/jdk/make/com/sun/tools/attach/FILES_c.gmk
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-ifeq ($(PLATFORM),windows)
-FILES_c = \
- WindowsAttachProvider.c \
- WindowsVirtualMachine.c
-endif
-
-ifeq ($(PLATFORM),solaris)
-FILES_c = \
- SolarisVirtualMachine.c
-endif
-
-ifeq ($(PLATFORM),linux)
-FILES_c = \
- LinuxVirtualMachine.c
-endif
-
-ifeq ($(PLATFORM), macosx)
-FILES_c = \
- BsdVirtualMachine.c
-endif
diff --git a/jdk/make/com/sun/tools/attach/FILES_java.gmk b/jdk/make/com/sun/tools/attach/FILES_java.gmk
deleted file mode 100644
index ac18cc2..0000000
--- a/jdk/make/com/sun/tools/attach/FILES_java.gmk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-FILES_java = \
- com/sun/tools/attach/AgentLoadException.java \
- com/sun/tools/attach/AgentInitializationException.java \
- com/sun/tools/attach/AttachPermission.java \
- com/sun/tools/attach/AttachNotSupportedException.java \
- com/sun/tools/attach/VirtualMachine.java \
- com/sun/tools/attach/VirtualMachineDescriptor.java \
- com/sun/tools/attach/spi/AttachProvider.java \
- sun/tools/attach/HotSpotAttachProvider.java \
- sun/tools/attach/HotSpotVirtualMachine.java
-
-ifeq ($(PLATFORM), solaris)
-FILES_java += \
- sun/tools/attach/SolarisAttachProvider.java
-endif
-
-ifeq ($(PLATFORM), linux)
-FILES_java += \
- sun/tools/attach/LinuxAttachProvider.java
-endif
-
-ifeq ($(PLATFORM), macosx)
-FILES_java += \
- sun/tools/attach/BsdAttachProvider.java
-endif
-
-#
-# Files that need to be copied
-#
-SERVICEDIR = $(CLASSBINDIR)/META-INF/services
-
-FILES_copy = \
- $(SERVICEDIR)/com.sun.tools.attach.spi.AttachProvider
-
-
diff --git a/jdk/make/com/sun/tools/attach/Makefile b/jdk/make/com/sun/tools/attach/Makefile
deleted file mode 100644
index 9053eaa..0000000
--- a/jdk/make/com/sun/tools/attach/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../../..
-PACKAGE = com.sun.tools.attach
-LIBRARY = attach
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-ifeq ($(PLATFORM), solaris)
-FILES_m = mapfile-solaris
-endif
-ifeq ($(PLATFORM), linux)
-FILES_m = mapfile-linux
-endif
-ifeq ($(PLATFORM), macosx)
-FILES_m = mapfile-bsd
-endif
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-#
-# Files to compile
-#
-include FILES_c.gmk
-include FILES_java.gmk
-include Exportedfiles.gmk
-
-ifeq ($(PLATFORM), solaris)
-OTHER_LDLIBS += -ldoor
-endif
-ifeq ($(PLATFORM), windows)
-EXTRA_LIBS += psapi.lib
-endif
-
-ifeq ($PLATFORM), macosx)
- vpath %.c $(call NativeSrcDirList,,native/sun/tools/attach)
-else
- vpath %.c $(PLATFORM_SRC)/native/sun/tools/attach
-endif
-
-all: classes copy-files
-
-#
-# Copy the service provider configuration files into the resource
-# directory. Copy the configuration file also uncomments any
-# providers that need to be enabled for this platform.
-#
-
-copy-files: $(FILES_copy)
-
-$(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/tools/attach/META-INF/services/%
- @$(MKDIR) -p $(@D)
- @$(RM) $@
- @$(CAT) $< | $(SED) -e "s/^#\[$(PLATFORM)\]//" > $@
-
-.PHONY: copy-files
-
-
-clean::
- $(RM) -r $(CLASSDESTDIR)/com/sun/tools/attach
- $(RM) -r $(CLASSDESTDIR)/sun/tools/attach
- $(RM) $(FILES_copy)
-
-#
-# Library to compile.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-
-
-
-
-
diff --git a/jdk/make/com/sun/tools/attach/mapfile-bsd b/jdk/make/com/sun/tools/attach/mapfile-bsd
deleted file mode 100644
index 9d82d9c..0000000
--- a/jdk/make/com/sun/tools/attach/mapfile-bsd
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
- Java_sun_tools_attach_BsdVirtualMachine_close;
- Java_sun_tools_attach_BsdVirtualMachine_connect;
- Java_sun_tools_attach_BsdVirtualMachine_open;
- Java_sun_tools_attach_BsdVirtualMachine_sendQuitTo;
- Java_sun_tools_attach_BsdVirtualMachine_socket;
- Java_sun_tools_attach_BsdVirtualMachine_read;
- Java_sun_tools_attach_BsdVirtualMachine_write;
- Java_sun_tools_attach_BsdVirtualMachine_createAttachFile;
- local:
- *;
-};
diff --git a/jdk/make/com/sun/tools/attach/mapfile-linux b/jdk/make/com/sun/tools/attach/mapfile-linux
deleted file mode 100644
index d9b11d3..0000000
--- a/jdk/make/com/sun/tools/attach/mapfile-linux
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Java_sun_tools_attach_LinuxVirtualMachine_checkPermissions;
- Java_sun_tools_attach_LinuxVirtualMachine_close;
- Java_sun_tools_attach_LinuxVirtualMachine_connect;
- Java_sun_tools_attach_LinuxVirtualMachine_getLinuxThreadsManager;
- Java_sun_tools_attach_LinuxVirtualMachine_isLinuxThreads;
- Java_sun_tools_attach_LinuxVirtualMachine_open;
- Java_sun_tools_attach_LinuxVirtualMachine_sendQuitTo;
- Java_sun_tools_attach_LinuxVirtualMachine_sendQuitToChildrenOf;
- Java_sun_tools_attach_LinuxVirtualMachine_socket;
- Java_sun_tools_attach_LinuxVirtualMachine_read;
- Java_sun_tools_attach_LinuxVirtualMachine_write;
- local:
- *;
-};
diff --git a/jdk/make/com/sun/tools/attach/mapfile-solaris b/jdk/make/com/sun/tools/attach/mapfile-solaris
deleted file mode 100644
index 35c160a..0000000
--- a/jdk/make/com/sun/tools/attach/mapfile-solaris
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Java_sun_tools_attach_SolarisVirtualMachine_checkPermissions;
- Java_sun_tools_attach_SolarisVirtualMachine_enqueue;
- Java_sun_tools_attach_SolarisVirtualMachine_open;
- Java_sun_tools_attach_SolarisVirtualMachine_close;
- Java_sun_tools_attach_SolarisVirtualMachine_read;
- Java_sun_tools_attach_SolarisVirtualMachine_sigquit;
- local:
- *;
-};
diff --git a/jdk/make/com/sun/tracing/Makefile b/jdk/make/com/sun/tracing/Makefile
deleted file mode 100644
index f00ab69..0000000
--- a/jdk/make/com/sun/tracing/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building tracing classes
-#
-
-BUILDDIR = ../../..
-PACKAGE = com.sun.tracing
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = dtrace
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build:
- $(SUBDIRS-loop)
-clean clobber::
- $(SUBDIRS-loop)
-
-AUTO_FILES_JAVA_DIRS = com/sun/tracing
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/com/sun/tracing/dtrace/Makefile b/jdk/make/com/sun/tracing/dtrace/Makefile
deleted file mode 100644
index 1a036eb..0000000
--- a/jdk/make/com/sun/tracing/dtrace/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building dtrace extension
-#
-BUILDDIR = ../../../..
-PACKAGE = com.sun.tracing.dtrace
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-AUTO_FILES_JAVA_DIRS = com/sun/tracing/dtrace
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/common/BuildToolJar.gmk b/jdk/make/common/BuildToolJar.gmk
deleted file mode 100644
index 2a308b6..0000000
--- a/jdk/make/common/BuildToolJar.gmk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Input: BUILDDIR PACKAGE PKGDIR PROGRAM BUILDTOOL_SOURCE_ROOT BUILDTOOL_MAIN
-
-BUILDTOOL_MAIN_SOURCE_FILE = $(BUILDTOOL_SOURCE_ROOT)/$(BUILDTOOL_MAIN)
-BUILDTOOL_MANIFEST_FILE = $(BUILDTOOLCLASSDIR)/$(PROGRAM)_manifest.mf
-BUILDTOOL_JAR_FILE = $(BUILDTOOLJARDIR)/$(PROGRAM).jar
-BUILDTOOL_ALL_FILES := $(shell $(CD) $(BUILDTOOL_SOURCE_ROOT) \
- && $(FIND) $(PKGDIR) $(SCM_DIRS_prune) -o -type f -print)
-BUILTTOOL_MAINCLASS = $(subst /,.,$(BUILDTOOL_MAIN:%.java=%))
-
-all build: $(BUILDTOOL_JAR_FILE) tool_info
-
-$(BUILDTOOL_MANIFEST_FILE): $(BUILDTOOL_MAIN_SOURCE_FILE)
- @$(prep-target)
- $(ECHO) "Main-Class: $(BUILTTOOL_MAINCLASS)" > $@
-
-$(BUILDTOOL_JAR_FILE): $(BUILDTOOL_MANIFEST_FILE) \
- $(BUILDTOOL_ALL_FILES:%=$(BUILDTOOL_SOURCE_ROOT)/%)
- @$(prep-target)
- @$(MKDIR) -p $(BUILDTOOLCLASSDIR)
- $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
- -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
- $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
- -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
- $(BOOT_JAR_JFLAGS) || $(RM) $@
- @$(java-vm-cleanup)
-
-# Printing out a build tool information line
-define printBuildToolSetting
-if [ "$2" != "" ] ; then $(PRINTF) "%-25s %s\n" "$1:" "$2"; fi
-endef
-
-# Print out the build tool information
-tool_info:
- @$(ECHO) "========================================================="
- @$(call printBuildToolSetting,BUILDTOOL,$(PROGRAM))
- @$(call printBuildToolSetting,PACKAGE,$(PACKAGE))
- @$(call printBuildToolSetting,BUILDTOOL_SOURCE_ROOT,$(BUILDTOOL_SOURCE_ROOT))
- @$(call printBuildToolSetting,BUILTTOOL_MAINCLASS,$(BUILTTOOL_MAINCLASS))
- @$(call printBuildToolSetting,BUILDTOOL_JAR_FILE,$(BUILDTOOL_JAR_FILE))
- @$(ECHO) "========================================================="
-
-clean clobber::
- $(RM) -r $(BUILDTOOLCLASSDIR)/$(PKGDIR)
- $(RM) $(BUILDTOOL_MANIFEST_FILE)
- $(RM) $(BUILDTOOL_JAR_FILE)
-
diff --git a/jdk/make/common/CancelImplicits.gmk b/jdk/make/common/CancelImplicits.gmk
deleted file mode 100644
index 86c61a9..0000000
--- a/jdk/make/common/CancelImplicits.gmk
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Cancel some GNU make implicit rules. This causes far fewer stats
-# (crucial in incremental builds, when all that is being done is stats -- I
-# notice upto 20% speedup on local disk). See sections "10.2 Catalogue of
-# Implicit Rules" and "10.5.6 Canceling Implicit Rules" in make.dvi; see
-# also the output of gnumake -p.
-#
-# CAUTION! This is the first thing included in our makefiles, so you must
-# not add any targets here. Canceling %.f: %.F doesn't make any sense
-# because we don't have any targets ending with .f.
-#
-
-#
-# We don't make binaries directly from .{source} files with implicit
-# rules, so disable all of them.
-#
-ifndef USE_IMPLICITS
-%: %.o
-%: %.obj
-%: %.dll
-%: %.c
-%: %.cc
-%: %.C
-%: %.p
-%: %.f
-%: %.s
-%: %.F
-%: %.r
-%: %.S
-%: %.mod
-%: %.sh
-endif
-
-#
-# If you are using RCS, you must set the variable USE_RCS at the make
-# command line. Otherwise we disable RCS.
-#
-ifndef USE_RCS
-%:: %,v
-%:: RCS/%,v
-endif
diff --git a/jdk/make/common/Classes.gmk b/jdk/make/common/Classes.gmk
deleted file mode 100644
index 58453a9..0000000
--- a/jdk/make/common/Classes.gmk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# WARNING: This file is shared with other workspaces.
-# So when it includes other files, it must use JDK_TOPDIR.
-#
-
-include $(JDK_TOPDIR)/make/common/Rules.gmk
-
-#
-# Say you built classes into $(ALT_CLASSBINDIR) and then at the end of
-# the build you might want to copy them over to $(ALT_CLASSDESTDIR);
-# this rule takes care of that. No one should really set these
-# variables except the bootstrap/recompile stage of the java compiler.
-#
-ifdef ALT_CLASSBINDIR
-
-# By default post-processing is copying. Suppose you want to build
-# a jar file then set ALT_CLASSES_DISPOSITION to '../../dest/nameof.jar'
-# before including this file.
-ifndef ALT_CLASSES_DISPOSITION
-ALT_CLASSES_DISPOSITION = copy-classes
-endif
-
-build : $(ALT_CLASSES_DISPOSITION)
-
-copy-classes:
-ifneq ($(ALT_CLASSBINDIR), $(ALT_CLASSDESTDIR))
- @if [ -s $(TEMPDIR)/.classes.list ]; then \
- $(MKDIR) -p $(ALT_CLASSDESTDIR); \
- $(ECHO) "Copying $(ALT_CLASSBINDIR)..."; \
- $(ECHO) "($(CD) $(ALT_CLASSBINDIR); $(TAR) cf - .) | \
- ($(CD) $(ALT_CLASSDESTDIR); $(TAR) xf -)"; \
- ($(CD) $(ALT_CLASSBINDIR); $(TAR) cf - .) | \
- ($(CD) $(ALT_CLASSDESTDIR); $(TAR) xf -); \
- fi
-else # ALT_CLASSBINDIR
- @if [ -s $(TEMPDIR)/.classes.list ]; then \
- $(ECHO) "Copy source and destination are the same: $(ALT_CLASSBINDIR) -- Copy skipped..."; \
- fi
-endif # ALT_CLASSBINDIR
-
-.PHONY: copy-classes
-endif # ALT_CLASSBINDIR
-
diff --git a/jdk/make/common/Cscope.gmk b/jdk/make/common/Cscope.gmk
deleted file mode 100644
index 812fd5f..0000000
--- a/jdk/make/common/Cscope.gmk
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# The cscope.out file is made in the current directory and spans the entire
-# source tree.
-#
-# Things to note:
-# 1. We use relative names for cscope.
-# 2. We *don't* remove the old cscope.out file, because cscope is smart
-# enough to only build what has changed. It can be confused, however,
-# if files are renamed or removed, so it may be necessary to manually
-# remove cscope.out if a lot of reorganization has occurred.
-#
-CSDIRS = $(JDK_TOPDIR)/src $(JDK_TOPDIR)/build
-CSINCS = $(CSDIRS:%=-I%)
-
-#
-# Set CSFLAGS env variable to -b when using fast cscope to build the fast
-# (but large) cscope data bases.
-#
-CSCOPE = cscope-fast
-ifeq ($(CSCOPE), cscope-fast)
-CSFLAGS = -b
-endif
-
-#
-# Adding .java files pushes the file count of a full workspace up about 2500
-# files, which slows database lookup. Thus allow these files to be added from
-# the environment (CSCLASSES=yes).
-#
-ifdef CSCLASSES
-ADDCLASSES= -o -name '*.java'
-endif
-
-#
-# Adding CClassHeaders also pushes the file count of a full workspace up about
-# 200 files (these files also don't exist in a new workspace, and thus will
-# cause the recreation of the database as they get created, which might seem
-# A little confusing). Thus allow these files to be added from the environment
-# (CSHEADERS=yes).
-#
-ifndef CSHEADERS
-RMCCHEADERS= -o -name CClassHeaders
-endif
-
-
-.PRECIOUS: cscope.out
-
-cscope.out: cscope.files FRC
- $(CSCOPE) $(CSFLAGS)
-
-#
-# What files should we include? A simple rule might be just those files under
-# SCM control, however this would miss files we create like the opcodes and
-# CClassHeaders. The following attempts to find everything that is *useful*.
-# (demo directories contain many .java files
-# that probably aren't useful for development, and the pkgarchive may contain
-# duplicates of files within the source hierarchy). The ordering of the .raw
-# file is an attempt to make cscope display the most relevant files first.
-#
-cscope.files: FRC
- @-$(RM) cscope.files cscope.files.raw
- echo "$(CSINCS)" > cscope.files
- -find $(CSDIRS) $(SCM_DIRS_prune) -o -type d \( -name '.del-*' -o \
- -name '*demo' -o -name pkgarchive $(RMCCHEADERS) \) -prune -o \
- -type f \( -name '*.[Ccshlxy]' -o -name '*.il' -o -name '*.cc' -o \
- -name 'Makefile*' -o -name GNUmakefile -o -name '*.gmk' -o \
- -name '*.cpp' $(ADDCLASSES) \) -print > cscope.files.raw
- -egrep -v "\.java|\/build\/" cscope.files.raw >> cscope.files
- -fgrep ".java" cscope.files.raw >> cscope.files
- -fgrep "/build/" cscope.files.raw >> cscope.files
- @-$(RM) cscope.files.raw
-
-cscope.clean:
- -$(RM) cscope.files cscope.files.raw cscope.out
-
-FRC:
diff --git a/jdk/make/common/Defs-linux.gmk b/jdk/make/common/Defs-linux.gmk
deleted file mode 100644
index 7392108..0000000
--- a/jdk/make/common/Defs-linux.gmk
+++ /dev/null
@@ -1,478 +0,0 @@
-#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to specify compiler flags for programs and libraries
-# targeted to Linux. Should not contain any rules.
-#
-# WARNING: This file is shared with other workspaces.
-# So when it includes other files, it must use JDK_TOPDIR.
-#
-
-# Warning: the following variables are overriden by Defs.gmk. Set
-# values will be silently ignored:
-# CFLAGS (set $(OTHER_CFLAGS) instead)
-# CPPFLAGS (set $(OTHER_CPPFLAGS) instead)
-# CXXFLAGS (set $(OTHER_CXXFLAGS) instead)
-# LDFLAGS (set $(OTHER_LDFAGS) instead)
-# LDLIBS (set $(EXTRA_LIBS) instead)
-# LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
-
-# Get shared JDK settings
-include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
-
-# Part of INCREMENTAL_BUILD mechanism.
-# Compiler emits things like: path/file.o: file.h
-# We want something like: relative_path/file.o relative_path/file.d: file.h
-CC_DEPEND = -MM
-CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g'
-
-ifndef PLATFORM_SRC
- PLATFORM_SRC = $(BUILDDIR)/../src/solaris
-endif # PLATFORM_SRC
-
-# Location of the various .properties files specific to Linux platform
-ifndef PLATFORM_PROPERTIES
- PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib
-endif # PLATFORM_SRC
-
-# Platform specific closed sources
-ifndef OPENJDK
- ifndef CLOSED_PLATFORM_SRC
- CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris
- endif
-endif
-
-# platform specific include files
-PLATFORM_INCLUDE_NAME = $(PLATFORM)
-PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
-
-# suffix used for make dependencies files.
-DEPEND_SUFFIX = d
-# The suffix applied to the library name for FDLIBM
-FDDLIBM_SUFFIX = a
-# The suffix applied to scripts (.bat for windows, nothing for unix)
-SCRIPT_SUFFIX =
-# CC compiler object code output directive flag value
-CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
-
-# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
-# enabled with debug info files ZIP'ed to save space. For VARIANT !=
-# OPT builds, FDS is always enabled, after all a debug build without
-# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
-# meaning when FDS is enabled.
-#
-# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
-# disabled for a VARIANT == OPT build.
-#
-# Note: Use of a different variable name for the FDS override option
-# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
-# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
-# in options via environment variables, use of distinct variables
-# prevents strange behaviours. For example, in a VARIANT != OPT build,
-# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
-# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
-# variable name is used, then different values can be picked up by
-# different parts of the build. Just to be clear, we only need two
-# variable names because the incoming option value can be overridden
-# in some situations, e.g., a VARIANT != OPT build.
-
-ifeq ($(VARIANT), OPT)
- FULL_DEBUG_SYMBOLS ?= 1
- ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
-else
- # debug variants always get Full Debug Symbols (if available)
- ENABLE_FULL_DEBUG_SYMBOLS = 1
-endif
-_JUNK_ := $(shell \
- echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
-# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
-
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifndef CROSS_COMPILE_ARCH
- # Default OBJCOPY comes from GNU Binutils on Linux:
- DEF_OBJCOPY=/usr/bin/objcopy
- else
- # Assume objcopy is part of the cross-compilation toolkit
- DEF_OBJCOPY=$(COMPILER_PATH)/objcopy
- endif
- OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
- ifneq ($(ALT_OBJCOPY),)
- _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
- # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
- OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
- endif
-
- # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the
- # JDK build to import .debuginfo or .diz files from the HotSpot build.
- # However, adding FDS support to the JDK build will occur in phases
- # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
- # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a
- # particular library or program supports FDS.
-
- ifeq ($(OBJCOPY),)
- _JUNK_ := $(shell \
- echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")
- ENABLE_FULL_DEBUG_SYMBOLS=0
- else
- _JUNK_ := $(shell \
- echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
-
- # Library stripping policies for .debuginfo configs:
- # all_strip - strips everything from the library
- # min_strip - strips most stuff from the library; leaves minimum symbols
- # no_strip - does not strip the library at all
- #
- # Oracle security policy requires "all_strip". A waiver was granted on
- # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
- #
- # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
- STRIP_POLICY ?= min_strip
-
- _JUNK_ := $(shell \
- echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
-
- ZIP_DEBUGINFO_FILES ?= 1
-
- _JUNK_ := $(shell \
- echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
- endif
-endif
-
-#
-# Default optimization
-#
-
-ifndef OPTIMIZATION_LEVEL
- ifeq ($(PRODUCT), java)
- OPTIMIZATION_LEVEL = HIGHER
- else
- OPTIMIZATION_LEVEL = LOWER
- endif
-endif
-ifndef FASTDEBUG_OPTIMIZATION_LEVEL
- FASTDEBUG_OPTIMIZATION_LEVEL = LOWER
-endif
-
-CC_OPT/NONE =
-CC_OPT/LOWER = -O2
-CC_OPT/HIGHER = -O3
-CC_OPT/HIGHEST = -O3
-
-CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
-
-# For all platforms, do not omit the frame pointer register usage.
-# We need this frame pointer to make it easy to walk the stacks.
-# This should be the default on X86, but ia64 and amd64 may not have this
-# as the default.
-CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
-LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
-CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
-LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
-CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN
-ifeq ($(ZERO_BUILD), true)
- CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
- ifeq ($(ZERO_ENDIANNESS), little)
- CFLAGS_REQUIRED += -D_LITTLE_ENDIAN
- endif
- LDFLAGS_COMMON += $(ZERO_ARCHFLAG)
-else
- CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
- LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
-endif
-
-# If this is a --hash-style=gnu system, use --hash-style=both
-# The gnu .hash section won't work on some Linux systems like SuSE 10.
-_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | $(GREP) -- '--hash-style=gnu')
-ifneq ($(_HAS_HASH_STYLE_GNU),)
- LDFLAGS_HASH_STYLE = -Wl,--hash-style=both
-endif
-LDFLAGS_COMMON += $(LDFLAGS_HASH_STYLE)
-
-#
-# Selection of warning messages
-#
-GCC_INHIBIT = -Wno-unused -Wno-parentheses
-GCC_STYLE =
-GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
-
-#
-# Treat compiler warnings as errors, if warnings not allowed
-#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- GCC_WARNINGS += -Werror
-endif
-
-#
-# Misc compiler options
-#
-ifneq ($(ARCH),ppc)
- CFLAGS_COMMON = -fno-strict-aliasing
-endif
-PIC_CODE_LARGE = -fPIC
-PIC_CODE_SMALL = -fpic
-GLOBAL_KPIC = $(PIC_CODE_LARGE)
-CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS)
-ifeq ($(ARCH), amd64)
- CFLAGS_COMMON += -pipe
-endif
-
-# Linux 64bit machines use Dwarf2, which can be HUGE, have fastdebug use -g1
-DEBUG_FLAG = -g
-ifeq ($(FASTDEBUG), true)
- ifeq ($(ARCH_DATA_MODEL), 64)
- DEBUG_FLAG = -g1
- endif
-endif
-
-# DEBUG_BINARIES overrides everything, use full -g debug information
-ifeq ($(DEBUG_BINARIES), true)
- DEBUG_FLAG = -g
- CFLAGS_REQUIRED += $(DEBUG_FLAG)
-endif
-
-# If Full Debug Symbols is enabled, then we want the same debug and
-# optimization flags as used by FASTDEBUG.
-#
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(VARIANT), OPT)
- CC_OPT = $(DEBUG_FLAG) $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
- endif
- endif
-endif
-
-CFLAGS_OPT = $(CC_OPT)
-CFLAGS_DBG = $(DEBUG_FLAG)
-CFLAGS_COMMON += $(CFLAGS_REQUIRED)
-
-CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
-CXXFLAGS_OPT = $(CC_OPT)
-CXXFLAGS_DBG = $(DEBUG_FLAG)
-CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
-
-# FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java
-ifeq ($(FASTDEBUG), true)
- CFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
- CXXFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
-endif
-
-CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
-
-# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here)
-ifneq ($(ARCH),alpha)
- CPP_ARCH_FLAGS += -D$(ARCH)
-else
- CPP_ARCH_FLAGS += -D_$(ARCH)_
-endif
-
-CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \
- -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
-
-ifeq ($(ARCH_DATA_MODEL), 64)
-CPPFLAGS_COMMON += -D_LP64=1
-endif
-
-CPPFLAGS_OPT = -DNDEBUG
-CPPFLAGS_DBG = -DDEBUG
-ifneq ($(PRODUCT), java)
- CPPFLAGS_DBG += -DLOGGING
-endif
-
-ifdef LIBRARY
- # Libraries need to locate other libraries at runtime, and you can tell
- # a library where to look by way of the dynamic runpaths (RPATH or RUNPATH)
- # buried inside the .so. The $ORIGIN says to look relative to where
- # the library itself is and it can be followed with relative paths from
- # that. By default we always look in $ORIGIN, optionally we add relative
- # paths if the Makefile sets LD_RUNPATH_EXTRAS to those relative paths.
- # On Linux we add a flag -z origin, not sure if this is necessary, but
- # doesn't seem to hurt.
- # The environment variable LD_LIBRARY_PATH will over-ride these runpaths.
- # Try: 'readelf -d lib*.so' to see these settings in a library.
- #
- Z_ORIGIN_FLAG/sparc = -Xlinker -z -Xlinker origin
- Z_ORIGIN_FLAG/i586 = -Xlinker -z -Xlinker origin
- Z_ORIGIN_FLAG/amd64 = -Xlinker -z -Xlinker origin
- Z_ORIGIN_FLAG/ia64 = -Xlinker -z -Xlinker origin
- Z_ORIGIN_FLAG/arm =
- Z_ORIGIN_FLAG/ppc =
- Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlinker origin
-
- LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
-
- LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN
- LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%)
-
-endif
-
-EXTRA_LIBS += -lc
-
-LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs
-LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
-
-#
-# -L paths for finding and -ljava
-#
-LDFLAGS_OPT = -Xlinker -O1
-LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
-LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
-
-#
-# -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
-# statically link libgcc but will print a warning with the flag. We don't
-# want the warning, so check gcc version first.
-#
-ifeq ($(CC_MAJORVER),3)
- OTHER_LDFLAGS += -static-libgcc
-endif
-
-# Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
-# (See Rules.gmk) The gcc 5 compiler might have an option for this?
-AUTOMATIC_PCH_OPTION =
-
-#
-# Post Processing of libraries/executables
-#
-ifeq ($(VARIANT), OPT)
- ifneq ($(NO_STRIP), true)
- ifneq ($(DEBUG_BINARIES), true)
- # Debug 'strip -g' leaves local function Elf symbols (better stack
- # traces)
- POST_STRIP_PROCESS = $(STRIP) -g
- endif
- endif
-endif
-
-#
-# Use: ld $(LD_MAPFILE_FLAG) mapfile *.o
-#
-LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
-
-#
-# Support for Quantify.
-#
-ifdef QUANTIFY
-QUANTIFY_CMD = quantify
-QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
-LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
-endif
-
-#
-# Path and option to link against the VM, if you have to. Note that
-# there are libraries that link against only -ljava, but they do get
-# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
-# the library itself should not.
-#
-VM_NAME = server
-JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
-JAVALIB = -ljava $(JVMLIB)
-
-#
-# We want to privatize JVM symbols on Solaris. This is so the user can
-# write a function called FindClass and this should not override the
-# FindClass that is inside the JVM. At this point in time we are not
-# concerned with other JNI libraries because we hope that there will
-# not be as many clashes there.
-#
-PRIVATIZE_JVM_SYMBOLS = false
-
-USE_PTHREADS = true
-override ALT_CODESET_KEY = _NL_CTYPE_CODESET_NAME
-override AWT_RUNPATH =
-override HAVE_ALTZONE = false
-override HAVE_FILIOH = false
-override HAVE_GETHRTIME = false
-override HAVE_GETHRVTIME = false
-override HAVE_SIGIGNORE = true
-override LEX_LIBRARY = -lfl
-ifeq ($(STATIC_CXX),true)
-override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
-else
-override LIBCXX = -lstdc++
-endif
-override LIBPOSIX4 =
-override LIBSOCKET =
-override LIBNSL =
-override LIBSCF =
-override LIBTHREAD =
-override LIBDL = -ldl
-override MOOT_PRIORITIES = true
-override NO_INTERRUPTIBLE_IO = true
-ifeq ($(ARCH), amd64)
-override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
-else
-override OPENWIN_LIB = $(OPENWIN_HOME)/lib
-endif
-override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
-override SUN_CMM_SUBDIR =
-override THREADS_FLAG = native
-override USE_GNU_M4 = true
-override USING_GNU_TAR = true
-override WRITE_LIBVERSION = false
-
-# USE_EXECNAME forces the launcher to look up argv[0] on $PATH, and put the
-# resulting resolved absolute name of the executable in the environment
-# variable EXECNAME. That executable name is then used that to locate the
-# installation area.
-override USE_EXECNAME = true
-
-# If your platform has DPS, it will have Type1 fonts too, in which case
-# it is best to enable DPS support until such time as 2D's rasteriser
-# can fully handle Type1 fonts in all cases. Default is "yes".
-# HAVE_DPS should only be "no" if the platform has no DPS headers or libs
-# DPS (Displayable PostScript) is available on Solaris machines
-HAVE_DPS = no
-
-#
-# Japanese manpages
-#
-JA_SOURCE_ENCODING = eucJP
-JA_TARGET_ENCODINGS = UTF-8
-
-# Settings for the JDI - Serviceability Agent binding.
-HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
-SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX)
-SA_DEBUGINFO_NAME = $(LIB_PREFIX)saproc.debuginfo
-SA_DIZ_NAME = $(LIB_PREFIX)saproc.diz
-
-# The JDI - Serviceability Agent binding is not currently supported
-# on Linux-ia64.
-ifeq ($(ARCH), ia64)
- INCLUDE_SA = false
-else
- INCLUDE_SA = true
-endif
-
-ifdef CROSS_COMPILE_ARCH
- # X11 headers are not under /usr/include
- OTHER_CFLAGS += -I$(OPENWIN_HOME)/include
- OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
- OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
-endif
diff --git a/jdk/make/common/Defs-macosx.gmk b/jdk/make/common/Defs-macosx.gmk
deleted file mode 100644
index 83ccf60..0000000
--- a/jdk/make/common/Defs-macosx.gmk
+++ /dev/null
@@ -1,513 +0,0 @@
-#
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to specify compiler flags for programs and libraries
-# targeted to MACOSX. Should not contain any rules.
-#
-# WARNING: This file is shared with other workspaces.
-# So when it includes other files, it must use JDK_TOPDIR.
-#
-
-# Warning: the following variables are overriden by Defs.gmk. Set
-# values will be silently ignored:
-# CFLAGS (set $(OTHER_CFLAGS) instead)
-# CPPFLAGS (set $(OTHER_CPPFLAGS) instead)
-# CXXFLAGS (set $(OTHER_CXXFLAGS) instead)
-# LDFLAGS (set $(OTHER_LDFAGS) instead)
-# LDLIBS (set $(EXTRA_LIBS) instead)
-# LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
-
-# Get shared JDK settings
-include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
-
-# Part of INCREMENTAL_BUILD mechanism.
-# Compiler emits things like: path/file.o: file.h
-# We want something like: relative_path/file.o relative_path/file.d: file.h
-CC_DEPEND = -MM
-CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g'
-
-ifndef PLATFORM_SRC
- PLATFORM_SRC = $(BUILDDIR)/../src/solaris
-endif # PLATFORM_SRC
-
-# Location of the various .properties files specific to MacOS X platform
-ifndef PLATFORM_PROPERTIES
- PLATFORM_PROPERTIES = $(BUILDDIR)/../src/macosx/lib
-endif # PLATFORM_SRC
-
-PLATFORM_SRC_MACOS = $(BUILDDIR)/../src/macosx
-
-# BSD build pulls its platform sources from the solaris tree.
-JAVA_SRCDIR_LIST = src/$(PLATFORM) src/solaris src/share
-NATIVE_SRCDIR_LIST = src/$(PLATFORM) src/solaris src/share
-
-# Platform specific closed sources
-ifndef OPENJDK
- ifndef CLOSED_PLATFORM_SRC
- CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris
- endif
-endif
-
-# platform specific include files
-PLATFORM_INCLUDE_NAME = $(OS_NAME)
-PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
-
-# suffix used for make dependencies files.
-DEPEND_SUFFIX = d
-# The suffix applied to the library name for FDLIBM
-FDDLIBM_SUFFIX = a
-# The suffix applied to scripts (.bat for windows, nothing for unix)
-SCRIPT_SUFFIX =
-# CC compiler object code output directive flag value
-CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
-CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
-
-# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
-# enabled with debug info files ZIP'ed to save space. For VARIANT !=
-# OPT builds, FDS is always enabled, after all a debug build without
-# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
-# meaning when FDS is enabled.
-#
-# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
-# disabled for a VARIANT == OPT build.
-#
-# Note: Use of a different variable name for the FDS override option
-# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
-# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
-# in options via environment variables, use of distinct variables
-# prevents strange behaviours. For example, in a VARIANT != OPT build,
-# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
-# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
-# variable name is used, then different values can be picked up by
-# different parts of the build. Just to be clear, we only need two
-# variable names because the incoming option value can be overridden
-# in some situations, e.g., a VARIANT != OPT build.
-
-ifeq ($(VARIANT), OPT)
- FULL_DEBUG_SYMBOLS ?= 1
- ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
-else
- # debug variants always get Full Debug Symbols (if available)
- ENABLE_FULL_DEBUG_SYMBOLS = 1
-endif
-_JUNK_ := $(shell \
- echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
-# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
-
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(OS_NAME),darwin)
- # MacOS X doesn't use OBJCOPY or STRIP_POLICY
- OBJCOPY=
- STRIP_POLICY=
- ZIP_DEBUGINFO_FILES ?= 1
- else
- ifndef CROSS_COMPILE_ARCH
- # Default OBJCOPY comes from GNU Binutils on Linux:
- DEF_OBJCOPY=/usr/bin/objcopy
- else
- # Assume objcopy is part of the cross-compilation toolkit
- DEF_OBJCOPY=$(COMPILER_PATH)/objcopy
- endif
- OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
- ifneq ($(ALT_OBJCOPY),)
- _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
- # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
- OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
- endif
-
- # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the
- # JDK build to import .debuginfo or .diz files from the HotSpot build.
- # However, adding FDS support to the JDK build will occur in phases
- # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
- # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a
- # particular library or program supports FDS.
-
- ifeq ($(OBJCOPY),)
- _JUNK_ := $(shell \
- echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo" \
- "files. You may need to set ALT_OBJCOPY.")
- ENABLE_FULL_DEBUG_SYMBOLS=0
- else
- _JUNK_ := $(shell \
- echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
-
- # Library stripping policies for .debuginfo configs:
- # all_strip - strips everything from the library
- # min_strip - strips most stuff from the library; leaves
- # minimum symbols
- # no_strip - does not strip the library at all
- #
- # Oracle security policy requires "all_strip". A waiver was granted
- # on 2011.09.01 that permits using "min_strip" in the Java JDK and
- # Java JRE.
- #
- # Currently, STRIP_POLICY is only used when Full Debug Symbols
- # is enabled.
- STRIP_POLICY ?= min_strip
-
- _JUNK_ := $(shell \
- echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
-
- ZIP_DEBUGINFO_FILES ?= 1
- endif
- endif
-
- _JUNK_ := $(shell \
- echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
-endif
-
-#
-# Default optimization
-#
-
-ifndef OPTIMIZATION_LEVEL
- ifeq ($(PRODUCT), java)
- OPTIMIZATION_LEVEL = HIGHER
- else
- OPTIMIZATION_LEVEL = LOWER
- endif
-endif
-ifndef FASTDEBUG_OPTIMIZATION_LEVEL
- FASTDEBUG_OPTIMIZATION_LEVEL = LOWER
-endif
-
-# For macosx use -Os by default, unless -O3 can be proved to be worth the cost, as per policy
-# <http://wikis.sun.com/display/OpenJDK/Mac+OS+X+Port+Compilers>
-CC_OPT/NONE =
-CC_OPT/LOWER = -Os
-CC_OPT/HIGHER = -Os
-CC_OPT/HIGHEST = -Os
-
-CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
-
-# For all platforms, do not omit the frame pointer register usage.
-# We need this frame pointer to make it easy to walk the stacks.
-# This should be the default on X86, but ia64, and x86_64
-# may not have this as the default.
-CFLAGS_REQUIRED_x86_64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-LDFLAGS_COMMON_x86_64 += -m64
-CFLAGS_REQUIRED_i586 += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-LDFLAGS_COMMON_i586 += -m32
-CFLAGS_REQUIRED_ia64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
-LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
-CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
-LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
-CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN
-ifeq ($(ZERO_BUILD), true)
- CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
- ifeq ($(ZERO_ENDIANNESS), little)
- CFLAGS_REQUIRED += -D_LITTLE_ENDIAN
- endif
- LDFLAGS_COMMON += $(ZERO_ARCHFLAG)
-else ifeq ($(ARCH), universal)
- CFLAGS_REQUIRED += -arch i386 -arch x86_64 -D_LITTLE_ENDIAN
- LDFLAGS_COMMON += -arch i386 -arch x86_64
-else
- CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
- LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
-endif
-# 16-byte stack re-alignment on 32-bit Darwin
-CFLAGS_REQUIRED_i586 += -mstackrealign
-
-OTHER_CFLAGS = \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
-
-#
-# Selection of warning messages
-#
-GCC_INHIBIT = -Wno-unused -Wno-parentheses
-GCC_STYLE =
-GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
-
-#
-# Treat compiler warnings as errors, if warnings not allowed
-#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- GCC_WARNINGS += -Werror
-endif
-
-#
-# Misc compiler options
-#
-ifneq ($(ARCH),ppc)
- CFLAGS_COMMON = -fno-strict-aliasing
-endif
-PIC_CODE_LARGE = -fPIC
-PIC_CODE_SMALL = -fpic
-GLOBAL_KPIC = $(PIC_CODE_LARGE)
-CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS)
-ifeq ($(ARCH), x86_64)
- CFLAGS_COMMON += -pipe
-endif
-
-# BSD 64bit machines use Dwarf2, which can be HUGE, have fastdebug use -g1
-DEBUG_FLAG = -g
-ifeq ($(FASTDEBUG), true)
- ifeq ($(ARCH_DATA_MODEL), 64)
- DEBUG_FLAG = -g1
- endif
-endif
-
-# DEBUG_BINARIES overrides everything, use full -g debug information
-ifeq ($(DEBUG_BINARIES), true)
- DEBUG_FLAG = -g
- CFLAGS_REQUIRED += $(DEBUG_FLAG)
-endif
-
-CFLAGS_OPT = $(CC_OPT)
-CFLAGS_DBG = $(DEBUG_FLAG)
-CFLAGS_COMMON += $(CFLAGS_REQUIRED)
-
-CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
-CXXFLAGS_OPT = $(CC_OPT)
-CXXFLAGS_DBG = $(DEBUG_FLAG)
-CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
-
-# FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java
-ifeq ($(FASTDEBUG), true)
- CFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
- CXXFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
-endif
-
-CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
-
-# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here)
-ifneq ($(ARCH),alpha)
- CPP_ARCH_FLAGS += -D$(ARCH)
-else
- CPP_ARCH_FLAGS += -D_$(ARCH)_
-endif
-CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -D_ALLBSD_SOURCE $(VERSION_DEFINES) \
- -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
-
-CPPFLAGS_COMMON += -DMACOSX
-
-ifeq ($(ARCH_DATA_MODEL), 64)
-CPPFLAGS_COMMON += -D_LP64=1
-endif
-
-CPPFLAGS_OPT = -DNDEBUG
-CPPFLAGS_DBG = -DDEBUG
-ifneq ($(PRODUCT), java)
- CPPFLAGS_DBG += -DLOGGING
-endif
-
-# Libraries need to locate other libraries at runtime, and you can tell
-# a library where to look by way of the dynamic runpaths (RPATH or RUNPATH)
-# buried inside the .{so,dylib}. The {$ORIGIN,@loader_path/} says to look
-# relative to where the library itself is and it can be followed
-# with relative paths from that. By default we always look in
-# {$ORIGIN,@loader_path/}, optionally we add relative paths if the Makefile
-# sets LD_RUNPATH_EXTRAS to those relative paths.
-# Except on MacOS X we add a flag -z origin, not sure if this is necessary,
-# but doesn't seem to hurt.
-# The environment variable LD_LIBRARY_PATH will over-ride these runpaths.
-# See 'man {dyld,rtld}' for more information.
-# Try: 'readelf -d lib*.so' to see these settings in a library.
-#
-LDFLAGS_COMMON += -Xlinker -rpath -Xlinker @loader_path/.
-LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -rpath -Xlinker @loader_path/%)
-LDFLAGS_COMMON += -Xlinker -install_name -Xlinker @rpath/$(@F)
-
-#
-# -L paths for finding and -ljava
-#
-LDFLAGS_COMMON += -L$(LIBDIR)
-
-#
-# -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
-# statically link libgcc but will print a warning with the flag. We don't
-# want the warning, so check gcc version first.
-#
-ifeq ($(CC_MAJORVER),3)
- OTHER_LDFLAGS += -static-libgcc
-endif
-
-# Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
-# (See Rules.gmk) The gcc 5 compiler might have an option for this?
-AUTOMATIC_PCH_OPTION =
-
-#
-# Post Processing of libraries/executables
-#
-ifeq ($(VARIANT), OPT)
- ifneq ($(NO_STRIP), true)
- ifneq ($(DEBUG_BINARIES), true)
- # Debug 'strip -S' leaves local function Elf symbols (better stack
- # traces)
- POST_STRIP_PROCESS = $(STRIP) -S
- endif
- endif
-endif
-
-#
-# Use: ld $(LD_MAPFILE_FLAG) mapfile *.o
-#
-LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
-
-#
-# Support for Quantify.
-#
-ifdef QUANTIFY
-QUANTIFY_CMD = quantify
-QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
-LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
-endif
-
-# Darwin does not support linker map files.
-LDNOMAP=true
-
-#
-# Path and option to link against the VM, if you have to. Note that
-# there are libraries that link against only -ljava, but they do get
-# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
-# the library itself should not.
-#
-VM_NAME = server
-JVMLIB = -L$(LIBDIR)/$(VM_NAME) -ljvm
-JAVALIB = -ljava $(JVMLIB)
-
-#
-# We want to privatize JVM symbols on Solaris. This is so the user can
-# write a function called FindClass and this should not override the
-# FindClass that is inside the JVM. At this point in time we are not
-# concerned with other JNI libraries because we hope that there will
-# not be as many clashes there.
-#
-PRIVATIZE_JVM_SYMBOLS = false
-
-USE_PTHREADS = true
-override ALT_CODESET_KEY = _NL_CTYPE_CODESET_NAME
-override AWT_RUNPATH =
-override HAVE_ALTZONE = false
-override HAVE_FILIOH = false
-override HAVE_GETHRTIME = false
-override HAVE_GETHRVTIME = false
-override HAVE_SIGIGNORE = true
-override LEX_LIBRARY = -lfl
-ifeq ($(STATIC_CXX),true)
-override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
-else
-override LIBCXX = -lstdc++
-endif
-override LIBPOSIX4 =
-override LIBSOCKET =
-override LIBNSL =
-override LIBTHREAD =
-override LIBDL =
-override MOOT_PRIORITIES = true
-override NO_INTERRUPTIBLE_IO = true
-override OPENWIN_HOME = $(X11_PATH)
-override OPENWIN_LIB = $(OPENWIN_HOME)/lib
-override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
-override SUN_CMM_SUBDIR =
-override THREADS_FLAG = native
-override USE_GNU_M4 = true
-override USING_GNU_TAR = true
-override WRITE_LIBVERSION = false
-
-ifdef ALT_X11_PATH
- X11_PATH = $(ALT_X11_PATH)
-else
- X11_PATH = /usr/X11R6
-endif
-
-ifdef ALT_PACKAGE_PATH
- PACKAGE_PATH = $(ALT_PACKAGE_PATH)
-else
- PACKAGE_PATH = /opt/local
-endif
-
-# ALSA
-ifdef ALT_ALSA_LIB_PATH
- ALSA_LIB_PATH = $(ALT_ALSA_LIB_PATH)
-else
- ALSA_LIB_PATH = $(PACKAGE_PATH)/lib
-endif
-
-ifdef ALT_ALSA_HEADERS_PATH
- ALSA_HEADERS_PATH = $(ALT_ALSA_HEADERS_PATH)
-else
- ALSA_HEADERS_PATH = $(PACKAGE_PATH)/include
-endif
-
-# USE_EXECNAME forces the launcher to look up argv[0] on $PATH, and put the
-# resulting resolved absolute name of the executable in the environment
-# variable EXECNAME. That executable name is then used that to locate the
-# installation area.
-override USE_EXECNAME = true
-
-# If your platform has DPS, it will have Type1 fonts too, in which case
-# it is best to enable DPS support until such time as 2D's rasteriser
-# can fully handle Type1 fonts in all cases. Default is "yes".
-# HAVE_DPS should only be "no" if the platform has no DPS headers or libs
-# DPS (Displayable PostScript) is available on Solaris machines
-HAVE_DPS = no
-
-SYSTEM_ZLIB = true
-
-#
-# Japanese manpages
-#
-JA_SOURCE_ENCODING = eucJP
-JA_TARGET_ENCODINGS = UTF-8
-
-# Settings for the JDI - Serviceability Agent binding.
-
-HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/lib
-SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX)
-
-# The JDI - Serviceability Agent binding is not currently supported
-# on ia64.
-ifeq ($(ARCH), ia64)
- INCLUDE_SA = false
-else
- INCLUDE_SA = true
-endif
-
-# X11 headers are not under /usr/include
-OTHER_CFLAGS += -I$(OPENWIN_HOME)/include
-OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
-OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
-
-LIB_LOCATION ?= $(LIBDIR)
-
-# Setting these parameters makes it an error to link to macosx APIs that are
-# newer than the given OS version and makes the linked binaries compatible even
-# if built on a newer version of the OS.
-# The expected format is X.Y.Z
-ifeq ($(MACOSX_VERSION_MIN),)
- MACOSX_VERSION_MIN=10.7.0
-endif
-# The macro takes the version with no dots, ex: 1070
-MACOSX_OS_VERSION_CFLAGS := -DMAC_OS_X_VERSION_MAX_ALLOWED=$(subst .,,$(MACOSX_VERSION_MIN)) \
- -mmacosx-version-min=$(MACOSX_VERSION_MIN)
-OTHER_CFLAGS += $(MACOSX_OS_VERSION_CFLAGS)
-OTHER_CXXFLAGS += $(MACOSX_OS_VERSION_CFLAGS)
-OTHER_LDFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN)
diff --git a/jdk/make/common/Defs-solaris.gmk b/jdk/make/common/Defs-solaris.gmk
deleted file mode 100644
index b08488f..0000000
--- a/jdk/make/common/Defs-solaris.gmk
+++ /dev/null
@@ -1,800 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to specify compiler flags for programs and libraries
-# targeted to Solaris. Should not contain any rules.
-#
-# WARNING: This file is shared with other workspaces.
-# So when it includes other files, it must use JDK_TOPDIR.
-#
-
-# Warning: the following variables are overridden by Defs.gmk. Set
-# values will be silently ignored:
-# CFLAGS (set $(OTHER_CFLAGS) instead)
-# CPPFLAGS (set $(OTHER_CPPFLAGS) instead)
-# CXXFLAGS (set $(OTHER_CXXFLAGS) instead)
-# LDFLAGS (set $(OTHER_LDFAGS) instead)
-# LDLIBS (set $(EXTRA_LIBS) instead)
-# LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
-# LINTFLAGS (set $(OTHER_LINTFLAGS) instead)
-#
-# Note: CPPFLAGS are used in C and C++ compiles.
-#
-
-# Get shared JDK settings
-include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
-
-ifndef PLATFORM_SRC
-PLATFORM_SRC = $(BUILDDIR)/../src/solaris
-endif # PLATFORM_SRC
-
-# Location of the various .properties files specific to Solaris platform
-ifndef PLATFORM_PROPERTIES
- PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib
-endif # PLATFORM_SRC
-
-# Platform specific closed sources
-ifndef OPENJDK
- ifndef CLOSED_PLATFORM_SRC
- CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris
- endif
-endif
-
-# platform specific include files
-PLATFORM_INCLUDE_NAME = $(PLATFORM)
-PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
-
-# suffix used for make dependencies files
-DEPEND_SUFFIX = d
-# suffix used for lint files
-LINT_SUFFIX = ln
-# The suffix applied to the library name for FDLIBM
-FDDLIBM_SUFFIX = a
-# The suffix applied to scripts (.bat for windows, nothing for unix)
-SCRIPT_SUFFIX =
-# CC compiler object code output directive flag value
-CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
-
-# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
-# enabled with debug info files ZIP'ed to save space. For VARIANT !=
-# OPT builds, FDS is always enabled, after all a debug build without
-# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
-# meaning when FDS is enabled.
-#
-# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
-# disabled for a VARIANT == OPT build.
-#
-# Note: Use of a different variable name for the FDS override option
-# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
-# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
-# in options via environment variables, use of distinct variables
-# prevents strange behaviours. For example, in a VARIANT != OPT build,
-# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
-# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
-# variable name is used, then different values can be picked up by
-# different parts of the build. Just to be clear, we only need two
-# variable names because the incoming option value can be overridden
-# in some situations, e.g., a VARIANT != OPT build.
-
-ADD_GNU_DEBUGLINK = $(ABS_BUILDTOOLBINDIR)/add_gnu_debuglink
-FIX_EMPTY_SEC_HDR_FLAGS = $(ABS_BUILDTOOLBINDIR)/fix_empty_sec_hdr_flags
-
-ifeq ($(VARIANT), OPT)
- FULL_DEBUG_SYMBOLS ?= 1
- ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
-else
- # debug variants always get Full Debug Symbols (if available)
- ENABLE_FULL_DEBUG_SYMBOLS = 1
-endif
-_JUNK_ := $(shell \
- echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
-# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
-
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- # Default OBJCOPY comes from the SUNWbinutils package:
- DEF_OBJCOPY=/usr/sfw/bin/gobjcopy
- OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
- ifneq ($(ALT_OBJCOPY),)
- _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
- # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
- OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
- endif
-
- # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the
- # JDK build to import .debuginfo or .diz files from the HotSpot build.
- # However, adding FDS support to the JDK build will occur in phases
- # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
- # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a
- # particular library or program supports FDS.
-
- ifeq ($(OBJCOPY),)
- _JUNK_ := $(shell \
- echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
- ENABLE_FULL_DEBUG_SYMBOLS=0
- else
- _JUNK_ := $(shell \
- echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
-
- # Library stripping policies for .debuginfo configs:
- # all_strip - strips everything from the library
- # min_strip - strips most stuff from the library; leaves minimum symbols
- # no_strip - does not strip the library at all
- #
- # Oracle security policy requires "all_strip". A waiver was granted on
- # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
- #
- #
- # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
- STRIP_POLICY ?= min_strip
-
- _JUNK_ := $(shell \
- echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
-
- ZIP_DEBUGINFO_FILES ?= 1
-
- _JUNK_ := $(shell \
- echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
- endif
-endif
-
-#
-# Java default optimization (-x04/-O2) etc. Applies to the VM.
-#
-ifndef OPTIMIZATION_LEVEL
- ifeq ($(PRODUCT), java)
- OPTIMIZATION_LEVEL = HIGHER
- else
- OPTIMIZATION_LEVEL = LOWER
- endif
-endif
-ifndef FASTDEBUG_OPTIMIZATION_LEVEL
- FASTDEBUG_OPTIMIZATION_LEVEL = LOWER
-endif
-
-#
-# If -Xa is in CFLAGS_COMMON it will end up ahead of $(CC_OPT) for the
-# optimized build, and that ordering of the flags completely freaks
-# out cc. Hence, -Xa is instead in each CFLAGS variant.
-#
-# The more unusual options to the Sun C compiler:
-# -v Stricter type checking, more error checking
-# (To turn ALL warnings into fatals, use -errwarn=%all)
-# -xstrconst Place string literals and constants in read-only area
-# (means you can't write on your string literals)
-# -xs Force debug information (stabs) into the .so or a.out
-# (makes the library/executable debuggable without the
-# .o files needing to be around, but at a space cost)
-# -g & -O If you add the -g option to the optimized compiles
-# you will get better stack retraces, the code is
-# still optimized. This includes a space cost too.
-# -xc99=%none Do NOT allow for c99 extensions to be used.
-# e.g. declarations must precede statements
-# -xCC Allow the C++ style of comments in C: //
-# Required with many of the source files.
-# -mt Assume multi-threaded (important)
-#
-# The more unusual options to the Sun C compiler:
-# +w Print more warnings
-# +w2 Maximum warnings
-#
-
-#
-# Debug flag for C and C++ compiler
-#
-CFLAGS_DEBUG_OPTION = -g $(CC_OPT/NONE)
-CXXFLAGS_DEBUG_OPTION = -g $(CXX_OPT/NONE)
-
-# Turn off -g if we are doing tcov build
-ifdef TCOV_BUILD
- CFLAGS_DEBUG_OPTION=
- CXXFLAGS_DEBUG_OPTION=
-endif
-
-# FASTDEBUG: Optimize the -g builds, gives us a faster debug java
-# If true adds -O to the debug compiles. This allows for any assert
-# tests to remain and debug checking. The resulting code is faster
-# but less debuggable. Stack traces are still valid, although only
-# approximate line numbers are given. Printing of local variables
-# during a debugging session is not possible, but stepping and
-# printing of global or static variables should be possible.
-# Performance/size of files should be about the same, maybe smaller.
-#
-ifeq ($(FASTDEBUG), true)
- CFLAGS_DEBUG_OPTION = -g $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
- CXXFLAGS_DEBUG_OPTION = -g0 $(CXX_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
-endif
-
-# If Full Debug Symbols is enabled, then we want the same debug and
-# optimization flags as used by FASTDEBUG. We also want all the
-# debug info in one place (-xs).
-#
-CFLAGS_COMMON=
-CXXFLAGS_COMMON=
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(VARIANT), OPT)
- OPTIMIZATION_LEVEL = $(FASTDEBUG_OPTIMIZATION_LEVEL)
- CFLAGS_COMMON += -g -xs
- CXXFLAGS_COMMON += -g0 -xs
- endif
- CFLAGS_DEBUG_OPTION += -xs
- CXXFLAGS_DEBUG_OPTION += -xs
- endif
-endif
-
-CFLAGS_COMMON += -L$(OBJDIR)
-
-# Do not allow C99 language features like declarations in code etc.
-CFLAGS_COMMON += -xc99=%none
-
-# Allow C++ comments in C code
-CFLAGS_COMMON += -xCC
-
-# Show error message tags on errors
-CFLAGS_COMMON += -errshort=tags
-CXXFLAGS_COMMON += -errtags=yes
-
-# Optimization flags
-CFLAGS_OPT = $(CC_OPT)
-
-# Debug version flags
-CFLAGS_DBG = $(CFLAGS_DEBUG_OPTION)
-
-# Required C compiler flags
-CFLAGS_COMMON += -Xa $(CFLAGS_REQUIRED)
-
-# Maximum warnings all the time
-CXXFLAGS_COMMON += +w
-CFLAGS_COMMON += -v
-
-# Assume MT behavior all the time (important)
-CXXFLAGS_COMMON += -mt
-CFLAGS_COMMON += -mt
-
-# Assume no C++ exceptions are used
-CXXFLAGS_COMMON += -features=no%except -DCC_NOEX
-
-# For C++, these options tell it to assume nothing about locating libraries
-# either at compile time, or at runtime. Use of these options will likely
-# require the use of -L and -R options to indicate where libraries will
-# be found at compile time (-L) and at runtime (-R).
-# The /usr/lib location comes for free, so no need to specify that one.
-# Note: C is much simplier and there is no need for these options. This
-# is mostly needed to avoid dependencies on libraries in the
-# Compiler install area, also see LIBCXX and LIBM.
-CXXFLAGS_COMMON += -norunpath -xnolib
-
-#
-# Treat compiler warnings as errors, if requested
-#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- CFLAGS_COMMON += -errwarn=%all
- CXXFLAGS_COMMON += -errwarn=%all
-endif
-
-CXXFLAGS_OPT = $(CXX_OPT)
-CXXFLAGS_DBG = $(CXXFLAGS_DEBUG_OPTION)
-CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
-
-# Add -xstrconst to the library compiles. This forces all string
-# literals into the read-only data section, which prevents them from
-# being written to and increases the runtime pages shared on the system.
-#
-ifdef LIBRARY
- CFLAGS_COMMON +=-xstrconst
-endif
-
-# Source browser database
-#
-# COMPILE_WITH_SB
-# If defined adds -xsb to compiles and creates a
-# source browsing database during compilation.
-#
-ifdef COMPILE_WITH_SB
- ifeq ($(LIBRARY), java)
- CFLAGS_DBG += -xsb
- endif
-endif
-
-# Lint Flags:
-# -Xa ANSI C plus K&R, favor ANSI rules
-# -fd report on old style func defs
-# -errchk=structarg report on 64bit struct args by value
-# -errchk=longptr64 report on 64bit to 32bit issues (ignores casts)
-# -errchk=parentheses report on suggested use of extra parens
-# -v suppress unused args
-# -x suppress unused externs
-# -u suppress extern func/vars used/defined
-# -errfmt=simple use one line errors with position info
-# $(LINT_XARCH_OPTION) See Compiler-sun.gwk
-
-LINTFLAGS_COMMON = -Xa
-LINTFLAGS_COMMON += -fd
-LINTFLAGS_COMMON += -errchk=structarg,longptr64,parentheses
-LINTFLAGS_COMMON += -v
-LINTFLAGS_COMMON += -x
-LINTFLAGS_COMMON += -u
-LINTFLAGS_COMMON += -errfmt=simple
-LINTFLAGS_OPT =
-LINTFLAGS_DBG =
-
-# The -W0,-noglobal tells the compiler to NOT generate mangled global
-# ELF data symbols for file local static data.
-# This can break fix&continue, but we'd rather do the same compilations
-# for deliverable bits as we do for non-deliverable bits
-# Tell the compilers to never generate globalized names, all the time.
-CFLAGS_COMMON += -W0,-noglobal
-
-# If we have a specific arch value to use, add it
-CFLAGS_COMMON += $(XARCH_OPTION)
-CXXFLAGS_COMMON += $(XARCH_OPTION)
-ASFLAGS_COMMON += $(AS_XARCH_OPTION)
-EXTRA_LIBS += $(XARCH_OPTION)
-LINTFLAGS_COMMON += $(LINT_XARCH_OPTION)
-
-#
-# uncomment the following to build with PERTURBALOT set
-#
-# OTHER_CFLAGS += -DPERTURBALOT
-#
-
-CPPFLAGS_COMMON = -D__solaris__ -D$(ARCH_FAMILY)
-CPPFLAGS_OPT = -DNDEBUG
-CPPFLAGS_DBG = -DDEBUG
-
-ifneq ($(PRODUCT), java)
- CPPFLAGS_DBG += -DLOGGING -DDBINFO
-endif
-
-ifeq ($(ARCH_FAMILY), i586)
- # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
- # Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
- # (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h).
- # Note: -Dmacro is the same as #define macro 1
- # -Dmacro= is the same as #define macro
- #
- CPPFLAGS_COMMON += -DcpuIntel -D_LITTLE_ENDIAN= -D$(LIBARCH)
- # Turn off a superfluous compiler error message on Intel
- CFLAGS_COMMON += -erroff=E_BAD_PRAGMA_PACK_VALUE
-endif
-
-# Java memory management is based on memory mapping by default, but a
-# system only assuming malloc/free can be built by adding -DUSE_MALLOC
-
-CPPFLAGS_COMMON += -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS
-CPPFLAGS_OPT += -DTRIMMED
-
-LDFLAGS_DEFS_OPTION = -z defs
-LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
-
-#
-# -L paths for finding and -ljava
-#
-LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
-LDFLAGS_OPT =
-LDFLAGS_DBG =
-
-#
-# We never really want the incremental linker, ever
-# The -xildoff option tells Sun's compilers to NOT use incremental linker
-#
-LDFLAGS_COMMON += -xildoff
-
-ifdef LIBRARY
- # Libraries need to locate other libraries at runtime, and you can tell
- # a library where to look by way of the dynamic runpaths (RPATH or RUNPATH)
- # buried inside the .so. The $ORIGIN says to look relative to where
- # the library itself is and it can be followed with relative paths from
- # that. By default we always look in $ORIGIN, optionally we add relative
- # paths if the Makefile sets LD_RUNPATH_EXTRAS to those relative paths.
- # The environment variable LD_LIBRARY_PATH will over-ride these runpaths.
- # Try: 'dump -Lv lib*.so' to see these settings in a library.
- #
- LDFLAGS_COMMON += -R\$$ORIGIN
- LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-R\$$ORIGIN/%)
-endif
-
-EXTRA_LIBS += -lc
-
-# Postprocessing is done on the images directories only
-#
-ifeq ($(VARIANT), OPT)
- ifeq ($(PARTIAL_GPROF), true)
- NO_STRIP = true
- endif
- ifeq ($(GPROF), true)
- NO_STRIP = true
- endif
- ifneq ($(NO_STRIP), true)
- # Debug 'strip -x' leaves local function Elf symbols (better stack traces)
- POST_STRIP_PROCESS = $(STRIP) -x
- endif
-endif
-POST_MCS_PROCESS=$(MCS) -d -a "JDK $(FULL_VERSION)"
-
-#
-# Sun C compiler will take -M and pass it on to ld.
-# Usage: ld $(LD_MAPFILE_FLAG) mapfile *.o
-#
-ifeq ($(CC_VERSION),gcc)
-LD_MAPFILE_FLAG = -Xlinker -M -Xlinker
-else
-LD_MAPFILE_FLAG = -M
-endif
-
-#
-# Variables globally settable from the make command line (default
-# values in brackets):
-# GPROF (false)
-# Eg: % gnumake GPROF=true
-GPROF = false
-ifeq ($(GPROF), true)
- CFLAGS_COMMON += -DGPROF -xpg
- EXTRA_LIBS += -xpg
-endif
-
-# PARTIAL_GPROF is to be used ONLY during compilation - it should not
-# appear during linking of libraries or programs. It also should
-# prevent linking with -z defs to allow a symbol to remain undefined.
-#
-PARTIAL_GPROF = false
-ifeq ($(PARTIAL_GPROF), true)
- CFLAGS_GPROF += -xpg
- LDFLAGS_DEFS_OPTION = -z nodefs
-endif
-
-#
-# For a TCOV build we add in the TCOV_OPTION
-#
-ifdef TCOV_BUILD
- TCOV_OPTION = -xprofile=tcov
- LDFLAGS_COMMON += $(TCOV_OPTION) -Kpic
- CFLAGS_COMMON += $(TCOV_OPTION)
- CXXFLAGS_COMMON += $(TCOV_OPTION)
- EXTRA_LIBS += $(TCOV_OPTION)
- LDNOMAP=true
-endif
-
-#
-# Solaris only uses native threads.
-#
-THREADS_FLAG= native
-THREADS_DIR= threads
-
-#
-# Support for Quantify.
-#
-ifdef QUANTIFY
- QUANTIFY_CMD = quantify
- QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
- LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
- ifdef LIBRARY
- CFLAGS_COMMON += -K PIC
- endif
-endif
-
-#
-# Support for Purify.
-#
-ifdef PURIFY
- PURIFY_CMD = /net/suntools.eng/export/tools/sparc/bin/purify
- PURIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
- LINK_PRE_CMD = $(PURIFY_CMD) $(PURIFY_OPTIONS)
- ifdef LIBRARY
- CFLAGS_COMMON += -K PIC
- endif
-endif
-
-#
-# Different "levels" of optimization.
-#
-ifeq ($(CC_VERSION),gcc)
-
- CC_OPT/NONE =
- CC_OPT/LOWER = -O2
- CC_OPT/HIGHER = -O3
- CC_OPT/HIGHEST = -O3
-
- CXX_OPT/NONE =
- CXX_OPT/LOWER = -O2
- CXX_OPT/HIGHER = -O3
- CXX_OPT/HIGHEST = -O3
-
- CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer
- CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer
-
- # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
- # (See Rules.gmk) May need to wait for gcc 5?
- AUTOMATIC_PCH_OPTION =
-
-else
-
- # Highest could be -xO5, but indications are that -xO5 should be reserved
- # for a per-file use, on sources with known performance impacts.
- OPT_LEVEL/LOWER = 2
- OPT_LEVEL/HIGHER = 4
- OPT_LEVEL/HIGHEST = 4
-
- CC_OPT/NONE =
- CC_OPT/LOWER = $(OPT_LEVEL/LOWER:%=-xO%)
- CC_OPT/HIGHER = $(OPT_LEVEL/HIGHER:%=-xO%)
- CC_OPT/HIGHEST = $(OPT_LEVEL/HIGHEST:%=-xO%)
-
- CXX_OPT/NONE =
- CXX_OPT/LOWER = $(OPT_LEVEL/LOWER:%=-xO%)
- CXX_OPT/HIGHER = $(OPT_LEVEL/HIGHER:%=-xO%)
- CXX_OPT/HIGHEST = $(OPT_LEVEL/HIGHEST:%=-xO%)
-
- # We need stack frames at all times
- USE_XKEEPFRAME_OPTION = false
- ifeq ($(USE_XKEEPFRAME_OPTION),true)
-
- # Unknown spelling on this option at this time (Maybe in SS13?)
- CC_XKEEPFRAME_OPTIONS = -xkeepframe
- CXX_XKEEPFRAME_OPTIONS = -xkeepframe
-
- else
-
- # On X86, make sure tail call optimization is off
- # The z and y are the tail call optimizations.
- ifeq ($(ARCH_FAMILY), i586)
- CC_NEWER_THAN_58 := \
- $(shell $(EXPR) $(CC_MAJORVER) \> 5 \| \
- \( $(CC_MAJORVER) = 5 \& $(CC_MINORVER) \> 8 \) )
- ifeq ($(CC_NEWER_THAN_58),1)
- # Somehow, tail call optimization is creeping in.
- # Make sure it is off.
- # WARNING: These may cause compiler warnings about duplicate -O options
- CC_XKEEPFRAME_OPTIONS += -Wu,-O$(OPT_LEVEL/$(OPTIMIZATION_LEVEL))~yz
- CXX_XKEEPFRAME_OPTIONS += -Qoption ube -O$(OPT_LEVEL/$(OPTIMIZATION_LEVEL))~yz
- endif
- endif
-
- # On i586 we need to tell the code generator to ALWAYS use a
- # frame pointer.
- ifeq ($(ARCH_FAMILY), i586)
- # Note that in 5.7, this is done with -xregs=no%frameptr
- ifeq ($(CC_VER), 5.5)
- # It's not exactly clear when this optimization kicks in, the
- # current assumption is -xO4 or greater and for C++ with
- # the -features=no%except option and -xO4 and greater.
- # Bottom line is, we ALWAYS want a frame pointer!
- CC_XKEEPFRAME_OPTIONS += -Wu,-Z~B
- CXX_XKEEPFRAME_OPTIONS += -Qoption ube -Z~B
- endif
-
- CC_NEWER_THAN_56 := \
- $(shell $(EXPR) $(CC_MAJORVER) \> 5 \| \
- \( $(CC_MAJORVER) = 5 \& $(CC_MINORVER) \> 6 \) )
- ifeq ($(CC_NEWER_THAN_56),1)
- # Do NOT use frame pointer register as a general purpose opt register
- CC_OPT/NONE += -xregs=no%frameptr
- CXX_OPT/NONE += -xregs=no%frameptr
- CC_XKEEPFRAME_OPTIONS += -xregs=no%frameptr
- CXX_XKEEPFRAME_OPTIONS += -xregs=no%frameptr
- endif
- endif
-
- # Optimizer for sparc needs to be told not to do certain things
- # related to frames or save instructions.
- ifeq ($(ARCH_FAMILY), sparc)
- # Do not use save instructions instead of add instructions
- # This was an optimization starting in SC5.0 that made it hard for us to
- # find the "save" instruction (which got turned into an "add")
- CC_XKEEPFRAME_OPTIONS += -Wc,-Qrm-s
- CXX_XKEEPFRAME_OPTIONS += -Qoption cg -Qrm-s
- # Don't allow tail call code optimization. Started in SC5.0.
- # We don't like code of this form:
- # save
- # <code>
- # call foo
- # restore
- # because we can't tell if the method will have a stack frame
- # and register windows or not.
- CC_XKEEPFRAME_OPTIONS += -Wc,-Qiselect-T0
- CXX_XKEEPFRAME_OPTIONS += -Qoption cg -Qiselect-T0
- endif
-
- endif
-
- # Extra options used with HIGHEST
- #
- # WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
- # done with care, there are some assumptions below that need to
- # be understood about the use of pointers, and IEEE behavior.
- #
- # Use non-standard floating point mode (not IEEE 754)
- CC_HIGHEST_EXTRAS += -fns
- # Do some simplification of floating point arithmetic (not IEEE 754)
- CC_HIGHEST_EXTRAS += -fsimple
- # Use single precision floating point with 'float'
- CC_HIGHEST_EXTRAS += -fsingle
- # Assume memory references via basic pointer types do not alias
- # (Source with excessing pointer casting and data access with mixed
- # pointer types are not recommended)
- CC_HIGHEST_EXTRAS += -xalias_level=basic
- # Use intrinsic or inline versions for math/std functions
- # (If you expect perfect errno behavior, do not use this)
- CC_HIGHEST_EXTRAS += -xbuiltin=%all
- # Loop data dependency optimizations (need -xO3 or higher)
- CC_HIGHEST_EXTRAS += -xdepend
- # Pointer parameters to functions do not overlap
- # (Similar to -xalias_level=basic usage, but less obvious sometimes.
- # If you pass in multiple pointers to the same data, do not use this)
- CC_HIGHEST_EXTRAS += -xrestrict
- # Inline some library routines
- # (If you expect perfect errno behavior, do not use this)
- CC_HIGHEST_EXTRAS += -xlibmil
- # Use optimized math routines
- # (If you expect perfect errno behavior, do not use this)
- # Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
- # CC_HIGHEST_EXTRAS += -xlibmopt
- ifeq ($(ARCH_FAMILY), sparc)
- # Assume at most 8byte alignment, raise SIGBUS on error
- ### Presents an ABI issue with customer JNI libs?
- ####CC_HIGHEST_EXTRAS += -xmemalign=8s
- # Automatic prefetch instructions, explicit prefetch macros
- CC_HIGHEST_EXTRAS += -xprefetch=auto,explicit
- # Pick ultra as the chip to optimize to
- CC_HIGHEST_EXTRAS += -xchip=ultra
- endif
- ifeq ($(ARCH), i586)
- # Pick pentium as the chip to optimize to
- CC_HIGHEST_EXTRAS += -xchip=pentium
- endif
- ifdef LIBRARY
- # The Solaris CBE (Common Build Environment) requires that the use
- # of appl registers be disabled when compiling a public library (or
- # a library that's loaded by a public library) on sparc.
- CFLAGS_REQUIRED_sparc += -xregs=no%appl
- CFLAGS_REQUIRED_sparcv9 += -xregs=no%appl
- endif
- CC_NEWER_THAN_56 := \
- $(shell $(EXPR) $(CC_MAJORVER) \> 5 \| \
- \( $(CC_MAJORVER) = 5 \& $(CC_MINORVER) \> 6 \) )
- ifeq ($(CC_NEWER_THAN_56),1)
- # Presents an ABI issue with customer JNI libs? We must be able to
- # to handle 4byte aligned objects? (rare occurance, but possible?)
- CFLAGS_REQUIRED_sparc += -xmemalign=4s
- endif
- # Just incase someone trys to use the SOS9 compilers
- ifeq ($(CC_VER), 5.6)
- # We MUST allow data alignment of 4 for sparc (sparcv9 is ok at 8s)
- CFLAGS_REQUIRED_sparc += -xmemalign=4s
- endif
- # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
- # (See Rules.gmk) The SS11 -xpch=auto* options appear to be broken.
- AUTOMATIC_PCH_OPTION =
-
- # Add in keep frame options
- CC_OPT/LOWER += $(CC_XKEEPFRAME_OPTIONS)
- CC_OPT/HIGHER += $(CC_XKEEPFRAME_OPTIONS)
- CC_OPT/HIGHEST += $(CC_XKEEPFRAME_OPTIONS)
- CXX_OPT/LOWER += $(CXX_XKEEPFRAME_OPTIONS)
- CXX_OPT/HIGHER += $(CXX_XKEEPFRAME_OPTIONS)
- CXX_OPT/HIGHEST += $(CXX_XKEEPFRAME_OPTIONS)
-
- # Add in highest optimization settings
- CC_OPT/HIGHEST += $(CC_HIGHEST_EXTRAS)
- CXX_OPT/HIGHEST += $(CC_HIGHEST_EXTRAS)
-
-endif
-
-# Default optimization settings based on level.
-CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
-CXX_OPT = $(CXX_OPT/$(OPTIMIZATION_LEVEL))
-
-# Flags required all the time
-CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
-
-#
-# Path and option to link against the VM, if you have to. Note that
-# there are libraries that link against only -ljava, but they do get
-# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
-# the library itself should not.
-#
-VM_NAME = server
-JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
-JAVALIB = -ljava $(JVMLIB)
-
-# Part of INCREMENTAL_BUILD mechanism.
-# Compiler emits things like: path/file.o: file.h
-# We want something like: relative_path/file.o relative_path/file.d: file.h
-# In addition on Solaris, any include file starting with / is deleted,
-# this gets rid of things like /usr/include files, which never change.
-CC_DEPEND = -xM1
-CC_DEPEND_FILTER = $(SED) -e '/:[ ]*[/]/d' -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g' | $(SORT) -u
-
-# Location of openwin libraries (do we really need this anymore?)
-OPENWIN_HOME = /usr/openwin
-OPENWIN_LIB = $(OPENWIN_HOME)/lib$(ISA_DIR)
-
-# Runtime graphics library search paths...
-OPENWIN_RUNTIME_LIB = /usr/openwin/lib$(ISA_DIR)
-AWT_RUNPATH = -R/usr/dt/lib$(ISA_DIR) -R$(OPENWIN_RUNTIME_LIB)
-
-# C++ Runtime library (libCrun.so), use instead of -lCrun.
-# Originally used instead of -lCrun to guarantee use of the system
-# .so version and not the .a or .so that came with the compilers.
-# With the newer compilers this could probably change back to -lCrun but
-# in general this is ok to continue to do.
-LIBCXX = /usr/lib$(ISA_DIR)/libCrun.so.1
-
-# JDK now requires Solaris 10, so pick up libm.so.2
-LIBM = /usr/lib$(ISA_DIR)/libm.so.2
-
-# Socket library
-LIBSOCKET = -lsocket
-
-# Network Services library
-LIBNSL = -lnsl
-
-# service configuration facility library
-LIBSCF = -lscf
-
-# Dynamic Loading library
-LIBDL = -ldl
-
-# GLOBAL_KPIC: If set means all libraries are PIC, position independent code
-# EXCEPT for select compiles
-# If a .o file is compiled non-PIC then it should be forced
-# into the RW data segment with a mapfile option. This is done
-# with object files which generated from .s files.
-# The -ztext enforces that no relocations remain in the text segment
-# so that it remains purely read-only for optimum system performance.
-# Some libraries may use a smaller size (13bit -Kpic) on sparc instead of
-# (32 bit -KPIC) and will override GLOBAL_KPIC appropriately.
-#
-PIC_CODE_LARGE = -KPIC
-PIC_CODE_SMALL = -Kpic
-ifndef TCOV_BUILD
- GLOBAL_KPIC = $(PIC_CODE_LARGE)
- CXXFLAGS_COMMON += $(GLOBAL_KPIC)
- CFLAGS_COMMON += $(GLOBAL_KPIC)
- LDFLAGS_COMMON += -ztext
-endif # TCOV_BUILD
-
-# If your platform has DPS, it will have Type1 fonts too, in which case
-# it is best to enable DPS support until such time as 2D's rasteriser
-# can fully handle Type1 fonts in all cases. Default is "yes".
-# HAVE_DPS should only be "no" if the platform has no DPS headers or libs
-# DPS (Displayable PostScript) is available on Solaris machines
-
-HAVE_DPS = yes
-
-#
-# Japanese manpages
-#
-JA_SOURCE_ENCODING = eucJP
-JA_TARGET_ENCODINGS = eucJP UTF-8 PCK
-
-# Settings for the JDI - Serviceability Agent binding.
-HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
-SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX)
-SA_DEBUGINFO_NAME = $(LIB_PREFIX)saproc.debuginfo
-SA_DIZ_NAME = $(LIB_PREFIX)saproc.diz
-INCLUDE_SA=true
-
diff --git a/jdk/make/common/Defs-windows.gmk b/jdk/make/common/Defs-windows.gmk
deleted file mode 100644
index ef2c4ae..0000000
--- a/jdk/make/common/Defs-windows.gmk
+++ /dev/null
@@ -1,432 +0,0 @@
-#
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to specify compiler flags for programs and libraries
-# targeted to Windows builds. Should not contain any rules.
-#
-# WARNING: This file is shared with other workspaces.
-# So when it includes other files, it must use JDK_TOPDIR.
-#
-
-# Get shared JDK settings
-include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
-
-# CC compiler object code output directive flag value
-CC_OBJECT_OUTPUT_FLAG = -Fo
-
-# The suffix applied to the library name for FDLIBM
-FDDLIBM_SUFFIX = lib
-# The suffix applied to scripts (.bat for windows, nothing for unix)
-SCRIPT_SUFFIX = .bat
-
-# LIB_LOCATION, which for windows identifies where .exe files go, may be
-# set by each GNUmakefile. The default is BINDIR.
-ifndef LIB_LOCATION
- LIB_LOCATION = $(BINDIR)
-endif # LIB_LOCATION
-
-ifndef PLATFORM_SRC
- PLATFORM_SRC = $(BUILDDIR)/../src/windows
-endif # PLATFORM_SRC
-
-# Location of the various .properties files specific to Windows platform
-ifndef PLATFORM_PROPERTIES
- PLATFORM_PROPERTIES = $(BUILDDIR)/../src/windows/lib
-endif # PLATFORM_SRC
-
-# Platform specific closed sources
-ifndef OPENJDK
- ifndef CLOSED_PLATFORM_SRC
- CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/windows
- endif
-endif
-
-# for backwards compatability, the old "win32" is used here instead of
-# the more proper "windows"
-PLATFORM_INCLUDE_NAME = win32
-PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
-
-# The following DLL's are considered MS runtime libraries and should
-# not to be REBASEd, see deploy/make/common/Release.gmk.
-# msvcr*.dll: Microsoft runtimes
-ifeq ($(COMPILER_VERSION), VS2010)
- MSVCRNN_DLL = msvcr100.dll
- MSVCPNN_DLL = msvcp100.dll
- MS_RUNTIME_LIBRARIES = $(MSVCRNN_DLL)
-endif
-
-# Full Debug Symbols has been enabled on Windows since JDK1.4.1.
-# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
-# enabled with debug info files ZIP'ed to save space. For VARIANT !=
-# OPT builds, FDS is always enabled, after all a debug build without
-# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
-# meaning when FDS is enabled.
-#
-# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
-# disabled for a VARIANT == OPT build.
-#
-# Note: Use of a different variable name for the FDS override option
-# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
-# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
-# in options via environment variables, use of distinct variables
-# prevents strange behaviours. For example, in a VARIANT != OPT build,
-# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
-# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
-# variable name is used, then different values can be picked up by
-# different parts of the build. Just to be clear, we only need two
-# variable names because the incoming option value can be overridden
-# in some situations, e.g., a VARIANT != OPT build.
-
-ifeq ($(VARIANT), OPT)
- FULL_DEBUG_SYMBOLS ?= 1
- ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
-else
- # debug variants always get Full Debug Symbols (if available)
- ENABLE_FULL_DEBUG_SYMBOLS = 1
-endif
-_JUNK_ := $(shell \
- echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
-
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ZIP_DEBUGINFO_FILES ?= 1
-else
- ZIP_DEBUGINFO_FILES=0
-endif
-_JUNK_ := $(shell echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
-
-# C Compiler flag definitions
-
-#
-# Default optimization
-#
-
-ifndef OPTIMIZATION_LEVEL
- ifeq ($(PRODUCT), java)
- OPTIMIZATION_LEVEL = HIGHER
- else
- OPTIMIZATION_LEVEL = LOWER
- endif
-endif
-ifndef FASTDEBUG_OPTIMIZATION_LEVEL
- FASTDEBUG_OPTIMIZATION_LEVEL = LOWER
-endif
-
-ifeq ($(CC_VERSION),msvc)
- # Visual Studio compiler option definitions:
- # -O1 Favors reduced size over speed (-Og -Os -Oy -Ob2 -Gs -GF -Gy)
- # -O2 Favors speed over reduced size (-Og -Oi -Ot -Oy -Ob2 -Gs -GF -Gy)
- # -Ob2 More aggressive inlining
- # -Og Global optimizations
- # -Oi Replace some functions with intrinsic or special forms
- # -fp:precise (should be the default)
- # Improve floating point calculations (disables some optimizations)
- # -Os Favor small code
- # -Ot Favor faster code
- # -Oy Frame pointer omission
- # -G6 Used to be -GB?
- # -GF Pool strings in read-only memory
- # -Gf Pool strings in read-write memory (the default)
- # -Gs Controls stack probess
- # -GS Adds buffer overflow checks on stacks (the default)
- # -EHsc Enables exception handling
- # -Gy Function level linking only
- #
-
- CC_OPT/NONE = -Od
- CC_OPT/LOWER = -O2
- CC_OPT/HIGHER = -O3
- CC_OPT/HIGHEST = -O3
-
- ifeq ($(COMPILER_VERSION), VS2010)
- # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
- AUTOMATIC_PCH_OPTION =
- GX_OPTION = -EHsc
- GZ_OPTION = -RTC1
- ifeq ($(ARCH_DATA_MODEL), 32)
- CC_OPT/HIGHEST = -O2
- CC_OPT/HIGHER = -O1
- CC_OPT/LOWER = -O1
- else
- CC_OPT/HIGHEST = -O2
- CC_OPT/HIGHER = -O1
- CC_OPT/LOWER = -O1
- endif
- endif
-
-else # CC_VERSION
- # GCC not supported, but left for historical reference...
- CC_OPT/NONE =
- CC_OPT/LOWER = -O2
- CC_OPT/HIGHER = -O2
- CC_OPT/HIGHEST = -O3
-
-endif
-
-CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
-
-# Select the runtime support library carefully, need to be consistent
-#
-# Visual Studio Runtime compiler option definitions:
-# -MD Use dynamic multi-threaded runtime library
-# -MDd Use debug version (don't use, doesn't mix with -MD DLL's)
-# -MT Use static multi-threaded runtime library (-ML is going away)
-# -MTd Use static debug version (better than -MDd, no runtime issues)
-# -D_DEBUG Change use of malloc/free/etc to use special debug ones (-MTd)
-#
-# NOTE: We also will use -D _STATIC_CPPLIB so we don't need msvcpnn.dll
-#
-# If MS_RUNTIME_STATIC is requested we may have a problem, it is no longer
-# supported by VS2010
-ifneq ($(MS_RUNTIME_STATIC),true)
- MS_RUNTIME_OPTION=-MD
-endif
-# The _DEBUG macro option (changes things like malloc to use debug version)
-MS_RUNTIME_DEBUG_OPTION=
-MS_RC_DEBUG_OPTION=
-# Externally set environment variable can force any build to use the debug vers
-ifeq ($(MFC_DEBUG), true)
- ifeq ($(MS_RUNTIME_STATIC),true)
- MS_RUNTIME_OPTION=-MTd
- else
- # This MS debugging flag forces a dependence on the debug
- # version of the runtime library (MSVCR*D.DLL), as does -MDd.
- # We cannot re-distribute this debug runtime.
- MS_RUNTIME_OPTION=-MDd
- endif
- MS_RUNTIME_DEBUG_OPTION= -D_DEBUG
- MS_RC_DEBUG_OPTION= -d _DEBUG
-endif
-
-# Always add _STATIC_CPPLIB definition
-STATIC_CPPLIB_OPTION = -D _STATIC_CPPLIB
-
-# Silence the warning about using _STATIC_CPPLIB
-ifneq ($(SHOW_ALL_WARNINGS),true)
- # Needed with VS2010 to turn off the deprecated warning.
- STATIC_CPPLIB_OPTION += -D _DISABLE_DEPRECATE_STATIC_CPPLIB
-endif
-
-MS_RUNTIME_OPTION += $(STATIC_CPPLIB_OPTION)
-
-ifeq ($(CC_VERSION),msvc)
- # Visual Studio compiler option definitions:
- # -Zi Cause *.pdb file to be created, full debug information
- # -Z7 Full debug inside the .obj, no .pdb
- # -Zd Basic debug, no local variables? In the .obj
- # -Zl Don't add runtime library name to obj file?
- # -Od Turns off optimization and speeds compilation
- # -YX -Fp/.../foobar.pch Use precompiled headers (try someday?)
- # -nologo Don't print out startup message
- # -D _STATIC_CPPLIB
- # Use static link for the C++ runtime (so msvcpnn.dll not needed)
- #
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- CFLAGS_COMMON += -Zi
- endif
- CFLAGS_COMMON += -nologo
- CFLAGS_OPT = $(CC_OPT)
- CFLAGS_DBG = -Od $(MS_RUNTIME_DEBUG_OPTION)
-
- CFLAGS_VS2010 += -Zc:wchar_t-
-
- # All builds get the same runtime setting
- CFLAGS_COMMON += $(MS_RUNTIME_OPTION) $(CFLAGS_$(COMPILER_VERSION))
-
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- LDEBUG = -debug
- endif
-
- ifeq ($(VTUNE_SUPPORT), true)
- OTHER_CFLAGS = -Z7 -Ox
- LDEBUG += -pdb:NONE
- endif
-
- # VS2010, always need safe exception handlers, not needed on 64bit
- ifeq ($(ARCH_DATA_MODEL), 32)
- LFLAGS_VS2010 += -SAFESEH
- endif
-
- # LFLAGS are the flags given to $(LINK) and used to build the actual DLL file
- BASELFLAGS = -nologo -opt:REF -incremental:no
-
- LFLAGS = $(BASELFLAGS) $(LDEBUG) $(EXTRA_LFLAGS) $(LFLAGS_$(COMPILER_VERSION))
- LDDFLAGS += $(LFLAGS_$(COMPILER_VERSION))
-
-endif
-
-#
-# Preprocessor macro definitions
-#
-CPPFLAGS_COMMON = -DWIN32 -DIAL -D_LITTLE_ENDIAN
-ifeq ($(ARCH), amd64)
- CPPFLAGS_COMMON += -D_AMD64_ -Damd64
-else
- CPPFLAGS_COMMON += -D_X86_ -Dx86
-endif
-CPPFLAGS_COMMON += -DWIN32_LEAN_AND_MEAN
-
-#
-# Output options (use specific filenames to avoid parallel compile errors)
-#
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- CFLAGS_COMMON += -Fd$(OBJDIR)/$(basename $(@F)).pdb -Fm$(OBJDIR)/$(basename $(@F)).map
-endif
-
-#
-# Use -wdNNNN to disable warning NNNN.
-# C4800 is a warning about bool performance casts (can't make go away)
-#
-COMPILER_WARNINGS_TO_IGNORE = 4800
-CFLAGS_COMMON += $(COMPILER_WARNINGS_TO_IGNORE:%=-wd%)
-
-#
-# Treat compiler warnings as errors, if requested
-#
-CFLAGS_COMMON += -W$(COMPILER_WARNING_LEVEL)
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- CFLAGS_COMMON += -WX
-endif
-
-# Turn off some warnings by default, enable them all if asked.
-ifneq ($(SHOW_ALL_WARNINGS),true)
- # The -D _CRT_SECURE_NO_DEPRECATE turns off security/deprecated warnings on
- # the standard C library functions like strcpy.
- CFLAGS_COMMON += -D _CRT_SECURE_NO_DEPRECATE
- # The -D _CRT_NONSTDC_NO_DEPRECATE turns off deprecation warnings about using
- # non-standard C POSIX functions.
- CFLAGS_COMMON += -D _CRT_NONSTDC_NO_DEPRECATE
-endif
-
-CPPFLAGS_OPT = -DNDEBUG
-CPPFLAGS_DBG = -DDEBUG -DLOGGING
-
-CXXFLAGS_COMMON = $(CFLAGS_COMMON)
-CXXFLAGS_OPT = $(CFLAGS_OPT)
-CXXFLAGS_DBG = $(CFLAGS_DBG)
-
-ifneq ($(LIBRARY),fdlibm)
- EXTRA_LIBS += advapi32.lib
-endif
-
-#
-# Path and option to link against the VM, if you have to.
-#
-JVMLIB = $(LIBDIR)/jvm.lib
-JAVALIB = $(LIBDIR)/java.lib
-
-ifeq ($(CC_VERSION), msvc)
- CC_DEPEND = -FD
- CC_DEPEND_FILTER =
-else # CC_VERSION
-# not supported, but left for historical reference...
- CC_DEPEND = -MM
- CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)&!g'
-endif # CC_VERSION
-
-LIBRARY_SUFFIX = dll
-LIB_SUFFIX = lib
-
-# Settings for the JDI - Serviceability Agent binding.
-HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/bin
-SALIB_NAME = $(LIB_PREFIX)sawindbg.$(LIBRARY_SUFFIX)
-SAMAP_NAME = $(LIB_PREFIX)sawindbg.map
-SAPDB_NAME = $(LIB_PREFIX)sawindbg.pdb
-SA_DIZ_NAME = $(LIB_PREFIX)sawindbg.diz
-
-ifeq ($(ARCH), ia64)
- # SA will never be supported here.
- INCLUDE_SA = false
-else
- INCLUDE_SA = true
-endif
-
-# Settings for the VERSIONINFO tap on windows.
-VERSIONINFO_RESOURCE = $(BUILDDIR)/../src/windows/resource/version.rc
-
-ifneq ($(JDK_BUILD_NUMBER),)
- COOKED_BUILD_NUMBER = $(shell $(ECHO) $(JDK_BUILD_NUMBER) | $(SED) -e 's/^b//' -e 's/^0//')
-else
- COOKED_BUILD_NUMBER = 0
-endif
-
-# If the update version contains non-numeric characters, we need
-# to massage it into a numeric format.
-# We use the following formula:
-# JDK_UPDATE_VER = JDK_UPDATE_VERSION * 10 + EXCEPTION_VERSION
-#
-# Here are some examples:
-# 1.5.0 b01 -> 5,0,0,1
-# 1.5.0_10 b01 -> 5,0,100,1
-# 1.4.2 b01 -> 4,2,0,1
-# 1.4.2_02 b01 -> 4,2,20,1
-# 1.4.2_02a b01 -> 4,2,21,1
-# 1.4.2_02b b01 -> 4,2,22,1
-ifdef JDK_UPDATE_VERSION
- VTMP := $(shell $(ECHO) $(JDK_UPDATE_VERSION) | $(TR) "abcde" "12345")
- CAB_CHAR1 := $(shell $(ECHO) $(VTMP) | $(NAWK) '{print substr($$1, 1, 1);}')
- CAB_CHAR2 := $(shell $(ECHO) $(VTMP) | $(NAWK) '{print substr($$1, 2, 1);}')
- CAB_CHAR3 := $(shell $(ECHO) $(VTMP) | $(NAWK) '{print substr($$1, 3, 1);}')
- JDK_UPDATE_META_TAG := U$(MARKETING_NUMBER)
- ifeq ($(CAB_CHAR3),)
- CAB_CHAR3 := 0
- endif
- ifeq ($(CAB_CHAR1), 0)
- JDK_UPDATE_VER := $(CAB_CHAR2)$(CAB_CHAR3)
- else
- JDK_UPDATE_VER := $(CAB_CHAR1)$(CAB_CHAR2)$(CAB_CHAR3)
- endif
-else
- JDK_UPDATE_VER := 0
-endif
-
-RC_FLAGS = -l 0x409 -r
-
-ifeq ($(VARIANT), OPT)
- RC_FLAGS += -d NDEBUG
-else
- RC_FLAGS += $(MS_RC_DEBUG_OPTION)
-endif
-
-# Values for the RC variables defined in RC_FLAGS
-JDK_RC_BUILD_ID = $(FULL_VERSION)
-JDK_RC_COMPANY = $(COMPANY_NAME)
-JDK_RC_COMPONENT = $(PRODUCT_NAME) $(JDK_RC_PLATFORM_NAME) binary
-JDK_RC_VER = \
- $(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
-JDK_RC_COPYRIGHT = Copyright \xA9 $(COPYRIGHT_YEAR)
-JDK_RC_NAME = \
- $(PRODUCT_NAME) $(JDK_RC_PLATFORM_NAME) $(JDK_MINOR_VERSION) $(JDK_UPDATE_META_TAG)
-JDK_RC_FVER = \
- $(JDK_MINOR_VERSION),$(JDK_MICRO_VERSION),$(JDK_UPDATE_VER),$(COOKED_BUILD_NUMBER)
-
-# JDK name required here
-RC_FLAGS += -d "JDK_BUILD_ID=$(JDK_RC_BUILD_ID)" \
- -d "JDK_COMPANY=$(JDK_RC_COMPANY)" \
- -d "JDK_COMPONENT=$(JDK_RC_COMPONENT)" \
- -d "JDK_VER=$(JDK_RC_VER)" \
- -d "JDK_COPYRIGHT=$(JDK_RC_COPYRIGHT)" \
- -d "JDK_NAME=$(JDK_RC_NAME)" \
- -d "JDK_FVER=$(JDK_RC_FVER)"
diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk
deleted file mode 100644
index 5403664..0000000
--- a/jdk/make/common/Defs.gmk
+++ /dev/null
@@ -1,651 +0,0 @@
-#
-# Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Common variables used by all the Java makefiles. This file should
-# not contain rules.
-#
-
-# WARNING: This file is shared with other workspaces.
-# So when it includes other files, it must use JDK_TOPDIR.
-#
-
-# Check for strange explicit settings (change to empty or true)
-ifdef OPENJDK
- ifneq ($(OPENJDK),true)
- x:=$(error "OPENJDK (if defined) can only be set to true")
- endif
-endif
-
-#
-# On Solaris, the 'make' utility from Sun will not work with these makefiles.
-# This little rule is only understood by Sun's make, and is harmless
-# when seen by the GNU make tool. If using Sun's make, this causes the
-# make command to fail.
-#
-SUN_MAKE_TEST:sh = echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
-
-ifndef JDK_TOPDIR
- ifdef BUILDDIR
- JDK_TOPDIR=$(BUILDDIR)/..
- else
- JDK_TOPDIR:=$(error "ERROR: Cannot define top of jdk repository")
- endif
-endif
-ifndef BUILDDIR
- # Hack, due to deploy repository using this file.
- BUILDDIR=$(JDK_TOPDIR)/make
-endif
-ifndef JDK_MAKE_SHARED_DIR
- JDK_MAKE_SHARED_DIR=$(JDK_TOPDIR)/make/common/shared
-endif
-
-include $(JDK_MAKE_SHARED_DIR)/Platform.gmk
-
-TOPDIR=$(BUILDDIR)/..
-
-include $(JDK_TOPDIR)/make/common/CancelImplicits.gmk
-
-# Historically PLATFORM_SRC used to be src/$(PLATFORM), but we switched it to
-# src/solaris so if you want to build on Linux you didn't need a src/linux
-# directory. In an ideal world it would be called src/genunix but we are not
-# there yet.
-#
-ifndef SHARE_SRC
- SHARE_SRC = $(BUILDDIR)/../src/share
-endif
-
-# Files that cannot be included in the OpenJDK distribution are
-# collected under a parent directory which contains just those files.
-ifndef CLOSED_SRC
- CLOSED_SRC = $(BUILDDIR)/../src/closed
-endif
-
-# If CLOSE_SRC_INCLUDED isn't set to true, check if there's any
-# closed directory.
-ifneq ($(CLOSED_SRC_INCLUDED), true)
- CLOSED_SRC_INCLUDED := $(shell \
- if [ -d $(CLOSED_SRC) ] ; then \
- echo true; \
- else \
- echo false; \
- fi)
-endif
-
-# Set OPENJDK based on CLOSED_SRC_INCLUDED
-ifeq ($(CLOSED_SRC_INCLUDED), false)
- OPENJDK = true
-endif
-
-# Define where closed directories are
-ifdef OPENJDK
- CLOSED_SRC =
- CLOSED_SHARE_SRC =
-else
- ifndef CLOSED_SHARE_SRC
- CLOSED_SHARE_SRC = $(CLOSED_SRC)/share
- endif
-endif
-
-# We allow for potential specialization of build files. This has to be
-# done on a file-by-file, case-by-case basis. Here we define the basic control
-# over where custom files are being used. Later we will -include the custom
-# Defs.gmk if present. This works best because all Makefiles include defs.gmk.
-# In other cases we can either have foo.gmk include custom/foo.gmk, or
-# a Makefile can do:
-# include foo.gmk
-# -include $CUSTOM_MAKE_DIR/foo.gmk
-#
-# For non-OpenJDK builds the default location is the make/closed repository.
-# For OpenJDK builds a real value has to be supplied externally.
-ifneq ($(OPENJDK),true)
- CUSTOM_MAKE_DIR = $(BUILDDIR)/closed
-endif
-
-#
-# Get platform definitions
-#
-
-include $(JDK_TOPDIR)/make/common/Defs-$(PLATFORM).gmk
-
-#
-# Cross-compilation Settings
-#
-ifdef CROSS_COMPILE_ARCH
- # Can't run the tools we just built
- USE_ONLY_BOOTDIR_TOOLS = true
-
- # When cross-compiling CC generates code for the target, but
- # some parts of the build generate C code that has to be compiled
- # and executed on the build host - HOST_CC is the 'local' compiler.
- # For linux the default is /usr/bin/gcc; other platforms need to
- # set it explicitly
- ifeq ($(PLATFORM), linux)
- ifndef HOST_CC
- HOST_CC = $(USRBIN_PATH)gcc
- endif
- endif
-else
- # Must set HOST_CC if not already set
- ifndef HOST_CC
- HOST_CC = $(CC)
- endif
-endif
-
-# Reset the VM name for client-only builds
-ifdef BUILD_CLIENT_ONLY
- VM_NAME = client
-endif
-
-#
-# Freetype logic is applicable to OpenJDK only
-#
-ifdef OPENJDK
-
-#if we use system lib we do not need to copy it to build tree
-USING_SYSTEM_FT_LIB=false
-
-ifeq ($(PLATFORM), windows)
- DEVTOOLS_FT_DIR=$(JDK_DEVTOOLS_DIR)/win32/freetype-$(ARCH)
-endif
-ifeq ($(PLATFORM), linux)
- DEVTOOLS_FT_DIR=$(JDK_DEVTOOLS_DIR)/$(PLATFORM)/freetype-$(ARCH)
-endif
-ifeq ($(PLATFORM), solaris)
- # historically for Solaris we have slightly different devtools
- # naming conventions
- DEVTOOLS_FT_DIR=$(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/freetype-$(ARCH)
-endif
-
-DEVTOOLS_FT_DIR_EXISTS = $(shell \
- if [ -f $(DEVTOOLS_FT_DIR)/include/ft2build.h ] ; then \
- echo true; \
- else \
- echo false; \
- fi)
-
- ifdef ALT_FREETYPE_LIB_PATH
- FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH)
- ifeq ($(PLATFORM), macosx)
- USING_SYSTEM_FT_LIB=true
- endif
- else
- ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
- FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
- else
- ifeq ($(PLATFORM), macosx)
- FREETYPE_LIB_PATH = /usr/X11R6/lib
- else
- FREETYPE_LIB_PATH = /usr/lib
- endif
- USING_SYSTEM_FT_LIB=true
- endif
- endif
-
- ifdef ALT_FREETYPE_HEADERS_PATH
- FREETYPE_HEADERS_PATH = $(ALT_FREETYPE_HEADERS_PATH)
- else
- ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
- FREETYPE_HEADERS_PATH = $(DEVTOOLS_FT_DIR)/include
- else
- ifeq ($(PLATFORM), macosx)
- FREETYPE_HEADERS_PATH = /usr/X11R6/include
- else
- FREETYPE_HEADERS_PATH = /usr/include
- endif
- endif
- endif
-endif
-
-#
-# zlib version
-#
-ZLIB_VERSION = 1.2.5
-
-
-#
-# Localizations for the different parts of the product beyond English
-#
-
-JRE_LOCALES = de es fr it ja ko pt_BR sv zh_CN zh_TW zh_HK
-PLUGIN_LOCALES = de es fr it ja ko pt_BR sv zh_CN zh_TW zh_HK
-JDK_LOCALES = ja zh_CN
-
-#
-# A list of locales we support but don't have resource files.
-# This is defined to optimize the search of resource bundles.
-#
-JRE_NONEXIST_LOCALES = en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh
-
-#
-# For now, most libraries except libjava and libjvm itself link against libjvm
-# and libjava, the latter for its exported common utilities. libjava only
-# links against libjvm. Programs' makefiles take their own responsibility for
-# adding other libs.
-#
-# The makefiles for these packages do not link against libjvm and libjava.
-# This list will eventually go away and each Programs' makefiles
-# will have to explicitly declare that they want to link to libjava/libjvm
-#
-NO_JAVALIB_PKGS = \
- sun.security.mscapi \
- sun.security.krb5 \
- sun.security.pkcs11 \
- sun.security.jgss \
- sun.security.jgss.wrapper \
- sun.security.ec \
- sun.security.smartcardio \
- com.sun.security.auth.module
-
-ifdef PACKAGE
-# put JAVALIB first, but do not lose any platform specific values....
- ifeq (,$(findstring $(PACKAGE),$(NO_JAVALIB_PKGS)))
- LDLIBS_COMMON = $(JAVALIB)
- endif
-endif # PACKAGE
-
-#
-# Libraries that must appear ahead of libc.so on the link command line
-#
-ifdef PROGRAM
-
- ifeq ($(PLATFORM), solaris)
- LDLIBS_COMMON = -lthread -ldl
- endif
-
- ifeq ($(PLATFORM), linux)
- LDLIBS_COMMON = -ldl
- endif
-
- ifeq ($(PLATFORM), macosx)
- LDLIBS_COMMON = -pthread
- endif
-
-endif # PROGRAM
-
-LDLIBS_COMMON += $(EXTRA_LIBS)
-
-# for generated libraries
-LIBDIR = $(OUTPUTDIR)/lib
-ABS_LIBDIR = $(ABS_OUTPUTDIR)/lib
-# Optional place to save the windows .lib files
-LIBFILES_DIR = $(OUTPUTDIR)/libfiles
-# for ext jre files
-EXTDIR = $(LIBDIR)/ext
-# for generated include files
-INCLUDEDIR = $(OUTPUTDIR)/include
-# for generated class files
-CLASSBINDIR = $(OUTPUTDIR)/classes
-DEMOCLASSDIR = $(OUTPUTDIR)/democlasses
-# for generated tool class files
-BUILDTOOLCLASSDIR = $(OUTPUTDIR)/btclasses
-# for build tool jar files
-BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars
-ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
-# for generated tool class files
-BUILDTOOLBINDIR = $(OUTPUTDIR)/btbins
-ABS_BUILDTOOLBINDIR = $(ABS_OUTPUTDIR)/btbins
-# for generated java source files
-GENSRCDIR = $(OUTPUTDIR)/gensrc
-# for generated C source files (not javah)
-GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc
-# for imported source files
-IMPORTSRCDIR = $(OUTPUTDIR)/impsrc
-# for imported documents
-IMPORTDOCDIR = $(OUTPUTDIR)/impdoc
-# for generated demo
-DEMODIR = $(OUTPUTDIR)/demo
-# for sample code
-SAMPLEDIR = $(OUTPUTDIR)/sample
-# for generated documentation
-DOCSDIR = $(OUTPUTDIR)/docs$(DOCSDIRSUFFIX)
-DOCSDIRSUFFIX =
-
-# The MESSAGE, WARNING and ERROR files are used to store sanityck and
-# warnings and errors.
-ifndef ERROR_FILE
- ERROR_FILE = $(OUTPUTDIR)/sanityCheckErrors.txt
-endif
-ifndef WARNING_FILE
- WARNING_FILE = $(OUTPUTDIR)/sanityCheckWarnings.txt
-endif
-ifndef MESSAGE_FILE
- MESSAGE_FILE = $(OUTPUTDIR)/sanityCheckMessages.txt
-endif
-
-JDK_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2sdk-image
-JRE_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-image
-
-#where the demo source can be found
-DEMOSRCDIR = $(SHARE_SRC)/demo
-
-#where the sample source can be found
-SAMPLESRCDIR = $(SHARE_SRC)/sample
-
-# An attempt is made to generate unique enough directories for the
-# generated files to not have name collisisons. Most build units
-# defines PRODUCT (except Release.gmk), but then they may or may
-# not define PACKAGE, PROGRAM, and LIBRARY. This code attempts to
-# generate a unique OBJDIR/CLASSHDRDIR for each build unit based
-# on which of those values are set within each build unit.
-
-UNIQUE_LOCATION_STRING = tmp
-
-ifneq ($(PRODUCT),)
- UNIQUE_LOCATION_STRING += /$(PRODUCT)
-endif
-
-ifneq ($(PACKAGE),)
- UNIQUE_LOCATION_STRING += /$(PACKAGE)
-endif
-
-ifneq ($(PROGRAM),)
- UNIQUE_LOCATION_STRING += /$(PROGRAM)
-endif
-
-ifneq ($(LIBRARY),)
- ifneq ($(LIBRARY_OUTPUT),)
- UNIQUE_LOCATION_STRING += /$(LIBRARY_OUTPUT)
- else
- UNIQUE_LOCATION_STRING += /$(LIBRARY)
- endif
-endif
-
-# the use of += above makes a space separated list which we need to
-# remove for filespecs.
-#
-NULLSTRING :=
-ONESPACE := $(NULLSTRING) # space before this comment is required.
-UNIQUE_PATH = $(subst $(ONESPACE),,$(UNIQUE_LOCATION_STRING))
-
-# TEMPDIR is a unique general purpose directory
-# need to use 'override' because GNU Make on Linux exports the wrong
-# value.
-override TEMPDIR = $(OUTPUTDIR)/$(UNIQUE_PATH)
-override ABS_TEMPDIR = $(ABS_OUTPUTDIR)/$(UNIQUE_PATH)
-
-# This must be created right away for pattern rules in Sanity.gmk to work.
-dummy1:=$(shell $(MKDIR) -p $(TEMPDIR))
-dummy2:=$(shell $(MKDIR) -p $(TEMP_DISK))
-
-# OBJDIRNAME is the name of the directory where the object code is to
-# be placed. It's name depends on whether the data model architecture
-# is 32-bit or not.
-ifneq ($(ARCH_DATA_MODEL), 32)
- OBJDIRNAME = obj$(ARCH_DATA_MODEL)$(OBJDIRNAME_SUFFIX)
-else
- OBJDIRNAME = obj$(OBJDIRNAME_SUFFIX)
-endif
-OBJDIR = $(TEMPDIR)/$(OBJDIRNAME)
-
-# CLASSHDRDIR is where the generated C Class Header files go.
-CLASSHDRDIR = $(TEMPDIR)/CClassHeaders
-
-#
-# CLASSDESTDIR can be used to specify the directory where generated classes
-# are to be placed. The default is CLASSBINDIR.
-#
-ifndef CLASSDESTDIR
-CLASSDESTDIR = $(CLASSBINDIR)
-endif
-
-INCLUDES = -I. -I$(CLASSHDRDIR) \
- $(patsubst %,-I%,$(subst $(CLASSPATH_SEPARATOR), ,$(VPATH.h))) $(OTHER_INCLUDES)
-OTHER_CPPFLAGS += $(INCLUDES)
-
-#
-# vpaths. These are the default locations searched for source files.
-# GNUmakefiles of individual areas often override the default settings.
-# There are no longer default vpath entries for C and assembler files
-# so we can ensure that libraries don't get their hands on JVM files.
-#
-# We define an intermediate variable for Java files because
-# we use its value later to help define $SOURCEPATH
-
-ifeq ($(PLATFORM), macosx)
- VPATH0.java = $(subst $(ONESPACE),:,$(GENSRCDIR) $(call JavaSrcDirList,,classes))
-else
- VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
-endif
-
-ifdef OPENJDK
- VPATH.java = $(VPATH0.java)
-else
- #
- # If filenames are duplicated between open/closed workspaces, prefer
- # the closed files.
- #
- # Source ordering is important: some targets depend on closed files
- # replacing open ones, and thus the closed file sources must be found
- # before the open ones.
- #
- # Don't reorder without consulting the teams that depend on this behavior.
- #
- VPATH.java = $(CLOSED_PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(CLOSED_SHARE_SRC)/classes$(CLASSPATH_SEPARATOR)$(VPATH0.java)
-endif
-vpath %.java $(VPATH.java)
-vpath %.class $(CLASSBINDIR)
-vpath %.$(OBJECT_SUFFIX) $(OBJDIR)
-
-#
-# VPATH.h is used elsewhere to generate include flags. By default,
-# anyone has access to the include files that the JVM area exports,
-# namely jni.h, jvm.h, and jni_utils.h, plus their platform-specific
-# relatives.
-#
-VPATH0.h = $(PLATFORM_SRC)/javavm/export$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/javavm/export
-ifdef OPENJDK
- VPATH.h = $(VPATH0.h)
-else
- VPATH.h = $(CLOSED_SHARE_SRC)/javavm/export$(CLASSPATH_SEPARATOR)$(VPATH0.h)
-endif
-vpath %.h $(VPATH.h)
-
-#
-# Used in two ways: helps link against libjava.so. Also if overridden
-# determines where your shared library is installed.
-#
-ifndef LIB_LOCATION
- LIB_LOCATION = $(LIBDIR)/$(LIBARCH)
-endif
-
-#
-# Java header and stub variables
-#
-CLASSHDRS = $(patsubst %,$(CLASSHDRDIR)/%.h,$(subst .,_,$(CLASSES.export)))
-CLASSSTUBOBJS = classstubs.$(OBJECT_SUFFIX)
-STUBPREAMBLE = $(INCLUDEDIR)/StubPreamble.h
-
-#
-# Classpath seen by javac (different from the one seen by the VM
-# running javac), and useful variables.
-#
-SOURCEPATH = $(VPATH.java)
-PKG = $(shell $(EXPR) $(PACKAGE) : '\([a-z]*\)')
-PKGDIR = $(subst .,/,$(PACKAGE))
-
-#
-# The java/javac/jdk variables (JAVAC_CMD, JAVA_CMD, etc.)
-#
-include $(JDK_MAKE_SHARED_DIR)/Defs-java.gmk
-
-UNIQUE_PATH_PATTERN = $(subst /,.,$(UNIQUE_PATH))
-
-# Run MAKE $@ for a launcher:
-# $(call make-launcher, name, mainclass, java-args, main-args)
-define make-launcher
-$(CD) $(BUILDDIR)/launchers && \
-$(MAKE) -f Makefile.launcher \
- PROGRAM=$(strip $1) \
- MAIN_CLASS=$(strip $2) \
- MAIN_JAVA_ARGS="$(strip $3)" \
- MAIN_ARGS="$(strip $4)"
-endef
-
-#
-# Convenient macros
-#
-
-# Prepare $@ target, remove old one and making sure containing dir exists
-define prep-target
-$(MKDIR) -p $(@D)
-$(RM) $@
-endef
-
-# Prepare $@ target dir, remove old one and making sure containing dir exists
-define prep-target-dir
-$(MKDIR) -p $(@D)
-$(RM) -r $@
-endef
-
-# Simple install of $< file to $@
-define install-file
-$(prep-target)
-$(CP) $< $@
-endef
-
-define chmod-file
-$(CHMOD) $1 $@
-endef
-
-define install-sym-link
-$(LN) -s $1 $@
-endef
-
-define install-manifest-file
-$(install-file)
-endef
-
-# Cleanup rule for after debug java run (hotspot.log file is left around)
-# (This could be an old leftover file in a read-only area, use the @- prefix)
-HOTSPOT_LOG_NAME = hotspot.log
-define java-vm-cleanup
-if [ -w $(HOTSPOT_LOG_NAME) ] ; then $(RM) $(HOTSPOT_LOG_NAME); fi
-endef
-
-# Current directory
-CURRENT_DIRECTORY := $(shell $(PWD))
-
-#
-# Create BYFILE OPT and DBG settings, if CFLAGS_OPT/foobar.o is set then it is
-# used for this file, otherwise the default settings are used.
-#
-CFLAGS_$(VARIANT)/BYFILE = $(CFLAGS_$(VARIANT)/$(@F)) \
- $(CFLAGS_$(VARIANT)$(CFLAGS_$(VARIANT)/$(@F)))
-CXXFLAGS_$(VARIANT)/BYFILE = $(CXXFLAGS_$(VARIANT)/$(@F)) \
- $(CXXFLAGS_$(VARIANT)$(CXXFLAGS_$(VARIANT)/$(@F)))
-
-# Command line define to provide basename of file being compiled to source.
-# The C macro THIS_FILE can replace the use of __FILE__ in the source
-# files for the current filename being compiled.
-# The value of the __FILE__ macro is unpredictable and can be anything
-# from a relative path to a full path, THIS_FILE will be more consistent..
-# The THIS_FILE macro will always be just the basename of the file being
-# compiled.
-# Different string literals in the the object files makes it difficult to
-# compare shared libraries from different builds.
-#
-# NOTE: If the THIS_FILE macro is actually expanded while in an included
-# source file, it will not return the name of the included file.
-#
-CPP_THIS_FILE = -DTHIS_FILE='"$(<F)"'
-
-#
-# Tool flags
-#
-# EXTRA_CFLAGS are used to define cross-compilation options
-#
-ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS)
-CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(EXTRA_CFLAGS)
-CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(EXTRA_CFLAGS)
-CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
- $(DEFINES) $(OPTIONS:%=-D%) $(CPP_THIS_FILE)
-LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS)
-LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON)
-LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \
- $(OTHER_LINTFLAGS)
-
-VERSION_DEFINES = -DRELEASE='"$(RELEASE)"'
-
-ifdef INSANE
- export INSANE
-endif
-
-ifdef ALT_COPYRIGHT_YEAR
- COPYRIGHT_YEAR = $(ALT_COPYRIGHT_YEAR)
-else
- COPYRIGHT_YEAR := $(shell $(DATE) '+%Y')
-endif
-
-ifndef OPENJDK
-include $(JDK_TOPDIR)/make/closed/common/Defs.gmk
-endif
-
-# Install of imported file (JDK_IMPORT_PATH, or some other external location)
-define install-importonly-file
-@$(ECHO) "ASSEMBLY_IMPORT: $@"
-$(prep-target)
-$(CP) $< $@
-@if [ "$(PLATFORM)" = "linux" -a "$(@F)" = "libjvm.so" ] ; then \
- if [ -x /usr/sbin/selinuxenabled ] ; then \
- /usr/sbin/selinuxenabled; \
- if [ $$? = 0 ] ; then \
- $(ECHO) "/usr/bin/chcon -t textrel_shlib_t $@"; \
- /usr/bin/chcon -t textrel_shlib_t $@; \
- if [ $$? != 0 ]; then \
- echo "ERROR: Cannot chcon $@"; \
- fi; \
- fi; \
- fi; \
-fi
-endef
-
-# MacOS X strongly discourages 'cp -r' and provides 'cp -R' instead.
-# May need to have a MacOS X specific definition of install-import-dir
-# sometime in the future.
-define install-import-dir
-@$(ECHO) "ASSEMBLY_IMPORT: $@"
-$(prep-target-dir)
-$(CP) -r $< $@
-endef
-
-ifeq ($(PLATFORM), macosx)
-# On MacOS X, debug info is in .dSYM directories
-define install-import-debuginfo
-$(install-import-dir)
-endef
-else
-define install-import-debuginfo
-$(install-import-file)
-endef
-endif
-
-define install-import-file
-$(install-importonly-file)
-endef
-
--include $(CUSTOM_MAKE_DIR)/Defs.gmk
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/common/Demo.gmk b/jdk/make/common/Demo.gmk
deleted file mode 100644
index 90bcf9a..0000000
--- a/jdk/make/common/Demo.gmk
+++ /dev/null
@@ -1,410 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# JDK Demo building jar file.
-
-# Some names are defined with LIBRARY inside the Defs.gmk file
-LIBRARY=$(DEMONAME)
-OBJDIR=$(TEMPDIR)/$(DEMONAME)
-
-# Input:
-# DEMONAME - name of the demo
-# DEMO_ROOT - path to root of all demo files
-# DEMO_DESTDIR - path to final demo destination directory
-#
-# Optional Input:
-# DEMO_SRCDIR - path to source if different from DEMO_ROOT
-# DEMO_PSRCDIR - path to additional platform specific source
-# DEMO_PKGDIR - sub directory of sources we want
-# DEMO_TOPFILES - names of top-level files relative to DEMO_ROOT
-# DEMO_MAINCLASS - name of the main class for the jar manifest
-# DEMO_NATIVECLASS - name of the class with native methods
-# DEMO_DESCRIPTOR - name of service file for jar (relative to DEMO_SRCDIR)
-# DEMO_EXTRA_SRCDIR - path to directory that holds extra sources to add
-# DEMO_EXTRA_FILES - extra sources relative to DEMO_EXTRA_SRCDIR
-# DEMO_OBJECTS - extra native object files needed
-# DEMO_MANIFEST_ATTR - extra line to add to the jar manifest file
-
-# Assume the source directory is the root directory if not set
-ifndef DEMO_SRCDIR
- DEMO_SRCDIR = $(DEMO_ROOT)
-endif
-ifndef DEMO_PKGDIR
- DEMO_PKGDIR = .
-endif
-
-# Some demos have special needs
-ifneq ($(DEMONAME),agent_util)
- DEMO_NEEDS_AGENT_UTIL = $(findstring agent_util,$(DEMO_OBJECTS))
-endif
-ifneq ($(DEMONAME),java_crw_demo)
- DEMO_NEEDS_JAVA_CRW_DEMO = $(findstring java_crw_demo,$(DEMO_OBJECTS))
-endif
-ifeq ($(DEMONAME),hprof)
- DEMO_NEEDS_NPT = true
-endif
-
-# Place to hold the build area (kind of a temp area)
-DEMO_BUILD_AREA = $(DEMOCLASSDIR)/$(PRODUCT)/$(DEMONAME)
-
-# Destination "src" directory
-DEMO_BUILD_SRCDIR = $(DEMO_BUILD_AREA)/src
-
-ifndef DEMO_SKIP_SRCZIP
- DEMO_BUILD_SRCZIP = $(DEMO_BUILD_AREA)/src.zip
- DEMO_SOURCE_ZIP = $(DEMO_DESTDIR)/src.zip
-endif
-
-# Place to hold the jar image we are creating
-DEMO_JAR_IMAGE = $(DEMO_BUILD_AREA)/jar_image
-
-# The jar manifest file we will create and use
-DEMO_MANIFEST = $(DEMO_BUILD_AREA)/manifest.mf
-
-# The list of source files or options we will supply to javac
-DEMO_JAVAC_INPUT = $(DEMO_BUILD_AREA)/javac_input.txt
-
-# Any name of javah file
-DEMO_JAVAH_FILE = $(DEMO_NATIVECLASS:%=$(DEMO_BUILD_SRCDIR)/%.h)
-
-# Get complete list of files for this demo
-ifdef DEMO_PSRCDIR
- DEMO_ALL_FILES2 := $(shell ( $(CD) $(DEMO_PSRCDIR) \
- && $(FIND) $(DEMO_PKGDIR) $(SCM_DIRS_prune) -o -type f -print ) \
- | $(SED) 's@^\./@@' )
- DEMO_ALL_FILES += $(DEMO_ALL_FILES2)
-endif
-ifdef DEMO_EXTRA_SRCDIR
- DEMO_ALL_FILES += $(DEMO_EXTRA_FILES)
-endif
-DEMO_ALL_FILES1 := $(shell ( $(CD) $(DEMO_SRCDIR) \
- && $(FIND) $(DEMO_PKGDIR) $(SCM_DIRS_prune) -o -type f -print ) \
- | $(SED) 's@^\./@@' )
-DEMO_ALL_FILES += $(DEMO_ALL_FILES1)
-
-# Just the java sources
-DEMO_JAVA_SOURCES = $(filter %.java,$(DEMO_ALL_FILES))
-
-# Just the C and C++ sources
-DEMO_C_SRC_FILES = $(filter %.c,$(DEMO_ALL_FILES))
-DEMO_CPP_SRC_FILES = $(filter %.cpp,$(DEMO_ALL_FILES))
-
-# All the native source files
-DEMO_ALL_NATIVE_SOURCES = $(DEMO_C_SRC_FILES)
-DEMO_ALL_NATIVE_SOURCES += $(DEMO_CPP_SRC_FILES)
-DEMO_ALL_NATIVE_SOURCES += $(filter %.h,$(DEMO_ALL_FILES))
-DEMO_ALL_NATIVE_SOURCES += $(filter %.hpp,$(DEMO_ALL_FILES))
-
-# If we have java sources, then define the jar file we will create
-ifndef DEMO_JAR_NAME
- DEMO_JAR_NAME = $(DEMONAME).jar
-endif
-ifneq ($(strip $(DEMO_JAVA_SOURCES)),)
- DEMO_JAR = $(DEMO_DESTDIR)/$(DEMO_JAR_NAME)
-endif
-
-# If we have native sources, define the native library we will create
-ifneq ($(strip $(DEMO_ALL_NATIVE_SOURCES)),)
- # Path to native library we will create
- DEMO_LIBRARY = \
- $(DEMO_DESTDIR)/lib$(ISA_DIR)/$(LIB_PREFIX)$(DEMONAME).$(LIBRARY_SUFFIX)
- # C and C++ compiler flags we need to add to standard flags
- DEMO_CPPFLAGS += -I$(DEMO_BUILD_SRCDIR)
- # If the npt library is used we need to find the npt.h file
- ifneq ($(DEMO_NEEDS_NPT),)
- # The npt library is delivered as part of the JRE
- DEMO_CPPFLAGS += -I$(SHARE_SRC)/npt -I$(PLATFORM_SRC)/npt
- endif
- # Is the shared agent_util code needed
- ifneq ($(DEMO_NEEDS_AGENT_UTIL),)
- DEMO_FULL_SOURCES += $(DEMO_BUILD_SRCDIR)/agent_util.c
- DEMO_FULL_SOURCES += $(DEMO_BUILD_SRCDIR)/agent_util.h
- endif
- # Is the shared java_crw_demo code needed
- ifneq ($(DEMO_NEEDS_JAVA_CRW_DEMO),)
- DEMO_FULL_SOURCES += $(DEMO_BUILD_SRCDIR)/java_crw_demo.c
- DEMO_FULL_SOURCES += $(DEMO_BUILD_SRCDIR)/java_crw_demo.h
- endif
- # All the native object files we need to build the library
- DEMO_OBJECTS += $(DEMO_C_SRC_FILES:%.c=%.$(OBJECT_SUFFIX)) \
- $(DEMO_CPP_SRC_FILES:%.cpp=%.$(OBJECT_SUFFIX))
- # Linking is special depending on whether we had C++ code or on windows
- DEMO_NEEDS_CPP = $(strip $(DEMO_CPP_SRC_FILES))
- CPPFLAGS += $(DEMO_CPPFLAGS)
- ifeq ($(PLATFORM),windows)
- # Note: This is a link with cl.exe, not link.exe, options differ quite
- # bit between them.
- LINK.demo = $(LINK.c)
- LDLIBS.demo = $(EXTRA_LIBS) $(LFLAGS_$(COMPILER_VERSION))
- DEMO_VERSION_INFO = $(OBJDIR)/$(LIBRARY).res
- LDLIBS.demo += $(DEMO_VERSION_INFO)
- else
- ifneq ($(DEMO_NEEDS_CPP),)
- LINK.demo = $(LINK.cpp)
- LDLIBS.demo = $(LIBCXX)
- ifeq ($(PLATFORM),solaris)
- LDLIBS.demo += -lc
- endif
- else
- LINK.demo = $(LINK.c)
- LDLIBS.demo = $(LDLIBS)
- endif
- endif
-endif
-
-# Files that are considered resources (need to be in the jar file)
-DEMO_RESOURCES += $(filter-out %.java,$(DEMO_ALL_FILES))
-
-# All destination files (top level readme files and all sources)
-# Note: We exclude the topfiles from the src tree.
-DEMO_DEST_TOPFILES = $(DEMO_TOPFILES:%=$(DEMO_DESTDIR)/%)
-DEMO_FILTERED_SOURCES = $(filter-out $(DEMO_TOPFILES),$(DEMO_ALL_FILES))
-DEMO_FULL_SOURCES += $(DEMO_FILTERED_SOURCES:%=$(DEMO_BUILD_SRCDIR)/%)
-
-# Default rule
-all: build demo_info
-
-# Used to populate the destination directories
-$(DEMO_DESTDIR)/%: $(DEMO_ROOT)/%
- $(install-file)
-ifneq ($(DEMO_SRCDIR),$(DEMO_ROOT))
-$(DEMO_DESTDIR)/%: $(DEMO_SRCDIR)/%
- $(install-file)
-endif
-$(DEMO_BUILD_SRCDIR)/%: $(DEMO_SRCDIR)/%
- $(install-file)
-ifdef DEMO_PSRCDIR
-$(DEMO_BUILD_SRCDIR)/%: $(DEMO_PSRCDIR)/%
- $(install-file)
-endif
-ifdef DEMO_EXTRA_SRCDIR
-$(DEMO_BUILD_SRCDIR)/%: $(DEMO_EXTRA_SRCDIR)/%
- $(install-file)
-endif
-ifneq ($(DEMO_NEEDS_AGENT_UTIL),)
-$(DEMO_BUILD_SRCDIR)/%: $(DEMO_SRCDIR)/../agent_util/%
- $(install-file)
-endif
-ifneq ($(DEMO_NEEDS_JAVA_CRW_DEMO),)
-$(DEMO_BUILD_SRCDIR)/%: $(DEMO_SRCDIR)/../java_crw_demo/%
- $(install-file)
-endif
-
-# Jar manifest file
-MAINMANIFEST = $(JDK_TOPDIR)/make/tools/manifest.mf
-$(DEMO_MANIFEST): $(MAINMANIFEST)
- @$(prep-target)
- $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
- -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
- $(MAINMANIFEST) >> $@
- $(ECHO) "Main-Class: $(DEMO_MAINCLASS)" >> $@
-ifdef DEMO_MANIFEST_ATTR
- $(ECHO) "$(DEMO_MANIFEST_ATTR)" >> $@
-endif
-
-# Populating the jar image directory
-$(DEMO_JAR_IMAGE)/%: $(DEMO_SRCDIR)/%
- $(install-file)
-ifdef DEMO_PSRCDIR
-$(DEMO_JAR_IMAGE)/%: $(DEMO_PSRCDIR)/%
- $(install-file)
-endif
-ifdef DEMO_EXTRA_SRCDIR
-$(DEMO_JAR_IMAGE)/%: $(DEMO_EXTRA_SRCDIR)/%
- $(install-file)
-endif
-ifdef DEMO_DESCRIPTOR
-$(DEMO_JAR_IMAGE)/META-INF/services/$(DEMO_DESCRIPTOR): \
- $(DEMO_SRCDIR)/$(DEMO_DESCRIPTOR)
- $(install-file)
-endif
-
-# If we are creating a jar file (we have java code)
-ifdef DEMO_JAR
-
-# Input file for javac
-$(DEMO_JAVAC_INPUT): $(DEMO_JAVA_SOURCES:%=$(DEMO_BUILD_SRCDIR)/%)
- @$(prep-target)
- @for i in $(DEMO_JAVA_SOURCES) ; do \
- $(ECHO) "$(DEMO_BUILD_SRCDIR)/$$i" >> $@ ; \
- done
-
-# Jar file creation
-$(DEMO_JAR): \
- $(DEMO_JAVAC_INPUT) \
- $(DEMO_MANIFEST) \
- $(DEMO_DESCRIPTOR:%=$(DEMO_JAR_IMAGE)/META-INF/services/%) \
- $(DEMO_RESOURCES:%=$(DEMO_JAR_IMAGE)/%)
- @$(prep-target)
- $(MKDIR) -p $(DEMO_JAR_IMAGE)
- $(JAVAC_CMD) -d $(DEMO_JAR_IMAGE) -sourcepath $(DEMO_BUILD_SRCDIR) \
- @$(DEMO_JAVAC_INPUT)
- ifeq ($(DEMO_INCL_SRC),true)
- $(CP) $(DEMO_JAVA_SOURCES:%=$(DEMO_BUILD_SRCDIR)/%) $(DEMO_JAR_IMAGE)
- endif
- ifeq ($(DEMO_ONLY_SRC),true)
- $(RM) -r $(DEMO_JAR_IMAGE)
- $(MKDIR) -p $(DEMO_JAR_IMAGE)
- $(CP) -r $(DEMO_BUILD_SRCDIR)/* $(DEMO_JAR_IMAGE)
- ifneq ($(DEMO_TOPFILES),)
- $(CP) $(DEMO_ROOT)/$(DEMO_TOPFILES) $(DEMO_JAR_IMAGE)
- endif
- endif
- $(BOOT_JAR_CMD) -cfm $@ $(DEMO_MANIFEST) \
- -C $(DEMO_JAR_IMAGE) . \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-endif
-
-ifndef DEMO_SKIP_SRCZIP
- # Create a src.zip file
- $(DEMO_BUILD_SRCZIP): $(DEMO_FULL_SOURCES)
- @$(prep-target)
- $(CD) $(DEMO_BUILD_AREA)/src && $(ZIPEXE) -q -r ../$(@F) .
-
- # Install the destination src.zip file and create the src tree
- $(DEMO_SOURCE_ZIP): $(DEMO_BUILD_SRCZIP)
- $(install-file)
-endif
-
-ifeq ($(PLATFORM),windows)
-# JDK name required here
-RC_FLAGS += -D "JDK_FNAME=$(LIBRARY).dll" \
- -D "JDK_INTERNAL_NAME=$(LIBRARY)" \
- -D "JDK_FTYPE=0x2L"
-endif
-
-# Native library building
-ifdef DEMO_LIBRARY
-
- # Full paths to object files
- DEMO_FULL_OBJECTS = $(DEMO_OBJECTS:%=$(OBJDIR)/%)
- VPATH=
-
-# Native compile rules
-$(OBJDIR)/%.$(OBJECT_SUFFIX): $(DEMO_BUILD_SRCDIR)/%.c
- @$(prep-target)
- $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$@ $<
- ifneq ($(DEMO_NEEDS_CPP),)
-$(OBJDIR)/%.$(OBJECT_SUFFIX): $(DEMO_BUILD_SRCDIR)/%.cpp
- @$(prep-target)
- $(COMPILE.cpp) $(CC_OBJECT_OUTPUT_FLAG)$@ $<
- endif
-
- # Actual creation of the native shared library (C++ and C are different)
-$(DEMO_LIBRARY): $(DEMO_FULL_OBJECTS)
- @$(prep-target)
- ifeq ($(PLATFORM),windows)
- $(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(DEMO_VERSION_INFO) $(VERSIONINFO_RESOURCE)
- $(LINK.demo) $(SHARED_LIBRARY_FLAG) -Fe$@ \
- $(sort $(DEMO_FULL_OBJECTS)) $(LDLIBS.demo)
- else
- $(LINK.demo) $(SHARED_LIBRARY_FLAG) -o $@ \
- $(sort $(DEMO_FULL_OBJECTS)) $(LDLIBS.demo)
- endif
- @$(call binary_file_verification,$@)
-
- # Generation of any javah include file, make sure objects are dependent on it
- ifdef DEMO_NATIVECLASS
-$(DEMO_JAVAH_FILE): $(DEMO_JAR)
- @$(prep-target)
- $(JAVAH_CMD) -d $(DEMO_BUILD_SRCDIR) -classpath $(DEMO_JAR) \
- $(DEMO_NATIVECLASS)
- @$(java-vm-cleanup)
-$(DEMO_FULL_OBJECTS): $(DEMO_JAVAH_FILE)
- endif
-
-endif
-
-# Build involves populating the destination "src" tree, building the jar and
-# native library, and creating a source bundle
-
-sources: $(DEMO_FULL_SOURCES)
- @$(ECHO) "Created $@"
-
-objects:
- @$(ECHO) "Created $@"
-
-# Why the nested make here? It only works this way, don't know why.
-bundles: $(DEMO_BUILD_SRCZIP)
- $(RM) -r $(DEMO_DESTDIR)
- $(MKDIR) -p $(DEMO_DESTDIR)
- $(MAKE) $(DEMO_LIBRARY) $(DEMO_JAR) $(DEMO_SOURCE_ZIP) $(DEMO_DEST_TOPFILES)
-# Applets are special, no jar file, no src.zip, everything expanded.
-ifdef DEMO_IS_APPLET
- @$(ECHO) "Expanding jar file into demos area at $(DEMO_DESTDIR)"
- ( $(CD) $(DEMO_DESTDIR) && \
- $(BOOT_JAR_CMD) -xfv $(DEMO_JAR_NAME) \
- $(BOOT_JAR_JFLAGS) && \
- $(RM) -r META-INF $(DEMO_JAR_NAME) && \
- $(java-vm-cleanup) )
- @( $(CD) $(DEMO_DESTDIR) && $(java-vm-cleanup) )
- @$(ECHO) "Expanding source into demos area at $(DEMO_DESTDIR)"
- ( $(CD) $(DEMO_DESTDIR) && $(UNZIP) -o src.zip && $(RM) src.zip )
-endif
-
-build: sources bundles
-
-# Printing out a demo information line
-define printDemoSetting
-if [ "$2" != "" ] ; then $(PRINTF) "%-20s %s\n" "$1:" "$2"; fi
-endef
-
-# Print out the demo information
-demo_info:
- @$(ECHO) "========================================================="
- @$(call printDemoSetting,DEMONAME,$(DEMONAME))
- @$(call printDemoSetting,DEMO_ROOT,$(DEMO_ROOT))
- @$(call printDemoSetting,DEMO_SRCDIR,$(DEMO_SRCDIR))
- @$(call printDemoSetting,DEMO_DESTDIR,$(DEMO_DESTDIR))
- @$(call printDemoSetting,DEMO_JAR,$(DEMO_JAR))
- @$(call printDemoSetting,DEMO_MANIFEST_ATTR,$(DEMO_MANIFEST_ATTR))
- @$(call printDemoSetting,DEMO_PSRCDIR,$(DEMO_PSRCDIR))
- @$(call printDemoSetting,DEMO_EXTRA_SRCDIR,$(DEMO_EXTRA_SRCDIR))
- @$(call printDemoSetting,DEMO_EXTRA_FILES,$(DEMO_EXTRA_FILES))
- @$(call printDemoSetting,DEMO_TOPFILES,$(DEMO_TOPFILES))
- @$(call printDemoSetting,DEMO_MAINCLASS,$(DEMO_MAINCLASS))
- @$(call printDemoSetting,DEMO_DESCRIPTOR,$(DEMO_DESCRIPTOR))
- @$(call printDemoSetting,DEMO_NATIVECLASS,$(DEMO_NATIVECLASS))
- @$(call printDemoSetting,DEMO_LIBRARY,$(DEMO_LIBRARY))
- @$(call printDemoSetting,DEMO_OBJECTS,$(DEMO_OBJECTS))
- @$(call printDemoSetting,DEMO_SOURCE_ZIP,$(DEMO_SOURCE_ZIP))
- @$(ECHO) "========================================================="
-
-# Clean rule
-clean clobber:
- $(RM) -r $(DEMO_BUILD_AREA)
- $(RM) -r $(DEMO_DESTDIR)
-
-# This should not be needed, but some versions of GNU make have a bug that
-# sometimes deleted these files for some strange and unknown reason
-# (GNU make version 3.78.1 has the problem, GNU make version 3.80 doesn't?)
-.PRECIOUS: $(DEMO_FULL_SOURCES) $(DEMO_BUILD_SRCZIP) $(DEMO_SOURCE_ZIP)
-
-# List phony targets
-.PHONY: all build clean clobber demo_info \
- sources bundles
-
diff --git a/jdk/make/common/Library.gmk b/jdk/make/common/Library.gmk
deleted file mode 100644
index 4b08030..0000000
--- a/jdk/make/common/Library.gmk
+++ /dev/null
@@ -1,393 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Generic makefile for building shared libraries.
-#
-
-# WARNING: This file is shared with other workspaces.
-# So when it includes other files, it must use JDK_TOPDIR.
-#
-
-include $(JDK_TOPDIR)/make/common/Classes.gmk
-
-#
-# It is important to define these *after* including Classes.gmk
-# in order to override the values defined inthat makefile.
-#
-
-ifeq ($(LIBRARY), fdlibm)
-ifeq ($(PLATFORM),windows)
-ACTUAL_LIBRARY_NAME = $(LIB_PREFIX)$(LIBRARY).$(FDDLIBM_SUFFIX)
-ACTUAL_LIBRARY_DIR = $(OBJDIR)
-else # PLATFORM
-ACTUAL_LIBRARY_NAME = $(LIB_PREFIX)$(LIBRARY).$(ARCH).$(FDDLIBM_SUFFIX)
-ACTUAL_LIBRARY_DIR = $(OBJDIR)
-endif #PLATFORM
-else # LIBRARY
-ACTUAL_LIBRARY_NAME = $(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
-ACTUAL_LIBRARY_DIR = $(LIB_LOCATION)
-endif
-ACTUAL_LIBRARY = $(ACTUAL_LIBRARY_DIR)/$(ACTUAL_LIBRARY_NAME)
-
-library:: $(ACTUAL_LIBRARY)
-
-FILES_o = $(patsubst %.c, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_c))))
-FILES_o += $(patsubst %.s, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_s))))
-FILES_o += $(patsubst %.cpp, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_cpp))))
-
-ifeq ($(PLATFORM), macosx)
-FILES_o += $(patsubst %.m, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_objc))))
-FILES_o += $(patsubst %.mm, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_objcpp))))
-
-INCREMENTAL_BUILD=false
-
-endif # PLATFORM
-
-ifeq ($(INCREMENTAL_BUILD),true)
-FILES_d = $(patsubst %.c, %.$(DEPEND_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_c))))
-FILES_d += $(patsubst %.cpp, %.$(DEPEND_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_cpp))))
-endif # INCREMENTAL_BUILD
-
-ifeq ($(PLATFORM),solaris)
-# List of all lint files, one for each .c file (only for C)
-FILES_ln = $(patsubst %.c, %.$(LINT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_c))))
-endif
-
-#
-# C++ libraries must be linked with CC.
-#
-ifdef CPLUSPLUSLIBRARY
-LINKER=$(LINK.cc)
-else
-LINKER=$(LINK.c)
-endif
-
-$(ACTUAL_LIBRARY):: $(INIT) $(TEMPDIR) $(LIBDIR) $(BINDIR) $(EXTDIR) classheaders
- @$(ECHO) Building lib:$(ACTUAL_LIBRARY)
-#
-# COMPILE_APPROACH: Different approaches to compile up the native object
-# files as quickly as possible.
-# The setting of parallel works best on Unix, batch on Windows.
-#
-
-COMPILE_FILES_o = $(OBJDIR)/.files_compiled
-$(COMPILE_FILES_o): $(FILES_d) $(FILES_o)
- @$(ECHO) "$<" >> $@
-clean::
- $(RM) $(COMPILE_FILES_o)
-
-#
-# COMPILE_APPROACH=parallel: Will trigger compilations (just compilations) to
-# happen in parallel. Greatly decreases Unix build time, even on single CPU
-# machines, more so on multiple CPU machines. Default is 2 compiles
-# at a time, but can be adjusted with ALT_PARALLEL_COMPILE_JOBS.
-# Note that each .d file will also be dependent on it's .o file, see
-# Rules.gmk.
-# Note this does not depend on Rules.gmk to work like batch (below)
-# and this technique doesn't seem to help Windows build time nor does
-# it work very well, it's possible the Windows Visual Studio compilers
-# don't work well in a parallel situation, this needs investigation.
-#
-
-ifeq ($(COMPILE_APPROACH),parallel)
-
-.PHONY: library_parallel_compile
-
-library_parallel_compile:
- @$(ECHO) "Begin parallel compiles: $(shell $(PWD))"
- @$(MAKE) -j $(PARALLEL_COMPILE_JOBS) $(COMPILE_FILES_o)
- @$(ECHO) "Done with parallel compiles: $(shell $(PWD))"
-
-$(ACTUAL_LIBRARY):: library_parallel_compile
-
-endif
-
-#
-# COMPILE_APPROACH=batch: Will trigger compilations (just compilations) to
-# happen in batch mode. Greatly decreases Windows build time.
-# See logic in Rules.gmk for how compiles happen, the $(MAKE) in
-# library_batch_compile below triggers the actions in Rules.gmk.
-# Note that each .d file will also be dependent on it's .o file, see
-# Rules.gmk.
-#
-ifeq ($(COMPILE_APPROACH),batch)
-
-.PHONY: library_batch_compile
-
-library_batch_compile:
- @$(ECHO) "Begin BATCH compiles: $(shell $(PWD))"
- $(MAKE) $(COMPILE_FILES_o)
- $(MAKE) batch_compile
- @$(ECHO) "Done with BATCH compiles: $(shell $(PWD))"
- $(MAKE) COMPILE_APPROACH=normal $(COMPILE_FILES_o)
-
-$(ACTUAL_LIBRARY):: library_batch_compile
-
-endif
-
-ifeq ($(PLATFORM), windows)
-
-#
-# Library building rules.
-#
-
-$(LIBRARY).lib:: $(OBJDIR)
-
-ifeq ($(LIBRARY), fdlibm)
-$(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lib
-
-$(OBJDIR)/$(LIBRARY).lib:: $(OBJDIR)/$(LIBRARY).lcf
- @$(prep-target)
- $(LIBEXE) -NODEFAULTLIB:MSVCRT -out:$@ -nologo \
- @$(OBJDIR)/$(LIBRARY).lcf $(OTHER_LCF) $(LDLIBS_COMMON)
-else # LIBRARY
-# build it into $(OBJDIR) so that the other generated files get put
-# there, then copy just the DLL (and MAP file) to the requested directory.
-#
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- MAP_OPTION="-map:$(OBJDIR)/$(LIBRARY).map"
-endif
-
-$(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf
- @$(prep-target)
- @$(MKDIR) -p $(OBJDIR)
- $(LINK) -dll -out:$(OBJDIR)/$(@F) \
- $(MAP_OPTION) \
- $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
- $(OTHER_LCF) $(LDLIBS)
- $(CP) $(OBJDIR)/$(@F) $@
- @$(call binary_file_verification,$@)
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- (set -e ; \
- $(CD) $(OBJDIR) ; \
- $(ZIPEXE) -q $(LIBRARY).diz $(LIBRARY).map $(LIBRARY).pdb ; \
- )
- $(CP) $(OBJDIR)/$(LIBRARY).diz $(@D)
- $(RM) $(OBJDIR)/$(LIBRARY).map $(OBJDIR)/$(LIBRARY).pdb
- else
- $(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
- $(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
- endif
-endif
-
-endif # LIBRARY
-
-$(OBJDIR)/$(LIBRARY).lcf: $(OBJDIR)/$(LIBRARY).res $(COMPILE_FILES_o) $(FILES_m)
- @$(prep-target)
- @$(MKDIR) -p $(TEMPDIR)
- @$(ECHO) $(sort $(FILES_o)) > $@
-ifndef LOCAL_RESOURCE_FILE
- @$(ECHO) $(OBJDIR)/$(LIBRARY).res >> $@
-endif
- @$(ECHO) Created $@
-
-# JDK name required here
-RC_FLAGS += -D "JDK_FNAME=$(LIBRARY).dll" \
- -D "JDK_INTERNAL_NAME=$(LIBRARY)" \
- -D "JDK_FTYPE=0x2L"
-
-$(OBJDIR)/$(LIBRARY).res: $(VERSIONINFO_RESOURCE)
-ifndef LOCAL_RESOURCE_FILE
- @$(prep-target)
- $(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(@) $(VERSIONINFO_RESOURCE)
-endif
-
-#
-# Install a .lib file if required.
-#
-ifeq ($(INSTALL_DOT_LIB), true)
-$(ACTUAL_LIBRARY):: $(LIBDIR)/$(LIBRARY).lib
-
-clean::
- -$(RM) $(LIBDIR)/$(LIBRARY).lib
-
-$(LIBDIR)/$(LIBRARY).lib:: $(OBJDIR)/$(LIBRARY).lib
- $(install-file)
-
-$(LIBDIR)/$(LIBRARY).dll:: $(OBJDIR)/$(LIBRARY).dll
- $(install-file)
-
-endif # INSTALL_DOT_LIB
-
-else # PLATFORM
-
-#
-# On Solaris, use mcs to write the version into the comment section of
-# the shared library. On other platforms set this to false at the
-# make command line.
-#
-
-ifneq ($(PLATFORM), macosx)
- ARFLAGS = -r
-endif
-
-ifeq ($(PLATFORM), solaris)
- ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
-$(ACTUAL_LIBRARY):: $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS)
- endif
-endif
-
-$(ACTUAL_LIBRARY):: $(COMPILE_FILES_o) $(FILES_m) $(FILES_reorder)
- @$(prep-target)
- @$(ECHO) "STATS: LIBRARY=$(LIBRARY), PRODUCT=$(PRODUCT), OPTIMIZATION_LEVEL=$(OPTIMIZATION_LEVEL)"
- @$(ECHO) "Rebuilding $@ because of $?"
-ifeq ($(LIBRARY), fdlibm)
- $(AR) $(ARFLAGS) $@ $(sort $(FILES_o))
-else # LIBRARY
- $(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(sort $(FILES_o)) $(LDLIBS)
- @$(call binary_file_verification,$@)
-ifeq ($(WRITE_LIBVERSION),true)
- $(MCS) -d -a "$(FULL_VERSION)" $@
-endif # WRITE_LIBVERSION
- ifneq ($(PLATFORM), macosx)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(PLATFORM), solaris)
-# gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-# Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-# empty section headers until a fixed $(OBJCOPY) is available.
-# An empty section header has sh_addr == 0 and sh_size == 0.
-# This problem has only been seen on Solaris X64, but we call this tool
-# on all Solaris builds just in case.
-#
-# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
- (set -e ; \
- $(CD) $(@D) ; \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
- $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
- $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
- )
- else # PLATFORM != solaris
- (set -e ; \
- $(CD) $(@D) ; \
- $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
- $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
- )
- endif # PLATFORM == solaris
- ifeq ($(STRIP_POLICY),all_strip)
- $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
- ifeq ($(PLATFORM), solaris)
- $(STRIP) -x $@
- else
- # assume Linux
- $(STRIP) -g $@
- endif
- # implied else here is no stripping at all
- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- (set -e ; \
- $(CD) $(@D) ; \
- $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
- $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
- )
- endif
- endif # LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
- endif # ENABLE_FULL_DEBUG_SYMBOLS
- endif # PLATFORM-!macosx
-endif # LIBRARY
-
-endif # PLATFORM
-
-#
-# Cross check all linted files against each other
-#
-ifeq ($(PLATFORM),solaris)
-lint.errors : $(FILES_ln)
- $(LINT.c) $(FILES_ln) $(LDLIBS)
-endif
-
-#
-# Class libraries with JNI native methods get a include to the package.
-#
-ifdef PACKAGE
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/common -I$(PLATFORM_SRC)/native/common
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/$(PKGDIR) \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)
-endif
-
-#
-# Clean/clobber rules
-#
-clean::
- $(RM) -r $(ACTUAL_LIBRARY)
-
-clobber:: clean
-
-#
-# INCREMENTAL_BUILD means that this workspace will be built over and over
-# possibly incrementally. This means tracking the object file dependencies
-# on include files so that sources get re-compiled when the include files
-# change. When building from scratch and doing a one time build (like
-# release engineering or nightly builds) set INCREMENTAL_BUILD=false.
-#
-
-ifeq ($(INCREMENTAL_BUILD),true)
-
-#
-# Workaround: gnumake sometimes says files is empty when it shouldn't
-# was: files := $(foreach file, $(wildcard $(OBJDIR)/*.$(DEPEND_SUFFIX)), $(file))
-#
-files := $(shell $(LS) $(OBJDIR)/*.$(DEPEND_SUFFIX) 2>/dev/null)
-
-#
-# Only include these files if we have any.
-#
-ifneq ($(strip $(files)),)
-
-include $(files)
-
-endif # files
-
-endif # INCREMENTAL_BUILD
-
-#
-# Default dependencies
-#
-
-all: build
-
-build: library
-
-debug:
- $(MAKE) VARIANT=DBG build
-
-fastdebug:
- $(MAKE) VARIANT=DBG FASTDEBUG=true build
-
-openjdk:
- $(MAKE) OPENJDK=true build
-
-FORCE:
-
-.PHONY: all build debug fastdebug
-
diff --git a/jdk/make/common/Mapfile-vers.gmk b/jdk/make/common/Mapfile-vers.gmk
deleted file mode 100644
index 67ac0cd..0000000
--- a/jdk/make/common/Mapfile-vers.gmk
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for linking with mapfiles.
-#
-# NOTE: Not using a mapfile will expose all your extern functions and
-# extern data symbols as part of your interface, so unless your
-# extern names are safe from being mistaken as names from other
-# libraries, you better use a mapfile, or use a unique naming
-# convention on all your extern symbols.
-#
-# The mapfile will establish versioning by defining the exported interface.
-#
-# The mapfile can also force certain .o files or elf sections into the
-# the different segments of the resulting library/program image.
-#
-# The macro FILES_m can contain any number of mapfiles.
-#
-
-# Always make sure 'all' is the default rule
-mapfile_default_rule: all
-
-ifeq ($(PLATFORM), solaris)
-
-ifeq ($(VARIANT), OPT)
- # OPT build MUST have a mapfile?
- ifndef FILES_m
- FILES_m = mapfile-vers
- endif
-
- # If we are re-ordering functions in this solaris library, we need to make
- # sure that -xF is added to the compile lines. This option is critical and
- # enables the functions to be reordered.
- ifdef FILES_reorder
- CFLAGS_OPT += -xF
- CXXFLAGS_OPT += -xF
- endif
-
-INIT += $(TEMPDIR)/mapfile-vers
-
-$(TEMPDIR)/mapfile-vers : $(FILES_m) $(FILES_reorder)
- $(prep-target)
- $(CAT) $(FILES_m) > $@
- ifdef FILES_reorder
- $(SED) -e 's=OUTPUTDIR=$(OUTPUTDIR)=' $(FILES_reorder) >> $@
- endif
-endif # VARIANT
-
-ifndef LDNOMAP
- LDMAPFLAGS_OPT = -M$(TEMPDIR)/mapfile-vers
- LDMAPFLAGS_DBG = $(FILES_m:%=-M%)
-endif
-
-endif # PLATFORM
-
-ifeq ($(PLATFORM), linux)
-
-ifeq ($(VARIANT), OPT)
- # OPT build MUST have a mapfile?
- ifndef FILES_m
- FILES_m = mapfile-vers
- endif
-endif # VARIANT
-
-ifndef LDNOMAP
- LDMAPFLAGS_OPT = $(FILES_m:%=-Xlinker -version-script=%)
- LDMAPFLAGS_DBG = $(FILES_m:%=-Xlinker -version-script=%)
-endif
-
-endif # PLATFORM
-
-LDFLAGS_OPT += $(LDMAPFLAGS_OPT)
-LDFLAGS_DBG += $(LDMAPFLAGS_DBG)
-
diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk
deleted file mode 100644
index b319ee4..0000000
--- a/jdk/make/common/Program.gmk
+++ /dev/null
@@ -1,414 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Generic makefile for building executables.
-#
-
-# WARNING: This file is shared with other workspaces.
-# So when it includes other files, it must use JDK_TOPDIR.
-#
-
-#
-# If building programs, use a normal compile approach
-#
-ifeq ($(COMPILE_APPROACH),batch)
- override COMPILE_APPROACH = normal
-endif
-
-# set the platform specific directory for macosx, also this platform shares
-# substantial family ties with its siblings (solaris and linux), thus we add
-# solaris src path to its compilation dependencies.
-ifeq ($(PLATFORM), macosx)
- LAUNCHER_PLATFORM_SRC = $(BUILDDIR)/../src/macosx
- LAUNCHER_SOLARIS_PLATFORM_SRC = $(BUILDDIR)/../src/solaris
-else
- LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)
-endif
-
-ifndef LAUNCHER_SHARE_SRC
- LAUNCHER_SHARE_SRC = $(SHARE_SRC)
-endif
-
-ACTUAL_PROGRAM_NAME = $(PROGRAM)$(EXE_SUFFIX)
-ACTUAL_PROGRAM_DIR = $(BINDIR)
-ACTUAL_PROGRAM = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME)
-
-# Make sure the default rule is all
-program_default_rule: all
-
-program: $(ACTUAL_PROGRAM)
-
-# Work-around for missing processor specific mapfiles
-ifndef CROSS_COMPILE_ARCH
- # reuse the mapfiles in the launcher's directory, the same should
- # be applicable to the tool launchers as well.
- FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH)
- include $(BUILDDIR)/common/Mapfile-vers.gmk
-endif
-
-include $(JDK_TOPDIR)/make/common/Rules.gmk
-
-ifdef NEVER_ACT_AS_SERVER_CLASS_MACHINE
- OTHER_CPPFLAGS += -DNEVER_ACT_AS_SERVER_CLASS_MACHINE
-endif
-
-#
-# Create a dependency on libjli (Java Launcher Infrastructure)
-#
-# On UNIX, this is a relative dependency using $ORIGIN. Unfortunately, to
-# do this reliably on Linux takes a different syntax than Solaris.
-#
-# On Windows, this is done by using the same directory as the executable
-# itself, as with all the Windows libraries.
-#
-ifeq ($(PLATFORM), macosx)
- ifneq ($(ARCH), universal)
- LDFLAGS += -Wl,-all_load
- endif
- LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
-
- ifeq ($(SYSTEM_ZLIB),true)
- OTHER_LDLIBS += $(ZLIB_LIBS)
- endif
-endif
-
-ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems
- LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
- OTHER_LDLIBS += -ljli
- ifeq ($(PLATFORM), solaris)
- ifeq ($(ARCH_DATA_MODEL), 32)
- LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
- LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
- else
- LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
- LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
- endif
- endif
- ifeq ($(PLATFORM), linux)
- LDFLAGS += $(LDFLAG_Z_ORIGIN)
- LDFLAGS += -Wl,--allow-shlib-undefined
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
- endif
-endif
-
-ifeq ($(PLATFORM), windows)
- JLI_LCF = $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/jli.lcf
- ifdef STATIC_JLI
- LDFLAGS += -libpath:$(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static
- else
- LDFLAGS += -libpath:$(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)
- endif
- OTHER_LDLIBS += jli.lib
-endif
-
-#
-# Applications expect to be able to link against libjawt without invoking
-# System.loadLibrary("jawt") first. This was the behaviour described in the
-# devloper documentation of JAWT and what worked with OpenJDK6.
-#
-ifeq ($(PLATFORM), solaris)
- ifeq ($(ARCH_DATA_MODEL), 32)
- LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)
- LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)
- else # ! ARCH_DATA_MODEL 64-bit
- LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)
- LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)
- endif # ARCH_DATA_MODEL
-endif # PLATFORM SOLARIS
-ifeq ($(PLATFORM), linux)
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)
-endif # PLATFORM LINUX
-
-
-#
-# Launcher specific files.
-#
-FILES_o = $(OBJDIR)/main.$(OBJECT_SUFFIX)
-
-$(ACTUAL_PROGRAM):: classes $(INIT)
-
-#
-# Windows only
-#
-ifeq ($(PLATFORM), windows)
- # JDK name required here
- RC_FLAGS += -D "JDK_FNAME=$(PROGRAM)$(EXE_SUFFIX)" \
- -D "JDK_INTERNAL_NAME=$(PROGRAM)" \
- -D "JDK_FTYPE=0x1L"
-
- $(OBJDIR)/$(PROGRAM).res: $(VERSIONINFO_RESOURCE)
- @$(prep-target)
- ifndef LOCAL_RESOURCE_FILE
- $(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(@) $(VERSIONINFO_RESOURCE)
- endif
-
- $(OBJDIR)/$(PROGRAM).lcf: $(OBJDIR)/$(PROGRAM).res $(FILES_o)
- @$(prep-target)
- @$(ECHO) $(FILES_o) > $@
- ifndef LOCAL_RESOURCE_FILE
- @$(ECHO) $(OBJDIR)/$(PROGRAM).res >> $@
- endif
- @$(ECHO) Created $@
-
- $(ACTUAL_PROGRAM):: $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
- @$(install-file)
-
- ifeq ($(ARCH_DATA_MODEL), 32)
- STACK_SIZE=327680
- else
- # We need more Stack for Windows 64bit
- STACK_SIZE=1048576
- endif
-
- IMVERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
- $(OBJDIR)/$(PROGRAM).exe.manifest: $(JDK_TOPDIR)/src/windows/resource/java.manifest
- @$(prep-target)
- $(SED) 's%IMVERSION%$(IMVERSION)%g;s%PROGRAM%$(PROGRAM)%g' $< > $@
-
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- MAP_OPTION="-map:$(OBJDIR)/$(PROGRAM).map"
-endif
-
- # We used a hand-crafted manifest file for all executables.
- # It is tweaked to embed the build number and executable name.
- # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
- $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(OBJDIR)/$(PROGRAM).lcf $(FILES_o) $(JLI_LCF) $(OBJDIR)/$(PROGRAM).exe.manifest
- @$(prep-target)
- @set -- $?; \
- $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
- $(LINK) -out:$@ -STACK:$(STACK_SIZE) \
- $(MAP_OPTION) $(LFLAGS) $(LDFLAGS) \
- @$(OBJDIR)/$(PROGRAM).lcf $(LDLIBS)
- ifdef MT
- $(MT) -manifest $(OBJDIR)/$(PROGRAM).exe.manifest /outputresource:$@;#1
- endif
- @$(call binary_file_verification,$@)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- (set -e ; \
- $(CD) $(OBJDIR) ; \
- $(ZIPEXE) -q $(PROGRAM).diz $(PROGRAM).map $(PROGRAM).pdb ; \
- $(RM) $(PROGRAM).map $(PROGRAM).pdb ; \
- )
- endif
- endif
-else
- #
- # Note that we have to link -lthread even when USE_PTHREADS is true.
- # This is becuase checkForCorrectLibthread() croaks otherwise.
- #
- LIBTHREAD = -lthread
- ifeq ($(USE_PTHREADS),true)
- THREADLIBS = -lpthread $(LIBTHREAD)
- else
- THREADLIBS = $(LIBTHREAD)
- endif
-
- ifeq ($(PLATFORM), macosx)
- THREADLIBS = -pthread
- # Needed for linking the various launchers
- LDFLAGS += -framework Cocoa -framework Security \
- -framework ApplicationServices
- OTHER_CPPFLAGS += -DPACKAGE_PATH='"$(PACKAGE_PATH)"'
-
- # Default Info.plist file for the command line tools. This gets overridden by
- # some of the jvmstat tools so that they have task_for_pid() privileges
- ifndef INFO_PLIST_FILE
- INFO_PLIST_FILE = Info-cmdline.plist
- endif
- LDFLAGS += -sectcreate __TEXT __info_plist $(LAUNCHER_PLATFORM_SRC)/lib/$(INFO_PLIST_FILE)
- else
- INFO_PLIST_FILE=
- endif
-
- #
- # This rule only applies on unix. It supports quantify and its ilk.
- #
-
- ifeq ($(PLATFORM), solaris)
- ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
- $(ACTUAL_PROGRAM):: $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS)
- endif
- endif
-
- $(ACTUAL_PROGRAM):: $(FILES_o)
- @$(prep-target)
- @set -- $?; \
- $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
- @$(MKDIR) -p $(TEMPDIR)
- $(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \
- $(sort $(FILES_o)) $(THREADLIBS) $(LDLIBS)
- ifeq ($(findstring privileged, $(INFO_PLIST_FILE)), privileged)
- -codesign -s openjdk_codesign $@
- endif
- @$(call binary_file_verification,$@)
- ifneq ($(PLATFORM), macosx)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(PLATFORM), solaris)
-# gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-# Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-# empty section headers until a fixed $(OBJCOPY) is available.
-# An empty section header has sh_addr == 0 and sh_size == 0.
-# This problem has only been seen on Solaris X64, but we call this tool
-# on all Solaris builds just in case.
-#
-# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
- (set -e ; \
- $(CD) $(@D) ; \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
- $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
- $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \
- )
- else # PLATFORM != solaris
- (set -e ; \
- $(CD) $(@D) ; \
- $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
- $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \
- )
- endif # PLATFORM == solaris
- ifeq ($(STRIP_POLICY),all_strip)
- $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
- ifeq ($(PLATFORM), solaris)
- $(STRIP) -x $@
- else
- # assume Linux
- $(STRIP) -g $@
- endif
- # implied else here is no stripping at all
- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- (set -e ; \
- $(CD) $(@D) ; \
- $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \
- $(RM) $(@F).debuginfo ; \
- )
- # save ZIP'ed debug info with rest of the program's build artifacts
- $(MV) $@.diz $(OBJDIR)
- else
- # save debug info with rest of the program's build artifacts
- $(MV) $@.debuginfo $(OBJDIR)
- endif
- endif # PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS
- endif # ENABLE_FULL_DEBUG_SYMBOLS
- endif # PLATFORM-!macosx
-endif # PLATFORM
-
-clean::
-ifeq ($(PLATFORM), windows)
- $(RM) $(OBJDIR)/$(PROGRAM).rc
- $(RM) $(OBJDIR)/$(PROGRAM).ico
- $(RM) $(OBJDIR)/$(PROGRAM).lcf
- $(RM) $(OBJDIR)/$(PROGRAM).map
- $(RM) $(OBJDIR)/$(PROGRAM).pdb
- $(RM) $(OBJDIR)/$(PROGRAM).exp
- $(RM) $(OBJDIR)/$(PROGRAM).lib
- $(RM) $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
- $(RM) $(OBJDIR)/$(PROGRAM).ilk
- $(RM) *.pdb
-else
- $(RM) $(OBJDIR)/$(PROGRAM).debuginfo
-endif
- $(RM) $(OBJDIR)/$(PROGRAM).diz
-
-
-clobber::
- $(RM) $(ACTUAL_PROGRAM)
-
-#
-# Now include make dependencies (created during compilation, see Rules.gmk)
-#
-ifeq ($(INCREMENTAL_BUILD),true)
- # Workaround: gnumake sometimes says files is empty when it shouldn't
- # was: files := $(foreach file, $(wildcard */$(ARCH)/*.$(DEPEND_SUFFIX)), $(file))
- files := $(shell $(LS) $(OBJDIR)/*.$(DEPEND_SUFFIX) 2>/dev/null)
- ifneq ($(strip $(files)),)
- include $(files)
- endif
-endif
-
-ifdef JAVA_ARGS
- OTHER_CPPFLAGS += -DJAVA_ARGS='$(JAVA_ARGS)'
- OTHER_CPPFLAGS += -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"'
-endif
-
-ifeq ($(PLATFORM), windows)
- ifdef RELEASE
- OTHER_CPPFLAGS += -DVERSION='"$(RELEASE)"'
- endif
-endif
-
-
-ifneq ($(PLATFORM), windows)
- HAVE_GETHRTIME=true
-endif
-
-ifeq ($(HAVE_GETHRTIME),true)
- OTHER_CPPFLAGS += -DHAVE_GETHRTIME
-endif
-
-OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
-ifeq ($(PLATFORM), macosx)
- OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC)/bin
- ifneq ($(SYSTEM_ZLIB), true)
- OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
- endif
-else
- OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
-endif
-
-OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
-VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
-
-VERSION_DEFINES += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
- -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"'
-
-$(OBJDIR)/main.$(OBJECT_SUFFIX): $(LAUNCHER_SHARE_SRC)/bin/main.c
- @$(prep-target)
- $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$(OBJDIR)/main.$(OBJECT_SUFFIX) \
- $(VERSION_DEFINES) $<
-
-#
-# Default dependencies
-#
-
-all: build
-
-build: program
-
-debug:
- $(MAKE) VARIANT=DBG build
-
-fastdebug:
- $(MAKE) VARIANT=DBG FASTDEBUG=true build
-
-.PHONY: all build program clean clobber debug fastdebug
diff --git a/jdk/make/common/Release-macosx.gmk b/jdk/make/common/Release-macosx.gmk
deleted file mode 100644
index be29f78..0000000
--- a/jdk/make/common/Release-macosx.gmk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-MANBASEDIRS=$(JDK_TOPDIR)/src/bsd/doc $(IMPORTDOCDIR)
-MAN1SUBDIR = man
-JA_DIRNAME=ja_JP.UTF-8
-
-# Defines the release targets for Mac OS X build products
-
-JDK_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents
-JRE_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2re-bundle/jre$(JDK_VERSION).jre/Contents
-
-MACOSX_SRC = $(JDK_TOPDIR)/src/macosx
-
-BUNDLE_ID ?= net.java.openjdk
-BUNDLE_ID_JRE ?= $(BUNDLE_ID).jre
-BUNDLE_ID_JDK ?= $(BUNDLE_ID).jdk
-
-BUNDLE_NAME ?= OpenJDK $(JDK_MINOR_VERSION)
-BUNDLE_NAME_JRE ?= $(BUNDLE_NAME)
-BUNDLE_NAME_JDK ?= $(BUNDLE_NAME)
-
-BUNDLE_INFO ?= OpenJDK ($(JDK_VERSION))
-BUNDLE_INFO_JRE ?= $(BUNDLE_INFO)
-BUNDLE_INFO_JDK ?= $(BUNDLE_INFO)
-
-BUNDLE_PLATFORM_VERSION ?= $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION)
-BUNDLE_VERSION ?= $(JDK_VERSION)
-BUNDLE_VENDOR ?= UNDEFINED
-
-jre-bundle-setup:
- $(RM) -r $(JRE_BUNDLE_DIR)
-
-jdk-bundle-setup:
- $(RM) -r $(JDK_BUNDLE_DIR)
-
-jre-bundle-files:
- $(MKDIR) -p $(JRE_BUNDLE_DIR)/MacOS
- ln -s ../Home/lib/jli/libjli.dylib $(JRE_BUNDLE_DIR)/MacOS/
- $(CP) -r $(JRE_IMAGE_DIR) $(JRE_BUNDLE_DIR)/Home
- $(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 > $(JRE_BUNDLE_DIR)/Info.plist
- /usr/bin/SetFile -a B $(JRE_BUNDLE_DIR)/../
-
-jdk-bundle-files:
- $(MKDIR) -p $(JDK_BUNDLE_DIR)/MacOS
- ln -s ../Home/jre/lib/jli/libjli.dylib $(JDK_BUNDLE_DIR)/MacOS/
- $(CP) -r $(JDK_IMAGE_DIR) $(JDK_BUNDLE_DIR)/Home
- $(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 > $(JDK_BUNDLE_DIR)/Info.plist
- /usr/bin/SetFile -a B $(JDK_BUNDLE_DIR)/../
-
-EXTRA_IMAGE_TARGETS += jre-bundle-setup jdk-bundle-setup jre-bundle-files jdk-bundle-files
-
-.PHONY: $(EXTRA_JRE_TARGETS) $(EXTRA_IMAGE_TARGETS)
diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk
deleted file mode 100644
index b584781..0000000
--- a/jdk/make/common/Release.gmk
+++ /dev/null
@@ -1,1410 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include $(JDK_TOPDIR)/make/docs/CORE_PKGS.gmk
-include $(JDK_TOPDIR)/make/docs/NON_CORE_PKGS.gmk
-
-# What jdk version are we building
-THIS_JDK_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
-
-#
-# Perform release engineering tasks.
-#
-# images An image is what the product looks like when it is
-# installed.
-#
-
-IMAGE_BINDIR = bin
-
-# The compiler should not issue a "Proprietary" warning when compiling
-# classes in the com.sun.java.swing.plaf packages, since we've always
-# allowed, and even advocated, extending them (see bug 6476749).
-#
-# This approach is NOT to be used as a general purpose way to avoid such
-# compiler warnings for non-core packages. The correct way is to document
-# the packages in NON_CORE_PKGS.gmk, and include them in the NON_CORE_PKGS
-# definition.
-#
-# Swing has taken this approach only as a temporary measure to avoid
-# the compiler warnings until we can properly document these packages.
-# This is covered under 6491853.
-EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \
- com.sun.java.swing.plaf.motif \
- com.sun.java.swing.plaf.gtk
-
-#
-# Include the exported private packages in ct.sym.
-# This is an interim solution until the ct.sym is replaced
-# with a new module system (being discussed for JDK 8).
-#
-EXPORTED_PRIVATE_PKGS = com.oracle.net \
- com.oracle.nio
-
-# 64-bit solaris has a few special cases. We define the variable
-# SOLARIS64 for use in this Makefile to easily test those cases
-ifeq ($(PLATFORM), solaris)
- ifeq ($(ARCH_DATA_MODEL), 64)
- SOLARIS64 = true
- IMAGE_BINDIR = bin/$(ARCH)
- endif
-endif
-
-JTG_DOCS = $(JDK_TOPDIR)/src/solaris/doc
-
-ifeq ($(PLATFORM), macosx)
- include $(JDK_TOPDIR)/make/common/Release-$(PLATFORM).gmk
-endif
-
-# The base names of all the license and document files for the jdk and jre
-# (These files get placed in the jdk and jre install images)
-ifdef OPENJDK
- # Where to find these files
- SHARE_JDK_DOC_SRC = $(JDK_TOPDIR)
- SHARE_JRE_DOC_SRC = $(JDK_TOPDIR)
- # Same files for jdk and jre, no name changes
- IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
- IMAGE_DOCLIST_JDK_DEMOS_AND_SAMPLES =
- IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
-else
- # make/closed/common/Defs.gmk for closed location of SHARE_JDK_DOC_SRC
-
- IMAGE_DOCLIST_JDK = COPYRIGHT README.html LICENSE THIRDPARTYLICENSEREADME.txt
- IMAGE_DOCLIST_JDK_DEMOS_AND_SAMPLES = demo/DEMOS_LICENSE sample/SAMPLES_LICENSE
- IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt
- ifeq ($(PLATFORM), windows)
- IMAGE_DOCLIST_JRE += README.txt
- else
- IMAGE_DOCLIST_JRE += README
- endif
-endif
-
-# Paths to these files we need
-JDK_DOCFILES = $(IMAGE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%)
-JRE_DOCFILES = $(IMAGE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%)
-JDK_DEMOS_AND_SAMPLES_DOCFILES = $(IMAGE_DOCLIST_JDK_DEMOS_AND_SAMPLES:%=$(JDK_IMAGE_DIR)/%)
-
-# absolute directory names: note, these must exist prior to build
-# time - they are created in the main Makefile.
-JRE_IMAGE_BINDIR = $(JRE_IMAGE_DIR)/bin
-
-MAINMANIFEST = $(JDK_TOPDIR)/make/tools/manifest.mf
-BEANMANIFEST = $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest
-
-#
-# Man pages
-#
-
-JRE_MAN_PAGES = \
- java.1 \
- keytool.1 \
- orbd.1 \
- pack200.1 \
- policytool.1 \
- rmid.1 \
- rmiregistry.1 \
- servertool.1 \
- tnameserv.1 \
- unpack200.1
-
-ifndef OPENJDK
- JRE_MAN_PAGES += javaws.1
-endif
-
-JDK_MAN_PAGES = \
- $(JRE_MAN_PAGES) \
- appletviewer.1 \
- extcheck.1 \
- idlj.1 \
- jar.1 \
- jarsigner.1 \
- javac.1 \
- javadoc.1 \
- javah.1 \
- javap.1 \
- jcmd.1 \
- jconsole.1 \
- jdb.1 \
- jhat.1 \
- jinfo.1 \
- jmap.1 \
- jps.1 \
- jrunscript.1 \
- jsadebugd.1 \
- jstack.1 \
- jstat.1 \
- jstatd.1 \
- native2ascii.1 \
- rmic.1 \
- schemagen.1 \
- serialver.1 \
- wsgen.1 \
- wsimport.1 \
- xjc.1
-
-ifndef OPENJDK
- JDK_MAN_PAGES += jvisualvm.1
-endif
-
-ifeq ($(PLATFORM), solaris)
- MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR)
- MAN1SUBDIR=sun/man/man1
-endif # solaris
-
-ifeq ($(PLATFORM), linux)
- MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR)
- MAN1SUBDIR=man
- JA_DIRNAME=ja_JP.UTF-8
-endif # linux
-
-define copy-man-pages
-$(MKDIR) -p $1/man/man1
-for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
- for manpage in $2; do \
- if [ -f $${manbase}/$${manpage} ] ; then \
- $(CP) $${manbase}/$${manpage} $1/man/man1 ; \
- for ja_encoding in $(JA_TARGET_ENCODINGS); do \
- ja_dir="ja"; \
- if [ "$${ja_encoding}" != "$(JA_SOURCE_ENCODING)" ]; then \
- ja_dir="ja_JP.$${ja_encoding}"; \
- fi; \
- $(MKDIR) -p $1/man/$${ja_dir}/man1; \
- $(CAT) $${manbase}/ja/$${manpage} \
- | $(NATIVE2ASCII) -encoding $(JA_SOURCE_ENCODING) \
- | $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \
- | $(NATIVE2ASCII) -reverse -encoding $${ja_encoding} \
- > $1/man/$${ja_dir}/man1/$${manpage}; \
- done; \
- fi; \
- done; \
-done
-$(java-vm-cleanup)
-if [ "$(JA_DIRNAME)" != "" ] ; then \
- $(CD) $1/man && $(RM) ja && $(LN) -s $(JA_DIRNAME) ja; \
-fi
-endef
-
-
-# no compression unless requested
-ifndef COMPRESS_JARS
- CREATE_JAR_OPTS = c0mf
- CREATE_JAR_OPTS_NOMANIFEST = c0f
-else
- CREATE_JAR_OPTS = cmf
- CREATE_JAR_OPTS_NOMANIFEST = cf
-endif
-
-#
-# Targets.
-#
-INITIAL_IMAGE_JRE=initial-image-jre
-INITIAL_IMAGE_JDK=initial-image-jdk
-ifeq ($(PLATFORM), solaris)
- ifeq ($(ARCH_DATA_MODEL), 64)
- INITIAL_IMAGE_JRE=initial-image-jre-sol64
- INITIAL_IMAGE_JDK=initial-image-jdk-sol64
- endif
-endif
-
-images images-clobber \
-initial-image-jre initial-image-jdk \
-initial-image-jre-sol64 initial-image-jdk-sol64 \
-trim-image-jre trim-image-jdk \
-identify-image-jre identify-image-jdk \
-process-image-jre process-image-jdk \
-compare-image \
-sec-files sec-files-win jgss-files ::
- @$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
-
-# Order is important here, trim jre after jdk image is created
-ifeq ($(PLATFORM), macosx)
-
-images:: sanity-images post-sanity-images \
- $(INITIAL_IMAGE_JRE) $(EXTRA_JRE_TARGETS) $(INITIAL_IMAGE_JDK) \
- trim-image-jre trim-image-jdk \
- identify-image-jre identify-image-jdk \
- process-image-jre process-image-jdk sec-files sec-files-win jgss-files \
- $(EXTRA_IMAGE_TARGETS)
-else
-
-images:: sanity-images post-sanity-images \
- $(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \
- trim-image-jre trim-image-jdk \
- identify-image-jre identify-image-jdk \
- process-image-jre process-image-jdk sec-files sec-files-win jgss-files
-endif
-
-# Don't use these
-image-jre:: initial-image-jre trim-image-jre identify-image-jre process-image-jre
-image-jdk:: initial-image-jdk trim-image-jdk identify-image-jdk process-image-jdk
-
-#
-# Sources we ship in the SDK.
-#
-SOURCES = \
- java/applet \
- java/awt \
- java/beans \
- java/io \
- java/lang \
- java/math \
- java/net \
- java/nio \
- java/rmi \
- java/security \
- java/sql \
- java/text \
- java/util \
- com/sun/corba \
- com/sun/image/codec/jpeg \
- com/sun/imageio \
- com/sun/java/swing \
- com/sun/javadoc \
- com/sun/jmx \
- com/sun/source \
- com/sun/naming \
- com/sun/security/auth \
- com/sun/security/jgss \
- javax/accessibility \
- javax/annotation \
- javax/script \
- javax/imageio \
- javax/lang \
- javax/management \
- javax/naming \
- javax/print \
- javax/rmi \
- javax/security \
- javax/sound \
- javax/sql \
- javax/swing \
- javax/tools \
- javax/xml \
- com/sun/org/apache \
- com/sun/java_cup \
- com/sun/jlex \
- org/ietf \
- org/omg \
- org/w3c/dom \
- org/xml/sax
-#
-# Directories where sources may be found. If a file with the same path
-# name exists in more than one of these places, the one found last on this
-# list wins.
-#
-SOURCE_DIRS = $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
-SOURCE_DIRS += $(GENSRCDIR)
-SOURCE_DIRS += $(IMPORTSRCDIR)
-ifndef OPENJDK
- SOURCE_DIRS += $(CLOSED_SRC)/share/classes
-endif
-
-
-#
-# Specific files and directories that will be filtered out from above areas.
-#
-SOURCE_FILTERs = $(SCM_DIRs) ',*'
-SOURCE_FILES_filter = $(SOURCE_FILTERs:%=-name % -prune -o)
-
-#
-# Bug 4249883 - excluding some unnecessary packages from com.sun.tools
-#
-# Bug 5008685 - exclude jconsole from sun/tools
-#
-TOOLS = \
- META-INF/services/com.sun.jdi.connect.Connector \
- META-INF/services/com.sun.jdi.connect.spi.TransportService \
- sun/tools/asm \
- sun/tools/jar \
- sun/tools/java \
- sun/tools/javac \
- sun/tools/jcmd \
- sun/tools/jps \
- sun/tools/jstat \
- sun/tools/jstatd \
- sun/tools/native2ascii \
- sun/tools/serialver \
- sun/tools/tree \
- sun/tools/util \
- sun/security/tools/jarsigner/Main.class \
- sun/security/tools/jarsigner/JarSignerParameters.class \
- sun/security/tools/jarsigner/Resources.class \
- sun/security/tools/jarsigner/Resources_ja.class \
- sun/security/tools/jarsigner/Resources_zh_CN.class \
- sun/security/tools/jarsigner/SignatureFile\$$Block.class \
- sun/security/tools/jarsigner/SignatureFile.class \
- sun/security/tools/jarsigner/TimestampedSigner.class \
- sun/rmi/rmic \
- sun/applet \
- sun/jvmstat \
- com/sun/javadoc \
- com/sun/jdi \
- com/sun/jarsigner \
- com/sun/source \
- com/sun/tools/classfile \
- com/sun/tools/doclets \
- com/sun/tools/doclint \
- com/sun/tools/example/debug/expr \
- com/sun/tools/example/debug/tty \
- com/sun/tools/extcheck \
- com/sun/tools/hat \
- com/sun/tools/javac \
- com/sun/tools/javadoc \
- com/sun/tools/javah \
- com/sun/tools/javap \
- com/sun/tools/jdeps \
- com/sun/tools/corba \
- com/sun/tools/internal/xjc \
- com/sun/tools/internal/ws \
- META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
- META-INF/services/com.sun.tools.internal.xjc.Plugin \
- com/sun/istack/internal/tools \
- com/sun/tools/internal/jxc/ap \
- com/sun/tools/internal/ws/wscompile/plugin/at_generated \
- com/sun/codemodel \
- com/sun/tools/internal/jxc \
- com/sun/xml/internal/rngom \
- com/sun/xml/internal/xsom \
- org/relaxng/datatype \
- com/sun/xml/internal/dtdparser \
- com/sun/tools/jdi \
- com/sun/tools/script/shell \
- META-INF/services/com.sun.tools.attach.spi.AttachProvider \
- com/sun/tools/attach \
- sun/tools/attach \
- sun/tools/jstack \
- sun/tools/jinfo \
- sun/tools/jmap
-
-# classes that go into jfr.jar
-JFR_CLASSES_DIRS= \
- com/oracle/jrockit/jfr \
- oracle/jrockit/jfr \
- jdk/jfr
-
-# classes that go into jsse.jar
-JSSE_CLASSES_DIRS = \
- sun/security/provider/Sun.class \
- sun/security/rsa/SunRsaSign.class \
- sun/security/ssl \
- com/sun/net/ssl/internal/ssl
-
-# files under $(OUTPUTDIR) that need to go into sec-bin.zip for builds
-# where the corresponding sources are not available
-SEC_FILES_DIRS = \
- classes/javax/net \
- classes/javax/security/cert \
- classes/com/sun/net/ssl \
- classes/com/sun/security/cert \
- classes/sun/net/www/protocol/https \
- classes/sun/security/pkcs12 \
- classes/sun/security/ssl \
- classes/sun/security/krb5/*.class \
- classes/sun/security/krb5/internal/*.class \
- classes/sun/security/krb5/internal/ccache \
- classes/sun/security/krb5/internal/crypto \
- classes/sun/security/krb5/internal/ktab \
- classes/sun/security/krb5/internal/rcache \
- classes/sun/security/krb5/internal/util \
- classes/sun/security/jgss/spi/GSSContextSpi.class
-
-# files under $(OUTPUTDIR) that need to go into sec-windows-win.zip for builds
-# where the corresponding sources are not available
-SEC_FILES_WIN_DIRS = \
- classes/sun/security/krb5/internal/tools
-
-# files under $(BINDIR) that need to go into jgss_files.zip for builds
-# where the corresponding sources are not available
-JGSS_FILES_DIRS = \
- bin/w2k_lsa_auth.dll \
- bin/w2k_lsa_auth.map \
- bin/w2k_lsa_auth.pdb
-
-# The following get removed from the SDK image.
-NOTJDKTOOLS = \
- java_vm
-
-# The following get removed from the JRE after the bulk-copy of BINDIR...
-NOTJRETOOLS = \
- appletviewer$(EXE_SUFFIX) \
- extcheck$(EXE_SUFFIX) \
- idlj$(EXE_SUFFIX) \
- jar$(EXE_SUFFIX) \
- jarsigner$(EXE_SUFFIX) \
- java-rmi.cgi \
- javac$(EXE_SUFFIX) \
- javadoc$(EXE_SUFFIX) \
- javah$(EXE_SUFFIX) \
- javap$(EXE_SUFFIX) \
- jdeps$(EXE_SUFFIX) \
- jcmd$(EXE_SUFFIX) \
- jdb$(EXE_SUFFIX) \
- jps$(EXE_SUFFIX) \
- jrunscript$(EXE_SUFFIX) \
- jstat$(EXE_SUFFIX) \
- jstatd$(EXE_SUFFIX) \
- jstack$(EXE_SUFFIX) \
- packagebean$(SCRIPT_SUFFIX) \
- rmic$(EXE_SUFFIX) \
- serialver$(EXE_SUFFIX) \
- unregbean$(EXE_SUFFIX) \
- jconsole$(EXE_SUFFIX) \
- jinfo$(EXE_SUFFIX) \
- jmap$(EXE_SUFFIX) \
- native2ascii$(EXE_SUFFIX) \
- xjc$(EXE_SUFFIX) \
- wsgen$(EXE_SUFFIX) \
- wsimport$(EXE_SUFFIX) \
- schemagen$(EXE_SUFFIX) \
- jsadebugd$(EXE_SUFFIX) \
- jhat$(EXE_SUFFIX)
-
-# The following get removed from the JRE after the bulk-copy of LIBDIR...
-NOTJRELIBS = tools.jar \
- jconsole.jar
-
-ifeq ($(INCLUDE_SA), true)
- NOTJRELIBS += sa-jdi.jar
-
- # The following get removed from the JRE after the bulk-copy of LIBDIR...
- NOTJRE_SHARED_LIBS = $(SALIB_NAME)
-else
- NOTJRE_SHARED_LIBS =
-endif
-
-# Attach library is JDK only
-NOTJRE_SHARED_LIBS += $(LIB_PREFIX)attach.$(LIBRARY_SUFFIX)
-
-#
-###### RULES
-
-# Processing license files from source area to image area
-# These will be modified to have the platform specific EOL chars.
-define process-doc-file
-$(prep-target)
-$(SED) 's/$$//g' $< > $@
-$(CHMOD) 444 $@
-endef
-
-# JDK files
-$(JDK_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/%
- $(process-doc-file)
-
-$(JDK_IMAGE_DIR)/demo/DEMOS_LICENSE: $(SHARE_JDK_DOC_SRC)/DEMOS_LICENSE
- $(process-doc-file)
-
-$(JDK_IMAGE_DIR)/sample/SAMPLES_LICENSE: $(SHARE_JDK_DOC_SRC)/SAMPLES_LICENSE
- $(process-doc-file)
-
-# JRE files
-$(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%
- $(process-doc-file)
-ifeq ($(PLATFORM), windows)
-$(JRE_IMAGE_DIR)/README.txt: $(SHARE_JRE_DOC_SRC)/README
- $(process-doc-file)
-endif
-
-# Differences tool
-DIRDIFF_JARFILE = $(BUILDTOOLJARDIR)/dirdiff.jar
-
-######################################################
-# List of directories in classes directory that should NOT be in rt.jar
-######################################################
-
-NOT_RT_JAR_LIST = $(ABS_TEMPDIR)/not_rt_jar.list
-
-$(NOT_RT_JAR_LIST): FRC
- $(prep-target)
- $(ECHO) "#\n" >> $@
- $(ECHO) "# List of subdirectories not in include in rt.jar" >> $@
- $(ECHO) "# Directories must contain trailing '/'." >> $@
- $(ECHO) "com/sun/javadoc/" >> $@
- $(ECHO) "com/sun/jdi/" >> $@
- $(ECHO) "com/sun/jarsigner/" >> $@
- $(ECHO) "com/sun/source/" >> $@
- $(ECHO) "com/sun/istack/internal/tools/" >> $@
- $(ECHO) "META-INF/services/com.sun.jdi.connect.Connector" >> $@
- $(ECHO) "META-INF/services/com.sun.jdi.connect.spi.TransportService" >> $@
- $(ECHO) "META-INF/services/com.sun.tools.xjc.Plugin" >> $@
- $(ECHO) "com/sun/tools/" >> $@
- $(ECHO) "sun/jvmstat/" >> $@
- $(ECHO) "sun/nio/cs/ext/" >> $@
- $(ECHO) "sun/awt/HKSCS.class" >> $@
- $(ECHO) "sun/awt/motif/X11GB2312\$$Decoder.class" >> $@
- $(ECHO) "sun/awt/motif/X11GB2312\$$Encoder.class" >> $@
- $(ECHO) "sun/awt/motif/X11GB2312.class" >> $@
- $(ECHO) "sun/awt/motif/X11GBK\$$Encoder.class" >> $@
- $(ECHO) "sun/awt/motif/X11GBK.class" >> $@
- $(ECHO) "sun/awt/motif/X11KSC5601\$$Decoder.class" >> $@
- $(ECHO) "sun/awt/motif/X11KSC5601\$$Encoder.class" >> $@
- $(ECHO) "sun/awt/motif/X11KSC5601.class" >> $@
- $(ECHO) "sun/rmi/rmic/" >> $@
- $(ECHO) "sun/tools/asm/" >> $@
- $(ECHO) "sun/tools/java/" >> $@
- $(ECHO) "sun/tools/javac/" >> $@
- $(ECHO) "com/sun/tools/classfile/" >> $@
- $(ECHO) "com/sun/tools/javap/" >> $@
- $(ECHO) "com/sun/tools/jdeps/" >> $@
- $(ECHO) "sun/tools/jcmd/" >> $@
- $(ECHO) "sun/tools/jconsole/" >> $@
- $(ECHO) "sun/tools/jps/" >> $@
- $(ECHO) "sun/tools/jstat/" >> $@
- $(ECHO) "sun/tools/jstatd/" >> $@
- $(ECHO) "sun/tools/native2ascii/" >> $@
- $(ECHO) "sun/tools/serialver/" >> $@
- $(ECHO) "sun/tools/tree/" >> $@
- $(ECHO) "sun/tools/util/" >> $@
- $(ECHO) "sun/security/tools/jarsigner/Main.class" >> $@
- $(ECHO) "sun/security/tools/jarsigner/JarSignerParameters.class" >> $@
- $(ECHO) "sun/security/tools/jarsigner/Resources.class" >> $@
- $(ECHO) "sun/security/tools/jarsigner/Resources_ja.class" >> $@
- $(ECHO) "sun/security/tools/jarsigner/Resources_zh_CN.class" >> $@
- $(ECHO) "sun/security/tools/jarsigner/SignatureFile\$$Block.class" >> $@
- $(ECHO) "sun/security/tools/jarsigner/SignatureFile.class" >> $@
- $(ECHO) "sun/security/tools/jarsigner/TimestampedSigner.class" >> $@
- $(ECHO) "sun/security/provider/Sun.class" >> $@
- $(ECHO) "sun/security/rsa/SunRsaSign.class" >> $@
- $(ECHO) "sun/security/ssl/" >> $@
- $(ECHO) "com/sun/net/ssl/internal/ssl/" >> $@
- $(ECHO) "javax/crypto/" >> $@
- $(ECHO) "sun/security/internal/" >> $@
- $(ECHO) "com/sun/crypto/provider/" >> $@
- $(ECHO) "META-INF/services/com.sun.tools.attach.spi.AttachProvider" >> $@
- $(ECHO) "com/sun/tools/attach/" >> $@
- $(ECHO) "org/relaxng/datatype/" >> $@
- $(ECHO) "com/sun/codemodel/" >> $@
- $(ECHO) "com/sun/xml/internal/dtdparser/" >> $@
- $(ECHO) "com/sun/xml/internal/rngom/" >> $@
- $(ECHO) "com/sun/xml/internal/xsom/" >> $@
- $(ECHO) "com/sun/tools/script/shell/" >> $@
- $(ECHO) "sun/tools/attach/" >> $@
- $(ECHO) "sun/tools/jstack/" >> $@
- $(ECHO) "sun/tools/jinfo/" >> $@
- $(ECHO) "sun/tools/jmap/" >> $@
-ifndef OPENJDK
-ifndef JAVASE_EMBEDDED
- $(ECHO) "com/oracle/jrockit/jfr/" >> $@
- $(ECHO) "com/oracle/jrockit/jfr/client/" >> $@
- $(ECHO) "com/oracle/jrockit/jfr/management/" >> $@
- $(ECHO) "oracle/jrockit/jfr/" >> $@
- $(ECHO) "oracle/jrockit/jfr/events/" >> $@
- $(ECHO) "oracle/jrockit/jfr/openmbean/" >> $@
- $(ECHO) "oracle/jrockit/jfr/parser/" >> $@
- $(ECHO) "oracle/jrockit/jfr/settings/" >> $@
- $(ECHO) "oracle/jrockit/jfr/tools/" >> $@
- $(ECHO) "jdk/jfr/" >> $@
-endif
-endif
-
-
-# File order list for rt.jar
-# - sun.applet is included, till hotjava stops relying on it.
-# - sun.tools.jar is included, needs cleanup.
-#
-REORDER_TEMPDIR=$(ABS_TEMPDIR)/reorder
-TOTAL_JAR_FILELIST=$(REORDER_TEMPDIR)/file_list
-
-JARFILELISTS_TEMPDIR=$(ABS_TEMPDIR)/jarfilelists
-RT_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/rt_jar_list
-RES_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/resources_jar_list
-
-JARREORDER_JARFILE = $(ABS_BUILDTOOLJARDIR)/jarreorder.jar
-
-$(TOTAL_JAR_FILELIST): $(JARREORDER_JARFILE) $(NOT_RT_JAR_LIST)
- $(prep-target)
- $(RM) $@.temp
- ($(CD) $(CLASSBINDIR) && \
- $(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \
- -o $@.temp $(ABS_LIBDIR)/classlist $(NOT_RT_JAR_LIST) . )
- $(MV) $@.temp $@
- @($(CD) $(CLASSBINDIR) && $(java-vm-cleanup))
-
-# Create jfr.jar
-JFR_JAR=
-ifndef OPENJDK
-ifndef JAVASE_EMBEDDED
-JFR_JAR=$(ABS_TEMPDIR)/jfr-orig.jar
-$(JFR_JAR): $(OTHER_JAR_MANIFEST_FILE)
- $(prep-target)
- $(CD) $(CLASSBINDIR) && \
- $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \
- $(JFR_CLASSES_DIRS) $(BOOT_JAR_JFLAGS)
- @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
-endif
-endif
-
-# Create the rt.jar file list & non-class files list
-
-JARSPLIT_JARFILE = $(BUILDTOOLJARDIR)/jarsplit.jar
-
-$(RT_JAR_FILELIST) + $(RES_JAR_FILELIST): \
- $(TOTAL_JAR_FILELIST) $(JARSPLIT_JARFILE)
- @$(RM) $(RT_JAR_FILELIST) $(RES_JAR_FILELIST)
- $(MKDIR) -p $(JARFILELISTS_TEMPDIR)
- $(BOOT_JAVA_CMD) -jar $(JARSPLIT_JARFILE) \
- $(TOTAL_JAR_FILELIST) \
- -o $(RT_JAR_FILELIST) $(RES_JAR_FILELIST)
- @$(java-vm-cleanup)
-
-# Create the manifest file.
-RT_JAR_MANIFEST_FILE=$(ABS_TEMPDIR)/rt_manifest.tmp
-$(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
- $(prep-target)
- $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
- -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
- $(MAINMANIFEST) >> $@
- $(ECHO) >> $@
- $(CAT) $(BEANMANIFEST) >> $@
-
-OTHER_JAR_MANIFEST_FILE=$(ABS_TEMPDIR)/other_manifest.tmp
-$(OTHER_JAR_MANIFEST_FILE): $(MAINMANIFEST)
- $(prep-target)
- $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
- -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
- $(MAINMANIFEST) >> $@
-
-# Create resources.jar containing non-class files
-RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar
-$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(OTHER_JAR_MANIFEST_FILE)
- $(prep-target)
- $(CD) $(CLASSBINDIR) && \
- $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \
- @$(RES_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
- @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
-
-# Create jsse.jar containing SunJSSE implementation classes
-JSSE_JAR=$(ABS_TEMPDIR)/jsse-orig.jar
-$(JSSE_JAR): $(OTHER_JAR_MANIFEST_FILE)
- $(prep-target)
- $(CD) $(CLASSBINDIR) && \
- $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \
- $(JSSE_CLASSES_DIRS) $(BOOT_JAR_JFLAGS)
- @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
-
-# Create sec-bin.zip
-SEC_FILES_ZIP=$(ABS_TEMPDIR)/sec-bin.zip
-sec-files::
- $(prep-target)
- $(RM) $(SEC_FILES_ZIP)
- $(CD) $(OUTPUTDIR) && \
- $(ZIPEXE) -rq9 $(SEC_FILES_ZIP) $(SEC_FILES_DIRS)
- @$(java-vm-cleanup)
-
-# Create sec-windows-bin.zip
-SEC_FILES_WIN_ZIP=$(ABS_TEMPDIR)/sec-windows-bin.zip
-sec-files-win::
-ifeq ($(PLATFORM), windows)
- $(prep-target)
- $(RM) $(SEC_FILES_WIN_ZIP)
- $(CD) $(OUTPUTDIR) && \
- $(ZIPEXE) -rq9 $(SEC_FILES_WIN_ZIP) $(SEC_FILES_WIN_DIRS)
- @$(java-vm-cleanup)
-endif
-
-# Create JGSS files that contains the native Kerberos library
-JGSS_WIN32_FILES_ZIP=$(ABS_TEMPDIR)/jgss-windows-i586-bin.zip
-JGSS_WIN64_FILES_ZIP=$(ABS_TEMPDIR)/jgss-windows-x64-bin.zip
-jgss-files::
-ifeq ($(PLATFORM), windows)
- $(prep-target)
- ifeq ($(ARCH_DATA_MODEL), 32)
- $(RM) $(JGSS_WIN32_FILES_ZIP)
- $(CD) $(OUTPUTDIR) && \
- $(ZIPEXE) -rq9 $(JGSS_WIN32_FILES_ZIP) $(JGSS_FILES_DIRS)
- else
- $(RM) $(JGSS_WIN64_FILES_ZIP)
- $(CD) $(OUTPUTDIR) && \
- $(ZIPEXE) -rq9 $(JGSS_WIN64_FILES_ZIP) $(JGSS_FILES_DIRS)
- endif
- @$(java-vm-cleanup)
-endif
-
-# Create rt.jar
-RT_JAR=$(ABS_TEMPDIR)/rt-orig.jar
-$(RT_JAR): $(RT_JAR_FILELIST) $(RT_JAR_MANIFEST_FILE)
- $(prep-target)
- $(CD) $(CLASSBINDIR) && \
- $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(RT_JAR_MANIFEST_FILE) $@ \
- @$(RT_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
- @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
-
-# Meta-index construction to make core class loaders lazier
-
-BUILDMETAINDEX_JARFILE = $(ABS_BUILDTOOLJARDIR)/buildmetaindex.jar
-
-######################################################
-# JRE Image
-######################################################
-
-initial-image-jre-setup:
- $(RM) -r $(JRE_IMAGE_DIR)
- $(MKDIR) -p $(JRE_IMAGE_DIR)
-
-# 64-bit solaris jre image contains only the 64-bit add-on files.
-initial-image-jre-sol64:: initial-image-jre-setup
- @# Use tar instead of cp to preserve the symbolic links
- for dir in bin lib ; do \
- ( $(CD) $(OUTPUTDIR) && \
- $(TAR) cf - `$(FIND) $$dir -name '$(ARCH)' -print` | \
- ($(CD) $(JRE_IMAGE_DIR) && $(TAR) xf -) ) ; \
- done
- @# Remove some files from the jre area
- for t in $(NOTJRETOOLS) ; do \
- $(RM) $(JRE_IMAGE_DIR)/bin$(ISA_DIR)/$$t ; \
- done
- for l in $(NOTJRELIBS) ; do \
- $(RM) $(JRE_IMAGE_DIR)/lib/$$l ; \
- done
- $(RM) `$(FIND) $(JRE_IMAGE_DIR)/lib -name 'orb.idl'`
- $(RM) `$(FIND) $(JRE_IMAGE_DIR)/lib -name 'ir.idl'`
-
-# Construct an initial jre image (initial jdk jre) no trimming or stripping
-# See "initial-image-jdk-setup" for an explanation of the rm of
-# drive names like C:
-initial-image-jre:: initial-image-jre-setup \
- $(JRE_DOCFILES) \
- $(RT_JAR) $(RESOURCES_JAR) $(JSSE_JAR) $(JFR_JAR) \
- $(BUILDMETAINDEX_JARFILE)
- @# Copy in bin directory
-ifeq ($(USING_MSYS),true)
- # No cpio in MinGW/MSYS
- $(CD) $(OUTPUTDIR) && $(TAR) -cf - bin | ($(CD) $(JRE_IMAGE_DIR) && $(TAR) -xpf -)
-else
- $(CD) $(OUTPUTDIR) && $(FIND) bin -depth | $(CPIO) -pdum $(JRE_IMAGE_DIR)
-endif
- @# CTE plugin security change require new empty directory lib/applet
- $(MKDIR) -p $(JRE_IMAGE_DIR)/lib/applet
- @# Copy in lib directory
-ifeq ($(USING_MSYS),true)
- # No cpio in MinGW/MSYS
- $(CD) $(OUTPUTDIR) && $(TAR) -cf - lib | ($(CD) $(JRE_IMAGE_DIR) && $(TAR) -xpf -)
-else
- $(CD) $(OUTPUTDIR) && $(FIND) lib -depth | $(CPIO) -pdum $(JRE_IMAGE_DIR)
-endif
-
- ifeq ($(USING_CYGWIN),true)
- $(RM) -rf $(JRE_IMAGE_DIR)/[A-Za-z]:
- $(RM) -rf $(OUTPUTDIR)/[A-Za-z]:
- endif
- @# Make sure all directories are read/execute for everyone
- $(CHMOD) a+rx `$(FIND) $(JRE_IMAGE_DIR) -type d`
- @# Remove some files from the jre area
- for t in $(NOTJRETOOLS) ; do \
- $(RM) $(JRE_IMAGE_DIR)/bin$(ISA_DIR)/$$t ; \
- done
- for l in $(NOTJRELIBS) ; do \
- $(RM) $(JRE_IMAGE_DIR)/lib/$$l ; \
- done
- @# Remove orb.idl and ir.idl from jre
- $(FIND) $(JRE_IMAGE_DIR)/lib -name 'orb.idl' -exec $(RM) \{} \;
- $(FIND) $(JRE_IMAGE_DIR)/lib -name 'ir.idl' -exec $(RM) \{} \;
- @# Copy in rt.jar & resources.jar file
- $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
- $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
- $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
-ifneq ($(JFR_JAR),)
- $(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
-endif
- @# Generate meta-index to make boot and extension class loaders lazier
- $(CD) $(JRE_IMAGE_DIR)/lib && \
- $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
- -o meta-index *.jar
- @$(CD) $(JRE_IMAGE_DIR)/lib && $(java-vm-cleanup)
- $(CD) $(JRE_IMAGE_DIR)/lib/ext && \
- $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
- -o meta-index *.jar
- @$(CD) $(JRE_IMAGE_DIR)/lib/ext && $(java-vm-cleanup)
-ifeq ($(PLATFORM), macosx)
- @#install jobjc, apple mac only
- $(CP) $(OUTPUTDIR)/JObjC.build/JObjC.jar $(JRE_IMAGE_DIR)/lib/JObjC.jar
-endif
-ifeq ($(PLATFORM), windows)
- @# Remove certain *.lib files
- $(CD) $(JRE_IMAGE_DIR)/lib && \
- $(RM) java.$(LIB_SUFFIX) jvm.$(LIB_SUFFIX) \
- awt.$(LIB_SUFFIX) jawt.$(LIB_SUFFIX)
- ifeq ($(ARCH_DATA_MODEL), 32)
- @# The Java Kernel JRE image ships with a special VM. It is not included
- @# in the full JRE image, so remove it. Also, is it only for 32-bit windows.
- $(CD) $(JRE_IMAGE_DIR)/bin && $(RM) -r kernel
- endif
-endif # Windows
-ifneq ($(PLATFORM), windows)
- $(call copy-man-pages,$(JRE_IMAGE_DIR),$(JRE_MAN_PAGES))
-endif # !windows
-
-# Trim out any extra files not for the jre shipment but wanted in the jdk jre.
-# (Note the jdk WILL want the jre image before this trimming)
-# Removes server VM on Windows 32bit.
-# Remove certain shared libraries that should not be in the jre image
-# but should be in the jdk jre image.
-trim-image-jre::
-ifeq ($(PLATFORM), windows)
- ifeq ($(ARCH_DATA_MODEL), 32)
- $(RM) -r $(JRE_IMAGE_DIR)/bin/server
- endif
- ifdef NOTJRE_SHARED_LIBS
- for l in $(NOTJRE_SHARED_LIBS) ; do \
- $(RM) $(JRE_IMAGE_DIR)/bin/$$l ; \
- done ;
- endif
-else # PLATFORM
- ifdef NOTJRE_SHARED_LIBS
- for l in $(NOTJRE_SHARED_LIBS) ; do \
- $(RM) $(JRE_IMAGE_DIR)/lib/$(LIBARCH)/$$l ; \
- done ;
- endif
-endif # PLATFORM
-
-# Get list of all binary (COFF or Elf) files in the jre
-JRE_BIN_LIST=$(TEMPDIR)/jre-bin-files.list
-$(JRE_BIN_LIST):
- $(RM) $@
-ifeq ($(PLATFORM), windows)
- $(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*.exe \
- -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@
-else
- $(FIND) $(JRE_IMAGE_DIR)/lib -type f -name \*.$(LIB_SUFFIX) >> $@
-# The FILE command reports .debuginfo files as "ELF", but we don't want
-# those files in the JRE_BIN_LIST file. EXE_SUFFIX is empty on non-Windows.
- $(FILE) `$(FIND) $(JRE_IMAGE_DIR)/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \
- | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
-endif
-
-# Post process the image (strips and mcs on Elf files we are shipping)
-# (Note the jdk WILL want the jre image before this processing)
-process-image-jre:: $(JRE_BIN_LIST)
-ifneq ($(POST_STRIP_PROCESS), )
- @for f in `$(CAT) $(JRE_BIN_LIST)`; do \
- $(CHMOD) u+w $${f}; \
- $(ECHO) $(POST_STRIP_PROCESS) $${f}; \
- $(POST_STRIP_PROCESS) $${f}; \
- $(CHMOD) go-w $${f}; \
- done
-endif
-ifneq ($(POST_MCS_PROCESS), )
- @for f in `$(CAT) $(JRE_BIN_LIST)`; do \
- $(CHMOD) u+w $${f}; \
- $(ECHO) $(POST_MCS_PROCESS) $${f}; \
- $(POST_MCS_PROCESS) $${f}; \
- $(CHMOD) go-w $${f}; \
- done
-endif
- @for f in `$(CAT) $(JRE_BIN_LIST)`; do \
- $(call binary_file_verification,$${f}); \
- done
- $(RM) $(JRE_BIN_LIST)
-
-######################################################
-# JDK Image
-######################################################
-# Note: cpio ($(CPIO)) sometimes leaves directories without rx access.
-
-# REMIND: the $(RM) calls for patterns like c:, d: following $(CPIO)
-# are because the 1.7.x versions of cygwin's cpio command drops these
-# in the working directory if the output path begins with that pattern
-# The one for the output jre subdirectory gets there because cpio sees its
-# own dropping in the input jre subdirectory. Need to remove both of these.
-# We can remove these RM's if someone figures out how to stop cpio from
-# leaving these there.
-# Note that its a real problem not because this directory can end up in the
-# bundle (I think it won't since it not in bin or lib and those are the
-# only places from which we copy everything), but because the presence
-# of this file causes cygwin's find to bomb out, thus breaking the build
-# in "install".
-
-initial-image-jdk-setup:
- $(RM) -r $(JDK_IMAGE_DIR)
- $(MKDIR) -p $(JDK_IMAGE_DIR)/jre
-ifeq ($(USING_MSYS),true)
- ($(CD) $(JRE_IMAGE_DIR) && $(TAR) -cf - . \
- | ($(CD) $(JDK_IMAGE_DIR)/jre && $(TAR) -xpf -))
-else
- ($(CD) $(JRE_IMAGE_DIR) && $(FIND) . -depth -print \
- | $(CPIO) -pdum $(JDK_IMAGE_DIR)/jre )
-endif
- ifeq ($(USING_CYGWIN),true)
- $(RM) -rf $(JRE_IMAGE_DIR)/[A-Za-z]:
- $(RM) -rf $(JDK_IMAGE_DIR)/jre/[A-Za-z]:
- endif
- $(RM) -rf $(JDK_IMAGE_DIR)/jre/man
- $(CHMOD) a+rx `$(FIND) $(JDK_IMAGE_DIR) -type d`
-
-initial-image-jdk64-bindemos:
- for dir in bin demo ; do \
- ( $(CD) $(OUTPUTDIR) && \
- $(TAR) cf - `$(FIND) $$dir -name '$(LIBARCH)' -print` | \
- ($(CD) $(JDK_IMAGE_DIR) && $(TAR) xf -) ) ; \
- done
-
-# Solaris 64 bit image is special
-initial-image-jdk-sol64:: initial-image-jdk-setup \
- initial-image-jdk64-bindemos
-
-# DB files to add
-ifdef OPENJDK
-
-initial-image-jdk-db:
-
-else
-
-# Create the list of db *.zip files to bundle with jdk
-ABS_DB_PATH :=$(call FullPath,$(CLOSED_SHARE_SRC)/db)
-DB_BINARY_BUNDLE = $(shell $(LS) $(ABS_DB_PATH)/db-derby-*-bin.zip 2>/dev/null)
-
-# Java DB image. Move the Java DB demo directory into the JDK's demo
-# dir and in the process, rename it to db. Also remove index.html,
-# since it presumes docs are co-located, javadoc, docs and tests and
-# update the copyright year of the JDK READMEs to that of the release.
-initial-image-jdk-db: $(DB_BINARY_BUNDLE)
- $(MKDIR) -p $(JDK_IMAGE_DIR)/db
- $(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $(DB_BINARY_BUNDLE)
- $(CD) $(JDK_IMAGE_DIR)/db && $(MV) db-derby-*-bin/* .
- $(CD) $(JDK_IMAGE_DIR)/db && $(RM) -r db-derby-*-bin
- $(CAT) $(ABS_DB_PATH)/README-JDK.html | \
- $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > \
- $(JDK_IMAGE_DIR)/db/README-JDK.html
- $(CAT) $(ABS_DB_PATH)/3RDPARTY | \
- $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > \
- $(JDK_IMAGE_DIR)/db/3RDPARTY
-ifndef NO_DEMOS
- $(RM) -r $(DEMODIR)/db
- $(MV) $(JDK_IMAGE_DIR)/db/demo $(DEMODIR)/db
- $(CAT) $(ABS_DB_PATH)/README-JDK-DEMOS.html | \
- $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > \
- $(DEMODIR)/db/README-JDK-DEMOS.html
-else
- $(RM) -r $(JDK_IMAGE_DIR)/db/demo
-endif
- @# remove stuff from original distro we don't want
- $(RM) $(JDK_IMAGE_DIR)/db/index.html $(JDK_IMAGE_DIR)/db/KEYS
- $(RM) -r $(JDK_IMAGE_DIR)/db/{docs,javadoc,test}
-endif
-
-# The launcher source files we need for src.zip
-FILES_launcher = $(wildcard $(SHARE_SRC)/bin/*) \
- $(wildcard $(PLATFORM_SRC)/bin/java_md*)
-
-# Standard jdk image
-initial-image-jdk:: initial-image-jdk-setup \
- initial-image-jdk-db \
- $(JDK_DOCFILES) \
- $(JDK_DEMOS_AND_SAMPLES_DOCFILES)
- $(MKDIR) $(JDK_IMAGE_DIR)/lib
- @#
- @# Copy in the jars in lib that only belong in the JDK
- @#
- for l in $(NOTJRELIBS); do \
- if [ -r $(LIBDIR)/$$l ]; then \
- $(CP) $(LIBDIR)/$$l $(JDK_IMAGE_DIR)/lib; \
- fi; \
- done
- ifeq ($(PLATFORM), windows)
- @#
- @# lib/
- @#
- $(CP) $(LIBDIR)/$(LIB_PREFIX)jvm.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
- $(CP) $(LIBDIR)/$(LIB_PREFIX)jawt.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
- @#
- @# bin/
- @#
- @# copy all EXE files and only certain DLL files from BINDIR
- $(MKDIR) -p $(JDK_IMAGE_DIR)/bin
- $(CP) $(BINDIR)/*$(EXE_SUFFIX) $(JDK_IMAGE_DIR)/bin
- $(CP) $(BINDIR)/jli.$(LIBRARY_SUFFIX) $(JDK_IMAGE_DIR)/bin
- ifeq ($(COMPILER_VERSION), VS2010)
- $(CP) $(BINDIR)/msvc*100.$(LIBRARY_SUFFIX) $(JDK_IMAGE_DIR)/bin
- endif
- else # PLATFORM
- @#
- @# bin/
- @#
- ($(CD) $(BINDIR)/.. && $(TAR) cf - \
- `$(FIND) bin \( -type f -o -type l \) -print `) | \
- ($(CD) $(JDK_IMAGE_DIR) && $(TAR) xf -)
- endif # PLATFORM
- @#
- @# files that might not exist need to be touched.
- @#
- $(TOUCH) $(CLASSBINDIR)/META-INF/services/com.sun.tools.internal.xjc.Plugin
- @#
- @# lib/tools.jar
- @#
- $(CD) $(CLASSBINDIR) && \
- $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS_NOMANIFEST) $(ABS_LIBDIR)/tools.jar \
- $(TOOLS) $(BOOT_JAR_JFLAGS)
- @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
- $(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
- @#
- @# lib/ct.sym
- @#
- $(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym
- $(JAVAC_CMD) -XDprocess.packages -proc:only \
- -processor com.sun.tools.javac.sym.CreateSymbols \
- -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
- -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
- -Acom.sun.tools.javac.sym.Profiles=$(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \
- $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
- $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS_NOMANIFEST) $(LIBDIR)/ct.sym \
- -C $(OUTPUTDIR)/symbols META-INF $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
- $(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym
- @#
- @# CORBA supported orb.idl and ir.idl should be copied to lib
- @#
- $(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
- $(CP) $(LIBDIR)/ir.idl $(JDK_IMAGE_DIR)/lib/ir.idl
- ifeq ($(PLATFORM), linux)
- @#
- @# on Linux copy jexec from jre/lib to /lib
- @#
- $(CP) $(LIBDIR)/jexec $(JDK_IMAGE_DIR)/lib/jexec
- endif # PLATFORM
- @#
- @# src.zip
- @#
- $(MKDIR) -p $(JDK_IMAGE_DIR)/src
- @#
- @# The '*-*' pattern in the find command excludes files named with dashes,
- @# such as the java.nio templates for generated classes
- @#
- @# The Linux 'tar' command cannot handle the huge command line argument
- @# generated by the more efficient solaris/windows method of copying files.
- @# So for Linux, make use of the -T option (like Solaris' -I option) of
- @# obtaining the list of files from a file. MKS tar has no such option.
-
- ifneq (,$(findstring $(PLATFORM), linux macosx))
- for d in $(SOURCE_DIRS); do \
- $(RM) $(ABS_TEMPDIR)/src-files.list; \
- ($(CD) $$d && \
- for sd in $(SOURCES) ; do \
- if [ -d $$sd ] ; then \
- $(FIND) $$sd $(SOURCE_FILES_filter) \
- -name '*.java' -print \
- >> $(ABS_TEMPDIR)/src-files.list ; \
- fi; \
- done ; \
- ) ; \
- if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \
- ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \
- | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
- fi; \
- done
- else
- for d in $(SOURCE_DIRS); do \
- $(RM) $(ABS_TEMPDIR)/src-files.list; \
- ($(CD) $$d && \
- for sd in $(SOURCES) ; do \
- if [ -d $$sd ] ; then \
- $(FIND) $$sd $(SOURCE_FILES_filter) \
- -name '*.java' -print \
- >> $(ABS_TEMPDIR)/src-files.list ; \
- fi; \
- done ; \
- ) ; \
- if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \
- ($(CD) $$d && $(TAR) cf - `$(CAT) $(ABS_TEMPDIR)/src-files.list`) \
- | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
- fi; \
- done
- endif
- $(RM) $(ABS_TEMPDIR)/src-files.list
- $(CHMOD) -R +w $(JDK_IMAGE_DIR)/src
- $(MKDIR) -p $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(FILES_launcher) $(JDK_IMAGE_DIR)/src/launcher
- $(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
- $(RM) -r $(JDK_IMAGE_DIR)/src
- @#
- @# demo, include
- @#
-ifndef NO_DEMOS
- $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
-endif
-ifndef NO_SAMPLES
- $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
-endif
- $(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR)
- @#
- @# Swing BeanInfo generation
- @#
- $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
-ifneq ($(PLATFORM), windows)
- $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
-endif # !windows
-
-# Trim out files we don't want to ship
-trim-image-jdk::
- @# Remove tools that should not be part of SDK.
- for t in $(NOTJDKTOOLS); do \
- $(RM) $(JDK_IMAGE_DIR)/bin/$${t}$(EXE_SUFFIX); \
- done
-
-# Get list of binary (COFF or Elf) files in the jdk
-JDK_BIN_LIST=$(TEMPDIR)/jdk-bin-files.list
-$(JDK_BIN_LIST):
-ifeq ($(PLATFORM), windows)
- $(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f -name \*.exe \
- -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@
- $(FIND) $(JDK_IMAGE_DIR)/bin -type f -name \*.exe \
- -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" >> $@
-else
- $(RM) $@
- $(FIND) $(JDK_IMAGE_DIR)/jre/lib -type f -name \*.$(LIB_SUFFIX) >> $@
-# The FILE command reports .debuginfo files as "ELF", but we don't want
-# those files in the JDK_BIN_LIST file. EXE_SUFFIX is empty on non-Windows.
- $(FILE) `$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \
- | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
- file `$(FIND) $(JDK_IMAGE_DIR)/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \
- | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
-endif
-
-# Post process the image (strips and mcs on files we are shipping)
-process-image-jdk:: $(JDK_BIN_LIST)
-ifneq ($(POST_STRIP_PROCESS), )
- @for f in `$(CAT) $(JDK_BIN_LIST)`; do \
- $(CHMOD) u+w $${f}; \
- $(ECHO) $(POST_STRIP_PROCESS) $${f}; \
- $(POST_STRIP_PROCESS) $${f}; \
- $(CHMOD) go-w $${f}; \
- done
-endif
-ifneq ($(POST_MCS_PROCESS), )
- @for f in `$(CAT) $(JDK_BIN_LIST)`; do \
- $(CHMOD) u+w $${f}; \
- $(ECHO) $(POST_MCS_PROCESS) $${f}; \
- $(POST_MCS_PROCESS) $${f}; \
- $(CHMOD) go-w $${f}; \
- done
-endif
- @for f in `$(CAT) $(JDK_BIN_LIST)`; do \
- $(call binary_file_verification,$${f}); \
- done
- $(RM) $(JDK_BIN_LIST)
-
-###################################################################
-# What did we build
-###################################################################
-
-# The jdk text info file that lives at the root of the install image.
-
-JDK_INFO_FILE = $(JDK_IMAGE_DIR)/release
-JRE_INFO_FILE = $(JRE_IMAGE_DIR)/release
-
-# Common way to emit a line into the release or info file
-define info-file-item # name value
-$(PRINTF) '%s="%s"\n' $1 $2 >> $@
-endef
-
-# Values to emit
-MINIMUM_OS_NAME := $(REQUIRED_OS_NAME)
-MINIMUM_OS_VERSION := $(REQUIRED_OS_VERSION)
-MINIMUM_OS_ARCH := $(ARCH)
-ALL_SOURCE_TIPS = $(shell \
- if [ -f $(SOURCE_TIPS) ] ; then \
- $(CAT) $(SOURCE_TIPS) ; \
- fi)
-
-$(JDK_INFO_FILE): FRC
- $(prep-target)
- $(call info-file-item, "JAVA_VERSION", "$(THIS_JDK_VERSION)")
- $(call info-file-item, "OS_NAME", "$(MINIMUM_OS_NAME)")
- $(call info-file-item, "OS_VERSION", "$(MINIMUM_OS_VERSION)")
- $(call info-file-item, "OS_ARCH", "$(MINIMUM_OS_ARCH)")
- $(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)")
-
-# Create release file to identify this image
-identify-image-jdk:: $(JDK_INFO_FILE)
-
-$(JRE_INFO_FILE): FRC
- $(prep-target)
- $(call info-file-item, "JAVA_VERSION", "$(THIS_JDK_VERSION)")
- $(call info-file-item, "OS_NAME", "$(MINIMUM_OS_NAME)")
- $(call info-file-item, "OS_VERSION", "$(MINIMUM_OS_VERSION)")
- $(call info-file-item, "OS_ARCH", "$(MINIMUM_OS_ARCH)")
- $(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)")
-
-# Create release file to identify this image
-identify-image-jre:: $(JRE_INFO_FILE)
-
-###################################################################
-# What do we compare against
-###################################################################
-
-# The temporary files and areas created
-TEMP_PREV_JRE_BASE_DIR=$(TEMPDIR)/previous_jre
-TEMP_PREV_JDK_BASE_DIR=$(TEMPDIR)/previous_jdk
-TEMP_PREV_JRE_COMPARISON=$(TEMP_PREV_JRE_BASE_DIR)/previous_jre_comparison.txt
-TEMP_PREV_JDK_COMPARISON=$(TEMP_PREV_JDK_BASE_DIR)/previous_jdk_comparison.txt
-TEMP_PREV_JRE_IMAGE_DIR=$(TEMP_PREV_JRE_BASE_DIR)/jre$(PREVIOUS_JDK_VERSION)
-TEMP_PREV_JDK_IMAGE_DIR=$(TEMP_PREV_JDK_BASE_DIR)/jdk$(PREVIOUS_JDK_VERSION)
-
-# unbundle(sourcedir,bundlename,destdir)
-# logic is slightly different if a .tar.gz file (linux)
-define unbundle
-$(RM) -r $3
-$(MKDIR) -p $3
-$(CP) $1 $3
-if [ "`$(BASENAME) $2 .gz`" != "$2" ] ; then \
- ( $(CD) $3 && ( $(GUNZIP) -dc $2 | $(TAR) xf - ) && $(RM) $2 ); \
-else \
- ( $(CD) $3 && $(TAR) xf $2 && $(RM) $2 ); \
-fi
-( $(CD) $3 && $(RM) $2 )
-endef
-
-# In general, ignore the fastdebug tree, and changes in the demo and sample area
-COMPARE_FILTER = | $(EGREP) -v /fastdebug/ | $(EGREP) -v /demo/ | $(EGREP) -v /sample/
-
-# If a previuous image is provided, no need to install it.
-ifdef PREVIOUS_RELEASE_IMAGE
-
- # Just use the pre-installed images
- PREV_JRE_IMAGE_DIR=$(PREVIOUS_RELEASE_IMAGE)/jre
- PREV_JDK_IMAGE_DIR=$(PREVIOUS_RELEASE_IMAGE)
-
-else
-
- # Use the temp images we will create
- PREV_JRE_IMAGE_DIR=$(TEMP_PREV_JRE_IMAGE_DIR)
- PREV_JDK_IMAGE_DIR=$(TEMP_PREV_JDK_IMAGE_DIR)
-
-# Force the installation in this case
-compare-image:: install-previous-sanity install-previous-jre install-previous-jdk
-
-# Unbundle the jre
-$(TEMP_PREV_JRE_IMAGE_DIR)/bin/java$(EXE_SUFFIX): $(PREVIOUS_JRE_BUNDLE)
- $(call unbundle,$(PREVIOUS_JRE_BUNDLE),$(PREVIOUS_JRE_FILE),$(TEMP_PREV_JRE_BASE_DIR))
- $(TOUCH) $@
-
-# Unbundle the jdk
-$(TEMP_PREV_JDK_IMAGE_DIR)/bin/java$(EXE_SUFFIX): $(PREVIOUS_JDK_BUNDLE)
- $(call unbundle,$(PREVIOUS_JDK_BUNDLE),$(PREVIOUS_JDK_FILE),$(TEMP_PREV_JDK_BASE_DIR))
- $(TOUCH) $@
-
-endif
-
-# Make sure all images have a java in them (used as the touch file)
-install-previous-sanity:
- @if [ ! -f $(PREVIOUS_JRE_BUNDLE) ]; then \
- $(ECHO) "ERROR: You do not have access to the previous java release jre bundles. \n" \
- " Please check your access to \n" \
- " $(PREVIOUS_JRE_BUNDLE) \n" \
- " and/or check your value of ALT_PREVIOUS_RELEASE_PATH or ALT_PREVIOUS_JRE_FILE \n" \
- " This will affect you if you build the images target. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @if [ ! -f $(PREVIOUS_JDK_BUNDLE) ]; then \
- $(ECHO) "ERROR: You do not have access to the previous java release sdk bundles. \n" \
- " Please check your access to \n" \
- " $(PREVIOUS_sdk_BUNDLE) \n" \
- " and/or check your value of ALT_PREVIOUS_RELEASE_PATH or ALT_PREVIOUS_JDK_FILE. \n" \
- " This will affect you if you build the images target. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-install-previous-jre: $(PREV_JRE_IMAGE_DIR)/bin/java$(EXE_SUFFIX)
-install-previous-jdk: $(PREV_JDK_IMAGE_DIR)/bin/java$(EXE_SUFFIX)
-
-# Create the jre comparison report
-$(TEMP_PREV_JRE_COMPARISON): install-previous-jre $(DIRDIFF_JARFILE)
- $(prep-target)
- $(BOOT_JAVA_CMD) -jar $(DIRDIFF_JARFILE) \
- $(PREV_JRE_IMAGE_DIR) $(JRE_IMAGE_DIR) | $(SORT) > $@
- @$(java-vm-cleanup)
-
-# Create the jdk comparison report
-$(TEMP_PREV_JDK_COMPARISON): install-previous-jdk $(DIRDIFF_JARFILE)
- $(prep-target)
- $(BOOT_JAVA_CMD) -jar $(DIRDIFF_JARFILE) \
- $(PREV_JDK_IMAGE_DIR) $(JDK_IMAGE_DIR) | $(SORT) > $@
- @$(java-vm-cleanup)
-
-# Clean up names in the messages printed out
-CAT_FILTER = $(SED) -e "s|$(JDK_IMAGE_DIR)|JDK_IMAGE|g" \
- -e "s|$(JRE_IMAGE_DIR)|JRE_IMAGE|g"
-
-# Report on the jre image comparison
-compare-image-jre: $(TEMP_PREV_JRE_COMPARISON)
- @$(ECHO) "JRE Image Comparison to version $(PREVIOUS_JDK_VERSION)"
- @$(ECHO) " Previous: $(PREV_JRE_IMAGE_DIR)"
- @$(ECHO) " Current: $(JRE_IMAGE_DIR)"
- @$(CAT) $< $(COMPARE_FILTER) | $(CAT_FILTER)
- ( $(ECHO) " " ; $(CAT) $< | $(CAT_FILTER) ; $(ECHO) " " ) >> $(WARNING_FILE)
-
-# Report on the jdk image comparison
-compare-image-jdk: $(TEMP_PREV_JDK_COMPARISON)
- @$(ECHO) "JDK Image Comparison to version $(PREVIOUS_JDK_VERSION)"
- @$(ECHO) " Previous: $(PREV_JDK_IMAGE_DIR)"
- @$(ECHO) " Current: $(JDK_IMAGE_DIR)"
- $(CAT) $< $(COMPARE_FILTER) | $(CAT_FILTER)
- ( $(ECHO) " " ; $(CAT) $< | $(CAT_FILTER) ; $(ECHO) " " ) >> $(WARNING_FILE)
-
-# Do both image comparisons
-compare-image:: compare-image-jre compare-image-jdk
-
-# Clean up any temp images and reports
-compare-image-clobber:
- $(RM) -r $(TEMP_PREV_JRE_BASE_DIR)
- $(RM) -r $(TEMP_PREV_JDK_BASE_DIR)
-
-######################################################
-# clobber
-######################################################
-images-clobber::
- $(RM) -r $(REORDER_TEMPDIR)
- $(RM) -r $(JARFILELISTS_TEMPDIR)
-ifeq ($(ARCH_DATA_MODEL), 32)
- $(CD) javax/swing/beaninfo && $(MAKE) swingbeans.clobber
- $(RM) -r $(CLASSBINDIR)/META-INF
- $(RM) $(TEMPDIR)/tmp.jar
-endif
-ifeq ($(PLATFORM), linux)
- $(RM) -r $(OUTPUTDIR)/$(ARCH)
-endif
-ifeq ($(PLATFORM), windows)
- $(RM) $(TEMPDIR)/rebase.input
-endif
- $(RM) -r $(JDK_IMAGE_DIR)
- $(RM) -r $(JRE_IMAGE_DIR)
-
-images images-clobber::
- @$(ECHO) ">>>Finished making "$@" @ `$(DATE)` ..."
- @$(java-vm-cleanup)
-
-.PHONY: images image-jre image-jdk \
- initial-image-jre initial-image-jdk \
- initial-image-jre-sol64 initial-image-jdk-sol64 \
- initial-image-jdk-setup \
- initial-image-jdk-db \
- initial-image-jdk64-bindemos \
- initial-image-jre-setup \
- trim-image-jre trim-image-jdk \
- process-image-jre process-image-jdk \
- identify-image-jre identify-image-jdk \
- install-previous-jre install-previous-jdk \
- compare-image-jre compare-image-jdk \
- compare-image compare-image-clobber \
- images-clobber
-
-# Force rule
-FRC:
diff --git a/jdk/make/common/Rules.gmk b/jdk/make/common/Rules.gmk
deleted file mode 100644
index 4136a5d..0000000
--- a/jdk/make/common/Rules.gmk
+++ /dev/null
@@ -1,355 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-#
-# Rules shared by all Java makefiles.
-#
-# Used to apply to source file $<, checks code conventions, issues warnings.
-define check-conventions
- if [ "$(CONVENTION_WATCH)" = "true" ] ; then \
- if [ "`$(CAT) -n -v -t $< | $(EGREP) -v '\@\(\#\)' | $(EGREP) '\^[MLI]'`" != "" ] ; then \
- $(ECHO) "WARNING: File contains tabs, ^M, or ^L characters: $<"; \
- if [ "$(CONVENTION_DETAILS)" = "true" ] ; then \
- $(CAT) -n -v -t $< | $(EGREP) -v '\@\(\#\)' | $(EGREP) '\^[MLI]' ; \
- fi; \
- fi; \
- fi
-endef
-
-# Make sure the default rule is all
-rules_default_rule: all
-
-#
-# Directory set up. (Needed by deploy workspace)
-#
-$(CLASSDESTDIR) $(CLASSHDRDIR) $(OBJDIR) $(OUTPUTDIR) $(BINDIR) $(LIBDIR) $(LIBDIR)/$(LIBARCH) $(TEMPDIR) $(EXTDIR):
- $(MKDIR) -p $@
-
-#
-# All source tree areas for java/properties files (a few may be closed)
-#
-ifeq ($(PLATFORM), macosx)
- ifdef OPENJDK
- ALL_CLASSES_SRC = $(call JavaSrcDirList,,classes)
- else
- ALL_CLASSES_SRC = \
- $(CLOSED_SHARE_SRC)/classes $(CLOSED_PLATFORM_SRC)/classes \
- $(call JavaSrcDirList,,classes)
- endif
-else
- ifdef OPENJDK
- ALL_CLASSES_SRC = $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
- else
- ALL_CLASSES_SRC = \
- $(CLOSED_SHARE_SRC)/classes $(CLOSED_PLATFORM_SRC)/classes \
- $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
- endif
-endif
-
-#
-# If AUTO_FILES_PROPERTIES_DIRS used, automatically find properties files
-#
-ifdef AUTO_FILES_PROPERTIES_DIRS
- AUTO_FILES_PROPERTIES_FILTERS1 = $(SCM_DIRs) ',*'
- AUTO_FILES_PROPERTIES_FILTERS1 += $(AUTO_PROPERTIES_PRUNE)
- FILES_properties_find_filters1 = $(AUTO_FILES_PROPERTIES_FILTERS1:%=-name % -prune -o)
- FILES_properties_auto1 := \
- $(shell \
- for dir in $(ALL_CLASSES_SRC) ; do \
- if [ -d $$dir ] ; then \
- ( $(CD) $$dir; \
- for sdir in $(AUTO_FILES_PROPERTIES_DIRS); do \
- if [ -d $$sdir ] ; then \
- $(FIND) $$sdir $(FILES_properties_find_filters1) \
- -name '*.properties' -print ; \
- fi ; \
- done \
- ); \
- fi; \
- done \
- )
-else
- FILES_properties_auto1 =
-endif # AUTO_FILES_PROPERTIES_DIRS
-
-# Add any automatically found properties files to the properties file list
-FILES_properties += $(FILES_properties_auto1)
-
-#
-# Get Resources help
-#
-include $(JDK_TOPDIR)/make/common/internal/Resources.gmk
-
-#
-# Compiling .java files.
-#
-
-#
-# Automatically add to FILES_java if AUTO_FILES_JAVA_DIRS is defined
-#
-# There are two basic types of sources, normal source files and the
-# generated ones. The Normal sources will be located in:
-# $(ALL_CLASSES_SRC)
-# The generated sources, which might show up late to dinner, are at:
-# $(GENSRCDIR)
-# and since they could be generated late, we need to be careful that
-# we look for these sources late and not use the ':=' assignment which
-# might miss their generation.
-
-ifdef AUTO_FILES_JAVA_DIRS
- # Filter out these files or directories
- AUTO_FILES_JAVA_SOURCE_FILTERS1 = $(SCM_DIRs) ',*'
- AUTO_FILES_JAVA_SOURCE_FILTERS2 =
- AUTO_FILES_JAVA_SOURCE_FILTERS1 += $(AUTO_JAVA_PRUNE)
- AUTO_FILES_JAVA_SOURCE_FILTERS2 += $(AUTO_JAVA_PRUNE)
-
- # First list is the normal sources that should always be there,
- # by using the ':=', which means we do this processing once.
- FILES_java_find_filters1 = $(AUTO_FILES_JAVA_SOURCE_FILTERS1:%=-name % -prune -o)
- FILES_java_auto1 := \
- $(shell \
- for dir in $(ALL_CLASSES_SRC) ; do \
- if [ -d $$dir ] ; then \
- ( $(CD) $$dir; \
- for sdir in $(AUTO_FILES_JAVA_DIRS); do \
- if [ -d $$sdir ] ; then \
- $(FIND) $$sdir $(FILES_java_find_filters1) \
- -name '*.java' -print ; \
- fi ; \
- done \
- ); \
- fi; \
- done \
- )
- # Second list is the generated sources that should be rare, but will likely
- # show up late and we need to look for them at the last minute, so we
- # cannot use the ':=' assigment here. But if this gets expanded multiple
- # times, the if tests should make them relatively cheap.
- FILES_java_find_filters2 = $(AUTO_FILES_JAVA_SOURCE_FILTERS2:%=-name % -prune -o)
- FILES_java_auto2 = \
- $(shell \
- for dir in $(GENSRCDIR); do \
- if [ -d $$dir ] ; then \
- ( $(CD) $$dir; \
- for sdir in $(AUTO_FILES_JAVA_DIRS); do \
- if [ -d $$sdir ] ; then \
- $(FIND) $$sdir $(FILES_java_find_filters2) \
- -name '*.java' -print ; \
- fi ; \
- done \
- ); \
- fi; \
- done \
- )
-else
- FILES_java_auto1 =
- FILES_java_auto2 =
-endif
-
-# Add all found java sources to FILES_java macro (if AUTO_FILES_JAVA_DIRS used)
-FILES_java += $(FILES_java_auto1) $(FILES_java_auto2)
-
-# File that will hold java source names that need compiling
-JAVA_SOURCE_LIST=$(TEMPDIR)/.classes.list
-
-# Add a java source to the list
-define add-java-file
-$(ECHO) "$?" >> $(JAVA_SOURCE_LIST)
-$(check-conventions)
-endef
-
-ifdef DEMOS
-$(CLASSDESTDIR)/%.class: $(SOURCEPATH)/%.java
- @$(add-java-file)
-#Redirect zh_HK java files to tmp directory which created from zh_TW
-#$(CLASSDESTDIR)/%_zh_HK.class: $(JDK_L10N_TMP_OUTPUTDIR)/%_zh_HK.java
-# @$(add-java-file)
-else
-
-#
-# Rules for closed files
-#
-# If filenames are duplicated between open/closed workspaces, prefer
-# the closed files.
-#
-# Rule ordering in this Makefile is important: some targets depend
-# on closed files replacing open ones, and thus the closed file rules
-# must be found before the open ones.
-#
-# Don't reorder without consulting teams that depend on this behavior.
-#
-ifndef OPENJDK
-$(CLASSDESTDIR)/%.class: $(CLOSED_PLATFORM_SRC)/classes/%.java
- @$(add-java-file)
-$(CLASSDESTDIR)/%.class: $(CLOSED_SHARE_SRC)/classes/%.java
- @$(add-java-file)
-endif
-
-$(CLASSDESTDIR)/%.class: $(GENSRCDIR)/%.java
- @$(add-java-file)
-
-ifeq ($(PLATFORM), macosx)
-$(CLASSDESTDIR)/%.class: $(JDK_TOPDIR)/src/macosx/classes/%.java
- @$(add-java-file)
-endif
-$(CLASSDESTDIR)/%.class: $(PLATFORM_SRC)/classes/%.java
- @$(add-java-file)
-
-$(CLASSDESTDIR)/%.class: $(SHARE_SRC)/classes/%.java
- @$(add-java-file)
-
-#Redirect zh_HK java files to tmp directory which created from zh_TW
-$(CLASSDESTDIR)/%_zh_HK.class: $(JDK_L10N_TMP_OUTPUTDIR)/%_zh_HK.java
- @$(add-java-file)
-endif
-
-# List of class files needed
-FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
-
-# Got to include exported files.
-FILES_class += $(FILES_export:%.java=$(CLASSDESTDIR)/%.class)
-
-# Construct list of java sources we need to compile
-source_list_prime:
- @$(MKDIR) -p $(TEMPDIR)
-# Note that we slip resources in so that compiled properties files get created:
-$(JAVA_SOURCE_LIST) : source_list_prime resources $(FILES_class)
- @$(TOUCH) $@
-
-.delete.classlist:
- @$(RM) $(JAVA_SOURCE_LIST)
-
-# Make sure all newer sources are compiled (in a batch)
-classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
-
-.compile.classlist : $(JAVA_SOURCE_LIST)
- @$(MKDIR) -p $(CLASSDESTDIR)
- @$(RM) $<.filtered
- @$(CAT) $< | $(NAWK) 'length>0' | $(SORT) -u > $<.filtered
- @numfiles=`$(WC) -l < $<.filtered` ; \
- if [ $$numfiles -ge 1 ] ; then \
- $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
- $(CAT) $<.filtered; \
- $(ECHO) "# Running javac: $$numfiles files; in $(CURDIR)"; \
- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered && \
- $(ECHO) "# javac finished"; \
- fi
- @$(java-vm-cleanup)
-
-clobber clean::
- $(RM) $(JAVA_SOURCE_LIST)
-
-ifndef DONT_CLOBBER_CLASSES
- ifndef PACKAGE
- DONT_CLOBBER_CLASSES = true
- else
- DONT_CLOBBER_CLASSES = false
- endif
-endif
-
-packages.clean:
-ifeq ($(DONT_CLOBBER_CLASSES),false)
- ifdef AUTO_FILES_JAVA_DIRS
- @for sdir in $(AUTO_FILES_JAVA_DIRS); do \
- $(ECHO) "$(RM) -r $(CLASSDESTDIR)/$$sdir"; \
- $(RM) -r $(CLASSDESTDIR)/$$sdir; \
- done
- else
- $(RM) -r $(CLASSDESTDIR)/$(PKGDIR)
- endif
-endif
-
-ifdef DEMOS
-classes.clean:
- $(RM) -r $(DEMODST) $(CLASSDESTDIR)
-else
-classes.clean: packages.clean
- $(RM) $(JAVA_SOURCE_LIST)
-endif
-
-#
-# C and C++ make dependencies
-#
-include $(JDK_TOPDIR)/make/common/internal/NativeCompileRules.gmk
-
-#
-# Running Javah to generate stuff into CClassHeaders.
-#
-
-ifdef FILES_export
-
-CLASSES.export = $(subst /,.,$(FILES_export:%.java=%))
-CLASSES.export += $(subst /,.,$(FILES_export2:%.java=%))
-CLASSES.export += $(subst /,.,$(FILES_export3:%.java=%))
-CLASSES_export = $(FILES_export:%.java=$(CLASSDESTDIR)/%.class)
-CLASSES_export += $(FILES_export2:%.java=$(CLASSDESTDIR)/%.class)
-CLASSES_export += $(FILES_export3:%.java=$(CLASSDESTDIR)/%.class)
-
-# Fix when deploy workspace makefiles don't depend on this name
-#CLASSHDR_DOTFILE=$(CLASSHDRDIR)/.classheaders
-
-CLASSHDR_DOTFILE=$(OBJDIR)/.class.headers.$(ARCH)
-
-classheaders: classes $(CLASSHDR_DOTFILE)
-
-$(CLASSHDR_DOTFILE): $(CLASSES_export)
- $(prep-target)
- @$(ECHO) "# Running javah:"
- $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
- $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
- @$(java-vm-cleanup)
- @$(TOUCH) $@
-
-classheaders.clean:
- $(RM) $(CLASSHDR_DOTFILE)
- $(RM) -r $(CLASSHDRDIR)
-
-else # FILES_export
-
-classheaders: classes
-
-classheaders.clean:
-
-endif # FILES_export
-
-clean clobber:: classheaders.clean classes.clean .delete.classlist
-
-#
-# Default dependencies
-#
-
-all: build
-
-build: classheaders
-
-default: all
-
-.PHONY: all build clean clobber \
- .delete.classlist classes .compile.classlist classes.clean \
- classheaders classheaders.clean \
- batch_compile
-
diff --git a/jdk/make/common/Sanity.gmk b/jdk/make/common/Sanity.gmk
deleted file mode 100644
index 233abea..0000000
--- a/jdk/make/common/Sanity.gmk
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Settings and rules to validate the JDK build environment.
-
-.PHONY: \
- pre-sanity \
- sanity \
- sanity-base \
- sanity-docs \
- sanity-images \
- post-sanity-all \
- post-sanity-docs \
- post-sanity-images \
- sanity-all
-
-# Bring in common sanity check rules
-include $(JDK_MAKE_SHARED_DIR)/Sanity.gmk
-
-# EXTERNALSANITYCONTROL means that this workspace build is being controlled by
-# the control workspace, and that workspace is managing what is done to the sanity
-# check files, and this sanity check run is only appending to those files.
-
-pre-sanity: $(SANITY_FILES)
-ifndef EXTERNALSANITYCONTROL
- @$(RM) $(SANITY_FILES)
-endif
-
-sanity-base: pre-sanity \
- sane-settings \
- sane-insane \
- sane-make \
- sane-build_number \
- sane-os_version \
- sane-makeflags \
- sane-alt_outputdir \
- sane-outputdir \
- sane-devtools_path \
- sane-compiler_path \
- sane-unixcommand_path \
- sane-usrbin_path \
- sane-math_iso \
- sane-libCrun \
- sane-unixccs_path \
- sane-msdevtools_path \
- sane-compiler \
- sane-cacerts \
- sane-ant_version \
- sane-zip_version \
- sane-msvcrt_path
-
-# The rules sanity-* have a one-to-one correspondence with the major targets
-# Each sanity-* rule should have no body to ensure that the post-sanity-* is the
-# last rule executed. The pre-sanity rule should be the first dependency. This design
-# expects the execution of pre-sanity only once per gnumake command invocation,
-# thus, info written to ERROR_FILE and/or WARNING_FILE will not be removed by subsequent
-# targets in the same 'gnumake' command line.
-
-sanity-all:: sanity-base \
- sane-classpath \
- sane-java_home \
- sane-fonts \
- sane-variant \
- sane-ld_library_path \
- sane-ld_library_path_64 \
- sane-ld_options \
- sane-ld_run_path \
- sane-alt_bootdir \
- sane-bootdir \
- sane-local-bootdir \
- sane-alsa-headers
-
-ifdef OPENJDK
-sanity-all:: sane-freetype
-endif
-
-
-# Always check cups header paths on solaris & linux
-ifneq ($(PLATFORM), windows)
-sanity-all:: \
- sane-cups
-endif
-
-# Always check hotspot binary paths even if we are building them from scratch
-HOTSPOT_IMPORT_CHECK=true
-ifeq ($(HOTSPOT_IMPORT_CHECK),true)
-sanity-all:: \
- sane-hotspot_binaries \
- sane-hotspot_import
-endif
-
-sanity-docs: sanity-base sane-docs_import
-
-sanity-images:: sanity-base
-
-sanity:: sanity-all post-sanity
-
-# this should be the last rule in any target's sanity rule.
-post-sanity post-sanity-all post-sanity-docs post-sanity-images: sane-lastrule
diff --git a/jdk/make/common/Subdirs.gmk b/jdk/make/common/Subdirs.gmk
deleted file mode 100644
index f212d50..0000000
--- a/jdk/make/common/Subdirs.gmk
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Generic makefile for building subdirectories.
-#
-# SUBDIRS variables to specify the subdirectories to build recursively.
-# Makefile has to include Subdirs.gmk AFTER all SUBDIRS variables are
-# defined.
-#
-# This file does not contain any rule.
-#
-# WARNING: This file is shared with other workspaces.
-# So when it includes other files, it must use JDK_TOPDIR.
-
-#
-# SUBDIRS subdirs for the base module always get built
-# SUBDIRS_<group> subdirs for the named group
-#
-# By default, subdirs specified in the SUBDIRS and all SUBDIRS_*
-# variables will be built.
-#
-# Variables of the currently supported groups are:
-# SUBDIRS_desktop
-# SUBDIRS_management
-# SUBDIRS_enterprise
-# SUBDIRS_misc
-# SUBDIRS_tools
-#
-# Change to the above list also need to update
-# make/common/shared/Sanity.gmk. NOTE: this list is subject
-# to change.
-#
-# Eventually we want to restructure the make directory
-# according to these grouping (e.g. make/desktop/...) and
-# the SUBDIRS_<group> variables would not be needed.
-#
-
-# Iterate the subdirectories specified in $1.
-# - cd into each subdir and make them
-
-# Given a SUBDIRS* list (first argument), cd into them and make them
-# SUBDIRS_MAKEFLAGS Make settings for a subdir make
-# SUBDIRS_MAKEFLAGS-$@ Make settings specific to this target
-#
-define subdirs-group-loop
-@$(ECHO) "Begin Processing SUBDIRS: $($1)"
-@for i in DUMMY $($1) ; do \
- if [ "$$i" != "DUMMY" ] ; then \
- $(MAKE) -C $$i $@ $(SUBDIRS_MAKEFLAGS) $(SUBDIRS_MAKEFLAGS-$@) \
- FULL_VERSION=$(FULL_VERSION) RELEASE=$(RELEASE) || exit 1; \
- fi ; \
-done
-@$(ECHO) "Done Processing SUBDIRS: $($1)"
-endef
-
-# Given a OTHERSUBDIRS list, cd into them and make them (extra loop define)
-# OTHERSUBDIRS_MAKEFLAGS Make settings for a subdir make
-define OTHERSUBDIRS-loop
-@$(ECHO) "Begin Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
-@for i in DUMMY $(OTHERSUBDIRS) ; do \
- if [ "$$i" != "DUMMY" ] ; then \
- $(MAKE) -C $$i $@ $(OTHERSUBDIRS_MAKEFLAGS) \
- FULL_VERSION=$(FULL_VERSION) RELEASE=$(RELEASE) || exit 1; \
- fi ; \
-done
-@$(ECHO) "Done Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
-endef
-
-#
-# Iterate the list specified in SUBDIRS_<group> only if
-# SUBDIRS_<group> is set.
-#
-ifdef SUBDIRS_desktop
- define subdirs-desktop-loop
- @$(call subdirs-group-loop,SUBDIRS_desktop)
- endef
-else
- define subdirs-desktop-loop
- endef
-endif # SUBDIRS_desktop
-
-ifdef SUBDIRS_enterprise
- define subdirs-enterprise-loop
- @$(call subdirs-group-loop,SUBDIRS_enterprise)
- endef
-else
-define subdirs-enterprise-loop
-endef
-endif # SUBDIRS_enterprise
-
-ifdef SUBDIRS_management
- define subdirs-management-loop
- @$(call subdirs-group-loop,SUBDIRS_management)
- endef
-else
- define subdirs-management-loop
- endef
-endif # SUBDIRS_management
-
-ifdef SUBDIRS_misc
- define subdirs-misc-loop
- @$(call subdirs-group-loop,SUBDIRS_misc)
- endef
-else
- define subdirs-misc-loop
- endef
-endif # SUBDIRS_misc
-
-ifdef SUBDIRS_tools
- define subdirs-tools-loop
- @$(call subdirs-group-loop,SUBDIRS_tools)
- endef
-else
- define subdirs-tools-loop
- endef
-endif # SUBDIRS_tools
-
-#
-# If BUILD_MODULES is not set or it's set to "all",
-# iterate all groups.
-SUBDIRS_all = $(SUBDIRS) $(SUBDIRS_desktop) $(SUBDIRS_enterprise) \
- $(SUBDIRS_management) $(SUBDIRS_misc) $(SUBDIRS_tools)
-
-define SUBDIRS-loop
- @$(call subdirs-group-loop,SUBDIRS_all)
-endef
diff --git a/jdk/make/common/internal/Defs-corba.gmk b/jdk/make/common/internal/Defs-corba.gmk
deleted file mode 100644
index 2046869..0000000
--- a/jdk/make/common/internal/Defs-corba.gmk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# The specific packages that come from or go to rt.jar and tools.jar
-IMPORT_RT_PACKAGES += \
- org/omg/CORBA \
- org/omg/CORBA_2_3 \
- org/omg/CosNaming \
- org/omg/Dynamic \
- org/omg/DynamicAny \
- org/omg/IOP \
- org/omg/Messaging \
- org/omg/PortableInterceptor \
- org/omg/PortableServer \
- org/omg/SendingContext \
- org/omg/stub/java/rmi \
- javax/rmi \
- javax/rmi/CORBA \
- javax/activity \
- javax/transaction \
- com/sun/corba/se/GiopIDL \
- com/sun/corba/se/PortableActivationIDL \
- com/sun/corba/se/impl \
- com/sun/corba/se/internal \
- com/sun/corba/se/org/omg/CORBA \
- com/sun/corba/se/pept \
- com/sun/corba/se/spi \
- com/sun/org/omg/CORBA \
- com/sun/org/omg/SendingContext \
- com/sun/tools/corba/se/logutil \
- sun/corba \
- sun/rmi/rmic/iiop
-
-IMPORT_TOOLS_PACKAGES += \
- com/sun/tools/corba/se/idl \
- sun/rmi/rmic/iiop
-
-IMPORT_CORBA_BINARIES += \
- lib/orb.idl \
- lib/ir.idl
-
diff --git a/jdk/make/common/internal/Defs-jaxp.gmk b/jdk/make/common/internal/Defs-jaxp.gmk
deleted file mode 100644
index eb5813c..0000000
--- a/jdk/make/common/internal/Defs-jaxp.gmk
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# The specific packages that come from or go to rt.jar and tools.jar
-IMPORT_RT_PACKAGES += \
- org/w3c/dom \
- org/xml/sax \
- javax/xml/XMLConstants.class \
- javax/xml/datatype \
- javax/xml/namespace \
- javax/xml/parsers \
- javax/xml/stream \
- javax/xml/transform \
- javax/xml/validation \
- javax/xml/xpath \
- com/sun/java_cup \
- com/sun/org/apache/bcel \
- com/sun/org/apache/regexp \
- com/sun/org/apache/xalan \
- com/sun/org/apache/xerces \
- com/sun/org/apache/xml/internal/dtm \
- com/sun/org/apache/xml/internal/res \
- com/sun/org/apache/xml/internal/resolver \
- com/sun/org/apache/xml/internal/serialize \
- com/sun/org/apache/xml/internal/serializer \
- com/sun/org/apache/xml/internal/utils \
- com/sun/org/apache/xpath \
- com/sun/xml/internal/stream
-
-IMPORT_TOOLS_PACKAGES +=
-
diff --git a/jdk/make/common/internal/Defs-jaxws.gmk b/jdk/make/common/internal/Defs-jaxws.gmk
deleted file mode 100644
index 8424551..0000000
--- a/jdk/make/common/internal/Defs-jaxws.gmk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# The specific packages that come from or go to rt.jar and tools.jar
-IMPORT_RT_PACKAGES += \
- META-INF/mailcap.default \
- META-INF/mimetypes.default \
- javax/activation \
- com/sun/activation \
- javax/xml/bind \
- javax/xml/soap \
- javax/xml/ws \
- javax/jws \
- javax/annotation \
- com/sun/org/glassfish \
- com/sun/istack/internal \
- com/sun/istack/internal/localization \
- com/sun/istack/internal/logging \
- com/sun/xml/internal/bind \
- com/sun/xml/internal/fastinfoset \
- com/sun/xml/internal/messaging \
- com/sun/xml/internal/org/jvnet \
- com/sun/xml/internal/txw2 \
- com/sun/xml/internal/ws \
- com/sun/xml/internal/stream/buffer
-
-NOT_USED_PACKAGES += \
- com/sun/tools/internal/txw2
-
-IMPORT_TOOLS_PACKAGES += \
- com/sun/codemodel \
- com/sun/istack/internal/tools \
- com/sun/xml/internal/rngom \
- com/sun/xml/internal/xsom \
- com/sun/xml/internal/dtdparser \
- com/sun/tools/internal/xjc \
- com/sun/tools/internal/ws \
- com/sun/tools/internal/jxc \
- org/relaxng \
- META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
- META-INF/services/com.sun.tools.internal.xjc.Plugin \
- com/sun/tools/internal/jxc/ap \
- com/sun/tools/internal/ws/wscompile/plugin/at_generated
-
-
diff --git a/jdk/make/common/internal/Defs-langtools.gmk b/jdk/make/common/internal/Defs-langtools.gmk
deleted file mode 100644
index eed4435..0000000
--- a/jdk/make/common/internal/Defs-langtools.gmk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# The specific packages that come from or go to rt.jar and tools.jar
-
-IMPORT_RT_PACKAGES += \
- javax/annotation/processing \
- javax/lang/model \
- javax/tools
-
-IMPORT_TOOLS_PACKAGES += \
- com/sun/javadoc \
- com/sun/source \
- com/sun/tools/classfile \
- com/sun/tools/doclets \
- com/sun/tools/doclint \
- com/sun/tools/javac \
- com/sun/tools/javadoc \
- com/sun/tools/javah \
- com/sun/tools/javap
-
diff --git a/jdk/make/common/internal/ImportComponents.gmk b/jdk/make/common/internal/ImportComponents.gmk
deleted file mode 100644
index dc487e1..0000000
--- a/jdk/make/common/internal/ImportComponents.gmk
+++ /dev/null
@@ -1,173 +0,0 @@
-#
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# JDK jars where component classes come from as second choice
-JDK_RT_JAR = $(JDK_IMPORT_PATH)/jre/lib/rt.jar
-JDK_TOOLS_JAR = $(JDK_IMPORT_PATH)/lib/tools.jar
-JDK_RESOURCES_JAR = $(JDK_IMPORT_PATH)/jre/lib/resources.jar
-
-# The specific packages that come from or go to rt.jar and tools.jar
-# IF the component deliverables are not available.
-IMPORT_TOOLS_PACKAGES =
-IMPORT_RT_PACKAGES =
-
-# The following will add to IMPORT_TOOLS_PACKAGES and/or IMPORT_RT_PACKAGES
-ifndef LANGTOOLS_DIST
- include $(BUILDDIR)/common/internal/Defs-langtools.gmk
-endif
-ifndef CORBA_DIST
- include $(BUILDDIR)/common/internal/Defs-corba.gmk
-endif
-ifndef JAXP_DIST
- include $(BUILDDIR)/common/internal/Defs-jaxp.gmk
-endif
-ifndef JAXWS_DIST
- include $(BUILDDIR)/common/internal/Defs-jaxws.gmk
-endif
-
-# Clean up these lists so empty lists are empty
-IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES))
-IMPORT_RT_PACKAGES := $(strip $(IMPORT_RT_PACKAGES))
-
-# Relative paths to import component deliverables
-CLASSES_JAR_FILE=lib/classes.jar
-SRC_ZIP_FILE=lib/src.zip
-BIN_ZIP_FILE=lib/bin.zip
-DOC_ZIP_FILE=lib/doc.zip
-
-#################################################################
-# Macros:
-
-# Importing component class files
-define import-one-classes
-@if [ "$($1)" != "" ] ; then \
- $(ECHO) "Importing classes from component $1"; \
- $(call Unjar,$2,$($1)/$(CLASSES_JAR_FILE),); \
-fi
-endef
-
-# Importing optional component doc files (for man pages?)
-define import-one-docs
-@if [ "$($1)" != "" -a -f $($1)/$(DOC_ZIP_FILE) ] ; then \
- $(ECHO) "Importing docs from component $1"; \
- $(call Unzipper,$2,$($1)/$(DOC_ZIP_FILE)); \
-fi
-endef
-
-# Importing optional component src files (for jdk src.zip and javadoc)
-define import-one-sources
-@if [ "$($1)" != "" ] ; then \
- $(ECHO) "Importing sources from component $1"; \
- $(call Unzipper,$2,$($1)/$(SRC_ZIP_FILE)); \
-fi
-endef
-
-# Importing optional component bin files (for install image)
-define import-one-binaries
-@if [ "$($1)" != "" -a -f $($1)/$(BIN_ZIP_FILE) ] ; then \
- $(ECHO) "Importing binaries from component $1"; \
- $(call Unzipper,$2,$($1)/$(BIN_ZIP_FILE)); \
-fi
-endef
-
-# Unzip zip file $2 into directory $1 (if $2 exists)
-# Warning: $2 must be absolute path not relative
-define Unzipper
-( \
- $(MKDIR) -p $1; \
- $(ECHO) "( $(CD) $1 && $(UNZIP) -o $2 )"; \
- ( $(CD) $1 && $(UNZIP) -o $2 ) \
-)
-endef
-
-# Unjar directories $3 from jar file $2 into directory $1 (if $2 exists)
-# Warning: $2 must be absolute path not relative
-define Unjar
-( \
- $(MKDIR) -p $1; \
- $(ECHO) "( $(CD) $1 && $(BOOT_JAR_CMD) xfv $2 $3 $(BOOT_JAR_JFLAGS) )" ; \
- ( $(CD) $1 && $(BOOT_JAR_CMD) xfv $2 $3 $(BOOT_JAR_JFLAGS) ) && \
- ( $(CD) $1 && $(java-vm-cleanup) ) \
-)
-endef
-
-# Import all component sources into directory $1
-define import-component-sources
-$(call import-one-sources,LANGTOOLS_DIST,$1)
-$(call import-one-sources,CORBA_DIST,$1)
-$(call import-one-sources,JAXP_DIST,$1)
-$(call import-one-sources,JAXWS_DIST,$1)
-endef
-
-# Import all component docs into directory $1 (optional)
-define import-component-docs
-$(call import-one-docs,LANGTOOLS_DIST,$1)
-$(call import-one-docs,CORBA_DIST,$1)
-$(call import-one-docs,JAXP_DIST,$1)
-$(call import-one-docs,JAXWS_DIST,$1)
-endef
-
-# Import all component bins into directory $1 (optional)
-define import-component-binaries
-$(call import-one-binaries,LANGTOOLS_DIST,$1)
-$(call import-one-binaries,CORBA_DIST,$1)
-$(call import-one-binaries,JAXP_DIST,$1)
-$(call import-one-binaries,JAXWS_DIST,$1)
-if [ "$(CORBA_DIST)" = "" ] ; then \
- $(MKDIR) -p $(OUTPUTDIR)/lib ; \
- ( $(CD) $(JDK_IMPORT_PATH) && $(CP) $(IMPORT_CORBA_BINARIES) $(ABS_OUTPUTDIR)/lib ) ; \
-fi
-endef
-
-# Import all component classes into directory $1
-# Here we special case classes coming from JDK when component not supplied
-define import-component-classes
-$(ECHO) "Import classes from $(JDK_IMPORT_PATH)"
-if [ "$(IMPORT_TOOLS_PACKAGES)" != "" ] ; then \
- $(call Unjar,$1,$(JDK_RESOURCES_JAR),$(IMPORT_TOOLS_PACKAGES)); \
- $(call Unjar,$1,$(JDK_TOOLS_JAR),$(IMPORT_TOOLS_PACKAGES)); \
-fi
-if [ "$(IMPORT_RT_PACKAGES)" != "" ] ; then \
- $(call Unjar,$1,$(JDK_RESOURCES_JAR),$(IMPORT_RT_PACKAGES)); \
- $(call Unjar,$1,$(JDK_RT_JAR),$(IMPORT_RT_PACKAGES)); \
-fi
-$(call import-one-classes,LANGTOOLS_DIST,$1)
-$(call import-one-classes,CORBA_DIST,$1)
-$(call import-one-classes,JAXP_DIST,$1)
-$(call import-one-classes,JAXWS_DIST,$1)
-endef
-
-# Clean up import files
-define import-component-sources-clean
-$(RM) -r $1
-endef
-define import-component-docs-clean
-$(RM) -r $1
-endef
-define import-component-classes-clean
-$(RM) -r $(IMPORT_TOOLS_PACKAGES:%=$1/%)
-$(RM) -r $(IMPORT_RT_PACKAGES:%=$1/%)
-endef
-
diff --git a/jdk/make/common/internal/NativeCompileRules.gmk b/jdk/make/common/internal/NativeCompileRules.gmk
deleted file mode 100644
index e6569da..0000000
--- a/jdk/make/common/internal/NativeCompileRules.gmk
+++ /dev/null
@@ -1,232 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Native C/C++ Compile Rules
-#
-
-#
-# INCREMENTAL_BUILD: Record the #include file dependencies.
-#
-# NOTE: We build make include files with the suffix
-# $(DEPEND_SUFFIX) on every compilation. These are initially
-# created as temp files just in case a ^C kills it in the middle.
-# Compiler is smart enough to handle ^C and not create the .o file, or
-# is supposed to be that smart, but the .$(DEPEND_SUFFIX) file
-# creation here isn't.
-# These .$(DEPEND_SUFFIX) files are included by Library.gmk and
-# Program.gmk, when they exist (Search for 'make dependencies').
-#
-
-ifeq ($(INCREMENTAL_BUILD),true)
-
-$(OBJDIR)/%.$(DEPEND_SUFFIX): %.c
- @$(prep-target)
- @$(ECHO) "Creating $@"
- @$(RM) $@.temp
- @$(CC) $(CC_DEPEND) $(CPPFLAGS) $< 2> $(DEV_NULL) | \
- $(CC_DEPEND_FILTER) > $@.temp
- @$(MV) $@.temp $@
-
-$(OBJDIR)/%.$(DEPEND_SUFFIX): %.cpp
- @$(prep-target)
- @$(ECHO) "Creating $@"
- @$(RM) $@.temp
- @$(CXX) $(CC_DEPEND) $(CPPFLAGS) $(CXXFLAGS) $< 2> $(DEV_NULL) | \
- $(CC_DEPEND_FILTER) > $@.temp
- @$(MV) $@.temp $@
-
-endif # INCREMENTAL_BUILD
-
-#
-# C, C++, asm files.
-#
-# Normal or parallel compile rule is the same, but batch compiles require
-# we save up the sources files that use the same compile line so that we
-# can do one compile line.
-#
-
-ifneq ($(COMPILE_APPROACH), batch)
-
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.c
- @$(prep-target)
- $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $<
- @$(check-conventions)
-
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.cpp
- @$(prep-target)
- $(COMPILE.cc) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $<
- @$(check-conventions)
-
-else
-
- #
- # Batch compiling might be faster if the compiler was smart about recognizing
- # optimization opportunities available when all files are being compiled
- # the same way. Unfortunately this is rare.
- # Automatic pre-compiled headers (pch) might be a possibility so we
- # add any auto pch options here.
- # So we save all the source files that have the same compile line as the
- # first file. A normal compile pass is made after the batch compile
- # to catch anything missed.
- # If the compilers had a -o option that allowed us to direct where to
- # write the object files to, then we would not need to save the object
- # file list or move them from the make directory to the build directory.
- #
-
- # Source names
- COMPILE_LIST.c = $(OBJDIR)/.source_names_c
- COMPILE_LIST.cpp = $(OBJDIR)/.source_names_cpp
-
- # Object file list
- COMPILE_OBJ_LIST.c = $(OBJDIR)/.obj_names_c
- COMPILE_OBJ_LIST.cpp = $(OBJDIR)/.obj_names_cpp
-
- # The compile line
- COMPILE_BATCH.c = $(OBJDIR)/.compile_c
- COMPILE_BATCH.cpp = $(OBJDIR)/.compile_cpp
-
- # The compile line for the current target
- THIS_COMPILE_BATCH.c = $(COMPILE_BATCH.c)-$(@F)
- THIS_COMPILE_BATCH.cpp = $(COMPILE_BATCH.cpp)-$(@F)
-
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.c
- @$(prep-target)
- @$(ECHO) "$(COMPILE.c) $(CFLAGS_GPROF)" > $(THIS_COMPILE_BATCH.c)
- @if [ ! -s $(COMPILE_BATCH.c) ] ; then \
- $(CP) $(THIS_COMPILE_BATCH.c) $(COMPILE_BATCH.c) ; \
- $(ECHO) $< > $(COMPILE_LIST.c); \
- $(ECHO) $(@F) > $(COMPILE_OBJ_LIST.c); \
- elif [ "`$(DIFF) -w -b $(THIS_COMPILE_BATCH.c) $(COMPILE_BATCH.c)`" \
- = "" ] ; then \
- $(ECHO) $< >> $(COMPILE_LIST.c); \
- $(ECHO) $(@F) >> $(COMPILE_OBJ_LIST.c); \
- fi
- @$(RM) $(THIS_COMPILE_BATCH.c)
- @$(check-conventions)
-
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.cpp
- @$(prep-target)
- @$(ECHO) "$(COMPILE.cpp) $(CFLAGS_GPROF)" > $(THIS_COMPILE_BATCH.cpp)
- @if [ ! -s $(COMPILE_BATCH.cpp) ] ; then \
- $(CP) $(THIS_COMPILE_BATCH.cpp) $(COMPILE_BATCH.cpp) ; \
- $(ECHO) $< > $(COMPILE_LIST.cpp); \
- $(ECHO) $(@F) > $(COMPILE_OBJ_LIST.cpp); \
- elif [ "`$(DIFF) -w -b $(THIS_COMPILE_BATCH.cpp) $(COMPILE_BATCH.cpp)`"\
- = "" ] ; then \
- $(ECHO) $< >> $(COMPILE_LIST.cpp); \
- $(ECHO) $(@F) >> $(COMPILE_OBJ_LIST.cpp); \
- fi
- @$(RM) $(THIS_COMPILE_BATCH.cpp)
- @$(check-conventions)
-
-batch_compile: $(FILES_o)
- @$(ECHO) "Doing batch compilations"
- @if [ -s $(COMPILE_LIST.c) ] ; then \
- $(ECHO) "$(COMPILE.c) $(CFLAGS_GPROF) $(AUTOMATIC_PCH_OPTION) \
- `$(CAT) $(COMPILE_LIST.c)`" ; \
- ( $(COMPILE.c) $(CFLAGS_GPROF) $(AUTOMATIC_PCH_OPTION) \
- `$(CAT) $(COMPILE_LIST.c)` && \
- $(ECHO) "$(MV) `$(CAT) $(COMPILE_OBJ_LIST.c)` $(OBJDIR)" && \
- $(MV) `$(CAT) $(COMPILE_OBJ_LIST.c)` $(OBJDIR) ) || exit 1 ; \
- fi
- @if [ -s $(COMPILE_LIST.cpp) ] ; then \
- $(ECHO) "$(COMPILE.cpp) $(CFLAGS_GPROF) $(AUTOMATIC_PCH_OPTION) \
- `$(CAT) $(COMPILE_LIST.cpp)`" ; \
- ( $(COMPILE.cpp) $(CFLAGS_GPROF) $(AUTOMATIC_PCH_OPTION) \
- `$(CAT) $(COMPILE_LIST.cpp)` && \
- $(ECHO) "$(MV) `$(CAT) $(COMPILE_OBJ_LIST.cpp)` $(OBJDIR)" && \
- $(MV) `$(CAT) $(COMPILE_OBJ_LIST.cpp)` $(OBJDIR) ) || exit 1 ; \
- fi
- @$(RM) $(COMPILE_BATCH.c) $(COMPILE_LIST.c) $(COMPILE_OBJ_LIST.c)
- @$(RM) $(COMPILE_BATCH.cpp) $(COMPILE_LIST.cpp) $(COMPILE_OBJ_LIST.cpp)
-
-endif
-
-# newer as does not handle c++ style comments
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.s
- ifneq ($(CC_VERSION), gcc)
- @$(prep-target)
- $(COMPILE.s) $(CC_OBJECT_OUTPUT_FLAG)$@ $<
- else
- @$(prep-target)
- $(CPP) -x assembler-with-cpp $< | $(COMPILE.s) -o $@
- endif
- @$(check-conventions)
-
-# Obj-C files (Mac OS X only).
-ifeq ($(PLATFORM), macosx)
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.m
- @$(prep-target)
- $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $<
- @$(check-conventions)
-
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.mm
- @$(prep-target)
- $(COMPILE.cc) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $<
- @$(check-conventions)
-
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.c
- @$(prep-target)
- $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $<
- @$(check-conventions)
-endif # PLATFORM
-
-#
-# Quick hack for making the compiler generate just the assembly file.
-# $ gnumake obj/sparc/myfile.s
-#
-$(OBJDIR)/%.s: %.c
- @$(prep-target)
- $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$@ -S $<
- @$(check-conventions)
-
-# remove the intermediate files from the directories.
-# (If VARIANT=OPT, this removes all debug and fastdebug files too)
-clobber clean::
- $(RM) -r $(OBJDIR)
- $(RM) -r $(OBJDIR)_*
-
-#
-# Lint support
-# (The 'lint' rule below is an older rule not using the .$(LINT_SUFFIX) files)
-#
-
-ifeq ($(PLATFORM), solaris)
-$(OBJDIR)/%.$(LINT_SUFFIX): %.c
- @$(prep-target)
- $(LINT.c) -dirout=$(OBJDIR) -c $<
-lint.clean:
- $(RM) $(OBJDIR)/*.$(LINT_SUFFIX)
-# Old rule
-lint: $(FILES_c)
- ifneq ($(FILES_c),)
- $(LINT.c) -Ncheck -Nlevel=3 $? $(LDLIBS) > lint.$(ARCH) 2>&1
- endif
-endif
-
-.PHONY: batch_compile
-
-
diff --git a/jdk/make/common/internal/Resources.gmk b/jdk/make/common/internal/Resources.gmk
deleted file mode 100644
index bae72bc..0000000
--- a/jdk/make/common/internal/Resources.gmk
+++ /dev/null
@@ -1,273 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Generic mechanism for installing properties files, resource bundles,
-# and other resource files.
-#
-# FILES_properties should be defined.
-# FILES_compiled_properties should be defined.
-#
-# If COMPILED_PROPERTIES_SUPERCLASS is defined, ALL the FILES_properties
-# files will be compiled into java with this super class.
-#
-# You can add locales to LOCALE_SUFFIXES explicitly, or use the
-# LOCALE_SET_DEFINITION variable to add some pre-defined locale lists.
-# The LOCALE_SET_DEFINITION can have the value: jre, plugin, or jdk.
-#
-# Resource bundles to be installed are identified using the following variables.
-# Note that only the file name of the base bundle is given; localized versions
-# are added automatically. For Java files, use a format suitable for inclusion
-# in the FILES_java list; dito for properties, all relative paths.
-#
-# NEW_RESOURCE_BUNDLES_JAVA - new resource bundles implemented in
-# Java, not localized
-# RESOURCE_BUNDLES_JAVA - resource bundles implemented in
-# Java, localized
-#
-# The following variable is now used for most .properties files in the JDK.
-# These properties files are converted into java and compiled with javac.
-# The resulting .class files are usually smaller and are always faster to load.
-# The relative path to the properties file becomes a relative path to a
-# java source file.
-#
-# RESOURCE_BUNDLES_COMPILED_PROPERTIES - resource bundles implemented as
-# properties files, localized
-# NEW_RESOURCE_BUNDLES_COMPILED_PROPERTIES - same as above, not localized
-#
-# For non-compiled properties files, use the following variables:
-#
-# NEW_RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES - new resource bundles implemented as
-# properties files, not localized
-# RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES - resource bundles implemented as
-# properties files, localized
-#
-# Other properties files to be installed are identified using the variable:
-#
-# OTHER_PROPERTIES
-#
-
-# Compile properties files into java source?
-ifdef COMPILED_PROPERTIES_SUPERCLASS
- # Add all properties files to the compiled properties list (all or nothing)
- COMPILED_PROPERTIES += $(FILES_compiled_properties) $(FILES_properties)
-else
- COMPILED_PROPERTIES_SUPERCLASS = ListResourceBundle
- COMPILED_PROPERTIES += $(FILES_compiled_properties)
-endif
-
-# Determine the locale suffixes needed beyond the base bundle
-
-ifeq ($(LOCALE_SET_DEFINITION), plugin)
- LOCALE_SUFFIXES += $(PLUGIN_LOCALES)
-endif
-ifeq ($(LOCALE_SET_DEFINITION), jdk)
- LOCALE_SUFFIXES += $(JDK_LOCALES)
-endif
-ifeq ($(LOCALE_SET_DEFINITION), jre)
- LOCALE_SUFFIXES += $(JRE_LOCALES)
-endif
-
-# Java files get tacked onto the standard list of files to compile
-RESOURCE_BUNDLE_FILES_java += $(NEW_RESOURCE_BUNDLES_JAVA)
-RESOURCE_BUNDLE_FILES_java += $(RESOURCE_BUNDLES_JAVA) \
- $(foreach file,$(RESOURCE_BUNDLES_JAVA), \
- $(foreach locale,$(LOCALE_SUFFIXES), \
- $(basename $(file))_$(locale).java))
-
-# Add to java sources list
-FILES_java += $(RESOURCE_BUNDLE_FILES_java)
-
-# Compiled properties files are translated to .java.
-# The .java files are generated into GENSRCDIR.
-COMPILED_PROPERTIES += $(NEW_RESOURCE_BUNDLES_COMPILED_PROPERTIES)
-COMPILED_PROPERTIES += $(RESOURCE_BUNDLES_COMPILED_PROPERTIES) \
- $(foreach file,$(RESOURCE_BUNDLES_COMPILED_PROPERTIES),\
- $(foreach locale,$(LOCALE_SUFFIXES),\
- $(basename $(file))_$(locale)$(suffix $(file))))
-
-# Add to java sources list
-FILES_java += $(COMPILED_PROPERTIES:%.properties=%.java)
-
-# Non-compiled files
-PROPERTIES_FILES += $(NEW_RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES)
-PROPERTIES_FILES += $(RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES) \
- $(foreach file,$(RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES), \
- $(foreach locale,$(LOCALE_SUFFIXES), \
- $(basename $(file))_$(locale)$(suffix $(file))))
-# other properties
-PROPERTIES_FILES += $(OTHER_PROPERTIES)
-
-#
-# Compile Properties tool
-#
-COMPILEPROPERTIES_JARFILE = $(BUILDTOOLJARDIR)/compileproperties.jar
-
-#
-# Strip Properties tool
-#
-STRIPPROPERTIES_JARFILE = $(BUILDTOOLJARDIR)/stripproperties.jar
-
-#
-# Process and strip all non-compiled properties files (in a batch mode)
-#
-STRIP_PROP_FILES = $(PROPERTIES_FILES:%=$(CLASSDESTDIR)/%)
-# To efficiently strip properties we use one run of StripProperties.
-# This macro gathers an option for use later.
-STRIP_PROP_options=$(TEMPDIR)/strip_prop_options
-define install-properties-file
-$(install-file)
-$(call chmod-file, a+rw)
-@$(ECHO) "# Adding to strip properties list: $@"
-$(ECHO) "$@" >> $(STRIP_PROP_options)
-endef
-
-# Constructs command line options file
-$(STRIP_PROP_options): $(STRIP_PROP_FILES)
- @$(TOUCH) $@
-strip_prop_options_clean:
- @$(RM) $(STRIP_PROP_options)
-
-# Strip the properties files
-strip_all_props: $(STRIPPROPERTIES_JARFILE) $(STRIP_PROP_options)
- @if [ -s $(STRIP_PROP_options) ] ; then \
- $(ECHO) "$(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) @$(STRIP_PROP_options)" ; \
- $(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) @$(STRIP_PROP_options) ; \
- fi
- @$(java-vm-cleanup)
-
-#
-# Creates files in CLASSDESTDIR
-#
-
-# In some cases, we move files from package to resources subdir
-$(CLASSDESTDIR)/$(PKGDIR)/resources/%.properties: \
- $(SHARE_SRC)/classes/$(PKGDIR)/%.properties
- $(install-properties-file)
-$(CLASSDESTDIR)/%.properties: $(SHARE_SRC)/classes/%.properties
- $(install-properties-file)
-$(CLASSDESTDIR)/%.res: $(SHARE_SRC)/classes/%.res
- $(install-file)
-$(CLASSDESTDIR)/%.dtd: $(SHARE_SRC)/classes/%.dtd
- $(install-file)
-$(CLASSDESTDIR)/%.xml: $(SHARE_SRC)/classes/%.xml
- $(install-file)
-$(CLASSDESTDIR)/%.prp: $(SHARE_SRC)/classes/%.prp
- $(install-file)
-
-#
-# To efficiently compile properties into java sources we use one run
-# of compileproperties. This macro gathers an option for use later.
-# Note: The properties file and java source name can be different
-# locales, e.g. zh_TW and zh_HK. The java source filename
-# determines the name of the class.
-COMPILE_PROP_options=$(TEMPDIR)/compile_prop_options
-define add-property-java-file
-@$(prep-target)
-@$(ECHO) "# Adding to compile properties list: $? -> $@"
-$(ECHO) "-compile $? $@ $(COMPILED_PROPERTIES_SUPERCLASS)" \
- >> $(COMPILE_PROP_options)
-endef
-
-$(GENSRCDIR)/%.java: $(PLATFORM_SRC)/classes/%.properties
- $(add-property-java-file)
-$(GENSRCDIR)/%.java: $(SHARE_SRC)/classes/%.properties
- $(add-property-java-file)
-$(GENSRCDIR)/%.java: $(GENSRCDIR)/%.properties
- $(add-property-java-file)
-ifdef PLATFORM_SRC_MACOS
-$(GENSRCDIR)/%.java: $(PLATFORM_SRC_MACOS)/classes/%.properties
- $(add-property-java-file)
-endif
-ifndef OPENJDK
-$(GENSRCDIR)/%.java: $(CLOSED_PLATFORM_SRC)/classes/%.properties
- $(add-property-java-file)
-$(GENSRCDIR)/%.java: $(CLOSED_SHARE_SRC)/classes/%.properties
- $(add-property-java-file)
-endif
-
-# Create HK java file from zh_TW (explicit resource bundles only)
-define create-hk-java-file
-@$(prep-target)
-$(CAT) $< | $(SED) -e '/class/s/_zh_TW/_zh_HK/' > $@
-endef
-
-# Explicit resource bundles
-$(GENSRCDIR)/%_zh_HK.java: $(PLATFORM_SRC)/classes/%_zh_TW.java
- $(create-hk-java-file)
-$(GENSRCDIR)/%_zh_HK.java: $(SHARE_SRC)/classes/%_zh_TW.java
- $(create-hk-java-file)
-
-# Compile of zh_HK properties just uses the zh_TW properties files
-$(GENSRCDIR)/%_zh_HK.java: $(PLATFORM_SRC)/classes/%_zh_TW.properties
- $(add-property-java-file)
-$(GENSRCDIR)/%_zh_HK.java: $(SHARE_SRC)/classes/%_zh_TW.properties
- $(add-property-java-file)
-
-# Simple delivery of zh_HK properties files just copies zh_TW properties files
-$(CLASSDESTDIR)/%_zh_HK.properties: \
- $(PLATFORM_SRC)/classes/%_zh_TW.properties
- $(install-properties-file)
-$(CLASSDESTDIR)/%_zh_HK.properties: \
- $(SHARE_SRC)/classes/%_zh_TW.properties
- $(install-properties-file)
-
-# List of java files converted from properties files needed
-COMPILE_PROP_JAVA_FILES = $(COMPILED_PROPERTIES:%.properties=$(GENSRCDIR)/%.java)
-
-# Constructs command line options file
-$(COMPILE_PROP_options): $(COMPILE_PROP_JAVA_FILES)
- @$(TOUCH) $@
-compile_prop_options_clean:
- @$(RM) $(COMPILE_PROP_options)
-
-# Make sure all are compiled, one compiler run
-compile_all_props: $(COMPILEPROPERTIES_JARFILE) $(COMPILE_PROP_options)
- @if [ `$(CAT) $(COMPILE_PROP_options) | $(WC) -l` -ge 1 ] ; then \
- $(MKDIR) -p $(GENSRCDIR); \
- $(ECHO) "$(BOOT_JAVA_CMD) -jar $(COMPILEPROPERTIES_JARFILE) @$(COMPILE_PROP_options)";\
- $(BOOT_JAVA_CMD) -jar $(COMPILEPROPERTIES_JARFILE) @$(COMPILE_PROP_options) ; \
- $(java-vm-cleanup); \
- fi
-
-# Make sure the build rule creates all the properties
-resources:
-
-ifneq ($(strip $(PROPERTIES_FILES)),)
- resources: strip_prop_options_clean strip_all_props
- clobber clean::
- $(RM) $(STRIP_PROP_FILES) $(STRIP_PROP_options)
-endif
-
-ifneq ($(strip $(COMPILED_PROPERTIES)),)
- resources: compile_prop_options_clean compile_all_props
- clobber clean::
- $(RM) $(COMPILE_PROP_JAVA_FILES) $(COMPILE_PROP_options)
-endif
-
-.PHONY: resources \
- compile_prop_options_clean compile_all_props \
- strip_prop_options_clean strip_all_props
-
diff --git a/jdk/make/common/shared/Compiler-gcc.gmk b/jdk/make/common/shared/Compiler-gcc.gmk
deleted file mode 100644
index 023faf6..0000000
--- a/jdk/make/common/shared/Compiler-gcc.gmk
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# GCC Compiler settings
-#
-
-ifeq ($(PLATFORM), windows)
-
- # Settings specific to Windows, pretty stale, hasn't been used
- CC = $(COMPILER_PATH)gcc
- CPP = $(COMPILER_PATH)gcc -E
- CXX = $(COMPILER_PATH)g++
- CCC = $(COMPILER_PATH)g++
- LIBEXE = $(COMPILER_PATH)lib
- LINK = $(COMPILER_PATH)link
- RC = $(COMPILER_PATH)rc
- LINK32 = $(LINK)
- RSC = $(RC)
- # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake
- NMAKE = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo
- ifeq ($(ARCH_DATA_MODEL), 32)
- CC_VER = UNKNOWN
- else
- CC_VER = UNKNOWN
- endif
- _LINK_VER :=$(shell $(LINK) 2>&1 | $(HEAD) -n 1)
- LINK_VER :=$(call GetVersion,"$(_LINK_VER)")
-
-endif
-
-ifeq ($(PLATFORM), linux)
-
- # Settings specific to Linux
- CC = $(COMPILER_PATH)gcc
- CPP = $(COMPILER_PATH)gcc -E
- # statically link libstdc++ before C++ ABI is stablized on Linux
- STATIC_CXX = true
- ifeq ($(STATIC_CXX),true)
- # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
- # We need to use gcc to statically link the C++ runtime. gcc and g++ use
- # the same subprocess to compile C++ files, so it is OK to build using gcc.
- CXX = $(COMPILER_PATH)gcc
- else
- CXX = $(COMPILER_PATH)g++
- endif
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -shared
- SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
-
-endif
-
-ifeq ($(PLATFORM), solaris)
-
- # Settings specific to Solaris
- CC = $(COMPILER_PATH)gcc
- CPP = $(COMPILER_PATH)gcc -E
- CXX = $(COMPILER_PATH)g++
-
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -G
-
-endif
-
-# Get gcc version
-_CC_VER :=$(shell $(CC) -dumpversion 2>&1 )
-CC_VER :=$(call GetVersion,"$(_CC_VER)")
-CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
-CC_MINORVER :=$(call MinorVersion,$(CC_VER))
-
-# Name of compiler
-COMPILER_NAME = GCC$(call MajorVersion,$(CC_VER))
-COMPILER_VERSION = $(COMPILER_NAME)
-
diff --git a/jdk/make/common/shared/Compiler-llvm.gmk b/jdk/make/common/shared/Compiler-llvm.gmk
deleted file mode 100644
index 606a061..0000000
--- a/jdk/make/common/shared/Compiler-llvm.gmk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# LLVM Compiler settings
-#
-
-ifeq ($(PLATFORM), macosx)
-
- # Settings specific to Mac OS X
- ifeq ($(origin CC), default)
- CC = $(COMPILER_PATH)llvm-gcc
- endif
- CPP = $(COMPILER_PATH)llvm-gcc -E
- ifeq ($(origin CXX), default)
- CXX = $(COMPILER_PATH)llvm-g++
- endif
-
- REQUIRED_CC_VER = 4.2.1
-
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -Wl,-install_name,@rpath/$(@F) -dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0
- SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
-
- AR = $(CC)
- ARFLAGS = -nostdlib -r -arch i386 -arch x86_64 -o
-
-endif
-
-# Get llvm version
-_CC_VER :=$(shell $(CC) -dumpversion 2>&1 )
-CC_VER :=$(call GetVersion,"$(_CC_VER)")
-
-# Name of compiler
-COMPILER_NAME = LLVM-GCC$(call MajorVersion,$(CC_VER))
-COMPILER_VERSION = $(COMPILER_NAME)
-
diff --git a/jdk/make/common/shared/Compiler-msvc.gmk b/jdk/make/common/shared/Compiler-msvc.gmk
deleted file mode 100644
index d6d7416..0000000
--- a/jdk/make/common/shared/Compiler-msvc.gmk
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# MSVC Compiler settings
-#
-
-ifeq ($(PLATFORM), windows)
-ifndef CONFIGURE_BUILD
- CC = $(COMPILER_PATH)cl
- CPP = $(COMPILER_PATH)cl
- CXX = $(COMPILER_PATH)cl
- CCC = $(COMPILER_PATH)cl
- LIBEXE = $(COMPILER_PATH)lib
- LINK = $(COMPILER_PATH)link
- LINK32 = $(LINK)
- DUMPBIN = $(COMPILER_PATH)dumpbin.exe
-
- # Fill in unknown values
- COMPILER_NAME=Unknown MSVC Compiler
- COMPILER_VERSION=
-
- # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake
- NMAKE = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo
-
- # Compiler version and type (Always get word after "Version")
- CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(SED) 's/.*\(Version.*\)/\1/' | $(NAWK) '{print $$2}')
-
- LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
- CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
-
- # The VS2010 compiler is the same one used on both 32bit and 64bit
- ifeq ($(CC_MAJORVER), 16)
- COMPILER_NAME=Microsoft Visual Studio 10 (16.00.40219.01)
- COMPILER_VERSION=VS2010
- ifeq ($(WINDOWSSDKDIR),)
- WINDOWSSDKDIR := $(error WINDOWSSDKDIR cannot be empty here)
- endif
- ifeq ($(ARCH_DATA_MODEL), 32)
- _OTHER_TOOLS_BIN = $(WINDOWSSDKDIR)/Bin
- else
- ifeq ($(ARCH), ia64)
- _OTHER_TOOLS_BIN = $(WINDOWSSDKDIR)/Bin/ia64
- else
- _OTHER_TOOLS_BIN = $(WINDOWSSDKDIR)/Bin/x64
- endif
- endif
- RC = $(_OTHER_TOOLS_BIN)/RC.Exe
- REBASE = $(_OTHER_TOOLS_BIN)/ReBase.Exe
- MT = $(_OTHER_TOOLS_BIN)/mt.exe
- MTL = $(_OTHER_TOOLS_BIN)/midl.exe
- endif
-
- # These variables can never be empty
- ifndef COMPILER_PATH
- COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
- endif
- ifndef COMPILER_VERSION
- COMPILER_VERSION := $(error COMPILER_VERSION cannot be empty here)
- endif
- ifneq ($(COMPILER_VERSION),VS2010)
- COMPILER_VERSION := $(error COMPILER_VERSION must be VS2010)
- endif
-
- # Shared library generation flag
- SHARED_LIBRARY_FLAG = -LD
- # RSC is always same as RC (Not sure who uses this RSC variable)
- RSC = $(RC)
-endif
-endif
-
diff --git a/jdk/make/common/shared/Compiler-sun.gmk b/jdk/make/common/shared/Compiler-sun.gmk
deleted file mode 100644
index c9181dc..0000000
--- a/jdk/make/common/shared/Compiler-sun.gmk
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Sun Studio Compiler settings
-#
-
-# Sun Studio Compiler settings specific to Solaris
-ifeq ($(PLATFORM), solaris)
- CC = $(COMPILER_PATH)cc
- CPP = $(COMPILER_PATH)cc -E
- CXX = $(COMPILER_PATH)CC
- LINT = $(COMPILER_PATH)lint
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -G
- GCC =$(GCC_COMPILER_PATH)gcc
-endif
-
-# Sun Studio Compiler settings specific to Linux
-ifeq ($(PLATFORM), linux)
- # This has not been tested
- CC = $(COMPILER_PATH)cc
- CPP = $(COMPILER_PATH)cc -E
- CXX = $(COMPILER_PATH)CC
- LINT = $(COMPILER_PATH)lint
- # statically link libstdc++ before C++ ABI is stablized on Linux
- STATIC_CXX = true
- ifeq ($(STATIC_CXX),true)
- # CC always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
- # We need to use cc to statically link the C++ runtime.
- CXX = $(COMPILER_PATH)cc
- else
- CXX = $(COMPILER_PATH)CC
- endif
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -G
-endif
-
-# Get compiler version
-_CC_VER :=$(shell $(CC) -V 2>&1 | $(HEAD) -n 1)
-CC_VER :=$(call GetVersion,"$(_CC_VER)")
-CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
-CC_MINORVER :=$(call MinorVersion,$(CC_VER))
-
-# Name of compilers being used
-COMPILER_VERSION-5.7 = SS10
-COMPILER_NAME-5.7 = Sun Studio 10
-COMPILER_VERSION-5.8 = SS11
-COMPILER_NAME-5.8 = Sun Studio 11
-COMPILER_VERSION-5.9 = SS12
-COMPILER_NAME-5.9 = Sun Studio 12
-COMPILER_VERSION-5.10 = SS12u1
-COMPILER_NAME-5.10 = Sun Studio 12 Update 1
-COMPILER_VERSION-5.11 = OSS12u2
-COMPILER_NAME-5.11 = Oracle Solaris Studio 12 Update 2
-COMPILER_VERSION = $(COMPILER_VERSION-$(CC_VER))
-COMPILER_NAME = $(COMPILER_NAME-$(CC_VER))
-
-# Arch specific settings (determines type of .o files and instruction set)
-# Starting in SS12 (5.9), the arch options changed.
-# The assembler /usr/ccs/bin/as wants older SS11 (5.8) style options.
-# Note: We need to have both 32 and 64 values at all times for awt Makefiles.
-#
-XARCH_OPTION_OLD/32 =
-XARCH_OPTION_OLD/64 =
-XARCH_OPTION_NEW/32 = -m32
-XARCH_OPTION_NEW/64 = -m64
-# Lint options are slightly different
-LINT_XARCH_OPTION_OLD/32 =
-LINT_XARCH_OPTION_OLD/64 =
-LINT_XARCH_OPTION_NEW/32 = -m32
-LINT_XARCH_OPTION_NEW/64 = -m64
-ifeq ($(ARCH_FAMILY), sparc)
- ifdef VIS_NEEDED
- XARCH_OPTION_OLD/32 += -xarch=v8plusa
- XARCH_OPTION_OLD/64 += -xarch=v9a
- XARCH_OPTION_NEW/32 += -xarch=sparcvis
- XARCH_OPTION_NEW/64 += -xarch=sparcvis
- else
- # Someday this should change to improve optimization on UltraSPARC
- # and abandon v8, even change to sparcvis or sparcvis2, this
- # abandons machines like the SPARCstation 10.
- # Indications with jdk6 is that alacrity runs do not show a
- # big improvement using v8plus over v8, but other benchmarks might.
- XARCH_OPTION_OLD/32 += -xarch=v8
- XARCH_OPTION_OLD/64 += -xarch=v9
- # Note that this new option (SS12+) effectively means v8plus
- XARCH_OPTION_NEW/32 += -xarch=sparc
- XARCH_OPTION_NEW/64 += -xarch=sparc
- endif
- LINT_XARCH_OPTION_OLD/64 += -Xarch=v9
-endif
-ifeq ($(ARCH_FAMILY), i586)
- XARCH_OPTION_OLD/64 += -xarch=amd64
- LINT_XARCH_OPTION_OLD/64 += -Xarch=amd64
-endif
-# Pick the options we want based on the compiler being used. (5.9 or newer)
-CC_59_OR_NEWER := \
- $(shell expr $(CC_MAJORVER) \> 5 \| \
- \( $(CC_MAJORVER) = 5 \& $(CC_MINORVER) \>= 9 \) )
-ifeq ($(CC_59_OR_NEWER), 1)
- XARCH_OPTION/32 = $(XARCH_OPTION_NEW/32)
- XARCH_OPTION/64 = $(XARCH_OPTION_NEW/64)
- LINT_XARCH_OPTION/32 = $(LINT_XARCH_OPTION_NEW/32)
- LINT_XARCH_OPTION/64 = $(LINT_XARCH_OPTION_NEW/64)
-else
- XARCH_OPTION/32 = $(XARCH_OPTION_OLD/32)
- XARCH_OPTION/64 = $(XARCH_OPTION_OLD/64)
- LINT_XARCH_OPTION/32 = $(LINT_XARCH_OPTION_OLD/32)
- LINT_XARCH_OPTION/64 = $(LINT_XARCH_OPTION_OLD/64)
-endif
-XARCH_OPTION = $(XARCH_OPTION/$(ARCH_DATA_MODEL))
-LINT_XARCH_OPTION = $(LINT_XARCH_OPTION/$(ARCH_DATA_MODEL))
-# The /usr/ccs/bin/as assembler always wants the older SS11 (5.8) options.
-AS_XARCH_OPTION = $(XARCH_OPTION_OLD/$(ARCH_DATA_MODEL))
-
diff --git a/jdk/make/common/shared/Defs-control.gmk b/jdk/make/common/shared/Defs-control.gmk
deleted file mode 100644
index 50dd44a..0000000
--- a/jdk/make/common/shared/Defs-control.gmk
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Common variables used by all the Java makefiles. This file should
-# not contain rules.
-#
-
-# WARNING: This file is shared with other components.
-#
-
-ifndef JDK_MAKE_SHARED_DIR
- JDK_MAKE_SHARED_DIR = $(JDK_TOPDIR)/make/common/shared
-endif
-
-ifndef HOTSPOT_TOPDIR
- HOTSPOT_TOPDIR=$(TOPDIR)/hotspot
-endif
-ifndef LANGTOOLS_TOPDIR
- LANGTOOLS_TOPDIR=$(TOPDIR)/langtools
-endif
-ifndef CORBA_TOPDIR
- CORBA_TOPDIR=$(TOPDIR)/corba
-endif
-ifndef JAXP_TOPDIR
- JAXP_TOPDIR=$(TOPDIR)/jaxp
-endif
-ifndef JAXWS_TOPDIR
- JAXWS_TOPDIR=$(TOPDIR)/jaxws
-endif
-ifndef JDK_TOPDIR
- JDK_TOPDIR=$(TOPDIR)/jdk
-endif
-ifndef INSTALL_TOPDIR
- INSTALL_TOPDIR=$(TOPDIR)/install
-endif
-ifndef SPONSORS_TOPDIR
- SPONSORS_TOPDIR=$(TOPDIR)/sponsors
-endif
-ifndef DEPLOY_TOPDIR
- DEPLOY_TOPDIR=$(TOPDIR)/deploy
-endif
-
-# Get shared platform settings
-include $(JDK_MAKE_SHARED_DIR)/Platform.gmk
-
-# Default directory immediately above the "build" output directory (OUTPUTDIR)
-BUILD_PARENT_DIRECTORY=$(TOPDIR)
-
-# Get platform specific settings
-include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
-
-SRC_BUNDLEDIR = $(OUTPUTDIR)/source-bundles
-ABS_SRC_BUNDLEDIR = $(ABS_OUTPUTDIR)/source-bundles
-BIN_BUNDLEDIR = $(OUTPUTDIR)/bundles
-BIN_DEMOS_BUNDLEDIR = $(OUTPUTDIR)/demos-bundles
-ABS_BIN_BUNDLEDIR = $(ABS_OUTPUTDIR)/bundles
-
-dummy := $(shell $(MKDIR) -p $(BIN_BUNDLEDIR))
-dummy := $(shell $(MKDIR) -p $(BIN_DEMOS_BUNDLEDIR) )
-dummy := $(shell $(MKDIR) -p $(SRC_BUNDLEDIR) )
-
-TEMP_DIR = $(OUTPUTDIR)/tmp
-ABS_TEMP_DIR = $(ABS_OUTPUTDIR)/tmp
-
-dummy := $(shell $(MKDIR) -p $(TEMP_DIR))
-
-# The language version we want for this jdk build
-SOURCE_LANGUAGE_VERSION=8
-# The class version we want for this jdk build
-TARGET_CLASS_VERSION=8
-
-# The MESSAGE, WARNING and ERROR files are used to store sanity check and
-# source check messages, warnings and errors.
-export ERROR_FILE := $(ABS_OUTPUTDIR)/sanityCheckErrors.txt
-export WARNING_FILE := $(ABS_OUTPUTDIR)/sanityCheckWarnings.txt
-export MESSAGE_FILE := $(ABS_OUTPUTDIR)/sanityCheckMessages.txt
-
-# source bundle generation definitions
-BUNDLE_DATE := $(shell $(DATE) '+%d_%b_%Y' | $(TR) "[A-Z]" "[a-z]")
-ifdef ALT_BUNDLE_DATE
- BUNDLE_DATE := $(ALT_BUNDLE_DATE)
-endif
-
-# If the update version contains non-numeric characters, we need
-# to massage it into a numeric format. Unfortunately, the
-# Windows VERSIONINFO resource that we stick in jvm.dll cannot
-# handle non-numeric characters. We have to do this here because
-# Hotspot (nmake) cannot handle calculations. So we use the
-# following formula:
-# COOKED_JDK_UPDATE_VERSION = JDK_UPDATE_VERSION * 10 + EXCEPTION_VERSION
-#
-# Here are some examples:
-# 1.5.0 b01 -> 5,0,0,1
-# 1.5.0_10 b01 -> 5,0,100,1
-# 1.4.2 b01 -> 4,2,0,1
-# 1.4.2_02 b01 -> 4,2,20,1
-# 1.4.2_02a b01 -> 4,2,21,1
-# 1.4.2_02b b01 -> 4,2,22,1
-ifdef JDK_UPDATE_VERSION
- VTMP := $(shell $(ECHO) $(JDK_UPDATE_VERSION) | $(TR) "abcde" "12345")
- CHAR1 := $(shell $(ECHO) $(VTMP) | $(NAWK) '{print substr($$1, 1, 1);}')
- CHAR2 := $(shell $(ECHO) $(VTMP) | $(NAWK) '{print substr($$1, 2, 1);}')
- CHAR3 := $(shell $(ECHO) $(VTMP) | $(NAWK) '{print substr($$1, 3, 1);}')
- ifeq ($(CHAR3),)
- CHAR3 := 0
- endif
- ifeq ($(CHAR1), 0)
- COOKED_JDK_UPDATE_VERSION := $(CHAR2)$(CHAR3)
- else
- COOKED_JDK_UPDATE_VERSION := $(CHAR1)$(CHAR2)$(CHAR3)
- endif
-endif
-
-ifneq ($(JDK_BUILD_NUMBER),)
- COOKED_BUILD_NUMBER = $(shell $(ECHO) $(JDK_BUILD_NUMBER) \
- | $(SED) -e 's/^b//' | $(SED) -e 's/^0//')
-else
- COOKED_BUILD_NUMBER = 0
-endif
-
diff --git a/jdk/make/common/shared/Defs-java.gmk b/jdk/make/common/shared/Defs-java.gmk
deleted file mode 100644
index 0d755ed..0000000
--- a/jdk/make/common/shared/Defs-java.gmk
+++ /dev/null
@@ -1,245 +0,0 @@
-#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Common java/javac/jdk variables used by all the Java makefiles.
-# This file should not contain rules.
-#
-
-# WARNING: This file is shared with other workspaces.
-# So when it includes other files, it must use JDK_TOPDIR.
-#
-
-#
-# Memory related -J flags that all uses of java tools should use.
-#
-JAVA_MEM_FLAGS = -Xmx$(MAX_VM_MEMORY)m
-ifeq ($(ARCH), ia64)
- # Special flags for javac on ia64 to work around a VM problem with
- # bad code generation during inlining (what version had this problem?):
- # Suspect this may not be needed anymore.
- JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
-else
- JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m
-endif
-
-#
-# All java tools (javac, javah, and javadoc) run faster with certain java
-# options, this macro should be used with all these tools.
-# In particular, the client VM makes these tools run faster when
-# it's available.
-#
-ADD_CLIENT_VM_OPTION = false
-ifeq ($(PLATFORM), solaris)
- ADD_CLIENT_VM_OPTION = true
-else
- ifeq ($(ARCH_DATA_MODEL), 32)
- ADD_CLIENT_VM_OPTION = true
- endif
-endif
-
-# Options for hotspot to turn off printing of options with fastdebug version
-# and creating the hotspot.log file.
-JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
- -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
-
-# JVM options
-ifeq ($(PLATFORM), macosx)
- JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS) -Djava.awt.headless=true
-else
- JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
-endif
-
-ifeq ($(ADD_CLIENT_VM_OPTION), true)
- JAVA_JVM_FLAGS += -client
-endif
-ifdef USE_HOTSPOT_INTERPRETER_MODE
- JAVA_JVM_FLAGS += -Xint
-endif
-
-# Various VM flags
-JAVA_TOOLS_FLAGS = $(JAVA_JVM_FLAGS) $(JAVA_MEM_FLAGS)
-
-# The VM flags for javac
-JAVAC_JVM_FLAGS =
-
-# 64-bit builds require a larger thread stack size.
-ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
-else
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
-endif
-JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
-
-# The jar -J options are special, must be added at the end of the command line
-JAR_JFLAGS = $(JAVA_TOOLS_FLAGS:%=-J%)
-
-# JAVA_TOOLS_DIR is the default location to find Java tools to run, if
-# langtools is not available.
-# This should be the latest promoted JDK javac.
-ifndef JAVA_TOOLS_DIR
- JAVA_TOOLS_DIR = $(JDK_IMPORT_PATH)/bin
-endif
-
-#
-# Invoking the Java compiler. In leaf makefiles, choose as follows:
-# -- Use JAVAC if you want to take full control of what options get
-# passed to javac.
-# -- Use JAVAC_CMD if you want to take the defaults given to you.
-#
-
-ifndef DEBUG_CLASSFILES
- ifeq ($(VARIANT), DBG)
- DEBUG_CLASSFILES = true
- endif
-endif
-JAVACFLAGS =
-ifeq ($(DEBUG_CLASSFILES),true)
- JAVACFLAGS += -g
-endif
-ifeq ($(JAVAC_MAX_WARNINGS), true)
- JAVAC_LINT_OPTIONS += -Xlint:all
-endif
-ifeq ($(JAVAC_WARNINGS_FATAL), true)
- JAVACFLAGS += -Werror
-endif
-
-# TODO: Workaround for CR 7063027. Remove -path eventually.
-JAVAC_LINT_OPTIONS += -Xlint:-path
-
-JAVACFLAGS += $(JAVAC_LINT_OPTIONS)
-
-#
-# Some licensees do not get the Security Source bundles. We will
-# fall back on the prebuilt jce.jar so that we can do a best
-# attempt at building. If sources exist, we always want to
-# build/use the most recent source instead of an older jce.jar, whether
-# built implicitly/explicitly.
-#
-ifeq ($(wildcard $(SHARE_SRC)/classes/javax/crypto/Cipher.java),)
- JCE_PATH = $(CLASSPATH_SEPARATOR)$(LIBDIR)/jce.jar
-endif
-
-# Add the source level
-SOURCE_LANGUAGE_VERSION = 8
-LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION)
-JAVACFLAGS += $(LANGUAGE_VERSION)
-
-# Add the class version we want
-TARGET_CLASS_VERSION = 8
-CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
-JAVACFLAGS += $(CLASS_VERSION)
-JAVACFLAGS += -encoding ascii
-JAVACFLAGS += "-Xbootclasspath:$(CLASSBINDIR)$(JCE_PATH)"
-JAVACFLAGS += $(OTHER_JAVACFLAGS)
-
-# Needed for javah
-JAVAHFLAGS += -bootclasspath "$(CLASSBINDIR)$(JCE_PATH)"
-
-# Needed for javadoc to ensure it builds documentation
-# against the newly built classes
-JAVADOCFLAGS += -bootclasspath "$(CLASSBINDIR)$(JCE_PATH)"
-
-# Needed for JAVADOC and BOOT_JAVACFLAGS
-NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
-
-# Langtools
-ifdef LANGTOOLS_DIST
- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
- JAVAC_CMD = $(BOOT_JAVA_CMD) \
- "-Xbootclasspath/p:$(JAVAC_JAR)" \
- -jar $(JAVAC_JAR) $(JAVACFLAGS)
- JAVAH_CMD = $(BOOT_JAVA_CMD) \
- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
- -jar $(JAVAH_JAR) $(JAVAHFLAGS)
- JAVADOC_CMD = $(BOOT_JAVA_CMD) \
- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
- -jar $(JAVADOC_JAR) $(JAVADOCFLAGS)
-else
- # If no explicit tools, use boot tools (add VM flags in this case)
- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- $(JAVACFLAGS)
- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
- $(JAVAHFLAGS)
- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) \
- $(JAVADOCFLAGS)
-endif
-
-# Override of what javac to use (see deploy workspace)
-ifdef JAVAC
- JAVAC_CMD = $(JAVAC)
-endif
-
-#
-# The bootstrap java compiler (defined as the javac in the ALT_BOOTDIR jdk).
-# Will be used to compile java code used to build the jdk, e.g. class files
-# created by this compiler will NOT become part of this built jdk, but just
-# used to build this jdk, e.g. run with the java in the ALT_BOOTDIR jdk.
-#
-# The javac supplied with the LANGTOOLS_DIST should be used to build the
-# classes that will be put into the built jdk. But note that this javac
-# will use the ALT_BOOTDIR java runtime. Any classes created by the
-# LANGTOOLS_DIST javac should not be run during this jdk build and indeed
-# may not even run with the ALT_BOOTDIR jdk because they may be a newer
-# class file version that the ALT_BOOTDIR jdk doesn't understand.
-#
-# The important observation here is that the built jdk is NOT run during
-# the build. If the built jdk needs to be verified that it can build this
-# same jdk, then it should be supplied to the build process as the ALT_BOOTDIR
-# jdk, and this resulting built jdk should be compared to the first one.
-# (They should be the same). Re-using this built jdk as the ALT_BOOTDIR
-# jdk will be the only way and the recommeneded way to verify the built jdk
-# can bootstrap itself.
-#
-
-# The javac options supplied to the boot javac is limited. This compiler
-# should only be used to build the 'make/tools' sources, which are not
-# class files that end up in the classes directory.
-BOOT_JAVACFLAGS += $(JAVAC_LINT_OPTIONS)
-ifeq ($(JAVAC_WARNINGS_FATAL), true)
- BOOT_JAVACFLAGS += -Werror
-endif
-
-BOOT_JAVACFLAGS += -encoding ascii
-BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
-
-BOOT_JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS)
-
-BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
-BOOT_JAVAC_CMD = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
-BOOT_JAR_CMD = $(BOOTDIR)/bin/jar
-BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner
-
-# Various tools we need to run (FIXUP: Are these the right ones?)
-NATIVE2ASCII = $(BOOTDIR)/bin/native2ascii $(JAVA_TOOLS_FLAGS:%=-J%)
-RMIC = $(BOOTDIR)/bin/rmic $(JAVA_TOOLS_FLAGS:%=-J%)
-IDLJ = $(BOOTDIR)/bin/idlj $(JAVA_TOOLS_FLAGS:%=-J%)
-
-# Should not be used
-JAVA = /should/not/be/used
-
diff --git a/jdk/make/common/shared/Defs-javadoc.gmk b/jdk/make/common/shared/Defs-javadoc.gmk
deleted file mode 100644
index c222ad1..0000000
--- a/jdk/make/common/shared/Defs-javadoc.gmk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Copyright year for beginning of Java and some of the apis
-# (Needed when creating the javadocs)
-FIRST_COPYRIGHT_YEAR = 1993
-DOMAPI_FIRST_COPYRIGHT_YEAR = 2005
-MIRROR_FIRST_COPYRIGHT_YEAR = 2004
-DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993
-TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993
-JDI_FIRST_COPYRIGHT_YEAR = 1999
-JAAS_FIRST_COPYRIGHT_YEAR = 1998
-JGSS_FIRST_COPYRIGHT_YEAR = 2000
-SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005
-HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005
-MGMT_FIRST_COPYRIGHT_YEAR = 2003
-ATTACH_FIRST_COPYRIGHT_YEAR = 2005
-JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006
-SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
-TRACING_FIRST_COPYRIGHT_YEAR = 2008
-TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
-JNLP_FIRST_COPYRIGHT_YEAR = 1998
-PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
-
-# Oracle name
-FULL_COMPANY_NAME = Oracle and/or its affiliates
-
-# Copyright address
-COMPANY_ADDRESS = 500 Oracle Parkway<br>Redwood Shores, CA 94065 USA.
-
-# The trademark symbol
-TRADEMARK = ™
-
-# Common copyright lines used
-# The word "Copyright" might optionally be a link to the file cpyr.html.
-# The first year of copyright may vary or not be available.
-# The address to the company might be optional.
-COMMA:= ,
-EMPTY:=
-SPACE:=$(EMPTY) $(EMPTY)
-COPYRIGHT_SYMBOL = &\#x00a9;
-# Macro to construct the copyright line
-# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
-define CopyrightLine # optionalurl optionalfirstyear optionaladdress
-$(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
-$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
-$(FULL_COMPANY_NAME). $3 All rights reserved.
-endef
-
diff --git a/jdk/make/common/shared/Defs-linux.gmk b/jdk/make/common/shared/Defs-linux.gmk
deleted file mode 100644
index 722ff0c..0000000
--- a/jdk/make/common/shared/Defs-linux.gmk
+++ /dev/null
@@ -1,223 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Definitions for Linux.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Linux (C & C++ compiler warnings)
-ifndef COMPILER_WARNINGS_FATAL
- COMPILER_WARNINGS_FATAL=false
-endif
-
-# Linux should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
- COMPILE_APPROACH = parallel
-endif
-
-# Indication that we are doing an incremental build.
-# This may trigger the creation of make depend files.
-ifndef INCREMENTAL_BUILD
- INCREMENTAL_BUILD = false
-endif
-
-# FullPath just makes sure it never ends with a / and no duplicates
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# OptFullPath: Absolute path name of a dir that might not initially exist.
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-
-# Location on system where jdk installs might be
-USRJDKINSTANCES_PATH =/opt/java
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
-else
- UNIXCOMMAND_PATH = /bin/
-endif
-
-# USRBIN_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_USRBIN_PATH)" "undefined"
- USRBIN_PATH :=$(call PrefixPath,$(ALT_USRBIN_PATH))
-else
- USRBIN_PATH = /usr/bin/
-endif
-
-# UNIXCCS_PATH: path to where the Solaris ported UNIX commands can be found
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
- UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
-else
- UNIXCCS_PATH = /usr/ccs/bin/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-ifdef ALT_SLASH_JAVA
- SLASH_JAVA :=$(ALT_SLASH_JAVA)
-else
- SLASH_JAVA := $(call DirExists,/java,/java,/NOT-SET)
-endif
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifdef ALT_JDK_DEVTOOLS_DIR
- JDK_DEVTOOLS_DIR =$(ALT_JDK_DEVTOOLS_DIR)
-else
- JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-endif
-
-# COMPILER_PATH: path to where the compiler and tools are installed.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_COMPILER_PATH)" "undefined"
- COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH))
-else
- COMPILER_PATH =/usr/bin/
-endif
-
-# OPENWIN_HOME: path to where the X11 environment is installed.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq ($(ALT_OPENWIN_HOME),)
- OPENWIN_HOME :=$(call PrefixPath,$(ALT_OPENWIN_HOME))
-else
- OPENWIN_HOME =/usr/X11R6/
-endif
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
- DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
-else
- DEVTOOLS_PATH =/usr/bin/
-endif
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-ifndef ALT_BOOTDIR
- _BOOTDIR1 =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
- _BOOTDIR2 =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-endif
-
-# Always build headless on Linux
-BUILD_HEADLESS = true
-LIBM=-lm
-
-# Set ZLIB_LIBS if not already set
-ifeq ("$(ZLIB_LIBS)", "")
- ZLIB_LIBS=-lz
-endif
-
-# GCC29_COMPILER_PATH: is the path to where the gcc 2.9 compiler is installed
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifdef ALT_GCC29_COMPILER_PATH
- GCC29_COMPILER_PATH :=$(call PrefixPath,$(ALT_GCC29_COMPILER_PATH))
-else
- GCC29_COMPILER_PATH = $(JDK_DEVTOOLS_DIR)/$(PLATFORM)/gcc29/usr/
-endif
-
-_CUPS_HEADERS_PATH=/usr/include
-
-# Import JDK images allow for partial builds, components not built are
-# imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
-# multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
-ifdef ALT_BUILD_JDK_IMPORT_PATH
- BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-else
- BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
-endif
-BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-
-# JDK_IMPORT_PATH: location of JDK install tree (this version) to import
-ifdef ALT_JDK_IMPORT_PATH
- JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-else
- JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-endif
-JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-
-# HOTSPOT_IMPORT_PATH: location of hotspot pre-built files
-ifdef ALT_HOTSPOT_IMPORT_PATH
- HOTSPOT_IMPORT_PATH :=$(call FullPath,$(ALT_HOTSPOT_IMPORT_PATH))
-else
- HOTSPOT_IMPORT_PATH =$(JDK_IMPORT_PATH)
-endif
-HOTSPOT_IMPORT_PATH:=$(call AltCheckValue,HOTSPOT_IMPORT_PATH)
-
-# HOTSPOT_CLIENT_PATH: location of client jvm library file.
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifdef ALT_HOTSPOT_CLIENT_PATH
- HOTSPOT_CLIENT_PATH :=$(call FullPath,$(ALT_HOTSPOT_CLIENT_PATH))
- else
- HOTSPOT_CLIENT_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/client
- endif
- HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
-endif
-
-# HOTSPOT_SERVER_PATH: location of server jvm library file.
-ifdef ALT_HOTSPOT_SERVER_PATH
- HOTSPOT_SERVER_PATH :=$(call FullPath,$(ALT_HOTSPOT_SERVER_PATH))
-else
- HOTSPOT_SERVER_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/server
-endif
-HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
-
-# Special define for checking the binaries
-
-# Debug builds should downgrade warnings to just info
-MAPFILE_WARNING-DBG=INFO
-MAPFILE_WARNING-OPT=WARNING
-MAPFILE_WARNING-=WARNING
-MAPFILE_WARNING=$(MAPFILE_WARNING-$(VARIANT))
-
-# Macro to check it's input file for banned dependencies and verify the
-# binary built properly. Relies on process exit code.
-ifndef CROSS_COMPILE_ARCH
-define binary_file_verification # binary_file
-( \
- $(ECHO) "Checking for mapfile use in: $1" && \
- if [ "`$(NM) -D -g --defined-only $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
- $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
- fi && \
- $(ECHO) "Library loads for: $1" && \
- $(LDD) $1 && \
- $(ECHO) "RUNPATH for: $1" && \
- ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
-)
-endef
-else
-define binary_file_verification
-( \
- $(ECHO) "Skipping binary file verification for cross-compile build" \
-)
-endef
-endif
-
diff --git a/jdk/make/common/shared/Defs-macosx.gmk b/jdk/make/common/shared/Defs-macosx.gmk
deleted file mode 100644
index e858344..0000000
--- a/jdk/make/common/shared/Defs-macosx.gmk
+++ /dev/null
@@ -1,257 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Definitions for Bsd.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Bsd (C & C++ compiler warnings)
-ifndef COMPILER_WARNINGS_FATAL
- COMPILER_WARNINGS_FATAL=false
-endif
-
-# Bsd should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
- COMPILE_APPROACH = parallel
-endif
-
-# Indication that we are doing an incremental build.
-# This may trigger the creation of make depend files.
-ifndef INCREMENTAL_BUILD
- INCREMENTAL_BUILD = false
-endif
-
-# FullPath just makes sure it never ends with a / and no duplicates
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# OptFullPath: Absolute path name of a dir that might not initially exist.
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-
-# Location on system where jdk installs might be
-USRJDKINSTANCES_PATH = $(PACKAGE_PATH)
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
-else
- UNIXCOMMAND_PATH = /bin/
-endif
-
-# USRBIN_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_USRBIN_PATH)" "undefined"
- USRBIN_PATH :=$(call PrefixPath,$(ALT_USRBIN_PATH))
-else
- USRBIN_PATH = /usr/bin/
-endif
-
-# UNIXCCS_PATH: path to where the Solaris ported UNIX commands can be found
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
- UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
-else
- UNIXCCS_PATH = /usr/ccs/bin/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-ifdef ALT_SLASH_JAVA
- SLASH_JAVA :=$(ALT_SLASH_JAVA)
-else
- SLASH_JAVA := $(call DirExists,/java,/java,/NOT-SET)
-endif
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifdef ALT_JDK_DEVTOOLS_DIR
- JDK_DEVTOOLS_DIR =$(ALT_JDK_DEVTOOLS_DIR)
-else
- JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-endif
-
-# COMPILER_PATH: path to where the compiler and tools are installed.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_COMPILER_PATH)" "undefined"
- COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH))
-else
- ifeq ($(OS_VENDOR), Apple)
- ifndef DEVELOPER_DIR
- DEVELOPER_DIR = $(shell /usr/bin/xcode-select -print-path)/usr/bin/
- endif
-
- COMPILER_PATH := $(call DirExists,$(DEVELOPER_DIR),/usr/bin/,/NOT-SET)
- else
- COMPILER_PATH =/usr/bin/
- endif
-endif
-
-# OPENWIN_HOME: path to where the X11 environment is installed.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq ($(ALT_OPENWIN_HOME),)
- OPENWIN_HOME :=$(call PrefixPath,$(ALT_OPENWIN_HOME))
-else
- OPENWIN_HOME =$(X11_PATH)
-endif
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
- DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
-else
- DEVTOOLS_PATH =$(PACKAGE_PATH)/bin/
-endif
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-ifndef ALT_BOOTDIR
- _BOOTDIR1 =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
- _BOOTDIR2 =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-endif
-
-# Always build headless on Bsd
-BUILD_HEADLESS = true
-LIBM=-lm
-
-ifeq ($(OS_VENDOR), Apple)
- _CUPS_HEADERS_PATH=/usr/include
-else
- _CUPS_HEADERS_PATH=$(PACKAGE_PATH)/include
-endif
-
-# Set ZLIB_LIBS if not already set
-ifeq ("$(ZLIB_LIBS)", "")
- ZLIB_LIBS=-lz
-endif
-
-# Import JDK images allow for partial builds, components not built are
-# imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
-# multiple platforms, e.g. windows-i586, solaris-sparc, bsd-586, etc.
-ifdef ALT_BUILD_JDK_IMPORT_PATH
- BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-else
- BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
-endif
-BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-
-# JDK_IMPORT_PATH: location of JDK install tree (this version) to import
-ifdef ALT_JDK_IMPORT_PATH
- JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-else
- JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-endif
-JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-
-# HOTSPOT_IMPORT_PATH: location of hotspot pre-built files
-ifdef ALT_HOTSPOT_IMPORT_PATH
- HOTSPOT_IMPORT_PATH :=$(call FullPath,$(ALT_HOTSPOT_IMPORT_PATH))
-else
- HOTSPOT_IMPORT_PATH =$(JDK_IMPORT_PATH)
-endif
-HOTSPOT_IMPORT_PATH:=$(call AltCheckValue,HOTSPOT_IMPORT_PATH)
-
-# HOTSPOT_CLIENT_PATH: location of client jvm library file.
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifdef ALT_HOTSPOT_CLIENT_PATH
- HOTSPOT_CLIENT_PATH :=$(call FullPath,$(ALT_HOTSPOT_CLIENT_PATH))
- else
- HOTSPOT_CLIENT_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/client
- endif
- HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
-endif
-
-# HOTSPOT_SERVER_PATH: location of server jvm library file.
-ifdef ALT_HOTSPOT_SERVER_PATH
- HOTSPOT_SERVER_PATH :=$(call FullPath,$(ALT_HOTSPOT_SERVER_PATH))
-else
- HOTSPOT_SERVER_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/server
-endif
-HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
-
-# Special define for checking the binaries
-
-# Debug builds should downgrade warnings to just info
-MAPFILE_WARNING-DBG=INFO
-MAPFILE_WARNING-OPT=WARNING
-MAPFILE_WARNING-=WARNING
-MAPFILE_WARNING=$(MAPFILE_WARNING-$(VARIANT))
-
-# Macro to check it's input file for banned dependencies and verify the
-# binary built properly. Relies on process exit code.
-ifndef CROSS_COMPILE_ARCH
-ifeq ($(OS_VENDOR), Apple)
-define binary_file_verification # binary_file
-( \
- $(ECHO) "Checking for mapfile use in: $1" && \
- if [ "`$(NM) -g $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
- $(ECHO) "WARNING: File was not built with a mapfile: $1"; \
- fi && \
- $(ECHO) "Library loads for: $1" && \
- $(OTOOL) -L $1 && \
- $(ECHO) "RUNPATH for: $1" && \
- ( $(OTOOL) -l $1 | $(EGREP) 'path ' ) \
-) || true
-endef
-else
-ifeq ($(OS_VENDOR), OpenBSD)
-define binary_file_verification # binary_file
-( \
- $(ECHO) "Checking for mapfile use in: $1" && \
- if [ "`$(OBJDUMP) -T $1 | $(EGREP) '[0-9a-f]* g *DF \.text.*SUNWprivate'`" = "" ] ; then \
- $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
- fi && \
- $(ECHO) "Library loads for: $1" && \
- $(LDD) $1 && \
- $(ECHO) "RUNPATH for: $1" && \
- ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
-) || true
-endef
-else
-define binary_file_verification # binary_file
-( \
- $(ECHO) "Checking for mapfile use in: $1" && \
- if [ "`$(NM) -D -g --defined-only $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
- $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
- fi && \
- $(ECHO) "Library loads for: $1" && \
- $(LDD) $1 && \
- $(ECHO) "RUNPATH for: $1" && \
- ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
-)
-endef
-endif # OS_VENDOR == OpenBSD
-endif # OS_VENDOR == Apple
-else
-define binary_file_verification
-( \
- $(ECHO) "Skipping binary file verification for cross-compile build" \
-)
-endef
-endif
-
diff --git a/jdk/make/common/shared/Defs-solaris.gmk b/jdk/make/common/shared/Defs-solaris.gmk
deleted file mode 100644
index c888a98..0000000
--- a/jdk/make/common/shared/Defs-solaris.gmk
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Definitions for Solaris.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Solaris (C & C++ compiler warnings)
-ifndef COMPILER_WARNINGS_FATAL
- COMPILER_WARNINGS_FATAL=false
-endif
-
-# Solaris should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
- COMPILE_APPROACH = parallel
-endif
-
-# Indication that we are doing an incremental build.
-# This may trigger the creation of make depend files.
-ifndef INCREMENTAL_BUILD
- INCREMENTAL_BUILD = false
-endif
-
-# FullPath just makes sure it never ends with a / and no duplicates
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# OptFullPath: Absolute path name of a dir that might not initially exist.
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-
-# Location on system where jdk installs might be
-USRJDKINSTANCES_PATH =/usr/jdk/instances
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
-else
- UNIXCOMMAND_PATH = /usr/bin/
-endif
-
-# UNIXCCS_PATH: path to where the less common UNIX commands can be found
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
- UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
-else
- UNIXCCS_PATH = /usr/ccs/bin/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-ifdef ALT_SLASH_JAVA
- SLASH_JAVA :=$(ALT_SLASH_JAVA)
-else
- SLASH_JAVA := $(call DirExists,/java,/java,/NOT-SET)
-endif
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifdef ALT_JDK_DEVTOOLS_DIR
- JDK_DEVTOOLS_DIR =$(ALT_JDK_DEVTOOLS_DIR)
-else
- JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-endif
-
-# COMPILER_PATH: path to where the compiler and tools are installed.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_COMPILER_PATH)" "undefined"
- COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH))
-else
- # If the place where we keep a set of Sun Studio compilers doesn't exist,
- # try and use /opt/SUNWspro, the default location for the SS compilers.
- # (DirExists checks for this path twice, an automount double check)
- _SUNSTUDIO_SET_ROOT=$(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/SUNWspro
- SUNSTUDIO_SET_ROOT:=$(call DirExists,$(_SUNSTUDIO_SET_ROOT),$(_SUNSTUDIO_SET_ROOT),)
- ifneq ($(SUNSTUDIO_SET_ROOT),)
- COMPILER_PATH =$(SUNSTUDIO_SET_ROOT)/$(REQUIRED_COMPILER_VERSION)/bin/
- else
- COMPILER_PATH =/opt/SUNWspro/bin/
- endif
-endif
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
- DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
-else
- ifdef ALT_JDK_DEVTOOLS_DIR
- DEVTOOLS_PATH =$(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/bin/
- else
- ifdef OPENJDK
- DEVTOOLS_PATH = /usr/bin/
- else
- DEVTOOLS_PATH =$(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/bin/
- endif
- endif
-endif
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-ifndef ALT_BOOTDIR
- _BOOTDIR1 =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
- _BOOTDIR2 =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-endif
-
-# GCC_COMPILER_PATH: path to where the gcc/g++ compiler and tools are installed
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_GCC_COMPILER_PATH)" "undefined"
- GCC_COMPILER_PATH :=$(call PrefixPath,$(ALT_GCC_COMPILER_PATH))
-else
- GCC_COMPILER_PATH = $(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/gnucc/bin/
-endif
-
-
-# Always build headless on Solaris
-BUILD_HEADLESS = true
-
-_CUPS_HEADERS_PATH=/opt/sfw/cups/include
-
-# Set ZLIB_LIBS if not already set
-ifeq ("$(ZLIB_LIBS)", "")
- ZLIB_LIBS=-lz
-endif
-
-# Import JDK images allow for partial builds, components not built are
-# imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
-# multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
-ifdef ALT_BUILD_JDK_IMPORT_PATH
- BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-else
- BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
-endif
-BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-
-# JDK_IMPORT_PATH: location of previously built JDK (this version) to import
-ifdef ALT_JDK_IMPORT_PATH
- JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-else
- JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-endif
-JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-
-# HOTSPOT_IMPORT_PATH: location of hotspot pre-built files
-ifdef ALT_HOTSPOT_IMPORT_PATH
- HOTSPOT_IMPORT_PATH :=$(call FullPath,$(ALT_HOTSPOT_IMPORT_PATH))
-else
- HOTSPOT_IMPORT_PATH =$(JDK_IMPORT_PATH)
-endif
-HOTSPOT_IMPORT_PATH:=$(call AltCheckValue,HOTSPOT_IMPORT_PATH)
-
-# HOTSPOT_CLIENT_PATH: location of client jvm library file.
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifdef ALT_HOTSPOT_CLIENT_PATH
- HOTSPOT_CLIENT_PATH :=$(call FullPath,$(ALT_HOTSPOT_CLIENT_PATH))
- else
- HOTSPOT_CLIENT_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/client
- endif
- HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
-endif
-
-# HOTSPOT_SERVER_PATH: location of server jvm library file.
-ifdef ALT_HOTSPOT_SERVER_PATH
- HOTSPOT_SERVER_PATH :=$(call FullPath,$(ALT_HOTSPOT_SERVER_PATH))
-else
- HOTSPOT_SERVER_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/server
-endif
-HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
-
-# Special define for checking the binaries
-
-# Debug builds should downgrade warnings to just info
-MAPFILE_WARNING-DBG=INFO
-MAPFILE_WARNING-OPT=WARNING
-MAPFILE_WARNING-=WARNING
-MAPFILE_WARNING=$(MAPFILE_WARNING-$(VARIANT))
-
-# Some libraries do not have mapfiles for multiple reasons.
-# These libraries for sparc and sparcv9 are exceptions to the mapfile rule:
-# libjdgaSUNWafb.so
-# libjdgaSUNWcg6.so
-# libjdgaSUNWffb.so
-# libjdgaSUNWm64.so
-# libxinerama.so
-# The JNI/JVMTI demo libraries are also missing mapfiles, no exceptions yet.
-ifeq ($(ARCH_FAMILY),sparc)
- MAPFILE_EXCEPTIONS = \
- (libjdgaSUNWafb|libjdgaSUNWcg6|libjdgaSUNWffb|libjdgaSUNWm64|libxinerama)
-else
- # At present there are no exceptions for non
- # SPARC. Use a harmless value.
- MAPFILE_EXCEPTIONS = (NO_EXCEPTIONS)
-endif
-
-# Macro to check it's input file for banned dependencies and verify the
-# binary built properly. Relies on process exit code.
-ifndef CROSS_COMPILE_ARCH
-define binary_file_verification # binary_file
-( \
- $(ECHO) "Checking for mapfile use in: $1" && \
- if [ "`$(ECHO) $(basename $(notdir $1)) | $(EGREP) '$(MAPFILE_EXCEPTIONS)'`" = "" \
- -a "`$(NM) -g -D $1 | $(EGREP) -v 'UNDEF' | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
- $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
- fi && \
- $(ECHO) "Library loads for: $1" && \
- $(LDD) $1 && \
- $(ECHO) "RUNPATH for: $1" && \
- ( $(DUMP) -L -v $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
-)
-endef
-else
-define binary_file_verification
-( \
- $(ECHO) "Skipping binary file verification for cross-compile build" \
-)
-endef
-endif
-
diff --git a/jdk/make/common/shared/Defs-utils.gmk b/jdk/make/common/shared/Defs-utils.gmk
deleted file mode 100644
index a14a08d..0000000
--- a/jdk/make/common/shared/Defs-utils.gmk
+++ /dev/null
@@ -1,259 +0,0 @@
-#
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Shared variables for standard unix utilties on all platforms.
-#
-# Assumes Platform.gmk has been included before this file.
-#
-# These input UTILS_* variables can be defined at anytime, ideally once.
-# Unix Commands: Normally /bin/, /usr/bin/. or C:/mksnt/mksnt/
-# UTILS_COMMAND_PATH
-# /usr/bin/
-# UTILS_USR_BIN_PATH
-# /usr/ccs/bin/ (m4, lex, yacc, as, ar, strip, mcs)
-# UTILS_CCS_BIN_PATH
-# Dev Tools: zip, unzip, etc that we may have special versions of
-# UTILS_DEVTOOL_PATH
-#
-# WARNING: This file cannot assume that any of these utilties are available
-# to be run via their variable names defined here.
-# The paths inside the UTILS_* variables may not be defined yet.
-#
-# Note: There is no guarantee that all these exist on all platforms.
-# Some only make sense for one platform, but are harmless.
-#
-
-ifeq ($(PLATFORM),linux)
- UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
- UTILS_USR_BIN_PATH=$(USRBIN_PATH)
- UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
- UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
-endif
-
-ifeq ($(PLATFORM),solaris)
- UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
- UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
- UTILS_CCS_BIN_PATH=$(UNIXCCS_PATH)
- UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
-endif
-
-ifeq ($(PLATFORM),windows)
- UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
- UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
- UTILS_CCS_BIN_PATH=$(UNIXCOMMAND_PATH)
- UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
-endif
-
-ifeq ($(PLATFORM),macosx)
- UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
- UTILS_USR_BIN_PATH=$(USRBIN_PATH)
- UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
- UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
-endif
-
-ifndef CONFIGURE_BUILD
- # Utilities
- ifdef CROSS_COMPILE_ARCH
- AR = $(COMPILER_PATH)ar
- AS = $(COMPILER_PATH)as
- LD = $(COMPILER_PATH)ld
- MCS = $(COMPILER_PATH)mcs
- NM = $(COMPILER_PATH)nm
- STRIP = $(COMPILER_PATH)strip
- else
- AR = $(UTILS_CCS_BIN_PATH)ar
- AS = $(UTILS_CCS_BIN_PATH)as
- LD = $(UTILS_CCS_BIN_PATH)ld
- MCS = $(UTILS_CCS_BIN_PATH)mcs
- NM = $(UTILS_CCS_BIN_PATH)nm
- STRIP = $(UTILS_CCS_BIN_PATH)strip
- endif
-endif # CONFIGURE_BUILD
-
-ADB = $(UTILS_COMMAND_PATH)adb
-BASENAME = $(UTILS_COMMAND_PATH)basename
-BZIP2 = $(UTILS_COMMAND_PATH)bzip2
-CAT = $(UTILS_COMMAND_PATH)cat
-CHMOD = $(UTILS_COMMAND_PATH)chmod
-CMP = $(UTILS_USR_BIN_PATH)cmp
-COMM = $(UTILS_USR_BIN_PATH)comm
-COMPRESS = $(UTILS_USR_BIN_PATH)compress
-CP = $(UTILS_COMMAND_PATH)cp
-CPIO = $(UTILS_COMMAND_PATH)cpio
-CUT = $(UTILS_USR_BIN_PATH)cut
-DATE = $(UTILS_COMMAND_PATH)date
-DF = $(UTILS_COMMAND_PATH)df
-DIFF = $(UTILS_USR_BIN_PATH)diff
-DIRNAME = $(UTILS_USR_BIN_PATH)dirname
-DUMP = $(UTILS_CCS_BIN_PATH)dump
-ECHO = $(UTILS_COMMAND_PATH)echo
-EGREP = $(UTILS_COMMAND_PATH)egrep
-EXPR = $(UTILS_USR_BIN_PATH)expr
-FILE = $(UTILS_USR_BIN_PATH)file
-FIND = $(UTILS_USR_BIN_PATH)find
-FMT = $(UTILS_COMMAND_PATH)fmt
-GDB = $(UTILS_USR_BIN_PATH)gdb
-GREP = $(UTILS_COMMAND_PATH)grep
-GUNZIP = $(UTILS_COMMAND_PATH)gunzip
-# GZIP is used for solaris. Linux and windows use tar czf
-GZIP = $(UTILS_COMMAND_PATH)gzip
-HEAD = $(UTILS_USR_BIN_PATH)head
-HG = hg
-ID = $(UTILS_COMMAND_PATH)id
-ISAINFO = $(UTILS_COMMAND_PATH)isainfo
-KSH = $(UTILS_COMMAND_PATH)ksh
-LDD = $(UTILS_USR_BIN_PATH)ldd
-LEX = $(UTILS_CCS_BIN_PATH)lex
-LN = $(UTILS_COMMAND_PATH)ln
-LS = $(UTILS_COMMAND_PATH)ls
-M4 = $(UTILS_CCS_BIN_PATH)m4
-MKDIR = $(UTILS_COMMAND_PATH)mkdir
-MKSINFO = $(UTILS_COMMAND_PATH)mksinfo
-MSGFMT = $(UTILS_USR_BIN_PATH)msgfmt
-MV = $(UTILS_COMMAND_PATH)mv
-NAWK = $(UTILS_USR_BIN_PATH)nawk
-OTOOL = $(UTILS_USR_BIN_PATH)otool
-PKGMK = $(UTILS_COMMAND_PATH)pkgmk
-PRINTF = $(UTILS_USR_BIN_PATH)printf
-PWD = $(UTILS_COMMAND_PATH)pwd
-READELF = $(UTILS_USR_BIN_PATH)readelf
-RMDIR = $(UTILS_COMMAND_PATH)rmdir
-RPM = $(UTILS_COMMAND_PATH)rpm
-RPMBUILD = $(UTILS_COMMAND_PATH)rpmbuild
-SED = $(UTILS_COMMAND_PATH)sed
-SH = $(UTILS_COMMAND_PATH)sh
-SHOWREV = $(UTILS_USR_BIN_PATH)showrev
-SORT = $(UTILS_COMMAND_PATH)sort
-TAIL = $(UTILS_USR_BIN_PATH)tail
-TAR = $(UTILS_COMMAND_PATH)tar
-TEST = $(UTILS_USR_BIN_PATH)test
-TOUCH = $(UTILS_COMMAND_PATH)touch
-TR = $(UTILS_USR_BIN_PATH)tr
-TRUE = $(UTILS_COMMAND_PATH)true
-UNAME = $(UTILS_COMMAND_PATH)uname
-UNIQ = $(UTILS_USR_BIN_PATH)uniq
-UNZIP = $(UTILS_USR_BIN_PATH)unzip
-UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
-XARGS = $(UTILS_USR_BIN_PATH)xargs
-WC = $(UTILS_USR_BIN_PATH)wc
-WHICH = $(UTILS_USR_BIN_PATH)which
-YACC = $(UTILS_CCS_BIN_PATH)yacc
-ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
-
-# Special cases
-#RM is defined by GNU Make as 'rm -f'
-CD = cd # intrinsic unix command
-
-# Windows specific
-ifeq ($(PLATFORM),windows)
- ifdef USING_CYGWIN
- # Intrinsic unix command, with backslash-escaped character interpretation
- ECHO = $(UNIXCOMMAND_PATH)echo -e
- ZIPEXE = $(UNIXCOMMAND_PATH)zip
- UNZIP = $(UNIXCOMMAND_PATH)unzip
- # Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
- NAWK = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
- else
- ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
- UNZIP = $(UTILS_DEVTOOL_PATH)unzip
- NAWK = $(UNIXCOMMAND_PATH)awk
- ifdef USING_MSYS
- ECHO = $(UTILS_COMMAND_PATH)echo -e
- AR = $(UTILS_DEVTOOL_PATH)ar
- endif
- endif
- # Re-define some utilities
- LEX =# override GNU Make intrinsic: no lex on windows
- SHA1SUM = $(UNIXCOMMAND_PATH)openssl sha1
-endif
-
-# Linux specific
-ifeq ($(PLATFORM),linux)
- # A few redefines
- # Allows for builds on Debian GNU Linux, basename is in a different place
- BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
- $(wildcard $(UTILS_USR_BIN_PATH)basename))
- # RPM 4 has replaced "rpm -b" with an entirely new utility "rpmbuild".
- # Also, some distribution (Ubuntu, Debian, others?) place the rpm command
- # itself in /usr/bin rather than it's traditional home in /bin.
- RPM=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpm) \
- $(wildcard $(UTILS_USR_BIN_PATH)rpm))
- RPMBUILD=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpmbuild) \
- $(wildcard $(UTILS_USR_BIN_PATH)rpmbuild) \
- $(wildcard $(UTILS_COMMAND_PATH)rpm) \
- $(wildcard $(UTILS_USR_BIN_PATH)rpm))
- # Most Linux distros have "sort" in /bin. Ubuntu, Debian and perhaps
- # others have it in /usr/bin.
- SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- $(wildcard $(UTILS_USR_BIN_PATH)sort))
- NAWK = $(USRBIN_PATH)gawk
- # Intrinsic unix command, with backslash-escaped character interpretation
- ECHO = /bin/echo -e
- # These are really in UTILS_USR_BIN_PATH on Linux
- ifndef CROSS_COMPILE_ARCH
- AR = $(UTILS_USR_BIN_PATH)ar
- AS = $(UTILS_USR_BIN_PATH)as
- LD = $(UTILS_USR_BIN_PATH)ld
- MCS = $(UTILS_USR_BIN_PATH)mcs
- NM = $(UTILS_USR_BIN_PATH)nm
- STRIP = $(UTILS_USR_BIN_PATH)strip
- endif
- LEX = $(UTILS_USR_BIN_PATH)lex
- M4 = $(UTILS_USR_BIN_PATH)m4
- YACC = $(UTILS_USR_BIN_PATH)yacc
-endif
-
-# Solaris specific
-ifeq ($(PLATFORM),solaris)
- # Intrinsic unix command, with backslash-escaped character interpretation
- # (not using -e will cause build failure when using /bin/bash)
- # (using -e breaks something else)
- ECHO = /usr/bin/echo
-endif
-
-ifeq ($(PLATFORM), macosx)
- BASENAME = $(UTILS_USR_BIN_PATH)basename
- EGREP = $(UTILS_USR_BIN_PATH)egrep
- EXPR = $(UTILS_COMMAND_PATH)expr
- FMT = $(UTILS_USR_BIN_PATH)fmt
- GREP = $(UTILS_USR_BIN_PATH)grep
- GUNZIP = $(UTILS_USR_BIN_PATH)gunzip
- ID = $(UTILS_USR_BIN_PATH)id
- MSGFMT = $(UTILS_DEVTOOL_PATH)msgfmt
- SED = $(UTILS_USR_BIN_PATH)sed
- SORT = $(UTILS_USR_BIN_PATH)sort
- TEST = $(UTILS_COMMAND_PATH)test
- TOUCH = $(UTILS_USR_BIN_PATH)touch
- TRUE = $(UTILS_USR_BIN_PATH)true
- UNAME = $(UTILS_USR_BIN_PATH)uname
- NAWK = $(UTILS_USR_BIN_PATH)awk
- UNZIPSFX = $(UTILS_USR_BIN_PATH)unzipsfx
- ZIPEXE = $(UTILS_USR_BIN_PATH)zip
- CPIO = $(UTILS_USR_BIN_PATH)cpio
- TAR = $(UTILS_USR_BIN_PATH)tar
- # Builtin shell command, no -e option needed
- ECHO = echo
-endif
diff --git a/jdk/make/common/shared/Defs-versions.gmk b/jdk/make/common/shared/Defs-versions.gmk
deleted file mode 100644
index 31d09f0..0000000
--- a/jdk/make/common/shared/Defs-versions.gmk
+++ /dev/null
@@ -1,203 +0,0 @@
-#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# WARNING: This file is shared with other workspaces.
-#
-
-# This file needs these set: PLATFORM, ARCH_FAMILY, and ARCH_DATA_MODEL.
-
-# Windows uses Microsoft compilers by default
-ifeq ($(PLATFORM), windows)
- override CC_VERSION = msvc
-endif
-
-# Solaris uses Sun Studio compilers by default
-ifeq ($(PLATFORM), solaris)
- override CC_VERSION = sun
-endif
-
-# Linux uses GNU compilers by default
-ifeq ($(PLATFORM), linux)
- override CC_VERSION = gcc
-endif
-
-# Mac OS X uses LLVM by default
-ifeq ($(PLATFORM), macosx)
- override CC_VERSION = llvm
-endif
-
-##########################################################################
-#
-# List of JDK official minimum, expected, or required versions:
-#
-# REQUIRED_ALSA_VERSION
-# Linux only: The ALSA sound library version expected.
-#
-# REQUIRED_ANT_VER
-# The minimum 'ant' version.
-#
-# REQUIRED_BOOT_VER
-# The minimum boot jdk version.
-#
-# REQUIRED_CC_VER
-# The primary C compiler version expected.
-#
-# REQUIRED_COMPILER_NAME
-# The long descriptive name of the compiler we should use
-#
-# REQUIRED_COMPILER_VERSION
-# The one word name that identifies the compilers being used.
-#
-# REQUIRED_CYGWIN_VER
-# Windows only: If CYGWIN is used, the minimum CYGWIN version.
-#
-# REQUIRED_FREETYPE_VERSION
-# If we are using freetype, the freetype version expected.
-#
-# REQUIRED_GCC_VER
-# Solaris and Linux only. The required version of gcc/g++ for the legacy OJI plugin.
-#
-# REQUIRED_LINK_VER
-# Windows only: The version of link.exe expected.
-#
-# REQUIRED_MAKE_VER
-# The minimum version of GNU make.
-#
-# REQUIRED_OS_VARIANT_NAME
-# The OS variation name required.
-# Solaris: Solaris or OpenSolaris
-# Windows: Windows2000, WindowsXP, Windows2003, Windows2008R2, etc.
-# Linux: Fedora, RedHat, SuSE, Ubuntu, etc.
-#
-# REQUIRED_OS_VARIANT_VERSION
-# The version number associated with the above OS variant name.
-# Solaris: output of uname -r
-# Windows: 5.0 for Windows2000, 5.1 for WindowsXP,
-# 5.2 for Windows2003, 6.1 for Windows2008R2, etc.
-# Linux: number for the variant, e.g. 9 for Fedora 9
-#
-# REQUIRED_OS_VERSION
-# The formal OS version number.
-# Solaris & Windows: same as REQUIRED_OS_VARIANT_VERSION
-# Linux: the kernel version, or output of uname -r
-#
-# REQUIRED_UNZIP_VER
-# The minimum version of unzip.
-#
-# REQUIRED_ZIP_VER
-# The minimum version of unzip.
-#
-###########
-#
-# Differences in the build platform from these versions may trigger warnings
-# messages during the sanity checking when building the JDK.
-#
-# When building the OpenJDK most of these required or expected versions are
-# ignored or allowed to vary widely to accomodate the many build situations
-# of the OpenJDK.
-#
-##########################################################################
-
-# Solaris specific
-ifeq ($(PLATFORM), solaris)
- REQUIRED_OS_NAME = SunOS
- REQUIRED_OS_VERSION = 5.10
- REQUIRED_OS_VARIANT_NAME = Solaris
- REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION)
- REQUIRED_COMPILER_NAME = Sun Studio 12 Update 1
- REQUIRED_COMPILER_VERSION = SS12u1
- # Cross-compilation compiler versions are target specific
- # so don't set a required version if cross-compiling
- ifndef CROSS_COMPILE_ARCH
- ifeq ($(CC_VERSION),sun)
- REQUIRED_CC_VER = 5.10
- endif
- ifeq ($(CC_VERSION),gcc)
- REQUIRED_CC_VER = 3.4.3
- endif
- endif
- REQUIRED_GCC_VER = 2.95.2
-endif
-
-# Linux specific
-ifeq ($(PLATFORM), linux)
- REQUIRED_OS_NAME = Linux
- REQUIRED_OS_VERSION = 2.6
- REQUIRED_OS_VARIANT_NAME = Fedora
- REQUIRED_OS_VARIANT_VERSION = 9
- REQUIRED_ALSA_VERSION = 0.9.1
- REQUIRED_COMPILER_NAME = GCC4
- REQUIRED_COMPILER_VERSION = GCC4
- REQUIRED_GCC_VER = 2.95
- # Cross-compilation compiler versions are target specific
- # so don't set a required version if cross-compiling
- ifndef CROSS_COMPILE_ARCH
- ifeq ($(CC_VERSION),gcc)
- REQUIRED_CC_VER = 4.3.0
- endif
- ifeq ($(CC_VERSION),sun)
- REQUIRED_CC_VER = 5.10
- endif
- endif
-endif
-
-# Mac specific
-ifeq ($(PLATFORM), macosx)
- REQUIRED_OS_NAME = Darwin
- REQUIRED_OS_VERSION = 11.2
- REQUIRED_OS_VARIANT_NAME = MacOSX
- REQUIRED_OS_VARIANT_VERSION = 10.7.2
- REQUIRED_COMPILER_NAME = GCC4
- REQUIRED_COMPILER_VERSION = GCC4
- REQUIRED_CC_VER = 4.2.1
-endif
-
-# Windows specific
-ifeq ($(PLATFORM), windows)
- REQUIRED_OS_NAME = Windows
- REQUIRED_OS_VERSION = 6.1
- REQUIRED_OS_VARIANT_NAME = Windows2008R2
- REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION)
- REQUIRED_CYGWIN_VER = 4.0
- ifeq ($(CC_VERSION),msvc)
- REQUIRED_COMPILER_NAME = Visual Studio 10
- REQUIRED_COMPILER_VERSION = VS2010
- REQUIRED_CC_VER = 16.00.40219.01
- REQUIRED_LINK_VER = 10.00.40219.01
- endif
- ifeq ($(CC_VERSION),gcc)
- REQUIRED_CC_VER = 3.4.3
- endif
-endif
-
-# Generic
-REQUIRED_ANT_VER = 1.7.1
-REQUIRED_BOOT_VER = 1.7
-REQUIRED_FREETYPE_VERSION = 2.3.0
-REQUIRED_MAKE_VER = 3.81
-REQUIRED_UNZIP_VER = 5.12
-REQUIRED_ZIP_VER = 2.2
-
diff --git a/jdk/make/common/shared/Defs-windows.gmk b/jdk/make/common/shared/Defs-windows.gmk
deleted file mode 100644
index d46d884..0000000
--- a/jdk/make/common/shared/Defs-windows.gmk
+++ /dev/null
@@ -1,701 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Definitions for Windows.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Windows (C++ compiler warnings)
-# Level: Default is 3, 0 means none, 4 is the most but may be unreliable
-# Some makefiles may have set this to 0 to turn off warnings completely,
-# which also effectively creates a COMPILER_WARNINGS_FATAL=false situation.
-# Program.gmk may turn this down to 2 (building .exe's).
-# Windows 64bit platforms are less likely to be warning free.
-# Historically, Windows 32bit builds should be mostly warning free.
-# VS2010 introduced a large number of security warnings that are off by
-# default but will be turned back on with SHOW_ALL_WARNINGS=true.
-ifndef COMPILER_WARNING_LEVEL
- COMPILER_WARNING_LEVEL=3
-endif
-ifndef COMPILER_WARNINGS_FATAL
- COMPILER_WARNINGS_FATAL=false
-endif
-ifndef SHOW_ALL_WARNINGS
- SHOW_ALL_WARNINGS = false
-endif
-
-# Windows should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
- COMPILE_APPROACH = normal
-endif
-
-# Indication that we are doing an incremental build.
-# This may trigger the creation of make depend files.
-# (This may not be working on windows yet, always force to false.)
-override INCREMENTAL_BUILD = false
-
-# WARNING: This is extremely touch stuff, between CYGWIN vs. MKS and all
-# variations of MKS and CYGWIN releases, and 32bit vs 64bit,
-# this file can give you nightmares.
-#
-# Notes:
-# Keep all paths in the windows "mixed" style except CYGWIN UNXIXCOMMAND_PATH.
-# Use of PrefixPath is critical, some variables must end with / (see NOTE).
-# Use of quotes is critical due to possible spaces in paths coming from
-# the environment variables, be careful.
-# First convert \ to / with subst, keep it quoted due to blanks, then
-# use cygpath -s or dosname -s to get the short non-blank name.
-# If the MKS is old and doesn't have a dosname -s, you will be forced
-# to set ALT variables with the short non-space directory names.
-# If dosname doesn't appear to work, we won't use it.
-# The dosname utility also wants to accept stdin if it is not supplied
-# any path on the command line, this is really dangerous when using
-# make variables that can easily become empty, so I use:
-# echo $1 | dosname -s instead of dosname -s $1
-# to prevent dosname from hanging up the make process when $1 is empty.
-# The cygpath utility does not have this problem.
-# The ALT values should never really have spaces or use \.
-# Suspect these environment variables to have spaces and/or \ characters:
-# SYSTEMROOT, SystemRoot, WINDIR, windir, PROGRAMFILES, ProgramFiles,
-# MSTOOLS, Mstools, MSSDK, MSSdk, VCnnCOMNTOOLS,
-# MSVCDIR, MSVCDir.
-# So use $(subst \,/,) on them first adding quotes and placing them in
-# their own variable assigned with :=, then use FullPath.
-#
-
-ifdef USING_CYGWIN
-# Macro to effectively do a toupper without an exec
-define ToUpper
-$(subst a,A,$(subst b,B,$(subst c,C,$(subst d,D,$(subst e,E,$(subst f,F,\
-$(subst g,G,$(subst h,H,$(subst i,I,$(subst j,J,$(subst k,K,$(subst l,L,\
-$(subst m,M,$(subst n,N,$(subst o,O,$(subst p,P,$(subst q,Q,$(subst r,R,\
-$(subst s,S,$(subst t,T,$(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,\
-$(subst y,Y,$(subst z,Z,$1))))))))))))))))))))))))))
-endef
-# All possible drive letters
-drives=a b c d e f g h i j k l m n o p q r s t v u w x y z
-# Convert /cygdrive/ paths to the mixed style without an exec of cygpath
-# Must be a path with no spaces. /cygdrive/letter is always lowercase
-# and letter:/ is always uppercase coming from cygpath.
-define MixedPath
-$(patsubst /%,$(CYGWIN_HOME)/%,$(sort $(filter-out /cygdrive/%,$(foreach drive,$(drives),$(patsubst /cygdrive/$(drive)/%,$(call ToUpper,$(drive)):/%,$1)))))
-endef
-# Use FullPath to get C:/ style non-spaces path. Never ends with a /!
-# We assume cygpath is available in the search path
-# NOTE: Use of 'pwd' with CYGWIN will not get you a mixed style path!
-define FullPath
-$(if $(word 2,$1),$(shell $(CYGPATH_CMD) $1 2> $(DEV_NULL)),$(call MixedPath,$(realpath $(subst ",,$1))))
-endef
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then $(CYGPATH_CMD) "$1" 2> $(DEV_NULL); else echo "$1"; fi)
-endef
-else
-ifdef USING_MSYS
-DOSPATH_CMD:=$(shell cd $(JDK_TOPDIR) 2> $(DEV_NULL) && pwd)/make/tools/msys_build_scripts/dospath.sh
-define FullPath
-$(subst \,/,$(shell $(DOSPATH_CMD) $1))
-endef
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-else
-# Temporary until we upgrade to MKS 8.7, MKS pwd returns mixed mode path
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-endif
-endif
-
-# System drive
-ifdef SYSTEMDRIVE
- _system_drive =$(SYSTEMDRIVE)
-else
- ifdef SystemDrive
- _system_drive =$(SystemDrive)
- endif
-endif
-_system_drive:=$(call CheckValue,_system_drive,C:)
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-# With cygwin, just use this as is don't use FullPath on it.
-ifdef ALT_UNIXCOMMAND_PATH
- ifdef USING_CYGWIN
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
- else
- xALT_UNIXCOMMAND_PATH :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))"
- fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH))
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
- endif
-else
- ifdef USING_CYGWIN
- UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
- else
- ifdef USING_MSYS
- UNIXCOMMAND_PATH :=$(call PrefixPath,/bin)
- else
- ifdef ROOTDIR
- xROOTDIR :="$(subst \,/,$(ROOTDIR))"
- _rootdir :=$(call FullPath,$(xROOTDIR))
- else
- xROOTDIR :="$(_system_drive)/mksnt"
- _rootdir :=$(call FullPath,$(xROOTDIR))
- endif
- ifneq ($(_rootdir),)
- UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt)
- endif
- endif # USING_MSYS
- endif # USING_CYGWIN
-endif
-UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
-
-# Get version of MKS or CYGWIN
-ifdef USING_MKS
- _MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@')
- MKS_VER :=$(call GetVersion,$(_MKS_VER))
- # At this point, we can re-define FullPath to use DOSNAME_CMD
- CHECK_MKS87:=$(call CheckVersions,$(MKS_VER),8.7)
- TRY_DOSNAME:=false
- ifeq ($(CHECK_MKS87),same)
- TRY_DOSNAME:=true
- endif
- # Newer should be ok
- ifeq ($(CHECK_MKS87),newer)
- TRY_DOSNAME:=true
- endif
- ifeq ($(TRY_DOSNAME),true)
- ifeq ($(shell $(UNIXCOMMAND_PATH)dosname -s $(_system_drive)/ 2> $(DEV_NULL)),$(_system_drive)/)
- _DOSNAME=$(UNIXCOMMAND_PATH)dosname
- DOSNAME_CMD:=$(_DOSNAME) -s
-define FullPath
-$(subst //,/,$(shell echo $1 | $(DOSNAME_CMD) 2> $(DEV_NULL)))
-endef
- endif # test dosname -s
- endif # TRY_DOSNAME
-endif # MKS
-
-# We try to get references to what we need via the default component
-# environment variables, or what was used historically.
-
-# Process Windows values into FullPath values, these paths may have \ chars
-
-# System root
-ifdef SYSTEMROOT
- xSYSTEMROOT :="$(subst \,/,$(SYSTEMROOT))"
- _system_root :=$(call FullPath,$(xSYSTEMROOT))
-else
- ifdef SystemRoot
- xSYSTEMROOT :="$(subst \,/,$(SystemRoot))"
- _system_root :=$(call FullPath,$(xSYSTEMROOT))
- else
- ifdef WINDIR
- xWINDIR :="$(subst \,/,$(WINDIR))"
- _system_root :=$(call FullPath,$(xWINDIR))
- else
- ifdef windir
- xWINDIR :="$(subst \,/,$(windir))"
- _system_root :=$(call FullPath,$(xWINDIR))
- endif
- endif
- endif
-endif
-_system_root:=$(call CheckValue,_system_root,$(_system_drive)/WINNT)
-
-# Program Files directory
-ifdef PROGRAMFILES
- xPROGRAMFILES :="$(subst \,/,$(PROGRAMFILES))"
-else
- ifeq ($(ARCH_DATA_MODEL), 32)
- xPROGRAMFILES :="$(_system_drive)/Program Files"
- else
- xPROGRAMFILES :="$(_system_drive)/Program Files (x86)"
- endif
-endif
-ifeq ($(ARCH_DATA_MODEL), 32)
- _program_files :=$(call FullPath,$(xPROGRAMFILES))
- _program_files32 :=$(_program_files)
-else
- ifdef PROGRAMW6432
- xPROGRAMW6432 :="$(subst \,/,$(PROGRAMW6432))"
- else
- xPROGRAMW6432 :="$(_system_drive)/Program Files"
- endif
- _program_files :=$(call FullPath,$(xPROGRAMW6432))
- _program_files32 :=$(call FullPath,$(xPROGRAMFILES))
- ifneq ($(word 1,$(_program_files32)),$(_program_files32))
- _program_files32:=
- endif
-endif
-ifneq ($(word 1,$(_program_files)),$(_program_files))
- _program_files:=
-endif
-
-# Use of the Visual Studio compilers requires certain env variables be set:
-# PATH should include the path to cl.exe
-# INCLUDE should be defined
-# LIB should be defined
-# LIBPATH should be defined
-# VS100COMNTOOLS should be defined
-# WINDOWSSDKDIR should be defined
-# The 7.0a path is from VS2010 Pro, the 7.1 path is the standalone SDK.
-# For 64bit either will work for us.
-# If a developer chooses to install the standalone SDK in some other
-# location, then they need to set WINDOWSSDKDIR.
-#
-# Compilers for 64bit may be from the free SDK, or Visual Studio Professional.
-# The free Express compilers don't contain 64 bit compilers, which is why
-# you instead need the SDK.
-# Release enginering will use VS2010 Pro, so the frequency of testing of
-# SDK based builds will depend entirely on individual usage.
-
-# We only need to do this once
-ifndef VS2010_EXISTS
- # The 2 key paths we need are WINDOWSSDKDIR and VS100COMNTOOLS.
- # If not defined try to see if default location exists.
- # If defined make sure that the path has no spaces.
- # Finally, export path with no spaces so logic minimizes FullPath calls.
- ifndef WINDOWSSDKDIR
- # The 7.0a SDK is the second choice.
- xWINDOWSSDKDIR :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/"
- fWINDOWSSDKDIR :=$(call FullPath,$(xWINDOWSSDKDIR))
- # The 7.1 SDK is the second choice.
- ifeq ($(fWINDOWSSDKDIR),)
- xWINDOWSSDKDIR :="$(_program_files32)/Microsoft SDKs/Windows/v7.1/"
- fWINDOWSSDKDIR :=$(call FullPath,$(xWINDOWSSDKDIR))
- endif
- else
- ifneq ($(word 2,$(WINDOWSSDKDIR)),)
- xWINDOWSSDKDIR :="$(subst \,/,$(WINDOWSSDKDIR))"
- fWINDOWSSDKDIR :=$(call FullPath,$(xWINDOWSSDKDIR))
- else
- fWINDOWSSDKDIR :=$(WINDOWSSDKDIR)
- endif
- endif
- ifneq ($(fWINDOWSSDKDIR),)
- WINDOWSSDKDIR :=$(fWINDOWSSDKDIR)/
- endif
- ifndef VS100COMNTOOLS
- xVS100COMNTOOLS :="$(_program_files32)/Microsoft Visual Studio 10.0/Common7/Tools/"
- fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS))
- else
- xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
- ifneq ($(word 2,$(VS100COMNTOOLS)),)
- fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS))
- else
- fVS100COMNTOOLS :=$(xVS100COMNTOOLS)
- endif
- endif
- ifneq ($(fVS100COMNTOOLS),)
- VS100COMNTOOLS :=$(fVS100COMNTOOLS)/
- endif
- # Check to see that both exist
- ifeq ($(WINDOWSSDKDIR),)
- _vs2010_message := No WINDOWSSDKDIR found on system. $(_vs2010_message)
- VS2010_EXISTS := false
- endif
- ifeq ($(VS100COMNTOOLS),)
- _vs2010_message := No VS100COMNTOOLS found on system. $(_vs2010_message)
- VS2010_EXISTS := false
- endif
- ifeq ($(VS2010_EXISTS),false)
- x:=$(warning WARNING: No VS2010 available. $(_vs2010_message))
- VS100COMNTOOLS :=
- WINDOWSSDKDIR :=
- else
- VS2010_EXISTS := true
- _msvc_dir :=$(VS100COMNTOOLS)/../../Vc
- endif
- export VS2010_EXISTS
- export VS100COMNTOOLS
- export WINDOWSSDKDIR
-endif
-
-ifneq ($(VS2010_EXISTS),true)
- x:=$(error ERROR: No VS2010 found on system.)
-endif
-
-# VS2010 Compiler root directory
-_msvc_dir :=$(VS100COMNTOOLS)/../../Vc
-# SDK root directory
-_ms_sdk :=$(WINDOWSSDKDIR)
-# Compiler bin directory and redist directory
-ifeq ($(ARCH_DATA_MODEL), 32)
- _compiler_bin :=$(_msvc_dir)/Bin
- _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC100.CRT)
-endif
-ifeq ($(ARCH_DATA_MODEL), 64)
- _compiler_bin :=$(_msvc_dir)/bin/amd64
- _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x64/Microsoft.VC100.CRT)
-endif
-ifeq ($(_redist_sdk),)
- _redist_sdk :=$(_system_root)/system32
-endif
-
-# Location on system where jdk installs might be
-ifneq ($(_program_files),)
- USRJDKINSTANCES_PATH =$(_program_files)/Java
-else
- USRJDKINSTANCES_PATH =$(_system_drive)/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-# NOTE: Do not use FullPath on this because it's often a drive letter and
-# plain drive letters are ambiguous, so just use this 'as is'.
-ifdef ALT_SLASH_JAVA
- xALT_SLASH_JAVA :="$(subst \,/,$(ALT_SLASH_JAVA))"
- SLASH_JAVA :=$(xALT_SLASH_JAVA)
-else
- ifdef ALT_JDK_JAVA_DRIVE
- SLASH_JAVA =$(JDK_JAVA_DRIVE)
- else
- SLASH_JAVA =J:
- endif
-endif
-SLASH_JAVA:=$(call AltCheckSpaces,SLASH_JAVA)
-SLASH_JAVA:=$(call AltCheckValue,SLASH_JAVA)
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifdef ALT_JDK_DEVTOOLS_DIR
- xALT_JDK_DEVTOOLS_DIR :="$(subst \,/,$(ALT_JDK_DEVTOOLS_DIR))"
- JDK_DEVTOOLS_DIR :=$(call FullPath,$(xALT_JDK_DEVTOOLS_DIR))
-else
- JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-endif
-JDK_DEVTOOLS_DIR:=$(call AltCheckSpaces,JDK_DEVTOOLS_DIR)
-JDK_DEVTOOLS_DIR:=$(call AltCheckValue,JDK_DEVTOOLS_DIR)
-
-# COMPILER_PATH: path to where the compiler and tools are installed.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifdef ALT_COMPILER_PATH
- xALT_COMPILER_PATH :="$(subst \,/,$(ALT_COMPILER_PATH))"
- fxALT_COMPILER_PATH :=$(call FullPath,$(xALT_COMPILER_PATH))
- COMPILER_PATH :=$(call PrefixPath,$(fxALT_COMPILER_PATH))
-else
- COMPILER_PATH :=$(call PrefixPath,$(_compiler_bin))
-endif
-COMPILER_PATH :=$(call AltCheckSpaces,COMPILER_PATH)
-
-# MSDEVTOOLS_PATH: path to where the additional MS Compiler tools are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifdef ALT_MSDEVTOOLS_PATH
- xALT_MSDEVTOOLS_PATH :="$(subst \,/,$(ALT_MSDEVTOOLS_PATH))"
- fxALT_MSDEVTOOLS_PATH :=$(call FullPath,$(xALT_MSDEVTOOLS_PATH))
- MSDEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_MSDEVTOOLS_PATH))
-else
- ifeq ($(ARCH_DATA_MODEL), 64)
- ifdef MSTOOLS
- xMSTOOLS :="$(subst \,/,$(MSTOOLS))"
- _ms_tools :=$(call FullPath,$(xMSTOOLS))
- else
- ifdef Mstools
- xMSTOOLS :="$(subst \,/,$(Mstools))"
- _ms_tools :=$(call FullPath,$(xMSTOOLS))
- else
- _ms_tools :=
- endif
- endif
- ifneq ($(_ms_tools),)
- _ms_tools_bin :=$(_ms_tools)/Bin
- else
- # Assumes compiler bin is .../Bin/win64/x86/AMD64, rc.exe is 3 levels up
- _ms_tools_bin :=$(_compiler_bin)/../../..
- endif
- else
- _ms_tools_bin :=$(_compiler_bin)
- endif
- MSDEVTOOLS_PATH :=$(call PrefixPath,$(_ms_tools_bin))
-endif
-MSDEVTOOLS_PATH:=$(call AltCheckSpaces,MSDEVTOOLS_PATH)
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifdef ALT_DEVTOOLS_PATH
- xALT_DEVTOOLS_PATH :="$(subst \,/,$(ALT_DEVTOOLS_PATH))"
- fxALT_DEVTOOLS_PATH :=$(call FullPath,$(xALT_DEVTOOLS_PATH))
- DEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_DEVTOOLS_PATH))
-else
- ifdef USING_CYGWIN
- DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
- else
- ifdef USING_MSYS
- DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
- else
- xDEVTOOLS_PATH :="$(_system_drive)/utils"
- fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
- DEVTOOLS_PATH :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
- endif # USING_MSYS
- endif # USING_CYGWIN
-endif
-DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH)
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-# The _BOOTDIR3 is defind optionally.
-ifndef ALT_BOOTDIR
- _BOOTDIR1 =$(_system_drive)/jdk$(PREVIOUS_JDK_VERSION)
- _BOOTDIR2 =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
- _BOOTDIR3 =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
-endif
-
-# Everybody needs the MSVCRNN runtime starting with VS2010
-_NEEDS_MSVCRNN = true
-
-ifeq ($(_NEEDS_MSVCRNN), true)
- # MSVCRNN_DLL_PATH: location of msvcrnn.dll that will be re-distributed
- ifdef ALT_MSVCRNN_DLL_PATH
- xALT_MSVCRNN_DLL_PATH :="$(subst \,/,$(ALT_MSVCRNN_DLL_PATH))"
- MSVCRNN_DLL_PATH :=$(call FullPath,$(xALT_MSVCRNN_DLL_PATH))
- else
- MSVCRNN_DLL_PATH :=$(_redist_sdk)
- endif
- MSVCRNN_DLL_PATH :=$(call AltCheckSpaces,MSVCRNN_DLL_PATH)
- MSVCRNN_DLL_PATH:=$(call AltCheckValue,MSVCRNN_DLL_PATH)
-endif
-
-# DEPLOY_MSSDK: Microsoft SDK for this platform (for deploy)
-ifdef ALT_DEPLOY_MSSDK
- xALT_DEPLOY_MSSDK :="$(subst \,/,$(ALT_DEPLOY_MSSDK))"
- DEPLOY_MSSDK :=$(call FullPath,$(xALT_DEPLOY_MSSDK))
-else
- DEPLOY_MSSDK :=$(_ms_sdk)
-endif
-DEPLOY_MSSDK:=$(call AltCheckSpaces,DEPLOY_MSSDK)
-
-# INSTALL_MSSDK: Microsoft Installer SDK for this platform (for install)
-ifdef ALT_INSTALL_MSSDK
- xALT_INSTALL_MSSDK :="$(subst \,/,$(ALT_INSTALL_MSSDK))"
- INSTALL_MSSDK :=$(call FullPath,$(xALT_INSTALL_MSSDK))
-else
- INSTALL_MSSDK :=$(_ms_sdk)
-endif
-INSTALL_MSSDK:=$(call AltCheckSpaces,INSTALL_MSSDK)
-
-# WSCRIPT: path to wscript.exe (used in creating install bundles)
-ifdef ALT_WSCRIPT
- xALT_WSCRIPT :="$(subst \,/,$(ALT_WSCRIPT))"
- WSCRIPT =$(xALT_WSCRIPT)
-else
- _WSCRIPT1 :=$(_system_root)/system32/wscript.exe
- _WSCRIPT2 :=$(DEVTOOLS_PATH)wscript.exe
- WSCRIPT :=$(call FileExists,$(_WSCRIPT1),$(_WSCRIPT2))
-endif
-# If CONFIGURE_BUILD is defined, checks were already done by configure.
-ifndef CONFIGURE_BUILD
-WSCRIPT:=$(call AltCheckSpaces,WSCRIPT)
-endif #! CONFIGURE_BUILD
-# batch mode no modal dialogs on errors, please.
-WSCRIPT += -B
-
-# CSCRIPT: path to cscript.exe (used in creating install bundles)
-ifdef ALT_CSCRIPT
- xALT_CSCRIPT :="$(subst \,/,$(ALT_CSCRIPT))"
- CSCRIPT =$(xALT_CSCRIPT)
-else
- _CSCRIPT1 :=$(_system_root)/system32/cscript.exe
- _CSCRIPT2 :=$(DEVTOOLS_PATH)cscript.exe
- CSCRIPT :=$(call FileExists,$(_CSCRIPT1),$(_CSCRIPT2))
-endif
-# If CONFIGURE_BUILD is defined, checks were already done by configure.
-ifndef CONFIGURE_BUILD
-CSCRIPT:=$(call AltCheckSpaces,CSCRIPT)
-endif #! CONFIGURE_BUILD
-
-# CABARC: path to cabarc.exe (used in creating install bundles)
-ifdef ALT_CABARC
- xALT_CABARC :="$(subst \,/,$(ALT_CABARC))"
- CABARC =$(xALT_CABARC)
-else
- _CABARC1 :=$(_system_root)/system32/cabarc.exe
- _CABARC2 :=$(DEVTOOLS_PATH)cabarc.exe
- CABARC :=$(call FileExists,$(_CABARC1),$(_CABARC2))
-endif
-CABARC:=$(call AltCheckSpaces,CABARC)
-
-# MSICERT: path to msicert.exe (used in creating install bundles)
-ifdef ALT_MSICERT
- xALT_MSICERT :="$(subst \,/,$(ALT_MSICERT))"
- MSICERT =$(xALT_MSICERT)
-else
- _MSICERT1 :=$(INSTALL_MSSDK)/Bin/msicert.exe
- _MSICERT2 :=$(DEVTOOLS_PATH)msicert.exe
- MSICERT :=$(call FileExists,$(_MSICERT1),$(_MSICERT2))
-endif
-# If CONFIGURE_BUILD is defined, checks were already done by configure.
-ifndef CONFIGURE_BUILD
-MSICERT:=$(call AltCheckSpaces,MSICERT)
-endif #! CONFIGURE_BUILD
-
-# Import JDK images allow for partial builds, components not built are
-# imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
-# multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
-ifdef ALT_BUILD_JDK_IMPORT_PATH
- BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-else
- BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
-endif
-BUILD_JDK_IMPORT_PATH:=$(call AltCheckSpaces,BUILD_JDK_IMPORT_PATH)
-BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-
-# JDK_IMPORT_PATH: location of previously built JDK (this version) to import
-ifdef ALT_JDK_IMPORT_PATH
- JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-else
- JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-endif
-JDK_IMPORT_PATH:=$(call AltCheckSpaces,JDK_IMPORT_PATH)
-JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-
-# HOTSPOT_IMPORT_PATH: location of hotspot pre-built files
-ifdef ALT_HOTSPOT_IMPORT_PATH
- HOTSPOT_IMPORT_PATH :=$(call FullPath,$(ALT_HOTSPOT_IMPORT_PATH))
-else
- # Default locations include the current $OUTPUTDIR, RE Promotions,
- # and a JDK. Please be aware the JDK does not include a Kernel VM.
- _HOTSPOT_IMPORT_PATH1 = $(OUTPUTDIR)/hotspot/import
- _HOTSPOT_IMPORT_PATH2 = $(PROMOTED_BUILD_DISTDIR)/hotspot/import
- _HOTSPOT_IMPORT_PATH3 = $(JDK_IMPORT_PATH)
- HOTSPOT_IMPORT_PATH := $(call DirExists,$(_HOTSPOT_IMPORT_PATH1),$(_HOTSPOT_IMPORT_PATH2),$(_HOTSPOT_IMPORT_PATH3))
-endif
-HOTSPOT_IMPORT_PATH:=$(call AltCheckSpaces,HOTSPOT_IMPORT_PATH)
-HOTSPOT_IMPORT_PATH:=$(call AltCheckValue,HOTSPOT_IMPORT_PATH)
-
-# HOTSPOT_CLIENT_PATH: location of client jvm library file.
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifdef ALT_HOTSPOT_CLIENT_PATH
- HOTSPOT_CLIENT_PATH :=$(call FullPath,$(ALT_HOTSPOT_CLIENT_PATH))
- else
- HOTSPOT_CLIENT_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/client
- endif
- HOTSPOT_CLIENT_PATH:=$(call AltCheckSpaces,HOTSPOT_CLIENT_PATH)
- HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
-endif
-
-# HOTSPOT_SERVER_PATH: location of server jvm library file.
-ifdef ALT_HOTSPOT_SERVER_PATH
- HOTSPOT_SERVER_PATH :=$(call FullPath,$(ALT_HOTSPOT_SERVER_PATH))
-else
- HOTSPOT_SERVER_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/server
-endif
-HOTSPOT_SERVER_PATH:=$(call AltCheckSpaces,HOTSPOT_SERVER_PATH)
-HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
-
-# HOTSPOT_LIB_PATH: location of jvm.lib file.
-ifdef ALT_HOTSPOT_LIB_PATH
- xALT_HOTSPOT_LIB_PATH :="$(subst \,/,$(ALT_HOTSPOT_LIB_PATH))"
- HOTSPOT_LIB_PATH :=$(call FullPath,$(xALT_HOTSPOT_LIB_PATH))
-else
- HOTSPOT_LIB_PATH =$(HOTSPOT_IMPORT_PATH)/lib
-endif
-HOTSPOT_LIB_PATH:=$(call AltCheckSpaces,HOTSPOT_LIB_PATH)
-HOTSPOT_LIB_PATH:=$(call AltCheckValue,HOTSPOT_LIB_PATH)
-
-# Special define for checking the binaries
-
-# All windows dll and exe files should have been built with -NXCOMPAT
-# and be setup for dynamic base addresses.
-# In addition, we should not be dependent on certain dll files that
-# we do not or cannot redistribute.
-
-# List of filenames we should NOT be dependent on
-ifeq ($(MFC_DEBUG),true)
- BANNED_DLLS=msvcp100[.]dll
-else
- BANNED_DLLS=msvcp100[.]dll|msvcr100d[.]dll|msvcrtd[.]dll
-endif
-
-# Check for -safeseh (only used on 32bit)
-define binary_file_safeseh_verification # binary_file
-( \
- $(ECHO) "Checking for -SAFESEH usage in: $1" && \
- if [ "`$(DUMPBIN) -loadconfig $1 | $(EGREP) -i 'Safe Exception Handler Table'`" = "" ] ; then \
- $(ECHO) "ERROR: Did not find 'Safe Exception Handler Table' in loadconfig: $1" ; \
- $(DUMPBIN) -loadconfig $1 ; \
- exit 6 ; \
- fi ; \
-)
-endef
-
-# Check for -NXCOMPAT usage
-define binary_file_nxcompat_verification # binary_file
-( \
- $(ECHO) "Checking for -NXCOMPAT usage in: $1" && \
- if [ "`$(DUMPBIN) -headers $1 | $(EGREP) -i 'NX compatible'`" = "" ] ; then \
- $(ECHO) "ERROR: Did not find 'NX compatible' in headers: $1" ; \
- $(DUMPBIN) -headers $1 ; \
- exit 7 ; \
- fi ; \
-)
-endef
-
-# Check for -DYNAMICBASE usage
-define binary_file_dynamicbase_verification # binary_file
-( \
- $(ECHO) "Checking for -DYNAMICBASE usage in: $1" && \
- if [ "`$(DUMPBIN) -headers $1 | $(EGREP) -i 'Dynamic base'`" = "" ] ; then \
- $(ECHO) "ERROR: Did not find 'Dynamic base' in headers: $1" ; \
- $(DUMPBIN) -headers $1 ; \
- exit 8 ; \
- fi ; \
-)
-endef
-
-# Check for banned dll usage
-define binary_file_dll_verification # binary_file
-( \
- $(ECHO) "Checking for banned dependencies in: $1" && \
- if [ "`$(DUMPBIN) -dependents $1 | $(EGREP) -i '$(BANNED_DLLS)'`" != "" ] ; then \
- $(ECHO) "ERROR: Found use of $(BANNED_DLLS)"; \
- $(DUMPBIN) -dependents $1 ; \
- exit 9 ; \
- fi ; \
-)
-endef
-
-# Macro to check it's input file for properly built executables.
-# Relies on process exit code. Different for 32bit vs 64bit.
-ifeq ($(ARCH_DATA_MODEL),32)
-define binary_file_verification # binary_file
-( \
- $(call binary_file_safeseh_verification,$1); \
- $(call binary_file_nxcompat_verification,$1); \
- $(call binary_file_dynamicbase_verification,$1); \
- $(call binary_file_dll_verification,$1); \
-)
-endef
-else
-define binary_file_verification # binary_file
-( \
- $(call binary_file_nxcompat_verification,$1); \
- $(call binary_file_dynamicbase_verification,$1); \
- $(call binary_file_dll_verification,$1); \
-)
-endef
-endif
-
diff --git a/jdk/make/common/shared/Defs.gmk b/jdk/make/common/shared/Defs.gmk
deleted file mode 100644
index 37bd371..0000000
--- a/jdk/make/common/shared/Defs.gmk
+++ /dev/null
@@ -1,675 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Definitions for all platforms.
-#
-# Normally the convention is that these alternate definitions of
-# primary make variables are never defined inside the Makefiles anywhere
-# but are defined via environment variables or set on the make command
-# line. So you should never see an ALT_* variable defined in any
-# makefiles, just used. This is the convention and there are some
-# exceptions, either mistakes or unusual circumstances.
-#
-# The naming convention for the default value of one of these variables
-# that has an ALT_* override capability is to name the default value with a
-# leading underscore (_). So for XXX you would have:
-# _XXX default value
-# ALT_XXX any override the user is providing if any
-# XXX the final value, either the default _XXX or the ALT_XXX value.
-#
-
-# On Directory names. In very rare cases should the Windows directory
-# names use the backslash, please use the C:/ style of windows paths.
-# Avoid duplicating the // characters in paths, this has known to cause
-# strange problems with jar and other utilities, e.g. /a//b/ != /a/b/.
-# Some of these variables have an explicit trailing / character, but in
-# general, they should NOT have the trailing / character.
-
-# Get shared system utilities macros defined
-include $(JDK_MAKE_SHARED_DIR)/Defs-utils.gmk
-
-# Assumes ARCH, PLATFORM, ARCH_VM_SUBDIR, JDK_TOPDIR, etc. have been defined.
-
-# Simple pwd path
-# NOTE: Just use the shell's cd and pwd here, more reliable at sanity time.
-define PwdPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-define AbsPwdPathCheck
-$(shell cd .. 2> $(DEV_NULL) && cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# Checks an ALT value for spaces (should be one word),
-# warns and returns Check_ALT_$1 if spaces
-define AltCheckSpaces
-$(if $(word 2,$($1)),$(warning "WARNING: Value of $1 contains a space: '$($1)', check or set ALT_$1")Check_ALT_$1,$($1))
-endef
-
-# Checks an ALT value for empty, warns and returns Check_ALT_$1 if empty
-define AltCheckValue
-$(if $($1),$($1),$(warning "WARNING: Value of $1 cannot be empty, check or set ALT_$1")Check_ALT_$1)
-endef
-
-# Checks any value for empty, warns and returns $2 if empty
-define CheckValue
-$(if $($1),$($1),$(warning "WARNING: Value of $1 cannot be empty, will use '$2'")$2)
-endef
-
-# Prefix for a utility prefix path, if empty leave alone, otherwise end with a /
-define PrefixPath
-$(if $1,$(subst //,/,$1/),)
-endef
-
-# Select a directory if it exists, or the alternate 2 or the alternate 3
-define DirExists
-$(shell \
- if [ -d "$1" ]; then \
- echo "$1"; \
- elif [ -d "$2" ]; then \
- echo "$2"; \
- else \
- echo "$3"; \
- fi)
-endef
-
-# Select a directory if it exists, or the alternate 2, or the alternate 3, or the alternate 4
-define DirExists4
-$(shell \
- if [ -d "$1" ]; then \
- echo "$1"; \
- elif [ -d "$2" ]; then \
- echo "$2"; \
- elif [ -d "$3" ]; then \
- echo "$3"; \
- else \
- echo "$4"; \
- fi)
-endef
-
-
-# Select a writable directory if it exists and is writable, or the alternate
-define WriteDirExists
-$(shell \
- if [ -d "$1" -a -w "$1" ]; then \
- echo "$1"; \
- else \
- echo "$2"; \
- fi)
-endef
-
-# Select a file if it exists, or the alternate 1, or the alternate 2
-define FileExists
-$(shell \
- if [ -r "$1" ]; then \
- echo "$1"; \
- elif [ -r "$2" ]; then \
- echo "$2"; \
- else \
- echo "NO_FILE_EXISTS"; \
- fi)
-endef
-
-# Given a line of text, get the version number from it
-define GetVersion
-$(shell echo $1 | sed -e 's@[^0-9]*\([0-9][0-9]*\.[0-9][.0-9]*\).*@\1@' )
-endef
-
-# Return one part of the version numbers, watch out for non digits.
-define VersionWord # Number Version
-$(word $1,$(subst ., ,$(subst -, ,$2)))
-endef
-
-# Given a major.minor.micro version, return the major, minor, or micro number
-define MajorVersion
-$(if $(call VersionWord,1,$1),$(call VersionWord,1,$1),0)
-endef
-define MinorVersion
-$(if $(call VersionWord,2,$1),$(call VersionWord,2,$1),0)
-endef
-define MicroVersion
-$(if $(call VersionWord,3,$1),$(call VersionWord,3,$1),0)
-endef
-
-# Macro that returns missing, same, newer, or older $1=version $2=required
-define CheckVersions
-$(shell \
- if [ "$1" = "" -o "$2" = "" ]; then \
- echo missing; \
- elif [ "$1" = "$2" ]; then \
- echo same; \
- elif [ $(call MajorVersion,$1) -lt $(call MajorVersion,$2) ] ; then \
- echo older; \
- elif [ $(call MajorVersion,$1) -gt $(call MajorVersion,$2) ] ; then \
- echo newer; \
- elif [ $(call MinorVersion,$1) -lt $(call MinorVersion,$2) ]; then \
- echo older; \
- elif [ $(call MinorVersion,$1) -gt $(call MinorVersion,$2) ]; then \
- echo newer; \
- elif [ $(call MicroVersion,$1) -lt $(call MicroVersion,$2) ]; then \
- echo older; \
- elif [ $(call MicroVersion,$1) -gt $(call MicroVersion,$2) ]; then \
- echo newer; \
- else \
- echo same; \
- fi)
-endef
-
-# Expand SRCDIR_LIST, which is used to automatically include various
-# platform and shared sources/headers. This is mainly useful for the
-# Mac OS X build, which pulls its platform sources from the solaris and/or
-# macosx trees, depending on the component.
-ifeq ($(PLATFORM), macosx)
- define JavaSrcDirList
- $(JAVA_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
- endef
- define NativeSrcDirList
- $(NATIVE_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
- endef
-endif
-
-# Make sure certain variables are non-empty at this point
-_check_values:=\
-$(call CheckValue,ARCH,),\
-$(call CheckValue,ARCH_DATA_MODEL,),\
-$(call CheckValue,ARCH_VM_SUBDIR,),\
-$(call CheckValue,JDK_TOPDIR,),\
-$(call CheckValue,JDK_MAKE_SHARED_DIR,),\
-$(call CheckValue,VARIANT,),\
-$(call CheckValue,PLATFORM,)
-
-# Misc common settings for all workspaces
-# This determines the version of the product, and the previous version or boot
-ifndef JDK_MAJOR_VERSION
- JDK_MAJOR_VERSION = 1
- PREVIOUS_MAJOR_VERSION = 1
-endif
-
-ifndef JDK_MINOR_VERSION
- JDK_MINOR_VERSION = 8
- PREVIOUS_MINOR_VERSION = 7
-endif
-
-ifndef JDK_MICRO_VERSION
- JDK_MICRO_VERSION = 0
- PREVIOUS_MICRO_VERSION = 0
-endif
-
-ifndef MILESTONE
- MILESTONE = internal
-endif
-
-# Default names
-ifdef OPENJDK
- LAUNCHER_NAME = openjdk
- PRODUCT_NAME = OpenJDK
- PRODUCT_SUFFIX = Runtime Environment
- JDK_RC_PLATFORM_NAME = Platform
- COMPANY_NAME = N/A
-else
- LAUNCHER_NAME = java
- PRODUCT_NAME = Java(TM)
- PRODUCT_SUFFIX = SE Runtime Environment
- JDK_RC_PLATFORM_NAME = Platform SE
- COMPANY_NAME = Oracle Corporation
-endif
-
-RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)
-
-ifndef BUILD_NUMBER
- JDK_BUILD_NUMBER = b00
-else
- ifndef JDK_BUILD_NUMBER
- JDK_BUILD_NUMBER = $(BUILD_NUMBER)
- endif
-endif
-
-# Default variant is the optimized version of everything
-# can be OPT or DBG, default is OPT
-# Determine the extra pattern to add to the release name for debug/fastdebug.
-# Determine the JDK_IMPORT_VARIANT, so we get the right VM files copied over.
-# Determine suffix for obj directory or OBJDIR, for .o files.
-# (by keeping .o files separate, just .o files, they don't clobber each
-# other, however, the library files will clobber each other).
-#
-ifeq ($(VARIANT), DBG)
- BUILD_VARIANT_RELEASE=-debug
- OBJDIRNAME_SUFFIX=_g
-else
- BUILD_VARIANT_RELEASE=
- OBJDIRNAME_SUFFIX=
-endif
-ifeq ($(FASTDEBUG), true)
- VARIANT=DBG
- BUILD_VARIANT_RELEASE=-fastdebug
- OBJDIRNAME_SUFFIX=_gO
- _JDK_IMPORT_VARIANT=/fastdebug
-endif
-
-# Depending on the flavor of the build, add a -debug or -fastdebug to the name
-ifdef DEBUG_NAME
- BUILD_VARIANT_RELEASE=-$(DEBUG_NAME)
-endif
-
-# These default values are redefined during a release build.
-# CTE can set JDK_UPDATE_VERSION during the update release
-ifdef JDK_UPDATE_VERSION
- JDK_VERSION = $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)_$(JDK_UPDATE_VERSION)
- MARKETING_NUMBER := $(shell \
- $(ECHO) $(JDK_UPDATE_VERSION) | $(NAWK) '{if (substr($$0,1,1)=="0") print substr($$0, 2); else print $$0;}')
- MARKET_NAME= $(shell $(ECHO) " Update $(MARKETING_NUMBER)")
- JDK_MKTG_VERSION = $(JDK_MINOR_VERSION)u$(MARKETING_NUMBER)
-else
- JDK_VERSION = $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
- JDK_MKTG_VERSION = $(JDK_MINOR_VERSION)
- MARKET_NAME=
-endif
-JDK_UNDERSCORE_VERSION = $(subst .,_,$(JDK_VERSION))
-JDK_MKTG_UNDERSCORE_VERSION = $(subst .,_,$(JDK_MKTG_VERSION))
-
-# RELEASE is JDK_VERSION and -MILESTONE if MILESTONE is set
-ifneq ($(MILESTONE),fcs)
- RELEASE = $(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
-else
- RELEASE = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
-endif
-
-# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
-ifdef BUILD_NUMBER
- FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
-else
- BUILD_NUMBER = b00
- ifndef USER_RELEASE_SUFFIX
- BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
- CLEAN_USERNAME := $(shell $(ECHO) "$(USER)" | $(TR) -d -c '[:alnum:]')
- USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' )
- endif
- export USER_RELEASE_SUFFIX
- FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
-endif
-
-# Promoted build location
-PROMOTED_RE_AREA = $(SLASH_JAVA)/re/jdk/$(JDK_VERSION)/promoted
-PROMOTED_BUILD_LATEST = latest
-PROMOTED_BUILD_BASEDIR = $(PROMOTED_RE_AREA)/$(PROMOTED_BUILD_LATEST)
-PROMOTED_BUILD_DISTDIR = $(PROMOTED_BUILD_BASEDIR)/dist/$(PLATFORM)-$(ARCH)
-PROMOTED_BUILD_BINARIES = $(PROMOTED_BUILD_BASEDIR)/binaries
-
-# PARALLEL_COMPILE_JOBS: is the number of compiles done in parallel.
-# If the user sets ALT_PARALLEL_COMPILE_JOBS, then COMPILE_APPROACH is set
-# to parallel.
-#
-# Recommended setting: 2 seems to be ideal for single cpu machines,
-# 2 times the number of CPU's is a basic formula,
-# but probably not more than 4 if the machine is
-# being shared by others, or the machine is limited
-# in RAM or swap.
-#
-ifdef ALT_PARALLEL_COMPILE_JOBS
- PARALLEL_COMPILE_JOBS=$(ALT_PARALLEL_COMPILE_JOBS)
-else
- PARALLEL_COMPILE_JOBS=2
-endif
-
-# Previous JDK release (version of BOOTDIR version)
-ifdef ALT_PREVIOUS_JDK_VERSION
- PREVIOUS_JDK_VERSION = $(ALT_PREVIOUS_JDK_VERSION)
-else
- PREVIOUS_JDK_VERSION = $(PREVIOUS_MAJOR_VERSION).$(PREVIOUS_MINOR_VERSION).$(PREVIOUS_MICRO_VERSION)
-endif
-export PREVIOUS_JDK_VERSION
-PREVIOUS_JDK_VERSION:=$(call AltCheckSpaces,PREVIOUS_JDK_VERSION)
-PREVIOUS_JDK_VERSION:=$(call AltCheckValue,PREVIOUS_JDK_VERSION)
-
-# Version with _ instead of . in number
-ifeq ($(PREVIOUS_MINOR_VERSION),5)
- PREVIOUS_JDK_UNDERSCORE_VERSION = $(subst .,_,$(PREVIOUS_JDK_VERSION))
-else
- PREVIOUS_JDK_UNDERSCORE_VERSION = $(PREVIOUS_MINOR_VERSION)
-endif
-
-# Include any private definitions for this set of workspaces
-_PRIVATE_DEFS_FILE=$(JDK_MAKE_SHARED_DIR)/PrivateDefs.gmk
-ifeq ($(USING_PRIVATE_DEFS),)
- USING_PRIVATE_DEFS:=$(shell if [ -f $(_PRIVATE_DEFS_FILE) ]; then echo true; else echo false; fi)
-endif
-ifeq ($(USING_PRIVATE_DEFS),true)
-dummy:=$(warning "WARNING: Using definitions from $(_PRIVATE_DEFS_FILE)")
-include $(_PRIVATE_DEFS_FILE)
-endif
-
-# OUTPUTDIR: Location of all output for the build
-ifdef ALT_OUTPUTDIR
- OUTPUTDIR:=$(subst \,/,$(ALT_OUTPUTDIR))
- # Assumes this is absolute (checks later)
- ABS_OUTPUTDIR:=$(OUTPUTDIR)
-else
- ifndef _OUTPUTDIR
- # Default: Get "build" parent directory, which should always exist
- ifndef BUILD_PARENT_DIRECTORY
- BUILD_PARENT_DIRECTORY=$(BUILDDIR)/..
- endif
- ifdef OPENJDK
- _OUTPUTDIRNAME=$(PLATFORM)-$(ARCH)$(OPENJDK_SUFFIX)
- else
- _OUTPUTDIRNAME=$(PLATFORM)-$(ARCH)
- endif
- _OUTPUTDIR=$(BUILD_PARENT_DIRECTORY)/build/$(_OUTPUTDIRNAME)
- endif
- OUTPUTDIR:=$(_OUTPUTDIR)
-endif
-# Check for spaces and null value
-OUTPUTDIR:=$(call AltCheckSpaces,OUTPUTDIR)
-OUTPUTDIR:=$(call AltCheckValue,OUTPUTDIR)
-
-# Get platform specific settings
-# NB: OUTPUTDIR must be defined. Otherwise hotspot import detection will not work correctly
-# On other hand this must be included early as it provides platform specific defines such as FullPath
-include $(JDK_MAKE_SHARED_DIR)/Defs-versions.gmk
-
-# Get platform specific settings (defines COMPILER_PATH)
-include $(JDK_MAKE_SHARED_DIR)/Defs-$(PLATFORM).gmk
-
-# Components
-ifdef ALT_LANGTOOLS_DIST
- LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST))
-else
- LANGTOOLS_DIST =
-endif
-ifdef ALT_CORBA_DIST
- CORBA_DIST :=$(call FullPath,$(ALT_CORBA_DIST))
-else
- CORBA_DIST =
-endif
-ifdef ALT_JAXP_DIST
- JAXP_DIST :=$(call FullPath,$(ALT_JAXP_DIST))
-else
- JAXP_DIST =
-endif
-ifdef ALT_JAXWS_DIST
- JAXWS_DIST :=$(call FullPath,$(ALT_JAXWS_DIST))
-else
- JAXWS_DIST =
-endif
-
-# HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation
-ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH
- HOTSPOT_DOCS_IMPORT_PATH :=$(call FullPath,$(ALT_HOTSPOT_DOCS_IMPORT_PATH))
-else
- HOTSPOT_DOCS_IMPORT_PATH :=$(call DirExists,$(HOTSPOT_IMPORT_PATH)/docs,$(PROMOTED_BUILD_BASEDIR)/docs,/NO_DOCS_DIR)
-endif
-
-# These are the same on all platforms but require the above platform include 1st
-
-# BOOTDIR: Bootstrap JDK, previous released JDK.
-# _BOOTDIR1 and _BOOTDIR2 picked by platform
-# Platform may optionally define _BOOTDIR3 as well.
-ifdef ALT_BOOTDIR
- BOOTDIR =$(ALT_BOOTDIR)
-else
- ifdef _BOOTDIR3
- BOOTDIR :=$(call DirExists4,$(_BOOTDIR1),$(_BOOTDIR2),$(_BOOTDIR3),/NO_BOOTDIR)
- else
- BOOTDIR :=$(call DirExists,$(_BOOTDIR1),$(_BOOTDIR2),/NO_BOOTDIR)
- endif
-endif
-export BOOTDIR
-BOOTDIR:=$(call AltCheckSpaces,BOOTDIR)
-BOOTDIR:=$(call AltCheckValue,BOOTDIR)
-
-# PREVIOUS_FCS_RE_AREA: re path to where previous release binaries/bundles are
-PREVIOUS_FCS_RE_AREA = $(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs
-
-# PREVIOUS_RELEASE_IMAGE: Previous install image to compare against
-ifdef ALT_PREVIOUS_RELEASE_IMAGE
-
- # Explicit image provided, no bundle access needed
- PREVIOUS_RELEASE_IMAGE :=$(call FullPath,$(ALT_PREVIOUS_RELEASE_IMAGE))
-
-else
-
- # PREVIOUS_RELEASE_PATH: path to where previous release bundles are
- ifdef ALT_PREVIOUS_RELEASE_PATH
- PREVIOUS_RELEASE_PATH :=$(call OptFullPath,$(ALT_PREVIOUS_RELEASE_PATH))
- else
- PREVIOUS_RELEASE_PATH := \
- $(call DirExists,$(PREVIOUS_FCS_RE_AREA)/bundles/$(PLATFORM)-$(ARCH),,)
- endif
-
- # Depending on if we have access to these bundles
- ifeq ($(PREVIOUS_RELEASE_PATH),)
- # Use images in re area or BOOTDIR (which is normally the previous release)
- PREVIOUS_RELEASE_IMAGE := \
- $(call DirExists,$(PREVIOUS_FCS_RE_AREA)/binaries/$(PLATFORM)-$(ARCH),$(BOOTDIR),)
- else
- # Get names of and paths to bundles
- PREVIOUS_RELEASE_PATH:=$(call AltCheckSpaces,PREVIOUS_RELEASE_PATH)
- PREVIOUS_RELEASE_PATH:=$(call AltCheckValue,PREVIOUS_RELEASE_PATH)
- export PREVIOUS_RELEASE_PATH
-
- # PREVIOUS_JDK_FILE: filename of install bundle for previous JDK
- ifdef ALT_PREVIOUS_JDK_FILE
- PREVIOUS_JDK_FILE =$(ALT_PREVIOUS_JDK_FILE)
- else
- PREVIOUS_JDK_FILE = \
- jdk-$(PREVIOUS_JDK_UNDERSCORE_VERSION)-$(PLATFORM)-$(ARCH)$(BUNDLE_FILE_SUFFIX)
- endif
- export PREVIOUS_JDK_FILE
- PREVIOUS_JDK_FILE:=$(call AltCheckSpaces,PREVIOUS_JDK_FILE)
- PREVIOUS_JDK_FILE:=$(call AltCheckValue,PREVIOUS_JDK_FILE)
-
- # PREVIOUS_JRE_FILE: filename of install bundle for previous JRE
- ifdef ALT_PREVIOUS_JRE_FILE
- PREVIOUS_JRE_FILE =$(ALT_PREVIOUS_JRE_FILE)
- else
- PREVIOUS_JRE_FILE = \
- jre-$(PREVIOUS_JDK_UNDERSCORE_VERSION)-$(PLATFORM)-$(ARCH)$(BUNDLE_FILE_SUFFIX)
- endif
- export PREVIOUS_JRE_FILE
- PREVIOUS_JRE_FILE:=$(call AltCheckSpaces,PREVIOUS_JRE_FILE)
- PREVIOUS_JRE_FILE:=$(call AltCheckValue,PREVIOUS_JRE_FILE)
-
- # Paths to these bundles
- PREVIOUS_JRE_BUNDLE = $(PREVIOUS_RELEASE_PATH)/$(PREVIOUS_JRE_FILE)
- PREVIOUS_JDK_BUNDLE = $(PREVIOUS_RELEASE_PATH)/$(PREVIOUS_JDK_FILE)
- endif
-
-endif
-
-# Indicate we are using an image comparison
-ifneq ($(PREVIOUS_RELEASE_IMAGE),)
- PREVIOUS_RELEASE_PATH = USING-PREVIOUS_RELEASE_IMAGE
- PREVIOUS_JRE_BUNDLE = USING-PREVIOUS_RELEASE_IMAGE
- PREVIOUS_JDK_BUNDLE = USING-PREVIOUS_RELEASE_IMAGE
-endif
-
-# CACERTS_FILE: if OPENJDK is false and the internal version of the file
-# (that is, non-empty) is available, use it, otherwise use an
-# empty keystore.
-#
-# We put this variable here for sanity checks and in case another
-# components will need to know which cacerts file is being used.
-#
-ifdef ALT_CACERTS_FILE
- CACERTS_FILE = $(ALT_CACERTS_FILE)
-else
- CACERTS_EXT = $(SHARE_SRC)/lib/security/cacerts
- ifdef OPENJDK
- CACERTS_FILE :=$(CACERTS_EXT)
- else # (!OPENJDK)
- CACERTS_INT = $(CLOSED_SHARE_SRC)/lib/security/cacerts.internal
- CACERTS_FILE :=$(call FileExists,$(CACERTS_INT),$(CACERTS_EXT))
- endif # (OPENJDK)
-endif
-CACERTS_FILE:=$(call AltCheckSpaces,CACERTS_FILE)
-CACERTS_FILE:=$(call AltCheckValue,CACERTS_FILE)
-
-#
-# When signing the JCE framework and provider, we could be using built
-# bits on a read-only filesystem. If so, this test will fail and crash
-# the build.
-#
-ifndef IGNORE_WRITABLE_OUTPUTDIR_TEST
-# Create the output directory and make sure it exists and is writable
-_create_outputdir:=$(shell $(MKDIR) -p "$(OUTPUTDIR)" > $(DEV_NULL) 2>&1)
-ifeq ($(call WriteDirExists,$(OUTPUTDIR),/dev/null),/dev/null)
- _outputdir_error:=$(error "ERROR: OUTPUTDIR '$(OUTPUTDIR)' not created or not writable")
-endif
-endif
-
-# Define absolute path if needed and check for spaces and null value
-ifndef ABS_OUTPUTDIR
- ifdef _OUTPUTDIRNAME
- #Could not define this at the same time as _OUTPUTDIRNAME as FullPath is not defined at that point
- ABS_BUILD_PARENT_DIRECTORY:=$(call FullPath,$(BUILD_PARENT_DIRECTORY))
- ABS_OUTPUTDIR:=$(ABS_BUILD_PARENT_DIRECTORY)/build/$(_OUTPUTDIRNAME)
- else
- ABS_OUTPUTDIR:=$(call FullPath,$(OUTPUTDIR))
- endif
-endif
-ABS_OUTPUTDIR:=$(call AltCheckSpaces,ABS_OUTPUTDIR)
-ABS_OUTPUTDIR:=$(call AltCheckValue,ABS_OUTPUTDIR)
-# Make doubly sure this is a full path
-ifeq ($(call AbsPwdPathCheck,$(ABS_OUTPUTDIR)), )
- ifdef ALT_OUTPUTDIR
- _outputdir_error:=$(error "ERROR: Trouble with the absolute path for OUTPUTDIR '$(OUTPUTDIR)', was ALT_OUTPUTDIR '$(ALT_OUTPUTDIR)' an absolute path?")
- else
- _outputdir_error:=$(error "ERROR: Trouble with the absolute path for OUTPUTDIR '$(OUTPUTDIR)'")
- endif
-endif
-_dir1:=$(call FullPath,$(ABS_OUTPUTDIR))
-_dir2:=$(call FullPath,$(OUTPUTDIR))
-ifneq ($(_dir1),$(_dir2))
- _outputdir_error:=$(error "ERROR: ABS_OUTPUTDIR '$(ABS_OUTPUTDIR)' is not the same directory as OUTPUTDIR '$(OUTPUTDIR)', '$(_dir1)'!='$(_dir2)'")
-endif
-
-# Bin directory
-# NOTE: ISA_DIR is usually empty, on Solaris it might be /sparcv9 or /amd64
-BINDIR = $(OUTPUTDIR)/bin$(ISA_DIR)
-
-# MOZILLA_HEADERS_PATH: path to mozilla header files for plugin
-ifdef ALT_MOZILLA_HEADERS_PATH
- MOZILLA_HEADERS_PATH :=$(call FullPath,$(ALT_MOZILLA_HEADERS_PATH))
-else
- MOZILLA_HEADERS_PATH =$(JDK_DEVTOOLS_DIR)/share/plugin
-endif
-MOZILLA_HEADERS_PATH:=$(call AltCheckSpaces,MOZILLA_HEADERS_PATH)
-MOZILLA_HEADERS_PATH:=$(call AltCheckValue,MOZILLA_HEADERS_PATH)
-
-# CUPS_HEADERS_PATH: path to Cups headers files for Unix printing
-ifneq ($(PLATFORM), windows)
-JDK_CUPS_HEADERS_PATH=$(JDK_DEVTOOLS_DIR)/share/cups/include
- ifdef ALT_CUPS_HEADERS_PATH
- CUPS_HEADERS_PATH:=$(call FullPath,$(ALT_CUPS_HEADERS_PATH))
- CUPS_HEADERS_PATH:=$(call AltCheckValue,CUPS_HEADERS_PATH)
- else
- CUPS_HEADERS_PATH:= \
- $(shell if [ -d "$(JDK_CUPS_HEADERS_PATH)" ]; then \
- echo "$(JDK_CUPS_HEADERS_PATH)"; \
- else \
- echo "$(_CUPS_HEADERS_PATH)";\
- fi)
- endif
-endif
-
-# Utilities ant
-ifeq ($(PLATFORM), windows)
- ifeq ($(ANT_HOME),)
- ANT_HOME := $(call DirExists,$(JDK_DEVTOOLS_DIR)/share/ant/latest,,)
- endif
-endif
-
-# There are few problems with ant we need to workaround:
-# 1) ant is using temporary directory java.io.tmpdir
-# However, this directory is not unique enough and two separate ant processes
-# can easily end up using the exact same temp directory. This may lead to weird build failures
-# To workaround this we will define tmp dir explicitly
-# 2) ant attempts to detect JDK location based on java.exe location
-# This is fragile as developer may have JRE first on the PATH.
-# To workaround this we will specify JAVA_HOME explicitly
-# 3) Sometimes we need to run ant with the boot jdk, sometimes with the import
-# jdk, sometimes with the jdk we are building (see deploy repo).
-
-ANT_TMPDIR = $(ABS_OUTPUTDIR)/tmp
-ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'
-
-ifeq ($(ANT_HOME),)
- ANT = $(ANT_WORKAROUNDS) JAVA_HOME='$(BOOTDIR)' ant
- ANT_WITH_IMPORT = $(ANT_WORKAROUNDS) JAVA_HOME='$(JDK_IMPORT_PATH)' ant
-else
- ANT = $(ANT_WORKAROUNDS) JAVA_HOME='$(BOOTDIR)' $(ANT_HOME)/bin/ant
- ANT_WITH_IMPORT = $(ANT_WORKAROUNDS) JAVA_HOME='$(JDK_IMPORT_PATH)' $(ANT_HOME)/bin/ant
-endif
-
-ifdef ALT_COPYRIGHT_YEAR
- COPYRIGHT_YEAR = $(ALT_COPYRIGHT_YEAR)
-else
- COPYRIGHT_YEAR = $(shell $(DATE) '+%Y')
-endif
-
-# Create file with source information
-SOURCE_TIPS=$(ABS_OUTPUTDIR)/source_tips
-
-# The source tips can come from the Mercurial repository, or in the files
-# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
-# directory as the original $(HGDIR) directory.
-# These should not be := assignments, only used from the root Makefile.
-HG_VERSION = $(shell $(HG) version 2> $(DEV_NULL))
-HG_DIRECTORY=.hg
-HGTIP_FILENAME=.hgtip
-HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO
-REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
- $(shell ( $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \
- $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
- 2> $(DEV_NULL))))))
-
-# Emit the repo:tip pairs to $@
-define GetSourceTips
-for i in $(REPO_LIST) IGNORE ; do \
- if [ "$${i}" = "IGNORE" ] ; then \
- continue; \
- elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
- $(PRINTF) " %s:%s" \
- "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \
- elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
- $(PRINTF) " %s:%s" \
- "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
- fi; \
-done >> $@
-$(PRINTF) "\n" >> $@
-endef
-
-# Create the HGTIP_FILENAME file
-define CreateHgTip
-$(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME);\
-$(ECHO) $1/$(HGTIP_FILENAME)
-endef
-
-# Get the compiler specific settings (will run the compiler to find out)
-# NOTE: COMPILER_PATH must be set by this time.
-# Up until we include this file, we don't know what specific compiler
-# version is actually being used (i.e. what is in PATH or COMPILER_PATH).
-include $(JDK_MAKE_SHARED_DIR)/Compiler-$(CC_VERSION).gmk
-
diff --git a/jdk/make/common/shared/Platform.gmk b/jdk/make/common/shared/Platform.gmk
deleted file mode 100644
index aeaeabe..0000000
--- a/jdk/make/common/shared/Platform.gmk
+++ /dev/null
@@ -1,551 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Shared platform (OS/ARCH) variable settings for the JDK builds.
-#
-# Includes basic system requirements, versions of utilities required,
-# suffixes on files, and basic defaults attributed to the build platform.
-#
-
-#
-# Assumes some basic unix system utilities (e.g. uname) are in the search path
-# in order to figure out the system.
-#
-
-ifndef PLATFORM_SHARED
-
-PLATFORM_SHARED=done
-
-# Possible Input variables:
-# ARCH_DATA_MODEL 32 or 64, default to 32
-# USER, LOGNAME user name (runs logname, or id if not set)
-# PROCESSOR_IDENTIFIER windows only: needed in environment
-#
-# (Also gets input by running the utilities uname, logname, isainfo, or id.)
-#
-# Variables set by this file:
-# SYSTEM_UNAME what 'uname' says this system is
-# USER login name of user (minus blanks)
-# PLATFORM windows, solaris, or linux
-# VARIANT OPT or DBG, OPT is the default
-# TEMP_DISK /tmp or C:/temp
-# ARCH_DATA_MODEL 32 or 64
-# ARCH sparc, sparcv9, i586, amd64, or ia64
-# ARCH_FAMILY sparc or i586
-# ARCHPROP sparc or x86
-# ARCH_VM_SUBDIR jre/bin, jre/lib/sparc, etc.
-# LIBARCH sparc, sparcv9, i386, amd64, or ia64
-# DEV_NULL destination of /dev/null, NUL or /dev/NULL
-# CLASSPATH_SEPARATOR separator in classpath, ; or :
-# LIB_PREFIX dynamic or static library prefix, lib or empty
-# LIB_SUFFIX static library file suffix, .lib or .a?
-# LIBRARY_SUFFIX dynamic library file suffix, .dll or .so
-# OBJECT_SUFFIX object file suffix, .o or .obj
-# EXE_SUFFIX executable file suffix, .exe or empty
-# BUNDLE_FILE_SUFFIX suffix for bundles: .tar or .tar.gz
-# ISA_DIR solaris only: /sparcv9 or /amd64
-# LIBARCH32 solaris only: sparc or i386
-# LIBARCH64 solaris only: sparcv9 or amd64
-# USING_CYGWIN windows only: true or false
-# USING_MSYS windows only: true or false
-# USING_MKS windows only: true or false
-# ISHIELD_TEMP_MIN windows only: minimum disk space in temp area
-
-# Only run uname once in this make session.
-ifndef SYSTEM_UNAME
- SYSTEM_UNAME := $(shell uname)
- export SYSTEM_UNAME
-endif
-
-#
-# Prune out all known SCM (Source Code Management) directories
-# so they will not be included when copying directory trees
-# or packaging up .jar files, etc. This applies to all workspaces.
-#
-SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files .hgignore .hgtags
-# When changing SCM_DIRs also change SCM_DIRS_rexp and SCM_DIRS_prune:
-SCM_DIRS_rexp = ".hg|.svn|CVS|RCS|SCCS|Codemgr_wsdata|deleted_files|.hgignore|.hgtags"
-SCM_DIRS_prune = \( -name .hg -o -name .svn -o -name CVS -o -name RCS -o -name SCCS -o -name Codemgr_wsdata -o -name deleted_files -o -name .hgignore -o -name .hgtags \) -prune
-
-# Don't define this unless it's not defined
-ifndef VARIANT
- VARIANT=OPT
-endif
-
-# Platform settings specific to Solaris
-ifeq ($(SYSTEM_UNAME), SunOS)
- PLATFORM = solaris
- # Solaris sparc build can be either 32-bit or 64-bit.
- # Default to 32, but allow explicit setting to 32 or 64.
- ifndef ARCH_DATA_MODEL
- ARCH_DATA_MODEL=32
- endif
- ifeq ($(ARCH_DATA_MODEL), 32)
- processor := $(shell uname -p)
- archExpr = case "$(processor)" in \
- i[3-9]86) \
- echo i586 \
- ;; \
- sparc*) \
- echo sparc \
- ;; \
- *) \
- echo $(processor) \
- ;; \
- esac
- ARCH := $(shell $(archExpr))
- else
- ARCH := $(shell isainfo -n)
- # ISA_DIR is used to locate 64-bit specific libraries which are generally
- # in the same general place as other libraries under the ./$(ARCH) directory
- ISA_DIR = /$(ARCH)
- endif
- # Need to maintain the jre/lib/i386 location for 32-bit Intel
- ifeq ($(ARCH), i586)
- ARCH_FAMILY = $(ARCH)
- LIBARCH = i386
- # Value of Java os.arch property
- ARCHPROP = x86
- else
- ifeq ($(ARCH), amd64)
- ARCH_FAMILY = i586
- else
- ARCH_FAMILY = sparc
- endif
- LIBARCH = $(ARCH)
- # Value of Java os.arch property
- ARCHPROP = $(LIBARCH)
- endif
- # The two LIBARCH names
- ifeq ($(ARCH_FAMILY), sparc)
- LIBARCH32 = sparc
- LIBARCH64 = sparcv9
- else
- LIBARCH32 = i386
- LIBARCH64 = amd64
- endif
- # Suffix for file bundles used in previous release
- BUNDLE_FILE_SUFFIX=.tar
- # How much RAM does this machine have (zones send an error to stderr):
- MB_OF_MEMORY:=$(shell /usr/sbin/prtconf 2>/dev/null | fgrep 'Memory size:' | expand | cut -d' ' -f3)
-endif
-
-# Platform settings specific to Linux
-ifeq ($(SYSTEM_UNAME), Linux)
- PLATFORM = linux
- # Arch and OS name/version
- ifdef CROSS_COMPILE_ARCH
- mach := $(CROSS_COMPILE_ARCH)
- else
- mach := $(shell uname -m)
- endif
- archExpr = case "$(mach)" in \
- i[3-9]86) \
- echo i586 \
- ;; \
- ia64) \
- echo ia64 \
- ;; \
- x86_64) \
- echo amd64 \
- ;; \
- sparc*) \
- echo sparc \
- ;; \
- arm*) \
- echo arm \
- ;; \
- *) \
- echo $(mach) \
- ;; \
- esac
- ARCH := $(shell $(archExpr) )
- ARCH_FAMILY := $(ARCH)
-
- # Linux builds may be 32-bit or 64-bit data model.
- ifeq ($(ARCH), sparc)
- # Linux sparc build can be either 32-bit or 64-bit.
- # Default to 32, but allow explicit setting to 32 or 64.
- ifndef ARCH_DATA_MODEL
- ARCH_DATA_MODEL=32
- endif
- ifeq ($(ARCH_DATA_MODEL), 32)
- ARCH=sparc
- else
- ARCH=sparcv9
- endif
- else
- # Most archs are 32-bit
- ifndef ARCH_DATA_MODEL
- ARCH_DATA_MODEL=32
- ifeq ($(ARCH), amd64)
- ARCH_DATA_MODEL=64
- endif
- ifeq ($(ARCH), ia64)
- ARCH_DATA_MODEL=64
- endif
- endif
- endif
-
- # Need to maintain the jre/lib/i386 location for 32-bit Intel
- ifeq ($(ARCH), i586)
- LIBARCH = i386
- else
- LIBARCH = $(ARCH)
- endif
-
- # Value of Java os.arch property
- ARCHPROP = $(LIBARCH)
-
- # Suffix for file bundles used in previous release
- BUNDLE_FILE_SUFFIX=.tar.gz
- # How much RAM does this machine have:
- MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' )
-endif
-
-ifeq ($(SYSTEM_UNAME), Darwin)
- PLATFORM = macosx
- OS_NAME = darwin
- OS_VENDOR = Apple
- GB_OF_MEMORY := $(shell system_profiler SPHardwareDataType | fgrep Memory: | awk '{print $$2}')
- MB_OF_MEMORY := $(shell expr ${GB_OF_MEMORY} '*' 1024)
-endif
-
-# Platform settings specific to BSD/Mac OS X
-ifeq ($(PLATFORM), macosx)
- OS_VERSION := $(shell uname -r)
-
- # Arch and OS name/version
- # Darwin x86 builds are i386/amd64 universal by default.
- # Allow arch to be set from the environment to avoid this.
- ifeq ($(origin ARCH), undefined)
- ifeq ($(PLATFORM), macosx)
-# ifdef OPENJDK -- when universal 32/64 binaries available in Hotspot
-# mach := universal
-# else
- mach := x86_64
-# endif
- else
- mach := $(shell uname -m)
- endif
- else
- mach := $(ARCH)
- endif
-
- archExpr = case "$(mach)" in \
- i[3-9]86) \
- echo i586 \
- ;; \
- sparc64) \
- echo sparcv9 \
- ;; \
- sparc*) \
- echo sparc \
- ;; \
- x86_64) \
- echo x86_64 \
- ;; \
- universal) \
- echo universal \
- ;; \
- "Power Macintosh") \
- echo ppc \
- ;; \
- *) \
- echo $(mach) \
- ;; \
- esac
- ARCH := $(shell $(archExpr) )
- ARCH_FAMILY := $(ARCH)
-
- # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
- # ARCH_DATA_MODEL does not exactly mean anything in universal
- # but it has to be one or the other, so pick 32
- ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))
- ARCH_DATA_MODEL=32
- else
- ARCH_DATA_MODEL=64
- endif
-
- # Need to maintain the jre/lib/i386 location for 32-bit Intel
- ifeq ($(ARCH), i586)
- LIBARCH = i386
- else
- LIBARCH = $(ARCH)
- endif
-
- # Value of Java os.arch property
- ARCHPROP = $(LIBARCH)
-
- # Suffix for file bundles used in previous release
- BUNDLE_FILE_SUFFIX=.tar.gz
- # How much RAM does this machine have:
-endif
-
-# Windows with and without CYGWIN will be slightly different
-ifeq ($(SYSTEM_UNAME), Windows_NT)
- PLATFORM = windows
- USING_MKS = true
- export USING_MKS
-endif
-ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
- PLATFORM = windows
- USING_CYGWIN = true
- export USING_CYGWIN
- CYGPATH_CMD=cygpath -a -s -m
- # Only run "cygpath /" once in this make session.
- ifndef CYGWIN_HOME
- CYGWIN_HOME := $(shell $(CYGPATH_CMD) /)
- export CYGWIN_HOME
- endif
-endif
-ifneq (,$(findstring MINGW,$(SYSTEM_UNAME)))
- PLATFORM = windows
- USING_MSYS = true
- export USING_MSYS
-endif
-
-# Platform settings specific to Windows
-ifeq ($(PLATFORM), windows)
- # Windows builds default to the appropriate for the underlaying
- # architecture.
- # Temporary disk area
- TEMP_DISK=C:/temp
- # GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
- # return "x86". Use the first word of $(PROCESSOR_IDENTIFIER) instead.
- # And sometimes PROCESSOR_IDENTIFIER is not defined at all
- # (in some restricted shells), so we use uname if we have to.
- ifeq ($(PROCESSOR_IDENTIFIER),)
- # Only run uname -m once in this make session.
- ifndef SYSTEM_UNAME_M
- SYSTEM_UNAME_M := $(shell uname -m)
- export SYSTEM_UNAME_M
- endif
- PROC_ARCH:=$(SYSTEM_UNAME_M)
- else
- PROC_ARCH:=$(word 1, $(PROCESSOR_IDENTIFIER))
- endif
- # Cover all the possibilities, MKS uname, CYGWIN uname, PROCESSOR_IDENTIFIER
- # Get: X86, X64, or IA64
- PROC_ARCH:=$(patsubst 386,X86,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst 486,X86,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst 586,X86,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst 686,X86,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst i386,X86,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst i486,X86,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst i586,X86,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst i686,X86,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst x86,X86,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst intel64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst Intel64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst INTEL64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst em64t,X64,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst EM64T,X64,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst amd64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst AMD64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst 8664,X64,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst x86_64,X64,$(PROC_ARCH))
- PROC_ARCH:=$(patsubst ia64,IA64,$(PROC_ARCH))
- ifndef ARCH_DATA_MODEL
- ifeq ($(PROC_ARCH),IA64)
- ARCH_DATA_MODEL=64
- else
- ifeq ($(PROC_ARCH),X64)
- ARCH_DATA_MODEL=64
- else
- ARCH_DATA_MODEL=32
- endif
- endif
- endif
- export ARCH_DATA_MODEL
- ifeq ($(ARCH_DATA_MODEL), 64)
- # If the user wants to perform a cross compile build then they must
- # - set ARCH_DATA_MODEL=64 and either
- # + set ARCH to ia64 or amd64, or
- ifeq ($(PROC_ARCH),X64)
- ARCH=amd64
- else
- ifeq ($(PROC_ARCH),IA64)
- ARCH=ia64
- endif
- endif
- LIBARCH=$(ARCH)
- # Value of Java os.arch property
- ARCHPROP=$(LIBARCH)
- else
- # LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel
- ARCH=i586
- LIBARCH=i386
- # Value of Java os.arch property
- ARCHPROP=x86
- endif
- ARCH_FAMILY = $(ARCH)
- # Where is unwanted output to be delivered?
- # MKS uses the special file "NUL"; Cygwin and MinGW/MSYS use the
- # customary unix file.
- ifeq ($(USING_MKS),true)
- DEV_NULL = NUL
- else
- DEV_NULL = /dev/null
- endif
- export DEV_NULL
- # Classpath separator
- CLASSPATH_SEPARATOR = ;
- # The suffix used for object file (.o for unix .obj for windows)
- OBJECT_SUFFIX = obj
- # The suffix applied to executables (.exe for windows, nothing for solaris)
- EXE_SUFFIX = .exe
- # The prefix applied to library files (lib for solaris, nothing for windows)
- LIB_PREFIX=
- LIBRARY_SUFFIX = dll
- LIB_SUFFIX = lib
- # User name determination (set _USER)
- ifndef USER
- ifdef USERNAME
- _USER := $(USERNAME)
- else
- ifdef LOGNAME
- _USER := $(LOGNAME)
- else
- _USER := $(shell id -un)
- endif
- endif
- else
- _USER:=$(USER)
- endif
- # Location of client/server directories
- ARCH_VM_SUBDIR=jre/bin
- # Suffix for file bundles used in previous release
- BUNDLE_FILE_SUFFIX=.tar
- # ISHIELD_TEMP_MIN is the difference of an empty C:\TEMP vs. one after a
- # bundles build on windows.
- ISHIELD_TEMP_MIN=250000
- # How much RAM does this machine have:
- ifeq ($(JDK_HAS_MEM_INFO),)
- ifeq ($(USING_CYGWIN),true)
- # CYGWIN has the 'free' utility
- _MB_OF_MEMORY := \
- $(shell free -m | grep Mem: | awk '{print $$2;}' )
- else
- # Windows XP and higher has the systeminfo utility
- _MB_OF_MEMORY := \
- $(shell systeminfo 2> $(DEV_NULL) | \
- grep 'Total Physical Memory:' | \
- awk '{print $$4;}' | sed -e 's@,@@')
- endif
- ifeq ($(shell expr $(_MB_OF_MEMORY) '+' 0 2> $(DEV_NULL)), $(_MB_OF_MEMORY))
- MB_OF_MEMORY := $(_MB_OF_MEMORY)
- else
- MB_OF_MEMORY := 512
- endif
- endif
-endif
-
-# Unix type settings (same for all unix platforms)
-ifneq ($(PLATFORM), windows)
- # Temporary disk area
- TEMP_DISK=/tmp
- # Where is unwanted output to be delivered?
- DEV_NULL = /dev/null
- export DEV_NULL
- # Character used between entries in classpath
- CLASSPATH_SEPARATOR = :
- # suffix used for object file (.o for unix .obj for windows)
- OBJECT_SUFFIX = o
- # The suffix applied to runtime libraries
- LIBRARY_SUFFIX = so
- # The suffix applied to link libraries
- LIB_SUFFIX = so
- # The suffix applied to executables (.exe for windows, nothing for solaris)
- EXE_SUFFIX =
- # The prefix applied to library files (lib for solaris, nothing for windows)
- LIB_PREFIX = lib
- # User name determination (set _USER)
- ifndef USER
- ifdef LOGNAME
- _USER := $(LOGNAME)
- else
- _USER := $(shell logname)
- endif
- else
- _USER:=$(USER)
- endif
- # Location of client/server directories
- ARCH_VM_SUBDIR=jre/lib/$(LIBARCH)
-endif
-
-# Darwin-specific Overrides
-ifeq ($(SYSTEM_UNAME),Darwin)
- # The suffix applied to runtime libraries
- LIBRARY_SUFFIX = dylib
- # The suffix applied to link libraries
- ifeq ($(ARCH), universal)
- LIB_SUFFIX = o
- else
- LIB_SUFFIX = a
- endif
-
- ifeq ($(PLATFORM), macosx)
- ARCH_VM_SUBDIR=jre/lib
- endif
-endif
-
-# Machines with 512Mb or less of real memory are considered low memory
-# build machines and adjustments will be made to prevent excessing
-# system swapping during the build.
-ifeq ($(JDK_HAS_MEM_INFO),)
- JDK_HAS_MEM_INFO=true
- export JDK_HAS_MEM_INFO
- ifneq ($(MB_OF_MEMORY),)
- LOW_MEMORY_MACHINE := $(shell \
- if [ $(MB_OF_MEMORY) -le 512 ] ; then \
- echo "true"; \
- else \
- echo "false"; \
- fi)
- MAX_VM_MEMORY := 512
- MIN_VM_MEMORY := $(MAX_VM_MEMORY)
- else
- MB_OF_MEMORY := unknown
- LOW_MEMORY_MACHINE := true
- MAX_VM_MEMORY := 384
- MIN_VM_MEMORY := 128
- endif
- export MB_OF_MEMORY
- export LOW_MEMORY_MACHINE
- export MAX_VM_MEMORY
- export MIN_VM_MEMORY
-endif
-
-# If blanks in the username, use the first 4 words and pack them together
-_USER1:=$(subst ', ,$(_USER))
-_USER2:=$(subst ", ,$(_USER1))
-USER:=$(word 1,$(_USER2))$(word 2,$(_USER2))$(word 3,$(_USER2))$(word 4,$(_USER2))
-export USER
-
-export PLATFORM
-endif
-
diff --git a/jdk/make/common/shared/PrivateDefs.gmk-example b/jdk/make/common/shared/PrivateDefs.gmk-example
deleted file mode 100644
index 93f6a43..0000000
--- a/jdk/make/common/shared/PrivateDefs.gmk-example
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file, when re-named to PrivateDefs.gmk will get included in the
-# makefile definitions (before the ALT_ variables are read) so that you can
-# override makefile settings permanently for a workspace.
-# Use of this file will cause WARNING errors, repeatedly, for a reason.
-#
-# WARNING: Use with caution.
-#
-
-# EXAMPLE: Testing a special build of hotspot
-# (this is the build/solaris/export-solaris-sparc directory from doing
-# a 'cd hotspot/make; gnumake' build)
-#
-ifeq ($(PLATFORM),solaris)
- ifeq ($(ARCH),sparc)
- ALT_HOTSPOT_IMPORT_PATH=$(JDK_TOPDIR)/../export-solaris-sparc
- endif
-endif
-
diff --git a/jdk/make/common/shared/Sanity-Settings.gmk b/jdk/make/common/shared/Sanity-Settings.gmk
deleted file mode 100644
index 2ceef21..0000000
--- a/jdk/make/common/shared/Sanity-Settings.gmk
+++ /dev/null
@@ -1,268 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Shared sanity settings file. Fills in the variable ALL_SETTINGS.
-#
-
-# On Windows in particular, it can happen that quotes get into the PATH
-# variable. This is very bad, and must be caught early or you can
-# see errors like: sh: -c: line 0: syntax error near unexpected token
-#
-ifneq ($(PATH), $(subst ",,$(PATH)))
- dummy1:=$(error ERROR: PATH variable contains double quotes, fix your PATH.)
-endif
-ifneq ($(PATH), $(subst ',,$(PATH)))
- dummy1:=$(error ERROR: PATH variable contains single quotes, fix your PATH.)
-endif
-
-# Used to add a heading to ALL_SETTINGS
-define addHeading
-"\n$1:\n"
-endef
-
-# Used to add a line to ALL_SETTINGS for an optional value
-# (need if test for windows which has issues with ; characters in values)
-define addOptionalSetting
-$(if $($1)," $1 = $($1)\n"," $1 = $($1)\n")
-endef
-
-# Used to add a line to ALL_SETTINGS for something that must have a value
-define addRequiredSetting
-$(if $($1)," $1 = $($1)\n",$(warning WARNING: $1 should not be empty [Sanity-Settings.gmk]))
-endef
-
-# Used to add a line to ALL_SETTINGS for something that must have a value
-define addRequiredVersionSetting
-$(if $($1)," $1 = $($1) [requires at least $(REQUIRED_$1)]\n",$(warning WARNING: $1 should not be empty [Sanity-Settings.gmk]))
-endef
-
-# Used to add a series of lines to ALL_SETTINGS
-define addAltSetting
-" $1 = $($1)\n ALT_$1 = $(ALT_$1)\n"
-endef
-
-# Variable that contains a string of all information
-
-# Make sure this is a 'do it now' variable.
-ALL_SETTINGS:=$(call addHeading,Bootstrap Settings)
-ALL_SETTINGS+=$(call addAltSetting,BOOTDIR)
-ALL_SETTINGS+=$(call addRequiredVersionSetting,BOOT_VER)
-ALL_SETTINGS+=$(call addAltSetting,OUTPUTDIR)
-ALL_SETTINGS+=$(call addRequiredSetting,ABS_OUTPUTDIR)
-
-
-ALL_SETTINGS+=$(call addHeading,Build Tool Settings)
-ALL_SETTINGS+=$(call addAltSetting,SLASH_JAVA)
-ALL_SETTINGS+=$(call addRequiredSetting,VARIANT)
-ALL_SETTINGS+=$(call addAltSetting,JDK_DEVTOOLS_DIR)
-ALL_SETTINGS+=$(call addOptionalSetting,ANT_HOME)
-ALL_SETTINGS+=$(call addAltSetting,UNIXCOMMAND_PATH)
-ALL_SETTINGS+=$(call addAltSetting,COMPILER_PATH)
-ALL_SETTINGS+=$(call addAltSetting,DEVTOOLS_PATH)
-ifeq ($(PLATFORM),linux)
- ALL_SETTINGS+=$(call addAltSetting,UNIXCCS_PATH)
- ALL_SETTINGS+=$(call addAltSetting,USRBIN_PATH)
- ifndef OPENJDK
- ALL_SETTINGS+=$(call addAltSetting,GCC29_COMPILER_PATH)
- endif
-endif
-ifeq ($(PLATFORM),solaris)
- ALL_SETTINGS+=$(call addAltSetting,UNIXCCS_PATH)
- ifndef OPENJDK
- ALL_SETTINGS+=$(call addAltSetting,GCC_COMPILER_PATH)
- endif
-endif
-ifeq ($(PLATFORM),windows)
- ifneq ($(MSVCRNN_DLL),)
- ALL_SETTINGS+=$(call addAltSetting,MSVCRNN_DLL_PATH)
- endif
- ALL_SETTINGS+=$(call addRequiredSetting,INCLUDE)
- ALL_SETTINGS+=$(call addRequiredSetting,LIB)
-endif
-ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_NAME)
-ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_VERSION)
-ifdef REQUIRED_CC_VER
- ALL_SETTINGS+=$(call addRequiredVersionSetting,CC_VER)
-else
- ALL_SETTINGS+=$(call addOptionalSetting,CC_VER)
-endif
-ifeq ($(PLATFORM),solaris)
- ifeq ($(ARCH_DATA_MODEL), 32)
- ifndef OPENJDK
- ALL_SETTINGS+=$(call addRequiredVersionSetting,GCC_VER)
- endif
- endif
-endif
-ALL_SETTINGS+=$(call addRequiredVersionSetting,ZIP_VER)
-ALL_SETTINGS+=$(call addRequiredVersionSetting,UNZIP_VER)
-ifeq ($(PLATFORM),windows)
- ALL_SETTINGS+=$(call addRequiredVersionSetting,LINK_VER)
- ALL_SETTINGS+=$(call addRequiredSetting,CC)
- ALL_SETTINGS+=$(call addRequiredSetting,LINK)
- ALL_SETTINGS+=$(call addRequiredSetting,DUMPBIN)
-endif
-ALL_SETTINGS+=$(call addRequiredVersionSetting,ANT_VER)
-ALL_SETTINGS+=$(call addRequiredSetting,TEMPDIR)
-
-
-ALL_SETTINGS+=$(call addHeading,Build Directives)
-ALL_SETTINGS+=$(call addOptionalSetting,OPENJDK)
-ALL_SETTINGS+=$(call addOptionalSetting,USE_HOTSPOT_INTERPRETER_MODE)
-ALL_SETTINGS+=$(call addOptionalSetting,PEDANTIC)
-ALL_SETTINGS+=$(call addOptionalSetting,DEV_ONLY)
-ALL_SETTINGS+=$(call addOptionalSetting,NO_DOCS)
-ALL_SETTINGS+=$(call addOptionalSetting,NO_DEMOS)
-ALL_SETTINGS+=$(call addOptionalSetting,NO_SAMPLES)
-ALL_SETTINGS+=$(call addOptionalSetting,NO_IMAGES)
-ALL_SETTINGS+=$(call addOptionalSetting,TOOLS_ONLY)
-ALL_SETTINGS+=$(call addOptionalSetting,INSANE)
-ALL_SETTINGS+=$(call addRequiredSetting,COMPILE_APPROACH)
-ifeq ($(COMPILE_APPROACH), parallel)
- ALL_SETTINGS+=$(call addAltSetting,PARALLEL_COMPILE_JOBS)
-endif
-ALL_SETTINGS+=$(call addOptionalSetting,FASTDEBUG)
-ALL_SETTINGS+=$(call addRequiredSetting,COMPILER_WARNINGS_FATAL)
-ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_WARNING_LEVEL)
-ALL_SETTINGS+=$(call addOptionalSetting,SHOW_ALL_WARNINGS)
-ALL_SETTINGS+=$(call addRequiredSetting,INCREMENTAL_BUILD)
-ALL_SETTINGS+=$(call addOptionalSetting,CC_HIGHEST_OPT)
-ALL_SETTINGS+=$(call addOptionalSetting,CC_HIGHER_OPT)
-ALL_SETTINGS+=$(call addOptionalSetting,CC_LOWER_OPT)
-ALL_SETTINGS+=$(call addOptionalSetting,CXXFLAGS)
-ALL_SETTINGS+=$(call addOptionalSetting,CFLAGS)
-
-ALL_SETTINGS+=$(call addOptionalSetting,BOOT_JAVA_CMD)
-ALL_SETTINGS+=$(call addOptionalSetting,BOOT_JAVAC_CMD)
-ALL_SETTINGS+=$(call addOptionalSetting,BOOT_JAR_CMD)
-ALL_SETTINGS+=$(call addOptionalSetting,BOOT_JARSIGNER_CMD)
-
-# These don't print out well with windows due to the ';' characters
-ifneq ($(PLATFORM),windows)
- ALL_SETTINGS+=$(call addOptionalSetting,JAVAC_CMD)
- ALL_SETTINGS+=$(call addOptionalSetting,JAVAH_CMD)
- ALL_SETTINGS+=$(call addOptionalSetting,JAVADOC_CMD)
-endif
-
-ALL_SETTINGS+=$(call addHeading,Build Platform Settings)
-ALL_SETTINGS+=$(call addRequiredSetting,USER)
-ALL_SETTINGS+=$(call addRequiredSetting,PLATFORM)
-ALL_SETTINGS+=$(call addRequiredSetting,ARCH)
-ALL_SETTINGS+=$(call addRequiredSetting,LIBARCH)
-ALL_SETTINGS+=$(call addRequiredSetting,ARCH_FAMILY)
-ALL_SETTINGS+=$(call addRequiredSetting,ARCH_DATA_MODEL)
-ALL_SETTINGS+=$(call addRequiredSetting,ARCHPROP)
-ifeq ($(PLATFORM),windows)
- ALL_SETTINGS+=$(call addRequiredSetting,PROCESSOR_ARCHITECTURE)
- ALL_SETTINGS+=$(call addRequiredSetting,PROCESSOR_IDENTIFIER)
- ifdef USING_CYGWIN
- ALL_SETTINGS+=$(call addRequiredSetting,USING_CYGWIN)
- ALL_SETTINGS+=$(call addRequiredVersionSetting,CYGWIN_VER)
- ALL_SETTINGS+=$(call addRequiredSetting,CYGPATH_CMD)
- else
- ifdef USING_MSYS
- ALL_SETTINGS+=$(call addRequiredSetting,USING_MSYS)
- ALL_SETTINGS+=$(call addRequiredSetting,DOSPATH_CMD)
- else
- ALL_SETTINGS+=$(call addRequiredVersionSetting,MKS_VER)
- ALL_SETTINGS+=$(call addOptionalSetting,DOSNAME_CMD)
- endif
- endif
-endif
-ifeq ($(PLATFORM),linux)
- ifdef REQUIRED_ALSA_VERSION
- ALL_SETTINGS+=$(call addRequiredSetting,ALSA_VERSION)
- endif
-endif
-ALL_SETTINGS+=$(call addRequiredVersionSetting,OS_VERSION)
-ALL_SETTINGS+=$(call addOptionalSetting,OS_VARIANT_NAME)
-ALL_SETTINGS+=$(call addOptionalSetting,OS_VARIANT_VERSION)
-ALL_SETTINGS+=$(call addRequiredSetting,MB_OF_MEMORY)
-
-
-ALL_SETTINGS+=$(call addHeading,GNU Make Settings)
-ALL_SETTINGS+=$(call addRequiredSetting,MAKE)
-ALL_SETTINGS+=$(call addRequiredVersionSetting,MAKE_VER)
-ALL_SETTINGS+=$(call addOptionalSetting,MAKECMDGOALS)
-ALL_SETTINGS+=$(call addOptionalSetting,MAKEFLAGS)
-ALL_SETTINGS+=$(call addRequiredSetting,SHELL)
-
-
-ALL_SETTINGS+=$(call addHeading,Target Build Versions)
-ALL_SETTINGS+=$(call addRequiredSetting,JDK_VERSION)
-ALL_SETTINGS+=$(call addOptionalSetting,MILESTONE)
-ALL_SETTINGS+=$(call addOptionalSetting,RELEASE)
-ALL_SETTINGS+=$(call addRequiredSetting,FULL_VERSION)
-ALL_SETTINGS+=$(call addOptionalSetting,BUILD_NUMBER)
-
-
-ALL_SETTINGS+=$(call addHeading,External File/Binary Locations)
-ALL_SETTINGS+=$(call addRequiredSetting,USRJDKINSTANCES_PATH)
-ALL_SETTINGS+=$(call addAltSetting,BUILD_JDK_IMPORT_PATH)
-ALL_SETTINGS+=$(call addAltSetting,JDK_IMPORT_PATH)
-ALL_SETTINGS+=$(call addAltSetting,LANGTOOLS_DIST)
-ALL_SETTINGS+=$(call addAltSetting,CORBA_DIST)
-ALL_SETTINGS+=$(call addAltSetting,JAXP_DIST)
-ALL_SETTINGS+=$(call addAltSetting,JAXWS_DIST)
-ALL_SETTINGS+=$(call addAltSetting,HOTSPOT_DOCS_IMPORT_PATH)
-ALL_SETTINGS+=$(call addAltSetting,HOTSPOT_IMPORT_PATH)
-ifeq ($(ARCH_DATA_MODEL), 32)
- ALL_SETTINGS+=$(call addAltSetting,HOTSPOT_CLIENT_PATH)
-endif
-ALL_SETTINGS+=$(call addAltSetting,HOTSPOT_SERVER_PATH)
-ifeq ($(PLATFORM),windows)
- ALL_SETTINGS+=$(call addAltSetting,HOTSPOT_LIB_PATH)
- ALL_SETTINGS+=$(call addAltSetting,WINDOWSSDKDIR)
- ALL_SETTINGS+=$(call addRequiredSetting,RC)
- ALL_SETTINGS+=$(call addRequiredSetting,REBASE)
- ifndef OPENJDK
- ALL_SETTINGS+=$(call addAltSetting,DEPLOY_MSSDK)
- ALL_SETTINGS+=$(call addAltSetting,INSTALL_MSSDK)
- ALL_SETTINGS+=$(call addAltSetting,WSCRIPT)
- ALL_SETTINGS+=$(call addAltSetting,MSICERT)
- endif
-endif
-ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE)
-ifndef OPENJDK
- ALL_SETTINGS+=$(call addAltSetting,MOZILLA_HEADERS_PATH)
-endif
-ifneq ($(PLATFORM),windows)
- ALL_SETTINGS+=$(call addAltSetting,CUPS_HEADERS_PATH)
-endif
-
-ifdef OPENJDK
- ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings)
- ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH)
- ALL_SETTINGS+=$(call addAltSetting,FREETYPE_LIB_PATH)
-endif
-
-ifdef OPENJDK
- ALL_SETTINGS+=$(call addHeading,Previous JDK Settings)
- ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_RELEASE_PATH)
- ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_JDK_VERSION)
- ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_JDK_FILE)
- ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_JRE_FILE)
- ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_RELEASE_IMAGE)
-endif
diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk
deleted file mode 100644
index 66fab35..0000000
--- a/jdk/make/common/shared/Sanity.gmk
+++ /dev/null
@@ -1,1566 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# WARNING: This file is shared with other workspaces.
-#
-
-#
-# Shared sanity rules for the JDK builds.
-#
-
-.SUFFIXES: .hdiffs
-
-# All files created during sanity checking
-
-SANITY_FILES = $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
-
-# How to say "The Release Engineering people use this"
-THE_OFFICIAL_USES=The official builds on $(PLATFORM) use
-
-# How to say "You are using:"
-YOU_ARE_USING=You appear to be using
-
-# Error message
-define SanityError
-$(ECHO) "ERROR: $1\n" >> $(ERROR_FILE)
-endef
-
-# Warning message
-define SanityWarning
-$(ECHO) "WARNING: $1\n" >> $(WARNING_FILE)
-endef
-
-# Official version error message: name version required_version
-define OfficialErrorMessage
-$(call SanityError,\
-$(THE_OFFICIAL_USES) $1 $3. Your $1 $(if $2,undefined,$2) will not work.)
-endef
-
-# Official version warning message: name version required_version
-define OfficialWarningMessage
-$(call SanityWarning,\
-$(THE_OFFICIAL_USES) $1 $3. $(YOU_ARE_USING) $1 $2.)
-endef
-
-
-# Settings and rules to validate the JDK build environment.
-
-ifeq ($(PLATFORM), solaris)
- # What kind of system we are using (Variations are Solaris and OpenSolaris)
- OS_VERSION := $(shell uname -r)
- OS_VARIANT_NAME := $(strip $(shell head -1 /etc/release | awk '{print $$1;}') )
- OS_VARIANT_VERSION := $(OS_VERSION)
- REQ_PATCH_LIST = $(JDK_TOPDIR)/make/PatchList.solaris
- ifeq ($(ARCH_FAMILY), sparc)
- PATCH_POSITION = $$4
- else
- PATCH_POSITION = $$6
- endif
- ifndef OPENJDK
- _GCC_VER :=$(shell $(GCC) -dumpversion 2>&1 )
- GCC_VER :=$(call GetVersion,"$(_GCC_VER)")
- endif
-endif
-
-ifeq ($(PLATFORM), linux)
- # What kind of system we are using (Variation is the Linux vendor)
- OS_VERSION := $(shell uname -r)
- OS_VARIANT_NAME := $(shell \
- if [ -f /etc/fedora-release ] ; then \
- echo "Fedora"; \
- elif [ -f /etc/redhat-release ] ; then \
- echo "RedHat"; \
- elif [ -f /etc/SuSE-release ] ; then \
- echo "SuSE"; \
- elif [ -f /etc/lsb-release ] ; then \
- $(EGREP) DISTRIB_ID /etc/lsb-release | $(SED) -e 's@.*DISTRIB_ID=\(.*\)@\1@'; \
- else \
- echo "Unknown"; \
- fi)
- OS_VARIANT_VERSION := $(shell \
- if [ "$(OS_VARIANT_NAME)" = "Fedora" ] ; then \
- $(CAT) /etc/fedora-release | $(HEAD) -1 | $(NAWK) '{ print $$3; }' ; \
- elif [ -f /etc/lsb-release ] ; then \
- $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
- fi)
- ALSA_INCLUDE=/usr/include/alsa/version.h
- ALSA_LIBRARY=/usr/lib/libasound.so
- _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
- $(SED) -e 's@.*"\(.*\)".*@\1@' )
- ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
-endif
-
-ifeq ($(PLATFORM), macosx)
- # What kind of system we are using
- OS_VERSION := $(shell uname -r)
- OS_VARIANT_NAME := MacOSX
- OS_VARIANT_VERSION := $(shell sw_vers -productVersion)
-endif
-
-ifeq ($(PLATFORM), windows)
- # Windows 2000 is 5.0, Windows XP is 5.1,
- # Windows 2003 is 5.2, Windows 7 and 2008R2 are 6.1
- # Assume 5.0 (Windows 2000) if systeminfo does not help
- WINDOWS_MAPPING-5.0 := Windows2000
- WINDOWS_MAPPING-5.1 := WindowsXP
- WINDOWS_MAPPING-5.2 := Windows2003
- WINDOWS_MAPPING-6.1 := Windows2008R2
- # What kind of system we are using (Variation is the common name)
- _OS_VERSION := \
- $(shell systeminfo 2> $(DEV_NULL) | \
- egrep '^OS Version:' | \
- awk '{print $$3;}' )
- ifeq ($(_OS_VERSION),)
- OS_VERSION = 5.0
- else
- OS_VERSION = $(call MajorVersion,$(_OS_VERSION)).$(call MinorVersion,$(_OS_VERSION))
- endif
- OS_VARIANT_NAME := $(WINDOWS_MAPPING-$(OS_VERSION))
- OS_VARIANT_VERSION := $(OS_VERSION)
- ifdef USING_CYGWIN
- # CYGWIN version
- _CYGWIN_VER := $(SYSTEM_UNAME)
- CYGWIN_VER :=$(call GetVersion,$(_CYGWIN_VER))
- endif
-endif
-
-# Get the version numbers of what we are using
-_MAKE_VER :=$(shell $(MAKE) --version 2>&1 | $(HEAD) -n 1)
-_ZIP_VER :=$(shell $(ZIPEXE) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^Zip')
-_UNZIP_VER :=$(shell $(UNZIP) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^UnZip')
-_BOOT_VER :=$(shell $(BOOTDIR)/bin/java -version 2>&1 | $(HEAD) -n 1)
-MAKE_VER :=$(call GetVersion,"$(_MAKE_VER)")
-ZIP_VER :=$(call GetVersion,"$(_ZIP_VER)")
-UNZIP_VER :=$(call GetVersion,"$(_UNZIP_VER)")
-BOOT_VER :=$(call GetVersion,"$(_BOOT_VER)")
-
-_ANT_VER:=$(shell $(ANT) -version 2>&1 )
-ANT_VER:=$(call GetVersion,"$(_ANT_VER)")
-
-ifdef ALT_BINDIR
- ALT_BINDIR_VERSION := $(shell $(ALT_BINDIR)/java$(EXE_SUFFIX) -version 2>&1 | $(NAWK) -F'"' '{ print $$2 }')
- ALT_BINDIR_OK := $(shell $(ECHO) $(ALT_BINDIR_VERSION) | $(EGREP) -c '^$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION)')
-endif
-
-INSTALL_PATCHES_FILE = $(TEMPDIR)/installed.patches
-
-# Get ALL_SETTINGS defined
-include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk
-
-.PHONY: \
- sane-copyrightyear\
- sane-settings \
- sane-insane \
- sane-build_number \
- sane-os_version \
- sane-memory_check \
- sane-windows \
- sane-locale \
- sane-linux \
- sane-cygwin \
- sane-cygwin-shell \
- sane-arch_data_model \
- sane-os_patch_level \
- sane-classpath \
- sane-java_home \
- sane-fonts \
- sane-variant \
- sane-ld_library_path \
- sane-ld_library_path_64 \
- sane-ld_options \
- sane-ld_run_path \
- sane-makeflags \
- sane-alt_outputdir \
- sane-outputdir \
- sane-alt_bootdir \
- sane-bootdir \
- sane-local-bootdir \
- sane-cups \
- sane-devtools_path \
- sane-compiler_path \
- sane-unixcommand_path \
- sane-usrbin_path \
- sane-unixccs_path \
- sane-docs_import \
- sane-math_iso \
- sane-libCrun \
- sane-msdevtools_path \
- sane-hotspot_binaries \
- sane-hotspot_import \
- sane-hotspot_import_dir \
- sane-hotspot_import_include \
- sane-compiler \
- sane-link \
- sane-cacerts \
- sane-alsa-headers \
- sane-ant_version \
- sane-zip_version \
- sane-unzip_version \
- sane-msvcrt_path \
- sane-freetype
-
-######################################################
-# check for COPYRIGHT_YEAR variable
-######################################################
-sane-copyrightyear:
-ifdef ALT_COPYRIGHT_YEAR
- @$(ECHO) "WARNING: ALT_COPYRIGHT_YEAR but not the current year\n" \
- " will be used for copyright year.\n " \
- "" >>$(WARNING_FILE)
-endif
-
-######################################################
-# check for INSANE variable
-######################################################
-sane-insane:
-ifdef INSANE
- @$(ECHO) "WARNING: You are building in 'INSANE' mode. You \n" \
- " should not use this mode, and in fact, \n" \
- " it may be removed at any time. If you \n" \
- " have build problems as a result of using \n" \
- " INSANE mode, then you should not expect \n" \
- " assistance from anyone with the problems \n" \
- " or consequences you experience. \n" \
- "" >> $(WARNING_FILE)
-endif
-
-######################################################
-# check for GNU Make version
-######################################################
-MAKE_CHECK :=$(call CheckVersions,$(MAKE_VER),$(REQUIRED_MAKE_VER))
-sane-make:
- @if [ "$(MAKE_CHECK)" != "same" -a "$(MAKE_CHECK)" != "newer" ]; then \
- $(ECHO) "ERROR: The version of make being used is older than \n" \
- " the required version of '$(REQUIRED_MAKE_VER)'. \n" \
- " The version of make found was '$(MAKE_VER)'. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-
-######################################################
-# Check the BUILD_NUMBER to make sure it contains bNN
-######################################################
-sane-build_number:
- @if [ "`$(ECHO) $(BUILD_NUMBER) | $(SED) 's@.*b[0-9][0-9]*.*@bNN@'`" != "bNN" ] ; then \
- $(ECHO) "WARNING: The BUILD_NUMBER needs to contain b[0-9][0-9]*. Currently BUILD_NUMBER=$(BUILD_NUMBER). \n" \
- " This has been known to cause build failures. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
-
-######################################################
-# Check the ARCH_DATA_MODEL setting
-######################################################
-sane-arch_data_model:
- @if [ "$(ARCH_DATA_MODEL)" != 32 -a "$(ARCH_DATA_MODEL)" != 64 ]; then \
- $(ECHO) "ERROR: The setting of ARCH_DATA_MODEL must be 32 or 64.\n" \
- " $(YOU_ARE_USING) ARCH_DATA_MODEL=$(ARCH_DATA_MODEL). \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-ifdef BUILD_CLIENT_ONLY
- @if [ "$(ARCH_DATA_MODEL)" != 32 ]; then \
- $(ECHO) "WARNING: You have requested BUILD_CLIENT_ONLY in a 64-bit build.\n" \
- "" >> $(WARNING_FILE) ; \
- fi
-endif
-
-######################################################
-# Check the OS version (windows and linux have release name checks)
-# NOTE: OPENJDK explicitly does not check for OS release information.
-# Unless we know for sure that it will not build somewhere, we cannot
-# generate a fatal sanity error, and a warning about the official
-# build platform just becomes clutter.
-######################################################
-ifndef OPENJDK
- OS_VERSION_CHECK := \
- $(call CheckVersions,$(OS_VERSION),$(REQUIRED_OS_VERSION))
- ifeq ($(OS_VARIANT_NAME),$(REQUIRED_OS_VARIANT_NAME))
- OS_VARIANT_VERSION_CHECK := \
- $(call CheckVersions,$(OS_VARIANT_VERSION),$(REQUIRED_OS_VARIANT_VERSION))
- endif
-endif
-sane-os_version:: sane-arch_data_model sane-memory_check sane-locale sane-os_patch_level
-ifndef OPENJDK
- ifneq ($(OS_VARIANT_NAME),$(REQUIRED_OS_VARIANT_NAME))
- ifeq ($(OS_VERSION_CHECK),missing)
- @$(call OfficialErrorMessage,OS version,$(OS_VERSION),$(REQUIRED_OS_VERSION))
- endif
- ifneq ($(OS_VERSION_CHECK),same)
- @$(call OfficialWarningMessage,OS version,$(OS_VERSION),$(REQUIRED_OS_VERSION))
- endif
- @$(call OfficialWarningMessage,OS variant,$(OS_VARIANT_NAME),$(REQUIRED_OS_VARIANT_NAME))
- else
- ifneq ($(OS_VARIANT_VERSION_CHECK),same)
- @$(call OfficialWarningMessage,$(OS_VARIANT_NAME) version,$(OS_VARIANT_VERSION),$(REQUIRED_OS_VARIANT_VERSION))
- endif
- endif
-endif # OPENJDK
-
-ifeq ($(PLATFORM), windows)
- sane-os_version:: sane-cygwin sane-cygwin-shell
-endif
-
-######################################################
-# Check the memory available on this machine
-######################################################
-sane-memory_check:
- @if [ "$(LOW_MEMORY_MACHINE)" = "true" ]; then \
- $(ECHO) "WARNING: This machine appears to only have $(MB_OF_MEMORY)Mb of physical memory, \n" \
- " builds on this machine could be slow. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
-
-######################################################
-# Check the locale (value of LC_ALL, not being empty or ==C can be a problem)
-######################################################
-sane-locale:
-ifneq ($(PLATFORM), windows)
- @if [ "$(LC_ALL)" != "" -a "$(LC_ALL)" != "C" ]; then \
- $(ECHO) "WARNING: LC_ALL has been set to $(LC_ALL), this can cause build failures. \n" \
- " Try setting LC_ALL to 'C'. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
- @if [ "$(LANG)" != "" -a "$(LANG)" != "C" ]; then \
- $(ECHO) "WARNING: LANG has been set to $(LANG), this can cause build failures. \n" \
- " Try setting LANG to 'C'. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
-ifeq ($(PLATFORM), macosx)
- @if [ "$(LANG)" = "" ]; then \
- $(ECHO) "ERROR: LANG must be set on Mac OS X. Recommended value is \"C\"" >> $(ERROR_FILE) ; \
- fi
-endif
-endif
-
-
-######################################################
-# Check the Windows cygwin version
-######################################################
-ifeq ($(PLATFORM), windows)
- CYGWIN_CHECK :=$(call CheckVersions,$(CYGWIN_VER),$(REQUIRED_CYGWIN_VER))
-sane-cygwin:
- ifdef USING_CYGWIN
- ifeq ($(CYGWIN_CHECK),missing)
- @$(call OfficialErrorMessage,CYGWIN version,$(CYGWIN_VER),$(REQUIRED_CYGWIN_VER))
- endif
- ifeq ($(CYGWIN_CHECK),older)
- @$(call OfficialWarningMessage,CYGWIN version,$(CYGWIN_VER),$(REQUIRED_CYGWIN_VER))
- endif
- endif
-endif
-
-######################################################
-# Check the cygwin shell is used, not cmd.exe
-######################################################
-ifeq ($(PLATFORM), windows)
-sane-cygwin-shell:
- ifdef USING_CYGWIN
- @if [ "$(SHLVL)" = "" -a "$(_)" = "" ]; then \
- $(ECHO) "ERROR: You are using an unsupported shell. \n" \
- " Use either sh, bash, ksh, zsh, or tcsh. \n" \
- " Using the cmd.exe utility is not supported. \n" \
- " If you still want to try your current shell, \n" \
- " please export SHLVL=1 when running $(MAKE). \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- endif
-endif
-
-######################################################
-# Get list of installed patches (this file has a particular format)
-######################################################
-$(INSTALL_PATCHES_FILE):
- @$(prep-target)
-ifeq ($(PLATFORM), solaris)
- ifeq ($(OS_VERSION),$(REQUIRED_OS_VERSION))
- $(SHOWREV) -p > $@ 2>&1
- endif
-endif
- @$(ECHO) "" >> $@
-
-######################################################
-# Check list of Solaris patches
-######################################################
-sane-os_patch_level: $(INSTALL_PATCHES_FILE)
-ifeq ($(PLATFORM), solaris)
- ifeq ($(OS_VERSION),$(REQUIRED_OS_VERSION))
- @$(NAWK) 'BEGIN { \
- readingInstallPatches = 0; \
- requiredCount = 0; \
- installCount = 0; \
-} \
-{ \
- if (readingInstallPatches) { \
- if ($$1=="Patch:") { \
- ns = split($$2,parts,"-"); \
- installPatchNo[installCount]=parts[1]; \
- installPatchRev[installCount]=parts[2]; \
- installCount++; \
- } \
- } \
- \
- if (!readingInstallPatches) { \
- if (index($$1,"#") != 0) continue; \
- if (match($$1,"BUILD") > 0 \
- && $$2 == $(OS_VERSION) \
- && ($$7 == "REQ" || $$7 == "req") \
- && $(PATCH_POSITION) != "none" \
- && $(PATCH_POSITION) != "NONE") { \
- ns = split($(PATCH_POSITION),parts,"-"); \
- requiredPatchNo[requiredCount]=parts[1]; \
- requiredPatchRev[requiredCount]=parts[2]; \
- requiredCount++; \
- } \
- } \
-} \
-END { \
- errorCount=0; \
- for (i=0; i<requiredCount; i++) { \
- foundMatch = 0; \
- for (j=0; j<installCount; j++) { \
- if (installPatchNo[j] == requiredPatchNo[i] \
- && installPatchRev[j] >= requiredPatchRev[i]) { \
- foundMatch = 1; \
- break; \
- } \
- } \
- if ( foundMatch == 0) { \
- printf("WARNING: Your solaris install is missing the required patch %s-%s\n", requiredPatchNo[i], requiredPatchRev[i] ); \
- printf(" Please update your your system patches or build on a different machine.\n\n" ); \
- errorCount++; \
- } \
- } \
-}' $(REQ_PATCH_LIST) readingInstallPatches=1 $(INSTALL_PATCHES_FILE) >> $(WARNING_FILE)
- endif
-endif # PLATFORM
-
-######################################################
-# CLASSPATH cannot be set, unless you are insane.
-######################################################
-sane-classpath:
-ifdef CLASSPATH
- @$(ECHO) "ERROR: Your CLASSPATH environment variable is set. This will \n" \
- " most likely cause the build to fail. Please unset it \n" \
- " and start your build again. \n" \
- "" >> $(ERROR_FILE)
-endif
-
-######################################################
-# JAVA_HOME cannot be set, unless you are insane.
-######################################################
-sane-java_home:
-ifdef JAVA_HOME
- @$(ECHO) "ERROR: Your JAVA_HOME environment variable is set. This will \n" \
- " most likely cause the build to fail. Please unset it \n" \
- " and start your build again. \n" \
- "" >> $(ERROR_FILE)
-endif
-
-######################################################
-# Make sure the fonts are there
-# Exceptions are when explicitly building OPENJDK, or
-# when the entire CLOSED_SRC dir is excluded, so we are
-# implicitly building OPENJDK
-######################################################
-FONT_FILE=$(CLOSED_SRC)/share/lib/fonts/LucidaTypewriterRegular.ttf
-sane-fonts:
-ifndef OPENJDK
- @if [ -d $(CLOSED_SRC) ] ; then \
- if [ ! -f $(FONT_FILE) ] ; then \
- $(ECHO) "ERROR: Missing $(FONT_FILE). \n" \
- " Verify you have downloaded and overlayed on the source area all the binary files. \n" \
- "" >> $(ERROR_FILE); \
- fi \
- fi
-endif
-
-######################################################
-# VARIANT must be set to DBG or OPT
-######################################################
-sane-variant:
- @if [ "$(VARIANT)" != DBG -a "$(VARIANT)" != OPT ] ; then \
- $(ECHO) "ERROR: Your VARIANT environment variable is set to $(VARIANT). \n" \
- " Needs to be set to DBG or OPT \n" \
- "" >> $(ERROR_FILE); \
- fi
-
-######################################################
-# LD_LIBRARY_PATH should not be set, unless you are insane.
-######################################################
-sane-ld_library_path:
-ifdef LD_LIBRARY_PATH
- @$(ECHO) "ERROR: Your LD_LIBRARY_PATH environment variable is set. This may \n" \
- " produce binaries binaries incorrectly. Please unset it \n" \
- " and start your build again. \n" \
- "" >> $(ERROR_FILE)
-endif
-
-######################################################
-# LD_LIBRARY_PATH_64 should not be set, unless you are insane.
-######################################################
-sane-ld_library_path_64:
-ifdef LD_LIBRARY_PATH_64
- @$(ECHO) "ERROR: Your LD_LIBRARY_PATH_64 environment variable is set. This may \n" \
- " produce binaries binaries incorrectly. Please unset it \n" \
- " and start your build again. \n" \
- "" >> $(ERROR_FILE)
-endif
-
-######################################################
-# LD_OPTIONS should not be set, unless you are insane.
-######################################################
-sane-ld_options:
-ifdef LD_OPTIONS
- @$(ECHO) "ERROR: Your LD_OPTIONS environment variable is set. This may \n" \
- " produce binaries binaries incorrectly. Please unset it \n" \
- " and start your build again. \n" \
- "" >> $(ERROR_FILE)
-endif
-
-######################################################
-# LD_RUN_PATH should not be set, unless you are insane.
-######################################################
-sane-ld_run_path:
-ifdef LD_RUN_PATH
- @$(ECHO) "ERROR: Your LD_RUN_PATH environment variable is set. This may \n" \
- " produce binaries binaries incorrectly. Please unset it \n" \
- " produce binaries binaries incorrectly. Please unset it \n" \
- " and start your build again. \n" \
- "" >> $(ERROR_FILE)
-endif
-
-######################################################
-# MAKEFLAGS cannot be set, unless you are insane.
-######################################################
-ifeq ($(PLATFORM), windows)
-ifdef USING_CYGWIN
-REAL_MAKEFLAGS:=$(subst --unix,,$(MAKEFLAGS))
-else
-REAL_MAKEFLAGS:=$(MAKEFLAGS)
-endif
-else
-REAL_MAKEFLAGS:=$(MAKEFLAGS)
-endif
-sane-makeflags:
-# ifneq ($(strip $(REAL_MAKEFLAGS)),)
-ifeq ($(origin MAKEFLAGS),environment)
- @#
- @# it is unacceptable to have the-e or --environment-overrides value in MAKEFLAGS
- @#
- @if [ `$(ECHO) $(MAKEFLAGS) | $(EGREP) -c '(^| )(e|--environment-overrides)( |$$)'` -ne 0 ]; then \
- $(ECHO) "ERROR: Either the build was started with the flag -e or \n" \
- " --environment-overrides, or the MAKEFLAGS environment \n" \
- " variable has this value set. This will cause any \n" \
- " environment variables you have defined to override \n" \
- " the values defined by the makefiles. This practice is \n" \
- " not recommemded by the authors of GNU Make, and \n" \
- " will lead to an improper build. \n" \
- " Please fix and restart the build. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @#
- @# it is unacceptable to havethe -i or --ignore-errors value in MAKEFLAGS
- @#
- @if [ `$(ECHO) $(MAKEFLAGS) | $(EGREP) -c '(^| )(i|--ignore-errors)( |$$)'` -ne 0 ]; then \
- $(ECHO) "ERROR: Either the build was started with the flag -i or \n" \
- " --ignore-errors, or the MAKEFLAGS environment \n" \
- " variable has this value set. 1111 You will be unable \n" \
- " to determine if the build is broken or not. \n" \
- " Please fix and restart the build. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @#
- @# it is unacceptable to have the -I or --include-dir value in MAKEFLAGS
- @#
- @if [ `$(ECHO) $(MAKEFLAGS) | $(EGREP) -c '(^| )(I|--include-dir)( |$$)'` -ne 0 ]; then \
- $(ECHO) "ERROR: Either the build was started with the flag -I or \n" \
- " --include-dir, or the MAKEFLAGS environment \n" \
- " variable has this value set. This will render your \n" \
- " build questionable as not all the rules and depenencies \n" \
- " are captured by the build. \n" \
- " Please fix and restart the build. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @#
- @# it is unacceptable to have the -k or --keep-going value in MAKEFLAGS:
- @#
- @if [ `$(ECHO) $(MAKEFLAGS) | $(EGREP) -c '(^| )(k|--keep-going)( |$$)'` -ne 0 ]; then \
- $(ECHO) "ERROR: Either the build was started with the flag -k or \n" \
- " --keep-going, or the MAKEFLAGS environment \n" \
- " variable has this value set. 222 You will be unable \n" \
- " to determine if the build is broken or not. \n" \
- " Please fix and restart the build. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @#
- @# it is unacceptable to have the -o or --assume-old or --old-filevalue in MAKEFLAGS:
- @# Note - this rule never gets invoked because it is processed out
- @# in GNU Make startup
- @#
- @if [ `$(ECHO) $(MAKEFLAGS) | $(EGREP) -c '(^| )(o|--assume-old|--old-file)( |$$)'` -ne 0 ]; then \
- $(ECHO) "ERROR: Either the build was started with the flag -o or \n" \
- " --assume-old or --old-file, or the MAKEFLAGS environment \n" \
- " variable has this value set. This could prevent the \n" \
- " build from executing rules it should, thus rendering a \n" \
- " questionable result. \n" \
- " Please fix and restart the build. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @#
- @# it is unacceptable to have the -r or --nobuiltin-rules value in MAKEFLAGS
- @#
- @if [ `$(ECHO) $(MAKEFLAGS) | $(EGREP) -c '(^| )(r|--no-builtin-rules)( |$$)'` -ne 0 ]; then \
- $(ECHO) "ERROR: Either the build was started with the flag -r or \n" \
- " --no-builtin-rules, or the MAKEFLAGS environment \n" \
- " variable has this value set. This may break the build \n" \
- " by not allowing builtin rules that may be required. \n" \
- " Please fix and restart the build. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @#
- @# it is unacceptable to have the -t or --touch value in MAKEFLAGS
- @# Note - this rule never gets invoked because it is processed out
- @# in GNU Make startup
- @#
- @if [ `$(ECHO) $(MAKEFLAGS) | $(EGREP) -c '(^| )(t|--touch)( |$$)'` -ne 0 ]; then \
- $(ECHO) "ERROR: Either the build was started with the flag -t or \n" \
- " --touch, or the MAKEFLAGS environment \n" \
- " variable has this value set. This will leave the \n" \
- " build in a unclear state and could lead to not executing \n" \
- " rules which should be executed. \n" \
- " Please fix and restart the build. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @#
- @# show what is in MAKEFLAGS so the user is aware...
- @#
- @$(ECHO) "WARNING: Your MAKEFLAGS environment variable is set. \n" \
- " You should be very careful about the values set here. \n" \
- "\n" \
- " MAKEFLAGS is set to =>$(MAKEFLAGS)<= \n" \
- "" >> $(WARNING_FILE)
-endif
-
-######################################################
-# if specified, ALT_OUTPUTDIR must point to non-relative path if set
-######################################################
-sane-alt_outputdir:
-ifdef ALT_OUTPUTDIR
- @if [ `$(ECHO) $(subst \,/,$(ALT_OUTPUTDIR)) | $(EGREP) -c '^([A-Za-z]:)?/'` -ne 1 ]; then \
- $(ECHO) "ERROR: ALT_OUTPUTDIR must be an Absolute Path Name, \n" \
- " not a Relative Path Name. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- ifeq ($(PLATFORM), windows)
- @if [ `$(ECHO) $(subst \,/,$(ALT_OUTPUTDIR)) | $(EGREP) -c '^([A-Za-z]:)'` -ne 1 ]; then \
- $(ECHO) "ERROR: On windows, ALT_OUTPUTDIR must contain the drive letter. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- endif
-endif
-
-######################################################
-# OUTPUTDIR tests
-######################################################
-sane-outputdir:
- @#
- @# OUTPUTDIR must be a directory...
- @#
- @if [ ! -d "$(OUTPUTDIR)" ]; then \
- $(ECHO) "ERROR: OUTPUTDIR must be an existing directory. The current \n" \
- " value of OUTPUTDIR is \n" \
- " $(OUTPUTDIR) \n" \
- " Please check your value of ALT_OUTPUTDIR. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @#
- @# OUTPUTDIR must be writeable by user...
- @#
- @if [ ! -w "$(OUTPUTDIR)" ]; then \
- $(ECHO) "ERROR: You must have write permissions to OUTPUTDIR. The \n" \
- " current value of OUTPUTDIR is \n" \
- " $(OUTPUTDIR) \n" \
- " Either obtain these permissions or set ALT_OUTPUTDIR. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-
-######################################################
-# if specified, ALT_BOOTDIR must point to non-relative path if set
-######################################################
-sane-alt_bootdir:
-ifdef ALT_BOOTDIR
- @if [ `$(ECHO) $(subst \,/,$(ALT_BOOTDIR)) | $(EGREP) -c '^([A-Za-z]:)?/'` -ne 1 ]; then \
- $(ECHO) "ERROR: ALT_BOOTDIR must be an Absolute Path Name, \n" \
- " not a Relative Path Name. \n" \
- " The current value of ALT_BOOTDIR is \n" \
- " $(ALT_BOOTDIR) \n" \
- " Please fix this and continue your build. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-endif
-
-######################################################
-# BOOTDIR must point to a valid JDK.
-######################################################
-BOOT_CHECK :=$(call CheckVersions,$(BOOT_VER),$(REQUIRED_BOOT_VER))
-sane-bootdir:
- @if [ "$(BOOT_CHECK)" != "same" -a "$(BOOT_CHECK)" != "newer" ]; then \
- $(ECHO) "ERROR: Your BOOTDIR environment variable does not point \n" \
- " to a valid JDK for bootstrapping this build. \n" \
- " A JDK $(JDK_MINOR_VERSION) $(MARKET_NAME) build must be bootstrapped using \n" \
- " JDK $(PREVIOUS_JDK_VERSION) fcs (or later). \n" \
- " Apparently, your bootstrap JDK is version $(BOOT_VER) \n" \
- " Please update your ALT_BOOTDIR setting and start your build again. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-
-######################################################
-# BOOTDIR is recommended to reside on a local drive
-######################################################
-sane-local-bootdir:
-ifeq ($(PLATFORM), windows)
- @if [ `$(ECHO) $(BOOTDIR) | $(EGREP) -c '^[jJ]:'` -ne 0 ]; then \
- $(ECHO) "WARNING: Your BOOTDIR is located on the J: drive. Often the J:\n" \
- " drive is mapped over a network. Using a mapped drive for\n" \
- " the BOOTDIR may significantly slow down the build process.\n" \
- " You may want to consider using the ALT_BOOTDIR variable\n" \
- " to point the build to another location for the BOOTDIR instead. \n" \
- " Your current BOOTDIR is:\n" \
- " $(BOOTDIR) \n" \
- "" >> $(WARNING_FILE) ; \
- fi
-endif
-
-######################################################
-# CACERTS_FILE must be absoulte path and readable
-######################################################
-sane-cacerts:
- ifdef ALT_CACERTS_FILE
- @if [ `$(ECHO) $(subst \,/,$(ALT_CACERTS_FILE)) | $(EGREP) -c '^([A-Za-z]:)?/'` -ne 1 ]; then \
- $(ECHO) "ERROR: ALT_CACERTS_FILE must be an Absolute Path Name, \n" \
- " not a Relative Path Name. \n" \
- " The current value of ALT_CACERTS_FILE is \n" \
- " $(ALT_CACERTS_FILE) \n" \
- " Please fix this and continue your build. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- endif
- @#
- @# CACERTS_FILE must be readable
- @#
- @if [ ! -r "$(subst \,/,$(CACERTS_FILE))" ]; then \
- $(ECHO) "ERROR: You do not have access to a valid cacerts file. \n" \
- " Please check your access to \n" \
- " $(subst \,/,$(CACERTS_FILE)) \n" \
- " and/or check your value of ALT_CACERTS_FILE. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @#
- @# CACERTS_FILE must be a file
- @#
- @if [ -d "$(subst \,/,$(CACERTS_FILE))" ]; then \
- $(ECHO) "ERROR: You do not have access to a valid cacerts file.\n" \
- " The value of CACERTS_FILE must point to a normal file.\n" \
- " Please check your access to \n" \
- " $(subst \,/,$(CACERTS_FILE)) \n" \
- " and/or check your value of ALT_CACERTS_FILE. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-
-
-######################################################
-# Check for availability of FreeType (OpenJDK specific)
-######################################################
-
-ifdef OPENJDK
- ifndef CROSS_COMPILE_ARCH
- # The freetypecheck Makefile prints out "Failed" if not good enough
- $(TEMPDIR)/freetypeinfo: FRC
- @$(prep-target)
- @(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
- $(ECHO) "Failed to build freetypecheck." ) > $@
-
- sane-freetype: $(TEMPDIR)/freetypeinfo
- @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
- $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
- " or higher is required. \n" \
- "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
- fi
- else
- #do nothing (cross-compiling)
- sane-freetype:
- endif
-else
- #do nothing (not OpenJDK)
- sane-freetype:
-endif
-
-######################################################
-# CUPS_HEADERS_PATH must be valid
-######################################################
-sane-cups:
-ifneq ($(PLATFORM), windows)
- @if [ ! -r $(CUPS_HEADERS_PATH)/cups/cups.h ]; then \
- $(ECHO) "ERROR: You do not have access to valid Cups header files. \n" \
- " Please check your access to \n" \
- " $(CUPS_HEADERS_PATH)/cups/cups.h \n" \
- " and/or check your value of ALT_CUPS_HEADERS_PATH, \n" \
- " CUPS is frequently pre-installed on many systems, \n" \
- " or may be downloaded from http://www.cups.org \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-endif
-
-######################################################
-# Check for existence of DEVTOOLS_PATH
-# All needed tools come with base system on Apple
-######################################################
-sane-devtools_path:
-ifneq ($(OS_VENDOR), Apple)
- @if [ "$(DEVTOOLS_PATH)" != "" -a ! -r "$(DEVTOOLS_PATH)" ]; then \
- $(ECHO) "ERROR: You do not have a valid DEVTOOLS_PATH setting. \n" \
- " Please check your access to \n" \
- " $(DEVTOOLS_PATH) \n" \
- " and/or check your value of ALT_DEVTOOLS_PATH. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-endif
-
-######################################################
-# Check for existence of MS_RUNTIME_LIBRARIES
-######################################################
-sane-msvcrt_path:
-ifeq ($(PLATFORM), windows)
- ifneq ($(MSVCRNN_DLL),)
- @if [ ! -r "$(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)" ]; then \
- $(ECHO) "ERROR: You do not have access to $(MSVCRNN_DLL). \n" \
- " Please check your access to \n" \
- " $(MSVCRNN_DLL_PATH) \n" \
- " and/or check your value of ALT_MSVCRNN_DLL_PATH. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- endif
-endif
-
-######################################################
-# Check for existence of COMPILER_PATH
-######################################################
-sane-compiler_path:
- @if [ "$(COMPILER_PATH)" != "" -a ! -r "$(COMPILER_PATH)" ]; then \
- $(ECHO) "ERROR: You do not have a valid COMPILER_PATH setting. \n" \
- " Please check your access to \n" \
- " $(COMPILER_PATH) \n" \
- " and/or check your value of ALT_COMPILER_PATH. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-
-######################################################
-# Check for existence of UNIXCOMMAND_PATH
-######################################################
-sane-unixcommand_path:
- @if [ "$(UNIXCOMMAND_PATH)" != "" -a ! -r "$(UNIXCOMMAND_PATH)" ]; then \
- $(ECHO) "ERROR: You do not have a valid UNIXCOMMAND_PATH setting. \n" \
- " Please check your access to \n" \
- " $(UNIXCOMMAND_PATH) \n" \
- " and/or check your value of ALT_UNIXCOMMAND_PATH. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-ifeq ($(PLATFORM), windows)
-ifeq ($(USING_MSYS), true)
- @for utility in $(AR) $(FILE) $(M4) ; do \
- if [ ! -r "`$(WHICH) $${utility}`" ]; then \
- $(ECHO) "WARNING: You do not have the utility $${utility} in the \n" \
- " directory $(UNIXCOMMAND_PATH). \n" \
- " The utilities ar, file and m4 are required. \n" \
- "" >> $(WARNING_FILE) ; \
- fi; \
- done
-else
- @for utility in $(AR) $(CPIO) $(FILE) $(M4) ; do \
- if [ ! -r "`$(WHICH) $${utility}`" ]; then \
- $(ECHO) "WARNING: You do not have the utility $${utility} in the \n" \
- " directory $(UNIXCOMMAND_PATH). \n" \
- " The utilities ar, cpio, file and m4 are required. \n" \
- "" >> $(WARNING_FILE) ; \
- fi; \
- done
-endif
-endif
-
-######################################################
-# Check for existence of USRBIN_PATH on linux
-######################################################
-sane-usrbin_path:
-ifeq ($(PLATFORM), linux)
- @if [ "$(USRBIN_PATH)" != "" -a ! -r "$(USRBIN_PATH)" ]; then \
- $(ECHO) "ERROR: You do not have a valid USRBIN_PATH setting. \n" \
- " Please check your access to \n" \
- " $(USRBIN_PATH) \n" \
- " and/or check your value of ALT_USRBIN_PATH. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-endif
-
-######################################################
-# Check for existence of UNIXCCS_PATH on solaris
-######################################################
-sane-unixccs_path:
-ifeq ($(PLATFORM), solaris)
- @if [ "$(UNIXCCS_PATH)" != "" -a ! -r "$(UNIXCCS_PATH)" ]; then \
- $(ECHO) "ERROR: You do not have a valid UNIXCCS_PATH setting. \n" \
- " Please check your access to \n" \
- " $(UNIXCCS_PATH) \n" \
- " and/or check your value of ALT_UNIXCCS_PATH. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-endif
-
-######################################################
-# Verify the docs directory exists
-######################################################
-sane-docs_import:
- @if [ ! -d "$(HOTSPOT_DOCS_IMPORT_PATH)" ]; then \
- $(ECHO) "WARNING: The directory HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_DOCS_IMPORT_PATH) \n" \
- " does not exist, check your value of ALT_HOTSPOT_DOCS_IMPORT_PATH. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
-
-######################################################
-# Check for possible problem regarding __fabsf, math_iso.h and the libm patch.
-# Hotspot should have been changed in Mustang 6.0 Build 47 to not depend
-# on __fabsf, this is just checking that fact now.
-######################################################
-sane-math_iso:
-ifeq ($(PLATFORM), solaris)
- @if [ -f $(HOTSPOT_SERVER_PATH)/$(LIB_PREFIX)jvm.$(LIBRARY_SUFFIX) ]; then \
- if [ "`$(NM) $(HOTSPOT_SERVER_PATH)/$(LIB_PREFIX)jvm.$(LIBRARY_SUFFIX) | $(GREP) __fabsf`" != "" ]; then \
- $(ECHO) "WARNING: This version of hotspot relies on __fabsf \n" \
- " which is not always available on Solaris 8 and 9 machines \n" \
- " unless they have the latest libm patch and the file \n" \
- " /usr/include/iso/math_iso.h which can trigger this dependency.\n" \
- " Hotspot should NOT be dependent on this extern, check the \n" \
- " version of the hotspot library you are using. \n" \
- "" >> $(WARNING_FILE) ; \
- fi; \
- fi
-endif
-
-######################################################
-# Check for possible patch problem regarding /usr/lib/libCrun.so
-######################################################
-sane-libCrun:
-ifeq ($(PLATFORM), solaris)
- @if [ "`$(NM) /usr/lib/libCrun.so.1 | $(GREP) __1c2n6FIpv_0_`" = "" ]; then \
- $(ECHO) "WARNING: The file /usr/lib/libCrun.so.1 is missing the extern \n" \
- " __1c2n6FIpv_0_ which indicates that the system is missing \n" \
- " a required Solaris patch, or you are using a pre-FCS release \n" \
- " of Solaris 10. You need the latest /usr/lib/libCrun.so.1 \n" \
- " which comes with the FCS release of Solaris 10 and available \n" \
- " through the latest Solaris 8 or 9 C++ runtime patches. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
-endif
-
-######################################################
-# Check for existence of the extra tools on windows
-######################################################
-sane-msdevtools_path:
-ifeq ($(PLATFORM), windows)
- ifeq ($(wildcard $(RC)),)
- @$(ECHO) "ERROR: Cannot find the RC utility from path: $(RC)\n" \
- " This is normally obtained from the WINDOWSSDKDIR." \
- "" >> $(ERROR_FILE)
- endif
- # MinGW/MSYS make 3.81 will not tolerate a path with a quoted substring
- ifeq ($(wildcard $(subst ",,$(DUMPBIN))),)
- @$(ECHO) "ERROR: Cannot find the DUMPBIN utility from path: $(DUMPBIN)\n" \
- " This is normally obtained from the COMPILER_PATH." \
- "" >> $(ERROR_FILE)
- endif
-endif
-
-######################################################
-# Check for existence of Hotspot binaries
-######################################################
-sane-hotspot_binaries:
-ifeq ($(ARCH_DATA_MODEL), 32)
- @if [ ! -r $(HOTSPOT_CLIENT_PATH)/$(LIB_PREFIX)jvm.$(LIBRARY_SUFFIX) ]; then \
- $(ECHO) "ERROR: HOTSPOT_CLIENT_PATH does not point to a valid HotSpot VM. \n" \
- " Please check your access to \n" \
- " $(HOTSPOT_CLIENT_PATH)/$(LIB_PREFIX)jvm.$(LIBRARY_SUFFIX) \n" \
- " and/or check your value of ALT_HOTSPOT_CLIENT_PATH. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-endif
- @if [ ! -r $(HOTSPOT_SERVER_PATH)/$(LIB_PREFIX)jvm.$(LIBRARY_SUFFIX) ]; then \
- $(ECHO) "ERROR: HOTSPOT_SERVER_PATH does not point to a valid HotSpot VM. \n" \
- " Please check your access to \n" \
- " $(HOTSPOT_SERVER_PATH)/$(LIB_PREFIX)jvm.$(LIBRARY_SUFFIX) \n" \
- " and/or check your value of ALT_HOTSPOT_SERVER_PATH. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @#
- @# Check value of HOTSPOT_LIB_PATH
- @#
-ifeq ($(PLATFORM), windows)
- @if [ ! -r $(HOTSPOT_LIB_PATH)/jvm.lib ]; then \
- $(ECHO) "ERROR: HOTSPOT_LIB_PATH does not point to a valid HotSpot library. \n" \
- " Please check your access to \n" \
- " $(HOTSPOT_LIB_PATH)/jvm.lib \n" \
- " and/or check your value of ALT_HOTSPOT_LIB_PATH. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- @#
- @# Check for the .map files - its OK if they are not there..
- @#
- ifeq ($(ARCH_DATA_MODEL), 32)
- @# There is no 64-bit HotSpot client VM
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- @if [ ! -r $(HOTSPOT_CLIENT_PATH)/jvm.diz ]; then \
- $(ECHO) "WARNING: HOTSPOT_CLIENT_PATH does not point to valid HotSpot .diz files. \n" \
- " These files are optional and aid in the debugging of the JVM. \n" \
- " Please check your access to \n" \
- " $(HOTSPOT_CLIENT_PATH)/jvm.diz \n" \
- " and/or check your value of ALT_HOTSPOT_CLIENT_PATH. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
- else
- @if [ ! -r $(HOTSPOT_CLIENT_PATH)/jvm.map ]; then \
- $(ECHO) "WARNING: HOTSPOT_CLIENT_PATH does not point to valid HotSpot .map files. \n" \
- " These files are optional and aid in the debugging of the JVM. \n" \
- " Please check your access to \n" \
- " $(HOTSPOT_CLIENT_PATH)/jvm.map \n" \
- " and/or check your value of ALT_HOTSPOT_CLIENT_PATH. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
- @if [ ! -r $(HOTSPOT_CLIENT_PATH)/jvm.pdb ]; then \
- $(ECHO) "WARNING: HOTSPOT_CLIENT_PATH does not point to valid HotSpot .pdb files. \n" \
- " These files are optional and aid in the debugging of the JVM. \n" \
- " Please check your access to \n" \
- " $(HOTSPOT_CLIENT_PATH)/jvm.pdb \n" \
- " and/or check your value of ALT_HOTSPOT_CLIENT_PATH. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- @if [ ! -r $(HOTSPOT_SERVER_PATH)/jvm.diz ]; then \
- $(ECHO) "WARNING: HOTSPOT_SERVER_PATH does not point to valid HotSpot .diz files. \n" \
- " These files are optional and aid in the debugging of the JVM. \n" \
- " Please check your access to \n" \
- " $(HOTSPOT_SERVER_PATH)/jvm.diz \n" \
- " and/or check your value of ALT_HOTSPOT_SERVER_PATH. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
- else
- @if [ ! -r $(HOTSPOT_SERVER_PATH)/jvm.map ]; then \
- $(ECHO) "WARNING: HOTSPOT_SERVER_PATH does not point to valid HotSpot .map files. \n" \
- " These files are optional and aid in the debugging of the JVM. \n" \
- " Please check your access to \n" \
- " $(HOTSPOT_SERVER_PATH)/jvm.map \n" \
- " and/or check your value of ALT_HOTSPOT_SERVER_PATH. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
- @if [ ! -r $(HOTSPOT_SERVER_PATH)/jvm.pdb ]; then \
- $(ECHO) "WARNING: HOTSPOT_SERVER_PATH does not point to valid HotSpot .pdb files. \n" \
- " These files are optional and aid in the debugging of the JVM. \n" \
- " Please check your access to \n" \
- " $(HOTSPOT_SERVER_PATH)/jvm.pdb \n" \
- " and/or check your value of ALT_HOTSPOT_SERVER_PATH. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
- endif
- endif
-endif
-
-
-######################################################
-# Check for existence of misc Hotspot imported files
-######################################################
-HOTSPOT_INCLUDE_FILE_LIST = jvmti.h
-HOTSPOT_INCLUDE_FILE_LIST += jvmticmlr.h
-#HOTSPOT_INCLUDE_FILE_LIST += jni.h jni_md.h
-#HOTSPOT_INCLUDE_FILE_LIST += jvm.h jvm_md.h
-#HOTSPOT_INCLUDE_FILE_LIST += jmm.h
-TMP_SDK_INCLUDE_FILE_LIST=$(HOTSPOT_INCLUDE_FILE_LIST:%.h=$(TEMPDIR)/%.h)
-TMP_SDK_INCLUDE_FILE_DIFFS=$(HOTSPOT_INCLUDE_FILE_LIST:%.h=$(TEMPDIR)/%.hdiffs)
-
-# These include files must have a pattern: 'version: MAJOR.MINOR.MICRO'
-# where MACRO, MINOR, and MICRO are numbers, e.g. 1.0.1, 0.2.90, etc.
-# The critical version we are checking is MAJOR.MINOR, we print all three
-# when we detect an error.
-
-TMP_SDK_INCLUDE_FIND_VERSION= $(EGREP) 'version:'
-TMP_SDK_INCLUDE_GET_VERSION= $(TMP_SDK_INCLUDE_FIND_VERSION) | \
- $(SED) -e 's@.*\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9].*@\1@'
-TMP_SDK_INCLUDE_GET_FULL_VERSION= $(TMP_SDK_INCLUDE_FIND_VERSION) | \
- $(SED) -e 's@.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*@\1@'
-
-# Compare an interface file (Rule creates 2 temp files: %.h and %.h.IMPORT)
-# Files jvm.h, jvm_md.h and jmm.h are special in that they are not publicly
-# exported but do represent VM interfaces used by the rest of the jdk.
-# So these 3 will not be found in a promoted build and can only
-# be checked when this represents a full control build (i.e. the
-# HOTSPOT_IMPORT_PATH includes these files in it's 'include' directory).
-$(TEMPDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
- @$(install-file)
- @$(RM) $@.IMPORT
- @if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(@F) ]; then \
- $(CP) $(HOTSPOT_IMPORT_PATH)/include/$(@F) $@.IMPORT ; \
- elif [ "$(@F)" != "jvm.h" -a "$(@F)" != "jmm.h" ] ; then \
- $(ECHO) "WARNING: HOTSPOT_IMPORT_PATH does not contain the interface file $(@F). \n" \
- " Check your value of ALT_HOTSPOT_IMPORT_PATH. \n" \
- "" >> $(WARNING_FILE) ; \
- $(CP) $< $@.IMPORT; \
- else \
- $(CP) $< $@.IMPORT; \
- fi
-
-$(TEMPDIR)/%.h: $(PLATFORM_SRC)/javavm/export/%.h
- @$(install-file)
- @$(RM) $@.IMPORT
- @if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) ]; then \
- $(CP) $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) $@.IMPORT ; \
- elif [ "$(@F)" != "jvm_md.h" ] ; then \
- $(ECHO) "WARNING: HOTSPOT_IMPORT_PATH does not contain the interface file $(@F). \n" \
- " Check your value of ALT_HOTSPOT_IMPORT_PATH. \n" \
- "" >> $(WARNING_FILE) ; \
- $(CP) $< $@.IMPORT; \
- else \
- $(CP) $< $@.IMPORT; \
- fi
-
-# Compares the two tempfiles: %.h and %.h.IMPORT, answer in %.hdiffs
-# Note: Putting anything into the hdiffs file will trigger generic IMPORT
-# warning message in hotspot_import_include.
-# First checks the major.minor versions, the micro number can differ.
-# Second checks the full version.
-# Lastly does a full diff if the full version differs or it has no version
-$(TEMPDIR)/%.hdiffs: $(TEMPDIR)/%.h
- @$(prep-target)
- @$(TOUCH) $@
- @if [ "`$(CAT) $< | $(TMP_SDK_INCLUDE_GET_VERSION)`" != \
- "`$(CAT) $<.IMPORT | $(TMP_SDK_INCLUDE_GET_VERSION)`" ] ; then \
- $(ECHO) "WARNING: The file $(<F) is not the same interface as the VM version.\n " \
- " this workspace has $(<F) `$(CAT) $< | $(TMP_SDK_INCLUDE_GET_FULL_VERSION)` and \n " \
- " HOTSPOT_IMPORT_PATH contains $(<F) `$(CAT) $<.IMPORT | $(TMP_SDK_INCLUDE_GET_FULL_VERSION)` \n" \
- "" >> $(WARNING_FILE) ; \
- $(ECHO) "Version mis-match" > $@ ; \
- fi
- @if [ "`$(CAT) $< | $(TMP_SDK_INCLUDE_GET_FULL_VERSION)`" != \
- "`$(CAT) $<.IMPORT | $(TMP_SDK_INCLUDE_GET_FULL_VERSION)`" ] ; then \
- $(RM) $<.filtered $<.IMPORT.filtered; \
- $(EGREP) -v 'VERSION' $< > $<.filtered; \
- $(EGREP) -v 'VERSION' $<.IMPORT > $<.IMPORT.filtered; \
- ($(DIFF) -w $<.filtered $<.IMPORT.filtered || exit 0) >> $@ ; \
- elif [ "`$(CAT) $< | $(TMP_SDK_INCLUDE_FIND_VERSION)`" = "" ] ; then \
- $(RM) $<.filtered $<.IMPORT.filtered; \
- $(EGREP) -v '@\(#\)' $< > $<.filtered; \
- $(EGREP) -v '@\(#\)' $<.IMPORT > $<.IMPORT.filtered; \
- ($(DIFF) -w $<.filtered $<.IMPORT.filtered || exit 0) >> $@ ; \
- fi
-
-# Verify all imported hotspot files
-sane-hotspot_import:: sane-hotspot_import_dir sane-hotspot_import_include
-
-# Verify the base directory exists
-sane-hotspot_import_dir:
- @$(RM) $(TMP_SDK_INCLUDE_FILE_DIFFS)
- @$(RM) $(TMP_SDK_INCLUDE_FILE_LIST)
- @if [ ! -d "$(HOTSPOT_IMPORT_PATH)" ]; then \
- $(ECHO) "WARNING: The directory HOTSPOT_IMPORT_PATH=$(HOTSPOT_IMPORT_PATH) \n" \
- " does not exist, check your value of ALT_HOTSPOT_IMPORT_PATH. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
-
-# Verify hotspot include files
-sane-hotspot_import_include: $(TMP_SDK_INCLUDE_FILE_LIST) $(TMP_SDK_INCLUDE_FILE_DIFFS)
- @if [ "`$(CAT) $(TMP_SDK_INCLUDE_FILE_DIFFS)`" != "" ] ; then \
- $(ECHO) "WARNING: Possible HotSpot VM interface conflict. \n" \
- " HOTSPOT_IMPORT_PATH is used to import files from the VM build. \n" \
- " It is also used to verify that any copied files are consistent between \n" \
- " these two components. It has been detected that one or more of the \n" \
- " VM interface files inside this workspace may not match the interfaces \n" \
- " exported by the VM, or the VM versions could not be found. \n" \
- " The list of VM interface files is: \n" \
- " $(HOTSPOT_INCLUDE_FILE_LIST). \n" \
- " This workspace has copies of these files at: \n" \
- " $(SHARE_SRC)/javavm/export and $(PLATFORM_SRC)/javavm/export \n" \
- " for build purposes, and they should contain the same interfaces \n" \
- " as the VM versions imported from: \n" \
- " \$$(HOTSPOT_IMPORT_PATH)/include \n" \
- " (i.e. $(HOTSPOT_IMPORT_PATH)/include) \n" \
- " If an interface indeed doesn't match, then the use of this interface \n" \
- " at JDK runtime could cause serious errors. \n" \
- "" >> $(WARNING_FILE) ; \
- for i in $(TMP_SDK_INCLUDE_FILE_DIFFS); do \
- if [ -s $$i ] ; then \
- $(ECHO) " " >> $(WARNING_FILE); \
- $(ECHO) "VM Interface Differences: $$i" >> $(WARNING_FILE); \
- $(CAT) $$i >> $(WARNING_FILE); \
- $(ECHO) " " >> $(WARNING_FILE); \
- fi; \
- done; \
- fi
- @$(RM) $(TMP_SDK_INCLUDE_FILE_DIFFS)
- @$(RM) $(TMP_SDK_INCLUDE_FILE_LIST)
-
-# The JDI-SA feature is not currently released on some platforms.
-# See the Defs-<arch>.gmk files.
-
-ifeq ($(INCLUDE_SA), true)
-# Verify that hotspot Serviceability Agent files are present. To keep
-# it simple, we will just check for one of them. The others have arch
-# dependent paths.
-
-sane-hotspot_import::
- @if [ ! -r $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar ] ; then \
- $(ECHO) "WARNING: File $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar does not exist.\n" \
- " The JDI binding for the Serviceability Agent will not be included in the build.\n" \
- " Please check your access to\n" \
- " $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar\n" \
- " and/or check your value of ALT_HOTSPOT_IMPORT_PATH.\n" \
- "" >> $(WARNING_FILE) ; \
- fi
-endif
-
-######################################################
-# Check the ant version
-######################################################
-ANT_CHECK :=$(call CheckVersions,$(ANT_VER),$(REQUIRED_ANT_VER))
-sane-ant_version:
- @if [ "$(ANT_CHECK)" != "same" \
- -a "$(ANT_CHECK)" != "newer" ]; then \
- $(ECHO) "ERROR: The version of ant being used is older than \n" \
- " the required version of '$(REQUIRED_ANT_VER)'. \n" \
- " The version of ant found was '$(ANT_VER)'. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-
-######################################################
-# Check the zip file version
-######################################################
-ZIP_CHECK :=$(call CheckVersions,$(ZIP_VER),$(REQUIRED_ZIP_VER))
-sane-zip_version: sane-unzip_version
- @if [ "$(ZIP_CHECK)" != "same" -a "$(ZIP_CHECK)" != "newer" ]; then \
- $(ECHO) "WARNING: The version of zip being used is older than \n" \
- " the required version of '$(REQUIRED_ZIP_VER)'. \n" \
- " The version of zip found was '$(ZIP_VER)'. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
-
-######################################################
-# Check the unzip file version
-######################################################
-UNZIP_CHECK :=$(call CheckVersions,$(UNZIP_VER),$(REQUIRED_UNZIP_VER))
-sane-unzip_version:
- @if [ "$(UNZIP_CHECK)" != "same" -a "$(UNZIP_CHECK)" != "newer" ]; then \
- $(ECHO) "WARNING: The version of unzip being used is older than \n" \
- " the required version of '$(REQUIRED_UNZIP_VER)'. \n" \
- " The version of unzip found was '$(UNZIP_VER)'. \n" \
- "" >> $(WARNING_FILE) ; \
- fi
-
-######################################################
-# Check the linker version(s)
-######################################################
-ifeq ($(PLATFORM), windows)
- LINK_CHECK :=$(call CheckVersions,$(LINK_VER),$(REQUIRED_LINK_VER))
-endif
-sane-link:
-ifdef LINK_VER
- @if [ "$(LINK_CHECK)" = "missing" ]; then \
- $(ECHO) "ERROR: The Linker version is undefined. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @if [ "$(LINK_CHECK)" != "same" ]; then \
- $(ECHO) "WARNING: To build Java 2 SDK $(JDK_VERSION) you need : \n" \
- " $(REQUIRED_COMPILER_VERSION) - link.exe version '$(REQUIRED_LINK_VER)' \n" \
- " Specifically the $(REQUIRED_COMPILER_NAME) link.exe. \n " \
- " $(YOU_ARE_USING) Linker version '$(LINK_VER)' \n" \
- "" >> $(WARNING_FILE) ; \
- fi
-endif
-
-######################################################
-# Check the compiler version(s)
-######################################################
-ifdef REQUIRED_CC_VER
- CC_CHECK :=$(call CheckVersions,$(CC_VER),$(REQUIRED_CC_VER))
-endif
-sane-compiler: sane-link
-ifdef REQUIRED_CC_VER
- @if [ "$(CC_CHECK)" = "missing" ]; then \
- $(ECHO) "ERROR: The Compiler version is undefined. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- ifndef OPENJDK
- @if [ "$(CC_CHECK)" != "same" ]; then \
- $(ECHO) "WARNING: The $(PLATFORM) compiler is not version $(REQUIRED_COMPILER_VERSION) $(REQUIRED_CC_VER) \n" \
- " Specifically the $(REQUIRED_COMPILER_NAME) compiler. \n " \
- " $(YOU_ARE_USING) $(COMPILER_VERSION): $(CC_VER) \n" \
- " The compiler was obtained from the following location: \n" \
- " $(COMPILER_PATH) \n" \
- "" >> $(WARNING_FILE) ; \
- fi
- endif
-endif
-
-######################################################
-# Check that ALSA headers and libs are installed and
-# that the header has the right version. We only
-# need /usr/include/alsa/version.h and /usr/lib/libasound.so
-######################################################
-
-ifdef REQUIRED_ALSA_VERSION
- ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION))
-endif
-sane-alsa-headers:
-ifdef REQUIRED_ALSA_VERSION
- @if [ "$(ALSA_CHECK)" != "missing" ] ; then \
- if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer" ] ; then \
- $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \
- " You have the following ALSA version installed: $${alsa_version} \n" \
- " Please reinstall ALSA (drivers and lib). You can download \n" \
- " the source distribution from http://www.alsa-project.org \n" \
- " or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
- "" >> $(ERROR_FILE) ; \
- fi ; \
- else \
- $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \
- " Please install ALSA (drivers and lib). You can download the \n" \
- " source distribution from http://www.alsa-project.org or go to \n" \
- " http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-endif
-
-# If a sanity file doesn't exist, just make sure it's dir exists
-$(SANITY_FILES):
- -@$(prep-target)
-
-######################################################
-# dump out the variable settings...
-######################################################
-sane-settings::
- @$(ECHO) >> $(MESSAGE_FILE)
- @$(ECHO) $(ALL_SETTINGS) >> $(MESSAGE_FILE)
- @$(ECHO) >> $(MESSAGE_FILE)
-
-######################################################
-# Check for existence of DEPLOY_MSSDK on windows
-######################################################
-sane-mssdk_path:
-ifeq ($(PLATFORM), windows)
- @if [ -z "$(DEPLOY_MSSDK)" ]; then \
- $(ECHO) "WARNING: Your DEPLOY_MSSDK setting is empty.\n" \
- " It is recommended to set ALT_DEPLOY_MSSDK.\n" \
- "" >> $(WARNING_FILE) ; \
- fi
- @if [ ! -r "$(DEPLOY_MSSDK)" ]; then \
- $(ECHO) "ERROR: You do not have a valid DEPLOY_MSSDK setting. \n" \
- " Please check your access to \n" \
- " $(DEPLOY_MSSDK) \n" \
- " and/or check your value of ALT_DEPLOY_MSSDK. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-endif
-
-######################################################
-# Check for existence of the MSSDK on windows
-######################################################
-sane-install-mssdk_path:
-ifeq ($(PLATFORM), windows)
- @if [ -z "$(WINDOWSSDKDIR)" ]; then \
- $(ECHO) "WARNING: Your WINDOWSSDKDIR setting is empty.\n" \
- " It is recommended to set ALT_WINDOWSSDKDIR.\n" \
- "" >> $(WARNING_FILE) ; \
- fi
- @if [ ! -r "$(WINDOWSSDKDIR)" ]; then \
- $(ECHO) "ERROR: You do not have a valid WINDOWSSDKDIR setting. \n" \
- " Please check your access to \n" \
- " $(WINDOWSSDKDIR) \n" \
- " and/or check your value of ALT_WINDOWSSDKDIR. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- @if [ -z "$(INSTALL_MSSDK)" ]; then \
- $(ECHO) "WARNING: Your INSTALL_MSSDK setting is empty.\n" \
- " It is recommended to set ALT_INSTALL_MSSDK.\n" \
- "" >> $(WARNING_FILE) ; \
- fi
- @if [ ! -r "$(INSTALL_MSSDK)" ]; then \
- $(ECHO) "ERROR: You do not have a valid INSTALL_MSSDK setting. \n" \
- " Please check your access to \n" \
- " $(INSTALL_MSSDK) \n" \
- " and/or check your value of ALT_INSTALL_MSSDK. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-endif
-
-######################################################
-# Check the GNU C++ compiler for OJI plugin
-######################################################
-sane-gcc-compiler:
-ifndef OPENJDK
- ifeq ($(PLATFORM), linux)
- ifeq ($(ARCH_DATA_MODEL), 32)
- ifdef ALT_GCC29_COMPILER_PATH
- @if [ ! -x $(ALT_GCC29_COMPILER_PATH)/bin/gcc ]; then \
- $(ECHO) "ERROR: You do not have a valid ALT_GCC29_COMPILER_PATH setting. \n" \
- " Please check your access to \n" \
- " $(ALT_GCC29_COMPILER_PATH)/bin/gcc \n" \
- " This will affect you if you build the plugin target. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- else
- ifdef ALT_GCC29_PLUGIN_LIB_PATH
- @if [ ! -r $(ALT_GCC29_PLUGIN_LIB_PATH)/libjavaplugin_oji.so ]; then \
- $(ECHO) "Error: You do not have a valid ALT_GCC29_PLUGIN_LIB_PATH setting. \n" \
- " Please check your access to \n" \
- " $(ALT_GCC29_PLUGIN_LIB_PATH)/libjavaplugin_oji.so \n" \
- " This will affect you if you build the plugin target, specifically for gcc 2.9 version of OJI plugin library. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- else
- @if [ ! -r $(GCC29_COMPILER_PATH) ]; then \
- $(ECHO) "ERROR: You do not have a valid GCC29_COMPILER_PATH setting. \n" \
- " Please check your access to \n" \
- " $(GCC29_COMPILER_PATH) \n" \
- " and/or check your value of ALT_GCC29_COMPILER_PATH or ALT_GCC29_PLUGIN_LIB_PATH \n" \
- " This will affect you if you build the plugin target. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- endif # ALT_GCC29_PLUGIN_LIB_PATH
- endif # ALT_GCC29_COMPILER_PATH
- endif # ARCH_DATA_MODEL, 32
- endif # LINUX
-endif # OPEN_JDK
-
-
-######################################################
-# MOZILLA_HEADERS_PATH must be valid
-######################################################
-sane-mozilla:
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifdef ALT_MOZILLA_HEADERS_PATH
- @if [ `$(ECHO) $(subst \,/,$(ALT_MOZILLA_HEADERS_PATH)) | $(EGREP) -c '^([A-Za-z]:)?/'` -ne 1 ]; then \
- $(ECHO) "ERROR: ALT_MOZILLA_HEADERS_PATH must be an Absolute Path Name, \n" \
- " not a Relative Path Name. \n" \
- " The current value of ALT_MOZILLA_HEADERS_PATH is \n" \
- " $(ALT_MOZILLA_HEADERS_PATH) \n" \
- " Please fix this and continue your build. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- endif
- @#
- @# MOZILLA_HEADERS_PATH must be valid....
- @#
- ifeq ($(PLATFORM), windows)
- @if [ ! -r $(subst \,/,$(MOZILLA_HEADERS_PATH))/mozilla_headers_18.win32/java/bool.h ]; then \
- $(ECHO) "ERROR: You do not have access to valid Mozilla header files. \n" \
- " Please check your access to \n" \
- " $(subst \,/,$(MOZILLA_HEADERS_PATH))/mozilla_headers_18.win32/java/bool.h \n" \
- " and/or check your value of ALT_JDK_DEVTOOLS_DIR, ALT_MOZILLA_HEADERS_PATH, \n" \
- " and on Windows, ALT_JDK_JAVA_DRIVE. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- else
- @if [ ! -r $(subst \,/,$(MOZILLA_HEADERS_PATH))/mozilla_headers_18/java/bool.h ]; then \
- $(ECHO) "ERROR: You do not have access to valid Mozilla header files. \n" \
- " Please check your access to \n" \
- " $(subst \,/,$(MOZILLA_HEADERS_PATH))/mozilla_headers_18/java/bool.h \n" \
- " and/or check your value of ALT_JDK_DEVTOOLS_DIR, ALT_MOZILLA_HEADERS_PATH, \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- endif
- @#
- @# Check for presence of headers required for new Java Plug-In ("plugin2")
- @#
- @if [ ! -r $(subst \,/,$(MOZILLA_HEADERS_PATH))/plugin2_mozilla_headers/npapi.h ]; then \
- $(ECHO) "ERROR: You do not have access to valid Mozilla header files for the new Java Plug-In. \n" \
- " Please check your access to \n" \
- " $(subst \,/,$(MOZILLA_HEADERS_PATH))/plugin2_mozilla_headers/npapi.h \n" \
- " and/or check your value of ALT_JDK_DEVTOOLS_DIR, ALT_MOZILLA_HEADERS_PATH, \n" \
- "" >> $(ERROR_FILE) ; \
- fi
-endif
-
-
-######################################################
-# Make sure Java Kernel VM is accessible
-######################################################
-sane-kernel-vm:
-ifeq ($(PLATFORM), windows)
- ifeq ($(ARCH_DATA_MODEL), 32)
- @if [ ! -r $(HOTSPOT_KERNEL_PATH)/jvm.dll ]; then \
- $(ECHO) "WARNING: Your HOTSPOT_IMPORT_PATH does not include a Kernel VM... \n" \
- " The kernel installer may not be built (unless hotspot is also). \n" \
- " $(HOTSPOT_KERNEL_PATH)/jvm.dll \n" \
- " Please check the value of ALT_HOTSPOT_IMPORT_PATH. \n" \
- >> $(WARNING_FILE) ; \
- fi
- endif
-endif
-
-######################################################
-# this should be the last rule in any target's sanity rule.
-######################################################
-sane-lastrule:
-ifndef EXTERNALSANITYCONTROL
- @if [ -r $(MESSAGE_FILE) ]; then \
- $(CAT) $(MESSAGE_FILE) ; \
- fi
- @if [ -r $(WARNING_FILE) ]; then \
- $(CAT) $(WARNING_FILE) ; \
- fi
- @if [ "x$(INSANE)" != x ]; then \
- $(ECHO) "INSANE mode requested. \n" \
- "Sanity will not force a build termination, even with errors.\n" \
- "" >> $(ERROR_FILE); \
- fi
- @if [ -r $(ERROR_FILE) ]; then \
- if [ "x$(INSANE)" = x ]; then \
- $(ECHO) "Exiting because of the above error(s). \n" \
- "">> $(ERROR_FILE); \
- fi ; \
- $(CAT) $(ERROR_FILE) ; \
- if [ "x$(INSANE)" = x ]; then \
- exit 1 ; \
- fi ; \
- fi
-ifdef PEDANTIC
- @if [ -r $(WARNING_FILE) ]; then \
- $(ECHO) "PEDANTIC mode requested. \n" \
- "Exiting because of the above warning(s). \n" \
- "" >> $(ERROR_FILE); \
- $(CAT) $(ERROR_FILE) ; \
- exit 1 ; \
- fi
-endif # PEDANTIC
- @if [ ! -r $(ERROR_FILE) ]; then \
- $(ECHO) "Sanity check passed." ; \
- fi
-endif # EXTERNALSANITYCONTROL
-
diff --git a/jdk/make/tools/GenerateCharacter/CharacterData00.java.template b/jdk/make/data/characterdata/CharacterData00.java.template
similarity index 100%
rename from jdk/make/tools/GenerateCharacter/CharacterData00.java.template
rename to jdk/make/data/characterdata/CharacterData00.java.template
diff --git a/jdk/make/tools/GenerateCharacter/CharacterData01.java.template b/jdk/make/data/characterdata/CharacterData01.java.template
similarity index 100%
rename from jdk/make/tools/GenerateCharacter/CharacterData01.java.template
rename to jdk/make/data/characterdata/CharacterData01.java.template
diff --git a/jdk/make/tools/GenerateCharacter/CharacterData02.java.template b/jdk/make/data/characterdata/CharacterData02.java.template
similarity index 100%
rename from jdk/make/tools/GenerateCharacter/CharacterData02.java.template
rename to jdk/make/data/characterdata/CharacterData02.java.template
diff --git a/jdk/make/tools/GenerateCharacter/CharacterData0E.java.template b/jdk/make/data/characterdata/CharacterData0E.java.template
similarity index 100%
rename from jdk/make/tools/GenerateCharacter/CharacterData0E.java.template
rename to jdk/make/data/characterdata/CharacterData0E.java.template
diff --git a/jdk/make/tools/GenerateCharacter/CharacterDataLatin1.java.template b/jdk/make/data/characterdata/CharacterDataLatin1.java.template
similarity index 100%
rename from jdk/make/tools/GenerateCharacter/CharacterDataLatin1.java.template
rename to jdk/make/data/characterdata/CharacterDataLatin1.java.template
diff --git a/jdk/make/tools/GenerateCharacter/CharacterDataPrivateUse.java.template b/jdk/make/data/characterdata/CharacterDataPrivateUse.java.template
similarity index 100%
rename from jdk/make/tools/GenerateCharacter/CharacterDataPrivateUse.java.template
rename to jdk/make/data/characterdata/CharacterDataPrivateUse.java.template
diff --git a/jdk/make/tools/GenerateCharacter/CharacterDataUndefined.java.template b/jdk/make/data/characterdata/CharacterDataUndefined.java.template
similarity index 100%
rename from jdk/make/tools/GenerateCharacter/CharacterDataUndefined.java.template
rename to jdk/make/data/characterdata/CharacterDataUndefined.java.template
diff --git a/jdk/make/tools/CharsetMapping/Big5.map b/jdk/make/data/charsetmapping/Big5.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/Big5.map
rename to jdk/make/data/charsetmapping/Big5.map
diff --git a/jdk/make/tools/CharsetMapping/Big5.nr b/jdk/make/data/charsetmapping/Big5.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/Big5.nr
rename to jdk/make/data/charsetmapping/Big5.nr
diff --git a/jdk/make/tools/CharsetMapping/DoubleByte-X.java.template b/jdk/make/data/charsetmapping/DoubleByte-X.java.template
similarity index 100%
rename from jdk/make/tools/CharsetMapping/DoubleByte-X.java.template
rename to jdk/make/data/charsetmapping/DoubleByte-X.java.template
diff --git a/jdk/make/tools/CharsetMapping/EUC_CN.map b/jdk/make/data/charsetmapping/EUC_CN.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/EUC_CN.map
rename to jdk/make/data/charsetmapping/EUC_CN.map
diff --git a/jdk/make/tools/CharsetMapping/EUC_KR.map b/jdk/make/data/charsetmapping/EUC_KR.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/EUC_KR.map
rename to jdk/make/data/charsetmapping/EUC_KR.map
diff --git a/jdk/make/tools/CharsetMapping/GBK.map b/jdk/make/data/charsetmapping/GBK.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/GBK.map
rename to jdk/make/data/charsetmapping/GBK.map
diff --git a/jdk/make/tools/CharsetMapping/HKSCS2001.c2b b/jdk/make/data/charsetmapping/HKSCS2001.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/HKSCS2001.c2b
rename to jdk/make/data/charsetmapping/HKSCS2001.c2b
diff --git a/jdk/make/tools/CharsetMapping/HKSCS2001.map b/jdk/make/data/charsetmapping/HKSCS2001.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/HKSCS2001.map
rename to jdk/make/data/charsetmapping/HKSCS2001.map
diff --git a/jdk/make/tools/CharsetMapping/HKSCS2008.c2b b/jdk/make/data/charsetmapping/HKSCS2008.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/HKSCS2008.c2b
rename to jdk/make/data/charsetmapping/HKSCS2008.c2b
diff --git a/jdk/make/tools/CharsetMapping/HKSCS2008.map b/jdk/make/data/charsetmapping/HKSCS2008.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/HKSCS2008.map
rename to jdk/make/data/charsetmapping/HKSCS2008.map
diff --git a/jdk/make/tools/CharsetMapping/HKSCS_XP.c2b b/jdk/make/data/charsetmapping/HKSCS_XP.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/HKSCS_XP.c2b
rename to jdk/make/data/charsetmapping/HKSCS_XP.c2b
diff --git a/jdk/make/tools/CharsetMapping/HKSCS_XP.map b/jdk/make/data/charsetmapping/HKSCS_XP.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/HKSCS_XP.map
rename to jdk/make/data/charsetmapping/HKSCS_XP.map
diff --git a/jdk/make/tools/CharsetMapping/IBM037.c2b b/jdk/make/data/charsetmapping/IBM037.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM037.c2b
rename to jdk/make/data/charsetmapping/IBM037.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM037.map b/jdk/make/data/charsetmapping/IBM037.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM037.map
rename to jdk/make/data/charsetmapping/IBM037.map
diff --git a/jdk/make/tools/CharsetMapping/IBM037.nr b/jdk/make/data/charsetmapping/IBM037.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM037.nr
rename to jdk/make/data/charsetmapping/IBM037.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM1006.map b/jdk/make/data/charsetmapping/IBM1006.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1006.map
rename to jdk/make/data/charsetmapping/IBM1006.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1025.c2b b/jdk/make/data/charsetmapping/IBM1025.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1025.c2b
rename to jdk/make/data/charsetmapping/IBM1025.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1025.map b/jdk/make/data/charsetmapping/IBM1025.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1025.map
rename to jdk/make/data/charsetmapping/IBM1025.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1025.nr b/jdk/make/data/charsetmapping/IBM1025.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1025.nr
rename to jdk/make/data/charsetmapping/IBM1025.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM1026.c2b b/jdk/make/data/charsetmapping/IBM1026.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1026.c2b
rename to jdk/make/data/charsetmapping/IBM1026.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1026.map b/jdk/make/data/charsetmapping/IBM1026.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1026.map
rename to jdk/make/data/charsetmapping/IBM1026.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1026.nr b/jdk/make/data/charsetmapping/IBM1026.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1026.nr
rename to jdk/make/data/charsetmapping/IBM1026.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM1046.map b/jdk/make/data/charsetmapping/IBM1046.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1046.map
rename to jdk/make/data/charsetmapping/IBM1046.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1047.map b/jdk/make/data/charsetmapping/IBM1047.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1047.map
rename to jdk/make/data/charsetmapping/IBM1047.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1097.map b/jdk/make/data/charsetmapping/IBM1097.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1097.map
rename to jdk/make/data/charsetmapping/IBM1097.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1098.map b/jdk/make/data/charsetmapping/IBM1098.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1098.map
rename to jdk/make/data/charsetmapping/IBM1098.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1112.c2b b/jdk/make/data/charsetmapping/IBM1112.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1112.c2b
rename to jdk/make/data/charsetmapping/IBM1112.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1112.map b/jdk/make/data/charsetmapping/IBM1112.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1112.map
rename to jdk/make/data/charsetmapping/IBM1112.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1112.nr b/jdk/make/data/charsetmapping/IBM1112.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1112.nr
rename to jdk/make/data/charsetmapping/IBM1112.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM1122.c2b b/jdk/make/data/charsetmapping/IBM1122.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1122.c2b
rename to jdk/make/data/charsetmapping/IBM1122.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1122.map b/jdk/make/data/charsetmapping/IBM1122.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1122.map
rename to jdk/make/data/charsetmapping/IBM1122.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1122.nr b/jdk/make/data/charsetmapping/IBM1122.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1122.nr
rename to jdk/make/data/charsetmapping/IBM1122.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM1123.c2b b/jdk/make/data/charsetmapping/IBM1123.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1123.c2b
rename to jdk/make/data/charsetmapping/IBM1123.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1123.map b/jdk/make/data/charsetmapping/IBM1123.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1123.map
rename to jdk/make/data/charsetmapping/IBM1123.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1123.nr b/jdk/make/data/charsetmapping/IBM1123.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1123.nr
rename to jdk/make/data/charsetmapping/IBM1123.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM1124.map b/jdk/make/data/charsetmapping/IBM1124.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1124.map
rename to jdk/make/data/charsetmapping/IBM1124.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1140.c2b b/jdk/make/data/charsetmapping/IBM1140.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1140.c2b
rename to jdk/make/data/charsetmapping/IBM1140.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1140.map b/jdk/make/data/charsetmapping/IBM1140.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1140.map
rename to jdk/make/data/charsetmapping/IBM1140.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1141.c2b b/jdk/make/data/charsetmapping/IBM1141.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1141.c2b
rename to jdk/make/data/charsetmapping/IBM1141.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1141.map b/jdk/make/data/charsetmapping/IBM1141.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1141.map
rename to jdk/make/data/charsetmapping/IBM1141.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1142.c2b b/jdk/make/data/charsetmapping/IBM1142.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1142.c2b
rename to jdk/make/data/charsetmapping/IBM1142.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1142.map b/jdk/make/data/charsetmapping/IBM1142.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1142.map
rename to jdk/make/data/charsetmapping/IBM1142.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1143.c2b b/jdk/make/data/charsetmapping/IBM1143.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1143.c2b
rename to jdk/make/data/charsetmapping/IBM1143.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1143.map b/jdk/make/data/charsetmapping/IBM1143.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1143.map
rename to jdk/make/data/charsetmapping/IBM1143.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1144.c2b b/jdk/make/data/charsetmapping/IBM1144.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1144.c2b
rename to jdk/make/data/charsetmapping/IBM1144.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1144.map b/jdk/make/data/charsetmapping/IBM1144.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1144.map
rename to jdk/make/data/charsetmapping/IBM1144.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1145.c2b b/jdk/make/data/charsetmapping/IBM1145.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1145.c2b
rename to jdk/make/data/charsetmapping/IBM1145.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1145.map b/jdk/make/data/charsetmapping/IBM1145.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1145.map
rename to jdk/make/data/charsetmapping/IBM1145.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1146.c2b b/jdk/make/data/charsetmapping/IBM1146.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1146.c2b
rename to jdk/make/data/charsetmapping/IBM1146.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1146.map b/jdk/make/data/charsetmapping/IBM1146.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1146.map
rename to jdk/make/data/charsetmapping/IBM1146.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1147.c2b b/jdk/make/data/charsetmapping/IBM1147.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1147.c2b
rename to jdk/make/data/charsetmapping/IBM1147.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1147.map b/jdk/make/data/charsetmapping/IBM1147.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1147.map
rename to jdk/make/data/charsetmapping/IBM1147.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1148.c2b b/jdk/make/data/charsetmapping/IBM1148.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1148.c2b
rename to jdk/make/data/charsetmapping/IBM1148.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1148.map b/jdk/make/data/charsetmapping/IBM1148.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1148.map
rename to jdk/make/data/charsetmapping/IBM1148.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1149.c2b b/jdk/make/data/charsetmapping/IBM1149.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1149.c2b
rename to jdk/make/data/charsetmapping/IBM1149.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1149.map b/jdk/make/data/charsetmapping/IBM1149.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1149.map
rename to jdk/make/data/charsetmapping/IBM1149.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1364.c2b b/jdk/make/data/charsetmapping/IBM1364.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1364.c2b
rename to jdk/make/data/charsetmapping/IBM1364.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1364.map b/jdk/make/data/charsetmapping/IBM1364.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1364.map
rename to jdk/make/data/charsetmapping/IBM1364.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1381.c2b b/jdk/make/data/charsetmapping/IBM1381.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1381.c2b
rename to jdk/make/data/charsetmapping/IBM1381.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1381.map b/jdk/make/data/charsetmapping/IBM1381.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1381.map
rename to jdk/make/data/charsetmapping/IBM1381.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1383.c2b b/jdk/make/data/charsetmapping/IBM1383.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1383.c2b
rename to jdk/make/data/charsetmapping/IBM1383.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM1383.map b/jdk/make/data/charsetmapping/IBM1383.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1383.map
rename to jdk/make/data/charsetmapping/IBM1383.map
diff --git a/jdk/make/tools/CharsetMapping/IBM1383.nr b/jdk/make/data/charsetmapping/IBM1383.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM1383.nr
rename to jdk/make/data/charsetmapping/IBM1383.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM273.c2b b/jdk/make/data/charsetmapping/IBM273.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM273.c2b
rename to jdk/make/data/charsetmapping/IBM273.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM273.map b/jdk/make/data/charsetmapping/IBM273.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM273.map
rename to jdk/make/data/charsetmapping/IBM273.map
diff --git a/jdk/make/tools/CharsetMapping/IBM273.nr b/jdk/make/data/charsetmapping/IBM273.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM273.nr
rename to jdk/make/data/charsetmapping/IBM273.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM277.c2b b/jdk/make/data/charsetmapping/IBM277.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM277.c2b
rename to jdk/make/data/charsetmapping/IBM277.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM277.map b/jdk/make/data/charsetmapping/IBM277.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM277.map
rename to jdk/make/data/charsetmapping/IBM277.map
diff --git a/jdk/make/tools/CharsetMapping/IBM277.nr b/jdk/make/data/charsetmapping/IBM277.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM277.nr
rename to jdk/make/data/charsetmapping/IBM277.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM278.c2b b/jdk/make/data/charsetmapping/IBM278.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM278.c2b
rename to jdk/make/data/charsetmapping/IBM278.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM278.map b/jdk/make/data/charsetmapping/IBM278.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM278.map
rename to jdk/make/data/charsetmapping/IBM278.map
diff --git a/jdk/make/tools/CharsetMapping/IBM278.nr b/jdk/make/data/charsetmapping/IBM278.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM278.nr
rename to jdk/make/data/charsetmapping/IBM278.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM280.c2b b/jdk/make/data/charsetmapping/IBM280.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM280.c2b
rename to jdk/make/data/charsetmapping/IBM280.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM280.map b/jdk/make/data/charsetmapping/IBM280.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM280.map
rename to jdk/make/data/charsetmapping/IBM280.map
diff --git a/jdk/make/tools/CharsetMapping/IBM280.nr b/jdk/make/data/charsetmapping/IBM280.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM280.nr
rename to jdk/make/data/charsetmapping/IBM280.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM284.c2b b/jdk/make/data/charsetmapping/IBM284.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM284.c2b
rename to jdk/make/data/charsetmapping/IBM284.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM284.map b/jdk/make/data/charsetmapping/IBM284.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM284.map
rename to jdk/make/data/charsetmapping/IBM284.map
diff --git a/jdk/make/tools/CharsetMapping/IBM284.nr b/jdk/make/data/charsetmapping/IBM284.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM284.nr
rename to jdk/make/data/charsetmapping/IBM284.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM285.c2b b/jdk/make/data/charsetmapping/IBM285.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM285.c2b
rename to jdk/make/data/charsetmapping/IBM285.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM285.map b/jdk/make/data/charsetmapping/IBM285.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM285.map
rename to jdk/make/data/charsetmapping/IBM285.map
diff --git a/jdk/make/tools/CharsetMapping/IBM285.nr b/jdk/make/data/charsetmapping/IBM285.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM285.nr
rename to jdk/make/data/charsetmapping/IBM285.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM290.c2b b/jdk/make/data/charsetmapping/IBM290.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM290.c2b
rename to jdk/make/data/charsetmapping/IBM290.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM290.map b/jdk/make/data/charsetmapping/IBM290.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM290.map
rename to jdk/make/data/charsetmapping/IBM290.map
diff --git a/jdk/make/tools/CharsetMapping/IBM297.c2b b/jdk/make/data/charsetmapping/IBM297.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM297.c2b
rename to jdk/make/data/charsetmapping/IBM297.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM297.map b/jdk/make/data/charsetmapping/IBM297.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM297.map
rename to jdk/make/data/charsetmapping/IBM297.map
diff --git a/jdk/make/tools/CharsetMapping/IBM297.nr b/jdk/make/data/charsetmapping/IBM297.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM297.nr
rename to jdk/make/data/charsetmapping/IBM297.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM300.c2b b/jdk/make/data/charsetmapping/IBM300.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM300.c2b
rename to jdk/make/data/charsetmapping/IBM300.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM300.map b/jdk/make/data/charsetmapping/IBM300.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM300.map
rename to jdk/make/data/charsetmapping/IBM300.map
diff --git a/jdk/make/tools/CharsetMapping/IBM420.c2b b/jdk/make/data/charsetmapping/IBM420.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM420.c2b
rename to jdk/make/data/charsetmapping/IBM420.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM420.map b/jdk/make/data/charsetmapping/IBM420.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM420.map
rename to jdk/make/data/charsetmapping/IBM420.map
diff --git a/jdk/make/tools/CharsetMapping/IBM420.nr b/jdk/make/data/charsetmapping/IBM420.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM420.nr
rename to jdk/make/data/charsetmapping/IBM420.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM424.c2b b/jdk/make/data/charsetmapping/IBM424.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM424.c2b
rename to jdk/make/data/charsetmapping/IBM424.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM424.map b/jdk/make/data/charsetmapping/IBM424.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM424.map
rename to jdk/make/data/charsetmapping/IBM424.map
diff --git a/jdk/make/tools/CharsetMapping/IBM424.nr b/jdk/make/data/charsetmapping/IBM424.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM424.nr
rename to jdk/make/data/charsetmapping/IBM424.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM437.map b/jdk/make/data/charsetmapping/IBM437.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM437.map
rename to jdk/make/data/charsetmapping/IBM437.map
diff --git a/jdk/make/tools/CharsetMapping/IBM500.c2b b/jdk/make/data/charsetmapping/IBM500.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM500.c2b
rename to jdk/make/data/charsetmapping/IBM500.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM500.map b/jdk/make/data/charsetmapping/IBM500.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM500.map
rename to jdk/make/data/charsetmapping/IBM500.map
diff --git a/jdk/make/tools/CharsetMapping/IBM500.nr b/jdk/make/data/charsetmapping/IBM500.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM500.nr
rename to jdk/make/data/charsetmapping/IBM500.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM737.map b/jdk/make/data/charsetmapping/IBM737.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM737.map
rename to jdk/make/data/charsetmapping/IBM737.map
diff --git a/jdk/make/tools/CharsetMapping/IBM775.map b/jdk/make/data/charsetmapping/IBM775.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM775.map
rename to jdk/make/data/charsetmapping/IBM775.map
diff --git a/jdk/make/tools/CharsetMapping/IBM833.c2b b/jdk/make/data/charsetmapping/IBM833.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM833.c2b
rename to jdk/make/data/charsetmapping/IBM833.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM833.map b/jdk/make/data/charsetmapping/IBM833.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM833.map
rename to jdk/make/data/charsetmapping/IBM833.map
diff --git a/jdk/make/tools/CharsetMapping/IBM838.c2b b/jdk/make/data/charsetmapping/IBM838.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM838.c2b
rename to jdk/make/data/charsetmapping/IBM838.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM838.map b/jdk/make/data/charsetmapping/IBM838.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM838.map
rename to jdk/make/data/charsetmapping/IBM838.map
diff --git a/jdk/make/tools/CharsetMapping/IBM838.nr b/jdk/make/data/charsetmapping/IBM838.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM838.nr
rename to jdk/make/data/charsetmapping/IBM838.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM850.map b/jdk/make/data/charsetmapping/IBM850.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM850.map
rename to jdk/make/data/charsetmapping/IBM850.map
diff --git a/jdk/make/tools/CharsetMapping/IBM852.map b/jdk/make/data/charsetmapping/IBM852.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM852.map
rename to jdk/make/data/charsetmapping/IBM852.map
diff --git a/jdk/make/tools/CharsetMapping/IBM855.map b/jdk/make/data/charsetmapping/IBM855.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM855.map
rename to jdk/make/data/charsetmapping/IBM855.map
diff --git a/jdk/make/tools/CharsetMapping/IBM856.map b/jdk/make/data/charsetmapping/IBM856.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM856.map
rename to jdk/make/data/charsetmapping/IBM856.map
diff --git a/jdk/make/tools/CharsetMapping/IBM857.map b/jdk/make/data/charsetmapping/IBM857.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM857.map
rename to jdk/make/data/charsetmapping/IBM857.map
diff --git a/jdk/make/tools/CharsetMapping/IBM858.map b/jdk/make/data/charsetmapping/IBM858.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM858.map
rename to jdk/make/data/charsetmapping/IBM858.map
diff --git a/jdk/make/tools/CharsetMapping/IBM860.map b/jdk/make/data/charsetmapping/IBM860.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM860.map
rename to jdk/make/data/charsetmapping/IBM860.map
diff --git a/jdk/make/tools/CharsetMapping/IBM861.map b/jdk/make/data/charsetmapping/IBM861.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM861.map
rename to jdk/make/data/charsetmapping/IBM861.map
diff --git a/jdk/make/tools/CharsetMapping/IBM862.map b/jdk/make/data/charsetmapping/IBM862.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM862.map
rename to jdk/make/data/charsetmapping/IBM862.map
diff --git a/jdk/make/tools/CharsetMapping/IBM863.map b/jdk/make/data/charsetmapping/IBM863.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM863.map
rename to jdk/make/data/charsetmapping/IBM863.map
diff --git a/jdk/make/tools/CharsetMapping/IBM864.map b/jdk/make/data/charsetmapping/IBM864.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM864.map
rename to jdk/make/data/charsetmapping/IBM864.map
diff --git a/jdk/make/tools/CharsetMapping/IBM865.map b/jdk/make/data/charsetmapping/IBM865.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM865.map
rename to jdk/make/data/charsetmapping/IBM865.map
diff --git a/jdk/make/tools/CharsetMapping/IBM866.map b/jdk/make/data/charsetmapping/IBM866.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM866.map
rename to jdk/make/data/charsetmapping/IBM866.map
diff --git a/jdk/make/tools/CharsetMapping/IBM868.map b/jdk/make/data/charsetmapping/IBM868.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM868.map
rename to jdk/make/data/charsetmapping/IBM868.map
diff --git a/jdk/make/tools/CharsetMapping/IBM869.map b/jdk/make/data/charsetmapping/IBM869.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM869.map
rename to jdk/make/data/charsetmapping/IBM869.map
diff --git a/jdk/make/tools/CharsetMapping/IBM870.c2b b/jdk/make/data/charsetmapping/IBM870.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM870.c2b
rename to jdk/make/data/charsetmapping/IBM870.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM870.map b/jdk/make/data/charsetmapping/IBM870.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM870.map
rename to jdk/make/data/charsetmapping/IBM870.map
diff --git a/jdk/make/tools/CharsetMapping/IBM870.nr b/jdk/make/data/charsetmapping/IBM870.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM870.nr
rename to jdk/make/data/charsetmapping/IBM870.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM871.c2b b/jdk/make/data/charsetmapping/IBM871.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM871.c2b
rename to jdk/make/data/charsetmapping/IBM871.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM871.map b/jdk/make/data/charsetmapping/IBM871.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM871.map
rename to jdk/make/data/charsetmapping/IBM871.map
diff --git a/jdk/make/tools/CharsetMapping/IBM871.nr b/jdk/make/data/charsetmapping/IBM871.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM871.nr
rename to jdk/make/data/charsetmapping/IBM871.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM874.map b/jdk/make/data/charsetmapping/IBM874.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM874.map
rename to jdk/make/data/charsetmapping/IBM874.map
diff --git a/jdk/make/tools/CharsetMapping/IBM874.nr b/jdk/make/data/charsetmapping/IBM874.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM874.nr
rename to jdk/make/data/charsetmapping/IBM874.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM875.c2b b/jdk/make/data/charsetmapping/IBM875.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM875.c2b
rename to jdk/make/data/charsetmapping/IBM875.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM875.map b/jdk/make/data/charsetmapping/IBM875.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM875.map
rename to jdk/make/data/charsetmapping/IBM875.map
diff --git a/jdk/make/tools/CharsetMapping/IBM875.nr b/jdk/make/data/charsetmapping/IBM875.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM875.nr
rename to jdk/make/data/charsetmapping/IBM875.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM918.c2b b/jdk/make/data/charsetmapping/IBM918.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM918.c2b
rename to jdk/make/data/charsetmapping/IBM918.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM918.map b/jdk/make/data/charsetmapping/IBM918.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM918.map
rename to jdk/make/data/charsetmapping/IBM918.map
diff --git a/jdk/make/tools/CharsetMapping/IBM918.nr b/jdk/make/data/charsetmapping/IBM918.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM918.nr
rename to jdk/make/data/charsetmapping/IBM918.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM921.map b/jdk/make/data/charsetmapping/IBM921.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM921.map
rename to jdk/make/data/charsetmapping/IBM921.map
diff --git a/jdk/make/tools/CharsetMapping/IBM922.map b/jdk/make/data/charsetmapping/IBM922.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM922.map
rename to jdk/make/data/charsetmapping/IBM922.map
diff --git a/jdk/make/tools/CharsetMapping/IBM930.c2b b/jdk/make/data/charsetmapping/IBM930.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM930.c2b
rename to jdk/make/data/charsetmapping/IBM930.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM930.map b/jdk/make/data/charsetmapping/IBM930.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM930.map
rename to jdk/make/data/charsetmapping/IBM930.map
diff --git a/jdk/make/tools/CharsetMapping/IBM930.nr b/jdk/make/data/charsetmapping/IBM930.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM930.nr
rename to jdk/make/data/charsetmapping/IBM930.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM933.c2b b/jdk/make/data/charsetmapping/IBM933.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM933.c2b
rename to jdk/make/data/charsetmapping/IBM933.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM933.map b/jdk/make/data/charsetmapping/IBM933.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM933.map
rename to jdk/make/data/charsetmapping/IBM933.map
diff --git a/jdk/make/tools/CharsetMapping/IBM935.c2b b/jdk/make/data/charsetmapping/IBM935.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM935.c2b
rename to jdk/make/data/charsetmapping/IBM935.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM935.map b/jdk/make/data/charsetmapping/IBM935.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM935.map
rename to jdk/make/data/charsetmapping/IBM935.map
diff --git a/jdk/make/tools/CharsetMapping/IBM935.nr b/jdk/make/data/charsetmapping/IBM935.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM935.nr
rename to jdk/make/data/charsetmapping/IBM935.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM937.c2b b/jdk/make/data/charsetmapping/IBM937.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM937.c2b
rename to jdk/make/data/charsetmapping/IBM937.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM937.map b/jdk/make/data/charsetmapping/IBM937.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM937.map
rename to jdk/make/data/charsetmapping/IBM937.map
diff --git a/jdk/make/tools/CharsetMapping/IBM937.nr b/jdk/make/data/charsetmapping/IBM937.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM937.nr
rename to jdk/make/data/charsetmapping/IBM937.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM939.c2b b/jdk/make/data/charsetmapping/IBM939.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM939.c2b
rename to jdk/make/data/charsetmapping/IBM939.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM939.map b/jdk/make/data/charsetmapping/IBM939.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM939.map
rename to jdk/make/data/charsetmapping/IBM939.map
diff --git a/jdk/make/tools/CharsetMapping/IBM939.nr b/jdk/make/data/charsetmapping/IBM939.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM939.nr
rename to jdk/make/data/charsetmapping/IBM939.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM942.c2b b/jdk/make/data/charsetmapping/IBM942.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM942.c2b
rename to jdk/make/data/charsetmapping/IBM942.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM942.map b/jdk/make/data/charsetmapping/IBM942.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM942.map
rename to jdk/make/data/charsetmapping/IBM942.map
diff --git a/jdk/make/tools/CharsetMapping/IBM943.map b/jdk/make/data/charsetmapping/IBM943.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM943.map
rename to jdk/make/data/charsetmapping/IBM943.map
diff --git a/jdk/make/tools/CharsetMapping/IBM943.nr b/jdk/make/data/charsetmapping/IBM943.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM943.nr
rename to jdk/make/data/charsetmapping/IBM943.nr
diff --git a/jdk/make/tools/CharsetMapping/IBM948.c2b b/jdk/make/data/charsetmapping/IBM948.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM948.c2b
rename to jdk/make/data/charsetmapping/IBM948.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM948.map b/jdk/make/data/charsetmapping/IBM948.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM948.map
rename to jdk/make/data/charsetmapping/IBM948.map
diff --git a/jdk/make/tools/CharsetMapping/IBM949.map b/jdk/make/data/charsetmapping/IBM949.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM949.map
rename to jdk/make/data/charsetmapping/IBM949.map
diff --git a/jdk/make/tools/CharsetMapping/IBM950.c2b b/jdk/make/data/charsetmapping/IBM950.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM950.c2b
rename to jdk/make/data/charsetmapping/IBM950.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM950.map b/jdk/make/data/charsetmapping/IBM950.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM950.map
rename to jdk/make/data/charsetmapping/IBM950.map
diff --git a/jdk/make/tools/CharsetMapping/IBM970.c2b b/jdk/make/data/charsetmapping/IBM970.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM970.c2b
rename to jdk/make/data/charsetmapping/IBM970.c2b
diff --git a/jdk/make/tools/CharsetMapping/IBM970.map b/jdk/make/data/charsetmapping/IBM970.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/IBM970.map
rename to jdk/make/data/charsetmapping/IBM970.map
diff --git a/jdk/make/tools/CharsetMapping/ISO_8859_11.map b/jdk/make/data/charsetmapping/ISO_8859_11.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/ISO_8859_11.map
rename to jdk/make/data/charsetmapping/ISO_8859_11.map
diff --git a/jdk/make/tools/CharsetMapping/ISO_8859_13.map b/jdk/make/data/charsetmapping/ISO_8859_13.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/ISO_8859_13.map
rename to jdk/make/data/charsetmapping/ISO_8859_13.map
diff --git a/jdk/make/tools/CharsetMapping/ISO_8859_15.map b/jdk/make/data/charsetmapping/ISO_8859_15.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/ISO_8859_15.map
rename to jdk/make/data/charsetmapping/ISO_8859_15.map
diff --git a/jdk/make/tools/CharsetMapping/ISO_8859_2.map b/jdk/make/data/charsetmapping/ISO_8859_2.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/ISO_8859_2.map
rename to jdk/make/data/charsetmapping/ISO_8859_2.map
diff --git a/jdk/make/tools/CharsetMapping/ISO_8859_3.map b/jdk/make/data/charsetmapping/ISO_8859_3.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/ISO_8859_3.map
rename to jdk/make/data/charsetmapping/ISO_8859_3.map
diff --git a/jdk/make/tools/CharsetMapping/ISO_8859_4.map b/jdk/make/data/charsetmapping/ISO_8859_4.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/ISO_8859_4.map
rename to jdk/make/data/charsetmapping/ISO_8859_4.map
diff --git a/jdk/make/tools/CharsetMapping/ISO_8859_5.map b/jdk/make/data/charsetmapping/ISO_8859_5.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/ISO_8859_5.map
rename to jdk/make/data/charsetmapping/ISO_8859_5.map
diff --git a/jdk/make/tools/CharsetMapping/ISO_8859_6.map b/jdk/make/data/charsetmapping/ISO_8859_6.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/ISO_8859_6.map
rename to jdk/make/data/charsetmapping/ISO_8859_6.map
diff --git a/jdk/make/tools/CharsetMapping/ISO_8859_7.map b/jdk/make/data/charsetmapping/ISO_8859_7.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/ISO_8859_7.map
rename to jdk/make/data/charsetmapping/ISO_8859_7.map
diff --git a/jdk/make/tools/CharsetMapping/ISO_8859_8.map b/jdk/make/data/charsetmapping/ISO_8859_8.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/ISO_8859_8.map
rename to jdk/make/data/charsetmapping/ISO_8859_8.map
diff --git a/jdk/make/tools/CharsetMapping/ISO_8859_9.map b/jdk/make/data/charsetmapping/ISO_8859_9.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/ISO_8859_9.map
rename to jdk/make/data/charsetmapping/ISO_8859_9.map
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0201.c2b b/jdk/make/data/charsetmapping/JIS_X_0201.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0201.c2b
rename to jdk/make/data/charsetmapping/JIS_X_0201.c2b
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0201.map b/jdk/make/data/charsetmapping/JIS_X_0201.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0201.map
rename to jdk/make/data/charsetmapping/JIS_X_0201.map
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0208.map b/jdk/make/data/charsetmapping/JIS_X_0208.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0208.map
rename to jdk/make/data/charsetmapping/JIS_X_0208.map
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0208_MS5022X.c2b b/jdk/make/data/charsetmapping/JIS_X_0208_MS5022X.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0208_MS5022X.c2b
rename to jdk/make/data/charsetmapping/JIS_X_0208_MS5022X.c2b
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0208_MS5022X.map b/jdk/make/data/charsetmapping/JIS_X_0208_MS5022X.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0208_MS5022X.map
rename to jdk/make/data/charsetmapping/JIS_X_0208_MS5022X.map
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0208_MS932.map b/jdk/make/data/charsetmapping/JIS_X_0208_MS932.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0208_MS932.map
rename to jdk/make/data/charsetmapping/JIS_X_0208_MS932.map
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0208_MS932.nr b/jdk/make/data/charsetmapping/JIS_X_0208_MS932.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0208_MS932.nr
rename to jdk/make/data/charsetmapping/JIS_X_0208_MS932.nr
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0208_Solaris.map b/jdk/make/data/charsetmapping/JIS_X_0208_Solaris.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0208_Solaris.map
rename to jdk/make/data/charsetmapping/JIS_X_0208_Solaris.map
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0208_Solaris.nr b/jdk/make/data/charsetmapping/JIS_X_0208_Solaris.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0208_Solaris.nr
rename to jdk/make/data/charsetmapping/JIS_X_0208_Solaris.nr
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0212.map b/jdk/make/data/charsetmapping/JIS_X_0212.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0212.map
rename to jdk/make/data/charsetmapping/JIS_X_0212.map
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0212_MS5022X.map b/jdk/make/data/charsetmapping/JIS_X_0212_MS5022X.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0212_MS5022X.map
rename to jdk/make/data/charsetmapping/JIS_X_0212_MS5022X.map
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0212_Solaris.map b/jdk/make/data/charsetmapping/JIS_X_0212_Solaris.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0212_Solaris.map
rename to jdk/make/data/charsetmapping/JIS_X_0212_Solaris.map
diff --git a/jdk/make/tools/CharsetMapping/JIS_X_0212_Solaris.nr b/jdk/make/data/charsetmapping/JIS_X_0212_Solaris.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/JIS_X_0212_Solaris.nr
rename to jdk/make/data/charsetmapping/JIS_X_0212_Solaris.nr
diff --git a/jdk/make/tools/CharsetMapping/Johab.map b/jdk/make/data/charsetmapping/Johab.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/Johab.map
rename to jdk/make/data/charsetmapping/Johab.map
diff --git a/jdk/make/tools/CharsetMapping/KOI8_R.map b/jdk/make/data/charsetmapping/KOI8_R.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/KOI8_R.map
rename to jdk/make/data/charsetmapping/KOI8_R.map
diff --git a/jdk/make/tools/CharsetMapping/KOI8_U.map b/jdk/make/data/charsetmapping/KOI8_U.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/KOI8_U.map
rename to jdk/make/data/charsetmapping/KOI8_U.map
diff --git a/jdk/make/tools/CharsetMapping/MS1250.map b/jdk/make/data/charsetmapping/MS1250.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS1250.map
rename to jdk/make/data/charsetmapping/MS1250.map
diff --git a/jdk/make/tools/CharsetMapping/MS1251.map b/jdk/make/data/charsetmapping/MS1251.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS1251.map
rename to jdk/make/data/charsetmapping/MS1251.map
diff --git a/jdk/make/tools/CharsetMapping/MS1252.map b/jdk/make/data/charsetmapping/MS1252.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS1252.map
rename to jdk/make/data/charsetmapping/MS1252.map
diff --git a/jdk/make/tools/CharsetMapping/MS1253.map b/jdk/make/data/charsetmapping/MS1253.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS1253.map
rename to jdk/make/data/charsetmapping/MS1253.map
diff --git a/jdk/make/tools/CharsetMapping/MS1254.map b/jdk/make/data/charsetmapping/MS1254.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS1254.map
rename to jdk/make/data/charsetmapping/MS1254.map
diff --git a/jdk/make/tools/CharsetMapping/MS1255.map b/jdk/make/data/charsetmapping/MS1255.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS1255.map
rename to jdk/make/data/charsetmapping/MS1255.map
diff --git a/jdk/make/tools/CharsetMapping/MS1256.map b/jdk/make/data/charsetmapping/MS1256.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS1256.map
rename to jdk/make/data/charsetmapping/MS1256.map
diff --git a/jdk/make/tools/CharsetMapping/MS1257.map b/jdk/make/data/charsetmapping/MS1257.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS1257.map
rename to jdk/make/data/charsetmapping/MS1257.map
diff --git a/jdk/make/tools/CharsetMapping/MS1258.map b/jdk/make/data/charsetmapping/MS1258.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS1258.map
rename to jdk/make/data/charsetmapping/MS1258.map
diff --git a/jdk/make/tools/CharsetMapping/MS874.map b/jdk/make/data/charsetmapping/MS874.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS874.map
rename to jdk/make/data/charsetmapping/MS874.map
diff --git a/jdk/make/tools/CharsetMapping/MS932.c2b b/jdk/make/data/charsetmapping/MS932.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS932.c2b
rename to jdk/make/data/charsetmapping/MS932.c2b
diff --git a/jdk/make/tools/CharsetMapping/MS932.map b/jdk/make/data/charsetmapping/MS932.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS932.map
rename to jdk/make/data/charsetmapping/MS932.map
diff --git a/jdk/make/tools/CharsetMapping/MS932.nr b/jdk/make/data/charsetmapping/MS932.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS932.nr
rename to jdk/make/data/charsetmapping/MS932.nr
diff --git a/jdk/make/tools/CharsetMapping/MS936.map b/jdk/make/data/charsetmapping/MS936.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS936.map
rename to jdk/make/data/charsetmapping/MS936.map
diff --git a/jdk/make/tools/CharsetMapping/MS949.map b/jdk/make/data/charsetmapping/MS949.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS949.map
rename to jdk/make/data/charsetmapping/MS949.map
diff --git a/jdk/make/tools/CharsetMapping/MS950.map b/jdk/make/data/charsetmapping/MS950.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS950.map
rename to jdk/make/data/charsetmapping/MS950.map
diff --git a/jdk/make/tools/CharsetMapping/MS950.nr b/jdk/make/data/charsetmapping/MS950.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MS950.nr
rename to jdk/make/data/charsetmapping/MS950.nr
diff --git a/jdk/make/tools/CharsetMapping/MacArabic.map b/jdk/make/data/charsetmapping/MacArabic.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacArabic.map
rename to jdk/make/data/charsetmapping/MacArabic.map
diff --git a/jdk/make/tools/CharsetMapping/MacCentralEurope.map b/jdk/make/data/charsetmapping/MacCentralEurope.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacCentralEurope.map
rename to jdk/make/data/charsetmapping/MacCentralEurope.map
diff --git a/jdk/make/tools/CharsetMapping/MacCroatian.map b/jdk/make/data/charsetmapping/MacCroatian.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacCroatian.map
rename to jdk/make/data/charsetmapping/MacCroatian.map
diff --git a/jdk/make/tools/CharsetMapping/MacCyrillic.map b/jdk/make/data/charsetmapping/MacCyrillic.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacCyrillic.map
rename to jdk/make/data/charsetmapping/MacCyrillic.map
diff --git a/jdk/make/tools/CharsetMapping/MacDingbat.map b/jdk/make/data/charsetmapping/MacDingbat.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacDingbat.map
rename to jdk/make/data/charsetmapping/MacDingbat.map
diff --git a/jdk/make/tools/CharsetMapping/MacGreek.map b/jdk/make/data/charsetmapping/MacGreek.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacGreek.map
rename to jdk/make/data/charsetmapping/MacGreek.map
diff --git a/jdk/make/tools/CharsetMapping/MacHebrew.map b/jdk/make/data/charsetmapping/MacHebrew.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacHebrew.map
rename to jdk/make/data/charsetmapping/MacHebrew.map
diff --git a/jdk/make/tools/CharsetMapping/MacIceland.map b/jdk/make/data/charsetmapping/MacIceland.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacIceland.map
rename to jdk/make/data/charsetmapping/MacIceland.map
diff --git a/jdk/make/tools/CharsetMapping/MacRoman.map b/jdk/make/data/charsetmapping/MacRoman.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacRoman.map
rename to jdk/make/data/charsetmapping/MacRoman.map
diff --git a/jdk/make/tools/CharsetMapping/MacRomania.map b/jdk/make/data/charsetmapping/MacRomania.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacRomania.map
rename to jdk/make/data/charsetmapping/MacRomania.map
diff --git a/jdk/make/tools/CharsetMapping/MacSymbol.map b/jdk/make/data/charsetmapping/MacSymbol.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacSymbol.map
rename to jdk/make/data/charsetmapping/MacSymbol.map
diff --git a/jdk/make/tools/CharsetMapping/MacThai.map b/jdk/make/data/charsetmapping/MacThai.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacThai.map
rename to jdk/make/data/charsetmapping/MacThai.map
diff --git a/jdk/make/tools/CharsetMapping/MacTurkish.map b/jdk/make/data/charsetmapping/MacTurkish.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacTurkish.map
rename to jdk/make/data/charsetmapping/MacTurkish.map
diff --git a/jdk/make/tools/CharsetMapping/MacUkraine.map b/jdk/make/data/charsetmapping/MacUkraine.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/MacUkraine.map
rename to jdk/make/data/charsetmapping/MacUkraine.map
diff --git a/jdk/make/tools/CharsetMapping/PCK.c2b b/jdk/make/data/charsetmapping/PCK.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/PCK.c2b
rename to jdk/make/data/charsetmapping/PCK.c2b
diff --git a/jdk/make/tools/CharsetMapping/PCK.map b/jdk/make/data/charsetmapping/PCK.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/PCK.map
rename to jdk/make/data/charsetmapping/PCK.map
diff --git a/jdk/make/tools/CharsetMapping/PCK.nr b/jdk/make/data/charsetmapping/PCK.nr
similarity index 100%
rename from jdk/make/tools/CharsetMapping/PCK.nr
rename to jdk/make/data/charsetmapping/PCK.nr
diff --git a/jdk/make/tools/CharsetMapping/SJIS.c2b b/jdk/make/data/charsetmapping/SJIS.c2b
similarity index 100%
rename from jdk/make/tools/CharsetMapping/SJIS.c2b
rename to jdk/make/data/charsetmapping/SJIS.c2b
diff --git a/jdk/make/tools/CharsetMapping/SJIS.map b/jdk/make/data/charsetmapping/SJIS.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/SJIS.map
rename to jdk/make/data/charsetmapping/SJIS.map
diff --git a/jdk/make/tools/CharsetMapping/SingleByte-X.java.template b/jdk/make/data/charsetmapping/SingleByte-X.java.template
similarity index 100%
rename from jdk/make/tools/CharsetMapping/SingleByte-X.java.template
rename to jdk/make/data/charsetmapping/SingleByte-X.java.template
diff --git a/jdk/make/tools/CharsetMapping/TIS_620.map b/jdk/make/data/charsetmapping/TIS_620.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/TIS_620.map
rename to jdk/make/data/charsetmapping/TIS_620.map
diff --git a/jdk/make/tools/CharsetMapping/dbcs b/jdk/make/data/charsetmapping/dbcs
similarity index 100%
rename from jdk/make/tools/CharsetMapping/dbcs
rename to jdk/make/data/charsetmapping/dbcs
diff --git a/jdk/make/tools/CharsetMapping/euc_tw.map b/jdk/make/data/charsetmapping/euc_tw.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/euc_tw.map
rename to jdk/make/data/charsetmapping/euc_tw.map
diff --git a/jdk/make/tools/CharsetMapping/extsbcs b/jdk/make/data/charsetmapping/extsbcs
similarity index 100%
rename from jdk/make/tools/CharsetMapping/extsbcs
rename to jdk/make/data/charsetmapping/extsbcs
diff --git a/jdk/make/tools/CharsetMapping/sbcs b/jdk/make/data/charsetmapping/sbcs
similarity index 100%
rename from jdk/make/tools/CharsetMapping/sbcs
rename to jdk/make/data/charsetmapping/sbcs
diff --git a/jdk/make/tools/CharsetMapping/sjis0213.map b/jdk/make/data/charsetmapping/sjis0213.map
similarity index 100%
rename from jdk/make/tools/CharsetMapping/sjis0213.map
rename to jdk/make/data/charsetmapping/sjis0213.map
diff --git a/jdk/make/tools/src/build/tools/deps/refs.allowed b/jdk/make/data/checkdeps/refs.allowed
similarity index 100%
rename from jdk/make/tools/src/build/tools/deps/refs.allowed
rename to jdk/make/data/checkdeps/refs.allowed
diff --git a/jdk/make/tools/sharing/classlist.linux b/jdk/make/data/classlist/classlist.linux
similarity index 100%
rename from jdk/make/tools/sharing/classlist.linux
rename to jdk/make/data/classlist/classlist.linux
diff --git a/jdk/make/tools/sharing/classlist.macosx b/jdk/make/data/classlist/classlist.macosx
similarity index 100%
rename from jdk/make/tools/sharing/classlist.macosx
rename to jdk/make/data/classlist/classlist.macosx
diff --git a/jdk/make/tools/sharing/classlist.solaris b/jdk/make/data/classlist/classlist.solaris
similarity index 100%
rename from jdk/make/tools/sharing/classlist.solaris
rename to jdk/make/data/classlist/classlist.solaris
diff --git a/jdk/make/tools/sharing/classlist.windows b/jdk/make/data/classlist/classlist.windows
similarity index 100%
rename from jdk/make/tools/sharing/classlist.windows
rename to jdk/make/data/classlist/classlist.windows
diff --git a/jdk/make/javax/crypto/policy/limited/LIMITED b/jdk/make/data/cryptopolicy/limited/LIMITED
similarity index 100%
rename from jdk/make/javax/crypto/policy/limited/LIMITED
rename to jdk/make/data/cryptopolicy/limited/LIMITED
diff --git a/jdk/make/javax/crypto/policy/limited/default_local.policy b/jdk/make/data/cryptopolicy/limited/default_local.policy
similarity index 100%
rename from jdk/make/javax/crypto/policy/limited/default_local.policy
rename to jdk/make/data/cryptopolicy/limited/default_local.policy
diff --git a/jdk/make/javax/crypto/policy/limited/exempt_local.policy b/jdk/make/data/cryptopolicy/limited/exempt_local.policy
similarity index 100%
rename from jdk/make/javax/crypto/policy/limited/exempt_local.policy
rename to jdk/make/data/cryptopolicy/limited/exempt_local.policy
diff --git a/jdk/make/javax/crypto/policy/unlimited/UNLIMITED b/jdk/make/data/cryptopolicy/unlimited/UNLIMITED
similarity index 100%
rename from jdk/make/javax/crypto/policy/unlimited/UNLIMITED
rename to jdk/make/data/cryptopolicy/unlimited/UNLIMITED
diff --git a/jdk/make/javax/crypto/policy/unlimited/default_US_export.policy b/jdk/make/data/cryptopolicy/unlimited/default_US_export.policy
similarity index 100%
rename from jdk/make/javax/crypto/policy/unlimited/default_US_export.policy
rename to jdk/make/data/cryptopolicy/unlimited/default_US_export.policy
diff --git a/jdk/make/javax/crypto/policy/unlimited/default_local.policy b/jdk/make/data/cryptopolicy/unlimited/default_local.policy
similarity index 100%
rename from jdk/make/javax/crypto/policy/unlimited/default_local.policy
rename to jdk/make/data/cryptopolicy/unlimited/default_local.policy
diff --git a/jdk/make/tools/dtdbuilder/dtds/HTMLlat1.sgml b/jdk/make/data/dtdbuilder/HTMLlat1.sgml
similarity index 100%
rename from jdk/make/tools/dtdbuilder/dtds/HTMLlat1.sgml
rename to jdk/make/data/dtdbuilder/HTMLlat1.sgml
diff --git a/jdk/make/tools/dtdbuilder/dtds/HTMLspecial.sgml b/jdk/make/data/dtdbuilder/HTMLspecial.sgml
similarity index 100%
rename from jdk/make/tools/dtdbuilder/dtds/HTMLspecial.sgml
rename to jdk/make/data/dtdbuilder/HTMLspecial.sgml
diff --git a/jdk/make/tools/dtdbuilder/dtds/HTMLsymbol.sgml b/jdk/make/data/dtdbuilder/HTMLsymbol.sgml
similarity index 100%
rename from jdk/make/tools/dtdbuilder/dtds/HTMLsymbol.sgml
rename to jdk/make/data/dtdbuilder/HTMLsymbol.sgml
diff --git a/jdk/make/tools/dtdbuilder/dtds/html32.dtd b/jdk/make/data/dtdbuilder/html32.dtd
similarity index 100%
rename from jdk/make/tools/dtdbuilder/dtds/html32.dtd
rename to jdk/make/data/dtdbuilder/html32.dtd
diff --git a/jdk/make/tools/dtdbuilder/dtds/public.map b/jdk/make/data/dtdbuilder/public.map
similarity index 100%
rename from jdk/make/tools/dtdbuilder/dtds/public.map
rename to jdk/make/data/dtdbuilder/public.map
diff --git a/jdk/makefiles/jpda/jdwp/jdwp.spec b/jdk/make/data/jdwp/jdwp.spec
similarity index 100%
rename from jdk/makefiles/jpda/jdwp/jdwp.spec
rename to jdk/make/data/jdwp/jdwp.spec
diff --git a/jdk/make/tools/manifest.mf b/jdk/make/data/mainmanifest/manifest.mf
similarity index 100%
rename from jdk/make/tools/manifest.mf
rename to jdk/make/data/mainmanifest/manifest.mf
diff --git a/jdk/make/tools/swing-beans/SwingBeanInfo.template b/jdk/make/data/swingbeaninfo/SwingBeanInfo.template
similarity index 100%
rename from jdk/make/tools/swing-beans/SwingBeanInfo.template
rename to jdk/make/data/swingbeaninfo/SwingBeanInfo.template
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/AbstractButtonColor16.gif b/jdk/make/data/swingbeaninfo/images/AbstractButtonColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/AbstractButtonColor16.gif
rename to jdk/make/data/swingbeaninfo/images/AbstractButtonColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/BorderColor16.gif b/jdk/make/data/swingbeaninfo/images/BorderColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/BorderColor16.gif
rename to jdk/make/data/swingbeaninfo/images/BorderColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/BoxColor16.gif b/jdk/make/data/swingbeaninfo/images/BoxColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/BoxColor16.gif
rename to jdk/make/data/swingbeaninfo/images/BoxColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/BoxColor32.gif b/jdk/make/data/swingbeaninfo/images/BoxColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/BoxColor32.gif
rename to jdk/make/data/swingbeaninfo/images/BoxColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/BoxMono16.gif b/jdk/make/data/swingbeaninfo/images/BoxMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/BoxMono16.gif
rename to jdk/make/data/swingbeaninfo/images/BoxMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/BoxMono32.gif b/jdk/make/data/swingbeaninfo/images/BoxMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/BoxMono32.gif
rename to jdk/make/data/swingbeaninfo/images/BoxMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JAppletColor16.gif b/jdk/make/data/swingbeaninfo/images/JAppletColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JAppletColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JAppletColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JAppletColor32.gif b/jdk/make/data/swingbeaninfo/images/JAppletColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JAppletColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JAppletColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JAppletMono16.gif b/jdk/make/data/swingbeaninfo/images/JAppletMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JAppletMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JAppletMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JAppletMono32.gif b/jdk/make/data/swingbeaninfo/images/JAppletMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JAppletMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JAppletMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JButtonColor16.gif b/jdk/make/data/swingbeaninfo/images/JButtonColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JButtonColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JButtonColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JButtonColor32.gif b/jdk/make/data/swingbeaninfo/images/JButtonColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JButtonColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JButtonColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JButtonMono16.gif b/jdk/make/data/swingbeaninfo/images/JButtonMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JButtonMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JButtonMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JButtonMono32.gif b/jdk/make/data/swingbeaninfo/images/JButtonMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JButtonMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JButtonMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxColor16.gif b/jdk/make/data/swingbeaninfo/images/JCheckBoxColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JCheckBoxColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxColor32.gif b/jdk/make/data/swingbeaninfo/images/JCheckBoxColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JCheckBoxColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor16.gif b/jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor32.gif b/jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono16.gif b/jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono32.gif b/jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JCheckBoxMenuItemMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMono16.gif b/jdk/make/data/swingbeaninfo/images/JCheckBoxMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JCheckBoxMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMono32.gif b/jdk/make/data/swingbeaninfo/images/JCheckBoxMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JCheckBoxMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JCheckBoxMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JColorChooserColor16.gif b/jdk/make/data/swingbeaninfo/images/JColorChooserColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JColorChooserColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JColorChooserColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JColorChooserColor32.gif b/jdk/make/data/swingbeaninfo/images/JColorChooserColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JColorChooserColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JColorChooserColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JColorChooserMono16.gif b/jdk/make/data/swingbeaninfo/images/JColorChooserMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JColorChooserMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JColorChooserMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JColorChooserMono32.gif b/jdk/make/data/swingbeaninfo/images/JColorChooserMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JColorChooserMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JColorChooserMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JComboBoxColor16.gif b/jdk/make/data/swingbeaninfo/images/JComboBoxColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JComboBoxColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JComboBoxColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JComboBoxColor32.gif b/jdk/make/data/swingbeaninfo/images/JComboBoxColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JComboBoxColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JComboBoxColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JComboBoxMono16.gif b/jdk/make/data/swingbeaninfo/images/JComboBoxMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JComboBoxMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JComboBoxMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JComboBoxMono32.gif b/jdk/make/data/swingbeaninfo/images/JComboBoxMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JComboBoxMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JComboBoxMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JComponentColor16.gif b/jdk/make/data/swingbeaninfo/images/JComponentColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JComponentColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JComponentColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JDesktopPaneColor16.gif b/jdk/make/data/swingbeaninfo/images/JDesktopPaneColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JDesktopPaneColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JDesktopPaneColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JDesktopPaneColor32.gif b/jdk/make/data/swingbeaninfo/images/JDesktopPaneColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JDesktopPaneColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JDesktopPaneColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JDesktopPaneMono16.gif b/jdk/make/data/swingbeaninfo/images/JDesktopPaneMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JDesktopPaneMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JDesktopPaneMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JDesktopPaneMono32.gif b/jdk/make/data/swingbeaninfo/images/JDesktopPaneMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JDesktopPaneMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JDesktopPaneMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JDialogColor16.gif b/jdk/make/data/swingbeaninfo/images/JDialogColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JDialogColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JDialogColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JDialogColor32.gif b/jdk/make/data/swingbeaninfo/images/JDialogColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JDialogColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JDialogColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JDialogMono16.gif b/jdk/make/data/swingbeaninfo/images/JDialogMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JDialogMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JDialogMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JDialogMono32.gif b/jdk/make/data/swingbeaninfo/images/JDialogMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JDialogMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JDialogMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JEditorPaneColor16.gif b/jdk/make/data/swingbeaninfo/images/JEditorPaneColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JEditorPaneColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JEditorPaneColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JEditorPaneColor32.gif b/jdk/make/data/swingbeaninfo/images/JEditorPaneColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JEditorPaneColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JEditorPaneColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JEditorPaneMono16.gif b/jdk/make/data/swingbeaninfo/images/JEditorPaneMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JEditorPaneMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JEditorPaneMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JEditorPaneMono32.gif b/jdk/make/data/swingbeaninfo/images/JEditorPaneMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JEditorPaneMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JEditorPaneMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFileChooserColor16.gif b/jdk/make/data/swingbeaninfo/images/JFileChooserColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFileChooserColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JFileChooserColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFileChooserColor32.gif b/jdk/make/data/swingbeaninfo/images/JFileChooserColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFileChooserColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JFileChooserColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFileChooserMono16.gif b/jdk/make/data/swingbeaninfo/images/JFileChooserMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFileChooserMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JFileChooserMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFileChooserMono32.gif b/jdk/make/data/swingbeaninfo/images/JFileChooserMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFileChooserMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JFileChooserMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor16.gif b/jdk/make/data/swingbeaninfo/images/JFormattedTextFieldColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JFormattedTextFieldColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor32.gif b/jdk/make/data/swingbeaninfo/images/JFormattedTextFieldColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JFormattedTextFieldColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldMono16.gif b/jdk/make/data/swingbeaninfo/images/JFormattedTextFieldMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JFormattedTextFieldMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldMono32.gif b/jdk/make/data/swingbeaninfo/images/JFormattedTextFieldMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JFormattedTextFieldMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFrameColor16.gif b/jdk/make/data/swingbeaninfo/images/JFrameColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFrameColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JFrameColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFrameColor32.gif b/jdk/make/data/swingbeaninfo/images/JFrameColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFrameColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JFrameColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFrameMono16.gif b/jdk/make/data/swingbeaninfo/images/JFrameMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFrameMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JFrameMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JFrameMono32.gif b/jdk/make/data/swingbeaninfo/images/JFrameMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JFrameMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JFrameMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JInternalFrameColor16.gif b/jdk/make/data/swingbeaninfo/images/JInternalFrameColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JInternalFrameColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JInternalFrameColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JInternalFrameColor32.gif b/jdk/make/data/swingbeaninfo/images/JInternalFrameColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JInternalFrameColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JInternalFrameColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JInternalFrameMono16.gif b/jdk/make/data/swingbeaninfo/images/JInternalFrameMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JInternalFrameMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JInternalFrameMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JInternalFrameMono32.gif b/jdk/make/data/swingbeaninfo/images/JInternalFrameMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JInternalFrameMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JInternalFrameMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JLabelColor16.gif b/jdk/make/data/swingbeaninfo/images/JLabelColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JLabelColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JLabelColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JLabelColor32.gif b/jdk/make/data/swingbeaninfo/images/JLabelColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JLabelColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JLabelColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JLabelMono16.gif b/jdk/make/data/swingbeaninfo/images/JLabelMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JLabelMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JLabelMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JLabelMono32.gif b/jdk/make/data/swingbeaninfo/images/JLabelMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JLabelMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JLabelMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor16.gif b/jdk/make/data/swingbeaninfo/images/JLayeredPaneColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JLayeredPaneColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor32.gif b/jdk/make/data/swingbeaninfo/images/JLayeredPaneColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JLayeredPaneColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono16.gif b/jdk/make/data/swingbeaninfo/images/JLayeredPaneMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JLayeredPaneMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono32.gif b/jdk/make/data/swingbeaninfo/images/JLayeredPaneMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JLayeredPaneMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JListColor16.gif b/jdk/make/data/swingbeaninfo/images/JListColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JListColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JListColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JListColor32.gif b/jdk/make/data/swingbeaninfo/images/JListColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JListColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JListColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JListMono16.gif b/jdk/make/data/swingbeaninfo/images/JListMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JListMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JListMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JListMono32.gif b/jdk/make/data/swingbeaninfo/images/JListMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JListMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JListMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuBarColor16.gif b/jdk/make/data/swingbeaninfo/images/JMenuBarColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuBarColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuBarColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuBarColor32.gif b/jdk/make/data/swingbeaninfo/images/JMenuBarColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuBarColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuBarColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuBarMono16.gif b/jdk/make/data/swingbeaninfo/images/JMenuBarMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuBarMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuBarMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuBarMono32.gif b/jdk/make/data/swingbeaninfo/images/JMenuBarMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuBarMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuBarMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuColor16.gif b/jdk/make/data/swingbeaninfo/images/JMenuColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuColor32.gif b/jdk/make/data/swingbeaninfo/images/JMenuColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuItemColor16.gif b/jdk/make/data/swingbeaninfo/images/JMenuItemColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuItemColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuItemColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuItemColor32.gif b/jdk/make/data/swingbeaninfo/images/JMenuItemColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuItemColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuItemColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuItemMono16.gif b/jdk/make/data/swingbeaninfo/images/JMenuItemMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuItemMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuItemMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuItemMono32.gif b/jdk/make/data/swingbeaninfo/images/JMenuItemMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuItemMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuItemMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuMono16.gif b/jdk/make/data/swingbeaninfo/images/JMenuMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JMenuMono32.gif b/jdk/make/data/swingbeaninfo/images/JMenuMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JMenuMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JMenuMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JOptionPaneColor16.gif b/jdk/make/data/swingbeaninfo/images/JOptionPaneColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JOptionPaneColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JOptionPaneColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JOptionPaneColor32.gif b/jdk/make/data/swingbeaninfo/images/JOptionPaneColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JOptionPaneColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JOptionPaneColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JOptionPaneMono16.gif b/jdk/make/data/swingbeaninfo/images/JOptionPaneMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JOptionPaneMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JOptionPaneMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JOptionPaneMono32.gif b/jdk/make/data/swingbeaninfo/images/JOptionPaneMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JOptionPaneMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JOptionPaneMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPanelColor16.gif b/jdk/make/data/swingbeaninfo/images/JPanelColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPanelColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JPanelColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPanelColor32.gif b/jdk/make/data/swingbeaninfo/images/JPanelColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPanelColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JPanelColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPanelMono16.gif b/jdk/make/data/swingbeaninfo/images/JPanelMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPanelMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JPanelMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPanelMono32.gif b/jdk/make/data/swingbeaninfo/images/JPanelMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPanelMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JPanelMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPasswordFieldColor16.gif b/jdk/make/data/swingbeaninfo/images/JPasswordFieldColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPasswordFieldColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JPasswordFieldColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPasswordFieldColor32.gif b/jdk/make/data/swingbeaninfo/images/JPasswordFieldColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPasswordFieldColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JPasswordFieldColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono16.gif b/jdk/make/data/swingbeaninfo/images/JPasswordFieldMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JPasswordFieldMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono32.gif b/jdk/make/data/swingbeaninfo/images/JPasswordFieldMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JPasswordFieldMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPopupMenuColor16.gif b/jdk/make/data/swingbeaninfo/images/JPopupMenuColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPopupMenuColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JPopupMenuColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPopupMenuColor32.gif b/jdk/make/data/swingbeaninfo/images/JPopupMenuColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPopupMenuColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JPopupMenuColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPopupMenuMono16.gif b/jdk/make/data/swingbeaninfo/images/JPopupMenuMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPopupMenuMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JPopupMenuMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JPopupMenuMono32.gif b/jdk/make/data/swingbeaninfo/images/JPopupMenuMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JPopupMenuMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JPopupMenuMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JProgressBarColor16.gif b/jdk/make/data/swingbeaninfo/images/JProgressBarColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JProgressBarColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JProgressBarColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JProgressBarColor32.gif b/jdk/make/data/swingbeaninfo/images/JProgressBarColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JProgressBarColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JProgressBarColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JProgressBarMono16.gif b/jdk/make/data/swingbeaninfo/images/JProgressBarMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JProgressBarMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JProgressBarMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JProgressBarMono32.gif b/jdk/make/data/swingbeaninfo/images/JProgressBarMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JProgressBarMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JProgressBarMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonColor16.gif b/jdk/make/data/swingbeaninfo/images/JRadioButtonColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JRadioButtonColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonColor32.gif b/jdk/make/data/swingbeaninfo/images/JRadioButtonColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JRadioButtonColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemColor16.gif b/jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemColor32.gif b/jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono16.gif b/jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono32.gif b/jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JRadioButtonMenuItemMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMono16.gif b/jdk/make/data/swingbeaninfo/images/JRadioButtonMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JRadioButtonMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMono32.gif b/jdk/make/data/swingbeaninfo/images/JRadioButtonMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRadioButtonMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JRadioButtonMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRootPaneColor16.gif b/jdk/make/data/swingbeaninfo/images/JRootPaneColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRootPaneColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JRootPaneColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRootPaneColor32.gif b/jdk/make/data/swingbeaninfo/images/JRootPaneColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRootPaneColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JRootPaneColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRootPaneMono16.gif b/jdk/make/data/swingbeaninfo/images/JRootPaneMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRootPaneMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JRootPaneMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JRootPaneMono32.gif b/jdk/make/data/swingbeaninfo/images/JRootPaneMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JRootPaneMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JRootPaneMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JScrollBarColor16.gif b/jdk/make/data/swingbeaninfo/images/JScrollBarColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JScrollBarColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JScrollBarColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JScrollBarColor32.gif b/jdk/make/data/swingbeaninfo/images/JScrollBarColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JScrollBarColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JScrollBarColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JScrollBarMono16.gif b/jdk/make/data/swingbeaninfo/images/JScrollBarMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JScrollBarMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JScrollBarMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JScrollBarMono32.gif b/jdk/make/data/swingbeaninfo/images/JScrollBarMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JScrollBarMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JScrollBarMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JScrollPaneColor16.gif b/jdk/make/data/swingbeaninfo/images/JScrollPaneColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JScrollPaneColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JScrollPaneColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JScrollPaneColor32.gif b/jdk/make/data/swingbeaninfo/images/JScrollPaneColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JScrollPaneColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JScrollPaneColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JScrollPaneMono16.gif b/jdk/make/data/swingbeaninfo/images/JScrollPaneMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JScrollPaneMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JScrollPaneMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JScrollPaneMono32.gif b/jdk/make/data/swingbeaninfo/images/JScrollPaneMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JScrollPaneMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JScrollPaneMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSeparatorColor16.gif b/jdk/make/data/swingbeaninfo/images/JSeparatorColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSeparatorColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JSeparatorColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSeparatorColor32.gif b/jdk/make/data/swingbeaninfo/images/JSeparatorColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSeparatorColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JSeparatorColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSeparatorMono16.gif b/jdk/make/data/swingbeaninfo/images/JSeparatorMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSeparatorMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JSeparatorMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSeparatorMono32.gif b/jdk/make/data/swingbeaninfo/images/JSeparatorMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSeparatorMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JSeparatorMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSliderColor16.gif b/jdk/make/data/swingbeaninfo/images/JSliderColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSliderColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JSliderColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSliderColor32.gif b/jdk/make/data/swingbeaninfo/images/JSliderColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSliderColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JSliderColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSliderMono16.gif b/jdk/make/data/swingbeaninfo/images/JSliderMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSliderMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JSliderMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSliderMono32.gif b/jdk/make/data/swingbeaninfo/images/JSliderMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSliderMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JSliderMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSpinnerColor16.gif b/jdk/make/data/swingbeaninfo/images/JSpinnerColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSpinnerColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JSpinnerColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSpinnerColor32.gif b/jdk/make/data/swingbeaninfo/images/JSpinnerColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSpinnerColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JSpinnerColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSpinnerMono16.gif b/jdk/make/data/swingbeaninfo/images/JSpinnerMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSpinnerMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JSpinnerMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSpinnerMono32.gif b/jdk/make/data/swingbeaninfo/images/JSpinnerMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSpinnerMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JSpinnerMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSplitPaneColor16.gif b/jdk/make/data/swingbeaninfo/images/JSplitPaneColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSplitPaneColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JSplitPaneColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSplitPaneColor32.gif b/jdk/make/data/swingbeaninfo/images/JSplitPaneColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSplitPaneColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JSplitPaneColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSplitPaneMono16.gif b/jdk/make/data/swingbeaninfo/images/JSplitPaneMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSplitPaneMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JSplitPaneMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JSplitPaneMono32.gif b/jdk/make/data/swingbeaninfo/images/JSplitPaneMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JSplitPaneMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JSplitPaneMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTabbedPaneColor16.gif b/jdk/make/data/swingbeaninfo/images/JTabbedPaneColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTabbedPaneColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JTabbedPaneColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTabbedPaneColor32.gif b/jdk/make/data/swingbeaninfo/images/JTabbedPaneColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTabbedPaneColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JTabbedPaneColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTabbedPaneMono16.gif b/jdk/make/data/swingbeaninfo/images/JTabbedPaneMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTabbedPaneMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JTabbedPaneMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTabbedPaneMono32.gif b/jdk/make/data/swingbeaninfo/images/JTabbedPaneMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTabbedPaneMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JTabbedPaneMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTableColor16.gif b/jdk/make/data/swingbeaninfo/images/JTableColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTableColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JTableColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTableColor32.gif b/jdk/make/data/swingbeaninfo/images/JTableColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTableColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JTableColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTableMono16.gif b/jdk/make/data/swingbeaninfo/images/JTableMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTableMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JTableMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTableMono32.gif b/jdk/make/data/swingbeaninfo/images/JTableMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTableMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JTableMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextAreaColor16.gif b/jdk/make/data/swingbeaninfo/images/JTextAreaColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextAreaColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JTextAreaColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextAreaColor32.gif b/jdk/make/data/swingbeaninfo/images/JTextAreaColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextAreaColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JTextAreaColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextAreaMono16.gif b/jdk/make/data/swingbeaninfo/images/JTextAreaMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextAreaMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JTextAreaMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextAreaMono32.gif b/jdk/make/data/swingbeaninfo/images/JTextAreaMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextAreaMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JTextAreaMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextFieldColor16.gif b/jdk/make/data/swingbeaninfo/images/JTextFieldColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextFieldColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JTextFieldColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextFieldColor32.gif b/jdk/make/data/swingbeaninfo/images/JTextFieldColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextFieldColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JTextFieldColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextFieldMono16.gif b/jdk/make/data/swingbeaninfo/images/JTextFieldMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextFieldMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JTextFieldMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextFieldMono32.gif b/jdk/make/data/swingbeaninfo/images/JTextFieldMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextFieldMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JTextFieldMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextPaneColor16.gif b/jdk/make/data/swingbeaninfo/images/JTextPaneColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextPaneColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JTextPaneColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextPaneColor32.gif b/jdk/make/data/swingbeaninfo/images/JTextPaneColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextPaneColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JTextPaneColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextPaneMono16.gif b/jdk/make/data/swingbeaninfo/images/JTextPaneMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextPaneMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JTextPaneMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTextPaneMono32.gif b/jdk/make/data/swingbeaninfo/images/JTextPaneMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTextPaneMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JTextPaneMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JToggleButtonColor16.gif b/jdk/make/data/swingbeaninfo/images/JToggleButtonColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JToggleButtonColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JToggleButtonColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JToggleButtonColor32.gif b/jdk/make/data/swingbeaninfo/images/JToggleButtonColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JToggleButtonColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JToggleButtonColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JToggleButtonMono16.gif b/jdk/make/data/swingbeaninfo/images/JToggleButtonMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JToggleButtonMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JToggleButtonMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JToggleButtonMono32.gif b/jdk/make/data/swingbeaninfo/images/JToggleButtonMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JToggleButtonMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JToggleButtonMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JToolBarColor16.gif b/jdk/make/data/swingbeaninfo/images/JToolBarColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JToolBarColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JToolBarColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JToolBarColor32.gif b/jdk/make/data/swingbeaninfo/images/JToolBarColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JToolBarColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JToolBarColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JToolBarMono16.gif b/jdk/make/data/swingbeaninfo/images/JToolBarMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JToolBarMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JToolBarMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JToolBarMono32.gif b/jdk/make/data/swingbeaninfo/images/JToolBarMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JToolBarMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JToolBarMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTreeColor16.gif b/jdk/make/data/swingbeaninfo/images/JTreeColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTreeColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JTreeColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTreeColor32.gif b/jdk/make/data/swingbeaninfo/images/JTreeColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTreeColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JTreeColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTreeMono16.gif b/jdk/make/data/swingbeaninfo/images/JTreeMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTreeMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JTreeMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JTreeMono32.gif b/jdk/make/data/swingbeaninfo/images/JTreeMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JTreeMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JTreeMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JViewportColor16.gif b/jdk/make/data/swingbeaninfo/images/JViewportColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JViewportColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JViewportColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JViewportColor32.gif b/jdk/make/data/swingbeaninfo/images/JViewportColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JViewportColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JViewportColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JViewportMono16.gif b/jdk/make/data/swingbeaninfo/images/JViewportMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JViewportMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JViewportMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JViewportMono32.gif b/jdk/make/data/swingbeaninfo/images/JViewportMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JViewportMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JViewportMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JWindowColor16.gif b/jdk/make/data/swingbeaninfo/images/JWindowColor16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JWindowColor16.gif
rename to jdk/make/data/swingbeaninfo/images/JWindowColor16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JWindowColor32.gif b/jdk/make/data/swingbeaninfo/images/JWindowColor32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JWindowColor32.gif
rename to jdk/make/data/swingbeaninfo/images/JWindowColor32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JWindowMono16.gif b/jdk/make/data/swingbeaninfo/images/JWindowMono16.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JWindowMono16.gif
rename to jdk/make/data/swingbeaninfo/images/JWindowMono16.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/beaninfo/images/JWindowMono32.gif b/jdk/make/data/swingbeaninfo/images/JWindowMono32.gif
similarity index 100%
rename from jdk/make/tools/swing-beans/beaninfo/images/JWindowMono32.gif
rename to jdk/make/data/swingbeaninfo/images/JWindowMono32.gif
Binary files differ
diff --git a/jdk/make/tools/swing-beans/javax/swing/SwingBeanInfoBase.java b/jdk/make/data/swingbeaninfo/javax/swing/SwingBeanInfoBase.java
similarity index 100%
rename from jdk/make/tools/swing-beans/javax/swing/SwingBeanInfoBase.java
rename to jdk/make/data/swingbeaninfo/javax/swing/SwingBeanInfoBase.java
diff --git a/jdk/make/javax/swing/beaninfo/manifest b/jdk/make/data/swingbeaninfo/manifest.mf
similarity index 100%
rename from jdk/make/javax/swing/beaninfo/manifest
rename to jdk/make/data/swingbeaninfo/manifest.mf
diff --git a/jdk/make/tools/swing-beans/sun/swing/BeanInfoUtils.java b/jdk/make/data/swingbeaninfo/sun/swing/BeanInfoUtils.java
similarity index 100%
rename from jdk/make/tools/swing-beans/sun/swing/BeanInfoUtils.java
rename to jdk/make/data/swingbeaninfo/sun/swing/BeanInfoUtils.java
diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION
new file mode 100644
index 0000000..1d76989
--- /dev/null
+++ b/jdk/make/data/tzdata/VERSION
@@ -0,0 +1,24 @@
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+tzdata2013h
diff --git a/jdk/make/data/tzdata/africa b/jdk/make/data/tzdata/africa
new file mode 100644
index 0000000..0eed8b1
--- /dev/null
+++ b/jdk/make/data/tzdata/africa
@@ -0,0 +1,1314 @@
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+
+# This data is by no means authoritative; if you think you know better,
+# go ahead and edit the file (and please send any changes to
+# tz@iana.org for general use in the future).
+
+# From Paul Eggert (2013-02-21):
+#
+# A good source for time zone historical data outside the U.S. is
+# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+# San Diego: ACS Publications, Inc. (2003).
+#
+# Gwillim Law writes that a good source
+# for recent time zone data is the International Air Transport
+# Association's Standard Schedules Information Manual (IATA SSIM),
+# published semiannually. Law sent in several helpful summaries
+# of the IATA's data after 1990.
+#
+# Except where otherwise noted, Shanks & Pottenger is the source for
+# entries through 1990, and IATA SSIM is the source for entries afterwards.
+#
+# Another source occasionally used is Edward W. Whitman, World Time Differences,
+# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
+# I found in the UCLA library.
+#
+# For data circa 1899, a common source is:
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+# <http://www.jstor.org/stable/1774359>.
+#
+# A reliable and entertaining source about time zones is
+# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+#
+# Previous editions of this database used WAT, CAT, SAT, and EAT
+# for +0:00 through +3:00, respectively,
+# but Mark R V Murray reports that
+# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
+# `CAT' is commonly used for +2:00 in countries north of South Africa, and
+# `WAT' is probably the best name for +1:00, as the common phrase for
+# the area that includes Nigeria is ``West Africa''.
+# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
+#
+# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
+# I'd guess that this was because people needed _some_ name for -1:00,
+# and at the time, far west Africa was the only major land area in -1:00.
+# This usage is now obsolete, as the last use of -1:00 on the African
+# mainland seems to have been 1976 in Western Sahara.
+#
+# To summarize, the following abbreviations seem to have some currency:
+# -1:00 WAT West Africa Time (no longer used)
+# 0:00 GMT Greenwich Mean Time
+# 2:00 CAT Central Africa Time
+# 2:00 SAST South Africa Standard Time
+# and Murray suggests the following abbreviation:
+# 1:00 WAT West Africa Time
+# I realize that this leads to `WAT' being used for both -1:00 and 1:00
+# for times before 1976, but this is the best I can think of
+# until we get more information.
+#
+# I invented the following abbreviations; corrections are welcome!
+# 2:00 WAST West Africa Summer Time
+# 2:30 BEAT British East Africa Time (no longer used)
+# 2:45 BEAUT British East Africa Unified Time (no longer used)
+# 3:00 CAST Central Africa Summer Time (no longer used)
+# 3:00 SAST South Africa Summer Time (no longer used)
+# 3:00 EAT East Africa Time
+# 4:00 EAST East Africa Summer Time (no longer used)
+
+# Algeria
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Algeria 1916 only - Jun 14 23:00s 1:00 S
+Rule Algeria 1916 1919 - Oct Sun>=1 23:00s 0 -
+Rule Algeria 1917 only - Mar 24 23:00s 1:00 S
+Rule Algeria 1918 only - Mar 9 23:00s 1:00 S
+Rule Algeria 1919 only - Mar 1 23:00s 1:00 S
+Rule Algeria 1920 only - Feb 14 23:00s 1:00 S
+Rule Algeria 1920 only - Oct 23 23:00s 0 -
+Rule Algeria 1921 only - Mar 14 23:00s 1:00 S
+Rule Algeria 1921 only - Jun 21 23:00s 0 -
+Rule Algeria 1939 only - Sep 11 23:00s 1:00 S
+Rule Algeria 1939 only - Nov 19 1:00 0 -
+Rule Algeria 1944 1945 - Apr Mon>=1 2:00 1:00 S
+Rule Algeria 1944 only - Oct 8 2:00 0 -
+Rule Algeria 1945 only - Sep 16 1:00 0 -
+Rule Algeria 1971 only - Apr 25 23:00s 1:00 S
+Rule Algeria 1971 only - Sep 26 23:00s 0 -
+Rule Algeria 1977 only - May 6 0:00 1:00 S
+Rule Algeria 1977 only - Oct 21 0:00 0 -
+Rule Algeria 1978 only - Mar 24 1:00 1:00 S
+Rule Algeria 1978 only - Sep 22 3:00 0 -
+Rule Algeria 1980 only - Apr 25 0:00 1:00 S
+Rule Algeria 1980 only - Oct 31 2:00 0 -
+# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+# more precise 0:09:21.
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
+ 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
+ 0:00 Algeria WE%sT 1940 Feb 25 2:00
+ 1:00 Algeria CE%sT 1946 Oct 7
+ 0:00 - WET 1956 Jan 29
+ 1:00 - CET 1963 Apr 14
+ 0:00 Algeria WE%sT 1977 Oct 21
+ 1:00 Algeria CE%sT 1979 Oct 26
+ 0:00 Algeria WE%sT 1981 May
+ 1:00 - CET
+
+# Angola
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Luanda 0:52:56 - LMT 1892
+ 0:52:04 - AOT 1911 May 26 # Angola Time
+ 1:00 - WAT
+
+# Benin
+# Whitman says they switched to 1:00 in 1946, not 1934;
+# go with Shanks & Pottenger.
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Porto-Novo 0:10:28 - LMT 1912
+ 0:00 - GMT 1934 Feb 26
+ 1:00 - WAT
+
+# Botswana
+# From Paul Eggert (2013-02-21):
+# Milne says they were regulated by the Cape Town Signal in 1899;
+# assume they switched to 2:00 when Cape Town did.
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Gaborone 1:43:40 - LMT 1885
+ 1:30 - SAST 1903 Mar
+ 2:00 - CAT 1943 Sep 19 2:00
+ 2:00 1:00 CAST 1944 Mar 19 2:00
+ 2:00 - CAT
+
+# Burkina Faso
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Ouagadougou -0:06:04 - LMT 1912
+ 0:00 - GMT
+
+# Burundi
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Bujumbura 1:57:28 - LMT 1890
+ 2:00 - CAT
+
+# Cameroon
+# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Douala 0:38:48 - LMT 1912
+ 1:00 - WAT
+
+# Cape Verde
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Atlantic/Cape_Verde -1:34:04 - LMT 1907 # Praia
+ -2:00 - CVT 1942 Sep
+ -2:00 1:00 CVST 1945 Oct 15
+ -2:00 - CVT 1975 Nov 25 2:00
+ -1:00 - CVT
+
+# Central African Republic
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Bangui 1:14:20 - LMT 1912
+ 1:00 - WAT
+
+# Chad
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Ndjamena 1:00:12 - LMT 1912
+ 1:00 - WAT 1979 Oct 14
+ 1:00 1:00 WAST 1980 Mar 8
+ 1:00 - WAT
+
+# Comoros
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro
+ 3:00 - EAT
+
+# Democratic Republic of Congo
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Kinshasa 1:01:12 - LMT 1897 Nov 9
+ 1:00 - WAT
+Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9
+ 2:00 - CAT
+
+# Republic of the Congo
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Brazzaville 1:01:08 - LMT 1912
+ 1:00 - WAT
+
+# Cote D'Ivoire
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Abidjan -0:16:08 - LMT 1912
+ 0:00 - GMT
+
+# Djibouti
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul
+ 3:00 - EAT
+
+###############################################################################
+
+# Egypt
+
+# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh
+# observatory; round to nearest. Milne also says that the official time for
+# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
+# did not apply to Cairo, Alexandria, or Port Said.
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Egypt 1940 only - Jul 15 0:00 1:00 S
+Rule Egypt 1940 only - Oct 1 0:00 0 -
+Rule Egypt 1941 only - Apr 15 0:00 1:00 S
+Rule Egypt 1941 only - Sep 16 0:00 0 -
+Rule Egypt 1942 1944 - Apr 1 0:00 1:00 S
+Rule Egypt 1942 only - Oct 27 0:00 0 -
+Rule Egypt 1943 1945 - Nov 1 0:00 0 -
+Rule Egypt 1945 only - Apr 16 0:00 1:00 S
+Rule Egypt 1957 only - May 10 0:00 1:00 S
+Rule Egypt 1957 1958 - Oct 1 0:00 0 -
+Rule Egypt 1958 only - May 1 0:00 1:00 S
+Rule Egypt 1959 1981 - May 1 1:00 1:00 S
+Rule Egypt 1959 1965 - Sep 30 3:00 0 -
+Rule Egypt 1966 1994 - Oct 1 3:00 0 -
+Rule Egypt 1982 only - Jul 25 1:00 1:00 S
+Rule Egypt 1983 only - Jul 12 1:00 1:00 S
+Rule Egypt 1984 1988 - May 1 1:00 1:00 S
+Rule Egypt 1989 only - May 6 1:00 1:00 S
+Rule Egypt 1990 1994 - May 1 1:00 1:00 S
+# IATA (after 1990) says transitions are at 0:00.
+# Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29.
+
+# From Alexander Krivenyshev (2011-04-20):
+# "...Egypt's interim cabinet decided on Wednesday to cancel daylight
+# saving time after a poll posted on its website showed the majority of
+# Egyptians would approve the cancellation."
+#
+# Egypt to cancel daylight saving time
+# <a href="http://www.almasryalyoum.com/en/node/407168">
+# http://www.almasryalyoum.com/en/node/407168
+# </a>
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt04.html">
+# http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
+# </a>
+Rule Egypt 1995 2010 - Apr lastFri 0:00s 1:00 S
+Rule Egypt 1995 2005 - Sep lastThu 23:00s 0 -
+# From Steffen Thorsen (2006-09-19):
+# The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
+# Egypt will turn back clocks by one hour at the midnight of Thursday
+# after observing the daylight saving time since May.
+# http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
+Rule Egypt 2006 only - Sep 21 23:00s 0 -
+# From Dirk Losch (2007-08-14):
+# I received a mail from an airline which says that the daylight
+# saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
+# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# http://www.nentjes.info/Bill/bill5.htm
+# http://www.timeanddate.com/worldclock/city.html?n=53
+# From Steffen Thorsen (2007-09-04): The official information...:
+# http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
+Rule Egypt 2007 only - Sep Thu>=1 23:00s 0 -
+# From Abdelrahman Hassan (2007-09-06):
+# Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
+# than the year of the Gregorian calendar, Ramadan shifts earlier each
+# year. This year it will be observed September 13 (September is quite
+# hot in Egypt), and the idea is to make fasting easier for workers by
+# shifting business hours one hour out of daytime heat. Consequently,
+# unless discontinued, next DST may end Thursday 28 August 2008.
+# From Paul Eggert (2007-08-17):
+# For lack of better info, assume the new rule is last Thursday in August.
+
+# From Petr Machata (2009-04-06):
+# The following appeared in Red Hat bugzilla[1] (edited):
+#
+# > $ zdump -v /usr/share/zoneinfo/Africa/Cairo | grep 2009
+# > /usr/share/zoneinfo/Africa/Cairo Thu Apr 23 21:59:59 2009 UTC = Thu =
+# Apr 23
+# > 23:59:59 2009 EET isdst=0 gmtoff=7200
+# > /usr/share/zoneinfo/Africa/Cairo Thu Apr 23 22:00:00 2009 UTC = Fri =
+# Apr 24
+# > 01:00:00 2009 EEST isdst=1 gmtoff=10800
+# > /usr/share/zoneinfo/Africa/Cairo Thu Aug 27 20:59:59 2009 UTC = Thu =
+# Aug 27
+# > 23:59:59 2009 EEST isdst=1 gmtoff=10800
+# > /usr/share/zoneinfo/Africa/Cairo Thu Aug 27 21:00:00 2009 UTC = Thu =
+# Aug 27
+# > 23:00:00 2009 EET isdst=0 gmtoff=7200
+#
+# > end date should be Thu Sep 24 2009 (Last Thursday in September at 23:59=
+# :59)
+# > http://support.microsoft.com/kb/958729/
+#
+# timeanddate[2] and another site I've found[3] also support that.
+#
+# [1] <a href="https://bugzilla.redhat.com/show_bug.cgi?id=492263">
+# https://bugzilla.redhat.com/show_bug.cgi?id=492263
+# </a>
+# [2] <a href="http://www.timeanddate.com/worldclock/clockchange.html?n=53">
+# http://www.timeanddate.com/worldclock/clockchange.html?n=53
+# </a>
+# [3] <a href="http://wwp.greenwichmeantime.com/time-zone/africa/egypt/">
+# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
+# </a>
+
+# From Arthur David Olson (2009-04-20):
+# In 2009 (and for the next several years), Ramadan ends before the fourth
+# Thursday in September; Egypt is expected to revert to the last Thursday
+# in September.
+
+# From Steffen Thorsen (2009-08-11):
+# We have been able to confirm the August change with the Egyptian Cabinet
+# Information and Decision Support Center:
+# <a href="http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html">
+# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
+# </a>
+#
+# The Middle East News Agency
+# <a href="http://www.mena.org.eg/index.aspx">
+# http://www.mena.org.eg/index.aspx
+# </a>
+# also reports "Egypt starts winter time on August 21"
+# today in article numbered "71, 11/08/2009 12:25 GMT."
+# Only the title above is available without a subscription to their service,
+# and can be found by searching for "winter" in their search engine
+# (at least today).
+
+# From Alexander Krivenyshev (2010-07-20):
+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
+# decided that Daylight Saving Time will not be used in Egypt during
+# Ramadan.
+#
+# Arabic translation:
+# "Clocks to go back during Ramadan--and then forward again"
+# <a href="http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again">
+# http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
+# </a>
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt02.html">
+# http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
+# </a>
+
+Rule Egypt 2008 only - Aug lastThu 23:00s 0 -
+Rule Egypt 2009 only - Aug 20 23:00s 0 -
+Rule Egypt 2010 only - Aug 11 0:00 0 -
+Rule Egypt 2010 only - Sep 10 0:00 1:00 S
+Rule Egypt 2010 only - Sep lastThu 23:00s 0 -
+
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
+ 2:00 Egypt EE%sT
+
+# Equatorial Guinea
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Malabo 0:35:08 - LMT 1912
+ 0:00 - GMT 1963 Dec 15
+ 1:00 - WAT
+
+# Eritrea
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Asmara 2:35:32 - LMT 1870
+ 2:35:32 - AMT 1890 # Asmara Mean Time
+ 2:35:20 - ADMT 1936 May 5 # Adis Dera MT
+ 3:00 - EAT
+
+# Ethiopia
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
+# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
+# We'll guess that 38E50 is for Adis Dera.
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Addis_Ababa 2:34:48 - LMT 1870
+ 2:35:20 - ADMT 1936 May 5 # Adis Dera MT
+ 3:00 - EAT
+
+# Gabon
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Libreville 0:37:48 - LMT 1912
+ 1:00 - WAT
+
+# Gambia
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Banjul -1:06:36 - LMT 1912
+ -1:06:36 - BMT 1935 # Banjul Mean Time
+ -1:00 - WAT 1964
+ 0:00 - GMT
+
+# Ghana
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+# Whitman says DST was observed from 1931 to ``the present'';
+# go with Shanks & Pottenger.
+Rule Ghana 1936 1942 - Sep 1 0:00 0:20 GHST
+Rule Ghana 1936 1942 - Dec 31 0:00 0 GMT
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Accra -0:00:52 - LMT 1918
+ 0:00 Ghana %s
+
+# Guinea
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Conakry -0:54:52 - LMT 1912
+ 0:00 - GMT 1934 Feb 26
+ -1:00 - WAT 1960
+ 0:00 - GMT
+
+# Guinea-Bissau
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Bissau -1:02:20 - LMT 1911 May 26
+ -1:00 - WAT 1975
+ 0:00 - GMT
+
+# Kenya
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Nairobi 2:27:16 - LMT 1928 Jul
+ 3:00 - EAT 1930
+ 2:30 - BEAT 1940
+ 2:45 - BEAUT 1960
+ 3:00 - EAT
+
+# Lesotho
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Maseru 1:50:00 - LMT 1903 Mar
+ 2:00 - SAST 1943 Sep 19 2:00
+ 2:00 1:00 SAST 1944 Mar 19 2:00
+ 2:00 - SAST
+
+# Liberia
+# From Paul Eggert (2006-03-22):
+# In 1972 Liberia was the last country to switch
+# from a UTC offset that was not a multiple of 15 or 20 minutes.
+# Howse reports that it was in honor of their president's birthday.
+# Shank & Pottenger report the date as May 1, whereas Howse reports Jan;
+# go with Shanks & Pottenger.
+# For Liberia before 1972, Shanks & Pottenger report -0:44, whereas Howse and
+# Whitman each report -0:44:30; go with the more precise figure.
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Monrovia -0:43:08 - LMT 1882
+ -0:43:08 - MMT 1919 Mar # Monrovia Mean Time
+ -0:44:30 - LRT 1972 May # Liberia Time
+ 0:00 - GMT
+
+###############################################################################
+
+# Libya
+
+# From Even Scharning (2012-11-10):
+# Libya set their time one hour back at 02:00 on Saturday November 10.
+# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
+# Here is an official source [in Arabic]: http://ls.ly/fb6Yc
+#
+# Steffen Thorsen forwarded a translation (2012-11-10) in
+# http://mm.icann.org/pipermail/tz/2012-November/018451.html
+#
+# From Tim Parenti (2012-11-11):
+# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1.
+# The DST rules planned for 2013 and onward roughly mirror those of Europe
+# (either two days before them or five days after them, so as to fall on
+# lastFri instead of lastSun).
+
+# From Even Scharning (2013-10-25):
+# The scheduled end of DST in Libya on Friday, October 25, 2013 was
+# cancelled yesterday....
+# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+#
+# From Paul Eggert (2013-10-25):
+# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Libya 1951 only - Oct 14 2:00 1:00 S
+Rule Libya 1952 only - Jan 1 0:00 0 -
+Rule Libya 1953 only - Oct 9 2:00 1:00 S
+Rule Libya 1954 only - Jan 1 0:00 0 -
+Rule Libya 1955 only - Sep 30 0:00 1:00 S
+Rule Libya 1956 only - Jan 1 0:00 0 -
+Rule Libya 1982 1984 - Apr 1 0:00 1:00 S
+Rule Libya 1982 1985 - Oct 1 0:00 0 -
+Rule Libya 1985 only - Apr 6 0:00 1:00 S
+Rule Libya 1986 only - Apr 4 0:00 1:00 S
+Rule Libya 1986 only - Oct 3 0:00 0 -
+Rule Libya 1987 1989 - Apr 1 0:00 1:00 S
+Rule Libya 1987 1989 - Oct 1 0:00 0 -
+Rule Libya 1997 only - Apr 4 0:00 1:00 S
+Rule Libya 1997 only - Oct 4 0:00 0 -
+Rule Libya 2013 only - Mar lastFri 1:00 1:00 S
+Rule Libya 2013 only - Oct lastFri 2:00 0 -
+
+# The 1996 and 1997 entries are from Shanks & Pottenger;
+# the IATA SSIM data contain some obvious errors.
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Tripoli 0:52:44 - LMT 1920
+ 1:00 Libya CE%sT 1959
+ 2:00 - EET 1982
+ 1:00 Libya CE%sT 1990 May 4
+ 2:00 - EET 1996 Sep 30
+ 1:00 Libya CE%sT 1997 Oct 4
+ 2:00 - EET 2012 Nov 10 2:00
+ 1:00 Libya CE%sT 2013 Oct 25 2:00
+ 2:00 - EET
+
+# Madagascar
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Indian/Antananarivo 3:10:04 - LMT 1911 Jul
+ 3:00 - EAT 1954 Feb 27 23:00s
+ 3:00 1:00 EAST 1954 May 29 23:00s
+ 3:00 - EAT
+
+# Malawi
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar
+ 2:00 - CAT
+
+# Mali
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Bamako -0:32:00 - LMT 1912
+ 0:00 - GMT 1934 Feb 26
+ -1:00 - WAT 1960 Jun 20
+ 0:00 - GMT
+
+# Mauritania
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Nouakchott -1:03:48 - LMT 1912
+ 0:00 - GMT 1934 Feb 26
+ -1:00 - WAT 1960 Nov 28
+ 0:00 - GMT
+
+# Mauritius
+
+# From Steffen Thorsen (2008-06-25):
+# Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial
+# basis....
+# It seems that Mauritius observed daylight saving time from 1982-10-10 to
+# 1983-03-20 as well, but that was not successful....
+# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
+
+# From Alex Krivenyshev (2008-06-25):
+# http://economicdevelopment.gov.mu/portal/site/Mainhomepage/menuitem.a42b24128104d9845dabddd154508a0c/?content_id=0a7cee8b5d69a110VgnVCM1000000a04a8c0RCRD
+
+# From Arthur David Olson (2008-06-30):
+# The www.timeanddate.com article cited by Steffen Thorsen notes that "A
+# final decision has yet to be made on the times that daylight saving
+# would begin and end on these dates." As a place holder, use midnight.
+
+# From Paul Eggert (2008-06-30):
+# Follow Thorsen on DST in 1982/1983, instead of Shanks & Pottenger.
+
+# From Steffen Thorsen (2008-07-10):
+# According to
+# <a href="http://www.lexpress.mu/display_article.php?news_id=111216">
+# http://www.lexpress.mu/display_article.php?news_id=111216
+# </a>
+# (in French), Mauritius will start and end their DST a few days earlier
+# than previously announced (2008-11-01 to 2009-03-31). The new start
+# date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
+# given, but it is probably at either 2 or 3 wall clock time).
+#
+# A little strange though, since the article says that they moved the date
+# to align itself with Europe and USA which also change time on that date,
+# but that means they have not paid attention to what happened in
+# USA/Canada last year (DST ends first Sunday in November). I also wonder
+# why that they end on a Friday, instead of aligning with Europe which
+# changes two days later.
+
+# From Alex Krivenyshev (2008-07-11):
+# Seems that English language article "The revival of daylight saving
+# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally
+# published on Monday, June 30, 2008...
+#
+# I guess that article in French "Le gouvernement avance l'introduction
+# de l'heure d'ete" stating that DST in Mauritius starting on October 26
+# and ending on March 27, 2009 is the most recent one.
+# ...
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html">
+# http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
+# </a>
+
+# From Riad M. Hossen Ally (2008-08-03):
+# The Government of Mauritius weblink
+# <a href="http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD">
+# http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
+# </a>
+# Cabinet Decision of July 18th, 2008 states as follows:
+#
+# 4. ...Cabinet has agreed to the introduction into the National Assembly
+# of the Time Bill which provides for the introduction of summer time in
+# Mauritius. The summer time period which will be of one hour ahead of
+# the standard time, will be aligned with that in Europe and the United
+# States of America. It will start at two o'clock in the morning on the
+# last Sunday of October and will end at two o'clock in the morning on
+# the last Sunday of March the following year. The summer time for the
+# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
+# and end on 29 March 2009.
+
+# From Ed Maste (2008-10-07):
+# THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
+# beginning / ending of summer time is 2 o'clock standard time in the
+# morning of the last Sunday of October / last Sunday of March.
+# <a href="http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf">
+# http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
+# </a>
+
+# From Steffen Thorsen (2009-06-05):
+# According to several sources, Mauritius will not continue to observe
+# DST the coming summer...
+#
+# Some sources, in French:
+# <a href="http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB">
+# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
+# </a>
+# <a href="http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-">
+# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
+# </a>
+#
+# Our wrap-up:
+# <a href="http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html">
+# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
+# </a>
+
+# From Arthur David Olson (2009-07-11):
+# The "mauritius-dst-will-not-repeat" wrapup includes this:
+# "The trial ended on March 29, 2009, when the clocks moved back by one hour
+# at 2am (or 02:00) local time..."
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Mauritius 1982 only - Oct 10 0:00 1:00 S
+Rule Mauritius 1983 only - Mar 21 0:00 0 -
+Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 S
+Rule Mauritius 2009 only - Mar lastSun 2:00 0 -
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
+ 4:00 Mauritius MU%sT # Mauritius Time
+# Agalega Is, Rodriguez
+# no information; probably like Indian/Mauritius
+
+# Mayotte
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
+ 3:00 - EAT
+
+# Morocco
+# See the `europe' file for Spanish Morocco (Africa/Ceuta).
+
+# From Alex Krivenyshev (2008-05-09):
+# Here is an article that Morocco plan to introduce Daylight Saving Time between
+# 1 June, 2008 and 27 September, 2008.
+#
+# "... Morocco is to save energy by adjusting its clock during summer so it will
+# be one hour ahead of GMT between 1 June and 27 September, according to
+# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
+#
+# <a href="http://www.worldtimezone.net/dst_news/dst_news_morocco01.html">
+# http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
+# </a>
+# OR
+# <a href="http://en.afrik.com/news11892.html">
+# http://en.afrik.com/news11892.html
+# </a>
+
+# From Alex Krivenyshev (2008-05-09):
+# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
+# <a href="http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view">
+# http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
+# </a>
+#
+# Morocco shifts to daylight time on June 1st through September 27, Govt.
+# spokesman.
+
+# From Patrice Scattolin (2008-05-09):
+# According to this article:
+# <a href="http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html">
+# http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
+# </a>
+# (and republished here:
+# <a href="http://www.actu.ma/heure-dete-comment_i127896_0.html">
+# http://www.actu.ma/heure-dete-comment_i127896_0.html
+# </a>
+# )
+# the changes occurs at midnight:
+#
+# saturday night may 31st at midnight (which in french is to be
+# intrepreted as the night between saturday and sunday)
+# sunday night the 28th at midnight
+#
+# Seeing that the 28th is monday, I am guessing that she intends to say
+# the midnight of the 28th which is the midnight between sunday and
+# monday, which jives with other sources that say that it's inclusive
+# june1st to sept 27th.
+#
+# The decision was taken by decree *2-08-224 *but I can't find the decree
+# published on the web.
+#
+# It's also confirmed here:
+# <a href="http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm">
+# http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
+# </a>
+# on a government portal as being between june 1st and sept 27th (not yet
+# posted in english).
+#
+# The following google query will generate many relevant hits:
+# <a href="http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search">
+# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
+# </a>
+
+# From Steffen Thorsen (2008-08-27):
+# Morocco will change the clocks back on the midnight between August 31
+# and September 1. They originally planned to observe DST to near the end
+# of September:
+#
+# One article about it (in French):
+# <a href="http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default">
+# http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
+# </a>
+#
+# We have some further details posted here:
+# <a href="http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html">
+# http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
+# </a>
+
+# From Steffen Thorsen (2009-03-17):
+# Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
+# to many sources, such as
+# <a href="http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html">
+# http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
+# </a>
+# <a href="http://www.medi1sat.ma/fr/depeche.aspx?idp=2312">
+# http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
+# </a>
+# (French)
+#
+# Our summary:
+# <a href="http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html">
+# http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
+# </a>
+
+# From Alexander Krivenyshev (2009-03-17):
+# Here is a link to official document from Royaume du Maroc Premier Ministre,
+# Ministere de la Modernisation des Secteurs Publics
+#
+# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
+# concerning the amendment of the legal time, the Ministry of Modernization of
+# Public Sectors announced that the official time in the Kingdom will be
+# advanced 60 minutes from Sunday 31 May 2009 at midnight.
+#
+# <a href="http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf">
+# http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
+# </a>
+#
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_morocco03.html">
+# http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
+# </a>
+
+# From Steffen Thorsen (2010-04-13):
+# Several news media in Morocco report that the Ministry of Modernization
+# of Public Sectors has announced that Morocco will have DST from
+# 2010-05-02 to 2010-08-08.
+#
+# Example:
+# <a href="http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html">
+# http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
+# </a>
+# (French)
+# Our page:
+# <a href="http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html">
+# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
+# </a>
+
+# From Dan Abitol (2011-03-30):
+# ...Rules for Africa/Casablanca are the following (24h format)
+# The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00
+# The 31th july 2011 at 00:59:59, [it] will be 31th July 00:00:00
+# ...Official links of change in morocco
+# The change was broadcast on the FM Radio
+# I ve called ANRT (telecom regulations in Morocco) at
+# +212.537.71.84.00
+# <a href="http://www.anrt.net.ma/fr/">
+# http://www.anrt.net.ma/fr/
+# </a>
+# They said that
+# <a href="http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view">
+# http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
+# </a>
+# is the official publication to look at.
+# They said that the decision was already taken.
+#
+# More articles in the press
+# <a href="http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev">
+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
+# </a>
+# e.html
+# <a href="http://www.lematin.ma/Actualite/Express/Article.asp?id=148923">
+# http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
+# </a>
+# <a href="http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim">
+# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
+# anche-prochain-5538.html
+# </a>
+
+# From Petr Machata (2011-03-30):
+# They have it written in English here:
+# <a href="http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view">
+# http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
+# </a>
+#
+# It says there that "Morocco will resume its standard time on July 31,
+# 2011 at midnight." Now they don't say whether they mean midnight of
+# wall clock time (i.e. 11pm UTC), but that's what I would assume. It has
+# also been like that in the past.
+
+# From Alexander Krivenyshev (2012-03-09):
+# According to Infomédiaire web site from Morocco (infomediaire.ma),
+# on March 9, 2012, (in French) Heure légale:
+# Le Maroc adopte officiellement l'heure d'été
+# <a href="http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9">
+# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
+# </a>
+# Governing Council adopted draft decree, that Morocco DST starts on
+# the last Sunday of March (March 25, 2012) and ends on
+# last Sunday of September (September 30, 2012)
+# except the month of Ramadan.
+# or (brief)
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_morocco06.html">
+# http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
+# </a>
+
+# From Arthur David Olson (2012-03-10):
+# The infomediaire.ma source indicates that the system is to be in
+# effect every year. It gives 03H00 as the "fall back" time of day;
+# it lacks a "spring forward" time of day; assume 2:00 XXX.
+# Wait on specifying the Ramadan exception for details about
+# start date, start time of day, end date, and end time of day XXX.
+
+# From Christophe Tropamer (2012-03-16):
+# Seen Morocco change again:
+# <a href="http://www.le2uminutes.com/actualite.php">
+# http://www.le2uminutes.com/actualite.php
+# </a>
+# "...à partir du dernier dimance d'avril et non fins mars,
+# comme annoncé précédemment."
+
+# From Milamber Space Network (2012-07-17):
+# The official return to GMT is announced by the Moroccan government:
+# <a href="http://www.mmsp.gov.ma/fr/actualites.aspx?id=288">
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
+# </a>
+#
+# Google translation, lightly edited:
+# Back to the standard time of the Kingdom (GMT)
+# Pursuant to Decree No. 2-12-126 issued on 26 Jumada (I) 1433 (April 18,
+# 2012) and in accordance with the order of Mr. President of the
+# Government No. 3-47-12 issued on 24 Sha'ban (11 July 2012), the Ministry
+# of Public Service and Administration Modernization announces the return
+# of the legal time of the Kingdom (GMT) from Friday, July 20, 2012 until
+# Monday, August 20, 2012. So the time will be delayed by 60 minutes from
+# 3:00 am Friday, July 20, 2012 and will again be advanced by 60 minutes
+# August 20, 2012 from 2:00 am.
+
+# From Paul Eggert (2013-03-06):
+# Morocco's daylight-saving transitions due to Ramadan seem to be
+# announced a bit in advance. On 2012-07-11 the Moroccan government
+# announced that year's Ramadan daylight-saving transitions would be
+# 2012-07-20 and 2012-08-20; see
+# <http://www.mmsp.gov.ma/fr/actualites.aspx?id=288>.
+
+# From Andrew Paprocki (2013-07-02):
+# Morocco announced that the year's Ramadan daylight-savings
+# transitions would be 2013-07-07 and 2013-08-10; see:
+# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10
+
+# From Steffen Thorsen (2013-09-28):
+# Morocco extends DST by one month, on very short notice, just 1 day
+# before it was going to end. There is a new decree (2.13.781) for
+# this, where DST from now on goes from last Sunday of March at 02:00
+# to last Sunday of October at 03:00, similar to EU rules. Official
+# source (French):
+# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013
+# Another source (specifying the time for start and end in the decree):
+# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
+
+# From Paul Eggert (2013-10-03):
+# To estimate what the Moroccan government will do in future years,
+# transition dates for 2014 through 2038 were determined by running
+# the following program under GNU Emacs 24.3:
+#
+# (let ((islamic-year 1435))
+# (while (< islamic-year 1461)
+# (let ((a
+# (calendar-gregorian-from-absolute
+# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
+# (b
+# (calendar-gregorian-from-absolute
+# (calendar-islamic-to-absolute (list 10 1 islamic-year)))))
+# (insert
+# (format
+# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n"
+# "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n")
+# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+# (setq islamic-year (+ 1 islamic-year))))
+#
+# with spring-forward transitions removed for 2023-2025, when the
+# normal spring-forward date falls during the estimated Ramadan; with
+# all transitions removed for 2026-2035, where the estimated Ramadan
+# falls entirely outside daylight-saving time; and with fall-back
+# transitions removed for 2036-2037, where the normal fall-back
+# date falls during the estimated Ramadan. Normally, the table would
+# stop after 2037 because 32-bit time_t values roll around early in 2038,
+# but that would imply a prediction of perpetual DST after March 2038
+# due to the year-2037 glitches. So, this table instead stops after
+# 2038, the first non-glitchy year after the 32-bit rollover.
+# An advantage of stopping after 2038 is that it lets zic guess
+# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
+
+# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+
+Rule Morocco 1939 only - Sep 12 0:00 1:00 S
+Rule Morocco 1939 only - Nov 19 0:00 0 -
+Rule Morocco 1940 only - Feb 25 0:00 1:00 S
+Rule Morocco 1945 only - Nov 18 0:00 0 -
+Rule Morocco 1950 only - Jun 11 0:00 1:00 S
+Rule Morocco 1950 only - Oct 29 0:00 0 -
+Rule Morocco 1967 only - Jun 3 12:00 1:00 S
+Rule Morocco 1967 only - Oct 1 0:00 0 -
+Rule Morocco 1974 only - Jun 24 0:00 1:00 S
+Rule Morocco 1974 only - Sep 1 0:00 0 -
+Rule Morocco 1976 1977 - May 1 0:00 1:00 S
+Rule Morocco 1976 only - Aug 1 0:00 0 -
+Rule Morocco 1977 only - Sep 28 0:00 0 -
+Rule Morocco 1978 only - Jun 1 0:00 1:00 S
+Rule Morocco 1978 only - Aug 4 0:00 0 -
+Rule Morocco 2008 only - Jun 1 0:00 1:00 S
+Rule Morocco 2008 only - Sep 1 0:00 0 -
+Rule Morocco 2009 only - Jun 1 0:00 1:00 S
+Rule Morocco 2009 only - Aug 21 0:00 0 -
+Rule Morocco 2010 only - May 2 0:00 1:00 S
+Rule Morocco 2010 only - Aug 8 0:00 0 -
+Rule Morocco 2011 only - Apr 3 0:00 1:00 S
+Rule Morocco 2011 only - Jul 31 0 0 -
+Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S
+Rule Morocco 2012 only - Sep 30 3:00 0 -
+Rule Morocco 2012 only - Jul 20 3:00 0 -
+Rule Morocco 2012 only - Aug 20 2:00 1:00 S
+Rule Morocco 2013 only - Jul 7 3:00 0 -
+Rule Morocco 2013 only - Aug 10 2:00 1:00 S
+Rule Morocco 2013 2035 - Oct lastSun 3:00 0 -
+Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
+Rule Morocco 2014 only - Jun 29 3:00 0 -
+Rule Morocco 2014 only - Jul 29 2:00 1:00 S
+Rule Morocco 2015 only - Jun 18 3:00 0 -
+Rule Morocco 2015 only - Jul 18 2:00 1:00 S
+Rule Morocco 2016 only - Jun 7 3:00 0 -
+Rule Morocco 2016 only - Jul 7 2:00 1:00 S
+Rule Morocco 2017 only - May 27 3:00 0 -
+Rule Morocco 2017 only - Jun 26 2:00 1:00 S
+Rule Morocco 2018 only - May 16 3:00 0 -
+Rule Morocco 2018 only - Jun 15 2:00 1:00 S
+Rule Morocco 2019 only - May 6 3:00 0 -
+Rule Morocco 2019 only - Jun 5 2:00 1:00 S
+Rule Morocco 2020 only - Apr 24 3:00 0 -
+Rule Morocco 2020 only - May 24 2:00 1:00 S
+Rule Morocco 2021 only - Apr 13 3:00 0 -
+Rule Morocco 2021 only - May 13 2:00 1:00 S
+Rule Morocco 2022 only - Apr 3 3:00 0 -
+Rule Morocco 2022 only - May 3 2:00 1:00 S
+Rule Morocco 2023 only - Apr 22 2:00 1:00 S
+Rule Morocco 2024 only - Apr 10 2:00 1:00 S
+Rule Morocco 2025 only - Mar 31 2:00 1:00 S
+Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
+Rule Morocco 2036 only - Oct 21 3:00 0 -
+Rule Morocco 2037 only - Oct 11 3:00 0 -
+Rule Morocco 2038 only - Sep 30 3:00 0 -
+Rule Morocco 2038 only - Oct 30 2:00 1:00 S
+Rule Morocco 2038 max - Oct lastSun 3:00 0 -
+
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
+ 0:00 Morocco WE%sT 1984 Mar 16
+ 1:00 - CET 1986
+ 0:00 Morocco WE%sT
+
+# Western Sahara
+#
+# From Gwillim Law (2013-10-22):
+# A correspondent who is usually well informed about time zone matters
+# ... says that Western Sahara observes daylight saving time, just as
+# Morocco does.
+#
+# From Paul Eggert (2013-10-23):
+# Assume that this has been true since Western Sahara switched to GMT,
+# since most of it was then controlled by Morocco.
+
+Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
+ -1:00 - WAT 1976 Apr 14
+ 0:00 Morocco WE%sT
+
+# Mozambique
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Maputo 2:10:20 - LMT 1903 Mar
+ 2:00 - CAT
+
+# Namibia
+# The 1994-04-03 transition is from Shanks & Pottenger.
+# Shanks & Pottenger report no DST after 1998-04; go with IATA.
+
+# From Petronella Sibeene (2007-03-30) in
+# <http://allafrica.com/stories/200703300178.html>:
+# While the entire country changes its time, Katima Mulilo and other
+# settlements in Caprivi unofficially will not because the sun there
+# rises and sets earlier compared to other regions. Chief of
+# Forecasting Riaan van Zyl explained that the far eastern parts of
+# the country are close to 40 minutes earlier in sunrise than the rest
+# of the country.
+#
+# From Paul Eggert (2007-03-31):
+# Apparently the Caprivi Strip informally observes Botswana time, but
+# we have no details. In the meantime people there can use Africa/Gaborone.
+
+# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Namibia 1994 max - Sep Sun>=1 2:00 1:00 S
+Rule Namibia 1995 max - Apr Sun>=1 2:00 0 -
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
+ 1:30 - SWAT 1903 Mar # SW Africa Time
+ 2:00 - SAST 1942 Sep 20 2:00
+ 2:00 1:00 SAST 1943 Mar 21 2:00
+ 2:00 - SAST 1990 Mar 21 # independence
+ 2:00 - CAT 1994 Apr 3
+ 1:00 Namibia WA%sT
+
+# Niger
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Niamey 0:08:28 - LMT 1912
+ -1:00 - WAT 1934 Feb 26
+ 0:00 - GMT 1960
+ 1:00 - WAT
+
+# Nigeria
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Lagos 0:13:36 - LMT 1919 Sep
+ 1:00 - WAT
+
+# Reunion
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis
+ 4:00 - RET # Reunion Time
+#
+# Scattered Islands (Iles Eparses) administered from Reunion are as follows.
+# The following information about them is taken from
+# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
+# no longer available as of 1999-08-17).
+# We have no info about their time zone histories.
+#
+# Bassas da India - uninhabited
+# Europa Island - inhabited from 1905 to 1910 by two families
+# Glorioso Is - inhabited until at least 1958
+# Juan de Nova - uninhabited
+# Tromelin - inhabited until at least 1958
+
+# Rwanda
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Kigali 2:00:16 - LMT 1935 Jun
+ 2:00 - CAT
+
+# St Helena
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Atlantic/St_Helena -0:22:48 - LMT 1890 # Jamestown
+ -0:22:48 - JMT 1951 # Jamestown Mean Time
+ 0:00 - GMT
+# The other parts of the St Helena territory are similar:
+# Tristan da Cunha: on GMT, say Whitman and the CIA
+# Ascension: on GMT, says usno1995 and the CIA
+# Gough (scientific station since 1955; sealers wintered previously):
+# on GMT, says the CIA
+# Inaccessible, Nightingale: no information, but probably GMT
+
+# Sao Tome and Principe
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Sao_Tome 0:26:56 - LMT 1884
+ -0:36:32 - LMT 1912 # Lisbon Mean Time
+ 0:00 - GMT
+
+# Senegal
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Dakar -1:09:44 - LMT 1912
+ -1:00 - WAT 1941 Jun
+ 0:00 - GMT
+
+# Seychelles
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria
+ 4:00 - SCT # Seychelles Time
+# From Paul Eggert (2001-05-30):
+# Aldabra, Farquhar, and Desroches, originally dependencies of the
+# Seychelles, were transferred to the British Indian Ocean Territory
+# in 1965 and returned to Seychelles control in 1976. We don't know
+# whether this affected their time zone, so omit this for now.
+# Possibly the islands were uninhabited.
+
+# Sierra Leone
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
+Rule SL 1935 1942 - Jun 1 0:00 0:40 SLST
+Rule SL 1935 1942 - Oct 1 0:00 0 WAT
+Rule SL 1957 1962 - Jun 1 0:00 1:00 SLST
+Rule SL 1957 1962 - Sep 1 0:00 0 GMT
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Freetown -0:53:00 - LMT 1882
+ -0:53:00 - FMT 1913 Jun # Freetown Mean Time
+ -1:00 SL %s 1957
+ 0:00 SL %s
+
+# Somalia
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Mogadishu 3:01:28 - LMT 1893 Nov
+ 3:00 - EAT 1931
+ 2:30 - BEAT 1957
+ 3:00 - EAT
+
+# South Africa
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 -
+Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
+ 1:30 - SAST 1903 Mar
+ 2:00 SA SAST
+# Marion and Prince Edward Is
+# scientific station since 1947
+# no information
+
+# Sudan
+#
+# From <a href="http://www.sunanews.net/sn13jane.html">
+# Sudan News Agency (2000-01-13)
+# </a>, also reported by Michael De Beukelaer-Dossche via Steffen Thorsen:
+# Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
+# Saturday.... This was announced Thursday by Caretaker State Minister for
+# Manpower Abdul-Rahman Nur-Eddin.
+#
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Sudan 1970 only - May 1 0:00 1:00 S
+Rule Sudan 1970 1985 - Oct 15 0:00 0 -
+Rule Sudan 1971 only - Apr 30 0:00 1:00 S
+Rule Sudan 1972 1985 - Apr lastSun 0:00 1:00 S
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Khartoum 2:10:08 - LMT 1931
+ 2:00 Sudan CA%sT 2000 Jan 15 12:00
+ 3:00 - EAT
+
+# South Sudan
+Link Africa/Khartoum Africa/Juba
+
+# Swaziland
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar
+ 2:00 - SAST
+
+# Tanzania
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Dar_es_Salaam 2:37:08 - LMT 1931
+ 3:00 - EAT 1948
+ 2:45 - BEAUT 1961
+ 3:00 - EAT
+
+# Togo
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Lome 0:04:52 - LMT 1893
+ 0:00 - GMT
+
+# Tunisia
+
+# From Gwillim Law (2005-04-30):
+# My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
+# this time in Tunisia. According to Yahoo France News
+# <http://fr.news.yahoo.com/050426/5/4dumk.html>, in a story attributed to AP
+# and dated 2005-04-26, "Tunisia has decided to advance its official time by
+# one hour, starting on Sunday, May 1. Henceforth, Tunisian time will be
+# UTC+2 instead of UTC+1. The change will take place at 23:00 UTC next
+# Saturday." (My translation)
+#
+# From Oscar van Vlijmen (2005-05-02):
+# LaPresse, the first national daily newspaper ...
+# <http://www.lapresse.tn/archives/archives280405/actualites/lheure.html>
+# ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
+# 1h standard time.
+#
+# From Atef Loukil (2006-03-28):
+# The daylight saving time will be the same each year:
+# Beginning : the last Sunday of March at 02:00
+# Ending : the last Sunday of October at 03:00 ...
+# http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=1188&Itemid=50
+
+# From Steffen Thorsen (2009-03-16):
+# According to several news sources, Tunisia will not observe DST this year.
+# (Arabic)
+# <a href="http://www.elbashayer.com/?page=viewn&nid=42546">
+# http://www.elbashayer.com/?page=viewn&nid=42546
+# </a>
+# <a href="http://www.babnet.net/kiwidetail-15295.asp">
+# http://www.babnet.net/kiwidetail-15295.asp
+# </a>
+#
+# We have also confirmed this with the US embassy in Tunisia.
+# We have a wrap-up about this on the following page:
+# <a href="http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html">
+# http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
+# </a>
+
+# From Alexander Krivenyshev (2009-03-17):
+# Here is a link to Tunis Afrique Presse News Agency
+#
+# Standard time to be kept the whole year long (tap.info.tn):
+#
+# (in English)
+# <a href="http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157">
+# http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
+# </a>
+#
+# (in Arabic)
+# <a href="http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1">
+# http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
+# </a>
+
+# From Arthur David Olson (2009--3-18):
+# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
+# that the fasting month of ramadan coincides with the period concerned by summer time.
+# Therefore, the standard time will be kept unchanged the whole year long."
+# So foregoing DST seems to be an exception (albeit one that may be repeated in the future).
+
+# From Alexander Krivenyshev (2010-03-27):
+# According to some news reports Tunis confirmed not to use DST in 2010
+#
+# (translation):
+# "The Tunisian government has decided to abandon DST, which was scheduled on
+# Sunday...
+# Tunisian authorities had suspended the DST for the first time last year also
+# coincided with the month of Ramadan..."
+#
+# (in Arabic)
+# <a href="http://www.moheet.com/show_news.aspx?nid=358861&pg=1">
+# http://www.moheet.com/show_news.aspx?nid=358861&pg=1
+# <a href="http://www.almadenahnews.com/newss/news.php?c=118&id=38036">
+# http://www.almadenahnews.com/newss/news.php?c=118&id=38036
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_tunis02.html">
+# http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Tunisia 1939 only - Apr 15 23:00s 1:00 S
+Rule Tunisia 1939 only - Nov 18 23:00s 0 -
+Rule Tunisia 1940 only - Feb 25 23:00s 1:00 S
+Rule Tunisia 1941 only - Oct 6 0:00 0 -
+Rule Tunisia 1942 only - Mar 9 0:00 1:00 S
+Rule Tunisia 1942 only - Nov 2 3:00 0 -
+Rule Tunisia 1943 only - Mar 29 2:00 1:00 S
+Rule Tunisia 1943 only - Apr 17 2:00 0 -
+Rule Tunisia 1943 only - Apr 25 2:00 1:00 S
+Rule Tunisia 1943 only - Oct 4 2:00 0 -
+Rule Tunisia 1944 1945 - Apr Mon>=1 2:00 1:00 S
+Rule Tunisia 1944 only - Oct 8 0:00 0 -
+Rule Tunisia 1945 only - Sep 16 0:00 0 -
+Rule Tunisia 1977 only - Apr 30 0:00s 1:00 S
+Rule Tunisia 1977 only - Sep 24 0:00s 0 -
+Rule Tunisia 1978 only - May 1 0:00s 1:00 S
+Rule Tunisia 1978 only - Oct 1 0:00s 0 -
+Rule Tunisia 1988 only - Jun 1 0:00s 1:00 S
+Rule Tunisia 1988 1990 - Sep lastSun 0:00s 0 -
+Rule Tunisia 1989 only - Mar 26 0:00s 1:00 S
+Rule Tunisia 1990 only - May 1 0:00s 1:00 S
+Rule Tunisia 2005 only - May 1 0:00s 1:00 S
+Rule Tunisia 2005 only - Sep 30 1:00s 0 -
+Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S
+Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 -
+
+# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+# more precise 0:09:21.
+# Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
+ 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
+ 1:00 Tunisia CE%sT
+
+# Uganda
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Kampala 2:09:40 - LMT 1928 Jul
+ 3:00 - EAT 1930
+ 2:30 - BEAT 1948
+ 2:45 - BEAUT 1957
+ 3:00 - EAT
+
+# Zambia
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Lusaka 1:53:08 - LMT 1903 Mar
+ 2:00 - CAT
+
+# Zimbabwe
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Harare 2:04:12 - LMT 1903 Mar
+ 2:00 - CAT
diff --git a/jdk/make/sun/javazic/tzdata/antarctica b/jdk/make/data/tzdata/antarctica
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/antarctica
rename to jdk/make/data/tzdata/antarctica
diff --git a/jdk/make/sun/javazic/tzdata/asia b/jdk/make/data/tzdata/asia
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/asia
rename to jdk/make/data/tzdata/asia
diff --git a/jdk/make/sun/javazic/tzdata/australasia b/jdk/make/data/tzdata/australasia
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/australasia
rename to jdk/make/data/tzdata/australasia
diff --git a/jdk/make/sun/javazic/tzdata/backward b/jdk/make/data/tzdata/backward
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/backward
rename to jdk/make/data/tzdata/backward
diff --git a/jdk/make/sun/javazic/tzdata/etcetera b/jdk/make/data/tzdata/etcetera
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/etcetera
rename to jdk/make/data/tzdata/etcetera
diff --git a/jdk/make/sun/javazic/tzdata/europe b/jdk/make/data/tzdata/europe
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/europe
rename to jdk/make/data/tzdata/europe
diff --git a/jdk/make/sun/javazic/tzdata/factory b/jdk/make/data/tzdata/factory
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/factory
rename to jdk/make/data/tzdata/factory
diff --git a/jdk/make/sun/javazic/tzdata/gmt b/jdk/make/data/tzdata/gmt
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/gmt
rename to jdk/make/data/tzdata/gmt
diff --git a/jdk/make/sun/javazic/tzdata/iso3166.tab b/jdk/make/data/tzdata/iso3166.tab
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/iso3166.tab
rename to jdk/make/data/tzdata/iso3166.tab
diff --git a/jdk/make/sun/javazic/tzdata/jdk11_backward b/jdk/make/data/tzdata/jdk11_backward
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/jdk11_backward
rename to jdk/make/data/tzdata/jdk11_backward
diff --git a/jdk/make/sun/javazic/tzdata/leapseconds b/jdk/make/data/tzdata/leapseconds
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/leapseconds
rename to jdk/make/data/tzdata/leapseconds
diff --git a/jdk/make/sun/javazic/tzdata/northamerica b/jdk/make/data/tzdata/northamerica
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/northamerica
rename to jdk/make/data/tzdata/northamerica
diff --git a/jdk/make/sun/javazic/tzdata/pacificnew b/jdk/make/data/tzdata/pacificnew
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/pacificnew
rename to jdk/make/data/tzdata/pacificnew
diff --git a/jdk/make/sun/javazic/tzdata/solar87 b/jdk/make/data/tzdata/solar87
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/solar87
rename to jdk/make/data/tzdata/solar87
diff --git a/jdk/make/sun/javazic/tzdata/solar88 b/jdk/make/data/tzdata/solar88
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/solar88
rename to jdk/make/data/tzdata/solar88
diff --git a/jdk/make/sun/javazic/tzdata/solar89 b/jdk/make/data/tzdata/solar89
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/solar89
rename to jdk/make/data/tzdata/solar89
diff --git a/jdk/make/data/tzdata/southamerica b/jdk/make/data/tzdata/southamerica
new file mode 100644
index 0000000..071f890
--- /dev/null
+++ b/jdk/make/data/tzdata/southamerica
@@ -0,0 +1,1796 @@
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+
+# This data is by no means authoritative; if you think you know better,
+# go ahead and edit the file (and please send any changes to
+# tz@iana.org for general use in the future).
+
+# From Paul Eggert (2006-03-22):
+# A good source for time zone historical data outside the U.S. is
+# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+# San Diego: ACS Publications, Inc. (2003).
+#
+# For data circa 1899, a common source is:
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+# <http://www.jstor.org/stable/1774359>.
+#
+# Gwillim Law writes that a good source
+# for recent time zone data is the International Air Transport
+# Association's Standard Schedules Information Manual (IATA SSIM),
+# published semiannually. Law sent in several helpful summaries
+# of the IATA's data after 1990.
+#
+# Except where otherwise noted, Shanks & Pottenger is the source for
+# entries through 1990, and IATA SSIM is the source for entries afterwards.
+#
+# Earlier editions of these tables used the North American style (e.g. ARST and
+# ARDT for Argentine Standard and Daylight Time), but the following quote
+# suggests that it's better to use European style (e.g. ART and ARST).
+# I suggest the use of _Summer time_ instead of the more cumbersome
+# _daylight-saving time_. _Summer time_ seems to be in general use
+# in Europe and South America.
+# -- E O Cutler, _New York Times_ (1937-02-14), quoted in
+# H L Mencken, _The American Language: Supplement I_ (1960), p 466
+#
+# Earlier editions of these tables also used the North American style
+# for time zones in Brazil, but this was incorrect, as Brazilians say
+# "summer time". Reinaldo Goulart, a Sao Paulo businessman active in
+# the railroad sector, writes (1999-07-06):
+# The subject of time zones is currently a matter of discussion/debate in
+# Brazil. Let's say that "the Brasilia time" is considered the
+# "official time" because Brasilia is the capital city.
+# The other three time zones are called "Brasilia time "minus one" or
+# "plus one" or "plus two". As far as I know there is no such
+# name/designation as "Eastern Time" or "Central Time".
+# So I invented the following (English-language) abbreviations for now.
+# Corrections are welcome!
+# std dst
+# -2:00 FNT FNST Fernando de Noronha
+# -3:00 BRT BRST Brasilia
+# -4:00 AMT AMST Amazon
+# -5:00 ACT ACST Acre
+
+###############################################################################
+
+###############################################################################
+
+# Argentina
+
+# From Bob Devine (1988-01-28):
+# Argentina: first Sunday in October to first Sunday in April since 1976.
+# Double Summer time from 1969 to 1974. Switches at midnight.
+
+# From U. S. Naval Observatory (1988-01-199):
+# ARGENTINA 3 H BEHIND UTC
+
+# From Hernan G. Otero (1995-06-26):
+# I am sending modifications to the Argentine time zone table...
+# AR was chosen because they are the ISO letters that represent Argentina.
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Arg 1930 only - Dec 1 0:00 1:00 S
+Rule Arg 1931 only - Apr 1 0:00 0 -
+Rule Arg 1931 only - Oct 15 0:00 1:00 S
+Rule Arg 1932 1940 - Mar 1 0:00 0 -
+Rule Arg 1932 1939 - Nov 1 0:00 1:00 S
+Rule Arg 1940 only - Jul 1 0:00 1:00 S
+Rule Arg 1941 only - Jun 15 0:00 0 -
+Rule Arg 1941 only - Oct 15 0:00 1:00 S
+Rule Arg 1943 only - Aug 1 0:00 0 -
+Rule Arg 1943 only - Oct 15 0:00 1:00 S
+Rule Arg 1946 only - Mar 1 0:00 0 -
+Rule Arg 1946 only - Oct 1 0:00 1:00 S
+Rule Arg 1963 only - Oct 1 0:00 0 -
+Rule Arg 1963 only - Dec 15 0:00 1:00 S
+Rule Arg 1964 1966 - Mar 1 0:00 0 -
+Rule Arg 1964 1966 - Oct 15 0:00 1:00 S
+Rule Arg 1967 only - Apr 2 0:00 0 -
+Rule Arg 1967 1968 - Oct Sun>=1 0:00 1:00 S
+Rule Arg 1968 1969 - Apr Sun>=1 0:00 0 -
+Rule Arg 1974 only - Jan 23 0:00 1:00 S
+Rule Arg 1974 only - May 1 0:00 0 -
+Rule Arg 1988 only - Dec 1 0:00 1:00 S
+#
+# From Hernan G. Otero (1995-06-26):
+# These corrections were contributed by InterSoft Argentina S.A.,
+# obtaining the data from the:
+# Talleres de Hidrografia Naval Argentina
+# (Argentine Naval Hydrography Institute)
+Rule Arg 1989 1993 - Mar Sun>=1 0:00 0 -
+Rule Arg 1989 1992 - Oct Sun>=15 0:00 1:00 S
+#
+# From Hernan G. Otero (1995-06-26):
+# From this moment on, the law that mandated the daylight saving
+# time corrections was derogated and no more modifications
+# to the time zones (for daylight saving) are now made.
+#
+# From Rives McDow (2000-01-10):
+# On October 3, 1999, 0:00 local, Argentina implemented daylight savings time,
+# which did not result in the switch of a time zone, as they stayed 9 hours
+# from the International Date Line.
+Rule Arg 1999 only - Oct Sun>=1 0:00 1:00 S
+# From Paul Eggert (2007-12-28):
+# DST was set to expire on March 5, not March 3, but since it was converted
+# to standard time on March 3 it's more convenient for us to pretend that
+# it ended on March 3.
+Rule Arg 2000 only - Mar 3 0:00 0 -
+#
+# From Peter Gradelski via Steffen Thorsen (2000-03-01):
+# We just checked with our Sao Paulo office and they say the government of
+# Argentina decided not to become one of the countries that go on or off DST.
+# So Buenos Aires should be -3 hours from GMT at all times.
+#
+# From Fabian L. Arce Jofre (2000-04-04):
+# The law that claimed DST for Argentina was derogated by President Fernando
+# de la Rua on March 2, 2000, because it would make people spend more energy
+# in the winter time, rather than less. The change took effect on March 3.
+#
+# From Mariano Absatz (2001-06-06):
+# one of the major newspapers here in Argentina said that the 1999
+# Timezone Law (which never was effectively applied) will (would?) be
+# in effect.... The article is at
+# http://ar.clarin.com/diario/2001-06-06/e-01701.htm
+# ... The Law itself is "Ley No 25155", sanctioned on 1999-08-25, enacted
+# 1999-09-17, and published 1999-09-21. The official publication is at:
+# http://www.boletin.jus.gov.ar/BON/Primera/1999/09-Septiembre/21/PDF/BO21-09-99LEG.PDF
+# Regretfully, you have to subscribe (and pay) for the on-line version....
+#
+# (2001-06-12):
+# the timezone for Argentina will not change next Sunday.
+# Apparently it will do so on Sunday 24th....
+# http://ar.clarin.com/diario/2001-06-12/s-03501.htm
+#
+# (2001-06-25):
+# Last Friday (yes, the last working day before the date of the change), the
+# Senate annulled the 1999 law that introduced the changes later postponed.
+# http://www.clarin.com.ar/diario/2001-06-22/s-03601.htm
+# It remains the vote of the Deputies..., but it will be the same....
+# This kind of things had always been done this way in Argentina.
+# We are still -03:00 all year round in all of the country.
+#
+# From Steffen Thorsen (2007-12-21):
+# A user (Leonardo Chaim) reported that Argentina will adopt DST....
+# all of the country (all Zone-entries) are affected. News reports like
+# http://www.lanacion.com.ar/opinion/nota.asp?nota_id=973037 indicate
+# that Argentina will use DST next year as well, from October to
+# March, although exact rules are not given.
+#
+# From Jesper Norgaard Welen (2007-12-26)
+# The last hurdle of Argentina DST is over, the proposal was approved in
+# the lower chamber too (Deputados) with a vote 192 for and 2 against.
+# By the way thanks to Mariano Absatz and Daniel Mario Vega for the link to
+# the original scanned proposal, where the dates and the zero hours are
+# clear and unambiguous...This is the article about final approval:
+# <a href="http://www.lanacion.com.ar/politica/nota.asp?nota_id=973996">
+# http://www.lanacion.com.ar/politica/nota.asp?nota_id=973996
+# </a>
+#
+# From Paul Eggert (2007-12-22):
+# For dates after mid-2008, the following rules are my guesses and
+# are quite possibly wrong, but are more likely than no DST at all.
+
+# From Alexander Krivenyshev (2008-09-05):
+# As per message from Carlos Alberto Fonseca Arauz (Nicaragua),
+# Argentina will start DST on Sunday October 19, 2008.
+#
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_argentina03.html">
+# http://www.worldtimezone.com/dst_news/dst_news_argentina03.html
+# </a>
+# OR
+# <a href="http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)">
+# http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
+# </a>
+
+# From Rodrigo Severo (2008-10-06):
+# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
+# ...
+# ------- Comment #1 from [jmdocile] 2008-10-06 16:28 0000 -------
+# Hi, there is a problem with timezone-data-2008e and maybe with
+# timezone-data-2008f
+# Argentinian law [Number] 25.155 is no longer valid.
+# <a href="http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm">
+# http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
+# </a>
+# The new one is law [Number] 26.350
+# <a href="http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm">
+# http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
+# </a>
+# So there is no summer time in Argentina for now.
+
+# From Mariano Absatz (2008-10-20):
+# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
+# From 2008-10-19 until 2009-03-15
+# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01">
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
+# </a>
+#
+# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer 2008/2009:
+# Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La Pampa, Neuquen, Rio Negro, Chubut, Santa Cruz
+# and Tierra del Fuego
+# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01">
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
+# </a>
+#
+# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
+# it will not apply DST either (even when it was not included in Decree 1705/2008)
+# <a href="http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc">
+# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+# </a>
+
+# From fullinet (2009-10-18):
+# As announced in
+# <a hef="http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356">
+# http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356
+# </a>
+# (an official .gob.ar) under title: "Sin Cambio de Hora" (english: "No hour change")
+#
+# "Por el momento, el Gobierno Nacional resolvio no modificar la hora
+# oficial, decision que estaba en estudio para su implementacion el
+# domingo 18 de octubre. Desde el Ministerio de Planificacion se anuncio
+# que la Argentina hoy, en estas condiciones meteorologicas, no necesita
+# la modificacion del huso horario, ya que 2009 nos encuentra con
+# crecimiento en la produccion y distribucion energetica."
+
+Rule Arg 2007 only - Dec 30 0:00 1:00 S
+Rule Arg 2008 2009 - Mar Sun>=15 0:00 0 -
+Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
+
+# From Mariano Absatz (2004-05-21):
+# Today it was officially published that the Province of Mendoza is changing
+# its timezone this winter... starting tomorrow night....
+# http://www.gobernac.mendoza.gov.ar/boletin/pdf/20040521-27158-normas.pdf
+# From Paul Eggert (2004-05-24):
+# It's Law No. 7,210. This change is due to a public power emergency, so for
+# now we'll assume it's for this year only.
+#
+# From Paul Eggert (2006-03-22):
+# <a href="http://www.spicasc.net/horvera.html">
+# Hora de verano para la Republica Argentina (2003-06-08)
+# </a> says that standard time in Argentina from 1894-10-31
+# to 1920-05-01 was -4:16:48.25. Go with this more-precise value
+# over Shanks & Pottenger.
+#
+# From Mariano Absatz (2004-06-05):
+# These media articles from a major newspaper mostly cover the current state:
+# http://www.lanacion.com.ar/04/05/27/de_604825.asp
+# http://www.lanacion.com.ar/04/05/28/de_605203.asp
+#
+# The following eight (8) provinces pulled clocks back to UTC-04:00 at
+# midnight Monday May 31st. (that is, the night between 05/31 and 06/01).
+# Apparently, all nine provinces would go back to UTC-03:00 at the same
+# time in October 17th.
+#
+# Catamarca, Chubut, La Rioja, San Juan, San Luis, Santa Cruz,
+# Tierra del Fuego, Tucuman.
+#
+# From Mariano Absatz (2004-06-14):
+# ... this weekend, the Province of Tucuman decided it'd go back to UTC-03:00
+# yesterday midnight (that is, at 24:00 Saturday 12th), since the people's
+# annoyance with the change is much higher than the power savings obtained....
+#
+# From Gwillim Law (2004-06-14):
+# http://www.lanacion.com.ar/04/06/10/de_609078.asp ...
+# "The time change in Tierra del Fuego was a conflicted decision from
+# the start. The government had decreed that the measure would take
+# effect on June 1, but a normative error forced the new time to begin
+# three days earlier, from a Saturday to a Sunday....
+# Our understanding was that the change was originally scheduled to take place
+# on June 1 at 00:00 in Chubut, Santa Cruz, Tierra del Fuego (and some other
+# provinces). Sunday was May 30, only two days earlier. So the article
+# contains a contradiction. I would give more credence to the Saturday/Sunday
+# date than the "three days earlier" phrase, and conclude that Tierra del
+# Fuego set its clocks back at 2004-05-30 00:00.
+#
+# From Steffen Thorsen (2004-10-05):
+# The previous law 7210 which changed the province of Mendoza's time zone
+# back in May have been modified slightly in a new law 7277, which set the
+# new end date to 2004-09-26 (original date was 2004-10-17).
+# http://www.gobernac.mendoza.gov.ar/boletin/pdf/20040924-27244-normas.pdf
+#
+# From Mariano Absatz (2004-10-05):
+# San Juan changed from UTC-03:00 to UTC-04:00 at midnight between
+# Sunday, May 30th and Monday, May 31st. It changed back to UTC-03:00
+# at midnight between Saturday, July 24th and Sunday, July 25th....
+# http://www.sanjuan.gov.ar/prensa/archivo/000329.html
+# http://www.sanjuan.gov.ar/prensa/archivo/000426.html
+# http://www.sanjuan.gov.ar/prensa/archivo/000441.html
+
+# From Alex Krivenyshev (2008-01-17):
+# Here are articles that Argentina Province San Luis is planning to end DST
+# as earlier as upcoming Monday January 21, 2008 or February 2008:
+#
+# Provincia argentina retrasa reloj y marca diferencia con resto del pais
+# (Argentine Province delayed clock and mark difference with the rest of the
+# country)
+# <a href="http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel">
+# http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel
+# </a>
+#
+# Es inminente que en San Luis atrasen una hora los relojes
+# (It is imminent in San Luis clocks one hour delay)
+# <a href="http://www.lagaceta.com.ar/vernotae.asp?id_nota=253414">
+# http://www.lagaceta.com.ar/vernotae.asp?id_nota=253414
+# </a>
+#
+# <a href="http://www.worldtimezone.net/dst_news/dst_news_argentina02.html">
+# http://www.worldtimezone.net/dst_news/dst_news_argentina02.html
+# </a>
+
+# From Jesper Norgaard Welen (2008-01-18):
+# The page of the San Luis provincial government
+# <a href="http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812">
+# http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812
+# </a>
+# confirms what Alex Krivenyshev has earlier sent to the tz
+# emailing list about that San Luis plans to return to standard
+# time much earlier than the rest of the country. It also
+# confirms that upon request the provinces San Juan and Mendoza
+# refused to follow San Luis in this change.
+#
+# The change is supposed to take place Monday the 21.st at 0:00
+# hours. As far as I understand it if this goes ahead, we need
+# a new timezone for San Luis (although there are also documented
+# independent changes in the southamerica file of San Luis in
+# 1990 and 1991 which has not been confirmed).
+
+# From Jesper Norgaard Welen (2008-01-25):
+# Unfortunately the below page has become defunct, about the San Luis
+# time change. Perhaps because it now is part of a group of pages "Most
+# important pages of 2008."
+#
+# You can use
+# <a href="http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834">
+# http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834
+# </a>
+# instead it seems. Or use "Buscador" from the main page of the San Luis
+# government, and fill in "huso" and click OK, and you will get 3 pages
+# from which the first one is identical to the above.
+
+# From Mariano Absatz (2008-01-28):
+# I can confirm that the Province of San Luis (and so far only that
+# province) decided to go back to UTC-3 effective midnight Jan 20th 2008
+# (that is, Monday 21st at 0:00 is the time the clocks were delayed back
+# 1 hour), and they intend to keep UTC-3 as their timezone all year round
+# (that is, unless they change their mind any minute now).
+#
+# So we'll have to add yet another city to 'southamerica' (I think San
+# Luis city is the mos populated city in the Province, so it'd be
+# America/Argentina/San_Luis... of course I can't remember if San Luis's
+# history of particular changes goes along with Mendoza or San Juan :-(
+# (I only remember not being able to collect hard facts about San Luis
+# back in 2004, when these provinces changed to UTC-4 for a few days, I
+# mailed them personally and never got an answer).
+
+# From Paul Eggert (2008-06-30):
+# Unless otherwise specified, data are from Shanks & Pottenger through 1992,
+# from the IATA otherwise. As noted below, Shanks & Pottenger say that
+# America/Cordoba split into 6 subregions during 1991/1992, one of which
+# was America/San_Luis, but we haven't verified this yet so for now we'll
+# keep America/Cordoba a single region rather than splitting it into the
+# other 5 subregions.
+
+# From Mariano Absatz (2009-03-13):
+# Yesterday (with our usual 2-day notice) the Province of San Luis
+# decided that next Sunday instead of "staying" @utc-03:00 they will go
+# to utc-04:00 until the second Saturday in October...
+#
+# The press release is at
+# <a href="http://www.sanluis.gov.ar/SL/Paginas/NoticiaDetalle.asp?TemaId=1&InfoPrensaId=3102">
+# http://www.sanluis.gov.ar/SL/Paginas/NoticiaDetalle.asp?TemaId=1&InfoPrensaId=3102
+# </a>
+# (I couldn't find the decree, but
+# <a href="http://www.sanluis.gov.ar">
+# www.sanluis.gov.ar
+# <a/>
+# is the official page for the Province Government).
+#
+# There's also a note in only one of the major national papers ...
+# http://www.lanacion.com.ar/nota.asp?nota_id=1107912
+#
+# The press release says [quick and dirty translation]:
+# ... announced that next Sunday, at 00:00, Puntanos (the San Luis
+# inhabitants) will have to turn back one hour their clocks
+#
+# Since then, San Luis will establish its own Province timezone. Thus,
+# during 2009, this timezone change will run from 00:00 the third Sunday
+# in March until 24:00 of the second Saturday in October.
+
+# From Mariano Absatz (2009-10-16):
+# ...the Province of San Luis is a case in itself.
+#
+# The Law at
+# <a href="http://www.diputadossanluis.gov.ar/diputadosasp/paginas/verNorma.asp?NormaID=276>"
+# http://www.diputadossanluis.gov.ar/diputadosasp/paginas/verNorma.asp?NormaID=276
+# </a>
+# is ambiguous because establishes a calendar from the 2nd Sunday in
+# October at 0:00 thru the 2nd Saturday in March at 24:00 and the
+# complement of that starting on the 2nd Sunday of March at 0:00 and
+# ending on the 2nd Saturday of March at 24:00.
+#
+# This clearly breaks every time the 1st of March or October is a Sunday.
+#
+# IMHO, the "spirit of the Law" is to make the changes at 0:00 on the 2nd
+# Sunday of October and March.
+#
+# The problem is that the changes in the rest of the Provinces that did
+# change in 2007/2008, were made according to the Federal Law and Decrees
+# that did so on the 3rd Sunday of October and March.
+#
+# In fact, San Luis actually switched from UTC-4 to UTC-3 last Sunday
+# (October 11th) at 0:00.
+#
+# So I guess a new set of rules, besides "Arg", must be made and the last
+# America/Argentina/San_Luis entries should change to use these...
+#
+# I'm enclosing a patch that does what I say... regretfully, the San Luis
+# timezone must be called "WART/WARST" even when most of the time (like,
+# right now) WARST == ART... that is, since last Sunday, all the country
+# is using UTC-3, but in my patch, San Luis calls it "WARST" and the rest
+# of the country calls it "ART".
+# ...
+
+# From Alexander Krivenyshev (2010-04-09):
+# According to news reports from El Diario de la Republica Province San
+# Luis, Argentina (standard time UTC-04) will keep Daylight Saving Time
+# after April 11, 2010--will continue to have same time as rest of
+# Argentina (UTC-3) (no DST).
+#
+# Confirmaron la prórroga del huso horario de verano (Spanish)
+# <a href="http://www.eldiariodelarepublica.com/index.php?option=com_content&task=view&id=29383&Itemid=9">
+# http://www.eldiariodelarepublica.com/index.php?option=com_content&task=view&id=29383&Itemid=9
+# </a>
+# or (some English translation):
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_argentina08.html">
+# http://www.worldtimezone.com/dst_news/dst_news_argentina08.html
+# </a>
+
+# From Mariano Absatz (2010-04-12):
+# yes...I can confirm this...and given that San Luis keeps calling
+# UTC-03:00 "summer time", we should't just let San Luis go back to "Arg"
+# rules...San Luis is still using "Western ARgentina Time" and it got
+# stuck on Summer daylight savings time even though the summer is over.
+
+# From Paul Eggert (2013-09-05):
+# Perhaps San Luis operates on the legal fiction that it is at UTC-4
+# with perpetual summer time, but ordinary usage typically seems to
+# just say it's at UTC-3; see, for example,
+# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>.
+# We've documented similar situations as being plain changes to
+# standard time, so let's do that here too. This does not change UTC
+# offsets, only tm_isdst and the time zone abbreviations. One minor
+# plus is that this silences a zic complaint that there's no POSIX TZ
+# setting for time stamps past 2038.
+
+# From Paul Eggert (2013-02-21):
+# Milne says Cordoba time was -4:16:48.2. Round to the nearest second.
+
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+#
+# Buenos Aires (BA), Capital Federal (CF),
+Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May # Cordoba Mean Time
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 Arg AR%sT
+#
+# Cordoba (CB), Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN),
+# Chaco (CC), Formosa (FM), Santiago del Estero (SE)
+#
+# Shanks & Pottenger also make the following claims, which we haven't verified:
+# - Formosa switched to -3:00 on 1991-01-07.
+# - Misiones switched to -3:00 on 1990-12-29.
+# - Chaco switched to -3:00 on 1991-01-04.
+# - Santiago del Estero switched to -4:00 on 1991-04-01,
+# then to -3:00 on 1991-04-26.
+#
+Zone America/Argentina/Cordoba -4:16:48 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1991 Mar 3
+ -4:00 - WART 1991 Oct 20
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 Arg AR%sT
+#
+# Salta (SA), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+Zone America/Argentina/Salta -4:21:40 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1991 Mar 3
+ -4:00 - WART 1991 Oct 20
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+#
+# Tucuman (TM)
+Zone America/Argentina/Tucuman -4:20:52 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1991 Mar 3
+ -4:00 - WART 1991 Oct 20
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 Jun 1
+ -4:00 - WART 2004 Jun 13
+ -3:00 Arg AR%sT
+#
+# La Rioja (LR)
+Zone America/Argentina/La_Rioja -4:27:24 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1991 Mar 1
+ -4:00 - WART 1991 May 7
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 Jun 1
+ -4:00 - WART 2004 Jun 20
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+#
+# San Juan (SJ)
+Zone America/Argentina/San_Juan -4:34:04 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1991 Mar 1
+ -4:00 - WART 1991 May 7
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 May 31
+ -4:00 - WART 2004 Jul 25
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+#
+# Jujuy (JY)
+Zone America/Argentina/Jujuy -4:21:12 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1990 Mar 4
+ -4:00 - WART 1990 Oct 28
+ -4:00 1:00 WARST 1991 Mar 17
+ -4:00 - WART 1991 Oct 6
+ -3:00 1:00 ARST 1992
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+#
+# Catamarca (CT), Chubut (CH)
+Zone America/Argentina/Catamarca -4:23:08 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1991 Mar 3
+ -4:00 - WART 1991 Oct 20
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 Jun 1
+ -4:00 - WART 2004 Jun 20
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+#
+# Mendoza (MZ)
+Zone America/Argentina/Mendoza -4:35:16 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1990 Mar 4
+ -4:00 - WART 1990 Oct 15
+ -4:00 1:00 WARST 1991 Mar 1
+ -4:00 - WART 1991 Oct 15
+ -4:00 1:00 WARST 1992 Mar 1
+ -4:00 - WART 1992 Oct 18
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 May 23
+ -4:00 - WART 2004 Sep 26
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+#
+# San Luis (SL)
+
+Rule SanLuis 2008 2009 - Mar Sun>=8 0:00 0 -
+Rule SanLuis 2007 2008 - Oct Sun>=8 0:00 1:00 S
+
+Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1990
+ -3:00 1:00 ARST 1990 Mar 14
+ -4:00 - WART 1990 Oct 15
+ -4:00 1:00 WARST 1991 Mar 1
+ -4:00 - WART 1991 Jun 1
+ -3:00 - ART 1999 Oct 3
+ -4:00 1:00 WARST 2000 Mar 3
+ -3:00 - ART 2004 May 31
+ -4:00 - WART 2004 Jul 25
+ -3:00 Arg AR%sT 2008 Jan 21
+ -4:00 SanLuis WAR%sT 2009 Oct 11
+ -3:00 - ART
+#
+# Santa Cruz (SC)
+Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May # Cordoba Mean Time
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 Jun 1
+ -4:00 - WART 2004 Jun 20
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+#
+# Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
+Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May # Cordoba Mean Time
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 - ART 2004 May 30
+ -4:00 - WART 2004 Jun 20
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+
+# Aruba
+Link America/Curacao America/Aruba
+
+# Bolivia
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/La_Paz -4:32:36 - LMT 1890
+ -4:32:36 - CMT 1931 Oct 15 # Calamarca MT
+ -4:32:36 1:00 BOST 1932 Mar 21 # Bolivia ST
+ -4:00 - BOT # Bolivia Time
+
+# Brazil
+
+# From Paul Eggert (1993-11-18):
+# The mayor of Rio recently attempted to change the time zone rules
+# just in his city, in order to leave more summer time for the tourist trade.
+# The rule change lasted only part of the day;
+# the federal government refused to follow the city's rules, and business
+# was in a chaos, so the mayor backed down that afternoon.
+
+# From IATA SSIM (1996-02):
+# _Only_ the following states in BR1 observe DST: Rio Grande do Sul (RS),
+# Santa Catarina (SC), Parana (PR), Sao Paulo (SP), Rio de Janeiro (RJ),
+# Espirito Santo (ES), Minas Gerais (MG), Bahia (BA), Goias (GO),
+# Distrito Federal (DF), Tocantins (TO), Sergipe [SE] and Alagoas [AL].
+# [The last three states are new to this issue of the IATA SSIM.]
+
+# From Gwillim Law (1996-10-07):
+# Geography, history (Tocantins was part of Goias until 1989), and other
+# sources of time zone information lead me to believe that AL, SE, and TO were
+# always in BR1, and so the only change was whether or not they observed DST....
+# The earliest issue of the SSIM I have is 2/91. Each issue from then until
+# 9/95 says that DST is observed only in the ten states I quoted from 9/95,
+# along with Mato Grosso (MT) and Mato Grosso do Sul (MS), which are in BR2
+# (UTC-4).... The other two time zones given for Brazil are BR3, which is
+# UTC-5, no DST, and applies only in the state of Acre (AC); and BR4, which is
+# UTC-2, and applies to Fernando de Noronha (formerly FN, but I believe it's
+# become part of the state of Pernambuco). The boundary between BR1 and BR2
+# has never been clearly stated. They've simply been called East and West.
+# However, some conclusions can be drawn from another IATA manual: the Airline
+# Coding Directory, which lists close to 400 airports in Brazil. For each
+# airport it gives a time zone which is coded to the SSIM. From that
+# information, I'm led to conclude that the states of Amapa (AP), Ceara (CE),
+# Maranhao (MA), Paraiba (PR), Pernambuco (PE), Piaui (PI), and Rio Grande do
+# Norte (RN), and the eastern part of Para (PA) are all in BR1 without DST.
+
+# From Marcos Tadeu (1998-09-27):
+# <a href="http://pcdsh01.on.br/verao1.html">
+# Brazilian official page
+# </a>
+
+# From Jesper Norgaard (2000-11-03):
+# [For an official list of which regions in Brazil use which time zones, see:]
+# http://pcdsh01.on.br/Fusbr.htm
+# http://pcdsh01.on.br/Fusbrhv.htm
+
+# From Celso Doria via David Madeo (2002-10-09):
+# The reason for the delay this year has to do with elections in Brazil.
+#
+# Unlike in the United States, elections in Brazil are 100% computerized and
+# the results are known almost immediately. Yesterday, it was the first
+# round of the elections when 115 million Brazilians voted for President,
+# Governor, Senators, Federal Deputies, and State Deputies. Nobody is
+# counting (or re-counting) votes anymore and we know there will be a second
+# round for the Presidency and also for some Governors. The 2nd round will
+# take place on October 27th.
+#
+# The reason why the DST will only begin November 3rd is that the thousands
+# of electoral machines used cannot have their time changed, and since the
+# Constitution says the elections must begin at 8:00 AM and end at 5:00 PM,
+# the Government decided to postpone DST, instead of changing the Constitution
+# (maybe, for the next elections, it will be possible to change the clock)...
+
+# From Rodrigo Severo (2004-10-04):
+# It's just the biannual change made necessary by the much hyped, supposedly
+# modern Brazilian eletronic voting machines which, apparently, can't deal
+# with a time change between the first and the second rounds of the elections.
+
+# From Steffen Thorsen (2007-09-20):
+# Brazil will start DST on 2007-10-14 00:00 and end on 2008-02-17 00:00:
+# http://www.mme.gov.br/site/news/detail.do;jsessionid=BBA06811AFCAAC28F0285210913513DA?newsId=13975
+
+# From Paul Schulze (2008-06-24):
+# ...by law number 11.662 of April 24, 2008 (published in the "Diario
+# Oficial da Uniao"...) in Brazil there are changes in the timezones,
+# effective today (00:00am at June 24, 2008) as follows:
+#
+# a) The timezone UTC+5 is e[x]tinguished, with all the Acre state and the
+# part of the Amazonas state that had this timezone now being put to the
+# timezone UTC+4
+# b) The whole Para state now is put at timezone UTC+3, instead of just
+# part of it, as was before.
+#
+# This change follows a proposal of senator Tiao Viana of Acre state, that
+# proposed it due to concerns about open television channels displaying
+# programs inappropriate to youths in the states that had the timezone
+# UTC+5 too early in the night. In the occasion, some more corrections
+# were proposed, trying to unify the timezones of any given state. This
+# change modifies timezone rules defined in decree 2.784 of 18 June,
+# 1913.
+
+# From Rodrigo Severo (2008-06-24):
+# Just correcting the URL:
+# <a href="https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=do&secao=1&pagina=1&data=25/04/2008">
+# https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=do&secao=1&pagina=1&data=25/04/2008
+# </a>
+#
+# As a result of the above Decree I believe the America/Rio_Branco
+# timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall
+# be created to represent the...west side of the Para State. I
+# suggest this new timezone be called Santarem as the most
+# important/populated city in the affected area.
+#
+# This new timezone would be the same as the Rio_Branco timezone up to
+# the 2008/06/24 change which would be to UTC-3 instead of UTC-4.
+
+# From Alex Krivenyshev (2008-06-24):
+# This is a quick reference page for New and Old Brazil Time Zones map.
+# <a href="http://www.worldtimezone.com/brazil-time-new-old.php">
+# http://www.worldtimezone.com/brazil-time-new-old.php
+# </a>
+#
+# - 4 time zones replaced by 3 time zones-eliminating time zone UTC- 05
+# (state Acre and the part of the Amazonas will be UTC/GMT- 04) - western
+# part of Par state is moving to one timezone UTC- 03 (from UTC -04).
+
+# From Paul Eggert (2002-10-10):
+# The official decrees referenced below are mostly taken from
+# <a href="http://pcdsh01.on.br/DecHV.html">
+# Decretos sobre o Horario de Verao no Brasil
+# </a>.
+
+# From Steffen Thorsen (2008-08-29):
+# As announced by the government and many newspapers in Brazil late
+# yesterday, Brazil will start DST on 2008-10-19 (need to change rule) and
+# it will end on 2009-02-15 (current rule for Brazil is fine). Based on
+# past years experience with the elections, there was a good chance that
+# the start was postponed to November, but it did not happen this year.
+#
+# It has not yet been posted to http://pcdsh01.on.br/DecHV.html
+#
+# An official page about it:
+# <a href="http://www.mme.gov.br/site/news/detail.do?newsId=16722">
+# http://www.mme.gov.br/site/news/detail.do?newsId=16722
+# </a>
+# Note that this link does not always work directly, but must be accessed
+# by going to
+# <a href="http://www.mme.gov.br/first">
+# http://www.mme.gov.br/first
+# </a>
+#
+# One example link that works directly:
+# <a href="http://jornale.com.br/index.php?option=com_content&task=view&id=13530&Itemid=54">
+# http://jornale.com.br/index.php?option=com_content&task=view&id=13530&Itemid=54
+# (Portuguese)
+# </a>
+#
+# We have a written a short article about it as well:
+# <a href="http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html">
+# http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
+# </a>
+#
+# From Alexander Krivenyshev (2011-10-04):
+# State Bahia will return to Daylight savings time this year after 8 years off.
+# The announcement was made by Governor Jaques Wagner in an interview to a
+# television station in Salvador.
+
+# In Portuguese:
+# <a href="http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html">
+# http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html
+# </a> and
+# <a href="http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html">
+# http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html
+# </a>
+
+# From Guilherme Bernardes Rodrigues (2011-10-07):
+# There is news in the media, however there is still no decree about it.
+# I just send a e-mail to Zulmira Brandao at
+# <a href="http://pcdsh01.on.br/">http://pcdsh01.on.br/</a> the
+# official agency about time in Brazil, and she confirmed that the old rule is
+# still in force.
+
+# From Guilherme Bernardes Rodrigues (2011-10-14)
+# It's official, the President signed a decree that includes Bahia in summer
+# time.
+# [ and in a second message (same day): ]
+# I found the decree.
+#
+# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
+# Link :
+# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6">
+# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
+# </a>
+
+# From Kelley Cook (2012-10-16):
+# The governor of state of Bahia in Brazil announced on Thursday that
+# due to public pressure, he is reversing the DST policy they implemented
+# last year and will not be going to Summer Time on October 21st....
+# http://www.correio24horas.com.br/r/artigo/apos-pressoes-wagner-suspende-horario-de-verao-na-bahia
+
+# From Rodrigo Severo (2012-10-16):
+# Tocantins state will have DST.
+# http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
+
+# From Steffen Thorsen (2013-09-20):
+# Tocantins in Brazil is very likely not to observe DST from October....
+# http://conexaoto.com.br/2013/09/18/ministerio-confirma-que-tocantins-esta-fora-do-horario-de-verao-em-2013-mas-falta-publicacao-de-decreto
+# We will keep this article updated when this is confirmed:
+# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
+
+# From Steffen Thorsen (2013-10-17):
+# http://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
+# Senator Jorge Viana announced that Acre will change time zone on November 10.
+# He did not specify the time of the change, nor if western parts of Amazonas
+# will change as well.
+#
+# From Paul Eggert (2013-10-17):
+# For now, assume western Amazonas will change as well.
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
+# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
+Rule Brazil 1931 only - Oct 3 11:00 1:00 S
+Rule Brazil 1932 1933 - Apr 1 0:00 0 -
+Rule Brazil 1932 only - Oct 3 0:00 1:00 S
+# Decree <a href="http://pcdsh01.on.br/HV23195.htm">23,195</a> (1933-10-10)
+# revoked DST.
+# Decree <a href="http://pcdsh01.on.br/HV27496.htm">27,496</a> (1949-11-24)
+# Decree <a href="http://pcdsh01.on.br/HV27998.htm">27,998</a> (1950-04-13)
+Rule Brazil 1949 1952 - Dec 1 0:00 1:00 S
+Rule Brazil 1950 only - Apr 16 1:00 0 -
+Rule Brazil 1951 1952 - Apr 1 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/HV32308.htm">32,308</a> (1953-02-24)
+Rule Brazil 1953 only - Mar 1 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/HV34724.htm">34,724</a> (1953-11-30)
+# revoked DST.
+# Decree <a href="http://pcdsh01.on.br/HV52700.htm">52,700</a> (1963-10-18)
+# established DST from 1963-10-23 00:00 to 1964-02-29 00:00
+# in SP, RJ, GB, MG, ES, due to the prolongation of the drought.
+# Decree <a href="http://pcdsh01.on.br/HV53071.htm">53,071</a> (1963-12-03)
+# extended the above decree to all of the national territory on 12-09.
+Rule Brazil 1963 only - Dec 9 0:00 1:00 S
+# Decree <a href="http://pcdsh01.on.br/HV53604.htm">53,604</a> (1964-02-25)
+# extended summer time by one day to 1964-03-01 00:00 (start of school).
+Rule Brazil 1964 only - Mar 1 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/HV55639.htm">55,639</a> (1965-01-27)
+Rule Brazil 1965 only - Jan 31 0:00 1:00 S
+Rule Brazil 1965 only - Mar 31 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/HV57303.htm">57,303</a> (1965-11-22)
+Rule Brazil 1965 only - Dec 1 0:00 1:00 S
+# Decree <a href="http://pcdsh01.on.br/HV57843.htm">57,843</a> (1966-02-18)
+Rule Brazil 1966 1968 - Mar 1 0:00 0 -
+Rule Brazil 1966 1967 - Nov 1 0:00 1:00 S
+# Decree <a href="http://pcdsh01.on.br/HV63429.htm">63,429</a> (1968-10-15)
+# revoked DST.
+# Decree <a href="http://pcdsh01.on.br/HV91698.htm">91,698</a> (1985-09-27)
+Rule Brazil 1985 only - Nov 2 0:00 1:00 S
+# Decree 92,310 (1986-01-21)
+# Decree 92,463 (1986-03-13)
+Rule Brazil 1986 only - Mar 15 0:00 0 -
+# Decree 93,316 (1986-10-01)
+Rule Brazil 1986 only - Oct 25 0:00 1:00 S
+Rule Brazil 1987 only - Feb 14 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/HV94922.htm">94,922</a> (1987-09-22)
+Rule Brazil 1987 only - Oct 25 0:00 1:00 S
+Rule Brazil 1988 only - Feb 7 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/HV96676.htm">96,676</a> (1988-09-12)
+# except for the states of AC, AM, PA, RR, RO, and AP (then a territory)
+Rule Brazil 1988 only - Oct 16 0:00 1:00 S
+Rule Brazil 1989 only - Jan 29 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/HV98077.htm">98,077</a> (1989-08-21)
+# with the same exceptions
+Rule Brazil 1989 only - Oct 15 0:00 1:00 S
+Rule Brazil 1990 only - Feb 11 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/HV99530.htm">99,530</a> (1990-09-17)
+# adopted by RS, SC, PR, SP, RJ, ES, MG, GO, MS, DF.
+# Decree 99,629 (1990-10-19) adds BA, MT.
+Rule Brazil 1990 only - Oct 21 0:00 1:00 S
+Rule Brazil 1991 only - Feb 17 0:00 0 -
+# <a href="http://pcdsh01.on.br/HV1991.htm">Unnumbered decree</a> (1991-09-25)
+# adopted by RS, SC, PR, SP, RJ, ES, MG, BA, GO, MT, MS, DF.
+Rule Brazil 1991 only - Oct 20 0:00 1:00 S
+Rule Brazil 1992 only - Feb 9 0:00 0 -
+# <a href="http://pcdsh01.on.br/HV1992.htm">Unnumbered decree</a> (1992-10-16)
+# adopted by same states.
+Rule Brazil 1992 only - Oct 25 0:00 1:00 S
+Rule Brazil 1993 only - Jan 31 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/HV942.htm">942</a> (1993-09-28)
+# adopted by same states, plus AM.
+# Decree <a href="http://pcdsh01.on.br/HV1252.htm">1,252</a> (1994-09-22;
+# web page corrected 2004-01-07) adopted by same states, minus AM.
+# Decree <a href="http://pcdsh01.on.br/HV1636.htm">1,636</a> (1995-09-14)
+# adopted by same states, plus MT and TO.
+# Decree <a href="http://pcdsh01.on.br/HV1674.htm">1,674</a> (1995-10-13)
+# adds AL, SE.
+Rule Brazil 1993 1995 - Oct Sun>=11 0:00 1:00 S
+Rule Brazil 1994 1995 - Feb Sun>=15 0:00 0 -
+Rule Brazil 1996 only - Feb 11 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/HV2000.htm">2,000</a> (1996-09-04)
+# adopted by same states, minus AL, SE.
+Rule Brazil 1996 only - Oct 6 0:00 1:00 S
+Rule Brazil 1997 only - Feb 16 0:00 0 -
+# From Daniel C. Sobral (1998-02-12):
+# In 1997, the DS began on October 6. The stated reason was that
+# because international television networks ignored Brazil's policy on DS,
+# they bought the wrong times on satellite for coverage of Pope's visit.
+# This year, the ending date of DS was postponed to March 1
+# to help dealing with the shortages of electric power.
+#
+# Decree 2,317 (1997-09-04), adopted by same states.
+Rule Brazil 1997 only - Oct 6 0:00 1:00 S
+# Decree <a href="http://pcdsh01.on.br/figuras/HV2495.JPG">2,495</a>
+# (1998-02-10)
+Rule Brazil 1998 only - Mar 1 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/figuras/Hv98.jpg">2,780</a> (1998-09-11)
+# adopted by the same states as before.
+Rule Brazil 1998 only - Oct 11 0:00 1:00 S
+Rule Brazil 1999 only - Feb 21 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/figuras/HV3150.gif">3,150</a>
+# (1999-08-23) adopted by same states.
+# Decree <a href="http://pcdsh01.on.br/DecHV99.gif">3,188</a> (1999-09-30)
+# adds SE, AL, PB, PE, RN, CE, PI, MA and RR.
+Rule Brazil 1999 only - Oct 3 0:00 1:00 S
+Rule Brazil 2000 only - Feb 27 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/DEC3592.htm">3,592</a> (2000-09-06)
+# adopted by the same states as before.
+# Decree <a href="http://pcdsh01.on.br/Dec3630.jpg">3,630</a> (2000-10-13)
+# repeals DST in PE and RR, effective 2000-10-15 00:00.
+# Decree <a href="http://pcdsh01.on.br/Dec3632.jpg">3,632</a> (2000-10-17)
+# repeals DST in SE, AL, PB, RN, CE, PI and MA, effective 2000-10-22 00:00.
+# Decree <a href="http://pcdsh01.on.br/figuras/HV3916.gif">3,916</a>
+# (2001-09-13) reestablishes DST in AL, CE, MA, PB, PE, PI, RN, SE.
+Rule Brazil 2000 2001 - Oct Sun>=8 0:00 1:00 S
+Rule Brazil 2001 2006 - Feb Sun>=15 0:00 0 -
+# Decree 4,399 (2002-10-01) repeals DST in AL, CE, MA, PB, PE, PI, RN, SE.
+# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2002/D4399.htm">4,399</a>
+Rule Brazil 2002 only - Nov 3 0:00 1:00 S
+# Decree 4,844 (2003-09-24; corrected 2003-09-26) repeals DST in BA, MT, TO.
+# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2003/D4844.htm">4,844</a>
+Rule Brazil 2003 only - Oct 19 0:00 1:00 S
+# Decree 5,223 (2004-10-01) reestablishes DST in MT.
+# <a href="http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2004/Decreto/D5223.htm">5,223</a>
+Rule Brazil 2004 only - Nov 2 0:00 1:00 S
+# Decree <a href="http://pcdsh01.on.br/DecHV5539.gif">5,539</a> (2005-09-19),
+# adopted by the same states as before.
+Rule Brazil 2005 only - Oct 16 0:00 1:00 S
+# Decree <a href="http://pcdsh01.on.br/DecHV5920.gif">5,920</a> (2006-10-03),
+# adopted by the same states as before.
+Rule Brazil 2006 only - Nov 5 0:00 1:00 S
+Rule Brazil 2007 only - Feb 25 0:00 0 -
+# Decree <a href="http://pcdsh01.on.br/DecHV6212.gif">6,212</a> (2007-09-26),
+# adopted by the same states as before.
+Rule Brazil 2007 only - Oct Sun>=8 0:00 1:00 S
+# From Frederico A. C. Neves (2008-09-10):
+# According to this decree
+# <a href="http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm">
+# http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm
+# </a>
+# [t]he DST period in Brazil now on will be from the 3rd Oct Sunday to the
+# 3rd Feb Sunday. There is an exception on the return date when this is
+# the Carnival Sunday then the return date will be the next Sunday...
+Rule Brazil 2008 max - Oct Sun>=15 0:00 1:00 S
+Rule Brazil 2008 2011 - Feb Sun>=15 0:00 0 -
+Rule Brazil 2012 only - Feb Sun>=22 0:00 0 -
+Rule Brazil 2013 2014 - Feb Sun>=15 0:00 0 -
+Rule Brazil 2015 only - Feb Sun>=22 0:00 0 -
+Rule Brazil 2016 2022 - Feb Sun>=15 0:00 0 -
+Rule Brazil 2023 only - Feb Sun>=22 0:00 0 -
+Rule Brazil 2024 2025 - Feb Sun>=15 0:00 0 -
+Rule Brazil 2026 only - Feb Sun>=22 0:00 0 -
+Rule Brazil 2027 2033 - Feb Sun>=15 0:00 0 -
+Rule Brazil 2034 only - Feb Sun>=22 0:00 0 -
+Rule Brazil 2035 2036 - Feb Sun>=15 0:00 0 -
+Rule Brazil 2037 only - Feb Sun>=22 0:00 0 -
+# From Arthur David Olson (2008-09-29):
+# The next is wrong in some years but is better than nothing.
+Rule Brazil 2038 max - Feb Sun>=15 0:00 0 -
+
+# The latest ruleset listed above says that the following states observe DST:
+# DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP.
+
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+#
+# Fernando de Noronha (administratively part of PE)
+Zone America/Noronha -2:09:40 - LMT 1914
+ -2:00 Brazil FN%sT 1990 Sep 17
+ -2:00 - FNT 1999 Sep 30
+ -2:00 Brazil FN%sT 2000 Oct 15
+ -2:00 - FNT 2001 Sep 13
+ -2:00 Brazil FN%sT 2002 Oct 1
+ -2:00 - FNT
+# Other Atlantic islands have no permanent settlement.
+# These include Trindade and Martin Vaz (administratively part of ES),
+# Atol das Rocas (RN), and Penedos de Sao Pedro e Sao Paulo (PE).
+# Fernando de Noronha was a separate territory from 1942-09-02 to 1989-01-01;
+# it also included the Penedos.
+#
+# Amapa (AP), east Para (PA)
+# East Para includes Belem, Maraba, Serra Norte, and Sao Felix do Xingu.
+# The division between east and west Para is the river Xingu.
+# In the north a very small part from the river Javary (now Jari I guess,
+# the border with Amapa) to the Amazon, then to the Xingu.
+Zone America/Belem -3:13:56 - LMT 1914
+ -3:00 Brazil BR%sT 1988 Sep 12
+ -3:00 - BRT
+#
+# west Para (PA)
+# West Para includes Altamira, Oribidos, Prainha, Oriximina, and Santarem.
+Zone America/Santarem -3:38:48 - LMT 1914
+ -4:00 Brazil AM%sT 1988 Sep 12
+ -4:00 - AMT 2008 Jun 24 00:00
+ -3:00 - BRT
+#
+# Maranhao (MA), Piaui (PI), Ceara (CE), Rio Grande do Norte (RN),
+# Paraiba (PB)
+Zone America/Fortaleza -2:34:00 - LMT 1914
+ -3:00 Brazil BR%sT 1990 Sep 17
+ -3:00 - BRT 1999 Sep 30
+ -3:00 Brazil BR%sT 2000 Oct 22
+ -3:00 - BRT 2001 Sep 13
+ -3:00 Brazil BR%sT 2002 Oct 1
+ -3:00 - BRT
+#
+# Pernambuco (PE) (except Atlantic islands)
+Zone America/Recife -2:19:36 - LMT 1914
+ -3:00 Brazil BR%sT 1990 Sep 17
+ -3:00 - BRT 1999 Sep 30
+ -3:00 Brazil BR%sT 2000 Oct 15
+ -3:00 - BRT 2001 Sep 13
+ -3:00 Brazil BR%sT 2002 Oct 1
+ -3:00 - BRT
+#
+# Tocantins (TO)
+Zone America/Araguaina -3:12:48 - LMT 1914
+ -3:00 Brazil BR%sT 1990 Sep 17
+ -3:00 - BRT 1995 Sep 14
+ -3:00 Brazil BR%sT 2003 Sep 24
+ -3:00 - BRT 2012 Oct 21
+ -3:00 Brazil BR%sT 2013 Sep
+ -3:00 - BRT
+#
+# Alagoas (AL), Sergipe (SE)
+Zone America/Maceio -2:22:52 - LMT 1914
+ -3:00 Brazil BR%sT 1990 Sep 17
+ -3:00 - BRT 1995 Oct 13
+ -3:00 Brazil BR%sT 1996 Sep 4
+ -3:00 - BRT 1999 Sep 30
+ -3:00 Brazil BR%sT 2000 Oct 22
+ -3:00 - BRT 2001 Sep 13
+ -3:00 Brazil BR%sT 2002 Oct 1
+ -3:00 - BRT
+#
+# Bahia (BA)
+# There are too many Salvadors elsewhere, so use America/Bahia instead
+# of America/Salvador.
+Zone America/Bahia -2:34:04 - LMT 1914
+ -3:00 Brazil BR%sT 2003 Sep 24
+ -3:00 - BRT 2011 Oct 16
+ -3:00 Brazil BR%sT 2012 Oct 21
+ -3:00 - BRT
+#
+# Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
+# Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),
+# Santa Catarina (SC), Rio Grande do Sul (RS)
+Zone America/Sao_Paulo -3:06:28 - LMT 1914
+ -3:00 Brazil BR%sT 1963 Oct 23 00:00
+ -3:00 1:00 BRST 1964
+ -3:00 Brazil BR%sT
+#
+# Mato Grosso do Sul (MS)
+Zone America/Campo_Grande -3:38:28 - LMT 1914
+ -4:00 Brazil AM%sT
+#
+# Mato Grosso (MT)
+Zone America/Cuiaba -3:44:20 - LMT 1914
+ -4:00 Brazil AM%sT 2003 Sep 24
+ -4:00 - AMT 2004 Oct 1
+ -4:00 Brazil AM%sT
+#
+# Rondonia (RO)
+Zone America/Porto_Velho -4:15:36 - LMT 1914
+ -4:00 Brazil AM%sT 1988 Sep 12
+ -4:00 - AMT
+#
+# Roraima (RR)
+Zone America/Boa_Vista -4:02:40 - LMT 1914
+ -4:00 Brazil AM%sT 1988 Sep 12
+ -4:00 - AMT 1999 Sep 30
+ -4:00 Brazil AM%sT 2000 Oct 15
+ -4:00 - AMT
+#
+# east Amazonas (AM): Boca do Acre, Jutai, Manaus, Floriano Peixoto
+# The great circle line from Tabatinga to Porto Acre divides
+# east from west Amazonas.
+Zone America/Manaus -4:00:04 - LMT 1914
+ -4:00 Brazil AM%sT 1988 Sep 12
+ -4:00 - AMT 1993 Sep 28
+ -4:00 Brazil AM%sT 1994 Sep 22
+ -4:00 - AMT
+#
+# west Amazonas (AM): Atalaia do Norte, Boca do Maoco, Benjamin Constant,
+# Eirunepe, Envira, Ipixuna
+Zone America/Eirunepe -4:39:28 - LMT 1914
+ -5:00 Brazil AC%sT 1988 Sep 12
+ -5:00 - ACT 1993 Sep 28
+ -5:00 Brazil AC%sT 1994 Sep 22
+ -5:00 - ACT 2008 Jun 24 00:00
+ -4:00 - AMT 2013 Nov 10
+ -5:00 - ACT
+#
+# Acre (AC)
+Zone America/Rio_Branco -4:31:12 - LMT 1914
+ -5:00 Brazil AC%sT 1988 Sep 12
+ -5:00 - ACT 2008 Jun 24 00:00
+ -4:00 - AMT 2013 Nov 10
+ -5:00 - ACT
+
+# Chile
+
+# From Eduardo Krell (1995-10-19):
+# The law says to switch to DST at midnight [24:00] on the second SATURDAY
+# of October.... The law is the same for March and October.
+# (1998-09-29):
+# Because of the drought this year, the government decided to go into
+# DST earlier (saturday 9/26 at 24:00). This is a one-time change only ...
+# (unless there's another dry season next year, I guess).
+
+# From Julio I. Pacheco Troncoso (1999-03-18):
+# Because of the same drought, the government decided to end DST later,
+# on April 3, (one-time change).
+
+# From Oscar van Vlijmen (2006-10-08):
+# http://www.horaoficial.cl/cambio.htm
+
+# From Jesper Norgaard Welen (2006-10-08):
+# I think that there are some obvious mistakes in the suggested link
+# from Oscar van Vlijmen,... for instance entry 66 says that GMT-4
+# ended 1990-09-12 while entry 67 only begins GMT-3 at 1990-09-15
+# (they should have been 1990-09-15 and 1990-09-16 respectively), but
+# anyhow it clears up some doubts too.
+
+# From Paul Eggert (2006-12-27):
+# The following data for Chile and America/Santiago are from
+# <http://www.horaoficial.cl/horaof.htm> (2006-09-20), transcribed by
+# Jesper Norgaard Welen. The data for Pacific/Easter are from Shanks
+# & Pottenger, except with DST transitions after 1932 cloned from
+# America/Santiago. The pre-1980 Pacific/Easter data are dubious,
+# but we have no other source.
+
+# From German Poo-Caaman~o (2008-03-03):
+# Due to drought, Chile extends Daylight Time in three weeks. This
+# is one-time change (Saturday 3/29 at 24:00 for America/Santiago
+# and Saturday 3/29 at 22:00 for Pacific/Easter)
+# The Supreme Decree is located at
+# <a href="http://www.shoa.cl/servicios/supremo316.pdf">
+# http://www.shoa.cl/servicios/supremo316.pdf
+# </a>
+# and the instructions for 2008 are located in:
+# <a href="http://www.horaoficial.cl/cambio.htm">
+# http://www.horaoficial.cl/cambio.htm
+# </a>.
+
+# From Jose Miguel Garrido (2008-03-05):
+# ...
+# You could see the announces of the change on
+# <a href="http://www.shoa.cl/noticias/2008/04hora/hora.htm">
+# http://www.shoa.cl/noticias/2008/04hora/hora.htm
+# </a>.
+
+# From Angel Chiang (2010-03-04):
+# Subject: DST in Chile exceptionally extended to 3 April due to earthquake
+# <a href="http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098">
+# http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098
+# </a>
+# (in Spanish, last paragraph).
+#
+# This is breaking news. There should be more information available later.
+
+# From Arthur Daivd Olson (2010-03-06):
+# Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
+
+# From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
+# It appears that the Chilean government has decided to postpone the
+# change from summer time to winter time again, by three weeks to April
+# 2nd:
+# <a href="http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651">
+# http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
+# </a>
+#
+# This is not yet reflected in the official "cambio de hora" site, but
+# probably will be soon:
+# <a href="http://www.horaoficial.cl/cambio.htm">
+# http://www.horaoficial.cl/cambio.htm
+# </a>
+
+# From Arthur David Olson (2011-03-02):
+# The emol.com article mentions a water shortage as the cause of the
+# postponement, which may mean that it's not a permanent change.
+
+# From Glenn Eychaner (2011-03-28):
+# The article:
+# <a href="http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}">
+# http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}
+# </a>
+#
+# In English:
+# Chile's clocks will go back an hour this year on the 7th of May instead
+# of this Saturday. They will go forward again the 3rd Saturday in
+# August, not in October as they have since 1968. This is a pilot plan
+# which will be reevaluated in 2012.
+
+# From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23):
+# As stated in the website of the Chilean Energy Ministry
+# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html
+# The Chilean Government has decided to postpone the entrance into winter time
+# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not
+# been yet formalized but it will within the next days.
+# Quote from the website communication:
+#
+# 6. For the year 2012, the dates of entry into winter time will be as follows:
+# a. Saturday April 28, 2012, clocks should go back 60 minutes; that is, at
+# 23:59:59, instead of passing to 0:00, the time should be adjusted to be 23:00
+# of the same day.
+# b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is,
+# at 23:59:59, instead of passing to 0:00, the time should be adjusted to be
+# 01:00 on September 2.
+
+# From Steffen Thorsen (2013-02-15):
+# According to several news sources, Chile has extended DST this year,
+# they will end DST later and start DST earlier than planned. They
+# hope to save energy. The new end date is 2013-04-28 00:00 and new
+# start date is 2013-09-08 00:00....
+# http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm
+
+# NOTE: ChileAQ rules for Antarctic bases are stored separately in the
+# 'antarctica' file.
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Chile 1927 1932 - Sep 1 0:00 1:00 S
+Rule Chile 1928 1932 - Apr 1 0:00 0 -
+Rule Chile 1942 only - Jun 1 4:00u 0 -
+Rule Chile 1942 only - Aug 1 5:00u 1:00 S
+Rule Chile 1946 only - Jul 15 4:00u 1:00 S
+Rule Chile 1946 only - Sep 1 3:00u 0:00 -
+Rule Chile 1947 only - Apr 1 4:00u 0 -
+Rule Chile 1968 only - Nov 3 4:00u 1:00 S
+Rule Chile 1969 only - Mar 30 3:00u 0 -
+Rule Chile 1969 only - Nov 23 4:00u 1:00 S
+Rule Chile 1970 only - Mar 29 3:00u 0 -
+Rule Chile 1971 only - Mar 14 3:00u 0 -
+Rule Chile 1970 1972 - Oct Sun>=9 4:00u 1:00 S
+Rule Chile 1972 1986 - Mar Sun>=9 3:00u 0 -
+Rule Chile 1973 only - Sep 30 4:00u 1:00 S
+Rule Chile 1974 1987 - Oct Sun>=9 4:00u 1:00 S
+Rule Chile 1987 only - Apr 12 3:00u 0 -
+Rule Chile 1988 1989 - Mar Sun>=9 3:00u 0 -
+Rule Chile 1988 only - Oct Sun>=1 4:00u 1:00 S
+Rule Chile 1989 only - Oct Sun>=9 4:00u 1:00 S
+Rule Chile 1990 only - Mar 18 3:00u 0 -
+Rule Chile 1990 only - Sep 16 4:00u 1:00 S
+Rule Chile 1991 1996 - Mar Sun>=9 3:00u 0 -
+Rule Chile 1991 1997 - Oct Sun>=9 4:00u 1:00 S
+Rule Chile 1997 only - Mar 30 3:00u 0 -
+Rule Chile 1998 only - Mar Sun>=9 3:00u 0 -
+Rule Chile 1998 only - Sep 27 4:00u 1:00 S
+Rule Chile 1999 only - Apr 4 3:00u 0 -
+Rule Chile 1999 2010 - Oct Sun>=9 4:00u 1:00 S
+Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 -
+# N.B.: the end of March 29 in Chile is March 30 in Universal time,
+# which is used below in specifying the transition.
+Rule Chile 2008 only - Mar 30 3:00u 0 -
+Rule Chile 2009 only - Mar Sun>=9 3:00u 0 -
+Rule Chile 2010 only - Apr Sun>=1 3:00u 0 -
+Rule Chile 2011 only - May Sun>=2 3:00u 0 -
+Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S
+Rule Chile 2012 max - Apr Sun>=23 3:00u 0 -
+Rule Chile 2012 max - Sep Sun>=2 4:00u 1:00 S
+# IATA SSIM anomalies: (1992-02) says 1992-03-14;
+# (1996-09) says 1998-03-08. Ignore these.
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Santiago -4:42:46 - LMT 1890
+ -4:42:46 - SMT 1910 # Santiago Mean Time
+ -5:00 - CLT 1916 Jul 1 # Chile Time
+ -4:42:46 - SMT 1918 Sep 1 # Santiago Mean Time
+ -4:00 - CLT 1919 Jul 1 # Chile Time
+ -4:42:46 - SMT 1927 Sep 1 # Santiago Mean Time
+ -5:00 Chile CL%sT 1947 May 22 # Chile Time
+ -4:00 Chile CL%sT
+Zone Pacific/Easter -7:17:44 - LMT 1890
+ -7:17:28 - EMT 1932 Sep # Easter Mean Time
+ -7:00 Chile EAS%sT 1982 Mar 13 21:00 # Easter I Time
+ -6:00 Chile EAS%sT
+#
+# Sala y Gomez Island is like Pacific/Easter.
+# Other Chilean locations, including Juan Fernandez Is, San Ambrosio,
+# San Felix, and Antarctic bases, are like America/Santiago.
+
+# Colombia
+
+# Milne gives 4:56:16.4 for Bogota time in 1899; round to nearest. He writes,
+# "A variation of fifteen minutes in the public clocks of Bogota is not rare."
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule CO 1992 only - May 3 0:00 1:00 S
+Rule CO 1993 only - Apr 4 0:00 0 -
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Bogota -4:56:16 - LMT 1884 Mar 13
+ -4:56:16 - BMT 1914 Nov 23 # Bogota Mean Time
+ -5:00 CO CO%sT # Colombia Time
+# Malpelo, Providencia, San Andres
+# no information; probably like America/Bogota
+
+# Curacao
+
+# Milne gives 4:35:46.9 for Curacao mean time; round to nearest.
+#
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger say that The Bottom and Philipsburg have been at
+# -4:00 since standard time was introduced on 1912-03-02; and that
+# Kralendijk and Rincon used Kralendijk Mean Time (-4:33:08) from
+# 1912-02-02 to 1965-01-01. The former is dubious, since S&P also say
+# Saba Island has been like Curacao.
+# This all predates our 1970 cutoff, though.
+#
+# By July 2007 Curacao and St Maarten are planned to become
+# associated states within the Netherlands, much like Aruba;
+# Bonaire, Saba and St Eustatius would become directly part of the
+# Netherlands as Kingdom Islands. This won't affect their time zones
+# though, as far as we know.
+#
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Curacao -4:35:47 - LMT 1912 Feb 12 # Willemstad
+ -4:30 - ANT 1965 # Netherlands Antilles Time
+ -4:00 - AST
+
+# From Arthur David Olson (2011-06-15):
+# use links for places with new iso3166 codes.
+# The name "Lower Prince's Quarter" is both longer than fourteen charaters
+# and contains an apostrophe; use "Lower_Princes" below.
+
+Link America/Curacao America/Lower_Princes # Sint Maarten
+Link America/Curacao America/Kralendijk # Caribbean Netherlands
+
+# Ecuador
+#
+# Milne says the Sentral and South American Telegraph Company used -5:24:15.
+#
+# From Paul Eggert (2007-03-04):
+# Apparently Ecuador had a failed experiment with DST in 1992.
+# <http://midena.gov.ec/content/view/1261/208/> (2007-02-27) and
+# <http://www.hoy.com.ec/NoticiaNue.asp?row_id=249856> (2006-11-06) both
+# talk about "hora Sixto". Leave this alone for now, as we have no data.
+#
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Guayaquil -5:19:20 - LMT 1890
+ -5:14:00 - QMT 1931 # Quito Mean Time
+ -5:00 - ECT # Ecuador Time
+Zone Pacific/Galapagos -5:58:24 - LMT 1931 # Puerto Baquerizo Moreno
+ -5:00 - ECT 1986
+ -6:00 - GALT # Galapagos Time
+
+# Falklands
+
+# From Paul Eggert (2006-03-22):
+# Between 1990 and 2000 inclusive, Shanks & Pottenger and the IATA agree except
+# the IATA gives 1996-09-08. Go with Shanks & Pottenger.
+
+# From Falkland Islands Government Office, London (2001-01-22)
+# via Jesper Norgaard:
+# ... the clocks revert back to Local Mean Time at 2 am on Sunday 15
+# April 2001 and advance one hour to summer time at 2 am on Sunday 2
+# September. It is anticipated that the clocks will revert back at 2
+# am on Sunday 21 April 2002 and advance to summer time at 2 am on
+# Sunday 1 September.
+
+# From Rives McDow (2001-02-13):
+#
+# I have communicated several times with people there, and the last
+# time I had communications that was helpful was in 1998. Here is
+# what was said then:
+#
+# "The general rule was that Stanley used daylight saving and the Camp
+# did not. However for various reasons many people in the Camp have
+# started to use daylight saving (known locally as 'Stanley Time')
+# There is no rule as to who uses daylight saving - it is a matter of
+# personal choice and so it is impossible to draw a map showing who
+# uses it and who does not. Any list would be out of date as soon as
+# it was produced. This year daylight saving ended on April 18/19th
+# and started again on September 12/13th. I do not know what the rule
+# is, but can find out if you like. We do not change at the same time
+# as UK or Chile."
+#
+# I did have in my notes that the rule was "Second Saturday in Sep at
+# 0:00 until third Saturday in Apr at 0:00". I think that this does
+# not agree in some cases with Shanks; is this true?
+#
+# Also, there is no mention in the list that some areas in the
+# Falklands do not use DST. I have found in my communications there
+# that these areas are on the western half of East Falkland and all of
+# West Falkland. Stanley is the only place that consistently observes
+# DST. Again, as in other places in the world, the farmers don't like
+# it. West Falkland is almost entirely sheep farmers.
+#
+# I know one lady there that keeps a list of which farm keeps DST and
+# which doesn't each year. She runs a shop in Stanley, and says that
+# the list changes each year. She uses it to communicate to her
+# customers, catching them when they are home for lunch or dinner.
+
+# From Paul Eggert (2001-03-05):
+# For now, we'll just record the time in Stanley, since we have no
+# better info.
+
+# From Steffen Thorsen (2011-04-01):
+# The Falkland Islands will not turn back clocks this winter, but stay on
+# daylight saving time.
+#
+# One source:
+# <a href="http://www.falklandnews.com/public/story.cfm?get=5914&source=3">
+# http://www.falklandnews.com/public/story.cfm?get=5914&source=3
+# </a>
+#
+# We have gotten this confirmed by a clerk of the legislative assembly:
+# Normally the clocks revert to Local Mean Time (UTC/GMT -4 hours) on the
+# third Sunday of April at 0200hrs and advance to Summer Time (UTC/GMT -3
+# hours) on the first Sunday of September at 0200hrs.
+#
+# IMPORTANT NOTE: During 2011, on a trial basis, the Falkland Islands
+# will not revert to local mean time, but clocks will remain on Summer
+# time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term
+# change to local time following the trial period will be notified.
+#
+# From Andrew Newman (2012-02-24)
+# A letter from Justin McPhee, Chief Executive,
+# Cable & Wireless Falkland Islands (dated 2012-02-22)
+# states...
+# The current Atlantic/Stanley entry under South America expects the
+# clocks to go back to standard Falklands Time (FKT) on the 15th April.
+# The database entry states that in 2011 Stanley was staying on fixed
+# summer time on a trial basis only. FIG need to contact IANA and/or
+# the maintainers of the database to inform them we're adopting
+# the same policy this year and suggest recommendations for future years.
+#
+# For now we will assume permanent summer time for the Falklands
+# until advised differently (to apply for 2012 and beyond, after the 2011
+# experiment was apparently successful.)
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 S
+Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 -
+Rule Falk 1939 only - Oct 1 0:00 1:00 S
+Rule Falk 1940 1942 - Sep lastSun 0:00 1:00 S
+Rule Falk 1943 only - Jan 1 0:00 0 -
+Rule Falk 1983 only - Sep lastSun 0:00 1:00 S
+Rule Falk 1984 1985 - Apr lastSun 0:00 0 -
+Rule Falk 1984 only - Sep 16 0:00 1:00 S
+Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 S
+Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 -
+Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 -
+Rule Falk 2001 2010 - Sep Sun>=1 2:00 1:00 S
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Atlantic/Stanley -3:51:24 - LMT 1890
+ -3:51:24 - SMT 1912 Mar 12 # Stanley Mean Time
+ -4:00 Falk FK%sT 1983 May # Falkland Is Time
+ -3:00 Falk FK%sT 1985 Sep 15
+ -4:00 Falk FK%sT 2010 Sep 5 02:00
+ -3:00 - FKST
+
+# French Guiana
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Cayenne -3:29:20 - LMT 1911 Jul
+ -4:00 - GFT 1967 Oct # French Guiana Time
+ -3:00 - GFT
+
+# Guyana
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Guyana -3:52:40 - LMT 1915 Mar # Georgetown
+ -3:45 - GBGT 1966 May 26 # Br Guiana Time
+ -3:45 - GYT 1975 Jul 31 # Guyana Time
+ -3:00 - GYT 1991
+# IATA SSIM (1996-06) says -4:00. Assume a 1991 switch.
+ -4:00 - GYT
+
+# Paraguay
+#
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger say that spring transitions are from 01:00 -> 02:00,
+# and autumn transitions are from 00:00 -> 23:00. Go with pre-1999
+# editions of Shanks, and with the IATA, who say transitions occur at 00:00.
+#
+# From Waldemar Villamayor-Venialbo (2013-09-20):
+# No time of the day is established for the adjustment, so people normally
+# adjust their clocks at 0 hour of the given dates.
+#
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Para 1975 1988 - Oct 1 0:00 1:00 S
+Rule Para 1975 1978 - Mar 1 0:00 0 -
+Rule Para 1979 1991 - Apr 1 0:00 0 -
+Rule Para 1989 only - Oct 22 0:00 1:00 S
+Rule Para 1990 only - Oct 1 0:00 1:00 S
+Rule Para 1991 only - Oct 6 0:00 1:00 S
+Rule Para 1992 only - Mar 1 0:00 0 -
+Rule Para 1992 only - Oct 5 0:00 1:00 S
+Rule Para 1993 only - Mar 31 0:00 0 -
+Rule Para 1993 1995 - Oct 1 0:00 1:00 S
+Rule Para 1994 1995 - Feb lastSun 0:00 0 -
+Rule Para 1996 only - Mar 1 0:00 0 -
+# IATA SSIM (2000-02) says 1999-10-10; ignore this for now.
+# From Steffen Thorsen (2000-10-02):
+# I have three independent reports that Paraguay changed to DST this Sunday
+# (10-01).
+#
+# Translated by Gwillim Law (2001-02-27) from
+# <a href="http://www.diarionoticias.com.py/011000/nacional/naciona1.htm">
+# Noticias, a daily paper in Asuncion, Paraguay (2000-10-01)
+# </a>:
+# Starting at 0:00 today, the clock will be set forward 60 minutes, in
+# fulfillment of Decree No. 7,273 of the Executive Power.... The time change
+# system has been operating for several years. Formerly there was a separate
+# decree each year; the new law has the same effect, but permanently. Every
+# year, the time will change on the first Sunday of October; likewise, the
+# clock will be set back on the first Sunday of March.
+#
+Rule Para 1996 2001 - Oct Sun>=1 0:00 1:00 S
+# IATA SSIM (1997-09) says Mar 1; go with Shanks & Pottenger.
+Rule Para 1997 only - Feb lastSun 0:00 0 -
+# Shanks & Pottenger say 1999-02-28; IATA SSIM (1999-02) says 1999-02-27, but
+# (1999-09) reports no date; go with above sources and Gerd Knops (2001-02-27).
+Rule Para 1998 2001 - Mar Sun>=1 0:00 0 -
+# From Rives McDow (2002-02-28):
+# A decree was issued in Paraguay (no. 16350) on 2002-02-26 that changed the
+# dst method to be from the first Sunday in September to the first Sunday in
+# April.
+Rule Para 2002 2004 - Apr Sun>=1 0:00 0 -
+Rule Para 2002 2003 - Sep Sun>=1 0:00 1:00 S
+#
+# From Jesper Norgaard Welen (2005-01-02):
+# There are several sources that claim that Paraguay made
+# a timezone rule change in autumn 2004.
+# From Steffen Thorsen (2005-01-05):
+# Decree 1,867 (2004-03-05)
+# From Carlos Raul Perasso via Jesper Norgaard Welen (2006-10-13)
+# <http://www.presidencia.gov.py/decretos/D1867.pdf>
+Rule Para 2004 2009 - Oct Sun>=15 0:00 1:00 S
+Rule Para 2005 2009 - Mar Sun>=8 0:00 0 -
+# From Carlos Raul Perasso (2010-02-18):
+# By decree number 3958 issued yesterday (
+# <a href="http://www.presidencia.gov.py/v1/wp-content/uploads/2010/02/decreto3958.pdf">
+# http://www.presidencia.gov.py/v1/wp-content/uploads/2010/02/decreto3958.pdf
+# </a>
+# )
+# Paraguay changes its DST schedule, postponing the March rule to April and
+# modifying the October date. The decree reads:
+# ...
+# Art. 1. It is hereby established that from the second Sunday of the month of
+# April of this year (2010), the official time is to be set back 60 minutes,
+# and that on the first Sunday of the month of October, it is to be set
+# forward 60 minutes, in all the territory of the Paraguayan Republic.
+# ...
+Rule Para 2010 max - Oct Sun>=1 0:00 1:00 S
+Rule Para 2010 2012 - Apr Sun>=8 0:00 0 -
+#
+# From Steffen Thorsen (2013-03-07):
+# Paraguay will end DST on 2013-03-24 00:00....
+# http://www.ande.gov.py/interna.php?id=1075
+#
+# From Carlos Raul Perasso (2013-03-15):
+# The change in Paraguay is now final. Decree number 10780
+# http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf
+Rule Para 2013 max - Mar Sun>=22 0:00 0 -
+
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Asuncion -3:50:40 - LMT 1890
+ -3:50:40 - AMT 1931 Oct 10 # Asuncion Mean Time
+ -4:00 - PYT 1972 Oct # Paraguay Time
+ -3:00 - PYT 1974 Apr
+ -4:00 Para PY%sT
+
+# Peru
+#
+# <a href="news:xrGmb.39935$gA1.13896113@news4.srv.hcvlny.cv.net">
+# From Evelyn C. Leeper via Mark Brader (2003-10-26):</a>
+# When we were in Peru in 1985-1986, they apparently switched over
+# sometime between December 29 and January 3 while we were on the Amazon.
+#
+# From Paul Eggert (2006-03-22):
+# Shanks & Pottenger don't have this transition. Assume 1986 was like 1987.
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Peru 1938 only - Jan 1 0:00 1:00 S
+Rule Peru 1938 only - Apr 1 0:00 0 -
+Rule Peru 1938 1939 - Sep lastSun 0:00 1:00 S
+Rule Peru 1939 1940 - Mar Sun>=24 0:00 0 -
+Rule Peru 1986 1987 - Jan 1 0:00 1:00 S
+Rule Peru 1986 1987 - Apr 1 0:00 0 -
+Rule Peru 1990 only - Jan 1 0:00 1:00 S
+Rule Peru 1990 only - Apr 1 0:00 0 -
+# IATA is ambiguous for 1993/1995; go with Shanks & Pottenger.
+Rule Peru 1994 only - Jan 1 0:00 1:00 S
+Rule Peru 1994 only - Apr 1 0:00 0 -
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Lima -5:08:12 - LMT 1890
+ -5:08:36 - LMT 1908 Jul 28 # Lima Mean Time?
+ -5:00 Peru PE%sT # Peru Time
+
+# South Georgia
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Atlantic/South_Georgia -2:26:08 - LMT 1890 # Grytviken
+ -2:00 - GST # South Georgia Time
+
+# South Sandwich Is
+# uninhabited; scientific personnel have wintered
+
+# Suriname
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Paramaribo -3:40:40 - LMT 1911
+ -3:40:52 - PMT 1935 # Paramaribo Mean Time
+ -3:40:36 - PMT 1945 Oct # The capital moved?
+ -3:30 - NEGT 1975 Nov 20 # Dutch Guiana Time
+ -3:30 - SRT 1984 Oct # Suriname Time
+ -3:00 - SRT
+
+# Trinidad and Tobago
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2
+ -4:00 - AST
+
+Link America/Port_of_Spain America/Anguilla
+Link America/Port_of_Spain America/Dominica
+Link America/Port_of_Spain America/Grenada
+Link America/Port_of_Spain America/Guadeloupe
+Link America/Port_of_Spain America/Marigot
+Link America/Port_of_Spain America/Montserrat
+Link America/Port_of_Spain America/St_Barthelemy
+Link America/Port_of_Spain America/St_Kitts
+Link America/Port_of_Spain America/St_Lucia
+Link America/Port_of_Spain America/St_Thomas
+Link America/Port_of_Spain America/St_Vincent
+Link America/Port_of_Spain America/Tortola
+
+# Uruguay
+# From Paul Eggert (1993-11-18):
+# Uruguay wins the prize for the strangest peacetime manipulation of the rules.
+# From Shanks & Pottenger:
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+# Whitman gives 1923 Oct 1; go with Shanks & Pottenger.
+Rule Uruguay 1923 only - Oct 2 0:00 0:30 HS
+Rule Uruguay 1924 1926 - Apr 1 0:00 0 -
+Rule Uruguay 1924 1925 - Oct 1 0:00 0:30 HS
+Rule Uruguay 1933 1935 - Oct lastSun 0:00 0:30 HS
+# Shanks & Pottenger give 1935 Apr 1 0:00 & 1936 Mar 30 0:00; go with Whitman.
+Rule Uruguay 1934 1936 - Mar Sat>=25 23:30s 0 -
+Rule Uruguay 1936 only - Nov 1 0:00 0:30 HS
+Rule Uruguay 1937 1941 - Mar lastSun 0:00 0 -
+# Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
+Rule Uruguay 1937 1940 - Oct lastSun 0:00 0:30 HS
+# Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
+# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
+Rule Uruguay 1941 only - Aug 1 0:00 0:30 HS
+Rule Uruguay 1942 only - Jan 1 0:00 0 -
+Rule Uruguay 1942 only - Dec 14 0:00 1:00 S
+Rule Uruguay 1943 only - Mar 14 0:00 0 -
+Rule Uruguay 1959 only - May 24 0:00 1:00 S
+Rule Uruguay 1959 only - Nov 15 0:00 0 -
+Rule Uruguay 1960 only - Jan 17 0:00 1:00 S
+Rule Uruguay 1960 only - Mar 6 0:00 0 -
+Rule Uruguay 1965 1967 - Apr Sun>=1 0:00 1:00 S
+Rule Uruguay 1965 only - Sep 26 0:00 0 -
+Rule Uruguay 1966 1967 - Oct 31 0:00 0 -
+Rule Uruguay 1968 1970 - May 27 0:00 0:30 HS
+Rule Uruguay 1968 1970 - Dec 2 0:00 0 -
+Rule Uruguay 1972 only - Apr 24 0:00 1:00 S
+Rule Uruguay 1972 only - Aug 15 0:00 0 -
+Rule Uruguay 1974 only - Mar 10 0:00 0:30 HS
+Rule Uruguay 1974 only - Dec 22 0:00 1:00 S
+Rule Uruguay 1976 only - Oct 1 0:00 0 -
+Rule Uruguay 1977 only - Dec 4 0:00 1:00 S
+Rule Uruguay 1978 only - Apr 1 0:00 0 -
+Rule Uruguay 1979 only - Oct 1 0:00 1:00 S
+Rule Uruguay 1980 only - May 1 0:00 0 -
+Rule Uruguay 1987 only - Dec 14 0:00 1:00 S
+Rule Uruguay 1988 only - Mar 14 0:00 0 -
+Rule Uruguay 1988 only - Dec 11 0:00 1:00 S
+Rule Uruguay 1989 only - Mar 12 0:00 0 -
+Rule Uruguay 1989 only - Oct 29 0:00 1:00 S
+# Shanks & Pottenger say no DST was observed in 1990/1 and 1991/2,
+# and that 1992/3's DST was from 10-25 to 03-01. Go with IATA.
+Rule Uruguay 1990 1992 - Mar Sun>=1 0:00 0 -
+Rule Uruguay 1990 1991 - Oct Sun>=21 0:00 1:00 S
+Rule Uruguay 1992 only - Oct 18 0:00 1:00 S
+Rule Uruguay 1993 only - Feb 28 0:00 0 -
+# From Eduardo Cota (2004-09-20):
+# The uruguayan government has decreed a change in the local time....
+# http://www.presidencia.gub.uy/decretos/2004091502.htm
+Rule Uruguay 2004 only - Sep 19 0:00 1:00 S
+# From Steffen Thorsen (2005-03-11):
+# Uruguay's DST was scheduled to end on Sunday, 2005-03-13, but in order to
+# save energy ... it was postponed two weeks....
+# http://www.presidencia.gub.uy/_Web/noticias/2005/03/2005031005.htm
+Rule Uruguay 2005 only - Mar 27 2:00 0 -
+# From Eduardo Cota (2005-09-27):
+# http://www.presidencia.gub.uy/_Web/decretos/2005/09/CM%20119_09%2009%202005_00001.PDF
+# This means that from 2005-10-09 at 02:00 local time, until 2006-03-12 at
+# 02:00 local time, official time in Uruguay will be at GMT -2.
+Rule Uruguay 2005 only - Oct 9 2:00 1:00 S
+Rule Uruguay 2006 only - Mar 12 2:00 0 -
+# From Jesper Norgaard Welen (2006-09-06):
+# http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
+Rule Uruguay 2006 max - Oct Sun>=1 2:00 1:00 S
+Rule Uruguay 2007 max - Mar Sun>=8 2:00 0 -
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Montevideo -3:44:44 - LMT 1898 Jun 28
+ -3:44:44 - MMT 1920 May 1 # Montevideo MT
+ -3:30 Uruguay UY%sT 1942 Dec 14 # Uruguay Time
+ -3:00 Uruguay UY%sT
+
+# Venezuela
+#
+# From John Stainforth (2007-11-28):
+# ... the change for Venezuela originally expected for 2007-12-31 has
+# been brought forward to 2007-12-09. The official announcement was
+# published today in the "Gaceta Oficial de la Republica Bolivariana
+# de Venezuela, numero 38.819" (official document for all laws or
+# resolution publication)
+# http://www.globovision.com/news.php?nid=72208
+
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Caracas -4:27:44 - LMT 1890
+ -4:27:40 - CMT 1912 Feb 12 # Caracas Mean Time?
+ -4:30 - VET 1965 # Venezuela Time
+ -4:00 - VET 2007 Dec 9 03:00
+ -4:30 - VET
diff --git a/jdk/make/sun/javazic/tzdata/systemv b/jdk/make/data/tzdata/systemv
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/systemv
rename to jdk/make/data/tzdata/systemv
diff --git a/jdk/make/sun/javazic/tzdata/zone.tab b/jdk/make/data/tzdata/zone.tab
similarity index 100%
rename from jdk/make/sun/javazic/tzdata/zone.tab
rename to jdk/make/data/tzdata/zone.tab
diff --git a/jdk/make/tools/UnicodeData/PropList.txt b/jdk/make/data/unicodedata/PropList.txt
similarity index 100%
rename from jdk/make/tools/UnicodeData/PropList.txt
rename to jdk/make/data/unicodedata/PropList.txt
diff --git a/jdk/make/tools/UnicodeData/Scripts.txt b/jdk/make/data/unicodedata/Scripts.txt
similarity index 100%
rename from jdk/make/tools/UnicodeData/Scripts.txt
rename to jdk/make/data/unicodedata/Scripts.txt
diff --git a/jdk/make/tools/UnicodeData/SpecialCasing.txt b/jdk/make/data/unicodedata/SpecialCasing.txt
similarity index 100%
rename from jdk/make/tools/UnicodeData/SpecialCasing.txt
rename to jdk/make/data/unicodedata/SpecialCasing.txt
diff --git a/jdk/make/tools/UnicodeData/UnicodeData.txt b/jdk/make/data/unicodedata/UnicodeData.txt
similarity index 100%
rename from jdk/make/tools/UnicodeData/UnicodeData.txt
rename to jdk/make/data/unicodedata/UnicodeData.txt
diff --git a/jdk/make/tools/UnicodeData/VERSION b/jdk/make/data/unicodedata/VERSION
similarity index 100%
rename from jdk/make/tools/UnicodeData/VERSION
rename to jdk/make/data/unicodedata/VERSION
diff --git a/jdk/make/docs/CORE_PKGS.gmk b/jdk/make/docs/CORE_PKGS.gmk
deleted file mode 100644
index 1a5e736..0000000
--- a/jdk/make/docs/CORE_PKGS.gmk
+++ /dev/null
@@ -1,300 +0,0 @@
-#
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# EXCLUDE_PKGS is the list of packages to exclude from the
-# Java API Specification. Do not add these to CORE_PKGS.
-# The concatenation of EXCLUDE_PKGS and CORE_PKGS
-# should make up the list of all packages under the
-# src/shared/classes directory of the JDK source tree.
-#
-EXCLUDE_PKGS = \
- java.awt.peer \
- java.awt.dnd.peer \
- sun.* \
- com.sun.* \
- org.apache.* \
- org.jcp.* \
- org.w3c.dom.css \
- org.w3c.dom.html \
- org.w3c.dom.stylesheets \
- org.w3c.dom.traversal \
- org.w3c.dom.ranges \
- org.w3c.dom.views \
- org.omg.stub.javax.management.remote.rmi
-
-#
-# ACTIVE_JSR_PKGS are packages that are part of an active JSR process--
-# one that is doing its own review. These packages are not included when
-# creating diff pages for the platform's JCP process.
-#
-# (see /java/pubs/apisrc/jdk/6.0/beta/make/docs/active_jsr_pkgs)
-# Note:
-# This is a list of regular expressions. So foo.* matches "foo" and "foo.bar".
-#
-ACTIVE_JSR_PKGS= \
- java.lang.invoke \
- java.sql \
- javax.activation \
- javax.annotation.* \
- javax.jws.* \
- javax.lang.* \
- javax.management.* \
- javax.script \
- javax.sql.* \
- javax.tools.* \
- javax.xml.* \
- org.w3c.* \
- org.xml.sax
-
-#
-# CORE_PKGS is the list of packages that form the
-# Java API Specification.
-#
-### ***IMPORTANT NOTE***
-### There is also a "REGEXP" variable in the docs/makefile that
-### determines which table the packages go in on the main page.
-### Currently, there is only table ("Platform Packages") and
-### everything goes in it, so REGEXP is "*". But if that policy
-### changes, packages added will need to be reflected in that
-### list of wildcard expressions, as well.
-###
-CORE_PKGS = \
- java.applet \
- java.awt \
- java.awt.color \
- java.awt.datatransfer \
- java.awt.dnd \
- java.awt.event \
- java.awt.font \
- java.awt.geom \
- java.awt.im \
- java.awt.im.spi \
- java.awt.image \
- java.awt.image.renderable \
- java.awt.print \
- java.beans \
- java.beans.beancontext \
- java.io \
- java.lang \
- java.lang.annotation \
- java.lang.instrument \
- java.lang.invoke \
- java.lang.management \
- java.lang.ref \
- java.lang.reflect \
- java.math \
- java.net \
- java.nio \
- java.nio.channels \
- java.nio.channels.spi \
- java.nio.charset \
- java.nio.charset.spi \
- java.nio.file \
- java.nio.file.attribute \
- java.nio.file.spi \
- java.rmi \
- java.rmi.activation \
- java.rmi.dgc \
- java.rmi.registry \
- java.rmi.server \
- java.security \
- java.security.acl \
- java.security.cert \
- java.security.interfaces \
- java.security.spec \
- java.sql \
- java.text \
- java.text.spi \
- java.time \
- java.time.chrono \
- java.time.format \
- java.time.temporal \
- java.time.zone \
- java.util \
- java.util.concurrent \
- java.util.concurrent.atomic \
- java.util.concurrent.locks \
- java.util.function \
- java.util.jar \
- java.util.logging \
- java.util.prefs \
- java.util.regex \
- java.util.spi \
- java.util.stream \
- java.util.zip \
- javax.accessibility \
- javax.activation \
- javax.activity \
- javax.annotation \
- javax.annotation.processing \
- javax.crypto \
- javax.crypto.interfaces \
- javax.crypto.spec \
- javax.imageio \
- javax.imageio.event \
- javax.imageio.metadata \
- javax.imageio.plugins.jpeg \
- javax.imageio.plugins.bmp \
- javax.imageio.spi \
- javax.imageio.stream \
- javax.jws \
- javax.jws.soap \
- javax.lang.model \
- javax.lang.model.element \
- javax.lang.model.type \
- javax.lang.model.util \
- javax.management \
- javax.management.loading \
- javax.management.monitor \
- javax.management.relation \
- javax.management.openmbean \
- javax.management.timer \
- javax.management.modelmbean \
- javax.management.remote \
- javax.management.remote.rmi \
- javax.naming \
- javax.naming.directory \
- javax.naming.event \
- javax.naming.ldap \
- javax.naming.spi \
- javax.net \
- javax.net.ssl \
- javax.print \
- javax.print.attribute \
- javax.print.attribute.standard \
- javax.print.event \
- javax.rmi \
- javax.rmi.CORBA \
- javax.rmi.ssl \
- javax.script \
- javax.security.auth \
- javax.security.auth.callback \
- javax.security.auth.kerberos \
- javax.security.auth.login \
- javax.security.auth.spi \
- javax.security.auth.x500 \
- javax.security.cert \
- javax.security.sasl \
- javax.sound.sampled \
- javax.sound.sampled.spi \
- javax.sound.midi \
- javax.sound.midi.spi \
- javax.sql \
- javax.sql.rowset \
- javax.sql.rowset.serial \
- javax.sql.rowset.spi \
- javax.swing \
- javax.swing.border \
- javax.swing.colorchooser \
- javax.swing.filechooser \
- javax.swing.event \
- javax.swing.table \
- javax.swing.text \
- javax.swing.text.html \
- javax.swing.text.html.parser \
- javax.swing.text.rtf \
- javax.swing.tree \
- javax.swing.undo \
- javax.swing.plaf \
- javax.swing.plaf.basic \
- javax.swing.plaf.metal \
- javax.swing.plaf.multi \
- javax.swing.plaf.nimbus \
- javax.swing.plaf.synth \
- javax.tools \
- javax.tools.annotation \
- javax.transaction \
- javax.transaction.xa \
- javax.xml.parsers \
- javax.xml.bind \
- javax.xml.bind.annotation \
- javax.xml.bind.annotation.adapters \
- javax.xml.bind.attachment \
- javax.xml.bind.helpers \
- javax.xml.bind.util \
- javax.xml.soap \
- javax.xml.ws \
- javax.xml.ws.handler \
- javax.xml.ws.handler.soap \
- javax.xml.ws.http \
- javax.xml.ws.soap \
- javax.xml.ws.spi \
- javax.xml.ws.spi.http \
- javax.xml.ws.wsaddressing \
- javax.xml.transform \
- javax.xml.transform.sax \
- javax.xml.transform.dom \
- javax.xml.transform.stax \
- javax.xml.transform.stream \
- javax.xml \
- javax.xml.crypto \
- javax.xml.crypto.dom \
- javax.xml.crypto.dsig \
- javax.xml.crypto.dsig.dom \
- javax.xml.crypto.dsig.keyinfo \
- javax.xml.crypto.dsig.spec \
- javax.xml.datatype \
- javax.xml.validation \
- javax.xml.namespace \
- javax.xml.xpath \
- javax.xml.stream \
- javax.xml.stream.events \
- javax.xml.stream.util \
- org.ietf.jgss \
- org.omg.CORBA \
- org.omg.CORBA.DynAnyPackage \
- org.omg.CORBA.ORBPackage \
- org.omg.CORBA.TypeCodePackage \
- org.omg.stub.java.rmi \
- org.omg.CORBA.portable \
- org.omg.CORBA_2_3 \
- org.omg.CORBA_2_3.portable \
- org.omg.CosNaming \
- org.omg.CosNaming.NamingContextExtPackage \
- org.omg.CosNaming.NamingContextPackage \
- org.omg.SendingContext \
- org.omg.PortableServer \
- org.omg.PortableServer.CurrentPackage \
- org.omg.PortableServer.POAPackage \
- org.omg.PortableServer.POAManagerPackage \
- org.omg.PortableServer.ServantLocatorPackage \
- org.omg.PortableServer.portable \
- org.omg.PortableInterceptor \
- org.omg.PortableInterceptor.ORBInitInfoPackage \
- org.omg.Messaging \
- org.omg.IOP \
- org.omg.IOP.CodecFactoryPackage \
- org.omg.IOP.CodecPackage \
- org.omg.Dynamic \
- org.omg.DynamicAny \
- org.omg.DynamicAny.DynAnyPackage \
- org.omg.DynamicAny.DynAnyFactoryPackage \
- org.w3c.dom \
- org.w3c.dom.events \
- org.w3c.dom.bootstrap \
- org.w3c.dom.ls \
- org.xml.sax \
- org.xml.sax.ext \
- org.xml.sax.helpers
diff --git a/jdk/make/docs/Makefile b/jdk/make/docs/Makefile
deleted file mode 100644
index ad9a2c5..0000000
--- a/jdk/make/docs/Makefile
+++ /dev/null
@@ -1,1178 +0,0 @@
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
-#
-BUILDDIR=..
-PRODUCT=docs
-include $(BUILDDIR)/common/Defs.gmk
-
-# Get CopyrightLine macro and other shared variables
-include $(BUILDDIR)/common/shared/Defs-javadoc.gmk
-
-# Url to root of documents
-DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
-
-# Url to copyright html file
-COPYRIGHT_URL-7 = $(DOCSDIR_URL)/legal/cpyr.html
-COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
-
-# Url to bug filing site
-BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/
-
-# Common line for how to submit a bug or rfe
-BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
-
-# Url to devdocs page
-# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
-DEV_DOCS_URL-5 = http://java.sun.com/j2se/1.5.0/docs/index.html
-DEV_DOCS_URL-6 = http://download.oracle.com/javase/6/docs/index.html
-DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
-DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
-DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
-DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
-
-# Url to Java Language Spec
-#JLS3_URL = http://java.sun.com/docs/books/jls/
-
-# Common Java trademark line
-JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
-$(FULL_COMPANY_NAME) in the US and other countries.
-
-#
-# Definitions for imported components
-#
-include $(BUILDDIR)/common/internal/ImportComponents.gmk
-
-# We override whatever the max VM memory setting is here.
-# NOTE: javadoc will not complete without these larger settings.
-# WARNING: This could cause thrashing on low memory machines.
-ifeq ($(ARCH_DATA_MODEL),64)
- MAX_VM_MEMORY = 1024
-else ifeq ($(ARCH),universal)
- MAX_VM_MEMORY = 1024
-else
- MAX_VM_MEMORY = 768
-endif
-
-# List of all possible directories for javadoc to look for sources
-# NOTE: Quotes are required around sourcepath argument only on Windows.
-# Otherwise, you get "No packages or classes specified." due
-# to $(CLASSPATH_SEPARATOR) being interpreted as an end of
-# command (newline or shell ; character)
-ALL_SOURCE_DIRS = $(SHARE_SRC)/classes \
- $(IMPORTSRCDIR) \
- $(GENSRCDIR) \
- $(SHARE_SRC)/../solaris/classes \
- $(SHARE_SRC)/../windows/classes \
- $(SHARE_SRC)/doc/stub
-
-# List of directories that actually exist
-ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
-
-# List with classpath separator between them
-EMPTY:=
-SPACE:= $(EMPTY) $(EMPTY)
-RELEASEDOCS_SOURCEPATH = \
- $(subst $(SPACE),$(CLASSPATH_SEPARATOR),$(strip $(ALL_SOURCE_DIRS)))
-
-# Prep for javadoc creation, assumes $@ is an index.html file
-define prep-javadoc
-@if [ -f "$@" -a "$?" != "" ] ; then \
- $(ECHO) "# Dependencies have changed: $?"; \
-fi
-$(RM) -r $(@D)
-$(MKDIR) -p $(@D)
-endef
-
-# A cache of the directories in ALL_SOURCE_DIRS
-DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
-
-# Given a list of packages, return a list of files or dirs to be dependent on
-# (Currently only returning a list of directories)
-define PackageDependencies # packages
-$(shell \
- if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
- for p in $1 ; do \
- pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
- $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
- done; \
- fi \
-)
-endef
-
-# Given a list of packages, add packages that exist to $@, print summary
-define PackageFilter # packages
-@if [ "$1" != "" ] ; then \
- for p in $1 ; do \
- pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
- found="false"; \
- for cp in $(ALL_SOURCE_DIRS) ; do \
- if [ -d $${cp}/$${pd} ] ; then \
- $(ECHO) "$${p}" >> $@; \
- found="true"; \
- break; \
- fi; \
- done; \
- if [ "$${found}" = "false" ] ; then \
- $(ECHO) "WARNING: Package not found: $${p}"; \
- fi; \
- done; \
-fi
-endef
-
-# Print out a summary of the javadoc command about to be run
-define JavadocSummary # optionsfile packagesfile
-@$(ECHO) "# Summary for $@";\
- $(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@# @' $1; \
- $(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@# @' $2
-endef
-
-#
-# Temporary directory for javadoc creation
-#
-DOCSTMPDIR = $(TEMPDIR)/doctmp
-
-#
-# Different api directories created from root directory
-#
-COREAPI_DOCSDIR = $(DOCSDIR)/api
-JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
-JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
-PLATFORM_DOCSDIR = $(DOCSDIR)/platform
-
-# The non-core api javadocs need to be able to access the root of the core
-# api directory, so for jdk/api or jre/api to get to the core api/
-# directory we would use this:
-JDKJRE2COREAPI = ../../api
-
-# Common bottom argument
-define CommonBottom # year
-<font size="-1"><br> $(call CopyrightLine,,$1,)</font>
-endef
-
-# Common trademark bottom argument (Not sure why this is used sometimes)
-define CommonTrademarkBottom # year
-<font size="-1">\
-$(BUG_SUBMIT_LINE)<br>$(JAVA_TRADEMARK_LINE)<br>\
-$(call CopyrightLine,,$1,$(COMPANY_ADDRESS))\
-</font>
-endef
-
-# Common echo of option
-define OptionOnly # opt
-$(PRINTF) "%s\n" "$1"
-endef
-define OptionPair # opt arg
-$(PRINTF) "%s '%s'\n" "$1" '$2'
-endef
-define OptionTrip # opt arg arg
-$(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
-endef
-
-# Core api bottom argument (with special sauce)
-COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\
-<br>For further API reference and developer documentation, \
-see <a href="$(DEV_DOCS_URL)" target="_blank">Java SE Documentation</a>. \
-That documentation contains more detailed, developer-targeted descriptions, \
-with conceptual overviews, definitions of terms, workarounds, \
-and working code examples.<br>\
-$(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
-</font>
-
-# Common javadoc options used by all
-COMMON_JAVADOCFLAGS = \
- $(NO_PROPRIETARY_API_WARNINGS) \
- -quiet \
- -use \
- -keywords \
- -Xdoclint:none \
- -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \
- $(ADDITIONAL_JAVADOCFLAGS)
-
-ifdef OPENJDK
- ADDITIONAL_JAVADOCFLAGS = \
- -Xdocrootparent $(DOCS_BASE_URL)
-else
- ADDITIONAL_JAVADOCFLAGS =
-endif
-
-# Draft used for non-fcs documents
-JDK_IS_FCS = false
-DRAFT_HEADER =
-ifeq ($(JDK_MINOR_VERSION),5)
- JDK_IS_FCS = true
-endif
-ifeq ($(JDK_MINOR_VERSION),6)
- JDK_IS_FCS = true
-endif
-ifeq ($(JDK_MINOR_VERSION),7)
- JDK_IS_FCS = true
-endif
-ifeq ($(JDK_IS_FCS),false)
- ifneq ($(MILESTONE), fcs)
- DRAFT_HEADER = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
- DRAFT_BOTTOM = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
- DRAFT_WINTITLE = $(BUILD_NUMBER)
- # Early access top text (not used in FCS releases)
- COREAPI_TOP_EARLYACCESS = \
-<div style="background-color: \#EEEEEE"> \
-<div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
-margin-left: 6px; margin-right: 6px; text-align: justify; \
-font-size: 80%; font-family: Helvetica, Arial, sans-serif; \
-font-weight: normal;"> \
-Please note that the specifications and other information \
-contained herein are not final and are subject to change. \
-The information is being made available to you solely for purpose of \
-evaluation. \
-</div> </div>
- endif
-endif
-
-#################################################################
-
-#
-# CORE_PKGS environment variable has been moved to the following file
-#
-include CORE_PKGS.gmk
-
-#
-# Load environment variables for API package names that are not part of
-# the Java SE platform
-#
-include NON_CORE_PKGS.gmk
-
-#################################################################
-
-#
-# Default target is same as docs target, create core api and all others it can
-#
-
-all: docs
-docs: coredocs otherdocs
-
-#################################################################
-# Production Targets -- USE THESE TARGETS WHEN:
-# a) You're generating docs outside of release engineering's
-# standard control build.
-# b) The docs will be pushed to the web and/or included in
-# the downloaded doc bundle.
-#
-# See: Notes.html#releaseTargets
-# Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
-#
-
-sanitycheckcoredocs:
- @$(ECHO) ""
- @$(ECHO) "Building core api docs with these values:"
- @$(ECHO) " BUILD_NUMBER = $(BUILD_NUMBER)"
- @$(ECHO) " MILESTONE = $(MILESTONE)"
- @$(ECHO) ""
- ifeq ($(BUILD_NUMBER), b00)
- @$(ECHO) "ERROR: Build number must be defined"
- @$(ECHO) "MILESTONE is set to $(MILESTONE)"
- @$(ECHO) ""
- exit 1
- endif
-
-#############################################################
-#
-# coredocs
-#
-COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
-$(JDK_MINOR_VERSION)<br>API Specification
-COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
-COREAPI_HEADER = \
-<strong>Java$(TRADEMARK) Platform<br>Standard Ed. $(JDK_MINOR_VERSION)</strong>
-
-# Java language specification cite
-TAG_JLS = jls:a:See <cite> \
-The Java™ Language Specification</cite>:
-
-# Overview file for core apis
-COREAPI_OVERVIEW = $(SHARE_SRC)/classes/overview-core.html
-
-# The index.html, options, and packages files
-COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
-COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
-COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
-
-coredocs: $(COREAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(COREAPI_INDEX_FILE): GET2DOCSDIR=..
-
-# Run javadoc if the index file is out of date or missing
-$(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ISO-8859-1) ; \
- $(call OptionPair,-tag,beaninfo:X) ; \
- $(call OptionPair,-tag,revised:X) ; \
- $(call OptionPair,-tag,since.unbundled:X) ; \
- $(call OptionPair,-tag,spec:X) ; \
- $(call OptionPair,-tag,specdefault:X) ; \
- $(call OptionPair,-tag,Note:X) ; \
- $(call OptionPair,-tag,ToDo:X) ; \
- $(call OptionPair,-tag,$(TAG_JLS)) ; \
- $(call OptionOnly,-splitIndex) ; \
- $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ;\
- $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- ) >> $@
-ifdef COREAPI_TOP_EARLYACCESS
- @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
-endif
-
-# Create a file with the package names in it
-$(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
- $(prep-target)
- $(call PackageFilter,$(CORE_PKGS))
-
-#############################################################
-#
-# docletapidocs
-#
-
-# Part of langtools
-ifdef LANGTOOLS_DIST
- ALL_OTHER_TARGETS += docletapidocs
-endif
-
-DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
-DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOCLETAPI_DOCTITLE := Doclet API
-DOCLETAPI_WINDOWTITLE := Doclet API
-DOCLETAPI_HEADER := <strong>Doclet API</strong>
-DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
-DOCLETAPI_GROUPNAME := Packages
-DOCLETAPI_REGEXP := com.sun.javadoc
-# DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
-DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
-DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages
-
-docletapidocs: $(DOCLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOCLETAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-breakiterator) ; \
- $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
- $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(DOCLETAPI_PKGS))
-
-#############################################################
-#
-# tagletapidocs
-#
-
-# Part of langtools
-ifdef LANGTOOLS_DIST
- ALL_OTHER_TARGETS += tagletapidocs
-endif
-
-TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
-TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
-# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
-
-# Temporary directory (special generation rules)
-TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
-
-# The index.html, options, and packages files
-TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
-TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
-TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
-
-tagletapidocs: $(TAGLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(RM) -r $(TAGLETAPI_TEMPDIR)
- $(MKDIR) -p $(TAGLETAPI_TEMPDIR)
- $(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(TAGLETAPI_TEMPDIR) \
- @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
- cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
- cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
- $(RM) -r $(TAGLETAPI_TEMPDIR)
-
-# Create file with javadoc options in it
-$(TAGLETAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nonavbar) ; \
- $(call OptionOnly,-noindex) ; \
- $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(TAGLETAPI_PACKAGES_FILE): $(IMPORTSRCDIR)/$(TAGLETAPI_FILE)
- $(prep-target)
- @($(ECHO) "$(IMPORTSRCDIR)/$(TAGLETAPI_FILE)" ) > $@
-
-#############################################################
-#
-# domapidocs
-#
-
-ALL_OTHER_TARGETS += domapidocs
-
-DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
-DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOMAPI_DOCTITLE := Common DOM API
-DOMAPI_WINDOWTITLE := Common DOM API
-DOMAPI_HEADER := <strong>Common DOM API</strong>
-DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
-DOMAPI_GROUPNAME := Packages
-DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
-# DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
-DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
-DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages
-
-domapidocs: $(DOMAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOMAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-splitIndex) ; \
- $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
- $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(DOMAPI_PKGS))
-
-#############################################################
-#
-# jpdadocs
-#
-
-ALL_OTHER_TARGETS += jpdadocs
-
-jpdadocs: jdidocs jdwpdocs jvmtidocs
-
-#############################################################
-#
-# jdidocs
-#
-
-ALL_OTHER_TARGETS += jdidocs
-
-JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
-JDI2COREAPI := ../../$(JDKJRE2COREAPI)
-JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
-JDI_WINDOWTITLE := Java Debug Interface
-JDI_HEADER := <strong>Java Debug Interface</strong>
-JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
-JDI_OVERVIEW := $(SHARE_SRC)/classes/jdi-overview.html
-# JDI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
-JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
-JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages
-
-jdidocs: $(JDI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JDI_PKGS))
-
-#############################################################
-#
-# jdwpdocs
-#
-
-ALL_OTHER_TARGETS += jdwpdocs
-
-JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
-JDWP_SPEC = $(BUILDDIR)/jpda/jdwp/jdwp.spec
-JDWPGEN_JARFILE = $(BUILDTOOLJARDIR)/jdwpgen.jar
-
-jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
-$(JDWP_DOCDIR)/jdwp-protocol.html: $(JDWPGEN_JARFILE) $(JDWP_SPEC)
- $(prep-javadoc)
- $(BOOT_JAVA_CMD) -jar $(JDWPGEN_JARFILE) $(JDWP_SPEC) -doc $@
-
-#############################################################
-#
-# jvmtidocs
-#
-
-ALL_OTHER_TARGETS += jvmtidocs
-
-JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
-JVMTI_HTML = $(HOTSPOT_DOCS_IMPORT_PATH)/platform/jvmti/jvmti.html
-
-jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
-$(JVMTI_DOCDIR)/jvmti.html:
- @$(prep-javadoc)
- @if [ -f $(JVMTI_HTML) ] ; then \
- $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
- $(CP) $(JVMTI_HTML) $@; \
- else \
- $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
- fi
-
-#############################################################
-#
-# jaasdocs
-#
-
-ALL_OTHER_TARGETS += jaasdocs
-
-JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
-JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
-JAAS_WINDOWTITLE := Java Authentication and Authorization Service
-JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
-JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
-# JAAS_PKGS is located in NON_CORE_PKGS.gmk
-JAAS_OVERVIEW := $(SHARE_SRC)/classes/com/sun/security/auth/jaas-overview.html
-
-# The index.html, options, and packages files
-JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
-JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
-JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages
-
-jaasdocs: $(JAAS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JAAS_PKGS))
-
-#############################################################
-#
-# jgssdocs
-#
-
-ALL_OTHER_TARGETS += jgssdocs
-
-JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
-JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
-JGSS_WINDOWTITLE := Java GSS-API Utilities
-JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
-JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
-JGSS_OVERVIEW := $(SHARE_SRC)/classes/com/sun/security/jgss/jgss-overview.html
-# JGSS_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
-JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
-JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages
-
-jgssdocs: $(JGSS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JGSS_PKGS))
-
-#############################################################
-#
-# smartcardiodocs
-#
-
-ALL_OTHER_TARGETS += smartcardiodocs
-
-SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
-SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
-SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
-SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O
-SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
-SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
-# SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
-SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
-SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages
-
-smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
-
-# Set relative location to core api document root
-$(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SMARTCARDIO_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
- $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
- $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
- $(prep-target)
- $(call PackageFilter,$(SMARTCARDIO_PKGS))
-
-#############################################################
-#
-# httpserverdocs
-#
-
-ALL_OTHER_TARGETS += httpserverdocs
-
-HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
-HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
-HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
-HTTPSERVER_WINDOWTITLE := Java HTTP Server
-HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
-HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
-# HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
-
-HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
-HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
-HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages
-
-httpserverdocs: $(HTTPSERVER_INDEX_HTML)
-
-# Set relative location to core api document root
-$(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(HTTPSERVER_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
- $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
- $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
- $(prep-target)
- $(call PackageFilter,$(HTTPSERVER_PKGS))
-
-#############################################################
-#
-# mgmtdocs
-#
-
-ALL_OTHER_TARGETS += mgmtdocs
-
-MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
-MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
-JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
-JVM_MIB_SRC := $(CLOSED_SRC)/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
-MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
-MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
-MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
-MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
-MGMT_OVERVIEW := $(SHARE_SRC)/classes/com/sun/management/mgmt-overview.html
-# MGMT_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
-MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
-MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages
-
-mgmtdocs: $(MGMT_INDEX_FILE)
-
-# Set relative location to core api document root
-$(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE)
- $(prep-javadoc)
- @if [ -f $(JVM_MIB_SRC) ] ; then \
- $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
- $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
- else \
- $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
- fi
- $(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
- $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
- $(prep-target)
- $(call PackageFilter,$(MGMT_PKGS))
-
-#############################################################
-#
-# attachdocs
-#
-
-ALL_OTHER_TARGETS += attachdocs
-
-ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
-ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
-ATTACH_DOCTITLE := Attach API
-ATTACH_WINDOWTITLE := Attach API
-ATTACH_HEADER := <strong>Attach API</strong>
-ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
-# ATTACH_PKGS is located in NON_CORE_PKGS.gmk
-
-ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
-ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
-ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages
-
-attachdocs: $(ATTACH_INDEX_HTML)
-
-# Set relative location to core api document root
-$(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(ATTACH_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
- $(prep-target)
- $(call PackageFilter,$(ATTACH_PKGS))
-
-#############################################################
-#
-# jconsoledocs
-#
-
-ALL_OTHER_TARGETS += jconsoledocs
-
-JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
-JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
-JCONSOLE_DOCTITLE := JConsole API
-JCONSOLE_WINDOWTITLE := JConsole API
-JCONSOLE_HEADER := <strong>JConsole API</strong>
-JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
-# JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk
-
-JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
-JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
-JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages
-
-jconsoledocs: $(JCONSOLE_INDEX_HTML)
-
-# Set relative location to core api document root
-$(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JCONSOLE_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
- $(prep-target)
- $(call PackageFilter,$(JCONSOLE_PKGS))
-
-#############################################################
-#
-# treeapidocs
-#
-
-# Part of langtools
-ifdef LANGTOOLS_DIST
- ALL_OTHER_TARGETS += treeapidocs
-endif
-
-TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
-TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TREEAPI_DOCTITLE := Compiler Tree API
-TREEAPI_WINDOWTITLE := Compiler Tree API
-TREEAPI_HEADER := <strong>Compiler Tree API</strong>
-TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
-TREEAPI_GROUPNAME := Packages
-TREEAPI_REGEXP := com.sun.source.*
-# TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
-TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
-TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
-
-treeapidocs: $(TREEAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(TREEAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-tag,$(TAG_JLS)) ; \
- $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
- $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(TREEAPI_PKGS))
-
-#############################################################
-#
-# sctpdocs
-#
-
-ALL_OTHER_TARGETS += sctpdocs
-
-SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
-SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
-SCTPAPI_DOCTITLE := SCTP API
-SCTPAPI_WINDOWTITLE := SCTP API
-SCTPAPI_HEADER := <strong>SCTP API</strong>
-SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
-# SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
-SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
-SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages
-
-sctpdocs: $(SCTPAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(SCTSCTSCTP: GET2DOCSDIR=$(SCTPAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SCTPAPI_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
- $(prep-target)
- $(call PackageFilter,$(SCTPAPI_PKGS))
-
-#############################################################
-#
-# Get a cache of all the directories
-
-$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
- $(prep-target)
- @for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
- $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
- $(FIND) $${cp} -type f >> $@; \
- done
-
-#############################################################
-#release version of core packages ########
-# Maximize performance and ensure that build number & milestone are set.
-
-rel-coredocs: sanitycheckcoredocs
- $(MAKE) coredocs
-
-rel-docs: rel-coredocs $(ALL_OTHER_TARGETS)
-#
-# end of production targets
-
-otherdocs: $(ALL_OTHER_TARGETS)
-
-clean:
- $(RM) -r $(DOCSDIR) $(DOCSTMPDIR)
-
-#############################################################
-# DEBUG TARGET
-# List the values defined in the makefile hierarchy, to make sure everything
-# is set properly, and to help identify values we can use instead of making new ones.
-# (Most of them come from common/shared/Defs.gmk)
-#
-# Notes:
-# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
-# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
-#
-
-echovalues:
- @$(ECHO) ""
- @$(ECHO) --------------Imports---------------------------
- @$(ECHO) "IMPORT_PACKAGES = $(IMPORT_PACKAGES)"
- @$(ECHO) "IMPORT_PACKAGE_FILTER = $(IMPORT_PACKAGE_FILTER)"
- @$(ECHO) --------------Imports---------------------------
- @$(ECHO) ""
- @$(ECHO) --------------Shared---------------------------
- @$(ECHO) BUILD_NUMBER = $(BUILD_NUMBER)
- @$(ECHO) FULL_VERSION = $(FULL_VERSION)
- @$(ECHO) JDK_VERSION = $(JDK_VERSION)
- @$(ECHO) JDK_MAJOR_VERSION = $(JDK_MAJOR_VERSION)
- @$(ECHO) JDK_MINOR_VERSION = $(JDK_MINOR_VERSION)
- @$(ECHO) JDK_MICRO_VERSION = $(JDK_MICRO_VERSION)
- @$(ECHO) JDK_UPDATE_VERSION = $(JDK_UPDATE_VERSION)
- @$(ECHO) JDK_MKTG_VERSION = $(JDK_MKTG_VERSION)
- @$(ECHO) JDK_UNDERSCORE_VERSION = $(JDK_UNDERSCORE_VERSION)
- @$(ECHO) JDK_MKTG_UNDERSCORE_VERSION = $(JDK_MKTG_UNDERSCORE_VERSION)
- @$(ECHO) MARKETING_NUMBER = $(MARKETING_NUMBER)
- @$(ECHO) MARKET_NAME = $(MARKET_NAME)
- @$(ECHO) MILESTONE = $(MILESTONE)
- @$(ECHO) RELEASE = $(RELEASE)
- @$(ECHO) USER_RELEASE_SUFFIX = $(USER_RELEASE_SUFFIX)
- @$(ECHO) --------------Shared---------------------------
- @$(ECHO) ""
- @$(ECHO) --------------common/Defs---------------------------
- @$(ECHO) "RELEASEDOCS_SOURCEPATH"
- @$(ECHO) " SHARE_SRC/classes: $(SHARE_SRC)/classes"
- @$(ECHO) " PLATFORM_SRC/classes: $(PLATFORM_SRC)/classes"
- @$(ECHO) " GENSRCDIR: $(GENSRCDIR)"
- @$(ECHO) " SHARE_SRC/doc/stub: $(SHARE_SRC)/doc/stub"
- @$(ECHO) " IMPORTSRCDIR: $(IMPORTSRCDIR)"
- @$(ECHO) --------------common/Defs---------------------------
- @$(ECHO) ""
-
-#############################################################
-.PHONY: all docs coredocs rel-docs echovalues otherdocs rel-coredocs \
- sanitycheckcoredocs $(ALL_OTHER_TARGETS)
-
diff --git a/jdk/make/docs/NON_CORE_PKGS.gmk b/jdk/make/docs/NON_CORE_PKGS.gmk
deleted file mode 100644
index 949637c..0000000
--- a/jdk/make/docs/NON_CORE_PKGS.gmk
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# This file contains the package names of all the "non-core"
-# API published in the Java 2 SDK documentation. "Non-core" means
-# it includes all published API outside of the JDK API specification.
-#
-# These environment variables are used by javadoc in
-# make/docs/Makefile and are referenced by the localization
-# team when determining which APIs to extract javadoc
-# comments from.
-
-DOMAPI_PKGS = com.sun.java.browser.dom \
- org.w3c.dom \
- org.w3c.dom.bootstrap \
- org.w3c.dom.ls \
- org.w3c.dom.ranges \
- org.w3c.dom.traversal \
- org.w3c.dom.html \
- org.w3c.dom.stylesheets \
- org.w3c.dom.css \
- org.w3c.dom.events \
- org.w3c.dom.views
-
-JDI_PKGS = com.sun.jdi \
- com.sun.jdi.event \
- com.sun.jdi.request \
- com.sun.jdi.connect \
- com.sun.jdi.connect.spi
-
-MGMT_PKGS = com.sun.management
-
-JAAS_PKGS = com.sun.security.auth \
- com.sun.security.auth.callback \
- com.sun.security.auth.login \
- com.sun.security.auth.module
-
-JGSS_PKGS = com.sun.security.jgss
-
-OLD_JSSE_PKGS = com.sun.net.ssl
-
-HTTPSERVER_PKGS = com.sun.net.httpserver \
- com.sun.net.httpserver.spi
-
-NIO_PKGS = com.sun.nio.file
-
-DOCLETAPI_PKGS = com.sun.javadoc
-
-TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
-
-ATTACH_PKGS = com.sun.tools.attach \
- com.sun.tools.attach.spi
-
-JCONSOLE_PKGS = com.sun.tools.jconsole
-
-TREEAPI_PKGS = com.sun.source.doctree \
- com.sun.source.tree \
- com.sun.source.util
-
-SMARTCARDIO_PKGS = javax.smartcardio
-
-SCTPAPI_PKGS = com.sun.nio.sctp
-
-ifeq ($(PLATFORM), macosx)
-APPLE_EXT_PKGS = com.apple.concurrent \
- com.apple.eawt \
- com.apple.eawt.event \
- com.apple.eio
-endif
-
-# non-core packages in rt.jar
-NON_CORE_PKGS = $(DOMAPI_PKGS) \
- $(MGMT_PKGS) \
- $(JAAS_PKGS) \
- $(JGSS_PKGS) \
- $(NIO_PKGS) \
- $(OLD_JSSE_PKGS) \
- $(HTTPSERVER_PKGS) \
- $(SMARTCARDIO_PKGS) \
- $(SCTPAPI_PKGS) \
- $(APPLE_EXT_PKGS)
-
diff --git a/jdk/make/docs/Notes.html b/jdk/make/docs/Notes.html
deleted file mode 100644
index e3d8ae1..0000000
--- a/jdk/make/docs/Notes.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Doc Process Notes</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h3><a name="REGEXP"></a><br>
-REGEXP</h3>
-<p> REGEXP is a list of wildcard patterns that determines which packages listed
- in CORE_PKGS.gmk go into which summary-table on the main API index page. It
- was motivated by the need to divide the world into "core packages"
- (java.*) and "extension packages" (javax.*). In time, the distinction
- went away. The whole table is now called "Platform Packages"--which
- eliminated the need for this list of regular expressions. But it lingered on,
- accreting all of the packages in the JVM, one by one. I pruned it back to "*",
- so it now covers every package in the Java platform API docs. If some separation
- is needed in the future, it can grow back into a colon-separated list, starting
- with this, which is in all respects equivalent to "*" at this point
- in time:</p>
-<blockquote>
- <pre>REGEXP = "java.*:javax.*:org.ietf*:org.omg.</pre>
-</blockquote>
-<h3><a name="releaseTargets"></a><br>
- Release Targets</h3>
-<p> (Thanks to Kelly O'Hair for this info.)</p>
-<p> The <tt>rel-coredocs</tt> and <tt>rel-docs</tt> targets were added by Eric
- Armstrong. <tt>rel-coredocs</tt> assumes the kind of large, 32-bit machine used
- in the javapubs group's docs-release process. It specifies memory settings accordingly
- to maximize performance.</p>
-<p> The performance settings, like the sanity check, are most important for the
- core docs--the platform APIs. Running javadoc on those APIs takes a significant
- amount of time and memory. Setting the initial heap size as large as possible
- is important to prevent thrashing as the heap grows. Setting the maximum as
- large as necessary is also important to keep the job from failing.</p>
-<blockquote>
- <p> <tt>-J-Xmx512</tt> sets a maximum of 512, which became necessary in 6.0<br>
- <tt>-J-Xms256</tt> sets starting size to 256 (default is 8)</p>
-</blockquote>
-<p> <tt>rel-coredocs</tt> also includes a sanity check to help ensure that <tt>BUILD_NUMBER</tt>
- and <tt>MILESTONE</tt> are specified properly when docs are built outside of
- the normal release engineering process, with the intention of releasing them
- on the web or in a downloaded docs bundle. (When invoked in release engineering's
- control build, the values are always set properly. But when the targets are
- run by themselves, they default to b00 and "internal"--which silently
- sabotage the result of a build that can take many hours to complete.</p>
-</body>
-</html>
diff --git a/jdk/make/gendata/GendataBreakIterator.gmk b/jdk/make/gendata/GendataBreakIterator.gmk
new file mode 100644
index 0000000..b1cc33d
--- /dev/null
+++ b/jdk/make/gendata/GendataBreakIterator.gmk
@@ -0,0 +1,99 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Make file for generating BreakIterator data files.
+#
+
+# 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.
+#
+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
+
+# Generate BreakIteratorData
+BREAK_ITERATOR_DIR = $(JDK_OUTPUTDIR)/break_iterator
+BREAK_ITERATOR_CLASSES = $(BREAK_ITERATOR_DIR)/classes
+
+# JAVAC_SOURCE_PATH_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 N-1 compatible.
+# Because we are targeting jdk N-1, but the surrounding source code is jdk N.
+# These two files should be moved out to a build tool! We have to disable
+# sjavac here as well.
+$(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR, \
+ SETUP := GENERATE_OLDBYTECODE, \
+ SRC := $(TEXT_SRCDIR), \
+ DISABLE_SJAVAC := true, \
+ JAVAC_SOURCE_PATH_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/data/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)/_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)
+ $(RM) $(BIFILES)
+ $(TOOL_GENERATEBREAKITERATORDATA) \
+ -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
+ $(RM) $(BIFILES_TH)
+ $(TOOL_GENERATEBREAKITERATORDATA) \
+ -o $(DATA_PKG_DIR) \
+ -spec $(UNICODEDATA) \
+ -language th
+ $(TOUCH) $@
+
+
+BREAK_ITERATOR += $(BIFILES) $(BIFILES_TH)
diff --git a/jdk/makefiles/gendata/GendataFontConfig.gmk b/jdk/make/gendata/GendataFontConfig.gmk
similarity index 100%
rename from jdk/makefiles/gendata/GendataFontConfig.gmk
rename to jdk/make/gendata/GendataFontConfig.gmk
diff --git a/jdk/makefiles/gendata/GendataHtml32dtd.gmk b/jdk/make/gendata/GendataHtml32dtd.gmk
similarity index 100%
rename from jdk/makefiles/gendata/GendataHtml32dtd.gmk
rename to jdk/make/gendata/GendataHtml32dtd.gmk
diff --git a/jdk/make/gendata/GendataTZDB.gmk b/jdk/make/gendata/GendataTZDB.gmk
new file mode 100644
index 0000000..b18d6a7
--- /dev/null
+++ b/jdk/make/gendata/GendataTZDB.gmk
@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+GENDATA_TZDB :=
+
+#
+# Time zone data file creation
+#
+TZDATA_DIR := $(JDK_TOPDIR)/make/data/tzdata
+TZDATA_TZFILE := africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera gmt jdk11_backward
+TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))
+
+GENDATA_TZDB_DAT := $(JDK_OUTPUTDIR)/lib/tzdb.dat
+
+$(GENDATA_TZDB_DAT): $(TZDATA_TZFILES)
+ $(RM) $(GENDATA_TZDB_DAT)
+ $(TOOL_TZDB) -srcdir $(TZDATA_DIR) -dstfile $(GENDATA_TZDB_DAT) $(TZDATA_TZFILE)
+
+GENDATA_TZDB += $(GENDATA_TZDB_DAT)
diff --git a/jdk/makefiles/gensrc/GensrcBuffer.gmk b/jdk/make/gensrc/GensrcBuffer.gmk
similarity index 100%
rename from jdk/makefiles/gensrc/GensrcBuffer.gmk
rename to jdk/make/gensrc/GensrcBuffer.gmk
diff --git a/jdk/makefiles/gensrc/GensrcCLDR.gmk b/jdk/make/gensrc/GensrcCLDR.gmk
similarity index 100%
rename from jdk/makefiles/gensrc/GensrcCLDR.gmk
rename to jdk/make/gensrc/GensrcCLDR.gmk
diff --git a/jdk/make/gensrc/GensrcCharacterData.gmk b/jdk/make/gensrc/GensrcCharacterData.gmk
new file mode 100644
index 0000000..c52993a
--- /dev/null
+++ b/jdk/make/gensrc/GensrcCharacterData.gmk
@@ -0,0 +1,64 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Rules to create $(JDK_OUTPUTDIR)/gensrc/sun/lang/CharacterData*.java
+#
+
+GENSRC_CHARACTERDATA :=
+
+CHARACTERDATA = $(JDK_TOPDIR)/make/data/characterdata
+UNICODEDATA = $(JDK_TOPDIR)/make/data/unicodedata
+
+define SetupCharacterData
+ $(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
+
+ 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))
+
+# Copy two Java files that need no preprocessing.
+$(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
+
+$(GENSRC_CHARACTERDATA): $(BUILD_TOOLS)
diff --git a/jdk/makefiles/gensrc/GensrcCharsetCoder.gmk b/jdk/make/gensrc/GensrcCharsetCoder.gmk
similarity index 100%
rename from jdk/makefiles/gensrc/GensrcCharsetCoder.gmk
rename to jdk/make/gensrc/GensrcCharsetCoder.gmk
diff --git a/jdk/make/gensrc/GensrcCharsetMapping.gmk b/jdk/make/gensrc/GensrcCharsetMapping.gmk
new file mode 100644
index 0000000..5624ebf
--- /dev/null
+++ b/jdk/make/gensrc/GensrcCharsetMapping.gmk
@@ -0,0 +1,104 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+GENSRC_CHARSETMAPPING :=
+
+GENSRC_TMP := $(JDK_OUTPUTDIR)/gensrc
+GENSRC_DST := $(JDK_OUTPUTDIR)/gensrc/sun/nio/cs
+
+GENSRC_DATA := $(JDK_TOPDIR)/make/data/charsetmapping
+GENSRC_JAVA_SRC := $(JDK_TOPDIR)/make/src/classes/build/tools/charsetmapping
+
+GENSRC_TEMPLATES := $(GENSRC_DATA)/SingleByte-X.java.template $(GENSRC_DATA)/DoubleByte-X.java.template
+
+###
+
+$(GENSRC_TMP)/_the.charsetmapping.dir:
+ $(ECHO) Generating charsetmapping classes
+ $(MKDIR) -p $(GENSRC_DST)/ext
+ $(TOUCH) $@
+
+###
+
+GENSRC_SB := $(GENSRC_TMP)/_the.charsetmapping.sbcs
+
+$(GENSRC_SB): $(GENSRC_DATA)/sbcs $(GENSRC_TEMPLATES) $(GENSRC_TMP)/_the.charsetmapping.dir
+ $(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_DATA) $(GENSRC_DST) sbcs
+ $(TOUCH) $@
+
+GENSRC_CHARSETMAPPING += $(GENSRC_SB)
+
+###
+
+$(GENSRC_DST)/ext/sjis0213.dat: $(GENSRC_DATA)/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)
+ $(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_DATA) $(GENSRC_DST)/ext euctw $(GENSRC_JAVA_SRC)/EUC_TW.java
+
+GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/EUC_TWMapping.java
+
+###
+
+$(GENSRC_DST)/ext/HKSCSMapping.java: $(GENSRC_JAVA_SRC)/HKSCS.java $(GENSRC_SB)
+ $(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_DATA) $(GENSRC_DST)/ext hkscs $(GENSRC_JAVA_SRC)/HKSCS.java
+
+GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/HKSCSMapping.java
+
+###
+
+$(GENSRC_TMP)/gensrc_the.charsetmapping.extsbcs: $(GENSRC_DATA)/extsbcs $(GENSRC_TEMPLATES) $(GENSRC_SB)
+ $(TOOL_CHARSETMAPPING) $(GENSRC_DATA) $(LOG_INFO) $(GENSRC_DST)/ext extsbcs
+ $(TOUCH) $@
+
+GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.extsbcs
+
+###
+
+$(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs: $(GENSRC_DATA)/dbcs $(GENSRC_TEMPLATES) $(GENSRC_SB)
+ $(TOOL_CHARSETMAPPING) $(GENSRC_DATA) $(LOG_INFO) $(GENSRC_DST)/ext dbcs
+ $(TOUCH) $@
+
+GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs
+
+###
+
+GENSRC_CHARSET_PROVIDER_CMD := $(JDK_TOPDIR)/make/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
+ NAWK="$(NAWK)" TEMPDIR="$(GENSRC_TMP)" SH="$(SH)" \
+ HASHER="$(TOOL_HASHER)" \
+ SCRIPTS="$(JDK_TOPDIR)/make/scripts" \
+ $(SH) -e $(GENSRC_CHARSET_PROVIDER_CMD) $(LOG_INFO) $< $(@D)
+
+GENSRC_CHARSETMAPPING += $(GENSRC_DST)/StandardCharsets.java
+
+$(GENSRC_CHARSETMAPPING): $(BUILD_TOOLS)
diff --git a/jdk/make/gensrc/GensrcExceptions.gmk b/jdk/make/gensrc/GensrcExceptions.gmk
new file mode 100644
index 0000000..e664dd8
--- /dev/null
+++ b/jdk/make/gensrc/GensrcExceptions.gmk
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+GENSRC_EXCEPTIONS :=
+
+GENSRC_EXCEPTIONS_TMP := $(JDK_OUTPUTDIR)/gensrc
+GENSRC_EXCEPTIONS_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio
+
+GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio
+GENSRC_EXCEPTIONS_CMD := $(JDK_TOPDIR)/make/scripts/genExceptions.sh
+
+GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels
+
+###
+
+$(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir:
+ $(ECHO) "Generating exceptions classes"
+ $(MKDIR) -p $(@D)
+ $(TOUCH) $@
+
+
+###
+
+$(GENSRC_EXCEPTIONS_DST)/_the.%: $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
+ $(GENSRC_EXCEPTIONS_CMD) \
+ $(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir
+ $(MKDIR) -p $(@D)/$*
+ SCRIPTS="$(JDK_TOPDIR)/make/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)
diff --git a/jdk/makefiles/gensrc/GensrcIcons.gmk b/jdk/make/gensrc/GensrcIcons.gmk
similarity index 100%
rename from jdk/makefiles/gensrc/GensrcIcons.gmk
rename to jdk/make/gensrc/GensrcIcons.gmk
diff --git a/jdk/make/gensrc/GensrcJDWP.gmk b/jdk/make/gensrc/GensrcJDWP.gmk
new file mode 100644
index 0000000..f429974
--- /dev/null
+++ b/jdk/make/gensrc/GensrcJDWP.gmk
@@ -0,0 +1,48 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Translate the Java debugger wire protocol (jdwp.spec) file into a JDWP.java file
+# and a JDWPCommands.h C-header file.
+
+JDWP_SPEC_FILE := $(JDK_TOPDIR)/make/data/jdwp/jdwp.spec
+
+$(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h: $(JDWP_SPEC_FILE)
+
+$(JDK_OUTPUTDIR)/gensrc/com/sun/tools/jdi/JDWP.java: $(JDWP_SPEC_FILE)
+ $(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: $(JDWP_SPEC_FILE)
+ $(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
diff --git a/jdk/makefiles/gensrc/GensrcJObjC.gmk b/jdk/make/gensrc/GensrcJObjC.gmk
similarity index 100%
rename from jdk/makefiles/gensrc/GensrcJObjC.gmk
rename to jdk/make/gensrc/GensrcJObjC.gmk
diff --git a/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk b/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk
new file mode 100644
index 0000000..98947a0
--- /dev/null
+++ b/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk
@@ -0,0 +1,120 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Scan for all locale resources and extract for which locales there exists
+# resources. Then put this meta information about exiting (supported?) locales
+# 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")
+
+# 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))
+
+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%
+
+# 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
+
+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))
+
+ 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'
+endef
+
+#sun.text.resources.FormatData
+$(eval $(call CaptureLocale,FormatData))
+
+#sun.text.resources.CollationData
+$(eval $(call CaptureLocale,CollationData))
+
+#sun.util.resources.TimeZoneNames
+$(eval $(call CaptureLocale,TimeZoneNames))
+
+#sun.util.resources.LocaleNames
+$(eval $(call CaptureLocale,LocaleNames))
+
+#sun.util.resources.CurrencyNames
+$(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'
+
+$(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java: \
+ $(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_CRBC_DST := $(JDK_OUTPUTDIR)/gensrc/sun/util/CoreResourceBundleControl.java
+GENSRC_CRBC_CMD := $(JDK_TOPDIR)/make/scripts/localelist.sh
+
+JRE_NONEXIST_LOCALES := en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh
+
+$(GENSRC_CRBC_DST): $(JDK_TOPDIR)/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template \
+ $(GENSRC_CRBC_CMD)
+ $(MKDIR) -p $(@D)
+ NAWK="$(NAWK)" SED="$(SED)" $(SH) $(GENSRC_CRBC_CMD) "$(JRE_NONEXIST_LOCALES)" $< $@
+
+GENSRC_LOCALEDATAMETAINFO += $(GENSRC_CRBC_DST)
+
+###
diff --git a/jdk/make/gensrc/GensrcMisc.gmk b/jdk/make/gensrc/GensrcMisc.gmk
new file mode 100644
index 0000000..adb8e85
--- /dev/null
+++ b/jdk/make/gensrc/GensrcMisc.gmk
@@ -0,0 +1,240 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include ProfileNames.gmk
+
+##########################################################################################
+# Install the launcher name, release version string, full version
+# string and the runtime name into the Version.java file.
+# To be printed by java -version
+
+$(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
+$(PROFILE_VERSION_JAVA_TARGETS): \
+ $(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
+ $(MV) $@.tmp $@
+
+GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
+ $(PROFILE_VERSION_JAVA_TARGETS)
+
+##########################################################################################
+# Version file for jconsole
+
+$(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java: \
+ $(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
+ $(SED) -e 's/@@jconsole_version@@/$(FULL_VERSION)/g' $< > $@.tmp
+ $(MV) $@.tmp $@
+
+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/.
+
+ $(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
+endif
+
+##########################################################################################
+
+GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java
+
+GENSRC_SOR_SRC := $(JDK_TOPDIR)/src/share/native/sun/nio/ch
+GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c
+GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/gensrc/genSocketOptionRegistry
+
+SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOR_SRC)/$(GENSRC_SOR_SRC_FILE) | \
+ $(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))
+
+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)
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/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
+ $(call install-file)
+endif
+
+##########################################################################################
+
+ifneq ($(OPENJDK_TARGET_OS), windows)
+
+ 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
+
+ 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))
+
+ 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)
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/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
+ $(call install-file)
+ endif
+
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+
+ 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
+
+ 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))
+
+ $(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)/make/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp
+ $(BUILD_GENSRC_SOL_EXE) >> $@.tmp
+ $(MV) $@.tmp $@
+
+
+endif
+
+##########################################################################################
+
+ifndef OPENJDK
+ 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
+ $(install-file)
+
+ $(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
+ $(install-file)
+
+ $(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
+
+ else
+ $(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
+ $(install-file)
+
+ 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
+
+##########################################################################################
diff --git a/jdk/makefiles/gensrc/GensrcProperties.gmk b/jdk/make/gensrc/GensrcProperties.gmk
similarity index 100%
rename from jdk/makefiles/gensrc/GensrcProperties.gmk
rename to jdk/make/gensrc/GensrcProperties.gmk
diff --git a/jdk/make/gensrc/GensrcSwing.gmk b/jdk/make/gensrc/GensrcSwing.gmk
new file mode 100644
index 0000000..b3b41c9
--- /dev/null
+++ b/jdk/make/gensrc/GensrcSwing.gmk
@@ -0,0 +1,103 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# 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
+
+$(JDK_OUTPUTDIR)/gensrc/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS)
+ $(MKDIR) -p $(@D)
+ $(ECHO) "Generating Nimbus source files"
+ $(TOOL_GENERATENIMBUS) $(LOG_INFO) \
+ -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(JDK_OUTPUTDIR)/gensrc \
+ -packagePrefix $(NIMBUS_PACKAGE).nimbus -lafName Nimbus
+ $(ECHO) $(LOG_INFO) "Finished generating Nimbus source files"
+ $(TOUCH) $@
+
+GENSRC_SWING_NIMBUS := $(JDK_OUTPUTDIR)/gensrc/_the.generated_nimbus
+
+#
+# Generate beaninfo java files
+#
+
+DOCLET_DATA_DIR = $(JDK_TOPDIR)/make/data/swingbeaninfo
+
+# javax.swing package
+BEANS = AbstractButton Box JComponent JApplet JButton \
+ JCheckBox JCheckBoxMenuItem JComboBox JColorChooser \
+ JDesktopPane JDialog JEditorPane JFileChooser JFrame \
+ JFormattedTextField JInternalFrame JLabel JLayeredPane \
+ JList JMenu JMenuBar JMenuItem JOptionPane JPanel \
+ JPasswordField JPopupMenu JProgressBar JRadioButton \
+ JRadioButtonMenuItem JScrollBar JScrollPane JSeparator \
+ JSlider JSplitPane JSpinner JTabbedPane JTable \
+ JTextArea JTextField JTextPane JToggleButton JToolBar \
+ JTree JWindow
+
+# javax.swing.text package
+BEANS_TEXT = JTextComponent
+
+BEANS_SRC = $(BEANS:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/%.java) \
+ $(BEANS_TEXT:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/text/%.java)
+
+# Dummy variable so far, in the old build system it was false by default
+SWINGBEAN_DEBUG_FLAG = false
+# GenDocletBeanInfo is compiled in Tools.gmk and picks up from $(JDK_OUTPUTDIR)/btclasses
+# 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)
+ $(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 build.tools.swingbeaninfo.GenDocletBeanInfo \
+ -x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \
+ -t $(DOCLET_DATA_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
+ $(TOUCH) $@
+
+# This file is the part of dt.jar
+# For some reason it is under $(JDK_TOPDIR)/make/data/swingbeaninfo
+# Should it be moved under $(JDK_TOPDIR)/src/share/classes/javax/swing instead?
+$(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java: $(DOCLET_DATA_DIR)/javax/swing/SwingBeanInfoBase.java
+ $(call install-file)
+
+# This file is the part of dt.jar
+# For some reason it is under $(JDK_TOPDIR)/make/data/swingbeaninfo
+# Should it be moved under $(JDK_TOPDIR)/src/share/classes/sun/swing instead?
+$(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java: $(DOCLET_DATA_DIR)/sun/swing/BeanInfoUtils.java
+ $(call install-file)
+
+GENSRC_SWING_BEANINFO = $(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo
diff --git a/jdk/makefiles/gensrc/GensrcX11Wrappers.gmk b/jdk/make/gensrc/GensrcX11Wrappers.gmk
similarity index 100%
rename from jdk/makefiles/gensrc/GensrcX11Wrappers.gmk
rename to jdk/make/gensrc/GensrcX11Wrappers.gmk
diff --git a/jdk/make/java/Makefile b/jdk/make/java/Makefile
deleted file mode 100644
index 80c97d2..0000000
--- a/jdk/make/java/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-PRODUCT=java
-BUILDDIR=..
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# The order of subdirs here is important
-#
-SUBDIRS += version jvm redist verify fdlibm java sun_nio jli main zip
-
-# Others
-# Note: java_crw_demo java_hprof_demo are demos but must be delivered built in sdk
-
-SUBDIRS += security math util text net nio jar time
-
-SUBDIRS_desktop = awt applet beans
-SUBDIRS_management = management
-SUBDIRS_misc = npt java_crw_demo java_hprof_demo \
- logging instrument invoke sql rmi
-
-
-ifeq ($(PLATFORM), solaris)
- ifeq ($(ARCH_DATA_MODEL), 32)
- SUBDIRS += jexec
- endif
-endif # PLATFORM
-
-ifeq ($(PLATFORM), linux)
- SUBDIRS += jexec
-endif # PLATFORM
-
-ifeq ($(PLATFORM), macosx)
- SUBDIRS += jobjc
-endif # PLATFORM
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/java/applet/Makefile b/jdk/make/java/applet/Makefile
deleted file mode 100644
index bdac860..0000000
--- a/jdk/make/java/applet/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = java.applet
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = java/applet
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/java/awt/Makefile b/jdk/make/java/awt/Makefile
deleted file mode 100644
index 20b5774..0000000
--- a/jdk/make/java/awt/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = java.awt
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = java/awt sun/awt/geom
-
-build: properties cursors
-
-#
-# Resources
-#
-RESOURCE_BUNDLES_COMPILED_PROPERTIES = sun/awt/resources/awt.properties
-LOCALE_SET_DEFINITION = jre
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-
-clean:: properties.clean sun.geom.clean cursors.clean
-
-_LIBPROPS = \
- flavormap.properties
-
-LIBPROPS = $(_LIBPROPS:%=$(LIBDIR)/%)
-
-properties: $(LIBDIR) $(LIBPROPS)
-
-$(LIBDIR)/%.properties: $(PLATFORM_PROPERTIES)/%.properties
- $(install-file)
-
-properties.clean :
- $(RM) $(LIBPROPS)
-
-.SUFFIXES : $(SUFFIXES) .gif .properties
-
-CURSORSRC = $(TOPDIR)/src/share/lib/images/cursors
-CURSORDIR = $(LIBDIR)/images/cursors
-
-ifeq ($(PLATFORM), windows)
-CURSORPROPSRC = $(TOPDIR)/src/windows/lib/images/cursors
-CURSORS = $(CURSORDIR)/win32_CopyDrop32x32.gif \
- $(CURSORDIR)/win32_MoveDrop32x32.gif \
- $(CURSORDIR)/win32_LinkDrop32x32.gif \
- $(CURSORDIR)/win32_CopyNoDrop32x32.gif \
- $(CURSORDIR)/win32_MoveNoDrop32x32.gif \
- $(CURSORDIR)/win32_LinkNoDrop32x32.gif \
- $(CURSORDIR)/invalid32x32.gif
-else # PLATFORM
-CURSORPROPSRC = $(TOPDIR)/src/solaris/lib/images/cursors
-CURSORS = $(CURSORDIR)/motif_CopyDrop32x32.gif \
- $(CURSORDIR)/motif_MoveDrop32x32.gif \
- $(CURSORDIR)/motif_LinkDrop32x32.gif \
- $(CURSORDIR)/motif_CopyNoDrop32x32.gif \
- $(CURSORDIR)/motif_MoveNoDrop32x32.gif \
- $(CURSORDIR)/motif_LinkNoDrop32x32.gif \
- $(CURSORDIR)/invalid32x32.gif
-endif # PLATFORM
-
-$(CURSORDIR)/cursors.properties : $(CURSORPROPSRC)/cursors.properties
- $(install-file)
-
-$(CURSORDIR)/%.gif : $(CURSORSRC)/%.gif
- $(install-file)
-
-cursors : $(CURSORDIR)/cursors.properties $(CURSORS)
-
-sun.geom.clean :
- $(RM) -r $(CLASSBINDIR)/sun/awt/geom
-
-cursors.clean :
- $(RM) -r $(CURSORDIR)
-
-.PHONY: properties properties.clean \
- cursors sun.geom.clean cursors.clean
-
diff --git a/jdk/make/java/beans/Makefile b/jdk/make/java/beans/Makefile
deleted file mode 100644
index d13bb78..0000000
--- a/jdk/make/java/beans/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building java.beans.*
-#
-
-BUILDDIR = ../..
-PACKAGE = java.beans
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-AUTO_FILES_JAVA_DIRS = java/beans com/sun/beans
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/java/fdlibm/FILES_c.gmk b/jdk/make/java/fdlibm/FILES_c.gmk
deleted file mode 100644
index 6672424..0000000
--- a/jdk/make/java/fdlibm/FILES_c.gmk
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- k_standard.c \
- k_rem_pio2.c \
- k_cos.c \
- k_sin.c \
- k_tan.c \
- e_acos.c \
- e_asin.c \
- e_atan2.c \
- e_atanh.c \
- e_cosh.c \
- e_exp.c \
- e_fmod.c \
- e_hypot.c \
- e_log.c \
- e_log10.c \
- e_pow.c \
- e_rem_pio2.c \
- e_remainder.c \
- e_scalb.c \
- e_sinh.c \
- e_sqrt.c \
- w_acos.c \
- w_asin.c \
- w_atan2.c \
- w_atanh.c \
- w_cosh.c \
- w_exp.c \
- w_fmod.c \
- w_hypot.c \
- w_log.c \
- w_log10.c \
- w_pow.c \
- w_remainder.c \
- w_scalb.c \
- w_sinh.c \
- w_sqrt.c \
- s_atan.c \
- s_cbrt.c \
- s_ceil.c \
- s_copysign.c \
- s_cos.c \
- s_expm1.c \
- s_fabs.c \
- s_finite.c \
- s_floor.c \
- s_frexp.c \
- s_ilogb.c \
- s_isnan.c \
- s_ldexp.c \
- s_lib_version.c \
- s_log1p.c \
- s_logb.c \
- s_matherr.c \
- s_modf.c \
- s_nextafter.c \
- s_rint.c \
- s_scalbn.c \
- s_signgam.c \
- s_significand.c \
- s_sin.c \
- s_tan.c \
- s_tanh.c
diff --git a/jdk/make/java/fdlibm/Makefile b/jdk/make/java/fdlibm/Makefile
deleted file mode 100644
index 36a9611..0000000
--- a/jdk/make/java/fdlibm/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for fdlibm
-#
-# Note:
-# The fdlibm libraries are built using special rules in Library.gmk.
-#
-
-BUILDDIR = ../..
-LIBRARY = fdlibm
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Where is fdlibm in the source tree?
-#
-FDLIBM_SRC = $(SHARE_SRC)/native/java/lang/fdlibm
-
-# Windows: compiler flags
-ifeq ($(PLATFORM),windows)
- # Turn all optimizations off
- OPTIMIZATION_LEVEL = NONE
- FASTDEBUG_OPTIMIZATION_LEVEL = NONE
- OTHER_CFLAGS =
- CPPFLAGS_DBG += -DLOGGING
-endif
-
-#
-# Linux: Disable optimization to get correctly reproducible
-# floating-point results.
-#
-ifeq ($(PLATFORM),linux)
- # Turn all optimizations off
- OPTIMIZATION_LEVEL = NONE
- FASTDEBUG_OPTIMIZATION_LEVEL = NONE
-endif
-
-ifeq ($(PLATFORM),macosx)
- # Turn all optimizations off
- OPTIMIZATION_LEVEL = NONE
- FASTDEBUG_OPTIMIZATION_LEVEL = NONE
-endif
-
-#
-# Include path.
-#
-OTHER_INCLUDES = -I$(FDLIBM_SRC)/include
-
-#
-# Things that must be linked in.
-#
-OTHER_LDLIBS =
-
-#
-# Files to compile.
-#
-include FILES_c.gmk
-
-#
-# Rules for the .a file.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Find fdlibm source files.
-#
-vpath %.c
-vpath %.c $(FDLIBM_SRC)/src
diff --git a/jdk/make/java/instrument/Makefile b/jdk/make/java/instrument/Makefile
deleted file mode 100644
index c81ce67..0000000
--- a/jdk/make/java/instrument/Makefile
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Makefile for building the Java Programming Language Instrumentation Services
-# agent, supporting java.lang.instrument
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../..
-PACKAGE = sun.instrument
-LIBRARY = instrument
-PRODUCT = sun
-
-# Configure the CFLAGS for this library. Use static binding so that there
-# are not dependencies on modules not on the search patch when invoked from
-# the Windows system directory (or elsewhere).
-MS_RUNTIME_STATIC=true
-
-FILES_m = mapfile-vers
-
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# Use the mapfile-vers (See the mapfile located with this Makefile)
-ifdef FILES_m
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-endif
-
-#
-# Files to compile.
-#
-FILES_c = \
- EncodingSupport.c \
- EncodingSupport_md.c \
- FileSystemSupport_md.c \
- InstrumentationImplNativeMethods.c \
- InvocationAdapter.c \
- JarFacade.c \
- JPLISAgent.c \
- JPLISAssert.c \
- JavaExceptions.c \
- PathCharsValidator.c \
- Reentrancy.c \
- Utilities.c
-
-#
-# -jaragent support requires zip and jar manfiest parser to be compiled
-# into the instrument library.
-#
-IO_PLATFORM_SRC = $(PLATFORM_SRC)/native/java/io
-LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
-LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
-
-FILES_c += \
- canonicalize_md.c
-
-FILES_export = \
- sun/instrument/InstrumentationImpl.java
-
-#
-# This controls the ability to do logging in the library.
-#
-CPPFLAGS_DBG += -DJPLIS_LOGGING
-CPPFLAGS_OPT += -DNO_JPLIS_LOGGING
-
-OTHER_INCLUDES = -I$(SHARE_SRC)/instrument
-OTHER_INCLUDES += -I$(PLATFORM_SRC)/instrument
-OTHER_INCLUDES += -I$(IO_PLATFORM_SRC)
-OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) -I$(LAUNCHER_PLATFORM_SRC)
-
-#
-# Create a dependency on libjli (Java Launcher Infrastructure)
-#
-# On UNIX, this is a relative dependency using $ORIGIN. Unfortunately, to
-# do this reliably on Linux takes a different syntax than Solaris.
-#
-# On Windows, this is done by using the same directory as the executable
-# itself, as with all the Windows libraries.
-#
-ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/jli.lib
- OTHER_LCF += -export:Agent_OnAttach
- # equivalent of strcasecmp is stricmp on Windows
- CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
-else
-ifneq (,$(findstring $(PLATFORM), macosx))
- ifneq ($(ARCH), universal)
- LDFLAGS += -Wl,-all_load
- endif
- LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
- OTHER_LDLIBS += -liconv
- ifeq ($(SYSTEM_ZLIB), true)
- OTHER_LDLIBS += -lz
- endif
-else
- LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
- OTHER_LDLIBS += -ljli
- OTHER_LDLIBS += -ldl
- ifeq ($(PLATFORM), solaris)
- LDFLAGS += -R \$$ORIGIN/jli
- endif
- ifeq ($(PLATFORM), linux)
- LDFLAGS += $(LDFLAG_Z_ORIGIN)
- LDFLAGS += -Wl,--allow-shlib-undefined
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
- endif
-endif
-endif
-
-ifeq ($(PLATFORM), macosx)
- LDFLAGS += -framework Cocoa -framework Security -framework ApplicationServices
-endif
-
-#
-# Library to compile.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-# We don't want to link against -ljava
-JAVALIB=
-
-#
-# Add to ambient vpath so we pick up the library files
-#
-vpath %.c $(SHARE_SRC)/instrument $(PLATFORM_SRC)/instrument
-vpath %.c $(IO_PLATFORM_SRC)
-
diff --git a/jdk/make/java/instrument/mapfile-vers b/jdk/make/java/instrument/mapfile-vers
deleted file mode 100644
index d219453..0000000
--- a/jdk/make/java/instrument/mapfile-vers
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Agent_OnLoad;
- Agent_OnAttach;
- Java_sun_instrument_InstrumentationImpl_isModifiableClass0;
- Java_sun_instrument_InstrumentationImpl_isRetransformClassesSupported0;
- Java_sun_instrument_InstrumentationImpl_setHasRetransformableTransformers;
- Java_sun_instrument_InstrumentationImpl_retransformClasses0;
- Java_sun_instrument_InstrumentationImpl_getAllLoadedClasses0;
- Java_sun_instrument_InstrumentationImpl_getInitiatedClasses0;
- Java_sun_instrument_InstrumentationImpl_redefineClasses0;
- Java_sun_instrument_InstrumentationImpl_getObjectSize0;
- Java_sun_instrument_InstrumentationImpl_appendToClassLoaderSearch0;
- Java_sun_instrument_InstrumentationImpl_setNativeMethodPrefixes;
- local:
- *;
-};
diff --git a/jdk/make/java/invoke/Makefile b/jdk/make/java/invoke/Makefile
deleted file mode 100644
index 1bdbd9a..0000000
--- a/jdk/make/java/invoke/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-
-PACKAGE = java.lang.invoke
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-AUTO_FILES_JAVA_DIRS = java/lang/invoke sun/invoke
-FILES_java = \
- java/lang/ClassValue.java \
- java/lang/BootstrapMethodError.java
-
-# The sources built here use new language syntax to generate
-# method handle calls. Let's be sure we are using that format.
-LANGUAGE_VERSION = -source 8
-CLASS_VERSION = -target 8
-
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/java/jar/Makefile b/jdk/make/java/jar/Makefile
deleted file mode 100644
index c238cec..0000000
--- a/jdk/make/java/jar/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = java.util.jar
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = java/util/jar
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/java/java/Exportedfiles.gmk b/jdk/make/java/java/Exportedfiles.gmk
deleted file mode 100644
index 8717935..0000000
--- a/jdk/make/java/java/Exportedfiles.gmk
+++ /dev/null
@@ -1,185 +0,0 @@
-#
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# These are the names of JAVA classes for which we will make .h files.
-#
-ifneq ($(PLATFORM), windows)
-FILES_export = \
- java/lang/Object.java \
- java/lang/Class.java \
- java/lang/Compiler.java \
- java/lang/String.java \
- java/lang/Thread.java \
- java/lang/ThreadGroup.java \
- java/lang/StrictMath.java \
- java/lang/Number.java \
- java/lang/Byte.java \
- java/lang/Short.java \
- java/lang/Integer.java \
- java/lang/Long.java \
- java/lang/Float.java \
- java/lang/Double.java \
- java/lang/Boolean.java \
- java/lang/Character.java \
- java/lang/System.java \
- java/lang/ClassLoader.java \
- java/lang/Runtime.java \
- java/lang/SecurityManager.java \
- java/lang/Shutdown.java \
- java/lang/Package.java \
- java/lang/UNIXProcess.java \
- java/lang/ref/Finalizer.java \
- java/lang/reflect/AccessibleObject.java \
- java/lang/reflect/Field.java \
- java/lang/reflect/Method.java \
- java/lang/reflect/Constructor.java \
- java/lang/reflect/InvocationTargetException.java \
- java/lang/reflect/Array.java \
- java/lang/reflect/Executable.java \
- java/lang/reflect/Proxy.java \
- java/security/AccessController.java \
- java/util/Date.java \
- java/util/TimeZone.java \
- java/util/ResourceBundle.java \
- java/util/concurrent/atomic/AtomicLong.java \
- java/util/prefs/FileSystemPreferences.java \
- java/io/Console.java \
- java/io/FileDescriptor.java \
- java/io/DefaultFileSystem.java \
- java/io/InputStream.java \
- java/io/FileInputStream.java \
- java/io/FileOutputStream.java \
- java/io/PrintStream.java \
- java/io/RandomAccessFile.java \
- java/io/DataInputStream.java \
- java/io/DataOutputStream.java \
- java/io/File.java \
- java/io/FileSystem.java \
- java/io/UnixFileSystem.java \
- java/io/ObjectInputStream.java \
- java/io/ObjectOutputStream.java \
- java/io/ObjectStreamClass.java \
- java/lang/Throwable.java \
- java/lang/NoClassDefFoundError.java \
- java/lang/StringIndexOutOfBoundsException.java \
- java/lang/OutOfMemoryError.java \
- sun/misc/Version.java \
- sun/misc/VM.java \
- sun/misc/VMSupport.java \
- sun/misc/Signal.java \
- sun/misc/MessageUtils.java \
- sun/misc/NativeSignalHandler.java \
- sun/misc/GC.java \
- sun/reflect/ConstantPool.java \
- sun/reflect/NativeConstructorAccessorImpl.java \
- sun/reflect/NativeMethodAccessorImpl.java \
- sun/reflect/Reflection.java \
- sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
-
-EXPORTED_inner = \
- java.lang.ClassLoader$$NativeLibrary
-
-else # PLATFORM
-FILES_export = \
- java/lang/Object.java \
- java/lang/Class.java \
- java/lang/Compiler.java \
- java/lang/String.java \
- java/lang/Thread.java \
- java/lang/ThreadGroup.java \
- java/lang/StrictMath.java \
- java/lang/Number.java \
- java/lang/Byte.java \
- java/lang/Short.java \
- java/lang/Integer.java \
- java/lang/Long.java \
- java/lang/Float.java \
- java/lang/Double.java \
- java/lang/Boolean.java \
- java/lang/System.java \
- java/lang/Package.java \
- java/lang/ClassLoader.java \
- java/lang/Runtime.java \
- java/lang/SecurityManager.java \
- java/lang/Shutdown.java \
- java/lang/reflect/AccessibleObject.java \
- java/lang/reflect/Field.java \
- java/lang/reflect/Method.java \
- java/lang/reflect/Constructor.java \
- java/lang/reflect/InvocationTargetException.java \
- java/lang/reflect/Array.java \
- java/lang/reflect/Executable.java \
- java/lang/reflect/Proxy.java \
- java/lang/ref/Reference.java \
- java/lang/ref/Finalizer.java \
- java/util/Date.java \
- java/util/Properties.java \
- java/util/ResourceBundle.java \
- java/util/TimeZone.java \
- java/util/concurrent/atomic/AtomicLong.java \
- java/util/prefs/WindowsPreferences.java \
- java/util/prefs/WindowsPreferencesFactory.java \
- java/util/logging/FileHandler.java \
- java/io/Console.java \
- java/io/FileSystem.java \
- java/io/FileDescriptor.java \
- java/io/DefaultFileSystem.java \
- java/io/InputStream.java \
- java/io/FileInputStream.java \
- java/io/FileOutputStream.java \
- java/io/PrintStream.java \
- java/io/RandomAccessFile.java \
- java/io/DataInputStream.java \
- java/io/DataOutputStream.java \
- java/io/File.java \
- java/io/ObjectOutputStream.java \
- java/io/ObjectInputStream.java \
- java/io/ObjectStreamClass.java \
- java/lang/Throwable.java \
- java/lang/NoClassDefFoundError.java \
- java/lang/StringIndexOutOfBoundsException.java \
- java/lang/OutOfMemoryError.java \
- java/lang/ProcessImpl.java \
- sun/misc/Version.java \
- sun/misc/VM.java \
- sun/misc/VMSupport.java \
- sun/misc/GC.java \
- sun/misc/Signal.java \
- sun/misc/NativeSignalHandler.java \
- sun/misc/MessageUtils.java \
- java/security/AccessController.java \
- sun/reflect/ConstantPool.java \
- sun/reflect/NativeConstructorAccessorImpl.java \
- sun/reflect/NativeMethodAccessorImpl.java \
- sun/reflect/Reflection.java \
- sun/security/provider/NativeSeedGenerator.java \
- sun/io/Win32ErrorMode.java \
- sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
-
-EXPORTED_inner = \
- java.lang.ClassLoader$$NativeLibrary
-
-endif # PLATFORM
diff --git a/jdk/make/java/java/FILES_c.gmk b/jdk/make/java/java/FILES_c.gmk
deleted file mode 100644
index 29bb7e3..0000000
--- a/jdk/make/java/java/FILES_c.gmk
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- AccessController.c \
- Array.c \
- String.c \
- Class.c \
- ClassLoader.c \
- Compiler.c \
- Console_md.c \
- Double.c \
- Executable.c \
- Field.c \
- FileDescriptor_md.c \
- FileInputStream.c \
- FileInputStream_md.c \
- FileOutputStream_md.c \
- Finalizer.c \
- Float.c \
- Object.c \
- ObjectOutputStream.c \
- ObjectInputStream.c \
- ObjectStreamClass.c \
- Package.c \
- ProcessEnvironment_md.c \
- Proxy.c \
- RandomAccessFile.c \
- RandomAccessFile_md.c \
- Runtime.c \
- SecurityManager.c \
- Shutdown.c \
- StrictMath.c \
- System.c \
- Thread.c \
- Throwable.c \
- Signal.c \
- NativeSignalHandler.c \
- verify_stub.c \
- io_util.c \
- io_util_md.c \
- jio.c \
- logging.c \
- jni_util.c \
- jni_util_md.c \
- jdk_util.c \
- jdk_util_md.c \
- check_version.c \
- java_props_md.c \
- ConstantPool.c \
- MessageUtils.c \
- GC.c \
- NativeAccessors.c \
- Reflection.c \
- Bits.c \
- AtomicLong.c \
- Version.c \
- VM.c \
- VMSupport.c \
- HostLocaleProviderAdapter_md.c
diff --git a/jdk/make/java/java/FILES_java.gmk b/jdk/make/java/java/FILES_java.gmk
deleted file mode 100644
index b62d15d..0000000
--- a/jdk/make/java/java/FILES_java.gmk
+++ /dev/null
@@ -1,537 +0,0 @@
-#
-# Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# This is the list of java classes that will be automatically built
-# from sources. See Exportedfiles.gmk for the list of files which
-# will generate header files
-#
-JAVA_JAVA_java = \
- java/lang/Object.java \
- java/lang/AutoCloseable.java \
- java/lang/Class.java \
- java/lang/Thread.java \
- java/lang/Character.java \
- java/lang/CharacterData.java \
- java/lang/CharacterName.java \
- sun/misc/ASCIICaseInsensitiveComparator.java \
- sun/misc/VM.java \
- sun/misc/Signal.java \
- sun/misc/NativeSignalHandler.java \
- java/lang/ThreadGroup.java \
- java/lang/ThreadLocal.java \
- java/lang/InheritableThreadLocal.java \
- java/lang/String.java \
- java/lang/ConditionalSpecialCasing.java \
- java/lang/StringCoding.java \
- java/lang/StringBuffer.java \
- java/lang/StringBuilder.java \
- java/lang/SuppressWarnings.java \
- java/lang/AbstractStringBuilder.java \
- java/lang/ClassLoader.java \
- java/lang/ClassLoaderHelper.java \
- java/lang/AssertionStatusDirectives.java \
- java/lang/Enum.java \
- java/lang/StrictMath.java \
- java/lang/Math.java \
- sun/misc/FloatingDecimal.java \
- sun/misc/FormattedFloatingDecimal.java \
- java/lang/Number.java \
- java/lang/Byte.java \
- java/lang/Short.java \
- java/lang/Integer.java \
- java/lang/Long.java \
- java/lang/Float.java \
- java/lang/Double.java \
- java/lang/Boolean.java \
- java/lang/Void.java \
- java/lang/Runnable.java \
- java/lang/Cloneable.java \
- java/lang/CharSequence.java \
- java/lang/SecurityManager.java \
- java/lang/Runtime.java \
- java/lang/RuntimePermission.java \
- java/lang/ApplicationShutdownHooks.java \
- java/lang/Shutdown.java \
- java/lang/Terminator.java \
- java/lang/System.java \
- java/lang/Compiler.java \
- java/lang/Throwable.java \
- java/lang/Exception.java \
- java/lang/ReflectiveOperationException.java \
- java/lang/IllegalAccessException.java \
- java/lang/InstantiationException.java \
- java/lang/ClassNotFoundException.java \
- java/lang/CloneNotSupportedException.java \
- java/lang/InterruptedException.java \
- java/lang/NoSuchFieldException.java \
- java/lang/NoSuchMethodException.java \
- java/lang/RuntimeException.java \
- java/lang/ArithmeticException.java \
- java/lang/ArrayStoreException.java \
- java/lang/ClassCastException.java \
- java/lang/IndexOutOfBoundsException.java \
- java/lang/ArrayIndexOutOfBoundsException.java \
- java/lang/StringIndexOutOfBoundsException.java \
- java/lang/NegativeArraySizeException.java \
- java/lang/NullPointerException.java \
- java/lang/IllegalStateException.java \
- java/lang/IllegalArgumentException.java \
- java/lang/NumberFormatException.java \
- java/lang/IllegalThreadStateException.java \
- java/lang/IllegalMonitorStateException.java \
- java/lang/SecurityException.java \
- java/lang/TypeNotPresentException.java \
- java/lang/EnumConstantNotPresentException.java \
- java/lang/UnsupportedOperationException.java \
- java/lang/Error.java \
- java/lang/AssertionError.java \
- java/lang/ThreadDeath.java \
- java/lang/LinkageError.java \
- java/lang/ClassCircularityError.java \
- java/lang/ClassFormatError.java \
- java/lang/UnsupportedClassVersionError.java \
- java/lang/ExceptionInInitializerError.java \
- java/lang/IncompatibleClassChangeError.java \
- java/lang/AbstractMethodError.java \
- java/lang/IllegalAccessError.java \
- java/lang/InstantiationError.java \
- java/lang/NoSuchFieldError.java \
- java/lang/NoSuchMethodError.java \
- java/lang/NoClassDefFoundError.java \
- java/lang/UnsatisfiedLinkError.java \
- java/lang/VerifyError.java \
- java/lang/VirtualMachineError.java \
- java/lang/InternalError.java \
- java/lang/OutOfMemoryError.java \
- java/lang/StackOverflowError.java \
- java/lang/UnknownError.java \
- java/lang/StackTraceElement.java \
- java/lang/Package.java \
- java/lang/Process.java \
- java/lang/ProcessBuilder.java \
- java/lang/ProcessEnvironment.java \
- java/lang/ProcessImpl.java \
- java/lang/Appendable.java \
- java/lang/Comparable.java \
- java/lang/Readable.java \
- java/lang/FunctionalInterface.java \
- java/lang/Override.java \
- java/lang/SafeVarargs.java \
- java/lang/SuppressWarnings.java \
- java/lang/ref/Reference.java \
- java/lang/ref/SoftReference.java \
- java/lang/ref/WeakReference.java \
- java/lang/ref/FinalReference.java \
- java/lang/ref/PhantomReference.java \
- java/lang/ref/ReferenceQueue.java \
- java/lang/ref/Finalizer.java \
- java/util/Base64.java \
- java/util/BitSet.java \
- java/util/Calendar.java \
- java/util/GregorianCalendar.java \
- sun/util/BuddhistCalendar.java \
- java/util/JapaneseImperialCalendar.java \
- sun/util/calendar/CalendarDate.java \
- sun/util/calendar/ImmutableGregorianDate.java \
- sun/util/calendar/CalendarSystem.java \
- sun/util/calendar/Era.java \
- sun/util/calendar/CalendarUtils.java \
- sun/util/calendar/AbstractCalendar.java \
- sun/util/calendar/BaseCalendar.java \
- sun/util/calendar/Gregorian.java \
- sun/util/calendar/JulianCalendar.java \
- sun/util/calendar/LocalGregorianCalendar.java \
- java/util/Currency.java \
- java/util/Date.java \
- java/util/Dictionary.java \
- java/util/EmptyStackException.java \
- java/util/Enumeration.java \
- java/util/EventListener.java \
- java/util/EventListenerProxy.java \
- java/util/EventObject.java \
- java/util/Formatter.java \
- java/util/Formattable.java \
- java/util/FormattableFlags.java \
- java/util/IllegalFormatException.java \
- java/util/DuplicateFormatFlagsException.java \
- java/util/FormatFlagsConversionMismatchException.java \
- java/util/IllegalFormatCodePointException.java \
- java/util/IllegalFormatConversionException.java \
- java/util/IllegalFormatFlagsException.java \
- java/util/IllegalFormatPrecisionException.java \
- java/util/IllegalFormatWidthException.java \
- java/util/MissingFormatArgumentException.java \
- java/util/MissingFormatWidthException.java \
- java/util/UnknownFormatConversionException.java \
- java/util/UnknownFormatFlagsException.java \
- java/util/IllformedLocaleException.java \
- java/util/FormatterClosedException.java \
- java/util/ListResourceBundle.java \
- java/util/Locale.java \
- sun/util/locale/BaseLocale.java \
- sun/util/locale/Extension.java \
- sun/util/locale/InternalLocaleBuilder.java \
- sun/util/locale/LanguageTag.java \
- sun/util/locale/LocaleExtensions.java \
- sun/util/locale/LocaleObjectCache.java \
- sun/util/locale/LocaleSyntaxException.java \
- sun/util/locale/LocaleUtils.java \
- sun/util/locale/ParseStatus.java \
- sun/util/locale/StringTokenIterator.java \
- sun/util/locale/UnicodeLocaleExtension.java \
- sun/util/locale/provider/AuxLocaleProviderAdapter.java \
- sun/util/locale/provider/AvailableLanguageTags.java \
- sun/util/locale/provider/BreakDictionary.java \
- sun/util/locale/provider/BreakIteratorProviderImpl.java \
- sun/util/locale/provider/CalendarDataProviderImpl.java \
- sun/util/locale/provider/CalendarDataUtility.java \
- sun/util/locale/provider/CalendarNameProviderImpl.java \
- sun/util/locale/provider/CalendarProviderImpl.java \
- sun/util/locale/provider/CollationRules.java \
- sun/util/locale/provider/CollatorProviderImpl.java \
- sun/util/locale/provider/CurrencyNameProviderImpl.java \
- sun/util/locale/provider/DateFormatProviderImpl.java \
- sun/util/locale/provider/DateFormatSymbolsProviderImpl.java \
- sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java \
- sun/util/locale/provider/DictionaryBasedBreakIterator.java \
- sun/util/locale/provider/FallbackLocaleProviderAdapter.java \
- sun/util/locale/provider/HostLocaleProviderAdapter.java \
- sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
- sun/util/locale/provider/JRELocaleConstants.java \
- sun/util/locale/provider/JRELocaleProviderAdapter.java \
- sun/util/locale/provider/LocaleServiceProviderPool.java \
- sun/util/locale/provider/LocaleProviderAdapter.java \
- sun/util/locale/provider/LocaleDataMetaInfo.java \
- sun/util/locale/provider/LocaleNameProviderImpl.java \
- sun/util/locale/provider/LocaleResources.java \
- sun/util/locale/provider/NumberFormatProviderImpl.java \
- sun/util/locale/provider/RuleBasedBreakIterator.java \
- sun/util/locale/provider/ResourceBundleBasedAdapter.java \
- sun/util/locale/provider/SPILocaleProviderAdapter.java \
- sun/util/locale/provider/TimeZoneNameProviderImpl.java \
- sun/util/locale/provider/TimeZoneNameUtility.java \
- sun/util/spi/CalendarProvider.java \
- java/util/LocaleISOData.java \
- sun/util/cldr/CLDRLocaleProviderAdapter.java \
- java/util/MissingResourceException.java \
- java/util/NoSuchElementException.java \
- java/util/Observable.java \
- java/util/Observer.java \
- java/util/Properties.java \
- java/util/InvalidPropertiesFormatException.java \
- sun/util/spi/XmlPropertiesProvider.java \
- java/util/PropertyPermission.java \
- java/util/PropertyResourceBundle.java \
- java/util/Random.java \
- java/util/ResourceBundle.java \
- sun/util/ResourceBundleEnumeration.java \
- sun/util/CoreResourceBundleControl.java \
- java/util/Scanner.java \
- java/util/InputMismatchException.java \
- java/util/Stack.java \
- java/util/StringJoiner.java \
- java/util/StringTokenizer.java \
- java/util/TimeZone.java \
- java/util/SimpleTimeZone.java \
- sun/util/calendar/ZoneInfo.java \
- sun/util/calendar/ZoneInfoFile.java \
- java/util/TooManyListenersException.java \
- java/util/Comparator.java \
- java/util/Comparators.java \
- java/util/Collections.java \
- java/util/Iterator.java \
- java/util/ListIterator.java \
- java/util/Collection.java \
- java/util/Set.java \
- java/util/SortedSet.java \
- java/util/NavigableSet.java \
- java/util/List.java \
- java/util/Queue.java \
- java/util/Deque.java \
- java/util/AbstractCollection.java \
- java/util/AbstractSet.java \
- java/util/HashSet.java \
- java/util/LinkedHashSet.java \
- java/util/TreeSet.java \
- java/util/EnumSet.java \
- java/util/RegularEnumSet.java \
- java/util/JumboEnumSet.java \
- java/util/AbstractList.java \
- java/util/ArrayList.java \
- java/util/Vector.java \
- java/util/AbstractSequentialList.java \
- java/util/LinkedList.java \
- java/util/AbstractQueue.java \
- java/util/PriorityQueue.java \
- java/util/ArrayDeque.java \
- java/util/Map.java \
- java/util/SortedMap.java \
- java/util/NavigableMap.java \
- java/util/AbstractMap.java \
- java/util/HashMap.java \
- java/util/LinkedHashMap.java \
- java/util/TreeMap.java \
- java/util/Hashtable.java \
- java/util/WeakHashMap.java \
- java/util/IdentityHashMap.java \
- java/util/EnumMap.java \
- java/util/Arrays.java \
- java/util/ArraysParallelSortHelpers.java \
- java/util/DualPivotQuicksort.java \
- java/util/TimSort.java \
- java/util/ComparableTimSort.java \
- java/util/ConcurrentModificationException.java \
- java/util/ServiceLoader.java \
- java/util/ServiceConfigurationError.java \
- java/util/Timer.java \
- java/util/TimerTask.java \
- java/util/Objects.java \
- java/util/UUID.java \
- java/util/concurrent/AbstractExecutorService.java \
- java/util/concurrent/ArrayBlockingQueue.java \
- java/util/concurrent/BlockingDeque.java \
- java/util/concurrent/BlockingQueue.java \
- java/util/concurrent/BrokenBarrierException.java \
- java/util/concurrent/Callable.java \
- java/util/concurrent/CancellationException.java \
- java/util/concurrent/CompletableFuture.java \
- java/util/concurrent/CompletionException.java \
- java/util/concurrent/CompletionService.java \
- java/util/concurrent/ConcurrentHashMap.java \
- java/util/concurrent/ConcurrentLinkedDeque.java \
- java/util/concurrent/ConcurrentLinkedQueue.java \
- java/util/concurrent/ConcurrentMap.java \
- java/util/concurrent/ConcurrentNavigableMap.java \
- java/util/concurrent/ConcurrentSkipListMap.java \
- java/util/concurrent/ConcurrentSkipListSet.java \
- java/util/concurrent/CopyOnWriteArrayList.java \
- java/util/concurrent/CopyOnWriteArraySet.java \
- java/util/concurrent/CountDownLatch.java \
- java/util/concurrent/CountedCompleter.java \
- java/util/concurrent/CyclicBarrier.java \
- java/util/concurrent/DelayQueue.java \
- java/util/concurrent/Delayed.java \
- java/util/concurrent/Exchanger.java \
- java/util/concurrent/ExecutionException.java \
- java/util/concurrent/Executor.java \
- java/util/concurrent/ExecutorService.java \
- java/util/concurrent/ExecutorCompletionService.java \
- java/util/concurrent/Executors.java \
- java/util/concurrent/ForkJoinPool.java \
- java/util/concurrent/ForkJoinTask.java \
- java/util/concurrent/ForkJoinWorkerThread.java \
- java/util/concurrent/Future.java \
- java/util/concurrent/FutureTask.java \
- java/util/concurrent/LinkedBlockingDeque.java \
- java/util/concurrent/LinkedBlockingQueue.java \
- java/util/concurrent/LinkedTransferQueue.java \
- java/util/concurrent/Phaser.java \
- java/util/concurrent/PriorityBlockingQueue.java \
- java/util/concurrent/RecursiveAction.java \
- java/util/concurrent/RecursiveTask.java \
- java/util/concurrent/RejectedExecutionException.java \
- java/util/concurrent/RejectedExecutionHandler.java \
- java/util/concurrent/RunnableFuture.java \
- java/util/concurrent/RunnableScheduledFuture.java \
- java/util/concurrent/ScheduledExecutorService.java \
- java/util/concurrent/ScheduledFuture.java \
- java/util/concurrent/ScheduledThreadPoolExecutor.java \
- java/util/concurrent/Semaphore.java \
- java/util/concurrent/SynchronousQueue.java \
- java/util/concurrent/ThreadFactory.java \
- java/util/concurrent/ThreadLocalRandom.java \
- java/util/concurrent/ThreadPoolExecutor.java \
- java/util/concurrent/TimeUnit.java \
- java/util/concurrent/TimeoutException.java \
- java/util/concurrent/TransferQueue.java \
- java/util/concurrent/atomic/AtomicBoolean.java \
- java/util/concurrent/atomic/AtomicInteger.java \
- java/util/concurrent/atomic/AtomicIntegerArray.java \
- java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java \
- java/util/concurrent/atomic/AtomicLong.java \
- java/util/concurrent/atomic/AtomicLongArray.java \
- java/util/concurrent/atomic/AtomicLongFieldUpdater.java \
- java/util/concurrent/atomic/AtomicMarkableReference.java \
- java/util/concurrent/atomic/AtomicReference.java \
- java/util/concurrent/atomic/AtomicReferenceArray.java \
- java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java \
- java/util/concurrent/atomic/AtomicStampedReference.java \
- java/util/concurrent/atomic/DoubleAccumulator.java \
- java/util/concurrent/atomic/DoubleAdder.java \
- java/util/concurrent/atomic/LongAccumulator.java \
- java/util/concurrent/atomic/LongAdder.java \
- java/util/concurrent/atomic/Striped64.java \
- java/util/concurrent/locks/AbstractOwnableSynchronizer.java \
- java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \
- java/util/concurrent/locks/AbstractQueuedSynchronizer.java \
- java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \
- java/util/concurrent/locks/Condition.java \
- java/util/concurrent/locks/Lock.java \
- java/util/concurrent/locks/LockSupport.java \
- java/util/concurrent/locks/ReadWriteLock.java \
- java/util/concurrent/locks/ReentrantLock.java \
- java/util/concurrent/locks/ReentrantReadWriteLock.java \
- java/util/concurrent/locks/StampedLock.java \
- java/util/regex/Pattern.java \
- java/util/regex/Matcher.java \
- java/util/regex/MatchResult.java \
- java/util/regex/ASCII.java \
- java/util/regex/UnicodeProp.java \
- java/util/regex/PatternSyntaxException.java \
- java/util/prefs/Preferences.java \
- java/util/prefs/AbstractPreferences.java \
- java/util/prefs/PreferenceChangeEvent.java \
- java/util/prefs/PreferenceChangeListener.java \
- java/util/prefs/NodeChangeEvent.java \
- java/util/prefs/NodeChangeListener.java \
- java/util/prefs/BackingStoreException.java \
- java/util/prefs/InvalidPreferencesFormatException.java \
- java/util/prefs/PreferencesFactory.java \
- java/util/prefs/Base64.java \
- java/util/prefs/XmlSupport.java \
- java/util/spi/CalendarDataProvider.java \
- java/util/spi/CalendarNameProvider.java \
- java/util/spi/CurrencyNameProvider.java \
- java/util/spi/LocaleNameProvider.java \
- java/util/spi/LocaleServiceProvider.java \
- java/util/spi/ResourceBundleControlProvider.java \
- java/util/spi/TimeZoneNameProvider.java \
- java/io/Closeable.java \
- java/io/Flushable.java \
- java/io/PipedInputStream.java \
- java/io/PipedOutputStream.java \
- java/io/IOException.java \
- java/io/CharConversionException.java \
- java/io/FileNotFoundException.java \
- java/io/EOFException.java \
- java/io/SyncFailedException.java \
- java/io/UTFDataFormatException.java \
- java/io/InterruptedIOException.java \
- java/io/UnsupportedEncodingException.java \
- java/io/DataInput.java \
- java/io/DataOutput.java \
- java/io/InputStream.java \
- java/io/FileInputStream.java \
- java/io/FilterInputStream.java \
- java/io/BufferedInputStream.java \
- java/io/DataInputStream.java \
- java/io/ByteArrayInputStream.java \
- java/io/PushbackInputStream.java \
- java/io/SequenceInputStream.java \
- java/io/StringBufferInputStream.java \
- java/io/LineNumberInputStream.java \
- java/io/OutputStream.java \
- java/io/FileOutputStream.java \
- java/io/FilterOutputStream.java \
- java/io/BufferedOutputStream.java \
- java/io/DataOutputStream.java \
- java/io/ByteArrayOutputStream.java \
- java/io/PrintStream.java \
- java/io/RandomAccessFile.java \
- java/io/StreamTokenizer.java \
- java/io/DeleteOnExitHook.java \
- java/io/File.java \
- java/io/FileSystem.java \
- java/io/FileDescriptor.java \
- java/io/DefaultFileSystem.java \
- java/io/FilenameFilter.java \
- java/io/FileFilter.java \
- java/io/FilePermission.java \
- java/io/Serializable.java \
- java/io/Externalizable.java \
- java/io/SerialCallbackContext.java \
- java/io/Bits.java \
- java/io/ObjectInput.java \
- java/io/ObjectInputStream.java \
- java/io/ObjectInputValidation.java \
- java/io/ObjectOutput.java \
- java/io/ObjectOutputStream.java \
- java/io/ObjectStreamClass.java \
- java/io/ObjectStreamConstants.java \
- java/io/ObjectStreamField.java \
- java/io/SerializablePermission.java \
- java/io/InvalidClassException.java \
- java/io/InvalidObjectException.java \
- java/io/NotActiveException.java \
- java/io/NotSerializableException.java \
- java/io/ObjectStreamException.java \
- java/io/OptionalDataException.java \
- java/io/StreamCorruptedException.java \
- java/io/WriteAbortedException.java \
- java/io/Reader.java \
- java/io/BufferedReader.java \
- java/io/LineNumberReader.java \
- java/io/CharArrayReader.java \
- java/io/FilterReader.java \
- java/io/PushbackReader.java \
- java/io/InputStreamReader.java \
- java/io/FileReader.java \
- java/io/PipedReader.java \
- java/io/StringReader.java \
- java/io/Writer.java \
- java/io/BufferedWriter.java \
- java/io/PrintWriter.java \
- java/io/CharArrayWriter.java \
- java/io/FilterWriter.java \
- java/io/OutputStreamWriter.java \
- java/io/FileWriter.java \
- java/io/PipedWriter.java \
- java/io/StringWriter.java \
- java/io/Console.java \
- java/io/ExpiringCache.java \
- java/nio/charset/Charset.java \
- java/nio/charset/CharsetDecoder.java \
- java/nio/charset/CharsetEncoder.java \
- java/nio/charset/UnmappableCharacterException.java \
- java/nio/Bits.java \
- java/nio/DirectByteBuffer.java \
- java/nio/HeapByteBuffer.java \
- java/nio/HeapCharBuffer.java \
- java/security/AccessController.java \
- java/security/ProtectionDomain.java \
- java/net/URLClassLoader.java \
- java/net/URLConnection.java \
- sun/misc/Launcher.java \
- sun/misc/MetaIndex.java \
- sun/misc/URLClassPath.java \
- sun/misc/Version.java \
- sun/misc/FileURLMapper.java \
- sun/misc/MessageUtils.java \
- sun/misc/GC.java \
- sun/misc/Service.java \
- sun/misc/JavaAWTAccess.java \
- sun/misc/JavaLangAccess.java \
- sun/misc/JavaIOAccess.java \
- sun/misc/JavaIOFileDescriptorAccess.java \
- sun/misc/JavaNioAccess.java \
- sun/misc/Perf.java \
- sun/misc/PerfCounter.java \
- sun/net/www/protocol/jar/Handler.java \
- sun/net/www/protocol/jar/JarURLConnection.java \
- sun/net/www/protocol/file/Handler.java \
- sun/net/www/protocol/file/FileURLConnection.java
-
-FILES_java = $(JAVA_JAVA_java)
diff --git a/jdk/make/java/java/Makefile b/jdk/make/java/java/Makefile
deleted file mode 100644
index d2a663f..0000000
--- a/jdk/make/java/java/Makefile
+++ /dev/null
@@ -1,505 +0,0 @@
-#
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for core Java libraries
-# (java.lang, java.lang.ref, java.lang.reflect, java.io, java.util)
-#
-
-BUILDDIR = ../..
-PACKAGE = java.lang
-LIBRARY = java
-PRODUCT = java
-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
-SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-JAVAC_MAX_WARNINGS=true
-include $(BUILDDIR)/common/Defs.gmk
-
-AUTO_FILES_JAVA_DIRS = java/util/function
-
-# windows compiler flags
-ifeq ($(PLATFORM),windows)
- OTHER_CFLAGS =
- # build directly into BINDIR...
- LIB_LOCATION = $(BINDIR)
- # Exported functions
- OTHER_LCF = -export:winFileHandleOpen -export:handleLseek
-endif
-
-OTHER_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
- -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
- -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
- -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
-
-ifdef JDK_UPDATE_VERSION
-OTHER_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
-endif
-
-
-#
-# Files to compile.
-#
-include FILES_c.gmk
-include FILES_java.gmk
-include Exportedfiles.gmk
-
-ifeq ($(PLATFORM),windows)
-FILES_java += java/io/WinNTFileSystem.java \
- java/util/prefs/WindowsPreferences.java \
- java/util/prefs/WindowsPreferencesFactory.java
-
-FILES_c += ProcessImpl_md.c \
- WinNTFileSystem_md.c \
- canonicalize_md.c \
- dirent_md.c \
- TimeZone.c \
- TimeZone_md.c \
- WindowsPreferences.c \
- sun/security/provider/WinCAPISeedGenerator.c \
- sun/io/Win32ErrorMode.c
-
-else # PLATFORM
-FILES_java += java/lang/UNIXProcess.java \
- java/io/UnixFileSystem.java \
- java/util/prefs/FileSystemPreferences.java \
- java/util/prefs/FileSystemPreferencesFactory.java \
-
-FILES_c += UNIXProcess_md.c \
- childproc.c \
- UnixFileSystem_md.c \
- canonicalize_md.c \
- TimeZone.c \
- TimeZone_md.c \
- FileSystemPreferences.c
-
-INIT += $(GENSRCDIR)/java/lang/UNIXProcess.java
-
-endif # PLATFORM
-
-ifeq ($(PLATFORM), macosx)
-FILES_c += java_props_macosx.c
-FILES_java += java/util/prefs/MacOSXPreferences.java \
- java/util/prefs/MacOSXPreferencesFile.java \
- java/util/prefs/MacOSXPreferencesFactory.java
-
-CFLAGS_$(VARIANT)/java_props_md.o = -Os -x objective-c
-CFLAGS_$(VARIANT)/java_props_macosx.o = -Os -x objective-c
-endif
-
-#
-# Make sure first rule does 'all'
-#
-default_rule: all
-
-#
-# Source files to generate before we try to compile anything
-#
-
-#
-# genlocales.gmk define rules to generate LocaleDataMetaInfo.java
-# which contains locale string list for sun.text.resources and
-# sun.util.resources.
-#
-include genlocales.gmk
-
-CLASSES_INIT = gencharsrc niosrc rbcontrolsrc genlocales
-
-niosrc: ; ($(CD) ../nio; $(MAKE) sources)
-
-gencharsrc: $(GENSRCDIR)/java/lang/CharacterData00.java \
- $(GENSRCDIR)/java/lang/CharacterData01.java \
- $(GENSRCDIR)/java/lang/CharacterData02.java \
- $(GENSRCDIR)/java/lang/CharacterData0E.java \
- $(GENSRCDIR)/java/lang/CharacterDataLatin1.java \
- $(GENSRCDIR)/java/lang/CharacterDataUndefined.java \
- $(GENSRCDIR)/java/lang/CharacterDataPrivateUse.java
-
-rbcontrolsrc: $(GENSRCDIR)/sun/util/CoreResourceBundleControl.java
-
-#
-# Add to the default C file search paths
-#
-vpath %.c $(PLATFORM_SRC)/native/java/lang:$(SHARE_SRC)/native/java/lang
-vpath %.c $(SHARE_SRC)/native/java/lang/ref
-vpath %.c $(SHARE_SRC)/native/java/lang/reflect
-vpath %.c $(SHARE_SRC)/native/java/io
-vpath %.c $(PLATFORM_SRC)/native/java/io
-vpath %.c $(SHARE_SRC)/native/java/nio
-vpath %.c $(SHARE_SRC)/native/java/security
-vpath %.c $(SHARE_SRC)/native/common
-vpath %.c $(SHARE_SRC)/native/sun/misc
-vpath %.c $(SHARE_SRC)/native/sun/reflect
-vpath %.c $(SHARE_SRC)/native/java/sql
-vpath %.c $(SHARE_SRC)/native/java/util
-vpath %.c $(SHARE_SRC)/native/java/util/concurrent/atomic
-vpath %.c $(PLATFORM_SRC)/native/common
-vpath %.c $(PLATFORM_SRC)/native/java/util
-vpath %.c $(PLATFORM_SRC)/native/sun/security/provider
-vpath %.c $(PLATFORM_SRC)/native/sun/io
-ifeq ($(PLATFORM),macosx)
-vpath %.c $(PLATFORM_SRC_MACOS)/native/sun/util/locale/provider
-else # PLATFORM
-vpath %.c $(PLATFORM_SRC)/native/sun/util/locale/provider
-endif # PLATFORM
-
-#
-# Includes the fdlibm header file.
-#
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/lang/fdlibm/include
-
-#
-# Also include the io_util.h header file.
-#
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/io
-OTHER_INCLUDES += -I$(PLATFORM_SRC)/native/java/io
-
-#
-# Also include the TimeZone_md.h header file.
-#
-OTHER_INCLUDES += -I$(PLATFORM_SRC)/native/java/util
-
-#
-# Is the altzone extern documented in ctime(3C) available?
-#
-ifneq ($(PLATFORM), windows)
-ifneq ($(PLATFORM), macosx)
-HAVE_ALTZONE=true
-endif
-endif
-
-ifeq ($(HAVE_ALTZONE),true)
-OTHER_CPPFLAGS += -DHAVE_ALTZONE
-endif
-
-#
-# System.c needs RELEASE.
-# java_props_md.c needs ARCH on non-Solaris platforms.
-#
-OTHER_CPPFLAGS += $(VERSION_DEFINES)
-
-#
-# Include name of LIBARCH
-#
-OTHER_CPPFLAGS += -DARCHPROPNAME='"$(ARCHPROP)"'
-
-#
-# Is the key in the call nl_langinfo(CODESET) called something other than
-# CODESET?
-#
-ifdef ALT_CODESET_KEY
-OTHER_CPPFLAGS += -DALT_CODESET_KEY=$(ALT_CODESET_KEY)
-endif
-
-#
-# Install .lib file.
-#
-INSTALL_DOT_LIB = true
-
-#
-# What to link?
-# On Windows, shell32 is not normally required and so it is delay loaded.
-#
-ifeq ($(PLATFORM),windows)
-OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
- -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib \
- shell32.lib delayimp.lib /DELAYLOAD:shell32.dll
-else
-OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) $(LIBSCF) $(LIBDL) \
- -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
-ifeq ($(PLATFORM), macosx)
-OTHER_LDLIBS += \
- -framework CoreFoundation \
- -framework Security \
- -framework SystemConfiguration
-endif
-endif
-
-#
-# Rules.
-#
-ifeq ($(PLATFORM), solaris)
- ifneq ($(ARCH), amd64)
- FILES_reorder += reorder-$(ARCH)
- endif
-endif
-
-SUBDIRS = reflect
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build:
- $(SUBDIRS-loop)
-clean clobber::
- $(SUBDIRS-loop)
-
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-ifeq ($(PLATFORM), solaris)
- ifeq ($(CC_VER), 5.8)
- ifndef REMOVE_ALL_WORKAROUNDS
- CFLAGS_OPT/ObjectInputStream.o = -xO3 \
- $(warning "WARNING: Using workaround for SS11 bug 6346242, on $@")
- endif
- endif
-endif
-
-ifneq ($(PLATFORM),windows)
-
-# UNIXProcess.java is different for solaris and linux. We need to copy
-# the correct UNIXProcess.java over to $(GENSRCDIR)/java/lang/.
-
-ifeq ($(PLATFORM), macosx)
-PLATFORM_UNIX_PROCESS = \
- $(PLATFORM_SRC)/classes/java/lang/UNIXProcess.java.bsd
-else
-PLATFORM_UNIX_PROCESS = \
- $(PLATFORM_SRC)/classes/java/lang/UNIXProcess.java.$(PLATFORM)
-endif
-
-$(GENSRCDIR)/java/lang/UNIXProcess.java: $(PLATFORM_UNIX_PROCESS)
- $(install-file)
-
-clean::
- $(RM) $(GENSRCDIR)/java/lang/UNIXProcess.java
-
-endif
-
-
-#
-# Because we can't link against ourselves!
-#
-JAVALIB =
-
-#
-# Special rules.
-#
-clean::
- $(RM) -r $(CLASSHDRDIR)
-
-clobber::
- $(RM) -r $(CLASSBINDIR)/java/io $(CLASSBINDIR)/java/lang \
- $(CLASSBINDIR)/java/security $(CLASSBINDIR)/java/util \
- $(CLASSBINDIR)/sun/misc
-
-#
-# Additional rule from sun/net/GNUmakefile to copy content-type.properties
-# file so that the MimeTable class won't complain while bootstrapping...
-#
-PROPS = content-types.properties
-
-#
-# Rule to copy calendars.properties file.
-#
-CAL_PROPS = calendars.properties
-
-#
-# Rule to copy Hijrah-umalqura calendar properties file.
-#
-HIJRAH_UMALQURA_PROPS = hijrah-config-umalqura.properties
-
-
-#
-# Rule to copy tzmappings file on Windows
-#
-ifeq ($(PLATFORM), windows)
-TZMAP = $(LIBDIR)/tzmappings
-TZMAPFILE = $(PLATFORM_SRC)/lib/tzmappings
-
-$(TZMAP): $(TZMAPFILE)
- $(install-file)
- $(call chmod-file, 444)
-endif
-
-build: $(LIBDIR)/$(PROPS) $(LIBDIR)/$(CAL_PROPS) $(LIBDIR)/$(HIJRAH_UMALQURA_PROPS) $(TZMAP)
-
-$(LIBDIR)/$(PROPS): $(PLATFORM_SRC)/lib/$(PROPS)
- $(install-file)
-
-$(LIBDIR)/$(CAL_PROPS): $(SHARE_SRC)/lib/$(CAL_PROPS)
- $(install-file)
-
-$(LIBDIR)/$(HIJRAH_UMALQURA_PROPS): $(SHARE_SRC)/lib/$(HIJRAH_UMALQURA_PROPS)
- $(install-file)
-
-clean::
- $(RM) -r $(LIBDIR)/$(PROPS) $(TZMAP)
-
-#
-# Rules to create lib/currency.data
-#
-
-CURDATA = $(LIBDIR)/currency.data
-GENERATECURRENCYDATA_JARFILE = $(BUILDTOOLJARDIR)/generatecurrencydata.jar
-
-build: $(CURDATA)
-
-$(CURDATA): \
- $(GENERATECURRENCYDATA_JARFILE) \
- $(SHARE_SRC)/classes/java/util/CurrencyData.properties
- $(RM) $(CURDATA)
- $(BOOT_JAVA_CMD) -jar $(GENERATECURRENCYDATA_JARFILE) -o $@.temp \
- < $(SHARE_SRC)/classes/java/util/CurrencyData.properties
- $(MV) $@.temp $@
- $(call chmod-file, 444)
-
-clean::
- $(RM) $(CURDATA)
-
-
-#
-# Rules to create $(GENSRCDIR)/sun/lang/CharacterData*.java
-#
-CHARACTERDATA = $(BUILDDIR)/tools/GenerateCharacter
-UNICODEDATA = $(BUILDDIR)/tools/UnicodeData
-
-GENERATECHARACTER_JARFILE = $(BUILDTOOLJARDIR)/generatecharacter.jar
-
-$(GENSRCDIR)/java/lang/CharacterDataLatin1.java \
- $(GENSRCDIR)/java/lang/CharacterData00.java \
- $(GENSRCDIR)/java/lang/CharacterData01.java \
- $(GENSRCDIR)/java/lang/CharacterData02.java \
- $(GENSRCDIR)/java/lang/CharacterData0E.java: \
- $(wildcard $(CHARACTERDATA)/*) \
- $(GENERATECHARACTER_JARFILE)
- @$(prep-target)
- $(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) \
- -template $(CHARACTERDATA)/CharacterDataLatin1.java.template \
- -spec $(UNICODEDATA)/UnicodeData.txt \
- -specialcasing $(UNICODEDATA)/SpecialCasing.txt \
- -proplist $(UNICODEDATA)/PropList.txt \
- -o $(GENSRCDIR)/java/lang/CharacterDataLatin1.java -string \
- -usecharforbyte -latin1 8
- $(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 0 \
- -template $(CHARACTERDATA)/CharacterData00.java.template \
- -spec $(UNICODEDATA)/UnicodeData.txt \
- -specialcasing $(UNICODEDATA)/SpecialCasing.txt \
- -proplist $(UNICODEDATA)/PropList.txt \
- -o $(GENSRCDIR)/java/lang/CharacterData00.java -string \
- -usecharforbyte 11 4 1
- $(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 1 \
- -template $(CHARACTERDATA)/CharacterData01.java.template \
- -spec $(UNICODEDATA)/UnicodeData.txt \
- -specialcasing $(UNICODEDATA)/SpecialCasing.txt \
- -proplist $(UNICODEDATA)/PropList.txt \
- -o $(GENSRCDIR)/java/lang/CharacterData01.java -string \
- -usecharforbyte 11 4 1
- $(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 2 \
- -template $(CHARACTERDATA)/CharacterData02.java.template \
- -spec $(UNICODEDATA)/UnicodeData.txt \
- -specialcasing $(UNICODEDATA)/SpecialCasing.txt \
- -proplist $(UNICODEDATA)/PropList.txt \
- -o $(GENSRCDIR)/java/lang/CharacterData02.java -string \
- -usecharforbyte 11 4 1
- $(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 14 \
- -template $(CHARACTERDATA)/CharacterData0E.java.template \
- -spec $(UNICODEDATA)/UnicodeData.txt \
- -specialcasing $(UNICODEDATA)/SpecialCasing.txt \
- -proplist $(UNICODEDATA)/PropList.txt \
- -o $(GENSRCDIR)/java/lang/CharacterData0E.java -string \
- -usecharforbyte 11 4 1
-
-$(GENSRCDIR)/java/lang/%.java : $(CHARACTERDATA)/%.java.template
- $(install-file)
-
-clean::
- $(RM) $(GENSRCDIR)/java/lang/CharacterDataLatin1.java
- $(RM) $(GENSRCDIR)/java/lang/CharacterData00.java
- $(RM) $(GENSRCDIR)/java/lang/CharacterData01.java
- $(RM) $(GENSRCDIR)/java/lang/CharacterData02.java
- $(RM) $(GENSRCDIR)/java/lang/CharacterData0E.java
- $(RM) $(GENSRCDIR)/java/lang/CharacterDataUndefined.java
- $(RM) $(GENSRCDIR)/java/lang/CharacterDataPrivateUse.java
-
-#
-# Rules to generate classes/java/lang/uniName.dat
-#
-
-
-
-UNINAME = $(CLASSBINDIR)/java/lang/uniName.dat
-GENERATEUNINAME_JARFILE = $(BUILDTOOLJARDIR)/generatecharacter.jar
-
-build: $(UNINAME)
-
-$(UNINAME): $(UNICODEDATA)/UnicodeData.txt \
- $(GENERATECHARACTER_JARFILE)
- @$(prep-target)
- $(BOOT_JAVA_CMD) -classpath $(GENERATECHARACTER_JARFILE) \
- build.tools.generatecharacter.CharacterName \
- $(UNICODEDATA)/UnicodeData.txt $(UNINAME)
-
-clean::
- $(RM) $(UNINAME)
-
-#
-# End of rules to create $(GENSRCDIR)/java/lang/CharacterDataXX.java
-#
-
-#
-# Rule to precompile CoreResourceBundleControl.java
-#
-LOCALES_GEN_SH = localelist.sh
-
-$(GENSRCDIR)/sun/util/CoreResourceBundleControl.java: \
- $(SHARE_SRC)/classes/sun/util/CoreResourceBundleControl-XLocales.java.template $(LOCALES_GEN_SH)
- @$(prep-target)
- NAWK="$(NAWK)" SED="$(SED)" $(SH) $(LOCALES_GEN_SH) "$(JRE_NONEXIST_LOCALES)" \
- $< $@
-clean::
- $(RM) $(GENSRCDIR)/sun/util/CoreResourceBundleControl.java
-
-
-HELPER_EXE = $(LIBDIR)/$(LIBARCH)/jspawnhelper
-BUILDHELPER =
-ifeq ($(PLATFORM), solaris)
- BUILDHELPER = 1
-endif
-ifeq ($(PLATFORM), macosx)
- HELPER_EXE = $(LIBDIR)/jspawnhelper
- BUILDHELPER = 1
-endif
-
-ARCHFLAG =
-ifeq ($(ARCH_DATA_MODEL), 64)
-ARCHFLAG = -m64
-endif
-
-ifdef BUILDHELPER
-
-HELPER_EXE_FILES_c = jspawnhelper.c
-HELPER_EXE_FILES_o = $(OBJDIR)/jspawnhelper.o \
- $(OBJDIR)/childproc.o
-
-$(HELPER_EXE): $(HELPER_EXE_FILES_o)
- $(CC) $(ARCHFLAG) $(HELPER_EXE_FILES_o) \
- -o $(TEMPDIR)/jspawnhelper
- $(CP) $(TEMPDIR)/jspawnhelper $(HELPER_EXE)
-
-build: $(HELPER_EXE)
-
-clean clobber::
- $(RM) $(HELPER_EXE_FILES_o) $(HELPER_EXE)
-
-endif #BUILDHELPER
diff --git a/jdk/make/java/java/genlocales.gmk b/jdk/make/java/java/genlocales.gmk
deleted file mode 100644
index 0d52565..0000000
--- a/jdk/make/java/java/genlocales.gmk
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# This file defines rules to build the locales information for
-# resources in "sun.util.resources" & "sun.text.resources" packages
-#
-
-# Save the current FILES_java & FILES_compiled_properties variables
-
-FILES_java_orig := $(FILES_java)
-FILES_compiled_properties_orig := $(FILES_compiled_properties)
-
-
-# Since all the resources files are going to be compiled into class file format,
-# only FILES_java and FILES_compiled_properties variables will be picked up
-#
-# $(BUILDDIR)/java/util/FILES_java.gmk & $(BUILDDIR)/java/util/FILES_properties.gmk
-# contain "sun.util.resources" for EN language support
-
-include $(BUILDDIR)/java/util/FILES_java.gmk
-include $(BUILDDIR)/java/util/FILES_properties.gmk
-
-EN_Resources_java := $(FILES_java)
-EN_Resources_properties := $(FILES_compiled_properties)
-
-# $(BUILDDIR)/java/text/FILES_java.gmk contains the "sun.text.resources" for
-# EN language support
-
-include $(BUILDDIR)/java/text/base/FILES_java.gmk
-
-EN_Resources_java += $(FILES_java)
-
-FILES_compiled_properties=
-
-# $(BUILDDIR)/sun/text/FILES_java.gmk & $(BUILDDIR)/sun/text/FILES_properties.gmk
-# contain both resources for Non-EN language support
-
-include $(BUILDDIR)/sun/text/FILES_java.gmk
-include $(BUILDDIR)/sun/text/FILES_properties.gmk
-
-NonEN_Resources_java := $(FILES_java)
-NonEN_Resources_properties := $(FILES_compiled_properties)
-
-# Restore the orignal FILES_java & FILES_compiled_properties variables
-FILES_java := $(FILES_java_orig)
-FILES_compiled_properties := $(FILES_compiled_properties_orig)
-
-LocaleDataMetaInfo_Src=$(SHARE_SRC)/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
-LocaleDataMetaInfo_Dest=$(GENSRCDIR)/sun/util/locale/provider/LocaleDataMetaInfo.java
-LOCALEGEN_SH=localegen.sh
-RESOURCE_NAMES="FormatData CollationData TimeZoneNames LocaleNames CurrencyNames CalendarData"
-
-
-# On MacOSX sed does not enter a newline as it does on other platforms with the same pattern
-# Using awk instead
-
-ifeq ($(PLATFORM), macosx)
-
-$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
- @$(RM) $@.tmp.en $@.tmp.nonen;
- @$(prep-target)
- @$(ECHO) $(EN_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.en;
- @$(ECHO) $(EN_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.en;
- @$(ECHO) $(NonEN_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.nonen;
- @$(ECHO) $(NonEN_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.nonen;
- NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
- $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.en \
- $@.tmp.nonen $< $@
- @$(RM) $@.tmp.en $@.tmp.nonen;
-
-else
-
-$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
- @$(RM) $@.tmp.en $@.tmp.nonen;
- @$(prep-target)
- @$(ECHO) $(subst .properties,'\n',$(EN_Resources_properties)) > $@.tmp.en;
- @$(ECHO) $(subst .java,'\n',$(EN_Resources_java)) >> $@.tmp.en;
- @$(ECHO) $(subst .properties,'\n',$(NonEN_Resources_properties)) > $@.tmp.nonen;
- @$(ECHO) $(subst .java,'\n',$(NonEN_Resources_java)) >> $@.tmp.nonen;
- NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
- $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.en \
- $@.tmp.nonen $< $@
- @$(RM) $@.tmp.en $@.tmp.nonen;
-endif
-
-genlocales : $(LocaleDataMetaInfo_Dest)
-
-clean clobber::
- $(RM) $(LocaleDataMetaInfo_Dest)
-
diff --git a/jdk/make/java/java/localegen.sh b/jdk/make/java/java/localegen.sh
deleted file mode 100644
index 78493d3..0000000
--- a/jdk/make/java/java/localegen.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# This script is to generate the supported locale list string and replace the
-# LocaleDataMetaInfo-XLocales.java.template in <ws>/src/share/classes/sun/util
-#
-# SORT, NAWK & SED is passed in as environment variables.
-#
-
-# A list of resource base name list;
-RESOURCE_NAMES=$1
-
-# A list of EN resources;
-EN_FILES_LIST=$2
-
-# A list of non-EN resources;
-NONEN_FILES_LIST=$3
-
-INPUT_FILE=$4
-OUTPUT_FILE=$5
-
-localelist=
-getlocalelist() {
- localelist=""
- localelist=`$NAWK -F$1_ '{print $2}' $2 | $SORT | $SED -e 's/_/-/g'`
-}
-
-sed_script="$SED -e \"s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@\" "
-
-# ja-JP-JP and th-TH-TH need to be manually added, as they don't have any resource files.
-nonenall=" ja-JP-JP th-TH-TH "
-
-for FILE in $RESOURCE_NAMES
-do
- getlocalelist $FILE $EN_FILES_LIST
- sed_script=$sed_script"-e \"s@#"$FILE"_ENLocales#@$localelist@g\" "
- enall=$enall" "$localelist
- getlocalelist $FILE $NONEN_FILES_LIST
- sed_script=$sed_script"-e \"s@#"$FILE"_NonENLocales#@$localelist@g\" "
- nonenall=$nonenall" "$localelist
-done
-
-enall=`(for LOC in $enall; do echo $LOC;done) |$SORT -u`
-nonenall=`(for LOC in $nonenall; do echo $LOC;done) |$SORT -u`
-
-sed_script=$sed_script"-e \"s@#AvailableLocales_ENLocales#@$enall@g\" "
-sed_script=$sed_script"-e \"s@#AvailableLocales_NonENLocales#@$nonenall@g\" "
-
-sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
-eval $sed_script
diff --git a/jdk/make/java/java/localelist.sh b/jdk/make/java/java/localelist.sh
deleted file mode 100644
index c1b6b7f..0000000
--- a/jdk/make/java/java/localelist.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# This script is to generate the supported locale list string and replace the
-# #LOCALE_LIST# in <ws>/src/share/classes/sun/util/CoreResourceBundleControl.java.
-#
-# NAWK & SED is passed in as environment variables.
-#
-LOCALE_LIST=$1
-INUT_FILE=$2
-OUTPUT_FILE=$3
-
-LOCALES=`(for I in $LOCALE_LIST; do echo $I;done) | sort | uniq`
-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] "\")";
- }
- }
- }'`
-
- JAVA_LOCALES=$JAVA_LOCALES$NewLocale
-}
-
-# count the number of locales
-counter=0
-for i in $LOCALES
-do
- 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
-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
-
-
-
diff --git a/jdk/make/java/java/mapfile-vers b/jdk/make/java/java/mapfile-vers
deleted file mode 100644
index 29ce7eb..0000000
--- a/jdk/make/java/java/mapfile-vers
+++ /dev/null
@@ -1,302 +0,0 @@
-#
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
- JNU_ThrowNoSuchMethodException;
- JNU_CallStaticMethodByName;
- JNU_CallMethodByName;
- JNU_CallMethodByNameV;
- JNU_ClassClass;
- JNU_ClassObject;
- JNU_ClassString;
- JNU_ClassThrowable;
- JNU_CopyObjectArray;
- JNU_Equals;
- JNU_GetEnv;
- JNU_GetFieldByName;
- JNU_GetStaticFieldByName;
- JNU_GetStringPlatformChars;
- JNU_IsInstanceOfByName;
- JNU_MonitorWait;
- JNU_NewObjectByName;
- JNU_NewStringPlatform;
- JNU_Notify;
- JNU_NotifyAll;
- JNU_PrintClass;
- JNU_PrintString;
- JNU_ReleaseStringPlatformChars;
- JNU_SetFieldByName;
- JNU_SetStaticFieldByName;
- JNU_ThrowArrayIndexOutOfBoundsException;
- JNU_ThrowByName;
- JNU_ThrowByNameWithLastError;
- JNU_ThrowClassNotFoundException;
- JNU_ThrowIllegalAccessError;
- JNU_ThrowIllegalAccessException;
- JNU_ThrowIllegalArgumentException;
- JNU_ThrowInstantiationException;
- JNU_ThrowInternalError;
- JNU_ThrowIOException;
- JNU_ThrowIOExceptionWithLastError;
- JNU_ThrowNoSuchFieldError;
- JNU_ThrowNoSuchFieldException;
- JNU_ThrowNoSuchMethodError;
- JNU_ThrowNullPointerException;
- JNU_ThrowNumberFormatException;
- JNU_ThrowOutOfMemoryError;
- JNU_ThrowStringIndexOutOfBoundsException;
- JNU_ToString;
-
- Java_java_io_FileDescriptor_initIDs;
- Java_java_io_FileDescriptor_sync;
- Java_java_io_FileInputStream_available;
- Java_java_io_FileInputStream_close0;
- Java_java_io_FileInputStream_initIDs;
- Java_java_io_FileInputStream_open;
- Java_java_io_FileInputStream_read;
- Java_java_io_FileInputStream_readBytes;
- Java_java_io_FileInputStream_skip;
- Java_java_io_FileOutputStream_close0;
- Java_java_io_FileOutputStream_initIDs;
- Java_java_io_FileOutputStream_open;
- Java_java_io_FileOutputStream_write;
- Java_java_io_FileOutputStream_writeBytes;
- Java_java_io_ObjectInputStream_bytesToDoubles;
- Java_java_io_ObjectInputStream_bytesToFloats;
- Java_java_io_ObjectOutputStream_doublesToBytes;
- Java_java_io_ObjectOutputStream_floatsToBytes;
- Java_java_io_ObjectStreamClass_hasStaticInitializer;
- Java_java_io_ObjectStreamClass_initNative;
- Java_java_io_RandomAccessFile_close0;
- Java_java_io_RandomAccessFile_getFilePointer;
- Java_java_io_RandomAccessFile_initIDs;
- Java_java_io_RandomAccessFile_length;
- Java_java_io_RandomAccessFile_open;
- Java_java_io_RandomAccessFile_read;
- Java_java_io_RandomAccessFile_readBytes;
- Java_java_io_RandomAccessFile_seek0;
- Java_java_io_RandomAccessFile_setLength;
- Java_java_io_RandomAccessFile_write;
- Java_java_io_RandomAccessFile_writeBytes;
- Java_java_io_UnixFileSystem_canonicalize0;
- Java_java_io_UnixFileSystem_checkAccess;
- Java_java_io_UnixFileSystem_createDirectory;
- Java_java_io_UnixFileSystem_createFileExclusively;
- Java_java_io_UnixFileSystem_delete0;
- Java_java_io_UnixFileSystem_getBooleanAttributes0;
- Java_java_io_UnixFileSystem_getLastModifiedTime;
- Java_java_io_UnixFileSystem_getLength;
- Java_java_io_UnixFileSystem_getSpace;
- Java_java_io_UnixFileSystem_initIDs;
- Java_java_io_UnixFileSystem_list;
- Java_java_io_UnixFileSystem_rename0;
- Java_java_io_UnixFileSystem_setLastModifiedTime;
- Java_java_io_UnixFileSystem_setReadOnly;
- Java_java_io_UnixFileSystem_setPermission;
- Java_java_lang_Class_forName0;
- Java_java_lang_Class_getPrimitiveClass;
- Java_java_lang_Class_isAssignableFrom;
- Java_java_lang_Class_isInstance;
- Java_java_lang_Class_registerNatives;
- Java_java_lang_ClassLoader_findBootstrapClass;
- Java_java_lang_ClassLoader_defineClass0;
- Java_java_lang_ClassLoader_defineClass1;
- Java_java_lang_ClassLoader_defineClass2;
- Java_java_lang_ClassLoader_findLoadedClass0;
- Java_java_lang_ClassLoader_resolveClass0;
- Java_java_lang_ClassLoader_00024NativeLibrary_find;
- Java_java_lang_ClassLoader_00024NativeLibrary_load;
- Java_java_lang_ClassLoader_00024NativeLibrary_unload;
- Java_java_lang_ClassLoader_00024NativeLibrary_findBuiltinLib;
- Java_java_lang_ClassLoader_registerNatives;
- Java_java_lang_Compiler_registerNatives;
- Java_java_lang_Double_longBitsToDouble;
- Java_java_lang_Double_doubleToRawLongBits;
- Java_java_lang_reflect_Proxy_defineClass0;
- Java_java_lang_Shutdown_runAllFinalizers;
- Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
- Java_java_lang_Float_intBitsToFloat;
- Java_java_lang_Float_floatToRawIntBits;
- Java_java_lang_StrictMath_IEEEremainder;
- Java_java_lang_StrictMath_acos;
- Java_java_lang_StrictMath_asin;
- Java_java_lang_StrictMath_atan;
- Java_java_lang_StrictMath_atan2;
- Java_java_lang_StrictMath_cos;
- Java_java_lang_StrictMath_exp;
- Java_java_lang_StrictMath_log;
- Java_java_lang_StrictMath_log10;
- Java_java_lang_StrictMath_pow;
- Java_java_lang_StrictMath_sin;
- Java_java_lang_StrictMath_sqrt;
- Java_java_lang_StrictMath_cbrt;
- Java_java_lang_StrictMath_tan;
- Java_java_lang_StrictMath_cosh;
- Java_java_lang_StrictMath_sinh;
- Java_java_lang_StrictMath_tanh;
- Java_java_lang_StrictMath_hypot;
- Java_java_lang_StrictMath_log1p;
- Java_java_lang_StrictMath_expm1;
- Java_java_lang_Object_getClass;
- Java_java_lang_Object_registerNatives;
- Java_java_lang_Package_getSystemPackage0;
- Java_java_lang_Package_getSystemPackages0;
- Java_java_lang_ProcessEnvironment_environ;
- Java_java_lang_reflect_Array_get;
- Java_java_lang_reflect_Array_getBoolean;
- Java_java_lang_reflect_Array_getByte;
- Java_java_lang_reflect_Array_getChar;
- Java_java_lang_reflect_Array_getDouble;
- Java_java_lang_reflect_Array_getFloat;
- Java_java_lang_reflect_Array_getInt;
- Java_java_lang_reflect_Array_getLength;
- Java_java_lang_reflect_Array_getLong;
- Java_java_lang_reflect_Array_getShort;
- Java_java_lang_reflect_Array_multiNewArray;
- Java_java_lang_reflect_Array_newArray;
- Java_java_lang_reflect_Array_set;
- Java_java_lang_reflect_Array_setBoolean;
- Java_java_lang_reflect_Array_setByte;
- Java_java_lang_reflect_Array_setChar;
- Java_java_lang_reflect_Array_setDouble;
- Java_java_lang_reflect_Array_setFloat;
- Java_java_lang_reflect_Array_setInt;
- Java_java_lang_reflect_Array_setLong;
- Java_java_lang_reflect_Array_setShort;
- Java_java_lang_reflect_Executable_getParameters0;
- Java_java_lang_reflect_Executable_getTypeAnnotationBytes0;
- Java_java_lang_reflect_Field_getTypeAnnotationBytes0;
- Java_java_lang_Runtime_freeMemory;
- Java_java_lang_Runtime_maxMemory;
- Java_java_lang_Runtime_gc;
- Java_java_lang_Runtime_runFinalization0;
- Java_java_lang_Runtime_totalMemory;
- Java_java_lang_Runtime_traceInstructions;
- Java_java_lang_Runtime_traceMethodCalls;
- Java_java_lang_Runtime_availableProcessors;
- Java_java_lang_SecurityManager_classDepth;
- Java_java_lang_SecurityManager_classLoaderDepth0;
- Java_java_lang_SecurityManager_currentClassLoader0;
- Java_java_lang_SecurityManager_currentLoadedClass0;
- Java_java_lang_SecurityManager_getClassContext;
- Java_java_lang_Shutdown_halt0;
- Java_java_lang_String_intern;
- Java_java_lang_System_identityHashCode;
- Java_java_lang_System_initProperties;
- Java_java_lang_System_mapLibraryName;
- Java_java_lang_System_registerNatives;
- Java_java_lang_System_setErr0;
- Java_java_lang_System_setIn0;
- Java_java_lang_System_setOut0;
- Java_java_lang_Thread_registerNatives;
- Java_java_lang_Throwable_fillInStackTrace;
- Java_java_lang_Throwable_getStackTraceDepth;
- Java_java_lang_Throwable_getStackTraceElement;
- Java_java_lang_UNIXProcess_init;
- Java_java_lang_UNIXProcess_waitForProcessExit;
- Java_java_lang_UNIXProcess_forkAndExec;
- Java_java_lang_UNIXProcess_destroyProcess;
- Java_java_nio_Bits_copyFromShortArray;
- Java_java_nio_Bits_copyToShortArray;
- Java_java_nio_Bits_copyFromIntArray;
- Java_java_nio_Bits_copyToIntArray;
- Java_java_nio_Bits_copyFromLongArray;
- Java_java_nio_Bits_copyToLongArray;
- Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2;
- Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
- Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2;
- Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2;
- Java_java_security_AccessController_getStackAccessControlContext;
- Java_java_security_AccessController_getInheritedAccessControlContext;
- Java_java_util_TimeZone_getSystemTimeZoneID;
- Java_java_util_TimeZone_getSystemGMTOffsetID;
- Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8;
- Java_java_util_prefs_FileSystemPreferences_chmod;
- Java_java_util_prefs_FileSystemPreferences_lockFile0;
- Java_java_util_prefs_FileSystemPreferences_unlockFile0;
- Java_java_util_logging_FileHandler_isSetUID;
- Java_sun_misc_MessageUtils_toStderr;
- Java_sun_misc_MessageUtils_toStdout;
- Java_sun_misc_NativeSignalHandler_handle0;
- Java_sun_misc_Signal_findSignal;
- Java_sun_misc_Signal_handle0;
- Java_sun_misc_Signal_raise0;
- Java_sun_reflect_ConstantPool_getClassAt0;
- Java_sun_reflect_ConstantPool_getClassAtIfLoaded0;
- Java_sun_reflect_ConstantPool_getDoubleAt0;
- Java_sun_reflect_ConstantPool_getFieldAt0;
- Java_sun_reflect_ConstantPool_getFieldAtIfLoaded0;
- Java_sun_reflect_ConstantPool_getFloatAt0;
- Java_sun_reflect_ConstantPool_getIntAt0;
- Java_sun_reflect_ConstantPool_getLongAt0;
- Java_sun_reflect_ConstantPool_getMemberRefInfoAt0;
- Java_sun_reflect_ConstantPool_getMethodAt0;
- Java_sun_reflect_ConstantPool_getMethodAtIfLoaded0;
- Java_sun_reflect_ConstantPool_getSize0;
- Java_sun_reflect_ConstantPool_getStringAt0;
- Java_sun_reflect_ConstantPool_getUTF8At0;
- Java_java_io_Console_istty;
- Java_java_io_Console_encoding;
- Java_java_io_Console_echo;
- Java_sun_misc_GC_maxObjectInspectionAge;
- Java_sun_reflect_NativeConstructorAccessorImpl_newInstance0;
- Java_sun_reflect_NativeMethodAccessorImpl_invoke0;
- Java_sun_reflect_Reflection_getCallerClass;
- Java_sun_reflect_Reflection_getClassAccessFlags;
- Java_sun_misc_Version_getJdkVersionInfo;
- Java_sun_misc_Version_getJdkSpecialVersion;
- Java_sun_misc_Version_getJvmVersionInfo;
- Java_sun_misc_Version_getJvmSpecialVersion;
- Java_sun_misc_VM_getThreadStateValues;
- Java_sun_misc_VM_latestUserDefinedLoader;
- Java_sun_misc_VM_initialize;
- Java_sun_misc_VMSupport_initAgentProperties;
-
- # ZipFile.c needs this one
- throwFileNotFoundException;
-
-# Java_sun_misc_VM_getState; threads.c
-# Java_sun_misc_VM_threadsSuspended; threads.c
-# Java_sun_misc_VM_unsuspendSomeThreads; threads.c
-# Java_sun_misc_VM_unsuspendThreads; threads.c
-
- Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_getPattern;
-
- # Outcalls from libjvm done using dlsym().
-
- VerifyClassCodes;
- VerifyClassCodesForMajorVersion;
- NewStringPlatform;
- GetStringPlatformChars;
- Canonicalize;
- JDK_GetVersionInfo0;
-
- local:
- *;
-};
diff --git a/jdk/make/java/java/reflect/Makefile b/jdk/make/java/java/reflect/Makefile
deleted file mode 100644
index 0412a0e..0000000
--- a/jdk/make/java/java/reflect/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for reflection and annotations
-#
-
-BUILDDIR = ../../..
-PACKAGE = java.lang.reflect
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-AUTO_FILES_JAVA_DIRS = java/lang/reflect sun/reflect java/lang/annotation
-
-#
-# Install .lib file.
-#
-INSTALL_DOT_LIB = true
-
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Special rules.
-#
-
-subdirs: classes
-
-clean::
- $(RM) -r $(CLASSHDRDIR)
-
-clobber::
- $(RM) -r $(CLASSBINDIR)/java/lang/reflect \
- $(CLASSBINDIR)/java/lang/annotatation
-
-.PHONY: clean clobber
diff --git a/jdk/make/java/java/reorder-i586 b/jdk/make/java/java/reorder-i586
deleted file mode 100644
index 86fd4a5..0000000
--- a/jdk/make/java/java/reorder-i586
+++ /dev/null
@@ -1,108 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%_init;
-text: .text%init64IO: OUTPUTDIR/tmp/java/java.lang/java/obj/UnixFileSystem_md.o;
-text: .text%JNI_OnLoad;
-text: .text%Canonicalize;
-text: .text%canonicalize;
-text: .text%collapse: OUTPUTDIR/tmp/java/java.lang/java/obj/canonicalize_md.o;
-text: .text%Java_java_lang_Object_registerNatives;
-text: .text%Java_java_lang_System_registerNatives;
-text: .text%Java_java_lang_Thread_registerNatives;
-text: .text%Java_java_security_AccessController_getStackAccessControlContext;
-text: .text%Java_java_security_AccessController_getInheritedAccessControlContext;
-text: .text%Java_java_lang_ClassLoader_registerNatives;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2;
-text: .text%Java_java_lang_Class_registerNatives;
-text: .text%Java_java_lang_Class_getPrimitiveClass;
-text: .text%Java_java_lang_System_initProperties;
-text: .text%GetJavaProperties;
-text: .text%uname: OUTPUTDIR/tmp/java/java.lang/java/obj/java_props_md.o;
-text: .text%mapLookup: OUTPUTDIR/tmp/java/java.lang/java/obj/java_props_md.o;
-text: .text%setPathEnvironment: OUTPUTDIR/tmp/java/java.lang/java/obj/java_props_md.o;
-text: .text%JNU_NewStringPlatform;
-text: .text%JNU_CallStaticMethodByName;
-text: .text%NewStringPlatform;
-text: .text%Java_java_io_FileInputStream_initIDs;
-text: .text%Java_java_io_FileDescriptor_initIDs;
-text: .text%Java_java_io_FileOutputStream_initIDs;
-text: .text%Java_java_lang_System_setIn0;
-text: .text%Java_sun_reflect_Reflection_getCallerClass;
-text: .text%Java_java_lang_Class_forName0;
-text: .text%Java_java_lang_String_intern;
-text: .text%Java_sun_reflect_NativeConstructorAccessorImpl_newInstance0;
-text: .text%Java_java_lang_Throwable_fillInStackTrace;
-text: .text%Java_java_lang_System_setOut0;
-text: .text%Java_java_lang_System_setErr0;
-text: .text%Java_java_lang_Compiler_registerNatives;
-text: .text%Java_java_io_FileSystem_getFileSystem;
-text: .text%JNU_NewObjectByName;
-text: .text%Java_java_io_UnixFileSystem_initIDs;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2;
-text: .text%Java_java_io_UnixFileSystem_list;
-text: .text%JNU_GetStringPlatformChars;
-text: .text%JNU_ReleaseStringPlatformChars;
-text: .text%JNU_ClassString;
-text: .text%JNU_CopyObjectArray;
-text: .text%Java_java_io_UnixFileSystem_canonicalize;
-text: .text%Java_java_io_UnixFileSystem_getBooleanAttributes0;
-text: .text%Java_java_lang_ClassLoader_findLoadedClass;
-text: .text%Java_java_lang_ClassLoader_findBootstrapClass;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2;
-text: .text%Java_java_lang_System_mapLibraryName;
-text: .text%cpchars: OUTPUTDIR/tmp/java/java.lang/java/obj/System.o;
-text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_load;
-text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_find;
-text: .text%Java_java_lang_Float_floatToIntBits;
-text: .text%Java_java_lang_Double_doubleToLongBits;
-text: .text%Java_java_io_FileInputStream_open;
-text: .text%fileOpen;
-text: .text%Java_java_io_UnixFileSystem_getLength;
-text: .text%Java_java_io_FileInputStream_readBytes;
-text: .text%readBytes;
-text: .text%Java_java_io_FileInputStream_close0;
-text: .text%Java_java_lang_Object_getClass;
-text: .text%Java_java_lang_ClassLoader_defineClass0;
-text: .text%VerifyClassCodes;
-# Test Exit
-text: .text%Java_java_lang_Shutdown_halt;
-# Test Hello
-text: .text%Java_java_io_FileOutputStream_writeBytes;
-text: .text%writeBytes;
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
-text: .text%JNU_GetEnv;
-text: .text%Java_java_io_UnixFileSystem_checkAccess;
-text: .text%Java_sun_reflect_NativeMethodAccessorImpl_invoke0;
-text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
-text: .text%Java_java_io_FileInputStream_available;
-text: .text%Java_java_lang_reflect_Array_newArray;
-text: .text%Java_java_lang_Throwable_getStackTraceDepth;
-text: .text%Java_java_lang_Throwable_getStackTraceElement;
-text: .text%Java_java_lang_System_identityHashCode;
-text: .text%Java_sun_misc_Signal_findSignal;
-text: .text%Java_sun_misc_Signal_handle0;
-text: .text%JNU_NotifyAll;
-# Test LoadFrame
-text: .text%JNU_CallMethodByName;
-text: .text%JNU_CallMethodByNameV;
-text: .text%Java_java_util_logging_FileHandler_lockFile;
-text: .text%Java_java_io_FileOutputStream_open;
-text: .text%Java_java_io_UnixFileSystem_createDirectory;
-text: .text%Java_java_io_UnixFileSystem_getLastModifiedTime;
-text: .text%Java_java_util_prefs_FileSystemPreferences_lockFile0;
-text: .text%Java_java_io_UnixFileSystem_setLastModifiedTime;
-text: .text%Java_java_util_prefs_FileSystemPreferences_unlockFile0;
-text: .text%Java_java_io_FileOutputStream_close0;
-text: .text%Java_java_util_logging_FileHandler_unlockFile;
-# Test LoadJFrame
-text: .text%Java_java_lang_Class_isAssignableFrom;
-text: .text%Java_java_lang_Class_isInstance;
-# Test JHello
-# SwingSet
-text: .text%Java_java_util_TimeZone_getSystemTimeZoneID;
-text: .text%findJavaTZ_md;
-text: .text%Java_java_lang_StrictMath_log;
diff --git a/jdk/make/java/java/reorder-sparc b/jdk/make/java/java/reorder-sparc
deleted file mode 100644
index 6293ec7..0000000
--- a/jdk/make/java/java/reorder-sparc
+++ /dev/null
@@ -1,106 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%init64IO: OUTPUTDIR/tmp/java/java.lang/java/obj/UnixFileSystem_md.o;
-text: .text%JNI_OnLoad;
-text: .text%Canonicalize;
-text: .text%canonicalize;
-text: .text%collapse: OUTPUTDIR/tmp/java/java.lang/java/obj/canonicalize_md.o;
-text: .text%Java_java_lang_Object_registerNatives;
-text: .text%Java_java_lang_System_registerNatives;
-text: .text%Java_java_lang_Thread_registerNatives;
-text: .text%Java_java_security_AccessController_getStackAccessControlContext;
-text: .text%Java_java_security_AccessController_getInheritedAccessControlContext;
-text: .text%Java_java_lang_ClassLoader_registerNatives;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2;
-text: .text%Java_java_lang_Class_registerNatives;
-text: .text%Java_java_io_ObjectStreamClass_initNative;
-text: .text%Java_java_lang_Class_getPrimitiveClass;
-text: .text%Java_java_lang_System_initProperties;
-text: .text%GetJavaProperties;
-text: .text%JNU_NewStringPlatform;
-text: .text%initializeEncoding: OUTPUTDIR/tmp/java/java.lang/java/obj/jni_util.o;
-text: .text%JNU_CallStaticMethodByName;
-text: .text%newString646_US: OUTPUTDIR/tmp/java/java.lang/java/obj/jni_util.o;
-text: .text%NewStringPlatform;
-text: .text%Java_java_io_FileInputStream_initIDs;
-text: .text%Java_java_io_FileDescriptor_initIDs;
-text: .text%Java_java_io_FileOutputStream_initIDs;
-text: .text%Java_java_lang_System_setIn0;
-text: .text%Java_sun_reflect_Reflection_getCallerClass;
-text: .text%Java_java_lang_Class_forName0;
-text: .text%Java_java_lang_Object_getClass;
-text: .text%Java_sun_reflect_Reflection_getClassAccessFlags;
-text: .text%Java_sun_reflect_NativeConstructorAccessorImpl_newInstance0;
-text: .text%Java_java_lang_System_setOut0;
-text: .text%Java_java_lang_System_setErr0;
-text: .text%Java_java_lang_System_identityHashCode;
-text: .text%Java_sun_misc_Signal_findSignal;
-text: .text%Java_sun_misc_Signal_handle0;
-text: .text%Java_java_io_FileSystem_getFileSystem;
-text: .text%JNU_NewObjectByName;
-text: .text%Java_java_io_UnixFileSystem_initIDs;
-text: .text%Java_java_io_UnixFileSystem_canonicalize;
-text: .text%JNU_GetStringPlatformChars;
-text: .text%JNU_ReleaseStringPlatformChars;
-text: .text%Java_java_io_FileInputStream_open;
-text: .text%fileOpen;
-text: .text%Java_java_io_FileInputStream_readBytes;
-text: .text%readBytes;
-text: .text%Java_java_io_FileInputStream_available;
-text: .text%Java_java_io_FileInputStream_close0;
-text: .text%Java_java_lang_System_mapLibraryName;
-text: .text%Java_java_io_UnixFileSystem_getBooleanAttributes0;
-text: .text%statMode: OUTPUTDIR/tmp/java/java.lang/java/obj/UnixFileSystem_md.o;
-text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_load;
-text: .text%Java_java_lang_Compiler_registerNatives;
-text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_find;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2;
-text: .text%Java_java_io_UnixFileSystem_list;
-text: .text%JNU_ClassString;
-text: .text%JNU_CopyObjectArray;
-text: .text%Java_java_lang_String_intern;
-text: .text%Java_java_lang_ClassLoader_findLoadedClass;
-text: .text%Java_java_lang_ClassLoader_findBootstrapClass;
-text: .text%Java_java_lang_Throwable_fillInStackTrace;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2;
-text: .text%Java_java_io_UnixFileSystem_getLastModifiedTime;
-text: .text%Java_java_lang_Float_floatToIntBits;
-text: .text%Java_java_lang_Double_doubleToLongBits;
-text: .text%Java_java_io_UnixFileSystem_getLength;
-text: .text%Java_java_lang_ClassLoader_defineClass0;
-text: .text%VerifyClassCodes;
-# Test Exit
-text: .text%Java_java_lang_Shutdown_halt;
-# Test Hello
-text: .text%Java_java_io_FileOutputStream_writeBytes;
-text: .text%writeBytes;
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
-text: .text%JNU_GetEnv;
-text: .text%Java_java_io_UnixFileSystem_checkAccess;
-text: .text%Java_java_lang_reflect_Array_newArray;
-text: .text%Java_java_lang_Throwable_getStackTraceDepth;
-text: .text%Java_java_lang_Throwable_getStackTraceElement;
-text: .text%throwFileNotFoundException;
-text: .text%JNU_NotifyAll;
-# Test LoadFrame
-text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
-text: .text%JNU_CallMethodByName;
-text: .text%JNU_CallMethodByNameV;
-text: .text%Java_java_io_UnixFileSystem_createDirectory;
-text: .text%Java_java_util_prefs_FileSystemPreferences_lockFile0;
-text: .text%Java_java_io_UnixFileSystem_setLastModifiedTime;
-text: .text%Java_java_util_prefs_FileSystemPreferences_unlockFile0;
-# Test LoadJFrame
-text: .text%Java_sun_reflect_NativeMethodAccessorImpl_invoke0;
-text: .text%Java_java_lang_Class_isInstance;
-# Test JHello
-# SwingSet
-text: .text%Java_java_lang_Class_isAssignableFrom;
-text: .text%Java_java_util_TimeZone_getSystemTimeZoneID;
-text: .text%findJavaTZ_md;
-text: .text%Java_java_lang_StrictMath_log;
-text: .text%Java_java_lang_StrictMath_sqrt;
diff --git a/jdk/make/java/java/reorder-sparcv9 b/jdk/make/java/java/reorder-sparcv9
deleted file mode 100644
index 29a530d..0000000
--- a/jdk/make/java/java/reorder-sparcv9
+++ /dev/null
@@ -1,102 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%init64IO: OUTPUTDIR/tmp/java/java.lang/java/obj64/UnixFileSystem_md.o;
-text: .text%JNI_OnLoad;
-text: .text%Canonicalize;
-text: .text%canonicalize;
-text: .text%collapse: OUTPUTDIR/tmp/java/java.lang/java/obj64/canonicalize_md.o;
-text: .text%Java_java_lang_Object_registerNatives;
-text: .text%Java_java_lang_System_registerNatives;
-text: .text%Java_java_lang_Thread_registerNatives;
-text: .text%Java_java_security_AccessController_getStackAccessControlContext;
-text: .text%Java_java_security_AccessController_getInheritedAccessControlContext;
-text: .text%Java_java_lang_ClassLoader_registerNatives;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2;
-text: .text%Java_java_lang_Class_registerNatives;
-text: .text%Java_java_lang_Class_getPrimitiveClass;
-text: .text%Java_java_lang_System_initProperties;
-text: .text%GetJavaProperties;
-text: .text%JNU_NewStringPlatform;
-text: .text%initializeEncoding: OUTPUTDIR/tmp/java/java.lang/java/obj64/jni_util.o;
-text: .text%JNU_CallStaticMethodByName;
-text: .text%newString8859_1: OUTPUTDIR/tmp/java/java.lang/java/obj64/jni_util.o;
-text: .text%NewStringPlatform;
-text: .text%Java_java_io_FileInputStream_initIDs;
-text: .text%Java_java_io_FileDescriptor_initIDs;
-text: .text%Java_java_io_FileOutputStream_initIDs;
-text: .text%Java_java_lang_System_setIn0;
-text: .text%Java_sun_reflect_Reflection_getCallerClass;
-text: .text%Java_java_lang_Class_forName0;
-text: .text%Java_java_lang_String_intern;
-text: .text%Java_java_lang_Float_floatToIntBits;
-text: .text%Java_java_lang_Double_doubleToLongBits;
-text: .text%Java_java_lang_ClassLoader_findLoadedClass;
-text: .text%Java_java_lang_ClassLoader_findBootstrapClass;
-text: .text%VerifyClassCodes;
-text: .text%Java_java_lang_Throwable_fillInStackTrace;
-text: .text%Java_java_lang_System_setOut0;
-text: .text%Java_java_lang_System_setErr0;
-text: .text%Java_java_lang_System_identityHashCode;
-text: .text%Java_sun_misc_Signal_findSignal;
-text: .text%Java_sun_misc_Signal_handle0;
-text: .text%Java_java_io_FileSystem_getFileSystem;
-text: .text%JNU_NewObjectByName;
-text: .text%Java_java_io_UnixFileSystem_initIDs;
-text: .text%Java_java_io_UnixFileSystem_canonicalize;
-text: .text%JNU_GetStringPlatformChars;
-text: .text%JNU_ReleaseStringPlatformChars;
-text: .text%Java_java_io_FileInputStream_open;
-text: .text%fileOpen;
-text: .text%Java_java_io_FileInputStream_readBytes;
-text: .text%readBytes;
-text: .text%Java_java_io_FileInputStream_available;
-text: .text%Java_java_io_FileInputStream_close0;
-text: .text%Java_java_lang_Compiler_registerNatives;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2;
-text: .text%Java_java_io_UnixFileSystem_list;
-text: .text%JNU_ClassString;
-text: .text%JNU_CopyObjectArray;
-text: .text%Java_java_io_UnixFileSystem_getBooleanAttributes0;
-text: .text%statMode: OUTPUTDIR/tmp/java/java.lang/java/obj64/UnixFileSystem_md.o;
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2;
-text: .text%Java_java_lang_System_mapLibraryName;
-text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_load;
-text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_find;
-text: .text%Java_java_io_UnixFileSystem_getLength;
-text: .text%Java_java_lang_Object_getClass;
-text: .text%Java_java_lang_ClassLoader_defineClass0;
-# Test Exit
-text: .text%Java_java_lang_Shutdown_halt;
-# Test Hello
-text: .text%Java_java_io_FileOutputStream_writeBytes;
-text: .text%writeBytes;
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
-text: .text%JNU_GetEnv;
-text: .text%Java_java_io_UnixFileSystem_checkAccess;
-text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
-text: .text%Java_java_lang_reflect_Array_newArray;
-text: .text%Java_java_lang_Throwable_getStackTraceDepth;
-text: .text%Java_java_lang_Throwable_getStackTraceElement;
-text: .text%throwFileNotFoundException: OUTPUTDIR/tmp/java/java.lang/java/obj64/io_util.o;
-text: .text%JNU_NotifyAll;
-# Test LoadFrame
-text: .text%JNU_CallMethodByName;
-text: .text%JNU_CallMethodByNameV;
-text: .text%Java_java_io_UnixFileSystem_createDirectory;
-text: .text%Java_java_io_UnixFileSystem_getLastModifiedTime;
-text: .text%Java_java_util_prefs_FileSystemPreferences_lockFile0;
-text: .text%Java_java_io_UnixFileSystem_setLastModifiedTime;
-text: .text%Java_java_util_prefs_FileSystemPreferences_unlockFile0;
-# Test LoadJFrame
-text: .text%Java_java_lang_Class_isAssignableFrom;
-text: .text%Java_java_lang_Class_isInstance;
-# Test JHello
-# SwingSet
-text: .text%Java_java_util_TimeZone_getSystemTimeZoneID;
-text: .text%findJavaTZ_md;
-text: .text%Java_java_lang_StrictMath_log;
-text: .text%Java_java_lang_StrictMath_sqrt;
diff --git a/jdk/make/java/java_crw_demo/Makefile b/jdk/make/java/java_crw_demo/Makefile
deleted file mode 100644
index 96da00b..0000000
--- a/jdk/make/java/java_crw_demo/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../..
-
-LIBRARY = java_crw_demo
-PRODUCT = sun
-LIBRARY_OUTPUT = java_crw_demo
-
-# Configure the CFLAGS for this library.
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SRCDIR=$(SHARE_SRC)/demo/jvmti/java_crw_demo
-
-# Use the mapfile-vers (See the mapfile located with this Makefile)
-FILES_m = mapfile-vers
-ifdef FILES_m
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-endif
-
-#
-# Files to compile.
-#
-FILES_c = java_crw_demo.c
-
-OTHER_INCLUDES = -I$(SRCDIR)
-
-#
-# Library to compile.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-# We don't want to link against -ljava
-JAVALIB=
-
-#
-# Add to ambient vpath so we pick up the library files
-#
-vpath %.c $(SRCDIR)
-
diff --git a/jdk/make/java/java_crw_demo/mapfile-vers b/jdk/make/java/java_crw_demo/mapfile-vers
deleted file mode 100644
index a21993e..0000000
--- a/jdk/make/java/java_crw_demo/mapfile-vers
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- java_crw_demo;
- java_crw_demo_classname;
- local:
- *;
-};
diff --git a/jdk/make/java/java_hprof_demo/Makefile b/jdk/make/java/java_hprof_demo/Makefile
deleted file mode 100644
index 7aab2e4..0000000
--- a/jdk/make/java/java_hprof_demo/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../..
-LIBRARY = hprof
-PRODUCT = sun
-LIBRARY_OUTPUT = hprof_jvmti
-
-# Use highest optimization
-OPTIMIZATION_LEVEL = HIGHEST
-
-# Configure the CFLAGS for this library.
-FILES_m = mapfile-vers
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SRCDIR=$(SHARE_SRC)/demo/jvmti/hprof
-PSRCDIR=$(PLATFORM_SRC)/demo/jvmti/hprof
-
-# Use the mapfile-vers (See the mapfile located with this Makefile)
-ifdef FILES_m
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-endif
-
-#
-# Files to compile.
-#
-FILES_c = \
- debug_malloc.c \
- hprof_blocks.c \
- hprof_check.c \
- hprof_class.c \
- hprof_cpu.c \
- hprof_error.c \
- hprof_event.c \
- hprof_frame.c \
- hprof_init.c \
- hprof_io.c \
- hprof_ioname.c \
- hprof_listener.c \
- hprof_loader.c \
- hprof_md.c \
- hprof_monitor.c \
- hprof_object.c \
- hprof_reference.c \
- hprof_site.c \
- hprof_stack.c \
- hprof_string.c \
- hprof_table.c \
- hprof_tag.c \
- hprof_tls.c \
- hprof_trace.c \
- hprof_tracker.c \
- hprof_util.c
-
-OTHER_INCLUDES = -I$(SRCDIR) \
- -I$(SHARE_SRC)/npt \
- -I$(PLATFORM_SRC)/npt \
- -I$(SHARE_SRC)/demo/jvmti/java_crw_demo
-
-ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS += wsock32.lib winmm.lib
-else
- OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBDL)
-endif
-
-#
-# Tell library.gmk to copy the txt file first
-#
-INIT += $(LIBDIR)/jvm.hprof.txt
-
-#
-# This puts logging code in
-#
-CPPFLAGS_DBG += -DHPROF_LOGGING
-
-#
-# Library to compile.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-# We don't want to link against -ljava
-JAVALIB=
-
-#
-# Add to ambient vpath so we pick up the library files
-#
-vpath %.c $(SRCDIR):$(PSRCDIR)
-
-#
-# Install the hprof prelude
-#
-$(LIBDIR)/jvm.hprof.txt: $(SRCDIR)/jvm.hprof.txt
- $(install-file)
-
-clean clobber::
- $(RM) $(LIBDIR)/jvm.hprof.txt
-
diff --git a/jdk/make/java/java_hprof_demo/mapfile-vers b/jdk/make/java/java_hprof_demo/mapfile-vers
deleted file mode 100644
index c9c948b..0000000
--- a/jdk/make/java/java_hprof_demo/mapfile-vers
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Agent_OnLoad;
- Agent_OnUnload;
- local:
- *;
-};
diff --git a/jdk/make/java/jexec/Makefile b/jdk/make/java/jexec/Makefile
deleted file mode 100644
index aa37904..0000000
--- a/jdk/make/java/jexec/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building jexec, a wrapper for direct execution of JAR files
-# on UNIX systems.
-#
-
-BUILDDIR = ../..
-
-PACKAGE = java.jexec
-PRODUCT = sun
-PROGRAM = jexec
-
-include $(BUILDDIR)/common/Defs.gmk
-
-ifeq ($(COMPILE_APPROACH),batch)
- override COMPILE_APPROACH = normal
-endif
-
-include $(BUILDDIR)/common/Rules.gmk
-
-JEXE_SRC = $(PLATFORM_SRC)/bin
-
-FILES_c = jexec.c
-FILES_o = $(patsubst %.c,$(OBJDIR)/%.o,$(FILES_c))
-
-vpath %.c $(JEXE_SRC)
-
-ifeq ($(PLATFORM), linux)
- #
- # On Linux jexec goes in lib, not lib/<arch>
- #
- LIB_LOCATION = $(LIBDIR)
-
- #
- # Also include the manifest_info.h header file.
- #
- OTHER_INCLUDES += -I$(SHARE_SRC)/bin
-endif # PLATFORM
-
-build: $(LIB_LOCATION)/$(PROGRAM)
-
-$(LIB_LOCATION)/$(PROGRAM):: $(FILES_o)
- $(prep-target)
- $(LINK_PRE_CMD) $(CC) $(LDFLAGS) $(FILES_o) $(CC_OBJECT_OUTPUT_FLAG)$@
-
-clean clobber::
- $(RM) $(FILES_o) $(LIB_LOCATION)/$(PROGRAM)
-
diff --git a/jdk/make/java/jli/Makefile b/jdk/make/java/jli/Makefile
deleted file mode 100644
index 17d7bd2..0000000
--- a/jdk/make/java/jli/Makefile
+++ /dev/null
@@ -1,237 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Java Launcher Infrastructure Library (libjli)
-#
-# This library provides shared support for the Java launcher in all of
-# its manifestations (java, javaw, javac, ...).
-#
-BUILDDIR = ../..
-LIBRARY = jli
-PRODUCT = java
-
-#
-# Must be included before Defs.gmk to be functional.
-#
-# Note that for Windows, both a dynamic and static version are built.
-# Doing the compiles with the static library specified can be overridden
-# by the link step, but not the reverse.
-#
-MS_RUNTIME_STATIC = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-ifneq ($(SYSTEM_ZLIB),true)
- ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
-else # SYSTEM_ZLIB
- OTHER_CFLAGS += $(ZLIB_CFLAGS)
-endif #SYSTEM_ZLIB
-LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
-
-# set the platform specific directory for macosx, also this platform shares
-# substantial family ties with its siblings (solaris and linux), thus we add
-# solaris src path to its compilation dependencies.
-ifeq ($(PLATFORM), macosx)
- LAUNCHER_PLATFORM_SRC = $(BUILDDIR)/../src/macosx/bin
- LAUNCHER_SOLARIS_PLATFORM_SRC = $(BUILDDIR)/../src/solaris/bin
-else # !MACOSX
- LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
-endif #PLATFORM
-
-ifeq ($(ZERO_BUILD), true)
- ERGO_FAMILY=zero
-else # !ZERO_BUILD
- ifneq (,$(findstring $(ARCH_FAMILY), amd64 x86_64))
- ERGO_FAMILY=i586
- else # !X86 FAMILY
- ERGO_FAMILY=$(ARCH_FAMILY)
- endif #ARCH_FAMILY
-endif # ZERO_BUILD
-
-#
-# Files to compile.
-#
-FILES_c = java.c \
- splashscreen_stubs.c \
- parse_manifest.c \
- version_comp.c \
- wildcard.c \
- jli_util.c
-
-ifneq ($(SYSTEM_ZLIB),true)
- FILES_c += inflate.c \
- inftrees.c \
- inffast.c \
- zadler32.c \
- zcrc32.c \
- zutil.c
-endif # SYSTEM_ZLIB
-
-# add platform specific files
-ifeq ($(PLATFORM), windows)
- FILES_c += java_md.c \
- cmdtoargs.c
-else # NIXES
- FILES_c += java_md_common.c
- ifeq ($(PLATFORM), macosx)
- FILES_c += java_md_macosx.c
- else # SOLARIS/LINUX
- FILES_c += java_md_solinux.c
- FILES_c += ergo.c
- ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
- # if the architecture specific ergo file exists then
- # use it, else use the generic definitions from ergo.c
- ifneq ($(wildcard $(LAUNCHER_PLATFORM_SRC)/$(ERGO_ARCH_FILE)),)
- FILES_c += $(ERGO_ARCH_FILE)
- else # !ERGO_ARCH_FILE
- OTHER_CPPFLAGS += -DUSE_GENERIC_ERGO
- endif # ERGO_ARCH_FILE
- endif #MACOSX
-endif #WINDOWS
-
-# Names of arch directories
-LIBARCH_DEFINES = -DLIBARCHNAME='"$(LIBARCH)"'
-ifeq ($(PLATFORM), solaris)
- LIBARCH_DEFINES += -DLIBARCH32NAME='"$(LIBARCH32)"'
- LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
-endif # PLATFORM
-
-ifeq ($(PLATFORM), macosx)
- OTHER_CPPFLAGS += $(LIBARCH_DEFINES) -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
-else # ! MACOSX
- OTHER_CPPFLAGS += $(LIBARCH_DEFINES)
-endif #PLATFORM
-
-ifneq ($(PLATFORM), windows) # UNIX systems
- ifeq ($(PLATFORM), macosx)
- LIB_LOCATION = $(LIBDIR)/jli
- else # SOLARIS/LINUX
- LD_RUNPATH_EXTRAS += ..
- LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli
- # Note: it is important to keep this order, meaning -lc as the
- # last library, otherwise it could cause compatibility issues
- # by pulling in SUNW_private symbols from libc
- LDLIBS = -ldl -lc
- ifeq ($(USE_PTHREADS),true)
- LDLIBS += -lpthread
- endif # USE_PTHREADS
- endif # PLATFORM
-endif # PLATFORM
-
-ifeq ($(PLATFORM), windows)
- EXTRA_LIBS = advapi32.lib \
- comctl32.lib \
- user32.lib
- JAVALIB =
- OTHER_LCF = -export:JLI_Launch \
- -export:JLI_ManifestIterate \
- -export:JLI_SetTraceLauncher \
- -export:JLI_ReportErrorMessage \
- -export:JLI_ReportErrorMessageSys \
- -export:JLI_ReportMessage \
- -export:JLI_ReportExceptionDescription \
- -export:JLI_MemAlloc \
- -export:JLI_CmdToArgs \
- -export:JLI_GetStdArgc \
- -export:JLI_GetStdArgs
-endif # PLATFORM
-
-OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
-OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
-ifneq ($(SYSTEM_ZLIB),true)
- OTHER_INCLUDES += -I$(ZIP_SRC)
-else # !SYSTEM_ZLIB
- LDLIBS += $(ZLIB_LIBS)
-endif # SYSTEM_ZLIB
-
-#
-# Library to compile.
-#
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# On Windows, some executable objects need to be statically linked against
-# the jli library. Hence, we need both a standard library (archive) and
-# an import library (associated with a dll). These both usually have the
-# extension .LIB, so they need to be placed in different directories. The
-# import library is build (as usual) in the $(OBJDIR) directory while the
-# standard library is built in a "static" subdirectory. The standard library
-# is not delivered as part of the product, but is only needed as part of
-# the build process. The import library is built by the standard rules
-# in Library.gmk. The additional rules which follow build the standard
-# library.
-#
-ifeq ($(PLATFORM), windows)
- STATIC_LIBRARY = $(OBJDIR)/static/$(LIBPREFIX)$(LIBRARY).lib
-
- $(STATIC_LIBRARY): $(FILES_o)
- @$(prep-target)
- $(LIBEXE) -nologo -out:$@ $(sort $(FILES_o))
-
- library:: $(STATIC_LIBRARY)
-endif # PLATFORM
-
-ifeq ($(PLATFORM), macosx)
- # Some Obj-C code is embedded in java_md_macosx.c, we stipulate so, using
- # "-x" option. Not doing so will cause the compiler to choose the language
- # based on the filename suffix, also "-Os" optimizes the file for size.
- CFLAGS_$(VARIANT)/java_md_macosx.o = -Os -x objective-c
- # Needed for linking the various launchers
- LDFLAGS += -framework Cocoa -framework Security \
- -framework ApplicationServices
- # Add solaris sources containing common logic to the header path
- OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC)
-endif # PLATFORM
-
-STATIC_LIBRARY_DIR = $(OBJDIR)/static
-STATIC_LIBRARY_NAME = lib$(LIBRARY).a
-STATIC_LIBRARY = $(STATIC_LIBRARY_DIR)/$(STATIC_LIBRARY_NAME)
-
-$(STATIC_LIBRARY_DIR): | $(OBJDIR)
- @$(MKDIR) $(STATIC_LIBRARY_DIR)
-
-$(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR)
- @$(prep-target)
- $(AR) $(ARFLAGS) $@ $(sort $(FILES_o))
-
-library:: $(STATIC_LIBRARY)
-
-vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
-ifneq ($(SYSTEM_ZLIB),true)
- vpath %.c $(ZIP_SRC)
-else # !SYSTEM_ZLIB
- #
- # Add to ambient vpath so we pick up the library files, for macos we add
- # solaris sources which contains the common logic for all nixes
- #
- ifeq ($(PLATFORM), macosx)
- vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC) \
- $(LAUNCHER_SOLARIS_PLATFORM_SRC)
- else # !MACOSX
- vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC)
- endif # MACOSX
-endif # SYSTEM_LIB
diff --git a/jdk/make/java/jli/mapfile-vers b/jdk/make/java/jli/mapfile-vers
deleted file mode 100644
index e6aced2..0000000
--- a/jdk/make/java/jli/mapfile-vers
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- JLI_Launch;
- JLI_ManifestIterate;
- JLI_SetTraceLauncher;
- JLI_ReportErrorMessage;
- JLI_ReportErrorMessageSys;
- JLI_ReportMessage;
- JLI_ReportExceptionDescription;
- JLI_GetStdArgs;
- JLI_GetStdArgc;
- local:
- *;
-};
diff --git a/jdk/make/java/jobjc/Makefile b/jdk/make/java/jobjc/Makefile
deleted file mode 100644
index 808e5b9..0000000
--- a/jdk/make/java/jobjc/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building jobjc
-
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-SRCDIR = $(JDK_TOPDIR)/src/macosx/native/jobjc
-
-ifeq ($(PLATFORM),macosx)
-
-# FRAMEWORKS for which we want to build bridge support
-FRAMEWORKS = Foundation CoreFoundation AppKit
-
-# metadata stuff
-GEN_DIR = $(OUTPUTDIR)/bridge_metadata
-STABLE_GEN_DIR = $(OUTPUTDIR)/stable_bridge_metadata
-STABLE_METADATA_FILES = $(addsuffix Full.bridgesupport,$(addprefix $(STABLE_GEN_DIR)/,$(FRAMEWORKS)))
-
-# source files
-CORE_SRC = $(shell $(FIND) $(SRCDIR) -type f -name "*.hs" -or -name "*.java" -or -name "*.m" -or -name "*.h" -print)
-GENERATOR_SRC = $(shell $(FIND) $(SRCDIR) -type f -name "*.java" -print)
-ADDITIONS_SRC = $(shell $(FIND) $(SRCDIR) -type f -name "*.java" -or -name "*.m" -or -name "*.h" -print)
-BUILD_SRC = $(SRCDIR)/JObjC.xcodeproj/project.pbxproj $(SRCDIR)/bridgesupport.gmk $(SRCDIR)/build.xml $(SRCDIR)/extract_classes.pl $(SRCDIR)/run-and-write-if-okay $(SRCDIR)/rungen $(SRCDIR)/runjava
-
-# jobjc products for jdk
-BUILT_DYLIB = $(OUTPUTDIR)/JObjC.dst/Debug/libJObjC.dylib
-BUILT_JAR = $(OUTPUTDIR)/JObjC.build/JObjC.jar
-
-$(GEN_DIR):
- mkdir -p $(GEN_DIR)
-
-stabilize: $(GEN_DIR)
- @echo Updating bridge support in $(GEN_DIR)
- ($(CD) $(GEN_DIR); $(MAKE) STABLE_GEN_DIR="$(STABLE_GEN_DIR)" FRAMEWORKS="$(FRAMEWORKS)" -f $(SRCDIR)/bridgesupport.gmk all)
-
-$(STABLE_METADATA_FILES): stabilize
-
-ABS_OUTPUTDIR=$(realpath $(OUTPUTDIR))
-ABS_STABLE_GEN_DIR=$(realpath $(STABLE_GEN_DIR))
-
-# How to run ant
-ifdef LANGTOOLS_DIST
- ANT_CMD = $(ANT)
-else
- ANT_CMD = $(ANT_WITH_IMPORT)
-endif
-
-$(BUILT_DYLIB) $(BUILT_JAR): $(STABLE_METADATA_FILES) $(CORE_SRC) $(GENERATOR_SRC) $(ADDITIONS_SRC) $(BUILD_SRC)
- @echo JObjC dylib or jar out of data wrt FRAMEWORKS '(' $(FRAMEWORKS) ')' or JObjC source '(' core, generator, additions, build ')'
- @echo Running ant with java_home set to ${ALT_BOOTDIR}
- (cd $(SRCDIR); OBJROOT="$(ABS_OUTPUTDIR)/JObjC.build" DSTROOT="$(ABS_OUTPUTDIR)/JObjC.dst" JAVA_HOME=${ALT_BOOTDIR} STABLE_GEN_DIR="$(ABS_STABLE_GEN_DIR)" $(ANT_CMD) -verbose all)
-
-all: $(BUILD_DYLIB) $(BUILT_JAR)
- $(CP) $(BUILT_DYLIB) $(LIB_LOCATION)/libJObjC.dylib
-
-clean clobber::
- (cd $(SRCDIR); export OBJROOT=$(OUTPUTDIR)/JObjC.build; export DSTROOT=$(OUTPUTDIR)/JObjC.dst; $(ANT_CMD) clean)
-
-endif
diff --git a/jdk/make/java/jvm/Makefile b/jdk/make/java/jvm/Makefile
deleted file mode 100644
index b35c3d9..0000000
--- a/jdk/make/java/jvm/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Make the directories of include files shipped with the JDK.
-#
-
-FILES_h = $(INCLUDEDIR)/jni.h \
- $(PLATFORM_INCLUDE)/jni_md.h \
- $(INCLUDEDIR)/jvmti.h \
- $(INCLUDEDIR)/jvmticmlr.h \
- $(INCLUDEDIR)/classfile_constants.h
-
-$(INCLUDEDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
- $(install-file)
-
-$(PLATFORM_INCLUDE)/%.h: $(PLATFORM_SRC)/javavm/export/%.h
- $(install-file)
-
-JVMCFG = $(JVMCFG_DIR)/jvm.cfg
-
-#
-# How to install jvm.cfg.
-#
-ifeq ($(ZERO_BUILD), true)
-JVMCFG_ARCH = zero
-else
-JVMCFG_ARCH = $(ARCH)
-endif
-
-ifeq ($(PLATFORM),macosx)
- JVMCFG_SRC=$(PLATFORM_SRC_MACOS)/bin/$(JVMCFG_ARCH)/jvm.cfg
- JVMCFG_DIR = $(LIBDIR)
-else
- JVMCFG_SRC=$(PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg
- JVMCFG_DIR = $(LIBDIR)/$(LIBARCH)
-endif
-
-ifdef BUILD_CLIENT_ONLY
-$(JVMCFG)::
- $(MKDIR) -p $(JVMCFG_DIR)
- @# Update jvm.cfg to use -client by default and alias -server to -client
- $(RM) -f $(JVMCFG)
- $(ECHO) "-client KNOWN">$(JVMCFG)
- $(ECHO) "-server ALIASED_TO -client">>$(JVMCFG)
- $(ECHO) "-hotspot ALIASED_TO -client">>$(JVMCFG)
- $(ECHO) "-classic WARN">>$(JVMCFG)
- $(ECHO) "-native ERROR">>$(JVMCFG)
- $(ECHO) "-green ERROR">>$(JVMCFG)
-else
-$(JVMCFG): $(JVMCFG_SRC)
- $(install-file)
-endif
-
-all: build
-
-build: $(FILES_h) $(JVMCFG)
-
-clean clobber::
- $(RM) $(FILES_h) $(JVMCFG)
-
diff --git a/jdk/make/java/logging/Makefile b/jdk/make/java/logging/Makefile
deleted file mode 100644
index 11ce8df..0000000
--- a/jdk/make/java/logging/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = java.util.logging
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-AUTO_FILES_JAVA_DIRS = java/util/logging sun/util/logging
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_COMPILED_PROPERTIES = \
- sun/util/logging/resources/logging.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-properties: $(LIBDIR)/logging.properties
-$(LIBDIR)/logging.properties: $(SHARE_SRC)/lib/logging.properties
- $(install-file)
-
-build: properties
-
diff --git a/jdk/make/java/main/Makefile b/jdk/make/java/main/Makefile
deleted file mode 100644
index 9eb14ab..0000000
--- a/jdk/make/java/main/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building java command line tools
-#
-
-BUILDDIR = ../..
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-ifeq ($(PLATFORM), windows)
-SUBDIRS = java javaw
-else
-SUBDIRS = java
-endif
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/java/main/java/Makefile b/jdk/make/java/main/java/Makefile
deleted file mode 100644
index 1c3478b..0000000
--- a/jdk/make/java/main/java/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-PROGRAM = java
-PRODUCT = java
-
-#
-# Statically link java to avoid the dependency on msvcrNN.dll. This
-# must be set before Defs.gmk is included.
-#
-MS_RUNTIME_STATIC = true
-#
-# Statically link java to avoid the dependency on jli.dll. This
-# must be set before Program.gmk is included.
-#
-STATIC_JLI = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# Override the default version info with our own resource file (see 5106536)
-ifeq ($(PLATFORM), windows)
-LDLIBS_COMMON += user32.lib comctl32.lib
-
-ifdef OPENJDK
- RC_FLAGS += -i "$(PLATFORM_SRC)/resource/icons"
-else
- RC_FLAGS += -i "$(CLOSED_SRC)/windows/native/sun/windows"
-endif
- VERSIONINFO_RESOURCE = $(PLATFORM_SRC)/resource/java.rc
-endif
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Program.gmk
-OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
-OTHER_CPPFLAGS += -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"'
-
-ifeq ($(PLATFORM), solaris)
-LDFLAGS += -R$(OPENWIN_LIB)
-endif
diff --git a/jdk/make/java/main/java/mapfile-amd64 b/jdk/make/java/main/java/mapfile-amd64
deleted file mode 100644
index 760fcc1..0000000
--- a/jdk/make/java/main/java/mapfile-amd64
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-# Specify what global symbols we export. Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
-#
-
-SUNWprivate_1.1 {
- global:
- main; # Provides basic adb symbol offsets
- environ; # Public symbols and required by Java run time
- _environ;
- __environ_lock;
-
- local:
- *;
-};
diff --git a/jdk/make/java/main/java/mapfile-i586 b/jdk/make/java/main/java/mapfile-i586
deleted file mode 100644
index 48061dd..0000000
--- a/jdk/make/java/main/java/mapfile-i586
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-# Specify what global symbols we export. Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
-#
-
-SUNWprivate_1.1 {
- global:
- main; # Provides basic adb symbol offsets
- environ; # Public symbols and required by Java run time
- _environ;
- __environ_lock;
- ___Argv; # The following are private, but as they are
- _start; # exported from ctr1/crtn, the clever hacker
- _init; # might know about them. However note, that
- _fini; # their use is strictly not supported.
- _lib_version;
-# _mcount;
- __fsr;
- __fsr_init_value;
- __longdouble_used;
-
- local:
- *;
-};
diff --git a/jdk/make/java/main/java/mapfile-sparc b/jdk/make/java/main/java/mapfile-sparc
deleted file mode 100644
index ef7eaf9..0000000
--- a/jdk/make/java/main/java/mapfile-sparc
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-# Specify what global symbols we export. Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
-#
-
-SUNWprivate_1.1 {
- global:
- main; # Provides basic adb symbol offsets
- environ; # Public symbols and required by Java run time
- _environ;
- __environ_lock;
- ___Argv; # The following are private, but as they are
- _start; # exported from ctr1/crtn, the clever hacker
- _init; # might know about them. However note, that
- _fini; # their use is strictly not supported.
- _lib_version;
- __cg92_used;
- __xargc;
- __xargv;
- __fsr_init_value;
-
- local:
- *;
-};
diff --git a/jdk/make/java/main/java/mapfile-sparcv9 b/jdk/make/java/main/java/mapfile-sparcv9
deleted file mode 100644
index 5ecdf6f..0000000
--- a/jdk/make/java/main/java/mapfile-sparcv9
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Specify what global symbols we export. Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
-#
-
-SUNWprivate_1.1 {
- global:
- main; # Provides basic adb symbol offsets
- environ; # Public symbols and required by Java run time
- _environ;
- __environ_lock;
- ___Argv; # The following are private, but as they are
- _start; # exported from ctr1/crtn, the clever hacker
- _init; # might know about them. However note, that
- _fini; # their use is strictly not supported.
- _lib_version;
- __xargc;
- __xargv;
- __fsr_init_value;
-
- local:
- *;
-};
diff --git a/jdk/make/java/main/javaw/Makefile b/jdk/make/java/main/javaw/Makefile
deleted file mode 100644
index 93a536e..0000000
--- a/jdk/make/java/main/javaw/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building javaw.exe (for windows)
-#
-
-BUILDDIR = ../../..
-PROGRAM = javaw
-PRODUCT = java
-
-#
-# Statically link javaw to avoid the dependency on msvcrNN.dll. This
-# must be set before Defs.gmk is included.
-#
-MS_RUNTIME_STATIC = true
-#
-# Statically link javaw to avoid the dependency on jli.dll. This
-# must be set before Program.gmk is included.
-#
-STATIC_JLI = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-OTHER_CPPFLAGS += -DJAVAW
-LDLIBS_COMMON += user32.lib comctl32.lib
-
-# Override the default version info with our own resource file (see 5106536)
-ifeq ($(PLATFORM), windows)
-ifdef OPENJDK
- RC_FLAGS += -i "$(PLATFORM_SRC)/resource/icons"
-else
- RC_FLAGS += -i "$(CLOSED_SRC)/windows/native/sun/windows"
-endif
- VERSIONINFO_RESOURCE = $(PLATFORM_SRC)/resource/java.rc
-endif
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Program.gmk
-OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
-OTHER_CPPFLAGS += -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"'
-
diff --git a/jdk/make/java/management/Exportedfiles.gmk b/jdk/make/java/management/Exportedfiles.gmk
deleted file mode 100644
index 21f46bd..0000000
--- a/jdk/make/java/management/Exportedfiles.gmk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# These are the names of Java classes for which we will make .h files.
-#
-
-FILES_export = \
- sun/management/ClassLoadingImpl.java \
- sun/management/DiagnosticCommandImpl.java \
- sun/management/FileSystemImpl.java \
- sun/management/Flag.java \
- sun/management/GarbageCollectorImpl.java \
- sun/management/GcInfoBuilder.java \
- sun/management/HotSpotDiagnostic.java \
- sun/management/HotspotThread.java \
- sun/management/MemoryImpl.java \
- sun/management/MemoryManagerImpl.java \
- sun/management/MemoryPoolImpl.java \
- sun/management/ThreadImpl.java \
- sun/management/VMManagementImpl.java
diff --git a/jdk/make/java/management/FILES_c.gmk b/jdk/make/java/management/FILES_c.gmk
deleted file mode 100644
index f0d0c9c..0000000
--- a/jdk/make/java/management/FILES_c.gmk
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- ClassLoadingImpl.c \
- DiagnosticCommandImpl.c \
- FileSystemImpl.c \
- Flag.c \
- GarbageCollectorImpl.c \
- GcInfoBuilder.c \
- HotSpotDiagnostic.c \
- HotspotThread.c \
- MemoryImpl.c \
- MemoryManagerImpl.c \
- MemoryPoolImpl.c \
- ThreadImpl.c \
- VMManagementImpl.c \
- management.c
-
diff --git a/jdk/make/java/management/Makefile b/jdk/make/java/management/Makefile
deleted file mode 100644
index 61b1dc5..0000000
--- a/jdk/make/java/management/Makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../..
-PACKAGE = java.lang.management
-LIBRARY = management
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-MGMT_SRC = $(SHARE_SRC)/classes/java/lang/management
-SMGMT_SRC = $(SHARE_SRC)/classes/sun/management
-
-AGENTJAR = $(LIBDIR)/management-agent.jar
-MANIFEST = $(SMGMT_SRC)/manifest
-
-#
-# Use mapfile
-#
-FILES_m = mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-#
-# Files to compile
-#
-include FILES_c.gmk
-
-# We don't need snmp here.
-AUTO_JAVA_PRUNE = snmp
-AUTO_FILES_JAVA_DIRS = java/lang/management com/sun/management sun/management
-
-include Exportedfiles.gmk
-
-ifeq ($(PLATFORM),windows)
-
-FILES_c += OperatingSystem_md.c
-
-FILES_export += com/sun/management/OperatingSystem.java
-
-else # PLATFORM (i.e. solaris & linux)
-
-FILES_c += UnixOperatingSystem_md.c
-
-FILES_export += com/sun/management/UnixOperatingSystem.java
-
-ifeq ($(PLATFORM),solaris)
-
-FILES_c += SolarisOperatingSystem.c
-OTHER_LDLIBS += -lkstat
-
-endif # PLATFORM solaris
-
-ifeq ($(PLATFORM),linux)
-
-FILES_c += LinuxOperatingSystem.c
-
-endif # PLATFORM linux
-
-ifeq ($(PLATFORM),macosx)
-
-FILES_c += MacosxOperatingSystem.c
-
-endif # PLATFORM macosx
-
-endif # PLATFORM
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_COMPILED_PROPERTIES = sun/management/resources/agent.properties
-
-#
-# Find C source files
-#
-vpath %.c $(SHARE_SRC)/native/sun/management
-vpath %.c $(PLATFORM_SRC)/native/sun/management
-vpath %.c $(PLATFORM_SRC)/native/com/sun/management
-
-#
-# Access to management.h
-#
-
-OTHER_INCLUDES += \
- -I$(SHARE_SRC)/native/sun/management
-
-ifeq ($(PLATFORM),windows)
- # Need process status helper API (psapi) on Windows
- OTHER_LDLIBS += $(JVMLIB) psapi.lib
-endif
-
-#
-# Library to compile.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-$(AGENTJAR): $(LIBDIR) $(TEMPDIR)/manifest
- $(BOOT_JAR_CMD) -cfm $(AGENTJAR) $(TEMPDIR)/manifest $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-$(TEMPDIR)/manifest: $(MANIFEST)
- $(install-manifest-file)
-
-build: $(AGENTJAR)
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR)/java/management
- $(RM) -r $(CLASSDESTDIR)/sun/management
- $(RM) $(TEMPDIR)/manifest $(AGENTJAR)
-
diff --git a/jdk/make/java/management/mapfile-vers b/jdk/make/java/management/mapfile-vers
deleted file mode 100644
index 1cf52a8..0000000
--- a/jdk/make/java/management/mapfile-vers
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- global:
- Java_com_sun_management_UnixOperatingSystem_getCommittedVirtualMemorySize;
- Java_com_sun_management_UnixOperatingSystem_getFreePhysicalMemorySize;
- Java_com_sun_management_UnixOperatingSystem_getFreeSwapSpaceSize;
- Java_com_sun_management_UnixOperatingSystem_getMaxFileDescriptorCount;
- Java_com_sun_management_UnixOperatingSystem_getOpenFileDescriptorCount;
- Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad;
- Java_com_sun_management_UnixOperatingSystem_getProcessCpuTime;
- Java_com_sun_management_UnixOperatingSystem_getSystemCpuLoad;
- Java_com_sun_management_UnixOperatingSystem_getTotalPhysicalMemorySize;
- Java_com_sun_management_UnixOperatingSystem_getTotalSwapSpaceSize;
- Java_com_sun_management_UnixOperatingSystem_initialize;
- Java_sun_management_ClassLoadingImpl_setVerboseClass;
- Java_sun_management_DiagnosticCommandImpl_executeDiagnosticCommand;
- Java_sun_management_DiagnosticCommandImpl_getDiagnosticCommands;
- Java_sun_management_DiagnosticCommandImpl_getDiagnosticCommandInfo;
- Java_sun_management_DiagnosticCommandImpl_setNotificationEnabled;
- Java_sun_management_FileSystemImpl_isAccessUserOnly0;
- Java_sun_management_Flag_getAllFlagNames;
- Java_sun_management_Flag_getFlags;
- Java_sun_management_Flag_getInternalFlagCount;
- Java_sun_management_Flag_initialize;
- Java_sun_management_Flag_setLongValue;
- Java_sun_management_Flag_setBooleanValue;
- Java_sun_management_Flag_setStringValue;
- Java_sun_management_GarbageCollectorImpl_getCollectionCount;
- Java_sun_management_GarbageCollectorImpl_getCollectionTime;
- Java_sun_management_GarbageCollectorImpl_setNotificationEnabled;
- Java_sun_management_GcInfoBuilder_fillGcAttributeInfo;
- Java_sun_management_GcInfoBuilder_getLastGcInfo0;
- Java_sun_management_GcInfoBuilder_getNumGcExtAttributes;
- Java_sun_management_HotSpotDiagnostic_dumpHeap0;
- Java_sun_management_HotspotThread_getInternalThreadCount;
- Java_sun_management_HotspotThread_getInternalThreadTimes0;
- Java_sun_management_MemoryImpl_getMemoryManagers0;
- Java_sun_management_MemoryImpl_getMemoryPools0;
- Java_sun_management_MemoryImpl_getMemoryUsage0;
- Java_sun_management_MemoryImpl_setVerboseGC;
- Java_sun_management_MemoryManagerImpl_getMemoryPools0;
- Java_sun_management_MemoryPoolImpl_getCollectionUsage0;
- Java_sun_management_MemoryPoolImpl_getMemoryManagers0;
- Java_sun_management_MemoryPoolImpl_getPeakUsage0;
- Java_sun_management_MemoryPoolImpl_getUsage0;
- Java_sun_management_MemoryPoolImpl_resetPeakUsage0;
- Java_sun_management_MemoryPoolImpl_setCollectionThreshold0;
- Java_sun_management_MemoryPoolImpl_setPoolCollectionSensor;
- Java_sun_management_MemoryPoolImpl_setPoolUsageSensor;
- Java_sun_management_MemoryPoolImpl_setUsageThreshold0;
- Java_sun_management_ThreadImpl_dumpThreads0;
- Java_sun_management_ThreadImpl_findDeadlockedThreads0;
- Java_sun_management_ThreadImpl_findMonitorDeadlockedThreads0;
- Java_sun_management_ThreadImpl_getThreadInfo1;
- Java_sun_management_ThreadImpl_getThreads;
- Java_sun_management_ThreadImpl_getThreadTotalCpuTime0;
- Java_sun_management_ThreadImpl_getThreadTotalCpuTime1;
- Java_sun_management_ThreadImpl_getThreadUserCpuTime0;
- Java_sun_management_ThreadImpl_getThreadUserCpuTime1;
- Java_sun_management_ThreadImpl_getThreadAllocatedMemory1;
- Java_sun_management_ThreadImpl_resetContentionTimes0;
- Java_sun_management_ThreadImpl_resetPeakThreadCount0;
- Java_sun_management_ThreadImpl_setThreadContentionMonitoringEnabled0;
- Java_sun_management_ThreadImpl_setThreadCpuTimeEnabled0;
- Java_sun_management_ThreadImpl_setThreadAllocatedMemoryEnabled0;
- Java_sun_management_VMManagementImpl_getAvailableProcessors;
- Java_sun_management_VMManagementImpl_getClassInitializationTime;
- Java_sun_management_VMManagementImpl_getClassLoadingTime;
- Java_sun_management_VMManagementImpl_getClassVerificationTime;
- Java_sun_management_VMManagementImpl_getDaemonThreadCount;
- Java_sun_management_VMManagementImpl_getInitializedClassCount;
- Java_sun_management_VMManagementImpl_getLiveThreadCount;
- Java_sun_management_VMManagementImpl_getLoadedClassSize;
- Java_sun_management_VMManagementImpl_getMethodDataSize;
- Java_sun_management_VMManagementImpl_getPeakThreadCount;
- Java_sun_management_VMManagementImpl_getProcessId;
- Java_sun_management_VMManagementImpl_getSafepointCount;
- Java_sun_management_VMManagementImpl_getSafepointSyncTime;
- Java_sun_management_VMManagementImpl_getStartupTime;
- Java_sun_management_VMManagementImpl_getUptime0;
- Java_sun_management_VMManagementImpl_getTotalApplicationNonStoppedTime;
- Java_sun_management_VMManagementImpl_getTotalClassCount;
- Java_sun_management_VMManagementImpl_getTotalCompileTime;
- Java_sun_management_VMManagementImpl_getTotalSafepointTime;
- Java_sun_management_VMManagementImpl_getTotalThreadCount;
- Java_sun_management_VMManagementImpl_getUnloadedClassCount;
- Java_sun_management_VMManagementImpl_getUnloadedClassSize;
- Java_sun_management_VMManagementImpl_getVerboseClass;
- Java_sun_management_VMManagementImpl_getVerboseGC;
- Java_sun_management_VMManagementImpl_getVersion0;
- Java_sun_management_VMManagementImpl_getVmArguments0;
- Java_sun_management_VMManagementImpl_initOptionalSupportFields;
- Java_sun_management_VMManagementImpl_isThreadContentionMonitoringEnabled;
- Java_sun_management_VMManagementImpl_isThreadCpuTimeEnabled;
- Java_sun_management_VMManagementImpl_isThreadAllocatedMemoryEnabled;
- JNI_OnLoad;
- local:
- *;
-};
diff --git a/jdk/make/java/math/Makefile b/jdk/make/java/math/Makefile
deleted file mode 100644
index df07e06..0000000
--- a/jdk/make/java/math/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-
-PACKAGE = java.math
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-FILES_java = \
- java/math/BigInteger.java \
- java/math/MutableBigInteger.java \
- java/math/SignedMutableBigInteger.java \
- java/math/BitSieve.java \
- java/math/BigDecimal.java \
- java/math/MathContext.java \
- java/math/RoundingMode.java
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/java/net/FILES_c.gmk b/jdk/make/java/net/FILES_c.gmk
deleted file mode 100644
index 93b7562..0000000
--- a/jdk/make/java/net/FILES_c.gmk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- DatagramPacket.c \
- InetAddress.c \
- Inet4Address.c \
- Inet6Address.c \
- NetworkInterface.c \
- InetAddressImplFactory.c \
- Inet4AddressImpl.c \
- Inet6AddressImpl.c \
- SocketInputStream.c \
- SocketOutputStream.c \
- net_util.c \
- net_util_md.c \
- ResolverConfigurationImpl.c \
- DefaultProxySelector.c
-
-ifeq ($(PLATFORM), linux)
- FILES_c += linux_close.c
-endif
-
-ifeq ($(PLATFORM), macosx)
- FILES_c += bsd_close.c
-endif
-
-ifeq ($(PLATFORM), windows)
- FILES_c += TwoStacksPlainSocketImpl.c
- FILES_c += DualStackPlainSocketImpl.c
- FILES_c += TwoStacksPlainDatagramSocketImpl.c
- FILES_c += DualStackPlainDatagramSocketImpl.c
-else
- FILES_c += PlainSocketImpl.c
- FILES_c += PlainDatagramSocketImpl.c
-endif
-
diff --git a/jdk/make/java/net/Makefile b/jdk/make/java/net/Makefile
deleted file mode 100644
index d45c920..0000000
--- a/jdk/make/java/net/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = java.net
-LIBRARY = net
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_c.gmk
-
-AUTO_FILES_JAVA_DIRS = java/net
-
-ifeq ($(PLATFORM), windows)
- FILES_c += NTLMAuthSequence.c
- FILES_c += NetworkInterface_winXP.c
-else
- FILES_c += SdpSupport.c
-endif
-
-FILES_export = \
- java/net/Socket.java \
- java/net/SocketOptions.java \
- java/net/SocketImpl.java \
- java/net/AbstractPlainSocketImpl.java \
- java/net/PlainSocketImpl.java \
- java/net/ServerSocket.java \
- java/net/InetAddress.java \
- java/net/Inet4Address.java \
- java/net/Inet6Address.java \
- java/net/InetAddressImpl.java \
- java/net/Inet4AddressImpl.java \
- java/net/Inet6AddressImpl.java \
- java/net/NetworkInterface.java \
- java/net/SocketInputStream.java \
- java/net/SocketOutputStream.java \
- java/net/DefaultDatagramSocketImplFactory.java \
- java/net/DatagramPacket.java \
- java/net/DatagramSocket.java \
- java/net/DatagramSocketImpl.java \
- java/net/AbstractPlainDatagramSocketImpl.java \
- java/net/MulticastSocket.java \
- java/net/UnknownHostException.java \
- java/net/ProtocolException.java \
- sun/net/spi/DefaultProxySelector.java
-
-ifeq ($(PLATFORM), windows)
- FILES_export += java/net/TwoStacksPlainSocketImpl.java
- FILES_export += java/net/DualStackPlainSocketImpl.java
- FILES_export += java/net/TwoStacksPlainDatagramSocketImpl.java
- FILES_export += java/net/DualStackPlainDatagramSocketImpl.java
- FILES_export += sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
-else
- FILES_export += java/net/PlainDatagramSocketImpl.java
-endif
-
-#
-# Find platform specific native code
-#
-vpath %.c $(PLATFORM_SRC)/native/sun/net/dns $(PLATFORM_SRC)/native/sun/net/www/protocol/http/ntlm \
- $(PLATFORM_SRC)/native/sun/net/sdp $(PLATFORM_SRC)/native/sun/net/spi
-
-#
-# Include rules
-#
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-include $(BUILDDIR)/common/Library.gmk
-
-ifeq ($(PLATFORM), macosx)
-ifdef DONT_ENABLE_IPV6
- OTHER_CFLAGS += -DDONT_ENABLE_IPV6
-endif
- OTHER_LDLIBS = $(JVMLIB) -pthread
-else
-ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS = ws2_32.lib $(JVMLIB) \
- secur32.lib iphlpapi.lib delayimp.lib \
- /DELAYLOAD:secur32.dll /DELAYLOAD:iphlpapi.dll
-else
- OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) $(LIBDL) $(JVMLIB)
-endif
-ifeq ($(PLATFORM), linux)
- OTHER_LDLIBS += -lpthread
-endif
-endif # PLATFORM
-
-CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-
-MISC_FILES = $(LIBDIR) $(LIBDIR)/net.properties
-
-$(LIBDIR)/net.properties: $(SHARE_SRC)/lib/net.properties
- $(install-file)
-
-#
-# SDP configuration template
-#
-ifeq ($(PLATFORM), solaris)
-SDP_PATH = sdp/sdp.conf.template
-SDP_CONF = $(LIBDIR)/$(SDP_PATH)
-$(SDP_CONF): $(PLATFORM_SRC)/lib/$(SDP_PATH)
- @$(RM) $*
- $(install-file)
-
-MISC_FILES += $(SDP_CONF)
-endif
-
-build: $(MISC_FILES)
-
diff --git a/jdk/make/java/net/mapfile-vers b/jdk/make/java/net/mapfile-vers
deleted file mode 100644
index 5018471..0000000
--- a/jdk/make/java/net/mapfile-vers
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
- Java_java_net_PlainSocketImpl_socketListen;
- Java_java_net_PlainDatagramSocketImpl_getTTL;
- Java_java_net_PlainDatagramSocketImpl_init;
- Java_java_net_SocketOutputStream_socketWrite0;
- Java_java_net_PlainSocketImpl_socketCreate;
- Java_java_net_PlainSocketImpl_socketAvailable;
- Java_java_net_PlainDatagramSocketImpl_join;
- Java_java_net_PlainDatagramSocketImpl_socketGetOption;
- Java_java_net_InetAddress_init;
- Java_java_net_Inet4Address_init;
- Java_java_net_Inet6Address_init;
- Java_java_net_PlainDatagramSocketImpl_setTTL;
- Java_java_net_PlainDatagramSocketImpl_socketSetOption;
- Java_java_net_PlainDatagramSocketImpl_bind0;
- Java_java_net_PlainSocketImpl_socketAccept;
- Java_java_net_DatagramPacket_init;
- Java_java_net_PlainDatagramSocketImpl_leave;
- Java_java_net_SocketInputStream_socketRead0;
- Java_java_net_InetAddressImplFactory_isIPv6Supported;
- Java_java_net_Inet4AddressImpl_getLocalHostName;
- Java_java_net_Inet4AddressImpl_lookupAllHostAddr;
- Java_java_net_Inet4AddressImpl_getHostByAddr;
- Java_java_net_Inet4AddressImpl_isReachable0;
- Java_java_net_Inet6AddressImpl_getLocalHostName;
- Java_java_net_Inet6AddressImpl_lookupAllHostAddr;
- Java_java_net_Inet6AddressImpl_getHostByAddr;
- Java_java_net_Inet6AddressImpl_isReachable0;
- Java_java_net_NetworkInterface_init;
- Java_java_net_NetworkInterface_getByName0;
- Java_java_net_NetworkInterface_getByIndex0;
- Java_java_net_NetworkInterface_getByInetAddress0;
- Java_java_net_NetworkInterface_getAll;
- Java_java_net_NetworkInterface_isUp0;
- Java_java_net_NetworkInterface_isLoopback0;
- Java_java_net_NetworkInterface_isP2P0;
- Java_java_net_NetworkInterface_supportsMulticast0;
- Java_java_net_NetworkInterface_getMacAddr0;
- Java_java_net_NetworkInterface_getMTU0;
- Java_java_net_PlainDatagramSocketImpl_send;
- Java_java_net_PlainSocketImpl_socketClose0;
- Java_java_net_SocketOutputStream_init;
- Java_java_net_PlainDatagramSocketImpl_peek;
- Java_java_net_PlainDatagramSocketImpl_peekData;
- Java_java_net_PlainSocketImpl_socketSetOption;
- Java_java_net_PlainSocketImpl_socketSendUrgentData;
- Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate;
- Java_java_net_PlainSocketImpl_socketGetOption;
- Java_java_net_PlainDatagramSocketImpl_receive0;
- Java_java_net_PlainDatagramSocketImpl_connect0;
- Java_java_net_PlainDatagramSocketImpl_disconnect0;
- Java_java_net_PlainDatagramSocketImpl_datagramSocketClose;
- Java_java_net_PlainSocketImpl_initProto;
- Java_java_net_PlainSocketImpl_socketBind;
- Java_java_net_PlainSocketImpl_socketShutdown;
- Java_java_net_SocketInputStream_init;
- Java_java_net_PlainSocketImpl_socketConnect;
- Java_java_net_PlainDatagramSocketImpl_getTimeToLive;
- Java_java_net_PlainDatagramSocketImpl_setTimeToLive;
- Java_sun_net_dns_ResolverConfigurationImpl_localDomain0;
- Java_sun_net_dns_ResolverConfigurationImpl_fallbackDomain0;
- Java_sun_net_sdp_SdpSupport_convert0;
- Java_sun_net_sdp_SdpSupport_create0;
- Java_sun_net_spi_DefaultProxySelector_init;
- Java_sun_net_spi_DefaultProxySelector_getSystemProxy;
- NET_AllocSockaddr;
- NET_SockaddrToInetAddress;
- NET_SockaddrEqualsInetAddress;
- NET_InetAddressToSockaddr;
- NET_GetPortFromSockaddr;
- NET_SetSockOpt;
- NET_GetSockOpt;
- NET_Bind;
- NET_MapSocketOption;
- NET_Wait;
- ipv6_available;
-
- local:
- *;
-};
diff --git a/jdk/make/java/nio/Exportedfiles.gmk b/jdk/make/java/nio/Exportedfiles.gmk
deleted file mode 100644
index 75ee6be..0000000
--- a/jdk/make/java/nio/Exportedfiles.gmk
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# These are the names of Java classes for which we will make .h files.
-#
-
-FILES_export = \
- java/net/SocketOptions.java \
- java/nio/MappedByteBuffer.java \
- sun/nio/ch/DatagramChannelImpl.java \
- sun/nio/ch/DatagramDispatcher.java \
- sun/nio/ch/FileChannelImpl.java \
- sun/nio/ch/FileDispatcherImpl.java \
- sun/nio/ch/FileKey.java \
- sun/nio/ch/FileLockImpl.java \
- sun/nio/ch/IOStatus.java \
- sun/nio/ch/IOUtil.java \
- sun/nio/ch/Net.java \
- sun/nio/ch/PollArrayWrapper.java \
- sun/nio/ch/ServerSocketChannelImpl.java \
- sun/nio/ch/SocketChannelImpl.java \
- sun/nio/ch/SocketDispatcher.java \
- java/io/FileDescriptor.java \
diff --git a/jdk/make/java/nio/FILES_c.gmk b/jdk/make/java/nio/FILES_c.gmk
deleted file mode 100644
index 1373bac..0000000
--- a/jdk/make/java/nio/FILES_c.gmk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- DatagramChannelImpl.c \
- DatagramDispatcher.c \
- FileChannelImpl.c \
- FileDispatcherImpl.c \
- FileKey.c \
- IOUtil.c \
- MappedByteBuffer.c \
- Net.c \
- ServerSocketChannelImpl.c \
- SocketChannelImpl.c \
- SocketDispatcher.c
diff --git a/jdk/make/java/nio/FILES_java.gmk b/jdk/make/java/nio/FILES_java.gmk
deleted file mode 100644
index 1725842..0000000
--- a/jdk/make/java/nio/FILES_java.gmk
+++ /dev/null
@@ -1,440 +0,0 @@
-#
-# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_src = \
- java/nio/Bits.java \
- java/nio/Buffer.java \
- java/nio/ByteOrder.java \
- java/nio/MappedByteBuffer.java \
- java/nio/StringCharBuffer.java \
- \
- java/nio/channels/AsynchronousByteChannel.java \
- java/nio/channels/AsynchronousChannel.java \
- java/nio/channels/AsynchronousChannelGroup.java \
- java/nio/channels/AsynchronousFileChannel.java \
- java/nio/channels/AsynchronousServerSocketChannel.java \
- java/nio/channels/AsynchronousSocketChannel.java \
- java/nio/channels/ByteChannel.java \
- java/nio/channels/Channel.java \
- java/nio/channels/Channels.java \
- java/nio/channels/CompletionHandler.java \
- java/nio/channels/DatagramChannel.java \
- java/nio/channels/FileChannel.java \
- java/nio/channels/FileLock.java \
- java/nio/channels/GatheringByteChannel.java \
- java/nio/channels/InterruptibleChannel.java \
- java/nio/channels/Pipe.java \
- java/nio/channels/MembershipKey.java \
- java/nio/channels/MulticastChannel.java \
- java/nio/channels/NetworkChannel.java \
- java/nio/channels/ReadableByteChannel.java \
- java/nio/channels/ScatteringByteChannel.java \
- java/nio/channels/SeekableByteChannel.java \
- java/nio/channels/SelectableChannel.java \
- java/nio/channels/Selector.java \
- java/nio/channels/SelectionKey.java \
- java/nio/channels/ServerSocketChannel.java \
- java/nio/channels/SocketChannel.java \
- java/nio/channels/WritableByteChannel.java \
- \
- java/nio/channels/spi/AbstractInterruptibleChannel.java \
- java/nio/channels/spi/AbstractSelectableChannel.java \
- java/nio/channels/spi/AbstractSelectionKey.java \
- java/nio/channels/spi/AbstractSelector.java \
- java/nio/channels/spi/AsynchronousChannelProvider.java \
- java/nio/channels/spi/SelectorProvider.java \
- \
- java/nio/charset/Charset.java \
- java/nio/charset/CoderResult.java \
- java/nio/charset/CoderMalfunctionError.java \
- java/nio/charset/CodingErrorAction.java \
- java/nio/charset/MalformedInputException.java \
- java/nio/charset/StandardCharsets.java \
- java/nio/charset/UnmappableCharacterException.java \
- \
- java/nio/charset/spi/CharsetProvider.java \
- \
- java/nio/file/AccessDeniedException.java \
- java/nio/file/AccessMode.java \
- java/nio/file/AtomicMoveNotSupportedException.java \
- java/nio/file/ClosedDirectoryStreamException.java \
- java/nio/file/ClosedFileSystemException.java \
- java/nio/file/ClosedWatchServiceException.java \
- java/nio/file/CopyMoveHelper.java \
- java/nio/file/CopyOption.java \
- java/nio/file/DirectoryIteratorException.java \
- java/nio/file/DirectoryNotEmptyException.java \
- java/nio/file/DirectoryStream.java \
- java/nio/file/FileAlreadyExistsException.java \
- java/nio/file/FileStore.java \
- java/nio/file/FileSystem.java \
- java/nio/file/FileSystemAlreadyExistsException.java \
- java/nio/file/FileSystemException.java \
- java/nio/file/FileSystemNotFoundException.java \
- java/nio/file/FileSystems.java \
- java/nio/file/FileTreeWalker.java \
- java/nio/file/FileVisitOption.java \
- java/nio/file/FileVisitResult.java \
- java/nio/file/FileVisitor.java \
- java/nio/file/Files.java \
- java/nio/file/InvalidPathException.java \
- java/nio/file/LinkOption.java \
- java/nio/file/LinkPermission.java \
- java/nio/file/NoSuchFileException.java \
- java/nio/file/NotDirectoryException.java \
- java/nio/file/NotLinkException.java \
- java/nio/file/OpenOption.java \
- java/nio/file/Path.java \
- java/nio/file/PathMatcher.java \
- java/nio/file/Paths.java \
- java/nio/file/ProviderMismatchException.java \
- java/nio/file/ProviderNotFoundException.java \
- java/nio/file/ReadOnlyFileSystemException.java \
- java/nio/file/SecureDirectoryStream.java \
- java/nio/file/SimpleFileVisitor.java \
- java/nio/file/StandardCopyOption.java \
- java/nio/file/StandardOpenOption.java \
- java/nio/file/StandardWatchEventKinds.java \
- java/nio/file/TempFileHelper.java \
- java/nio/file/WatchEvent.java \
- java/nio/file/WatchKey.java \
- java/nio/file/WatchService.java \
- java/nio/file/Watchable.java \
- \
- java/nio/file/attribute/AclEntry.java \
- java/nio/file/attribute/AclEntryFlag.java \
- java/nio/file/attribute/AclEntryPermission.java \
- java/nio/file/attribute/AclEntryType.java \
- java/nio/file/attribute/AclFileAttributeView.java \
- java/nio/file/attribute/AttributeView.java \
- java/nio/file/attribute/BasicFileAttributeView.java \
- java/nio/file/attribute/BasicFileAttributes.java \
- java/nio/file/attribute/DosFileAttributeView.java \
- java/nio/file/attribute/DosFileAttributes.java \
- java/nio/file/attribute/FileAttribute.java \
- java/nio/file/attribute/FileAttributeView.java \
- java/nio/file/attribute/FileOwnerAttributeView.java \
- java/nio/file/attribute/FileStoreAttributeView.java \
- java/nio/file/attribute/FileTime.java \
- java/nio/file/attribute/GroupPrincipal.java \
- java/nio/file/attribute/UserDefinedFileAttributeView.java \
- java/nio/file/attribute/PosixFileAttributeView.java \
- java/nio/file/attribute/PosixFileAttributes.java \
- java/nio/file/attribute/PosixFilePermission.java \
- java/nio/file/attribute/PosixFilePermissions.java \
- java/nio/file/attribute/UserPrincipal.java \
- java/nio/file/attribute/UserPrincipalLookupService.java \
- java/nio/file/attribute/UserPrincipalNotFoundException.java \
- \
- java/nio/file/spi/FileSystemProvider.java \
- java/nio/file/spi/FileTypeDetector.java \
- \
- com/sun/nio/file/ExtendedCopyOption.java \
- com/sun/nio/file/ExtendedOpenOption.java \
- com/sun/nio/file/ExtendedWatchEventModifier.java \
- com/sun/nio/file/SensitivityWatchEventModifier.java \
- \
- sun/nio/ByteBuffered.java \
- \
- sun/nio/ch/AbstractPollArrayWrapper.java \
- sun/nio/ch/AllocatedNativeObject.java \
- sun/nio/ch/AsynchronousChannelGroupImpl.java \
- sun/nio/ch/AsynchronousFileChannelImpl.java \
- sun/nio/ch/AsynchronousServerSocketChannelImpl.java \
- sun/nio/ch/AsynchronousSocketChannelImpl.java \
- sun/nio/ch/Cancellable.java \
- sun/nio/ch/ChannelInputStream.java \
- sun/nio/ch/CompletedFuture.java \
- sun/nio/ch/DatagramChannelImpl.java \
- sun/nio/ch/DatagramDispatcher.java \
- sun/nio/ch/DatagramSocketAdaptor.java \
- sun/nio/ch/DefaultAsynchronousChannelProvider.java \
- sun/nio/ch/DefaultSelectorProvider.java \
- sun/nio/ch/DirectBuffer.java \
- sun/nio/ch/ExtendedSocketOption.java \
- sun/nio/ch/FileChannelImpl.java \
- sun/nio/ch/FileDispatcher.java \
- sun/nio/ch/FileDispatcherImpl.java \
- sun/nio/ch/FileKey.java \
- sun/nio/ch/FileLockImpl.java \
- sun/nio/ch/FileLockTable.java \
- sun/nio/ch/Groupable.java \
- sun/nio/ch/Interruptible.java \
- sun/nio/ch/Invoker.java \
- sun/nio/ch/IOUtil.java \
- sun/nio/ch/IOStatus.java \
- sun/nio/ch/IOVecWrapper.java \
- sun/nio/ch/MembershipKeyImpl.java \
- sun/nio/ch/MembershipRegistry.java \
- sun/nio/ch/NativeDispatcher.java \
- sun/nio/ch/NativeObject.java \
- sun/nio/ch/NativeThread.java \
- sun/nio/ch/NativeThreadSet.java \
- sun/nio/ch/Net.java \
- sun/nio/ch/OptionKey.java \
- sun/nio/ch/PendingFuture.java \
- sun/nio/ch/PipeImpl.java \
- sun/nio/ch/PollArrayWrapper.java \
- sun/nio/ch/Reflect.java \
- sun/nio/ch/Secrets.java \
- sun/nio/ch/SelectionKeyImpl.java \
- sun/nio/ch/SelectorImpl.java \
- sun/nio/ch/SelectorProviderImpl.java \
- sun/nio/ch/SelChImpl.java \
- sun/nio/ch/ServerSocketAdaptor.java \
- sun/nio/ch/ServerSocketChannelImpl.java \
- sun/nio/ch/SinkChannelImpl.java \
- sun/nio/ch/SocketAdaptor.java \
- sun/nio/ch/SocketChannelImpl.java \
- sun/nio/ch/SocketDispatcher.java \
- sun/nio/ch/SocketOptionRegistry.java \
- sun/nio/ch/SourceChannelImpl.java \
- sun/nio/ch/ThreadPool.java \
- sun/nio/ch/Util.java \
- \
- sun/nio/cs/AbstractCharsetProvider.java \
- sun/nio/cs/ArrayDecoder.java \
- sun/nio/cs/ArrayEncoder.java \
- sun/nio/cs/FastCharsetProvider.java \
- sun/nio/cs/HistoricallyNamedCharset.java \
- sun/nio/cs/ISO_8859_1.java \
- sun/nio/cs/SingleByte.java \
- sun/nio/cs/StreamEncoder.java \
- sun/nio/cs/StreamDecoder.java \
- sun/nio/cs/Surrogate.java \
- sun/nio/cs/ThreadLocalCoders.java \
- sun/nio/cs/US_ASCII.java \
- sun/nio/cs/UTF_16.java \
- sun/nio/cs/UTF_16BE.java \
- sun/nio/cs/UTF_16LE.java \
- sun/nio/cs/UTF_8.java \
- sun/nio/cs/CESU_8.java \
- sun/nio/cs/Unicode.java \
- sun/nio/cs/UnicodeDecoder.java \
- sun/nio/cs/UnicodeEncoder.java \
- sun/nio/cs/UTF_32.java \
- sun/nio/cs/UTF_32BE.java \
- sun/nio/cs/UTF_32LE.java \
- sun/nio/cs/UTF_32BE_BOM.java \
- sun/nio/cs/UTF_32LE_BOM.java \
- sun/nio/cs/UTF_32Coder.java \
- \
- sun/nio/fs/AbstractAclFileAttributeView.java \
- sun/nio/fs/AbstractBasicFileAttributeView.java \
- sun/nio/fs/AbstractFileTypeDetector.java \
- sun/nio/fs/AbstractFileSystemProvider.java \
- sun/nio/fs/AbstractPath.java \
- sun/nio/fs/AbstractPoller.java \
- sun/nio/fs/AbstractUserDefinedFileAttributeView.java \
- sun/nio/fs/AbstractWatchKey.java \
- sun/nio/fs/AbstractWatchService.java \
- sun/nio/fs/BasicFileAttributesHolder.java \
- sun/nio/fs/Cancellable.java \
- sun/nio/fs/DefaultFileSystemProvider.java \
- sun/nio/fs/DefaultFileTypeDetector.java \
- sun/nio/fs/DynamicFileAttributeView.java \
- sun/nio/fs/FileOwnerAttributeViewImpl.java \
- sun/nio/fs/Globs.java \
- sun/nio/fs/NativeBuffer.java \
- sun/nio/fs/NativeBuffers.java \
- sun/nio/fs/Reflect.java \
- sun/nio/fs/Util.java \
- \
- java/net/DatagramSocket.java \
- java/net/DatagramSocketImpl.java \
- java/net/PlainSocketImpl.java \
- java/net/Socket.java \
- java/net/ServerSocket.java \
- java/net/SocketImpl.java \
- java/net/Socket.java \
- java/io/InputStreamReader.java \
- java/io/OutputStreamWriter.java \
- java/lang/String.java \
- java/lang/StringCoding.java \
- \
- sun/misc/Cleaner.java \
- sun/util/PreHashedMap.java
-
-# Generated coder classes
-#
-FILES_gen_coder = \
- java/nio/charset/CharsetDecoder.java \
- java/nio/charset/CharsetEncoder.java
-
-# Generated buffer classes
-#
-FILES_gen_buffer = \
- java/nio/ByteBuffer.java \
- java/nio/CharBuffer.java \
- java/nio/ShortBuffer.java \
- java/nio/IntBuffer.java \
- java/nio/LongBuffer.java \
- java/nio/FloatBuffer.java \
- java/nio/DoubleBuffer.java \
- \
- java/nio/HeapByteBuffer.java \
- java/nio/HeapByteBufferR.java \
- java/nio/HeapCharBuffer.java \
- java/nio/HeapCharBufferR.java \
- java/nio/HeapShortBuffer.java \
- java/nio/HeapShortBufferR.java \
- java/nio/HeapIntBuffer.java \
- java/nio/HeapIntBufferR.java \
- java/nio/HeapLongBuffer.java \
- java/nio/HeapLongBufferR.java \
- java/nio/HeapFloatBuffer.java \
- java/nio/HeapFloatBufferR.java \
- java/nio/HeapDoubleBuffer.java \
- java/nio/HeapDoubleBufferR.java \
- \
- java/nio/DirectByteBuffer.java \
- java/nio/DirectByteBufferR.java \
- \
- java/nio/DirectCharBufferU.java \
- java/nio/DirectCharBufferRU.java \
- java/nio/DirectShortBufferU.java \
- java/nio/DirectShortBufferRU.java \
- java/nio/DirectIntBufferU.java \
- java/nio/DirectIntBufferRU.java \
- java/nio/DirectLongBufferU.java \
- java/nio/DirectLongBufferRU.java \
- java/nio/DirectFloatBufferU.java \
- java/nio/DirectFloatBufferRU.java \
- java/nio/DirectDoubleBufferU.java \
- java/nio/DirectDoubleBufferRU.java \
- \
- java/nio/DirectCharBufferS.java \
- java/nio/DirectCharBufferRS.java \
- java/nio/DirectShortBufferS.java \
- java/nio/DirectShortBufferRS.java \
- java/nio/DirectIntBufferS.java \
- java/nio/DirectIntBufferRS.java \
- java/nio/DirectLongBufferS.java \
- java/nio/DirectLongBufferRS.java \
- java/nio/DirectFloatBufferS.java \
- java/nio/DirectFloatBufferRS.java \
- java/nio/DirectDoubleBufferS.java \
- java/nio/DirectDoubleBufferRS.java \
- \
- java/nio/ByteBufferAsCharBufferB.java \
- java/nio/ByteBufferAsCharBufferRB.java \
- java/nio/ByteBufferAsShortBufferB.java \
- java/nio/ByteBufferAsShortBufferRB.java \
- java/nio/ByteBufferAsIntBufferB.java \
- java/nio/ByteBufferAsIntBufferRB.java \
- java/nio/ByteBufferAsLongBufferB.java \
- java/nio/ByteBufferAsLongBufferRB.java \
- java/nio/ByteBufferAsFloatBufferB.java \
- java/nio/ByteBufferAsFloatBufferRB.java \
- java/nio/ByteBufferAsDoubleBufferB.java \
- java/nio/ByteBufferAsDoubleBufferRB.java \
- \
- java/nio/ByteBufferAsCharBufferL.java \
- java/nio/ByteBufferAsCharBufferRL.java \
- java/nio/ByteBufferAsShortBufferL.java \
- java/nio/ByteBufferAsShortBufferRL.java \
- java/nio/ByteBufferAsIntBufferL.java \
- java/nio/ByteBufferAsIntBufferRL.java \
- java/nio/ByteBufferAsLongBufferL.java \
- java/nio/ByteBufferAsLongBufferRL.java \
- java/nio/ByteBufferAsFloatBufferL.java \
- java/nio/ByteBufferAsFloatBufferRL.java \
- java/nio/ByteBufferAsDoubleBufferL.java \
- java/nio/ByteBufferAsDoubleBufferRL.java
-
-# Generated exception classes
-#
-FILES_gen_ex = \
- java/nio/BufferOverflowException.java \
- java/nio/BufferUnderflowException.java \
- java/nio/InvalidMarkException.java \
- java/nio/ReadOnlyBufferException.java \
- \
- java/nio/channels/AcceptPendingException.java \
- java/nio/channels/AlreadyBoundException.java \
- java/nio/channels/AlreadyConnectedException.java \
- java/nio/channels/AsynchronousCloseException.java \
- java/nio/channels/CancelledKeyException.java \
- java/nio/channels/ClosedByInterruptException.java \
- java/nio/channels/ClosedChannelException.java \
- java/nio/channels/ClosedSelectorException.java \
- java/nio/channels/ConnectionPendingException.java \
- java/nio/channels/FileLockInterruptionException.java \
- java/nio/channels/IllegalBlockingModeException.java \
- java/nio/channels/IllegalChannelGroupException.java \
- java/nio/channels/IllegalSelectorException.java \
- java/nio/channels/InterruptedByTimeoutException.java \
- java/nio/channels/NoConnectionPendingException.java \
- java/nio/channels/NonReadableChannelException.java \
- java/nio/channels/NonWritableChannelException.java \
- java/nio/channels/NotYetBoundException.java \
- java/nio/channels/NotYetConnectedException.java \
- java/nio/channels/OverlappingFileLockException.java \
- java/nio/channels/ReadPendingException.java \
- java/nio/channels/ShutdownChannelGroupException.java \
- java/nio/channels/UnresolvedAddressException.java \
- java/nio/channels/UnsupportedAddressTypeException.java \
- java/nio/channels/WritePendingException.java \
- \
- java/nio/charset/CharacterCodingException.java \
- java/nio/charset/IllegalCharsetNameException.java \
- java/nio/charset/UnsupportedCharsetException.java
-
-FILES_gen_sbcs = \
- sun/nio/cs/ISO_8859_2.java \
- sun/nio/cs/ISO_8859_4.java \
- sun/nio/cs/ISO_8859_5.java \
- sun/nio/cs/ISO_8859_7.java \
- sun/nio/cs/ISO_8859_9.java \
- sun/nio/cs/ISO_8859_13.java \
- sun/nio/cs/ISO_8859_15.java \
- sun/nio/cs/IBM437.java \
- sun/nio/cs/IBM737.java \
- sun/nio/cs/IBM775.java \
- sun/nio/cs/IBM850.java \
- sun/nio/cs/IBM852.java \
- sun/nio/cs/IBM855.java \
- sun/nio/cs/IBM857.java \
- sun/nio/cs/IBM858.java \
- sun/nio/cs/IBM862.java \
- sun/nio/cs/IBM866.java \
- sun/nio/cs/IBM874.java \
- sun/nio/cs/KOI8_R.java \
- sun/nio/cs/KOI8_U.java \
- sun/nio/cs/MS1250.java \
- sun/nio/cs/MS1251.java \
- sun/nio/cs/MS1252.java \
- sun/nio/cs/MS1253.java \
- sun/nio/cs/MS1254.java \
- sun/nio/cs/MS1257.java
-
-FILES_gen_csp = sun/nio/cs/StandardCharsets.java
-
-FILES_gen_sor = sun/nio/ch/SocketOptionRegistry.java
-
-FILES_gen = $(FILES_gen_coder) $(FILES_gen_buffer) $(FILES_gen_ex) \
- $(FILES_gen_csp) $(FILES_gen_sor)
-
-FILES_java = $(FILES_src) $(FILES_gen) $(FILES_gen_sbcs)
diff --git a/jdk/make/java/nio/Makefile b/jdk/make/java/nio/Makefile
deleted file mode 100644
index c20bec9..0000000
--- a/jdk/make/java/nio/Makefile
+++ /dev/null
@@ -1,1005 +0,0 @@
-#
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for java.nio
-#
-
-BUILDDIR = ../..
-PACKAGE = java.nio
-LIBRARY = nio
-PRODUCT = java
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-include $(BUILDDIR)/common/Defs.gmk
-
-NIO_SRC = $(SHARE_SRC)/classes/java/nio
-NIO_GEN = $(GENSRCDIR)/java/nio
-
-SNIO_SRC = $(SHARE_SRC)/classes/sun/nio
-SNIO_GEN = $(GENSRCDIR)/sun/nio
-
-#
-# Files to compile
-#
-
-include FILES_java.gmk
-include FILES_c.gmk
-include Exportedfiles.gmk
-
-ifeq ($(PLATFORM), solaris)
-FILES_java += \
- sun/nio/ch/AbstractPollSelectorImpl.java \
- sun/nio/ch/DevPollArrayWrapper.java \
- sun/nio/ch/DevPollSelectorImpl.java \
- sun/nio/ch/DevPollSelectorProvider.java \
- sun/nio/ch/EventPortSelectorImpl.java \
- sun/nio/ch/EventPortSelectorProvider.java \
- sun/nio/ch/EventPortWrapper.java \
- sun/nio/ch/InheritedChannel.java \
- sun/nio/ch/PollSelectorProvider.java \
- sun/nio/ch/PollSelectorImpl.java \
- sun/nio/ch/Port.java \
- sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
- sun/nio/ch/SolarisAsynchronousChannelProvider.java \
- sun/nio/ch/SolarisEventPort.java \
- sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
- sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
- \
- sun/nio/fs/GnomeFileTypeDetector.java \
- sun/nio/fs/MimeTypesFileTypeDetector.java \
- sun/nio/fs/PollingWatchService.java \
- sun/nio/fs/SolarisAclFileAttributeView.java \
- sun/nio/fs/SolarisFileStore.java \
- sun/nio/fs/SolarisFileSystem.java \
- sun/nio/fs/SolarisFileSystemProvider.java \
- sun/nio/fs/SolarisUserDefinedFileAttributeView.java \
- sun/nio/fs/SolarisNativeDispatcher.java \
- sun/nio/fs/SolarisWatchService.java \
- sun/nio/fs/UnixChannelFactory.java \
- sun/nio/fs/UnixCopyFile.java \
- sun/nio/fs/UnixDirectoryStream.java \
- sun/nio/fs/UnixException.java \
- sun/nio/fs/UnixFileAttributeViews.java \
- sun/nio/fs/UnixFileAttributes.java \
- sun/nio/fs/UnixFileKey.java \
- sun/nio/fs/UnixFileModeAttribute.java \
- sun/nio/fs/UnixFileStore.java \
- sun/nio/fs/UnixFileStoreAttributes.java \
- sun/nio/fs/UnixFileSystem.java \
- sun/nio/fs/UnixFileSystemProvider.java \
- sun/nio/fs/UnixMountEntry.java \
- sun/nio/fs/UnixNativeDispatcher.java \
- sun/nio/fs/UnixPath.java \
- sun/nio/fs/UnixSecureDirectoryStream.java \
- sun/nio/fs/UnixUriUtils.java \
- sun/nio/fs/UnixUserPrincipals.java
-
-FILES_c += \
- DevPollArrayWrapper.c \
- InheritedChannel.c \
- NativeThread.c \
- PollArrayWrapper.c \
- SolarisEventPort.c \
- UnixAsynchronousServerSocketChannelImpl.c \
- UnixAsynchronousSocketChannelImpl.c \
- \
- GnomeFileTypeDetector.c \
- SolarisNativeDispatcher.c \
- SolarisWatchService.c \
- UnixCopyFile.c \
- UnixNativeDispatcher.c
-
-FILES_export += \
- sun/nio/ch/DevPollArrayWrapper.java \
- sun/nio/ch/InheritedChannel.java \
- sun/nio/ch/NativeThread.java \
- sun/nio/ch/SolarisEventPort.java \
- sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
- sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
- \
- sun/nio/fs/GnomeFileTypeDetector.java \
- sun/nio/fs/SolarisNativeDispatcher.java \
- sun/nio/fs/SolarisWatchService.java \
- sun/nio/fs/UnixCopyFile.java \
- sun/nio/fs/UnixNativeDispatcher.java
-
-FILES_gen += \
- sun/nio/fs/SolarisConstants.java \
- sun/nio/fs/UnixConstants.java
-endif # PLATFORM = solaris
-
-ifeq ($(PLATFORM), windows)
-FILES_java += \
- sun/nio/ch/Iocp.java \
- sun/nio/ch/PendingIoCache.java \
- sun/nio/ch/WindowsAsynchronousChannelProvider.java \
- sun/nio/ch/WindowsAsynchronousFileChannelImpl.java \
- sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java \
- sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java \
- sun/nio/ch/WindowsSelectorImpl.java \
- sun/nio/ch/WindowsSelectorProvider.java \
- \
- sun/nio/fs/RegistryFileTypeDetector.java \
- sun/nio/fs/WindowsAclFileAttributeView.java \
- sun/nio/fs/WindowsChannelFactory.java \
- sun/nio/fs/WindowsConstants.java \
- sun/nio/fs/WindowsDirectoryStream.java \
- sun/nio/fs/WindowsException.java \
- sun/nio/fs/WindowsFileAttributeViews.java \
- sun/nio/fs/WindowsFileAttributes.java \
- sun/nio/fs/WindowsFileCopy.java \
- sun/nio/fs/WindowsFileStore.java \
- sun/nio/fs/WindowsFileSystem.java \
- sun/nio/fs/WindowsFileSystemProvider.java \
- sun/nio/fs/WindowsLinkSupport.java \
- sun/nio/fs/WindowsUserDefinedFileAttributeView.java \
- sun/nio/fs/WindowsNativeDispatcher.java \
- sun/nio/fs/WindowsPath.java \
- sun/nio/fs/WindowsPathParser.java \
- sun/nio/fs/WindowsPathType.java \
- sun/nio/fs/WindowsSecurity.java \
- sun/nio/fs/WindowsSecurityDescriptor.java \
- sun/nio/fs/WindowsUriSupport.java \
- sun/nio/fs/WindowsUserPrincipals.java \
- sun/nio/fs/WindowsWatchService.java
-
-FILES_c += \
- Iocp.c \
- RegistryFileTypeDetector.c \
- WindowsAsynchronousFileChannelImpl.c \
- WindowsAsynchronousServerSocketChannelImpl.c \
- WindowsAsynchronousSocketChannelImpl.c \
- WindowsNativeDispatcher.c \
- WindowsSelectorImpl.c
-
-FILES_export += \
- sun/nio/ch/Iocp.java \
- sun/nio/ch/WindowsAsynchronousFileChannelImpl.java \
- sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java \
- sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java \
- sun/nio/ch/WindowsSelectorImpl.java \
- sun/nio/fs/WindowsNativeDispatcher.java \
- sun/nio/fs/RegistryFileTypeDetector.java
-endif # PLATFORM = windows
-
-ifeq ($(PLATFORM), linux)
-FILES_java += \
- sun/nio/ch/AbstractPollSelectorImpl.java \
- sun/nio/ch/EPoll.java \
- sun/nio/ch/EPollArrayWrapper.java \
- sun/nio/ch/EPollPort.java \
- sun/nio/ch/EPollSelectorProvider.java \
- sun/nio/ch/EPollSelectorImpl.java \
- sun/nio/ch/InheritedChannel.java \
- sun/nio/ch/LinuxAsynchronousChannelProvider.java \
- sun/nio/ch/PollSelectorProvider.java \
- sun/nio/ch/PollSelectorImpl.java \
- sun/nio/ch/Port.java \
- sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
- sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
- sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
- \
- sun/nio/fs/GnomeFileTypeDetector.java \
- sun/nio/fs/MagicFileTypeDetector.java \
- sun/nio/fs/MimeTypesFileTypeDetector.java \
- sun/nio/fs/LinuxDosFileAttributeView.java \
- sun/nio/fs/LinuxFileStore.java \
- sun/nio/fs/LinuxFileSystem.java \
- sun/nio/fs/LinuxFileSystemProvider.java \
- sun/nio/fs/LinuxUserDefinedFileAttributeView.java \
- sun/nio/fs/LinuxNativeDispatcher.java \
- sun/nio/fs/LinuxWatchService.java \
- sun/nio/fs/UnixChannelFactory.java \
- sun/nio/fs/UnixCopyFile.java \
- sun/nio/fs/UnixDirectoryStream.java \
- sun/nio/fs/UnixException.java \
- sun/nio/fs/UnixFileAttributeViews.java \
- sun/nio/fs/UnixFileAttributes.java \
- sun/nio/fs/UnixFileKey.java \
- sun/nio/fs/UnixFileModeAttribute.java \
- sun/nio/fs/UnixFileStore.java \
- sun/nio/fs/UnixFileStoreAttributes.java \
- sun/nio/fs/UnixFileSystem.java \
- sun/nio/fs/UnixFileSystemProvider.java \
- sun/nio/fs/UnixMountEntry.java \
- sun/nio/fs/UnixNativeDispatcher.java \
- sun/nio/fs/UnixPath.java \
- sun/nio/fs/UnixSecureDirectoryStream.java \
- sun/nio/fs/UnixUriUtils.java \
- sun/nio/fs/UnixUserPrincipals.java
-
-FILES_c += \
- EPoll.c \
- EPollArrayWrapper.c \
- EPollPort.c \
- InheritedChannel.c \
- NativeThread.c \
- PollArrayWrapper.c \
- UnixAsynchronousServerSocketChannelImpl.c \
- UnixAsynchronousSocketChannelImpl.c \
- \
- GnomeFileTypeDetector.c \
- MagicFileTypeDetector.c \
- LinuxNativeDispatcher.c \
- LinuxWatchService.c \
- UnixCopyFile.c \
- UnixNativeDispatcher.c
-
-FILES_export += \
- sun/nio/ch/EPoll.java \
- sun/nio/ch/EPollArrayWrapper.java \
- sun/nio/ch/EPollPort.java \
- sun/nio/ch/InheritedChannel.java \
- sun/nio/ch/NativeThread.java \
- sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
- sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
- \
- sun/nio/fs/GnomeFileTypeDetector.java \
- sun/nio/fs/MagicFileTypeDetector.java \
- sun/nio/fs/LinuxNativeDispatcher.java \
- sun/nio/fs/LinuxWatchService.java \
- sun/nio/fs/UnixCopyFile.java \
- sun/nio/fs/UnixNativeDispatcher.java
-
-FILES_gen += \
- sun/nio/fs/UnixConstants.java
-endif # PLATFORM = linux
-
-ifeq ($(PLATFORM), macosx)
-FILES_java += \
- sun/nio/ch/AbstractPollSelectorImpl.java \
- sun/nio/ch/BsdAsynchronousChannelProvider.java \
- sun/nio/ch/InheritedChannel.java \
- sun/nio/ch/KQueue.java \
- sun/nio/ch/KQueuePort.java \
- sun/nio/ch/PollSelectorProvider.java \
- sun/nio/ch/PollSelectorImpl.java \
- sun/nio/ch/Port.java \
- sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
- sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
- sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
- \
- sun/nio/fs/MimeTypesFileTypeDetector.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/nio/fs/PollingWatchService.java \
- sun/nio/fs/UnixChannelFactory.java \
- sun/nio/fs/UnixCopyFile.java \
- sun/nio/fs/UnixDirectoryStream.java \
- sun/nio/fs/UnixException.java \
- sun/nio/fs/UnixFileAttributeViews.java \
- sun/nio/fs/UnixFileAttributes.java \
- sun/nio/fs/UnixFileKey.java \
- sun/nio/fs/UnixFileModeAttribute.java \
- sun/nio/fs/UnixFileStore.java \
- sun/nio/fs/UnixFileStoreAttributes.java \
- sun/nio/fs/UnixFileSystem.java \
- sun/nio/fs/UnixFileSystemProvider.java \
- sun/nio/fs/UnixMountEntry.java \
- sun/nio/fs/UnixNativeDispatcher.java \
- sun/nio/fs/UnixPath.java \
- sun/nio/fs/UnixSecureDirectoryStream.java \
- sun/nio/fs/UnixUriUtils.java \
- sun/nio/fs/UnixUserPrincipals.java
-
-FILES_c += \
- InheritedChannel.c \
- NativeThread.c \
- PollArrayWrapper.c \
- UnixAsynchronousServerSocketChannelImpl.c \
- UnixAsynchronousSocketChannelImpl.c \
- \
- BsdNativeDispatcher.c \
- MacOSXNativeDispatcher.c \
- UnixCopyFile.c \
- UnixNativeDispatcher.c \
- \
- KQueue.c \
- KQueuePort.c
-
-FILES_export += \
- sun/nio/ch/InheritedChannel.java \
- sun/nio/ch/KQueue.java \
- sun/nio/ch/KQueuePort.java \
- sun/nio/ch/NativeThread.java \
- sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
- sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
- \
- sun/nio/fs/BsdNativeDispatcher.java \
- sun/nio/fs/UnixCopyFile.java \
- sun/nio/fs/UnixNativeDispatcher.java
-
-FILES_gen += \
- sun/nio/fs/UnixConstants.java
-endif # PLATFORM = bsd, macosx
-
-ifeq ($(PLATFORM), macosx)
-FILES_java += \
- sun/nio/ch/KQueueSelectorProvider.java \
- sun/nio/ch/KQueueSelectorImpl.java \
- sun/nio/ch/KQueueArrayWrapper.java
-
-FILES_c += \
- KQueueArrayWrapper.c
-
-vpath %.c $(call NativeSrcDirList,,native/sun/nio/fs)
-vpath %.c $(call NativeSrcDirList,,native/sun/nio/ch)
-
-else
-
-#
-# Find platform-specific C source files
-#
-vpath %.c $(PLATFORM_SRC)/native/sun/nio/fs
-vpath %.c $(PLATFORM_SRC)/native/sun/nio/ch
-vpath %.c $(SHARE_SRC)/native/sun/nio/ch
-
-endif # PLATFORM = macosx
-
-#
-# Various variables
-#
-
-JAVALIB = # Don't self-link
-
-#
-# Access to io_util.c and net_util.c
-#
-
-OTHER_INCLUDES += \
- -I$(SHARE_SRC)/native/sun/nio/ch \
- -I$(SHARE_SRC)/native/java/io \
- -I$(SHARE_SRC)/native/java/net \
- -I$(PLATFORM_SRC)/native/java/net \
- -I$(CLASSHDRDIR)/../../../java.lang/java/CClassHeaders
-
-ifeq ($(PLATFORM),windows)
- OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \
- -libpath:$(LIBDIR) java.lib \
- $(OBJDIR)/../../../../sun/java.net/net/$(OBJDIRNAME)/net.lib
-endif
-ifeq ($(PLATFORM), linux)
-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
-endif
-ifeq ($(PLATFORM), macosx)
-OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread -framework CoreFoundation
-endif
-ifeq ($(PLATFORM), solaris)
-OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \
- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
-endif # PLATFORM
-
-#
-# Rules
-#
-
-build: sources
-
-clean clobber::
- $(RM) -r $(NIO_GEN) $(SNIO_GEN)
- $(RM) -r $(CLASSDESTDIR)/java/nio
- $(RM) -r $(CLASSDESTDIR)/sun/nio
-
-ifeq ($(PLATFORM), solaris)
-FILES_m = mapfile-solaris
-endif
-ifeq ($(PLATFORM), linux)
-FILES_m = mapfile-linux
-endif
-ifeq ($(PLATFORM), macosx)
-FILES_m = mapfile-bsd
-endif
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Generate source files
-#
-
-SPP_JARFILE = $(BUILDTOOLJARDIR)/spp.jar
-SPP_CMD = $(BOOT_JAVA_CMD) -jar $(SPP_JARFILE)
-
-FILES_genout = $(FILES_gen:%.java=$(GENSRCDIR)/%.java)
-
-BUF_SRC=$(NIO_SRC)
-CH_SRC=$(NIO_SRC)/channels
-CS_SRC=$(NIO_SRC)/charset
-SCH_SRC=$(SNIO_SRC)/ch
-SCS_SRC=$(SNIO_SRC)/cs
-SFS_SRC=$(SNIO_SRC)/fs
-
-# Template files
-HEAP_X_BUF_TEMPLATE=$(BUF_SRC)/Heap-X-Buffer.java.template
-BYTE_X_BUF_TEMPLATE=$(BUF_SRC)/ByteBufferAs-X-Buffer.java.template
-X_BUF_TEMPLATE=$(BUF_SRC)/X-Buffer.java.template
-X_BUF_BIN_TEMPLATE=$(BUF_SRC)/X-Buffer-bin.java.template
-DIRECT_X_BUF_TEMPLATE=$(BUF_SRC)/Direct-X-Buffer.java.template
-DIRECT_X_BUF_BIN_TEMPLATE=$(BUF_SRC)/Direct-X-Buffer-bin.java.template
-CHARSET_X_CODER_TEMPLATE=$(CS_SRC)/Charset-X-Coder.java.template
-
-BUF_GEN=$(NIO_GEN)
-CH_GEN=$(NIO_GEN)/channels
-CS_GEN=$(NIO_GEN)/charset
-SCH_GEN=$(SNIO_GEN)/ch
-SCS_GEN=$(SNIO_GEN)/cs
-SFS_GEN=$(SNIO_GEN)/fs
-
-FILES_gensbcs_out = $(FILES_gen_sbcs:%.java=$(GENSRCDIR)/%.java)
-
-sources: $(SPP_JARFILE) $(FILES_genout) $(FILES_gensbcs_out)
-
-#
-# Generated buffer classes
-#
-
-GEN_BUFFER_SH = genBuffer.sh
-
-GEN_BUFFER_CMD = SPP="$(SPP_CMD)" NAWK="$(NAWK)" SED="$(SED)" SH="$(SH)" \
- $(SH) $(GEN_BUFFER_SH)
-
-# Public abstract buffer classes
-#
-$(BUF_GEN)/ByteBuffer.java: $(X_BUF_TEMPLATE) \
- $(X_BUF_BIN_TEMPLATE) \
- $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=byte BIN=1 SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/CharBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=char SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ShortBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=short SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/IntBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=int SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/LongBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=long SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/FloatBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=float SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DoubleBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=double SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-
-# Buffers whose contents are heap-allocated
-#
-$(BUF_GEN)/HeapByteBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=byte SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapByteBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=byte RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapCharBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=char SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapCharBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=char RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapShortBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=short SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapShortBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=short RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapIntBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=int SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapIntBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=int RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapLongBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=long SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapLongBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=long RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapFloatBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=float SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapFloatBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=float RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapDoubleBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=double SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/HeapDoubleBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=double RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-
-# Direct byte buffer
-#
-$(BUF_GEN)/DirectByteBuffer.java: $(DIRECT_X_BUF_TEMPLATE) \
- $(DIRECT_X_BUF_TEMPLATE) \
- $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=byte BIN=1 SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectByteBuffer%.java: $(DIRECT_X_BUF_TEMPLATE) \
- $(DIRECT_X_BUF_TEMPLATE) \
- $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=byte RW=$* BIN=1 SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-
-# Unswapped views of direct byte buffers
-#
-$(BUF_GEN)/DirectCharBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=char BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectCharBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=char RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectShortBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=short BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectShortBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=short RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectIntBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=int BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectIntBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=int RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectLongBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=long BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectLongBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=long RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectFloatBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=float BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectFloatBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=float RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectDoubleBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=double BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectDoubleBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=double RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-
-# Swapped views of direct byte buffers
-#
-$(BUF_GEN)/DirectCharBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=char BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectCharBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=char RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectShortBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=short BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectShortBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=short RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectIntBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=int BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectIntBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=int RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectLongBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=long BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectLongBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=long RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectFloatBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=float BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectFloatBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=float RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectDoubleBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=double BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/DirectDoubleBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=double RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-
-# Big-endian views of byte buffers
-#
-$(BUF_GEN)/ByteBufferAsCharBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=char BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsCharBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=char RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsShortBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=short BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsShortBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=short RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsIntBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=int BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsIntBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=int RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsLongBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=long BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsLongBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=long RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsFloatBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=float BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsFloatBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=float RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsDoubleBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=double BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsDoubleBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=double RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-
-# Little-endian views of byte buffers
-#
-$(BUF_GEN)/ByteBufferAsCharBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=char BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsCharBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=char RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsShortBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=short BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsShortBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=short RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsIntBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=int BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsIntBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=int RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsLongBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=long BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsLongBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=long RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsFloatBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=float BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsFloatBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=float RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsDoubleBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=double BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-$(BUF_GEN)/ByteBufferAsDoubleBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH)
- $(prep-target)
- @$(RM) $@.temp
- TYPE=double RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD)
- $(MV) $@.temp $@
-
-#
-# Generated coder classes
-#
-
-GEN_CODER_SH = genCoder.sh
-
-GEN_CODER_CMD = SPP="$(SPP_CMD)" SED="$(SED)" NAWK="$(NAWK)" SH="$(SH)" $(SH) $(GEN_CODER_SH)
-
-$(CS_GEN)/CharsetDecoder.java: $(CHARSET_X_CODER_TEMPLATE) $(GEN_CODER_SH)
- $(prep-target)
- @$(RM) $@.temp
- $(GEN_CODER_CMD) decoder $< $@.temp
- $(MV) $@.temp $@
-
-$(CS_GEN)/CharsetEncoder.java: $(CHARSET_X_CODER_TEMPLATE) $(GEN_CODER_SH)
- $(prep-target)
- @$(RM) $@.temp
- $(GEN_CODER_CMD) encoder $< $@.temp
- $(MV) $@.temp $@
-
-#
-# Generated exception classes
-#
-
-GEN_EX_SH = genExceptions.sh
-
-GEN_EX_CMD = NAWK="$(NAWK)" SH="$(SH)" $(SH) $(GEN_EX_SH)
-
-$(CH_GEN)/%Exception.java: genExceptions.sh $(CH_SRC)/exceptions
- $(prep-target)
- @$(RM) $@.temp
- $(GEN_EX_CMD) $(CH_SRC)/exceptions $(CH_GEN)
-
-$(CS_GEN)/%Exception.java: genExceptions.sh $(CS_SRC)/exceptions
- $(prep-target)
- @$(RM) $@.temp
- $(GEN_EX_CMD) $(CS_SRC)/exceptions $(CS_GEN)
-
-$(BUF_GEN)/%Exception.java: genExceptions.sh $(BUF_SRC)/exceptions
- $(prep-target)
- @$(RM) $@.temp
- $(GEN_EX_CMD) $(BUF_SRC)/exceptions $(BUF_GEN)
-
-#
-# Generated charset-provider classes
-#
-
-HASHER_JARFILE = $(BUILDTOOLJARDIR)/hasher.jar
-
-$(SCS_GEN)/StandardCharsets.java: genCharsetProvider.sh \
- $(HASHER_JARFILE) $(SCS_SRC)/standard-charsets
- $(prep-target)
- @$(RM) $@.temp
- NAWK="$(NAWK)" TEMPDIR="$(TEMPDIR)" SH="$(SH)" \
- HASHER="$(BOOT_JAVA_CMD) -jar $(HASHER_JARFILE)" \
- $(SH) -e genCharsetProvider.sh $(SCS_SRC)/standard-charsets $(SCS_GEN)
-
-#
-# Generated channel implementation classes.
-# C source is compiled in TEMPDIR to avoid turds left by Windows compilers.
-#
-
-GENSOR_SRC = $(SHARE_SRC)/native/sun/nio/ch/genSocketOptionRegistry.c
-
-GENSOR_EXE = $(TEMPDIR)/genSocketOptionRegistry$(EXE_SUFFIX)
-
-SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSOR_SRC) | \
- $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
-
-$(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC)
- $(install-file)
-
-ifeq ($(PLATFORM), macosx)
- NIO_CC=$(HOST_CC)
-else
- NIO_CC=$(CC)
-endif
-
-$(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
- $(prep-target)
- ($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \
- -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC))
-
-ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
-$(SCH_GEN)/SocketOptionRegistry.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/ch/SocketOptionRegistry-$(PLATFORM)-$(ARCH).java
- $(prep-target)
- $(CP) $< $@
-else
-$(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
- $(prep-target)
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@
- $(GENSOR_EXE) >> $@
-endif
-#
-# Generated sun.nio.cs SingleByte classes
-#
-GENCSSRC = $(BUILDDIR)/tools/CharsetMapping
-CHARSETMAPPING_JARFILE = $(BUILDTOOLJARDIR)/charsetmapping.jar
-
-$(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java.template $(GENCSSRC)/sbcs
- @$(prep-target)
- $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSSRC) $(SCS_GEN) sbcs
-
-#
-# Generated file system implementation classes (Unix only)
-#
-
-GENUC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genUnixConstants.c
-
-GENUC_OBJ = $(TEMPDIR)/genUnixConstants.o
-GENUC_EXE = $(TEMPDIR)/genUnixConstants
-
-GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \
- $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
-
-$(GENUC_EXE) : $(GENUC_SRC)
- $(prep-target)
- $(CC) $(CPPFLAGS) -c -o $(GENUC_OBJ) $(GENUC_SRC)
- $(CC) $(CPPFLAGS) -o $@ $(GENUC_OBJ)
-
-ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
-$(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java
- $(prep-target)
- $(CP) $< $@
-else
-$(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
- $(prep-target)
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@
- $(GENUC_EXE) >> $@
-endif
-
-GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
-
-GENSC_OBJ = $(TEMPDIR)/genSolarisConstants.o
-GENSC_EXE = $(TEMPDIR)/genSolarisConstants
-
-GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \
- $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
-
-$(GENSC_EXE) : $(GENSC_SRC)
- $(prep-target)
- $(CC) $(CPPFLAGS) -c -o $(GENSC_OBJ) $(GENSC_SRC)
- $(CC) $(CPPFLAGS) -o $@ $(GENSC_OBJ)
-
-ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
-$(SFS_GEN)/SolarisConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java
- $(prep-target)
- $(CP) $< $@
-else
-$(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE)
- $(prep-target)
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@
- $(GENSC_EXE) >> $@
-endif
-
-.PHONY: sources
diff --git a/jdk/make/java/nio/addNotices.sh b/jdk/make/java/nio/addNotices.sh
deleted file mode 100644
index 4bb1ace..0000000
--- a/jdk/make/java/nio/addNotices.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Parse the first contiguous comment block in this script and generate
-# 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"
-
-cat <<__END__
-/*
-__END__
-
-if [ "x$COPYRIGHT_YEARS" != x ]; then
- cat <<__END__
- * Copyright (c) $COPYRIGHT_YEARS Oracle and/or its affiliates. All rights reserved.
-__END__
-fi
-
-$NAWK ' /^#.*Copyright.*Oracle/ { next }
- /^#([^!]|$)/ { sub(/^#/, " *"); print }
- /^$/ { print " */"; exit } ' $0
diff --git a/jdk/make/java/nio/genBuffer.sh b/jdk/make/java/nio/genBuffer.sh
deleted file mode 100644
index 91e6f7e..0000000
--- a/jdk/make/java/nio/genBuffer.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generate concrete buffer classes
-
-# Required environment variables
-# NAWK SED SPP To invoke tools
-# TYPE Primitive type
-# SRC Source file
-# DST Destination file
-#
-# Optional environment variables
-# RW Mutability: R(ead only), W(ritable)
-# BO Byte order: B(ig), L(ittle), S(wapped), U(nswapped)
-# BIN Defined => generate binary-data access methods
-
-type=$TYPE
-rw=$RW
-rwkey=XX
-
-case $type in
- char) fulltype=character;;
- int) fulltype=integer;;
- *) fulltype=$type;;
-esac
-
-case $type in
- byte) LBPV=0;;
- char | short) LBPV=1;;
- int | float) LBPV=2;;
- long | double) LBPV=3;;
-esac
-
-case $type in
- float|double) floatingPointOrIntegralType=floatingPointType;;
- *) floatingPointOrIntegralType=integralType;;
-esac
-
-typesAndBits() {
-
- type="$1"; BO="$2"
- memtype=$type; swaptype=$type; frombits=; tobits=
-
- case $type in
- float) memtype=int
- if [ x$BO != xU ]; then
- swaptype=int
- fromBits=Float.intBitsToFloat
- toBits=Float.floatToRawIntBits
- fi;;
- double) memtype=long
- if [ x$BO != xU ]; then
- swaptype=long
- fromBits=Double.longBitsToDouble
- toBits=Double.doubleToRawLongBits
- fi;;
- esac
-
- echo memtype=$memtype swaptype=$swaptype fromBits=$fromBits toBits=$toBits
-
- echo $type $fulltype $memtype $swaptype \
- | $NAWK '{ type = $1; fulltype = $2; memtype = $3; swaptype = $4;
- x = substr(type, 1, 1);
- Type = toupper(x) substr(type, 2);
- Fulltype = toupper(x) substr(fulltype, 2);
- Memtype = toupper(substr(memtype, 1, 1)) substr(memtype, 2);
- Swaptype = toupper(substr(swaptype, 1, 1)) substr(swaptype, 2);
- printf("Type=%s x=%s Fulltype=%s Memtype=%s Swaptype=%s ",
- Type, x, Fulltype, Memtype, Swaptype); }'
-
- echo "swap=`if [ x$BO = xS ]; then echo Bits.swap; fi`"
-
-}
-
-eval `typesAndBits $type $BO`
-
-a=`if [ $type = int ]; then echo an; else echo a; fi`
-A=`if [ $type = int ]; then echo An; else echo A; fi`
-
-if [ "x$rw" = xR ]; then rwkey=ro; else rwkey=rw; fi
-
-set -e
-
-$SPP <$SRC >$DST \
- -K$type \
- -K$floatingPointOrIntegralType \
- -Dtype=$type \
- -DType=$Type \
- -Dfulltype=$fulltype \
- -DFulltype=$Fulltype \
- -Dx=$x \
- -Dmemtype=$memtype \
- -DMemtype=$Memtype \
- -DSwaptype=$Swaptype \
- -DfromBits=$fromBits \
- -DtoBits=$toBits \
- -DLG_BYTES_PER_VALUE=$LBPV \
- -DBYTES_PER_VALUE="(1 << $LBPV)" \
- -DBO=$BO \
- -Dswap=$swap \
- -DRW=$rw \
- -K$rwkey \
- -Da=$a \
- -DA=$A \
- -Kbo$BO
-
-if [ $BIN ]; then
-
- genBinOps() {
- type="$1"
- Type=`echo $1 | $NAWK '{ print toupper(substr($1, 1, 1)) substr($1, 2) }'`
- fulltype="$2"
- LBPV="$3"
- nbytes="$4"
- nbytesButOne="$5"
- a=`if [ $type = int ]; then echo an; else echo a; fi`
- src=$6
- eval `typesAndBits $type`
- $SPP <$src \
- -Dtype=$type \
- -DType=$Type \
- -Dfulltype=$fulltype \
- -Dmemtype=$memtype \
- -DMemtype=$Memtype \
- -DfromBits=$fromBits \
- -DtoBits=$toBits \
- -DLG_BYTES_PER_VALUE=$LBPV \
- -DBYTES_PER_VALUE="(1 << $LBPV)" \
- -Dnbytes=$nbytes \
- -DnbytesButOne=$nbytesButOne \
- -DRW=$rw \
- -K$rwkey \
- -Da=$a \
- -be
- }
-
- mv $DST $DST.tmp
- sed -e '/#BIN/,$d' <$DST.tmp >$DST
- rm -f $DST.tmp
- binops=`dirname $SRC`/`basename $SRC .java.template`-bin.java.template
- genBinOps char character 1 two one $binops >>$DST
- genBinOps short short 1 two one $binops >>$DST
- genBinOps int integer 2 four three $binops >>$DST
- genBinOps long long 3 eight seven $binops >>$DST
- genBinOps float float 2 four three $binops >>$DST
- genBinOps double double 3 eight seven $binops >>$DST
- echo '}' >>$DST
-
-fi
diff --git a/jdk/make/java/nio/genCharsetProvider.sh b/jdk/make/java/nio/genCharsetProvider.sh
deleted file mode 100644
index 1b0fe1a..0000000
--- a/jdk/make/java/nio/genCharsetProvider.sh
+++ /dev/null
@@ -1,131 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generate a charset provider class
-
-# Required environment variables
-# 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; }
-'`
-
-OUT=$DST/$CLASS.java
-echo '-->' $OUT
-
-
-# Header
-#
-
-$SH ./addNotices.sh "$COPYRIGHT_YEARS" > $OUT
-
-cat <<__END__ >>$OUT
-
-// -- This file was mechanically generated: Do not edit! -- //
-
-package $PKG;
-
-import java.nio.charset.*;
-
-
-public class $CLASS
- extends FastCharsetProvider
-{
-
-__END__
-
-
-# Alias tables
-#
-$NAWK <$SPEC >>$OUT '
- 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)
- 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;
- }
-'
-
-$NAWK <$SPEC >$TEMPDIR/classes '
- /^[ \t]*charset / {
- csn = $2; cln = $3;
- lcsn = tolower(csn);
- printf "%-20s \"%s\"\n", lcsn, cln;
- }
-'
-
-${HASHER} -i Aliases <$TEMPDIR/aliases >>$OUT
-${HASHER} -i Classes <$TEMPDIR/classes >>$OUT
-${HASHER} -i -e Cache -t Charset <$TEMPDIR/classes >>$OUT
-
-
-# Constructor
-#
-cat <<__END__ >>$OUT
- public $CLASS() {
- super("$PKG", new Aliases(), new Classes(), new Cache());
- }
-
-}
-__END__
diff --git a/jdk/make/java/nio/genCoder.sh b/jdk/make/java/nio/genCoder.sh
deleted file mode 100644
index 4a2668d..0000000
--- a/jdk/make/java/nio/genCoder.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generate charset coder and decoder classes
-
-# Environment variables required from make: SED SPP
-
-what=$1
-SRC=$2
-DST=$3
-
-if [ x$what = xdecoder ]; then
-
- echo ' '$SRC '--('$what')-->' $DST
- $SPP <$SRC >$DST \
- -K$what \
- -DA='A' \
- -Da='a' \
- -DCode='Decode' \
- -Dcode='decode' \
- -DitypesPhrase='bytes in a specific charset' \
- -DotypesPhrase='sixteen-bit Unicode characters' \
- -Ditype='byte' \
- -Dotype='character' \
- -DItype='Byte' \
- -DOtype='Char' \
- -Dcoder='decoder' \
- -DCoder='Decoder' \
- -Dcoding='decoding' \
- -DOtherCoder='Encoder' \
- -DreplTypeName='string' \
- -DdefaultRepl='"\\uFFFD"' \
- -DdefaultReplName='<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'
-
-elif [ x$what = xencoder ]; then
-
- echo ' '$SRC '--('$what')-->' $DST
- $SPP <$SRC >$DST \
- -K$what \
- -DA='An' \
- -Da='an' \
- -DCode='Encode' \
- -Dcode='encode' \
- -DitypesPhrase='sixteen-bit Unicode characters' \
- -DotypesPhrase='bytes in a specific charset' \
- -Ditype='character' \
- -Dotype='byte' \
- -DItype='Char' \
- -DOtype='Byte' \
- -Dcoder='encoder' \
- -DCoder='Encoder' \
- -Dcoding='encoding' \
- -DOtherCoder='Decoder' \
- -DreplTypeName='byte array' \
- -DdefaultRepl='new byte[] { (byte)'"'"\\?"'"' }' \
- -DdefaultReplName='<tt>{<\/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'
-
-else
- echo Illegal coder type: $what
- exit 1
-fi
diff --git a/jdk/make/java/nio/genExceptions.sh b/jdk/make/java/nio/genExceptions.sh
deleted file mode 100644
index 9839282..0000000
--- a/jdk/make/java/nio/genExceptions.sh
+++ /dev/null
@@ -1,110 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generate exception classes
-
-SPEC=$1
-DST=$2
-
-gen() {
- ID=$1
- WHAT=$2
- SVUID=$3
- ARG_TYPE=$4
- ARG_ID=$5
- ARG_PROP=$6
- ARG_PHRASE=$7
- ARG_PARAM="$ARG_TYPE$ $ARG_ID"
- echo '-->' $DST/$ID.java
- out=$DST/${ID}.java
-
- $SH ./addNotices.sh "$COPYRIGHT_YEARS" > $out
-
-cat >>$out <<__END__
-
-// -- This file was mechanically generated: Do not edit! -- //
-
-package $PACKAGE;
-
-
-/**$WHAT
- *
- * @since $SINCE
- */
-
-public `if [ ${ABSTRACT:-0} = 1 ];
- then echo 'abstract '; fi`class $ID
- extends ${SUPER}
-{
-
- private static final long serialVersionUID = $SVUID;
-__END__
-
- if [ $ARG_ID ]; then
-
- cat >>$out <<__END__
-
- private $ARG_TYPE $ARG_ID;
-
- /**
- * Constructs an instance of this class. </p>
- *
- * @param $ARG_ID
- * The $ARG_PHRASE
- */
- public $ID($ARG_TYPE $ARG_ID) {
- super(String.valueOf($ARG_ID));
- this.$ARG_ID = $ARG_ID;
- }
-
- /**
- * Retrieves the $ARG_PHRASE. </p>
- *
- * @return The $ARG_PHRASE
- */
- public $ARG_TYPE get$ARG_PROP() {
- return $ARG_ID;
- }
-
-}
-__END__
-
- else
-
- cat >>$out <<__END__
-
- /**
- * Constructs an instance of this class.
- */
- public $ID() { }
-
-}
-__END__
-
- fi
-}
-
-. $SPEC
diff --git a/jdk/make/java/nio/mapfile-bsd b/jdk/make/java/nio/mapfile-bsd
deleted file mode 100644
index e5a92d9..0000000
--- a/jdk/make/java/nio/mapfile-bsd
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-SUNWprivate_1.1 {
- global:
- Java_java_nio_MappedByteBuffer_force0;
- Java_java_nio_MappedByteBuffer_isLoaded0;
- Java_java_nio_MappedByteBuffer_load0;
- Java_sun_nio_ch_DatagramChannelImpl_disconnect0;
- Java_sun_nio_ch_DatagramChannelImpl_initIDs;
- Java_sun_nio_ch_DatagramChannelImpl_receive0;
- Java_sun_nio_ch_DatagramChannelImpl_send0;
- Java_sun_nio_ch_DatagramDispatcher_read0;
- Java_sun_nio_ch_DatagramDispatcher_readv0;
- Java_sun_nio_ch_DatagramDispatcher_write0;
- Java_sun_nio_ch_DatagramDispatcher_writev0;
- Java_sun_nio_ch_FileChannelImpl_close0;
- Java_sun_nio_ch_FileChannelImpl_initIDs;
- Java_sun_nio_ch_FileChannelImpl_map0;
- Java_sun_nio_ch_FileChannelImpl_position0;
- Java_sun_nio_ch_FileChannelImpl_transferTo0;
- Java_sun_nio_ch_FileChannelImpl_unmap0;
- Java_sun_nio_ch_FileDispatcherImpl_close0;
- Java_sun_nio_ch_FileDispatcherImpl_closeIntFD;
- Java_sun_nio_ch_FileDispatcherImpl_force0;
- Java_sun_nio_ch_FileDispatcherImpl_init;
- Java_sun_nio_ch_FileDispatcherImpl_lock0;
- Java_sun_nio_ch_FileDispatcherImpl_preClose0;
- Java_sun_nio_ch_FileDispatcherImpl_pread0;
- Java_sun_nio_ch_FileDispatcherImpl_pwrite0;
- Java_sun_nio_ch_FileDispatcherImpl_read0;
- Java_sun_nio_ch_FileDispatcherImpl_readv0;
- Java_sun_nio_ch_FileDispatcherImpl_release0;
- Java_sun_nio_ch_FileDispatcherImpl_size0;
- Java_sun_nio_ch_FileDispatcherImpl_truncate0;
- Java_sun_nio_ch_FileDispatcherImpl_write0;
- Java_sun_nio_ch_FileDispatcherImpl_writev0;
- Java_sun_nio_ch_FileKey_init;
- Java_sun_nio_ch_FileKey_initIDs;
- Java_sun_nio_ch_InheritedChannel_close0;
- Java_sun_nio_ch_InheritedChannel_dup;
- Java_sun_nio_ch_InheritedChannel_dup2;
- Java_sun_nio_ch_InheritedChannel_open0;
- Java_sun_nio_ch_InheritedChannel_peerAddress0;
- Java_sun_nio_ch_InheritedChannel_peerPort0;
- Java_sun_nio_ch_InheritedChannel_soType0;
- Java_sun_nio_ch_IOUtil_configureBlocking;
- Java_sun_nio_ch_IOUtil_drain;
- Java_sun_nio_ch_IOUtil_fdVal;
- Java_sun_nio_ch_IOUtil_initIDs;
- Java_sun_nio_ch_IOUtil_makePipe;
- Java_sun_nio_ch_IOUtil_randomBytes;
- Java_sun_nio_ch_IOUtil_setfdVal;
- Java_sun_nio_ch_KQueue_kqueue;
- Java_sun_nio_ch_KQueue_keventRegister;
- Java_sun_nio_ch_KQueue_keventPoll;
- Java_sun_nio_ch_KQueue_keventSize;
- Java_sun_nio_ch_KQueue_identOffset;
- Java_sun_nio_ch_KQueue_filterOffset;
- Java_sun_nio_ch_KQueue_flagsOffset;
- Java_sun_nio_ch_KQueuePort_socketpair;
- Java_sun_nio_ch_KQueuePort_interrupt;
- Java_sun_nio_ch_KQueuePort_drain1;
- Java_sun_nio_ch_KQueuePort_close0;
- Java_sun_nio_ch_NativeThread_current;
- Java_sun_nio_ch_NativeThread_init;
- Java_sun_nio_ch_NativeThread_signal;
- Java_sun_nio_ch_Net_canIPv6SocketJoinIPv4Group0;
- Java_sun_nio_ch_Net_canJoin6WithIPv4Group0;
- Java_sun_nio_ch_Net_socket0;
- Java_sun_nio_ch_Net_bind0;
- Java_sun_nio_ch_Net_connect0;
- Java_sun_nio_ch_Net_listen;
- Java_sun_nio_ch_Net_localPort;
- Java_sun_nio_ch_Net_localInetAddress;
- Java_sun_nio_ch_Net_getIntOption0;
- Java_sun_nio_ch_Net_setIntOption0;
- Java_sun_nio_ch_Net_initIDs;
- Java_sun_nio_ch_Net_isIPv6Available0;
- Java_sun_nio_ch_Net_joinOrDrop4;
- Java_sun_nio_ch_Net_blockOrUnblock4;
- Java_sun_nio_ch_Net_joinOrDrop6;
- Java_sun_nio_ch_Net_blockOrUnblock6;
- Java_sun_nio_ch_Net_setInterface4;
- Java_sun_nio_ch_Net_getInterface4;
- Java_sun_nio_ch_Net_setInterface6;
- Java_sun_nio_ch_Net_getInterface6;
- Java_sun_nio_ch_Net_shutdown;
- Java_sun_nio_ch_Net_poll;
- Java_sun_nio_ch_Net_isExclusiveBindAvailable;
- Java_sun_nio_ch_PollArrayWrapper_interrupt;
- Java_sun_nio_ch_PollArrayWrapper_poll0;
- Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
- Java_sun_nio_ch_ServerSocketChannelImpl_initIDs;
- Java_sun_nio_ch_SocketChannelImpl_checkConnect;
- Java_sun_nio_ch_SocketChannelImpl_sendOutOfBandData;
- Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_accept0;
- Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_initIDs;
- Java_sun_nio_ch_UnixAsynchronousSocketChannelImpl_checkConnect;
- Java_sun_nio_fs_BsdNativeDispatcher_initIDs;
- Java_sun_nio_fs_BsdNativeDispatcher_getfsstat;
- Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry;
- Java_sun_nio_fs_BsdNativeDispatcher_endfsstat;
- Java_sun_nio_fs_UnixNativeDispatcher_init;
- Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
- Java_sun_nio_fs_UnixNativeDispatcher_strerror;
- Java_sun_nio_fs_UnixNativeDispatcher_dup;
- Java_sun_nio_fs_UnixNativeDispatcher_access0;
- Java_sun_nio_fs_UnixNativeDispatcher_stat0;
- Java_sun_nio_fs_UnixNativeDispatcher_lstat0;
- Java_sun_nio_fs_UnixNativeDispatcher_fstat;
- Java_sun_nio_fs_UnixNativeDispatcher_fstatat0;
- Java_sun_nio_fs_UnixNativeDispatcher_chmod0;
- Java_sun_nio_fs_UnixNativeDispatcher_fchmod;
- Java_sun_nio_fs_UnixNativeDispatcher_chown0;
- Java_sun_nio_fs_UnixNativeDispatcher_lchown0;
- Java_sun_nio_fs_UnixNativeDispatcher_fchown;
- Java_sun_nio_fs_UnixNativeDispatcher_utimes0;
- Java_sun_nio_fs_UnixNativeDispatcher_futimes;
- Java_sun_nio_fs_UnixNativeDispatcher_open0;
- Java_sun_nio_fs_UnixNativeDispatcher_openat0;
- Java_sun_nio_fs_UnixNativeDispatcher_close;
- Java_sun_nio_fs_UnixNativeDispatcher_read;
- Java_sun_nio_fs_UnixNativeDispatcher_write;
- Java_sun_nio_fs_UnixNativeDispatcher_fopen0;
- Java_sun_nio_fs_UnixNativeDispatcher_fclose;
- Java_sun_nio_fs_UnixNativeDispatcher_opendir0;
- Java_sun_nio_fs_UnixNativeDispatcher_fdopendir;
- Java_sun_nio_fs_UnixNativeDispatcher_readdir;
- Java_sun_nio_fs_UnixNativeDispatcher_closedir;
- Java_sun_nio_fs_UnixNativeDispatcher_link0;
- Java_sun_nio_fs_UnixNativeDispatcher_unlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_unlinkat0;
- Java_sun_nio_fs_UnixNativeDispatcher_rename0;
- Java_sun_nio_fs_UnixNativeDispatcher_renameat0;
- Java_sun_nio_fs_UnixNativeDispatcher_mkdir0;
- Java_sun_nio_fs_UnixNativeDispatcher_rmdir0;
- Java_sun_nio_fs_UnixNativeDispatcher_symlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_readlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_realpath0;
- Java_sun_nio_fs_UnixNativeDispatcher_statvfs0;
- Java_sun_nio_fs_UnixNativeDispatcher_pathconf0;
- Java_sun_nio_fs_UnixNativeDispatcher_fpathconf;
- Java_sun_nio_fs_UnixNativeDispatcher_mknod0;
- Java_sun_nio_fs_UnixNativeDispatcher_getpwuid;
- Java_sun_nio_fs_UnixNativeDispatcher_getgrgid;
- Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0;
- Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0;
- Java_sun_nio_fs_UnixCopyFile_transfer;
- handleSocketError;
-
- local:
- *;
-};
diff --git a/jdk/make/java/nio/mapfile-linux b/jdk/make/java/nio/mapfile-linux
deleted file mode 100644
index e85bafa..0000000
--- a/jdk/make/java/nio/mapfile-linux
+++ /dev/null
@@ -1,202 +0,0 @@
-#
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-SUNWprivate_1.1 {
- global:
- Java_java_nio_MappedByteBuffer_force0;
- Java_java_nio_MappedByteBuffer_isLoaded0;
- Java_java_nio_MappedByteBuffer_load0;
- Java_sun_nio_ch_DatagramChannelImpl_disconnect0;
- Java_sun_nio_ch_DatagramChannelImpl_initIDs;
- Java_sun_nio_ch_DatagramChannelImpl_receive0;
- Java_sun_nio_ch_DatagramChannelImpl_send0;
- Java_sun_nio_ch_DatagramDispatcher_read0;
- Java_sun_nio_ch_DatagramDispatcher_readv0;
- Java_sun_nio_ch_DatagramDispatcher_write0;
- Java_sun_nio_ch_DatagramDispatcher_writev0;
- Java_sun_nio_ch_EPollArrayWrapper_epollCreate;
- Java_sun_nio_ch_EPollArrayWrapper_epollCtl;
- Java_sun_nio_ch_EPollArrayWrapper_epollWait;
- Java_sun_nio_ch_EPollArrayWrapper_init;
- Java_sun_nio_ch_EPollArrayWrapper_interrupt;
- Java_sun_nio_ch_EPollArrayWrapper_offsetofData;
- Java_sun_nio_ch_EPollArrayWrapper_sizeofEPollEvent;
- Java_sun_nio_ch_EPoll_eventSize;
- Java_sun_nio_ch_EPoll_eventsOffset;
- Java_sun_nio_ch_EPoll_dataOffset;
- Java_sun_nio_ch_EPoll_epollCreate;
- Java_sun_nio_ch_EPoll_epollCtl;
- Java_sun_nio_ch_EPoll_epollWait;
- Java_sun_nio_ch_EPollPort_close0;
- Java_sun_nio_ch_EPollPort_drain1;
- Java_sun_nio_ch_EPollPort_interrupt;
- Java_sun_nio_ch_EPollPort_socketpair;
- Java_sun_nio_ch_FileChannelImpl_close0;
- Java_sun_nio_ch_FileChannelImpl_initIDs;
- Java_sun_nio_ch_FileChannelImpl_map0;
- Java_sun_nio_ch_FileChannelImpl_position0;
- Java_sun_nio_ch_FileChannelImpl_transferTo0;
- Java_sun_nio_ch_FileChannelImpl_unmap0;
- Java_sun_nio_ch_FileDispatcherImpl_close0;
- Java_sun_nio_ch_FileDispatcherImpl_closeIntFD;
- Java_sun_nio_ch_FileDispatcherImpl_force0;
- Java_sun_nio_ch_FileDispatcherImpl_init;
- Java_sun_nio_ch_FileDispatcherImpl_lock0;
- Java_sun_nio_ch_FileDispatcherImpl_preClose0;
- Java_sun_nio_ch_FileDispatcherImpl_pread0;
- Java_sun_nio_ch_FileDispatcherImpl_pwrite0;
- Java_sun_nio_ch_FileDispatcherImpl_read0;
- Java_sun_nio_ch_FileDispatcherImpl_readv0;
- Java_sun_nio_ch_FileDispatcherImpl_release0;
- Java_sun_nio_ch_FileDispatcherImpl_size0;
- Java_sun_nio_ch_FileDispatcherImpl_truncate0;
- Java_sun_nio_ch_FileDispatcherImpl_write0;
- Java_sun_nio_ch_FileDispatcherImpl_writev0;
- Java_sun_nio_ch_FileKey_init;
- Java_sun_nio_ch_FileKey_initIDs;
- Java_sun_nio_ch_InheritedChannel_close0;
- Java_sun_nio_ch_InheritedChannel_dup;
- Java_sun_nio_ch_InheritedChannel_dup2;
- Java_sun_nio_ch_InheritedChannel_open0;
- Java_sun_nio_ch_InheritedChannel_peerAddress0;
- Java_sun_nio_ch_InheritedChannel_peerPort0;
- Java_sun_nio_ch_InheritedChannel_soType0;
- Java_sun_nio_ch_IOUtil_configureBlocking;
- Java_sun_nio_ch_IOUtil_drain;
- Java_sun_nio_ch_IOUtil_fdVal;
- Java_sun_nio_ch_IOUtil_fdLimit;
- Java_sun_nio_ch_IOUtil_initIDs;
- Java_sun_nio_ch_IOUtil_iovMax;
- Java_sun_nio_ch_IOUtil_makePipe;
- Java_sun_nio_ch_IOUtil_randomBytes;
- Java_sun_nio_ch_IOUtil_setfdVal;
- Java_sun_nio_ch_NativeThread_current;
- Java_sun_nio_ch_NativeThread_init;
- Java_sun_nio_ch_NativeThread_signal;
- Java_sun_nio_ch_Net_canIPv6SocketJoinIPv4Group0;
- Java_sun_nio_ch_Net_canJoin6WithIPv4Group0;
- Java_sun_nio_ch_Net_socket0;
- Java_sun_nio_ch_Net_bind0;
- Java_sun_nio_ch_Net_connect0;
- Java_sun_nio_ch_Net_listen;
- Java_sun_nio_ch_Net_localPort;
- Java_sun_nio_ch_Net_localInetAddress;
- Java_sun_nio_ch_Net_getIntOption0;
- Java_sun_nio_ch_Net_setIntOption0;
- Java_sun_nio_ch_Net_initIDs;
- Java_sun_nio_ch_Net_isIPv6Available0;
- Java_sun_nio_ch_Net_joinOrDrop4;
- Java_sun_nio_ch_Net_blockOrUnblock4;
- Java_sun_nio_ch_Net_joinOrDrop6;
- Java_sun_nio_ch_Net_blockOrUnblock6;
- Java_sun_nio_ch_Net_setInterface4;
- Java_sun_nio_ch_Net_getInterface4;
- Java_sun_nio_ch_Net_setInterface6;
- Java_sun_nio_ch_Net_getInterface6;
- Java_sun_nio_ch_Net_shutdown;
- Java_sun_nio_ch_Net_poll;
- Java_sun_nio_ch_Net_isExclusiveBindAvailable;
- Java_sun_nio_ch_PollArrayWrapper_interrupt;
- Java_sun_nio_ch_PollArrayWrapper_poll0;
- Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
- Java_sun_nio_ch_ServerSocketChannelImpl_initIDs;
- Java_sun_nio_ch_SocketChannelImpl_checkConnect;
- Java_sun_nio_ch_SocketChannelImpl_sendOutOfBandData;
- Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_accept0;
- Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_initIDs;
- Java_sun_nio_ch_UnixAsynchronousSocketChannelImpl_checkConnect;
- Java_sun_nio_fs_GnomeFileTypeDetector_initializeGio;
- Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio;
- Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
- Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGnomeVfs;
- Java_sun_nio_fs_MagicFileTypeDetector_initialize0;
- Java_sun_nio_fs_MagicFileTypeDetector_probe0;
- Java_sun_nio_fs_LinuxWatchService_eventSize;
- Java_sun_nio_fs_LinuxWatchService_eventOffsets;
- Java_sun_nio_fs_LinuxWatchService_inotifyInit;
- Java_sun_nio_fs_LinuxWatchService_inotifyAddWatch;
- Java_sun_nio_fs_LinuxWatchService_inotifyRmWatch;
- Java_sun_nio_fs_LinuxWatchService_configureBlocking;
- Java_sun_nio_fs_LinuxWatchService_socketpair;
- Java_sun_nio_fs_LinuxWatchService_poll;
- Java_sun_nio_fs_LinuxNativeDispatcher_init;
- Java_sun_nio_fs_LinuxNativeDispatcher_fgetxattr0;
- Java_sun_nio_fs_LinuxNativeDispatcher_flistxattr;
- Java_sun_nio_fs_LinuxNativeDispatcher_fsetxattr0;
- Java_sun_nio_fs_LinuxNativeDispatcher_fremovexattr0;
- Java_sun_nio_fs_LinuxNativeDispatcher_setmntent0;
- Java_sun_nio_fs_LinuxNativeDispatcher_getmntent;
- Java_sun_nio_fs_LinuxNativeDispatcher_endmntent;
- Java_sun_nio_fs_UnixNativeDispatcher_init;
- Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
- Java_sun_nio_fs_UnixNativeDispatcher_strerror;
- Java_sun_nio_fs_UnixNativeDispatcher_dup;
- Java_sun_nio_fs_UnixNativeDispatcher_access0;
- Java_sun_nio_fs_UnixNativeDispatcher_stat0;
- Java_sun_nio_fs_UnixNativeDispatcher_lstat0;
- Java_sun_nio_fs_UnixNativeDispatcher_fstat;
- Java_sun_nio_fs_UnixNativeDispatcher_fstatat0;
- Java_sun_nio_fs_UnixNativeDispatcher_chmod0;
- Java_sun_nio_fs_UnixNativeDispatcher_fchmod;
- Java_sun_nio_fs_UnixNativeDispatcher_chown0;
- Java_sun_nio_fs_UnixNativeDispatcher_lchown0;
- Java_sun_nio_fs_UnixNativeDispatcher_fchown;
- Java_sun_nio_fs_UnixNativeDispatcher_utimes0;
- Java_sun_nio_fs_UnixNativeDispatcher_futimes;
- Java_sun_nio_fs_UnixNativeDispatcher_open0;
- Java_sun_nio_fs_UnixNativeDispatcher_openat0;
- Java_sun_nio_fs_UnixNativeDispatcher_close;
- Java_sun_nio_fs_UnixNativeDispatcher_read;
- Java_sun_nio_fs_UnixNativeDispatcher_write;
- Java_sun_nio_fs_UnixNativeDispatcher_fopen0;
- Java_sun_nio_fs_UnixNativeDispatcher_fclose;
- Java_sun_nio_fs_UnixNativeDispatcher_opendir0;
- Java_sun_nio_fs_UnixNativeDispatcher_fdopendir;
- Java_sun_nio_fs_UnixNativeDispatcher_readdir;
- Java_sun_nio_fs_UnixNativeDispatcher_closedir;
- Java_sun_nio_fs_UnixNativeDispatcher_link0;
- Java_sun_nio_fs_UnixNativeDispatcher_unlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_unlinkat0;
- Java_sun_nio_fs_UnixNativeDispatcher_rename0;
- Java_sun_nio_fs_UnixNativeDispatcher_renameat0;
- Java_sun_nio_fs_UnixNativeDispatcher_mkdir0;
- Java_sun_nio_fs_UnixNativeDispatcher_rmdir0;
- Java_sun_nio_fs_UnixNativeDispatcher_symlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_readlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_realpath0;
- Java_sun_nio_fs_UnixNativeDispatcher_statvfs0;
- Java_sun_nio_fs_UnixNativeDispatcher_pathconf0;
- Java_sun_nio_fs_UnixNativeDispatcher_fpathconf;
- Java_sun_nio_fs_UnixNativeDispatcher_mknod0;
- Java_sun_nio_fs_UnixNativeDispatcher_getpwuid;
- Java_sun_nio_fs_UnixNativeDispatcher_getgrgid;
- Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0;
- Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0;
- Java_sun_nio_fs_UnixCopyFile_transfer;
- handleSocketError;
-
- local:
- *;
-};
diff --git a/jdk/make/java/nio/mapfile-solaris b/jdk/make/java/nio/mapfile-solaris
deleted file mode 100644
index 3a610ed..0000000
--- a/jdk/make/java/nio/mapfile-solaris
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-SUNWprivate_1.1 {
- global:
- Java_java_nio_MappedByteBuffer_force0;
- Java_java_nio_MappedByteBuffer_isLoaded0;
- Java_java_nio_MappedByteBuffer_load0;
- Java_sun_nio_ch_DatagramChannelImpl_disconnect0;
- Java_sun_nio_ch_DatagramChannelImpl_initIDs;
- Java_sun_nio_ch_DatagramChannelImpl_receive0;
- Java_sun_nio_ch_DatagramChannelImpl_send0;
- Java_sun_nio_ch_DatagramDispatcher_read0;
- Java_sun_nio_ch_DatagramDispatcher_readv0;
- Java_sun_nio_ch_DatagramDispatcher_write0;
- Java_sun_nio_ch_DatagramDispatcher_writev0;
- Java_sun_nio_ch_DevPollArrayWrapper_init;
- Java_sun_nio_ch_DevPollArrayWrapper_interrupt;
- Java_sun_nio_ch_DevPollArrayWrapper_poll0;
- Java_sun_nio_ch_DevPollArrayWrapper_register;
- Java_sun_nio_ch_DevPollArrayWrapper_registerMultiple;
- Java_sun_nio_ch_FileChannelImpl_close0;
- Java_sun_nio_ch_FileChannelImpl_initIDs;
- Java_sun_nio_ch_FileChannelImpl_map0;
- Java_sun_nio_ch_FileChannelImpl_position0;
- Java_sun_nio_ch_FileChannelImpl_transferTo0;
- Java_sun_nio_ch_FileChannelImpl_unmap0;
- Java_sun_nio_ch_FileDispatcherImpl_close0;
- Java_sun_nio_ch_FileDispatcherImpl_closeIntFD;
- Java_sun_nio_ch_FileDispatcherImpl_force0;
- Java_sun_nio_ch_FileDispatcherImpl_init;
- Java_sun_nio_ch_FileDispatcherImpl_lock0;
- Java_sun_nio_ch_FileDispatcherImpl_preClose0;
- Java_sun_nio_ch_FileDispatcherImpl_pread0;
- Java_sun_nio_ch_FileDispatcherImpl_pwrite0;
- Java_sun_nio_ch_FileDispatcherImpl_read0;
- Java_sun_nio_ch_FileDispatcherImpl_readv0;
- Java_sun_nio_ch_FileDispatcherImpl_release0;
- Java_sun_nio_ch_FileDispatcherImpl_size0;
- Java_sun_nio_ch_FileDispatcherImpl_truncate0;
- Java_sun_nio_ch_FileDispatcherImpl_write0;
- Java_sun_nio_ch_FileDispatcherImpl_writev0;
- Java_sun_nio_ch_FileKey_init;
- Java_sun_nio_ch_FileKey_initIDs;
- Java_sun_nio_ch_InheritedChannel_close0;
- Java_sun_nio_ch_InheritedChannel_dup;
- Java_sun_nio_ch_InheritedChannel_dup2;
- Java_sun_nio_ch_InheritedChannel_open0;
- Java_sun_nio_ch_InheritedChannel_peerAddress0;
- Java_sun_nio_ch_InheritedChannel_peerPort0;
- Java_sun_nio_ch_InheritedChannel_soType0;
- Java_sun_nio_ch_IOUtil_configureBlocking;
- Java_sun_nio_ch_IOUtil_drain;
- Java_sun_nio_ch_IOUtil_fdLimit;
- Java_sun_nio_ch_IOUtil_fdVal;
- Java_sun_nio_ch_IOUtil_initIDs;
- Java_sun_nio_ch_IOUtil_iovMax;
- Java_sun_nio_ch_IOUtil_makePipe;
- Java_sun_nio_ch_IOUtil_randomBytes;
- Java_sun_nio_ch_IOUtil_setfdVal;
- Java_sun_nio_ch_NativeThread_current;
- Java_sun_nio_ch_NativeThread_init;
- Java_sun_nio_ch_NativeThread_signal;
- Java_sun_nio_ch_Net_canIPv6SocketJoinIPv4Group0;
- Java_sun_nio_ch_Net_canJoin6WithIPv4Group0;
- Java_sun_nio_ch_Net_socket0;
- Java_sun_nio_ch_Net_bind0;
- Java_sun_nio_ch_Net_connect0;
- Java_sun_nio_ch_Net_listen;
- Java_sun_nio_ch_Net_localPort;
- Java_sun_nio_ch_Net_localInetAddress;
- Java_sun_nio_ch_Net_getIntOption0;
- Java_sun_nio_ch_Net_setIntOption0;
- Java_sun_nio_ch_Net_initIDs;
- Java_sun_nio_ch_Net_isIPv6Available0;
- Java_sun_nio_ch_Net_joinOrDrop4;
- Java_sun_nio_ch_Net_blockOrUnblock4;
- Java_sun_nio_ch_Net_joinOrDrop6;
- Java_sun_nio_ch_Net_blockOrUnblock6;
- Java_sun_nio_ch_Net_setInterface4;
- Java_sun_nio_ch_Net_getInterface4;
- Java_sun_nio_ch_Net_setInterface6;
- Java_sun_nio_ch_Net_getInterface6;
- Java_sun_nio_ch_Net_shutdown;
- Java_sun_nio_ch_Net_poll;
- Java_sun_nio_ch_Net_isExclusiveBindAvailable;
- Java_sun_nio_ch_PollArrayWrapper_interrupt;
- Java_sun_nio_ch_PollArrayWrapper_poll0;
- Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
- Java_sun_nio_ch_ServerSocketChannelImpl_initIDs;
- Java_sun_nio_ch_SocketChannelImpl_checkConnect;
- Java_sun_nio_ch_SocketChannelImpl_sendOutOfBandData;
- Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_accept0;
- Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_initIDs;
- Java_sun_nio_ch_UnixAsynchronousSocketChannelImpl_checkConnect;
- Java_sun_nio_ch_SolarisEventPort_port_1create;
- Java_sun_nio_ch_SolarisEventPort_port_1close;
- Java_sun_nio_ch_SolarisEventPort_port_1associate;
- Java_sun_nio_ch_SolarisEventPort_port_1dissociate;
- Java_sun_nio_ch_SolarisEventPort_port_1get;
- Java_sun_nio_ch_SolarisEventPort_port_1getn;
- Java_sun_nio_ch_SolarisEventPort_port_1send;
- Java_sun_nio_fs_GnomeFileTypeDetector_initializeGio;
- Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio;
- Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
- Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGnomeVfs;
- Java_sun_nio_fs_UnixNativeDispatcher_init;
- Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
- Java_sun_nio_fs_UnixNativeDispatcher_strerror;
- Java_sun_nio_fs_UnixNativeDispatcher_dup;
- Java_sun_nio_fs_UnixNativeDispatcher_access0;
- Java_sun_nio_fs_UnixNativeDispatcher_stat0;
- Java_sun_nio_fs_UnixNativeDispatcher_lstat0;
- Java_sun_nio_fs_UnixNativeDispatcher_fstat;
- Java_sun_nio_fs_UnixNativeDispatcher_fstatat0;
- Java_sun_nio_fs_UnixNativeDispatcher_chmod0;
- Java_sun_nio_fs_UnixNativeDispatcher_fchmod;
- Java_sun_nio_fs_UnixNativeDispatcher_chown0;
- Java_sun_nio_fs_UnixNativeDispatcher_lchown0;
- Java_sun_nio_fs_UnixNativeDispatcher_fchown;
- Java_sun_nio_fs_UnixNativeDispatcher_utimes0;
- Java_sun_nio_fs_UnixNativeDispatcher_futimes;
- Java_sun_nio_fs_UnixNativeDispatcher_open0;
- Java_sun_nio_fs_UnixNativeDispatcher_openat0;
- Java_sun_nio_fs_UnixNativeDispatcher_close;
- Java_sun_nio_fs_UnixNativeDispatcher_read;
- Java_sun_nio_fs_UnixNativeDispatcher_write;
- Java_sun_nio_fs_UnixNativeDispatcher_fopen0;
- Java_sun_nio_fs_UnixNativeDispatcher_fclose;
- Java_sun_nio_fs_UnixNativeDispatcher_opendir0;
- Java_sun_nio_fs_UnixNativeDispatcher_fdopendir;
- Java_sun_nio_fs_UnixNativeDispatcher_readdir;
- Java_sun_nio_fs_UnixNativeDispatcher_closedir;
- Java_sun_nio_fs_UnixNativeDispatcher_link0;
- Java_sun_nio_fs_UnixNativeDispatcher_unlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_unlinkat0;
- Java_sun_nio_fs_UnixNativeDispatcher_rename0;
- Java_sun_nio_fs_UnixNativeDispatcher_renameat0;
- Java_sun_nio_fs_UnixNativeDispatcher_mkdir0;
- Java_sun_nio_fs_UnixNativeDispatcher_rmdir0;
- Java_sun_nio_fs_UnixNativeDispatcher_symlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_readlink0;
- Java_sun_nio_fs_UnixNativeDispatcher_realpath0;
- Java_sun_nio_fs_UnixNativeDispatcher_statvfs0;
- Java_sun_nio_fs_UnixNativeDispatcher_pathconf0;
- Java_sun_nio_fs_UnixNativeDispatcher_fpathconf;
- Java_sun_nio_fs_UnixNativeDispatcher_mknod0;
- Java_sun_nio_fs_UnixNativeDispatcher_getpwuid;
- Java_sun_nio_fs_UnixNativeDispatcher_getgrgid;
- Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0;
- Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0;
- Java_sun_nio_fs_UnixCopyFile_transfer;
- Java_sun_nio_fs_SolarisNativeDispatcher_init;
- Java_sun_nio_fs_SolarisNativeDispatcher_facl;
- Java_sun_nio_fs_SolarisNativeDispatcher_getextmntent;
- Java_sun_nio_fs_SolarisWatchService_init;
- Java_sun_nio_fs_SolarisWatchService_portCreate;
- Java_sun_nio_fs_SolarisWatchService_portAssociate;
- Java_sun_nio_fs_SolarisWatchService_portDissociate;
- Java_sun_nio_fs_SolarisWatchService_portSend;
- Java_sun_nio_fs_SolarisWatchService_portGetn;
- handleSocketError;
-
- local:
- *;
-};
diff --git a/jdk/make/java/nio/reorder-i586 b/jdk/make/java/nio/reorder-i586
deleted file mode 100644
index b1ef113..0000000
--- a/jdk/make/java/nio/reorder-i586
+++ /dev/null
@@ -1,17 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%Java_sun_nio_ch_FileChannelImpl_initIDs;
-text: .text%Java_sun_nio_ch_FileDispatcher_initIDs;
-text: .text%Java_sun_nio_ch_IOUtil_initIDs;
-text: .text%Java_sun_nio_ch_FileDispatcher_read0;
-text: .text%convertReturnVal;
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
diff --git a/jdk/make/java/nio/reorder-sparc b/jdk/make/java/nio/reorder-sparc
deleted file mode 100644
index 621b6c4..0000000
--- a/jdk/make/java/nio/reorder-sparc
+++ /dev/null
@@ -1,12 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
diff --git a/jdk/make/java/nio/reorder-sparcv9 b/jdk/make/java/nio/reorder-sparcv9
deleted file mode 100644
index b1ef113..0000000
--- a/jdk/make/java/nio/reorder-sparcv9
+++ /dev/null
@@ -1,17 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%Java_sun_nio_ch_FileChannelImpl_initIDs;
-text: .text%Java_sun_nio_ch_FileDispatcher_initIDs;
-text: .text%Java_sun_nio_ch_IOUtil_initIDs;
-text: .text%Java_sun_nio_ch_FileDispatcher_read0;
-text: .text%convertReturnVal;
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
diff --git a/jdk/make/java/npt/Makefile b/jdk/make/java/npt/Makefile
deleted file mode 100644
index 39fdde6..0000000
--- a/jdk/make/java/npt/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../..
-
-# It's currently used by jpda and hprof. Put it in base module for now.
-LIBRARY = npt
-PRODUCT = sun
-LIBRARY_OUTPUT = npt
-
-# Configure the CFLAGS for this library.
-
-FILES_m = mapfile-vers
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SRCDIR=$(SHARE_SRC)/npt
-PSRCDIR=$(PLATFORM_SRC)/npt
-
-# Use the mapfile-vers (See the mapfile located with this Makefile)
-ifdef FILES_m
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-endif
-
-#
-# Files to compile.
-#
-FILES_c = \
- npt.c \
- utf.c \
- utf_md.c
-
-OTHER_INCLUDES = -I$(SRCDIR) -I$(PSRCDIR)
-
-#
-# Library to compile.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-# We don't want to link against -ljava
-JAVALIB=
-
-# Add -export options to explicitly spell exported symbols
-ifeq ($(PLATFORM), windows)
- OTHER_LCF += -export:nptInitialize -export:nptTerminate
-endif
-
-# Add location of iconv header
-ifeq ($(PLATFORM), macosx)
- OTHER_LDLIBS += -liconv
-endif
-
-#
-# Add to ambient vpath so we pick up the library files
-#
-vpath %.c $(SRCDIR):$(PSRCDIR)
-
diff --git a/jdk/make/java/npt/mapfile-vers b/jdk/make/java/npt/mapfile-vers
deleted file mode 100644
index d8386a8..0000000
--- a/jdk/make/java/npt/mapfile-vers
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- nptInitialize;
- nptTerminate;
- local:
- *;
-};
diff --git a/jdk/make/java/redist/Makefile b/jdk/make/java/redist/Makefile
deleted file mode 100644
index f06e5d1..0000000
--- a/jdk/make/java/redist/Makefile
+++ /dev/null
@@ -1,750 +0,0 @@
-#
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Imports files exported by a hotspot build or provided from an external
-# location into the OUTPUTDIR, and also primes the OUTPUTDIR with files
-# that are provided inside this workspace.
-#
-# IMPORT_LIST contains the list of destination files that are copied
-# from external places (outside this workspace).
-#
-# INTERNAL_IMPORT_LIST is the list of destination files from BUILDDIR.
-#
-
-BUILDDIR = ../..
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-SERVER_LOCATION = server
-CLIENT_LOCATION = client
-
-DB_SUFFIX = _db
-DTRACE_SUFFIX = _dtrace
-
-ifeq ($(PLATFORM), windows)
- LIB_LOCATION = $(BINDIR)
-else ifeq ($(PLATFORM), macosx)
- LIB_LOCATION = $(LIBDIR)
-else
- LIB_LOCATION = $(LIBDIR)/$(LIBARCH)
-endif
-
-JVM_NAME = $(LIB_PREFIX)jvm.$(LIBRARY_SUFFIX)
-JVMLIB_NAME = $(LIB_PREFIX)jvm.$(LIB_SUFFIX)
-JVMMAP_NAME = $(LIB_PREFIX)jvm.map
-JVMPDB_NAME = $(LIB_PREFIX)jvm.pdb
-LIBJSIG_NAME = $(LIB_PREFIX)jsig.$(LIBRARY_SUFFIX)
-JVMDB_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).$(LIBRARY_SUFFIX)
-JVMDTRACE_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).$(LIBRARY_SUFFIX)
-
-JVM_DIZ_NAME = $(LIB_PREFIX)jvm.diz
-LIBJSIG_DIZ_NAME = $(LIB_PREFIX)jsig.diz
-JVMDB_DIZ_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).diz
-JVMDTRACE_DIZ_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).diz
-
-ifeq ($(PLATFORM), macosx)
- # Note: *.dSYM is a directory
- JVM_DEBUGINFO_NAME = $(LIB_PREFIX)jvm.dSYM
- LIBJSIG_DEBUGINFO_NAME = $(LIB_PREFIX)jsig.dSYM
- JVMDB_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).dSYM
- JVMDTRACE_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).dSYM
-else
- JVM_DEBUGINFO_NAME = $(LIB_PREFIX)jvm.debuginfo
- LIBJSIG_DEBUGINFO_NAME = $(LIB_PREFIX)jsig.debuginfo
- JVMDB_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).debuginfo
- JVMDTRACE_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).debuginfo
-endif
-
-CLASSSHARINGDATA_DIR = $(BUILDDIR)/tools/sharing
-
-# Needed to do file copy
-ABS_BUILDDIR :=$(call FullPath,$(BUILDDIR))
-
-SUBDIRS_desktop = fonts
-SUBDIRS_tools = sajdi
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all clean clobber::
- $(SUBDIRS-loop)
-
-all:: build
-
-# List of files created here or coming from BUILDDIR area (this workspace)
-INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist
-
-# List of files coming from outside this workspace
-ifndef BUILD_CLIENT_ONLY
- IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
- $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVM_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .debuginfo files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVM_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DEBUGINFO_NAME)
- endif
- endif
- endif
-else
- IMPORT_LIST =
-endif
-
-# Hotspot client is only available on 32-bit non-Zero builds
-ifneq ($(ZERO_BUILD), true)
-ifeq ($(ARCH_DATA_MODEL), 32)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
- $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVM_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .debuginfo files
- ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVM_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DEBUGINFO_NAME)
- endif
- endif
- endif
-endif
-endif
-
-ifeq ($(PLATFORM), windows)
-# Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows
-
-IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%)
-
-$(BINDIR)/$(MSVCRNN_DLL): $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)
- $(install-import-file)
- $(call chmod-file, a+x)
-
-# Get the hotspot .map and .pdb files for client and server
-ifndef BUILD_CLIENT_ONLY
- IMPORT_LIST += $(LIBDIR)/$(JVMLIB_NAME)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVM_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .pdb files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMPDB_NAME)),)
- # assume .map file is present if .pdb file is preset
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
- $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME)
- endif
- endif
- endif
-endif
-
-# Add .map and .pdb files to the import path for client and kernel VMs.
-# These are only available on 32-bit windows builds.
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVM_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .pdb files
- ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMPDB_NAME)),)
- # assume .map file is present if .pdb file is preset
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \
- $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME)
- endif
- endif
- ifeq ($(DO_KERNEL), true)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_KERNEL_PATH)/$(JVM_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .pdb files
- ifneq ($(wildcard $(HOTSPOT_KERNEL_PATH)/$(JVMPDB_NAME)),)
- # assume .map file is present if .pdb file is preset
- IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME) \
- $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME)
- endif
- endif
- endif
- endif
-endif
-
-$(LIBDIR)/$(JVMLIB_NAME): $(HOTSPOT_LIB_PATH)/$(JVMLIB_NAME)
- $(install-import-file)
-
-# it is OK for the .map and .pdb files to not exist, so do not force a
-# dependency on them from the bootstrap location, and allow the copy to fail.
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME):
- @$(prep-target)
- -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME) $@
-
-$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME):
- @$(prep-target)
- -$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMMAP_NAME) $@
-
-ifndef BUILD_CLIENT_ONLY
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME):
- @$(prep-target)
- -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME) $@
-endif
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME):
- @$(prep-target)
- -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMPDB_NAME) $@
-
-$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME):
- @$(prep-target)
- -$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMPDB_NAME) $@
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DIZ_NAME):
- @$(prep-target)
- -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVM_DIZ_NAME) $@
-
-$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_DIZ_NAME):
- @$(prep-target)
- -$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVM_DIZ_NAME) $@
-
-ifndef BUILD_CLIENT_ONLY
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME):
- @$(prep-target)
- -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMPDB_NAME) $@
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DIZ_NAME):
- @$(prep-target)
- -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVM_DIZ_NAME) $@
-endif
-
-# Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Windows
-else # PLATFORM
-# NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv NOT Windows
-
-IMPORT_LIST += $(LIB_LOCATION)/$(LIBJSIG_NAME)
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(LIBJSIG_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .debuginfo files
- ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME)
- endif
- endif
-endif
-ifndef BUILD_CLIENT_ONLY
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain the target of the symlink
- ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DIZ_NAME)
- endif
- else
- # the import JDK may not contain the target of the symlink
- ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME)
- endif
- endif
- endif
-endif
-
-ifeq ($(PLATFORM), solaris)
- ifndef BUILD_CLIENT_ONLY
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDB_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .debuginfo files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDB_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_DEBUGINFO_NAME)
- endif
- endif
- endif
- # The conditional can be removed when import JDKs contain these files.
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_NAME)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .debuginfo files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME)
- endif
- endif
- endif
- else
- $(warning WARNING: $(HOTSPOT_SERVER_PATH)/$(JVMDB_NAME) not found!)
- endif
- endif
-endif
-
-ifneq ($(ZERO_BUILD), true)
-ifeq ($(ARCH_DATA_MODEL), 32)
-
-IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain the target of the symlink
- ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DIZ_NAME)
- endif
- else
- # the import JDK may not contain the target of the symlink
- ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME)
- endif
- endif
-endif
-
-ifeq ($(PLATFORM), solaris)
-# solaris vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv solaris
-
-IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME)
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDB_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .debuginfo files
- ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDB_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_DEBUGINFO_NAME)
- endif
- endif
-endif
-
-# The conditional can be removed when import JDKs contain these files.
-ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_DIZ_NAME)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_DIZ_NAME)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .debuginfo files
- ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME)
- endif
- endif
- endif
-else
- $(warning WARNING: $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME) not found!)
-endif
-
-ifndef BUILD_CLIENT_ONLY
- # The conditional can be removed when import JDKs contain these files.
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .debuginfo files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME)
- endif
- endif
- endif
- else
- $(warning WARNING: $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME) not found!)
- endif
-
- # The conditional can be removed when import JDKs contain these files.
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_NAME)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_DIZ_NAME)
- endif
- else
- # the import JDK may not contain .debuginfo files
- ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME)
- endif
- endif
- endif
- else
- $(warning WARNING: $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME) not found!)
- endif
-endif
-
-# For backwards compatability, make a link of the 32-bit client JVM to $(LIBDIR)
-IMPORT_LIST += $(LIB_LOCATION)/$(JVM_NAME)
-
-$(LIB_LOCATION)/$(JVM_NAME): $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME)
- @$(prep-target)
-
-# solaris ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ solaris
-endif # 32bit solaris
-
-endif # 32bit
-
-endif # ZERO_BUILD
-
-# NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows
-
-endif # PLATFORM
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME)
- $(install-import-file)
- @$(call binary_file_verification,$@)
-
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DIZ_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_DIZ_NAME)
- $(install-import-file)
- else
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_DEBUGINFO_NAME)
- $(install-import-debuginfo)
- endif
-endif
-
-$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME): $(HOTSPOT_KERNEL_PATH)/$(JVM_NAME)
- $(install-file)
- @$(call binary_file_verification,$@)
-
-$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_NAME)
- $(install-import-file)
- @$(call binary_file_verification,$@)
-
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
-$(LIB_LOCATION)/$(LIBJSIG_DIZ_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DIZ_NAME)
- $(install-import-file)
- else
-$(LIB_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_DEBUGINFO_NAME)
- $(install-import-debuginfo)
- endif
-endif
-
-ifndef BUILD_CLIENT_ONLY
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME):
- @$(prep-target)
- $(call install-sym-link, ../$(LIBJSIG_NAME))
-
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-# We don't create a symlink to a libjsig.diz file, but we do put
-# the $(LIBJSIG_DEBUGINFO_NAME) symlink into a libjsig.diz file.
-# The aurora system does not like dangling symlinks.
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DIZ_NAME) \
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DIZ_NAME):
- @$(prep-target)
- $(LN) -s ../$(LIBJSIG_DEBUGINFO_NAME) $(@D)/$(LIBJSIG_DEBUGINFO_NAME)
- ( $(CD) $(@D) ; \
- $(ZIPEXE) -y $(LIBJSIG_DIZ_NAME) $(LIBJSIG_DEBUGINFO_NAME) ; \
- $(RM) $(LIBJSIG_DEBUGINFO_NAME) ; \
- )
- else
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME) \
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME):
- @$(prep-target)
- $(call install-sym-link, ../$(LIBJSIG_DEBUGINFO_NAME))
- endif
- endif
-else
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME):
- @$(prep-target)
- $(call install-sym-link, ../$(LIBJSIG_NAME))
-
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-# We don't create a symlink to a libjsig.diz file, but we do put
-# the $(LIBJSIG_DEBUGINFO_NAME) symlink into a libjsig.diz file.
-# The aurora system does not like dangling symlinks.
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DIZ_NAME):
- @$(prep-target)
- $(LN) -s ../$(LIBJSIG_DEBUGINFO_NAME) $(@D)/$(LIBJSIG_DEBUGINFO_NAME)
- ( $(CD) $(@D) ; \
- $(ZIPEXE) -y $(LIBJSIG_DIZ_NAME) $(LIBJSIG_DEBUGINFO_NAME) ; \
- $(RM) $(LIBJSIG_DEBUGINFO_NAME) ; \
- )
- else
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_NAME):
- @$(prep-target)
- $(call install-sym-link, ../$(LIBJSIG_DEBUGINFO_NAME))
- endif
- endif
-endif
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_NAME)
- $(install-import-file)
- @$(call binary_file_verification,$@)
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDB_NAME)
- $(install-import-file)
- @$(call binary_file_verification,$@)
-
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_DIZ_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_DIZ_NAME)
- $(install-import-file)
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_DIZ_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDB_DIZ_NAME)
- $(install-import-file)
- else
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_DEBUGINFO_NAME)
- $(install-import-debuginfo)
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDB_DEBUGINFO_NAME)
- $(install-import-debuginfo)
- endif
-endif
-
-ifndef BUILD_CLIENT_ONLY
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDB_NAME)
- $(install-import-file)
- @$(call binary_file_verification,$@)
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME)
- $(install-import-file)
- @$(call binary_file_verification,$@)
-
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_DIZ_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDB_DIZ_NAME)
- $(install-import-file)
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_DIZ_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_DIZ_NAME)
- $(install-import-file)
- else
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDB_DEBUGINFO_NAME)
- $(install-import-debuginfo)
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_DEBUGINFO_NAME)
- $(install-import-debuginfo)
- endif
- endif
-endif
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME)
- $(install-import-file)
- @$(call binary_file_verification,$@)
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_NAME)
- $(install-import-file)
- @$(call binary_file_verification,$@)
-
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_DIZ_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_DIZ_NAME)
- $(install-import-file)
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_DIZ_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_DIZ_NAME)
- $(install-import-file)
- else
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)
- $(install-import-debuginfo)
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_DEBUGINFO_NAME)
- $(install-import-debuginfo)
- endif
-endif
-
-ifndef BUILD_CLIENT_ONLY
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_NAME)
- $(install-import-file)
- @$(call binary_file_verification,$@)
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME)
- $(install-import-file)
- @$(call binary_file_verification,$@)
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_NAME)
- $(install-import-file)
- @$(call binary_file_verification,$@)
-
-ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_DIZ_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_DIZ_NAME)
- $(install-import-file)
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_DIZ_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_DIZ_NAME)
- $(install-import-file)
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DIZ_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_DIZ_NAME)
- $(install-import-file)
- else
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_DEBUGINFO_NAME)
- $(install-import-debuginfo)
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_DEBUGINFO_NAME)
- $(install-import-debuginfo)
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_DEBUGINFO_NAME)
- $(install-import-debuginfo)
- endif
-endif
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt : $(HOTSPOT_SERVER_PATH)/Xusage.txt
- $(install-import-file)
-endif
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt : $(HOTSPOT_CLIENT_PATH)/Xusage.txt
- $(install-import-file)
-
-$(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt : $(HOTSPOT_KERNEL_PATH)/Xusage.txt
- $(install-file)
-
-#
-# Specific to non-OpenJDK building
-#
-ifndef OPENJDK
-
-INTERNAL_IMPORT_LIST += \
- $(LIBDIR)/security/US_export_policy.jar \
- $(LIBDIR)/security/local_policy.jar \
- $(LIBDIR)/jce.jar
-
-$(LIBDIR)/jce.jar: \
- $(BUILDDIR)/closed/tools/crypto/jce/jce.jar
- $(install-file)
-$(LIBDIR)/security/US_export_policy.jar: \
- $(BUILDDIR)/closed/tools/crypto/jce/US_export_policy.jar
- $(install-file)
-$(LIBDIR)/security/local_policy.jar: \
- $(BUILDDIR)/closed/tools/crypto/jce/local_policy.jar
- $(install-file)
-
-endif # OPENJDK
-
-ADDJSUM_JARFILE = $(BUILDTOOLJARDIR)/addjsum.jar
-
-# Construct classlist file
-$(LIBDIR)/classlist: \
- $(CLASSSHARINGDATA_DIR)/classlist.$(PLATFORM) \
- $(ADDJSUM_JARFILE)
- @$(prep-target)
- @$(RM) -f $@.temp
- $(BOOT_JAVA_CMD) -jar $(ADDJSUM_JARFILE) \
- $(CLASSSHARINGDATA_DIR)/classlist.$(PLATFORM) $@.temp
- $(MV) $@.temp $@
-
-# Import internal files (ones that are stashed in this source tree)
-import_internal_files : $(INTERNAL_IMPORT_LIST)
-
-# Import files from the JDK that we are not building
-import_files: $(IMPORT_LIST)
-
-# Get component information variables and rules
-include $(BUILDDIR)/common/internal/ImportComponents.gmk
-
-# Security files we need to import
-SEC_FILES_ZIP=$(ABS_BUILDDIR)/tools/crypto/sec-bin.zip
-SEC_FILES_WIN_ZIP=$(ABS_BUILDDIR)/tools/crypto/sec-windows-bin.zip
-JGSS_WIN32_FILES_ZIP=$(ABS_BUILDDIR)/tools/crypto/jgss-windows-i586-bin.zip
-JGSS_WIN64_FILES_ZIP=$(ABS_BUILDDIR)/tools/crypto/jgss-windows-x64-bin.zip
-
-# Unzip zip file $2 into directory $1 (if $2 exists)
-# Warning: $2 must be absolute path not relative
-define SecUnzipper
-if [ -f $2 ] ; then \
- $(MKDIR) -p $1; \
- $(ECHO) "( $(CD) $1 && $(UNZIP) -o $2 )"; \
- ( $(CD) $1 && $(UNZIP) -o $2 ); \
-fi
-endef
-
-# If sec-bin exists, unpack it into the build directory
-# Also, the library recompile build indirectly depends on two SSL classes,
-# so copy those as well FIXUP
-# if sec-windows-bin exists, unpack it into the build directory
-# if JGSS files exists, unpack it into the build directory
-$(TEMPDIR)/security_imported:
- @$(prep-target)
- @$(call SecUnzipper,$(OUTPUTDIR),$(SEC_FILES_ZIP))
-ifeq ($(PLATFORM), windows)
- @$(call SecUnzipper,$(OUTPUTDIR),$(SEC_FILES_WIN_ZIP))
-endif
-ifeq ($(PLATFORM), windows)
- ifeq ($(ARCH_DATA_MODEL), 32)
- @$(call SecUnzipper,$(OUTPUTDIR),$(JGSS_WIN32_FILES_ZIP))
- else
- @$(call SecUnzipper,$(OUTPUTDIR),$(JGSS_WIN64_FILES_ZIP))
- endif
-endif
- @$(ECHO) "Imported on `$(DATE)`" > $@
-
-# Import all files from other components
-$(TEMPDIR)/components_imported:
- @$(prep-target)
- $(call import-component-binaries,$(ABS_OUTPUTDIR))
- $(call import-component-sources,$(IMPORTSRCDIR))
- $(call import-component-docs,$(IMPORTDOCDIR))
- $(call import-component-classes,$(CLASSDESTDIR))
- @$(ECHO) "Imported on `$(DATE)`" > $@
-
-# Do pretty much everything
-build : import_files \
- import_internal_files \
- $(TEMPDIR)/components_imported \
- $(TEMPDIR)/security_imported
-
-# Clean up what we imported (except for component files)
-clean clobber::
- $(RM) $(IMPORT_LIST)
- $(RM) $(INTERNAL_IMPORT_LIST)
- $(call import-component-sources-clean,$(IMPORTSRCDIR))
- $(call import-component-docs-clean,$(IMPORTDOCDIR))
- $(call import-component-classes-clean,$(CLASSDESTDIR))
- $(RM) $(TEMPDIR)/components_imported
- $(RM) $(TEMPDIR)/security_imported
-
-.PHONY: import_files import_internal_files
-
diff --git a/jdk/make/java/redist/fonts/Makefile b/jdk/make/java/redist/fonts/Makefile
deleted file mode 100644
index d98fb8f..0000000
--- a/jdk/make/java/redist/fonts/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-
-#
-# List of lucida font files that we redistribute.
-#
-
-SHARED_FONTFILES = \
- $(LIBDIR)/fonts/LucidaTypewriterRegular.ttf \
- $(LIBDIR)/fonts/LucidaTypewriterBold.ttf \
- $(LIBDIR)/fonts/LucidaBrightRegular.ttf \
- $(LIBDIR)/fonts/LucidaBrightDemiBold.ttf \
- $(LIBDIR)/fonts/LucidaBrightItalic.ttf \
- $(LIBDIR)/fonts/LucidaBrightDemiItalic.ttf \
- $(LIBDIR)/fonts/LucidaSansRegular.ttf \
- $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
-
-ifeq ($(PLATFORM), linux)
-
-# The oblique versions of the font are derived from the base versions
-# and since 2D can do this derivation on the fly at run time there is no
-# need to redistribute the fonts. An exception to this is on Linux.
-# The reason is that the Lucidas are specified in the font.properties files
-# on Linux, and so AWT/Motif components expect to be able to ask the Xserver
-# for these oblique fonts, but the Xserver cannot do the same derivation as
-# 2D can.
-
-OBLIQUE_FONTFILES = \
- $(LIBDIR)/oblique-fonts/LucidaTypewriterOblique.ttf \
- $(LIBDIR)/oblique-fonts/LucidaTypewriterBoldOblique.ttf \
- $(LIBDIR)/oblique-fonts/LucidaSansOblique.ttf \
- $(LIBDIR)/oblique-fonts/LucidaSansDemiOblique.ttf \
-
-endif
-
-ifndef OPENJDK
-
-# Lucida font files are not included in the OpenJDK distribution.
-# Get names of font files
-
-# Copy font files into OUTPUTDIR area
-
-FONTFILES = $(SHARED_FONTFILES)
-FONTSDIR = $(LIBDIR)/fonts
-FONTSDIRFILE = $(FONTSDIR)/fonts.dir
-INTERNAL_IMPORT_LIST = $(FONTFILES)
-
-ifneq ($(PLATFORM), windows)
- INTERNAL_IMPORT_LIST += $(FONTSDIRFILE)
-endif
-
-$(LIBDIR)/fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/%.ttf
- $(install-file)
-
-$(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
- $(install-file)
-
-ifeq ($(PLATFORM), linux)
-
-# The oblique fonts are only needed/wanted on Linux.
-
-OBLFONTSDIR = $(LIBDIR)/oblique-fonts
-OBLFONTSDIRFILE = $(OBLFONTSDIR)/fonts.dir
-INTERNAL_IMPORT_LIST += $(OBLIQUE_FONTFILES) $(OBLFONTSDIRFILE)
-
-$(LIBDIR)/oblique-fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/oblique/%.ttf
- $(install-file)
-
-$(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir
- $(install-file)
-
-endif # linux
-
-all build : $(INTERNAL_IMPORT_LIST)
-
-clean clobber::
- $(RM) $(INTERNAL_IMPORT_LIST)
-
-else
-
-all build clean clobber :
-
-endif # !OPENJDK
diff --git a/jdk/make/java/redist/sajdi/Makefile b/jdk/make/java/redist/sajdi/Makefile
deleted file mode 100644
index 6bec18c..0000000
--- a/jdk/make/java/redist/sajdi/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-ifeq ($(PLATFORM), windows)
- LIB_LOCATION = $(BINDIR)
-else ifeq ($(PLATFORM), macosx)
- LIB_LOCATION = $(LIBDIR)
-else
- LIB_LOCATION = $(LIBDIR)/$(LIBARCH)
-endif
-
-# INCLUDE_SA is false on platforms where SA is not supported.
-# On platforms where it is supported, we want to allow it to
-# not be present, at least temporarily. So,
-# if the SA files (well, just sa-jdi.jar) do not exist
-# in the HOTSPOT_IMPORT_PATH, then we won't build SA.
-SA_EXISTS := $(shell if [ -r $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar ] ; then \
- $(ECHO) true; \
- else \
- $(ECHO) false; \
- fi)
-
-ifeq ($(SA_EXISTS), false)
- INCLUDE_SA := false
-endif
-
-IMPORT_LIST =
-ifeq ($(INCLUDE_SA), true)
- IMPORT_LIST += $(LIBDIR)/sa-jdi.jar \
- $(LIB_LOCATION)/$(SALIB_NAME)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- # the import JDK may not contain .diz files
- ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SA_DIZ_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SA_DIZ_NAME)
- endif
- else
- ifeq ($(PLATFORM), windows)
- # the import JDK may not contain .pdb files
- ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SAPDB_NAME)),)
- # assume .map file is present if .pdb is present
- IMPORT_LIST += $(LIB_LOCATION)/$(SAMAP_NAME) \
- $(LIB_LOCATION)/$(SAPDB_NAME)
- endif
- else
- # the import JDK may not contain .debuginfo files
- ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SA_DEBUGINFO_NAME)),)
- IMPORT_LIST += $(LIB_LOCATION)/$(SA_DEBUGINFO_NAME)
- endif
- endif
- endif
- endif
-endif # INCLUDE_SA
-
-
-ifeq ($(INCLUDE_SA), true)
-# The Serviceability Agent is built in the Hotspot workspace.
-# It contains two files:
-# - sa-jdi.jar: This goes into the same dir as tools.jar.
-# - a shared library: sawindbg.dll on windows / libproc.sa on unix
-# This goes into the same dir as the other
-# shared libs, eg. libjdwp.so.
-$(LIBDIR)/sa-jdi.jar: $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar
- $(install-importonly-file)
-
-$(LIB_LOCATION)/$(SALIB_NAME): $(HOTSPOT_SALIB_PATH)/$(SALIB_NAME)
- $(install-import-file)
-
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
-$(LIB_LOCATION)/$(SA_DIZ_NAME): $(HOTSPOT_SALIB_PATH)/$(SA_DIZ_NAME)
- $(install-import-file)
- else
- ifeq ($(PLATFORM), windows)
-$(LIB_LOCATION)/$(SAPDB_NAME): $(HOTSPOT_SALIB_PATH)/$(SAPDB_NAME)
- $(install-import-file)
-
-$(LIB_LOCATION)/$(SAMAP_NAME): $(HOTSPOT_SALIB_PATH)/$(SAMAP_NAME)
- $(install-import-file)
- else
-$(LIB_LOCATION)/$(SA_DEBUGINFO_NAME): $(HOTSPOT_SALIB_PATH)/$(SA_DEBUGINFO_NAME)
- $(install-import-file)
- endif
- endif
- endif
-endif # INCLUDE_SA
-
-all: $(IMPORT_LIST)
-
-clean clobber::
diff --git a/jdk/make/java/rmi/Makefile b/jdk/make/java/rmi/Makefile
deleted file mode 100644
index 0e496da..0000000
--- a/jdk/make/java/rmi/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building java.rmi.*
-#
-
-BUILDDIR = ../..
-
-PACKAGE = java.rmi
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-AUTO_FILES_JAVA_DIRS = java/rmi
-
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/java/security/Makefile b/jdk/make/java/security/Makefile
deleted file mode 100644
index 8135973..0000000
--- a/jdk/make/java/security/Makefile
+++ /dev/null
@@ -1,156 +0,0 @@
-#
-# Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = java.security
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_LINT_OPTIONS = -Xlint:all
-JAVAC_WARNINGS_FATAL = true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Rules
-#
-AUTO_FILES_JAVA_DIRS = java/security
-
-#
-# Directories
-#
-
-# The default security properties file is for linux
-PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-linux
-
-ifeq ($(PLATFORM), solaris)
-PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-solaris
-
-else # NOT_SOLARIS
-
-# Register Microsoft CryptoAPI provider only on Windows platform.
-ifeq ($(PLATFORM), windows)
- PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows
-
-else # NOT_WINDOWS
-
-ifeq ($(PLATFORM), macosx)
- PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-macosx
-endif # MACOSX
-
-endif # NOT_WINDOWS
-endif # NOT_SOLARIS
-
-
-PROPS_BUILD = $(LIBDIR)/security/java.security
-
-POLICY_SRC = $(TOPDIR)/src/share/lib/security/java.policy
-POLICY_BUILD = $(LIBDIR)/security/java.policy
-
-CACERTS_SRC = $(CACERTS_FILE)
-CACERTS_BUILD = $(LIBDIR)/security/cacerts
-
-BLACKLISTED_CERTS_SRC = $(TOPDIR)/src/share/lib/security/blacklisted.certs
-BLACKLISTED_CERTS_BUILD = $(LIBDIR)/security/blacklisted.certs
-
-ifndef OPENJDK
- BLACKLIST_SRC = $(CLOSED_SHARE_SRC)/lib/security/blacklist
- BLACKLIST_BUILD = $(LIBDIR)/security/blacklist
- BLACKLISTED_CERTS_SRC += $(wildcard $(CLOSED_SHARE_SRC)/lib/security/blacklisted.certs)
- TRUSTEDLIBS_SRC = $(CLOSED_SHARE_SRC)/lib/security/trusted.libraries
- TRUSTEDLIBS_BUILD = $(LIBDIR)/security/trusted.libraries
- RESTRICTED_PKGS_SRC = $(CLOSED_SHARE_SRC)/lib/security/restricted.pkgs
- RESTRICTED_PKGS := $(shell $(CAT) $(RESTRICTED_PKGS_SRC) | $(TR) "\n" " ")
- ADDTORESTRICTEDPKGS_JARFILE = $(BUILDTOOLJARDIR)/addtorestrictedpkgs.jar
-endif
-
-FILES_class = $(FILES_java:%.java=$(CLASSBINDIR)/%.class)
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Rules.gmk
-
-ifdef OPENJDK
-build: properties policy cacerts blacklisted-certs
-else
-build: properties policy cacerts blacklist blacklisted-certs trustedlibs
-endif
-
-install: all
-
-properties: classes $(PROPS_BUILD)
-
-policy: classes $(POLICY_BUILD)
-
-cacerts: classes $(CACERTS_BUILD)
-
-blacklist: classes $(BLACKLIST_BUILD)
-
-blacklisted-certs: classes $(BLACKLISTED_CERTS_BUILD)
-
-trustedlibs: classes $(TRUSTEDLIBS_BUILD)
-
-ifdef OPENJDK
-$(PROPS_BUILD): $(PROPS_SRC)
- $(install-file)
-else
-$(PROPS_BUILD): $(PROPS_SRC)
- $(MKDIR) -p $(@D)
- $(BOOT_JAVA_CMD) -jar $(ADDTORESTRICTEDPKGS_JARFILE) $^ $@.tmp $(RESTRICTED_PKGS)
- $(MV) $@.tmp $@
-endif
-
-$(POLICY_BUILD): $(POLICY_SRC)
- $(install-file)
-
-$(CACERTS_BUILD): $(CACERTS_SRC)
- $(install-file)
-
-$(BLACKLIST_BUILD): $(BLACKLIST_SRC)
- $(install-file)
-
-$(BLACKLISTED_CERTS_BUILD): $(BLACKLISTED_CERTS_SRC)
- $(MKDIR) -p $(@D)
- $(CAT) $^ | $(SED) '/^$$/d' | $(SORT) | $(UNIQ) > $@.tmp
- $(GREP) -i Algorithm $@.tmp > $@
- if [ `$(SED) -n -e "$$=" $@` != 1 ]; then \
- $(ECHO) "Different algorithms defined in $^"; \
- $(RM) $@ $@.tmp; \
- false; \
- fi
- $(GREP) -iv Algorithm $@.tmp >> $@
- $(RM) $@.tmp
-
-$(TRUSTEDLIBS_BUILD): $(TRUSTEDLIBS_SRC)
- $(install-file)
-
-clean clobber:: .delete.classlist
- $(RM) -r $(CLASSBINDIR)/java/security
- $(RM) $(PROPS_BUILD) $(POLICY_BUILD) $(CACERTS_BUILD) $(BLACKLIST_BUILD) \
- $(BLACKLISTED_CERTS_BUILD) $(TRUSTEDLIBS_BUILD)
-
-# Additional Rule for building sun.security.util
-$(CLASSBINDIR)/%.class: $(SHARE_SRC)/sun/%.java
- @$(ECHO) $? >> $(TEMPDIR)/.classes.list
-
diff --git a/jdk/make/java/sql/Makefile b/jdk/make/java/sql/Makefile
deleted file mode 100644
index e3155b7..0000000
--- a/jdk/make/java/sql/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of JDBC
-#
-
-BUILDDIR = ../..
-PACKAGE = java.sql
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-AUTO_FILES_JAVA_DIRS = java/sql
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/java/sun_nio/FILES_java.gmk b/jdk/make/java/sun_nio/FILES_java.gmk
deleted file mode 100644
index 395ab25..0000000
--- a/jdk/make/java/sun_nio/FILES_java.gmk
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# This is the list of java classes that will be automatically built
-# from sources. See Exportedfiles.gmk for the list of files which
-# will generate header files
-#
-FILES_java = \
- sun/nio/cs/StandardCharsets.java \
- sun/nio/cs/AbstractCharsetProvider.java \
- sun/nio/cs/HistoricallyNamedCharset.java \
- sun/nio/cs/Surrogate.java \
- sun/nio/cs/CharsetMapping.java \
- sun/nio/cs/UnicodeEncoder.java \
- sun/nio/cs/UnicodeDecoder.java \
- sun/nio/cs/ISO_8859_1.java \
- sun/nio/cs/ISO_8859_2.java \
- sun/nio/cs/ISO_8859_4.java \
- sun/nio/cs/ISO_8859_5.java \
- sun/nio/cs/ISO_8859_7.java \
- sun/nio/cs/ISO_8859_9.java \
- sun/nio/cs/ISO_8859_13.java \
- sun/nio/cs/ISO_8859_15.java \
- sun/nio/cs/IBM437.java \
- sun/nio/cs/IBM737.java \
- sun/nio/cs/IBM775.java \
- sun/nio/cs/IBM850.java \
- sun/nio/cs/IBM852.java \
- sun/nio/cs/IBM855.java \
- sun/nio/cs/IBM857.java \
- sun/nio/cs/IBM858.java \
- sun/nio/cs/IBM862.java \
- sun/nio/cs/IBM866.java \
- sun/nio/cs/IBM874.java \
- sun/nio/cs/KOI8_R.java \
- sun/nio/cs/KOI8_U.java \
- sun/nio/cs/MS1250.java \
- sun/nio/cs/MS1251.java \
- sun/nio/cs/MS1252.java \
- sun/nio/cs/MS1253.java \
- sun/nio/cs/MS1254.java \
- sun/nio/cs/MS1257.java \
- sun/nio/cs/US_ASCII.java \
- sun/nio/cs/UTF_16.java \
- sun/nio/cs/UTF_16BE.java \
- sun/nio/cs/UTF_16LE.java \
- sun/nio/cs/UTF_16LE_BOM.java \
- sun/nio/cs/UTF_32.java \
- sun/nio/cs/UTF_32BE.java \
- sun/nio/cs/UTF_32LE.java \
- sun/nio/cs/UTF_32BE_BOM.java \
- sun/nio/cs/UTF_32LE_BOM.java
-
diff --git a/jdk/make/java/sun_nio/Makefile b/jdk/make/java/sun_nio/Makefile
deleted file mode 100644
index c3c11ac..0000000
--- a/jdk/make/java/sun_nio/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for sun/nio files
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.nio
-PRODUCT = sun
-
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-include FILES_java.gmk
-
-#
-# Install .lib file.
-#
-INSTALL_DOT_LIB = true
-
-include $(BUILDDIR)/common/Classes.gmk
-
-clean::
- $(RM) -r $(CLASSHDRDIR)
-clobber::
- $(RM) -r $(CLASSBINDIR)/sun/nio/cs
diff --git a/jdk/make/java/text/Makefile b/jdk/make/java/text/Makefile
deleted file mode 100644
index 7645d1d..0000000
--- a/jdk/make/java/text/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java.text
-#
-
-BUILDDIR = ../..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = base
-SUBDIRS_desktop = bidi
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/java/text/base/FILES_java.gmk b/jdk/make/java/text/base/FILES_java.gmk
deleted file mode 100644
index 47abc6f..0000000
--- a/jdk/make/java/text/base/FILES_java.gmk
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_java = \
- java/text/Annotation.java \
- java/text/AttributedCharacterIterator.java \
- java/text/AttributedString.java \
- java/text/BreakIterator.java \
- java/text/CalendarBuilder.java \
- java/text/CharacterIterator.java \
- java/text/CharacterIteratorFieldDelegate.java \
- java/text/ChoiceFormat.java \
- java/text/Collator.java \
- java/text/CollationElementIterator.java \
- java/text/CollationKey.java \
- java/text/DateFormat.java \
- java/text/DateFormatSymbols.java \
- java/text/DecimalFormat.java \
- java/text/DigitList.java \
- java/text/EntryPair.java \
- java/text/Format.java \
- java/text/FieldPosition.java \
- java/text/DontCareFieldPosition.java \
- java/text/MergeCollation.java \
- java/text/MessageFormat.java \
- java/text/Normalizer.java \
- java/text/NumberFormat.java \
- java/text/DecimalFormatSymbols.java \
- java/text/ParseException.java \
- java/text/ParsePosition.java \
- java/text/PatternEntry.java \
- java/text/RBCollationTables.java \
- java/text/RBTableBuilder.java \
- java/text/RuleBasedCollator.java \
- java/text/RuleBasedCollationKey.java \
- java/text/SimpleDateFormat.java \
- java/text/StringCharacterIterator.java \
- java/text/spi/BreakIteratorProvider.java \
- java/text/spi/CollatorProvider.java \
- java/text/spi/DateFormatProvider.java \
- java/text/spi/DateFormatSymbolsProvider.java \
- java/text/spi/DecimalFormatSymbolsProvider.java \
- java/text/spi/NumberFormatProvider.java \
- sun/text/SupplementaryCharacterData.java \
- sun/text/CodePointIterator.java \
- sun/text/CollatorUtilities.java \
- sun/text/CompactByteArray.java \
- sun/text/ComposedCharIter.java \
- sun/text/IntHashtable.java \
- sun/text/Normalizer.java \
- sun/text/SupplementaryCharacterData.java \
- sun/text/UCompactIntArray.java \
- sun/text/normalizer/CharTrie.java \
- sun/text/normalizer/CharacterIteratorWrapper.java \
- sun/text/normalizer/ICUBinary.java \
- sun/text/normalizer/ICUData.java \
- sun/text/normalizer/IntTrie.java \
- sun/text/normalizer/NormalizerBase.java \
- sun/text/normalizer/NormalizerDataReader.java \
- sun/text/normalizer/NormalizerImpl.java \
- sun/text/normalizer/RangeValueIterator.java \
- sun/text/normalizer/Replaceable.java \
- sun/text/normalizer/ReplaceableString.java \
- sun/text/normalizer/ReplaceableUCharacterIterator.java \
- sun/text/normalizer/RuleCharacterIterator.java \
- sun/text/normalizer/SymbolTable.java \
- sun/text/normalizer/Trie.java \
- sun/text/normalizer/TrieIterator.java \
- sun/text/normalizer/UBiDiProps.java \
- sun/text/normalizer/UCharacter.java \
- sun/text/normalizer/UCharacterIterator.java \
- sun/text/normalizer/UCharacterProperty.java \
- sun/text/normalizer/UCharacterPropertyReader.java \
- sun/text/normalizer/UTF16.java \
- sun/text/normalizer/UnicodeMatcher.java \
- sun/text/normalizer/UnicodeSet.java \
- sun/text/normalizer/UnicodeSetIterator.java \
- sun/text/normalizer/Utility.java \
- sun/text/normalizer/VersionInfo.java \
- \
- sun/text/resources/BreakIteratorInfo.java \
- \
- sun/text/resources/CollationData.java \
- \
- sun/text/resources/FormatData.java \
- sun/text/resources/JavaTimeSupplementary.java \
- sun/text/resources/en/FormatData_en.java \
- sun/text/resources/en/FormatData_en_AU.java \
- sun/text/resources/en/FormatData_en_CA.java \
- sun/text/resources/en/FormatData_en_GB.java \
- sun/text/resources/en/FormatData_en_IE.java \
- sun/text/resources/en/FormatData_en_IN.java \
- sun/text/resources/en/FormatData_en_MT.java \
- sun/text/resources/en/FormatData_en_NZ.java \
- sun/text/resources/en/FormatData_en_PH.java \
- sun/text/resources/en/FormatData_en_SG.java \
- sun/text/resources/en/FormatData_en_US.java \
- sun/text/resources/en/FormatData_en_ZA.java \
- sun/text/resources/en/JavaTimeSupplementary_en.java \
- sun/text/resources/en/JavaTimeSupplementary_en_GB.java \
- sun/text/resources/en/JavaTimeSupplementary_en_SG.java
diff --git a/jdk/make/java/text/base/Makefile b/jdk/make/java/text/base/Makefile
deleted file mode 100644
index c4481a6..0000000
--- a/jdk/make/java/text/base/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = java.text
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_java.gmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Rules to add data files BreakIterator
-#
-TEXT_CLASSES = $(BUILDTOOLCLASSDIR)/java.text/classes
-
-# 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.
-#
-TEXT_SRCDIR = $(SHARE_SRC)/classes/sun/text/resources
-TEXT_SOURCES = $(TEXT_SRCDIR)/BreakIteratorRules.java \
- $(TEXT_SRCDIR)/BreakIteratorInfo.java
-UNICODEDATA = $(BUILDDIR)/tools/UnicodeData
-
-# output
-TEXT_CLASSDIR = $(CLASSBINDIR)/sun/text/resources
-BIFILES = $(TEXT_CLASSDIR)/CharacterBreakIteratorData \
- $(TEXT_CLASSDIR)/WordBreakIteratorData \
- $(TEXT_CLASSDIR)/LineBreakIteratorData \
- $(TEXT_CLASSDIR)/SentenceBreakIteratorData
-
-ICU_FILES = $(TEXT_CLASSDIR)/unorm.icu \
- $(TEXT_CLASSDIR)/uprops.icu \
- $(TEXT_CLASSDIR)/ubidi.icu
-
-# builder
-GENERATEBREAKITERATORDATA_JARFILE = \
- $(BUILDTOOLJARDIR)/generatebreakiteratordata.jar
-
-$(BIFILES): $(GENERATEBREAKITERATORDATA_JARFILE) \
- $(UNICODEDATA)/UnicodeData.txt \
- $(TEXT_SOURCES)
- $(prep-target)
- $(RM) -r $(TEXT_CLASSES)
- $(MKDIR) -p $(TEXT_CLASSES)
- $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
- -sourcepath $(TEXT_SRCDIR) \
- $(TEXT_SOURCES)
- $(MKDIR) -p $(TEXT_CLASSDIR)
- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
- -o $(TEXT_CLASSDIR) \
- -spec $(UNICODEDATA)/UnicodeData.txt
- @$(java-vm-cleanup)
-
-build: $(BIFILES) $(ICU_FILES)
-
-#
-# Extra rules to copy unorm.icu, uprops.icu, and ubidi.icu
-#
-$(TEXT_CLASSDIR)/unorm.icu: $(TEXT_SRCDIR)/unorm.icu
- $(install-file)
-
-$(TEXT_CLASSDIR)/uprops.icu: $(TEXT_SRCDIR)/uprops.icu
- $(install-file)
-
-$(TEXT_CLASSDIR)/ubidi.icu: $(TEXT_SRCDIR)/ubidi.icu
- $(install-file)
-
-clean clobber::
- $(RM) -r $(TEXT_CLASSES)
- $(RM) -r $(BIFILES)
- $(RM) $(ICU_FILES)
-
diff --git a/jdk/make/java/text/bidi/Makefile b/jdk/make/java/text/bidi/Makefile
deleted file mode 100644
index d5775a5..0000000
--- a/jdk/make/java/text/bidi/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = java.text
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files for Bidi that is not in the base module
-#
-FILES_java = \
- java/text/Bidi.java \
- sun/text/bidi/BidiBase.java \
- sun/text/bidi/BidiLine.java \
- sun/text/bidi/BidiRun.java \
- sun/text/CodePointIterator.java
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/java/time/Makefile b/jdk/make/java/time/Makefile
deleted file mode 100644
index 0ff3698..0000000
--- a/jdk/make/java/time/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building jar utility.
-#
-
-BUILDDIR = ../../
-PACKAGE = java.time
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = java/time
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/java/util/FILES_java.gmk b/jdk/make/java/util/FILES_java.gmk
deleted file mode 100644
index 75bbe38..0000000
--- a/jdk/make/java/util/FILES_java.gmk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_java = \
- sun/util/resources/LocaleData.java \
- sun/util/resources/OpenListResourceBundle.java \
- sun/util/resources/ParallelListResourceBundle.java \
- sun/util/resources/LocaleNamesBundle.java \
- sun/util/resources/TimeZoneNamesBundle.java \
- sun/util/resources/TimeZoneNames.java \
- sun/util/resources/en/TimeZoneNames_en.java \
- sun/util/resources/en/TimeZoneNames_en_CA.java \
- sun/util/resources/en/TimeZoneNames_en_GB.java \
- sun/util/resources/en/TimeZoneNames_en_IE.java
diff --git a/jdk/make/java/util/FILES_properties.gmk b/jdk/make/java/util/FILES_properties.gmk
deleted file mode 100644
index e2fc3cb..0000000
--- a/jdk/make/java/util/FILES_properties.gmk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_compiled_properties = \
- sun/util/resources/LocaleNames.properties \
- sun/util/resources/en/LocaleNames_en.properties \
- sun/util/resources/en/LocaleNames_en_MT.properties \
- sun/util/resources/en/LocaleNames_en_PH.properties \
- sun/util/resources/en/LocaleNames_en_SG.properties \
- \
- sun/util/resources/CalendarData.properties \
- sun/util/resources/en/CalendarData_en.properties \
- sun/util/resources/en/CalendarData_en_GB.properties \
- sun/util/resources/en/CalendarData_en_IE.properties \
- sun/util/resources/en/CalendarData_en_MT.properties \
- \
- sun/util/resources/CurrencyNames.properties \
- sun/util/resources/en/CurrencyNames_en_AU.properties \
- sun/util/resources/en/CurrencyNames_en_CA.properties \
- sun/util/resources/en/CurrencyNames_en_GB.properties \
- sun/util/resources/en/CurrencyNames_en_IE.properties \
- sun/util/resources/en/CurrencyNames_en_IN.properties \
- sun/util/resources/en/CurrencyNames_en_MT.properties \
- sun/util/resources/en/CurrencyNames_en_NZ.properties \
- sun/util/resources/en/CurrencyNames_en_PH.properties \
- sun/util/resources/en/CurrencyNames_en_SG.properties \
- sun/util/resources/en/CurrencyNames_en_US.properties \
- sun/util/resources/en/CurrencyNames_en_ZA.properties
diff --git a/jdk/make/java/util/Makefile b/jdk/make/java/util/Makefile
deleted file mode 100644
index 9eda97a..0000000
--- a/jdk/make/java/util/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for sun.util.resources that don't need
-# to be part of the bootstrap build.
-#
-
-BUILDDIR = ../..
-
-PACKAGE = java.util.resources
-PRODUCT = java
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-
-# Adds more files than before?: AUTO_FILES_JAVA_DIRS=sun/util/resources
-include FILES_java.gmk
-
-# Adds more files than before?: AUTO_FILES_PROPERTIES_DIRS=sun/util/resources
-include FILES_properties.gmk
-
-#
-# Compile properties
-#
-COMPILED_PROPERTIES_SUPERCLASS=sun.util.resources.LocaleNamesBundle
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/java/verify/Makefile b/jdk/make/java/verify/Makefile
deleted file mode 100644
index 9100069..0000000
--- a/jdk/make/java/verify/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build libverify.so
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../..
-PRODUCT = java
-LIBRARY = verify
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Link to libjvm so JVM_ functions can be called.
-#
-OTHER_LDLIBS += $(JVMLIB)
-
-ifeq ($(PLATFORM), windows)
- #
- # Don't want JAVALIB
- #
- JAVALIB =
- EXTRA_LIBS =
-endif
-
-#
-# Files to compile.
-#
-FILES_c = \
- check_code.c \
- check_format.c
-
-#
-# Targets.
-#
-ifeq ($(PLATFORM), solaris)
- ifneq ($(ARCH), amd64)
- FILES_reorder += reorder-$(ARCH)
- endif
-endif
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Add to the ambient VPATH.
-#
-vpath %.c $(SHARE_SRC)/native/common
-
diff --git a/jdk/make/java/verify/mapfile-vers b/jdk/make/java/verify/mapfile-vers
deleted file mode 100644
index ecabd58..0000000
--- a/jdk/make/java/verify/mapfile-vers
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-SUNWprivate_1.1 {
- global:
- VerifyClass;
- VerifyClassForMajorVersion;
- VerifyClassname;
- VerifyFixClassname;
- local:
- *;
-};
diff --git a/jdk/make/java/verify/reorder-i586 b/jdk/make/java/verify/reorder-i586
deleted file mode 100644
index 56ee8e3..0000000
--- a/jdk/make/java/verify/reorder-i586
+++ /dev/null
@@ -1,40 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%VerifyFixClassname;
-text: .text%VerifyClassname;
-text: .text%skip_over_fieldname: OUTPUTDIR/tmp/java/verify/obj/check_format.o;
-text: .text%skip_over_field_signature: OUTPUTDIR/tmp/java/verify/obj/check_format.o;
-text: .text%VerifyClass;
-text: .text%make_class_info_from_name: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%class_name_to_ID: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%make_class_info: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%free_block: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%verify_method: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%verify_opcode_operands: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%initialize_dataflow: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%signature_to_fieldtype: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%check_register_values: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%pop_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%update_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%push_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%merge_into_successors: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%set_protected: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%merge_into_one_successor: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%merge_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-# Test Exit
-# Test Hello
-text: .text%merge_fullinfo_types: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%isAssignableTo: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-# Test Sleep
-text: .text%isLegalTarget: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%verify_constant_pool_type: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-# Test IntToString
-# Test LoadToolkit
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
-text: .text%copy_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%ntohl: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
diff --git a/jdk/make/java/verify/reorder-sparc b/jdk/make/java/verify/reorder-sparc
deleted file mode 100644
index 17e1346..0000000
--- a/jdk/make/java/verify/reorder-sparc
+++ /dev/null
@@ -1,44 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%VerifyFixClassname;
-text: .text%VerifyClassname;
-text: .text%skip_over_fieldname: OUTPUTDIR/tmp/java/verify/obj/check_format.o;
-text: .text%VerifyClass;
-text: .text%CCinit: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%initialize_class_hash;
-text: .text%make_class_info_from_name: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%make_class_info: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%verify_method: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%instruction_length: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%verify_opcode_operands: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%initialize_exception_table: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%initialize_dataflow: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%signature_to_fieldtype: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%check_register_values: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%pop_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%update_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%push_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%merge_into_successors: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%pop_and_free: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%set_protected: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%merge_into_one_successor: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%merge_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%merge_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%finalize_class_hash: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%CCdestroy: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-# Test Exit
-# Test Hello
-text: .text%merge_fullinfo_types: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-# Test LoadFrame
-text: .text%verify_constant_pool_type: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-# Test LoadJFrame
-# Test JHello
-# SwingSet
-text: .text%verify_field: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%check_and_push: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
-text: .text%signature_to_args_size: OUTPUTDIR/tmp/java/verify/obj/check_code.o;
diff --git a/jdk/make/java/verify/reorder-sparcv9 b/jdk/make/java/verify/reorder-sparcv9
deleted file mode 100644
index 1f58d56..0000000
--- a/jdk/make/java/verify/reorder-sparcv9
+++ /dev/null
@@ -1,45 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%VerifyFixClassname;
-text: .text%next_utf2unicode: OUTPUTDIR/tmp/java/verify/obj64/check_format.o;
-text: .text%VerifyClassname;
-text: .text%skip_over_fieldname: OUTPUTDIR/tmp/java/verify/obj64/check_format.o;
-text: .text%VerifyClass;
-text: .text%CCinit: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%initialize_class_hash;
-text: .text%make_class_info_from_name: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%make_class_info: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%verify_method: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%instruction_length: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%verify_opcode_operands: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%verify_constant_pool_type: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%check_and_push: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%pop_and_free: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%set_protected: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%initialize_exception_table: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%merge_fullinfo_types: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%initialize_dataflow: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%signature_to_fieldtype: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%check_register_values: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%pop_stack: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%update_registers: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%push_stack: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%merge_into_successors: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%merge_into_one_successor: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%merge_stack: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%merge_registers: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%finalize_class_hash: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%CCdestroy: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
-text: .text%verify_field: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
-text: .text%signature_to_args_size: OUTPUTDIR/tmp/java/verify/obj64/check_code.o;
diff --git a/jdk/make/java/version/Makefile b/jdk/make/java/version/Makefile
deleted file mode 100644
index 824300e..0000000
--- a/jdk/make/java/version/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to generate sun/misc/Version.java
-#
-
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-
-all build: $(GENSRCDIR)/sun/misc/Version.java
-
-$(GENSRCDIR)/sun/misc/Version.java: \
- $(SHARE_SRC)/classes/sun/misc/Version.java.template
- $(prep-target)
- $(RM) $@.temp
- $(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@@//g' \
- $< > $@.temp
- @$(MV) $@.temp $@
-
-clean clobber:
- $(RM) $(GENSRCDIR)/sun/misc/Version.java
diff --git a/jdk/make/java/zip/FILES_c.gmk b/jdk/make/java/zip/FILES_c.gmk
deleted file mode 100644
index 4e9889b..0000000
--- a/jdk/make/java/zip/FILES_c.gmk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- CRC32.c \
- Adler32.c \
- Deflater.c \
- Inflater.c \
- ZipFile.c \
- zip_util.c
-
-ifneq ($(SYSTEM_ZLIB),true)
-FILES_c += \
- compress.c \
- deflate.c \
- gzclose.c \
- gzlib.c \
- gzread.c \
- gzwrite.c \
- infback.c \
- inffast.c \
- inflate.c \
- inftrees.c \
- trees.c \
- uncompr.c \
- zadler32.c \
- zcrc32.c \
- zutil.c
-endif
diff --git a/jdk/make/java/zip/FILES_java.gmk b/jdk/make/java/zip/FILES_java.gmk
deleted file mode 100644
index 3f074d1..0000000
--- a/jdk/make/java/zip/FILES_java.gmk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-JAVA_ZIP_java = \
- java/util/zip/Adler32.java \
- java/util/zip/CRC32.java \
- java/util/zip/Checksum.java \
- java/util/zip/CheckedInputStream.java \
- java/util/zip/CheckedOutputStream.java \
- java/util/zip/DataFormatException.java \
- java/util/zip/Deflater.java \
- java/util/zip/DeflaterInputStream.java \
- java/util/zip/DeflaterOutputStream.java \
- java/util/zip/GZIPInputStream.java \
- java/util/zip/GZIPOutputStream.java \
- java/util/zip/Inflater.java \
- java/util/zip/InflaterInputStream.java \
- java/util/zip/InflaterOutputStream.java \
- java/util/zip/ZipConstants.java \
- java/util/zip/ZipEntry.java \
- java/util/zip/ZipError.java \
- java/util/zip/ZipException.java \
- java/util/zip/ZipFile.java \
- java/util/zip/ZipInputStream.java \
- java/util/zip/ZipOutputStream.java
-
-FILES_java = $(JAVA_ZIP_java)
diff --git a/jdk/make/java/zip/Makefile b/jdk/make/java/zip/Makefile
deleted file mode 100644
index 99afd60..0000000
--- a/jdk/make/java/zip/Makefile
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-
-BUILDDIR = ../..
-PACKAGE = java.util.zip
-LIBRARY = zip
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# ZLIB_VERSION is defined in make/common/Defs.gmk
-#
-
-#
-# Files to compile.
-#
-include FILES_c.gmk
-AUTO_FILES_JAVA_DIRS = java/util/zip
-
-FILES_export = \
- java/util/zip/CRC32.java \
- java/util/zip/Adler32.java \
- java/util/zip/Inflater.java \
- java/util/zip/Deflater.java \
- java/util/zip/ZipFile.java \
- java/util/zip/ZipEntry.java \
- java/util/jar/JarFile.java
-
-ifneq ($(PLATFORM), windows)
- # Use mmap unless explicitly disallowed
- ifneq ($(LIBZIP_CAN_USE_MMAP),false)
- OTHER_CFLAGS += -DUSE_MMAP
- endif
-endif
-
-ifeq ($(SYSTEM_ZLIB),true)
- OTHER_CFLAGS += $(ZLIB_CFLAGS)
-endif
-
-#
-# Library to compile.
-#
-ifeq ($(PLATFORM), solaris)
- ifneq ($(ARCH), amd64)
- FILES_reorder += reorder-$(ARCH)
- endif
-endif
-
-#
-# Use mapfile unconditionally (even with fastdebug).
-# JDK's internal zlib is incompatible with stock zlib, because the
-# size of struct z_stream has been changed, so internal zlib
-# implementation must not be allowed to leak outside of libzip.so,
-# else you get hard to debug failures with fastdebug jdk when user
-# native code includes stock zlib.
-#
-FILES_m = mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-ifeq ($(PLATFORM), windows)
-OTHER_LCF = -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
- -export:ZIP_ReadEntry -export:ZIP_GetNextEntry
-else
-CPPFLAGS += -UDEBUG
-endif
-
-CPPFLAGS += -I$(SHARE_SRC)/native/java/io
-CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
-
-ifneq ($(SYSTEM_ZLIB),true)
-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
-
-#
-# Add to ambient vpath so we pick up the library files
-#
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
-endif
-
-#
-# Link to JVM library for JVM_Zip* functions
-#
-ifeq ($(SYSTEM_ZLIB),true)
-OTHER_LDLIBS = $(ZLIB_LIBS)
-else
-OTHER_LDLIBS = $(JVMLIB)
-endif
-
diff --git a/jdk/make/java/zip/mapfile-vers b/jdk/make/java/zip/mapfile-vers
deleted file mode 100644
index 383fedf..0000000
--- a/jdk/make/java/zip/mapfile-vers
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Java_java_util_jar_JarFile_getMetaInfEntryNames;
- Java_java_util_zip_Adler32_update;
- Java_java_util_zip_Adler32_updateBytes;
- Java_java_util_zip_Adler32_updateByteBuffer;
- Java_java_util_zip_CRC32_update;
- Java_java_util_zip_CRC32_updateBytes;
- Java_java_util_zip_CRC32_updateByteBuffer;
- Java_java_util_zip_Deflater_deflateBytes;
- Java_java_util_zip_Deflater_end;
- Java_java_util_zip_Deflater_getAdler;
- Java_java_util_zip_Deflater_init;
- Java_java_util_zip_Deflater_initIDs;
- Java_java_util_zip_Deflater_reset;
- Java_java_util_zip_Deflater_setDictionary;
- Java_java_util_zip_Inflater_end;
- Java_java_util_zip_Inflater_getAdler;
- Java_java_util_zip_Inflater_inflateBytes;
- Java_java_util_zip_Inflater_init;
- Java_java_util_zip_Inflater_initIDs;
- Java_java_util_zip_Inflater_reset;
- Java_java_util_zip_Inflater_setDictionary;
- Java_java_util_zip_ZipFile_close;
- Java_java_util_zip_ZipFile_getCommentBytes;
- Java_java_util_zip_ZipFile_freeEntry;
- Java_java_util_zip_ZipFile_getEntry;
- Java_java_util_zip_ZipFile_getEntryBytes;
- Java_java_util_zip_ZipFile_getEntryCrc;
- Java_java_util_zip_ZipFile_getEntryCSize;
- Java_java_util_zip_ZipFile_getEntryFlag;
- Java_java_util_zip_ZipFile_getEntryMethod;
- Java_java_util_zip_ZipFile_getEntrySize;
- Java_java_util_zip_ZipFile_getEntryTime;
- Java_java_util_zip_ZipFile_getNextEntry;
- Java_java_util_zip_ZipFile_getZipMessage;
- Java_java_util_zip_ZipFile_getTotal;
- Java_java_util_zip_ZipFile_initIDs;
- Java_java_util_zip_ZipFile_open;
- Java_java_util_zip_ZipFile_read;
- Java_java_util_zip_ZipFile_startsWithLOC;
-
- ZIP_Close;
- ZIP_CRC32;
- ZIP_FindEntry;
- ZIP_GetEntry;
- ZIP_GetNextEntry;
- ZIP_Lock;
- ZIP_Open;
- ZIP_Read;
- ZIP_ReadEntry;
- ZIP_Unlock;
-
- local:
- *;
-};
diff --git a/jdk/make/java/zip/reorder-i586 b/jdk/make/java/zip/reorder-i586
deleted file mode 100644
index 73ea674..0000000
--- a/jdk/make/java/zip/reorder-i586
+++ /dev/null
@@ -1,50 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%ZIP_Open;
-text: .text%ZIP_Open_Generic;
-text: .text%InitializeZip;
-text: .text%allocZip;
-text: .text%readCEN: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o;
-text: .text%findEND: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o;
-text: .text%hash: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o;
-text: .text%isMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o;
-text: .text%addMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o;
-text: .text%ZIP_FindEntry;
-text: .text%ZIP_GetEntry;
-text: .text%ZIP_Lock;
-text: .text%readLOC: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o;
-text: .text%ZIP_Unlock;
-text: .text%ZIP_FreeEntry;
-text: .text%Java_java_util_zip_ZipFile_initIDs;
-text: .text%Java_java_util_zip_ZipFile_open;
-text: .text%Java_java_util_zip_ZipFile_getTotal;
-text: .text%Java_java_util_zip_ZipFile_startsWithLOC;
-text: .text%Java_java_util_zip_ZipFile_getEntry;
-text: .text%Java_java_util_zip_ZipFile_freeEntry;
-text: .text%Java_java_util_zip_ZipFile_getEntryTime;
-text: .text%Java_java_util_zip_ZipFile_getEntryCrc;
-text: .text%Java_java_util_zip_ZipFile_getEntryCSize;
-text: .text%Java_java_util_zip_ZipFile_getEntrySize;
-text: .text%Java_java_util_zip_ZipFile_getEntryFlag;
-text: .text%Java_java_util_zip_ZipFile_getEntryMethod;
-text: .text%Java_java_util_zip_ZipFile_getEntryBytes;
-text: .text%Java_java_util_zip_Inflater_initIDs;
-text: .text%Java_java_util_zip_Inflater_init;
-text: .text%inflateInit2_;
-text: .text%zcalloc;
-text: .text%inflateReset;
-text: .text%Java_java_util_zip_Inflater_inflateBytes;
-text: .text%inflate;
-text: .text%Java_java_util_zip_ZipFile_read;
-text: .text%ZIP_Read;
-text: .text%huft_build: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/inftrees.o;
-text: .text%zcfree;
-text: .text%Java_java_util_jar_JarFile_getMetaInfEntryNames;
-text: .text%ZIP_ReadEntry;
-text: .text%InflateFully;
-text: .text%inflateEnd;
-text: .text%Java_java_util_zip_Inflater_reset;
-text: .text%Java_java_util_zip_ZipFile_close;
-text: .text%ZIP_Close;
-text: .text%Java_java_util_zip_Inflater_end;
diff --git a/jdk/make/java/zip/reorder-sparc b/jdk/make/java/zip/reorder-sparc
deleted file mode 100644
index a5cde39..0000000
--- a/jdk/make/java/zip/reorder-sparc
+++ /dev/null
@@ -1,44 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-text: .text%ZIP_Open;
-text: .text%ZIP_Open_Generic;
-text: .text%InitializeZip;
-text: .text%allocZip;
-text: .text%readCEN: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o;
-text: .text%findEND: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o;
-text: .text%hash: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o;
-text: .text%isMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o;
-text: .text%addMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o;
-text: .text%ZIP_FindEntry;
-text: .text%ZIP_GetEntry;
-text: .text%ZIP_Lock;
-text: .text%ZIP_Unlock;
-text: .text%ZIP_FreeEntry;
-text: .text%Java_java_util_zip_ZipFile_initIDs;
-text: .text%Java_java_util_zip_ZipFile_open;
-text: .text%Java_java_util_zip_ZipFile_getTotal;
-text: .text%Java_java_util_zip_ZipFile_startsWithLOC;
-text: .text%Java_java_util_zip_ZipFile_getEntry;
-text: .text%Java_java_util_zip_ZipFile_freeEntry;
-text: .text%Java_java_util_zip_ZipFile_getEntryTime;
-text: .text%Java_java_util_zip_ZipFile_getEntryCrc;
-text: .text%Java_java_util_zip_ZipFile_getEntryCSize;
-text: .text%Java_java_util_zip_ZipFile_getEntrySize;
-text: .text%Java_java_util_zip_ZipFile_getEntryFlag;
-text: .text%Java_java_util_zip_ZipFile_getEntryMethod;
-text: .text%Java_java_util_zip_ZipFile_getEntryBytes;
-text: .text%Java_java_util_zip_Inflater_initIDs;
-text: .text%Java_java_util_zip_Inflater_init;
-text: .text%inflateInit2_;
-text: .text%zcalloc;
-text: .text%Java_java_util_zip_Inflater_inflateBytes;
-text: .text%Java_java_util_zip_ZipFile_read;
-text: .text%ZIP_Read;
-text: .text%zcfree;
-text: .text%Java_java_util_jar_JarFile_getMetaInfEntryNames;
-text: .text%Java_java_util_zip_Inflater_reset;
-text: .text%Java_java_util_zip_Inflater_end;
-text: .text%inflateEnd;
-text: .text%Java_java_util_zip_ZipFile_close;
-text: .text%ZIP_Close;
diff --git a/jdk/make/java/zip/reorder-sparcv9 b/jdk/make/java/zip/reorder-sparcv9
deleted file mode 100644
index 32ebae1..0000000
--- a/jdk/make/java/zip/reorder-sparcv9
+++ /dev/null
@@ -1,49 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-text: .text%ZIP_Open;
-text: .text%ZIP_Open_Generic;
-text: .text%InitializeZip;
-text: .text%allocZip;
-text: .text%readCEN: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o;
-text: .text%findEND: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o;
-text: .text%hash: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o;
-text: .text%isMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o;
-text: .text%addMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o;
-text: .text%ZIP_FindEntry;
-text: .text%ZIP_GetEntry;
-text: .text%ZIP_Lock;
-text: .text%readLOC: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o;
-text: .text%ZIP_Unlock;
-text: .text%ZIP_FreeEntry;
-text: .text%Java_java_util_zip_ZipFile_initIDs;
-text: .text%Java_java_util_zip_ZipFile_open;
-text: .text%Java_java_util_zip_ZipFile_getTotal;
-text: .text%Java_java_util_zip_ZipFile_startsWithLOC;
-text: .text%Java_java_util_zip_ZipFile_getEntry;
-text: .text%Java_java_util_zip_ZipFile_freeEntry;
-text: .text%Java_java_util_zip_ZipFile_getEntryTime;
-text: .text%Java_java_util_zip_ZipFile_getEntryCrc;
-text: .text%Java_java_util_zip_ZipFile_getEntryCSize;
-text: .text%Java_java_util_zip_ZipFile_getEntrySize;
-text: .text%Java_java_util_zip_ZipFile_getEntryFlag;
-text: .text%Java_java_util_zip_ZipFile_getEntryMethod;
-text: .text%Java_java_util_zip_ZipFile_getEntryBytes;
-text: .text%Java_java_util_zip_Inflater_initIDs;
-text: .text%Java_java_util_zip_Inflater_init;
-text: .text%inflateInit2_;
-text: .text%zcalloc;
-text: .text%inflateReset;
-text: .text%Java_java_util_zip_Inflater_inflateBytes;
-text: .text%inflate;
-text: .text%Java_java_util_zip_ZipFile_read;
-text: .text%ZIP_Read;
-text: .text%huft_build: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/inftrees.o;
-text: .text%zcfree;
-text: .text%Java_java_util_jar_JarFile_getMetaInfEntryNames;
-text: .text%ZIP_ReadEntry;
-text: .text%InflateFully;
-text: .text%inflateEnd;
-text: .text%Java_java_util_zip_Inflater_reset;
-text: .text%Java_java_util_zip_ZipFile_close;
-text: .text%ZIP_Close;
-text: .text%Java_java_util_zip_Inflater_end;
diff --git a/jdk/make/javax/Makefile b/jdk/make/javax/Makefile
deleted file mode 100644
index ebeec3c..0000000
--- a/jdk/make/javax/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building javax
-#
-
-BUILDDIR = ..
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = others security
-
-SUBDIRS_management = management
-
-SUBDIRS_misc = \
- crypto \
- sql \
- rmi
-
-# imageio uses xml, so build it last
-SUBDIRS_desktop = \
- accessibility \
- print \
- swing \
- sound \
- imageio
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build:
- $(SUBDIRS-loop)
-clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/javax/accessibility/Makefile b/jdk/make/javax/accessibility/Makefile
deleted file mode 100644
index 5775676..0000000
--- a/jdk/make/javax/accessibility/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = java.accessibility
-PRODUCT = java
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = javax/accessibility
-
-#
-# Resources
-#
-LOCALE_SUFFIXES += en
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_COMPILED_PROPERTIES = \
- com/sun/accessibility/internal/resources/accessibility.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/javax/crypto/Defs-jce.gmk b/jdk/make/javax/crypto/Defs-jce.gmk
deleted file mode 100644
index 6203129..0000000
--- a/jdk/make/javax/crypto/Defs-jce.gmk
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include $(BUILDDIR)/common/Release.gmk
-
-#
-# Include these extra attributes for now, should probably take out.
-#
-JCE_MANIFEST_FILE = $(TEMPDIR)/manifest.mf
-$(JCE_MANIFEST_FILE): $(MAINMANIFEST)
- $(prep-target)
- $(SED) -e "s#@@RELEASE@@#$(JDK_VERSION)#" \
- -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
- $(MAINMANIFEST) >> $@
- $(ECHO) "Extension-Name: javax.crypto" >> $@
- $(ECHO) "Implementation-Vendor-Id: com.sun" >> $@
-
-README-MAKEFILE_WARNING = \
- "\nPlease read make/javax/crypto/Makefile for further build instructions."
-
-define no-source-warning
- @$(ECHO) "\n***JCE sources are not available, skipping build.***" \
- $(README-MAKEFILE_WARNING)
-endef
-
-ifndef OPENJDK
-
-PREBUILT_DIR = $(BUILDDIR)/closed/tools/crypto
-
-define build-warning
- @$(ECHO) "\n***JCE in JDK builds require special tools/procedures.***" \
- $(README-MAKEFILE_WARNING)
-endef
-
-#
-# Location for JCE codesigning key.
-#
-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
-
-#
-# Defines for signing the various jar files.
-#
-
-define presign
- @if [ ! -f $(SIGNING_KEYSTORE) -o ! -f $(SIGNING_PASSPHRASE) ]; then \
- $(ECHO) "\n$(SIGNING_KEYSTORE): Signing mechanism *NOT* available..." \
- $(README-MAKEFILE_WARNING); \
- exit 2; \
- fi
-endef
-
-define sign-target
- $(BOOT_JARSIGNER_CMD) -keystore $(SIGNING_KEYSTORE) \
- $@ $(SIGNING_ALIAS) < $(SIGNING_PASSPHRASE)
- @$(java-vm-cleanup)
- @$(ECHO) "\nJar codesigning finished."
-endef
-
-RELEASE_DIR = $(OUTPUTDIR)/jce-release
-
-define release-warning
- @$(ECHO) \
- "\n***The jar files built by the 'release' target must***" \
- "\n***still be checked into the closed workspace! ***" \
- $(README-MAKEFILE_WARNING)
-endef
-
-#
-# Convenience macros for signing a jar file.
-#
-# Call through $(call sign-file, target file)
-#
-define sign-file
- $(presign)
- $(prep-target)
- $(CP) $1 $@
- $(sign-target)
-endef
-
-endif # !OPENJDK
diff --git a/jdk/make/javax/crypto/Makefile b/jdk/make/javax/crypto/Makefile
deleted file mode 100644
index 26af432..0000000
--- a/jdk/make/javax/crypto/Makefile
+++ /dev/null
@@ -1,489 +0,0 @@
-#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building jce.jar and the various cryptographic strength
-# policy jar files.
-#
-
-#
-# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Sun JDK builds
-# respectively.)
-#
-# JCE builds are very different between OpenJDK and JDK. The OpenJDK JCE
-# jar files do not require signing, but those for JDK do. If an unsigned
-# jar file is installed into JDK, things will break when the crypto
-# routines are called.
-#
-# This Makefile does the "real" build of the JCE files. There are some
-# javac options currently specific to JCE, so we recompile now to make
-# sure any implicit compilations didn't use any incorrect flags.
-#
-# For OpenJDK, the jar files built here are installed directly into the
-# OpenJDK.
-#
-# For JDK, the binaries use pre-built/pre-signed binary files stored in
-# the closed workspace that are not shipped in the OpenJDK workspaces.
-# We still build the JDK files here to verify the files compile, and in
-# preparation for possible signing. Developers working on JCE in JDK
-# must sign the JCE files before testing. The JCE signing key is kept
-# separate from the JDK workspace to prevent its disclosure.
-#
-# SPECIAL NOTE TO JCE/JDK developers: The source files must eventually
-# be built and signed, and the resulting jar files *MUST BE CHECKED INTO
-# THE CLOSED PART OF THE WORKSPACE*. This separate step *MUST NOT BE
-# FORGOTTEN*, otherwise a bug fixed in the source code will not be
-# reflected in the shipped binaries. The "release" target should be
-# used to generate the required files.
-#
-# There are a number of targets to help both JDK/OpenJDK developers.
-#
-# Main Targets (JDK/OPENJDK):
-#
-# all/clobber/clean The usual.
-# If OpenJDK: builds/installs the
-# jce.jar/limited policy files.
-# If JDK: builds but does not install.
-# During full tops-down builds,
-# prebuilt/presigned jce.jar &
-# limited policy files are copied
-# in by make/java/redist/Makefile.
-# If you are working in this directory
-# and want to install the prebuilts,
-# use the "install-prebuilt" target.
-#
-# jar Builds/installs jce.jar
-# If OpenJDK, does not sign
-# If JDK, tries to sign
-#
-# Other lesser-used Targets (JDK/OPENJDK):
-#
-# build-jar Builds jce.jar (does not sign/install)
-#
-# build-policy Builds policy files (does not sign/install)
-#
-# install-jar Alias for "jar" above
-#
-# install-limited Builds/installs limited policy files
-# If OpenJDK, does not sign
-# If JDK, tries to sign
-# install-unlimited Builds/nstalls unlimited policy files
-# If OpenJDK, does not sign
-# If JDK, tries to sign
-#
-# Other targets (JDK only):
-#
-# sign Alias for sign-jar and sign-policy
-# sign-jar Builds/signs jce.jar file (no install)
-# sign-policy Builds/signs policy files (no install)
-#
-# release Builds all targets in preparation
-# for workspace integration.
-#
-# install-prebuilt Installs the pre-built jar files
-#
-# This makefile was written to support parallel target execution.
-#
-
-BUILDDIR = ../..
-PACKAGE = javax.crypto
-PRODUCT = sun
-
-#
-# The following is for when we need to do postprocessing
-# (signing) against a read-only build. If the OUTPUTDIR
-# isn't writable, the build currently crashes out.
-#
-ifndef OPENJDK
- ifdef ALT_JCE_BUILD_DIR
- # =====================================================
- # Where to place the output, in case we're building from a read-only
- # build area. (e.g. a release engineering build.)
- JCE_BUILD_DIR=${ALT_JCE_BUILD_DIR}
- IGNORE_WRITABLE_OUTPUTDIR_TEST=true
- else
- JCE_BUILD_DIR=${TEMPDIR}
- endif
-endif
-
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Location for the newly built classfiles.
-#
-CLASSDESTDIR = $(TEMPDIR)/classes
-
-#
-# Subdirectories of these are automatically included.
-#
-AUTO_FILES_JAVA_DIRS = \
- javax/crypto \
- sun/security/internal/interfaces \
- sun/security/internal/spec
-
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Rules
-#
-
-#
-# Some licensees do not get the security sources, but we still need to
-# be able to build "all" for them. Check here to see if the sources were
-# available. If not, then we don't need to continue this rule.
-#
-
-ifdef OPENJDK
-ifdef UNLIMITED_CRYPTO
-POLICY = install-unlimited
-else
-POLICY = install-limited
-endif
-all: build-jar install-jar build-policy $(POLICY)
-else # OPENJDK
-ifeq ($(strip $(FILES_java)),)
-all:
- $(no-source-warning)
-else # FILES_java/policy files available
-all: build-jar build-policy
- $(build-warning)
-endif # $(FILES_java)/policy files available
-endif # OPENJDK
-
-#
-# We use a variety of subdirectories in the $(TEMPDIR) depending on what
-# part of the build we're doing. Both OPENJDK/JDK builds are initially
-# done in the unsigned area. When files are signed in JDK, they will be
-# placed in the appropriate areas.
-#
-UNSIGNED_DIR = $(TEMPDIR)/unsigned
-
-include Defs-jce.gmk
-
-
-# =====================================================
-# Build the unsigned jce.jar file. Signing comes later.
-#
-
-JAR_DESTFILE = $(LIBDIR)/jce.jar
-
-#
-# JCE building is somewhat involved.
-#
-# OpenJDK: Since we do not ship prebuilt JCE files, previous compiles
-# in the build may have needed JCE class signatures. There were then
-# implicitly built by javac (likely using the boot javac). While using
-# those class files was fine for signatures, we need to rebuild using
-# the right compiler.
-#
-# JDK: Even through the jce.jar was previously installed, since the
-# source files are accessible in the source directories, they will
-# always be "newer" than the prebuilt files inside the jar, and thus
-# make will always rebuild them. (We could "hide" the JCE source in a
-# separate directory, but that would make the build logic for JDK and
-# OpenJDK more complicated.)
-#
-# Thus in either situation, we shouldn't use these files.
-#
-# To make sure the classes were built with the right compiler options,
-# delete the existing files in $(CLASSBINDIR), rebuild the right way in a
-# directory under $(TEMPDIR), then copy the files back to
-# $(CLASSBINDIR). Building in $(TEMPDIR) allows us to use our make
-# infrastructure without modification: .classes.list, macros, etc.
-#
-
-#
-# The list of directories that will be remade from scratch, using the
-# right compilers/options.
-#
-DELETE_DIRS = $(patsubst %, $(CLASSBINDIR)/%, $(AUTO_FILES_JAVA_DIRS))
-
-#
-# Since the -C option to jar is used below, each directory entry must be
-# preceded with the appropriate directory to "cd" into.
-#
-JAR_DIRS = $(patsubst %, -C $(CLASSDESTDIR) %, $(AUTO_FILES_JAVA_DIRS))
-
-build-jar: $(UNSIGNED_DIR)/jce.jar
-
-#
-# Build jce.jar, then replace the previously built JCE files in the
-# classes directory with these. This ensures we have consistently built
-# files throughout the workspaces.
-#
-$(UNSIGNED_DIR)/jce.jar: prebuild build $(JCE_MANIFEST_FILE)
- $(prep-target)
- $(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ $(JAR_DIRS) \
- $(BOOT_JAR_JFLAGS)
- $(CP) -r $(CLASSDESTDIR)/* $(CLASSBINDIR)
- @$(java-vm-cleanup)
-
-build: prebuild
-
-prebuild:
- $(RM) -r $(DELETE_DIRS)
-
-
-# =====================================================
-# Build the unsigned policy files.
-#
-# Given the current state of world export/import policies,
-# these settings work for Sun's situation. This note is not
-# legal guidance, you must still resolve any export/import issues
-# applicable for your situation. Contact your export/import
-# counsel for more information.
-#
-
-POLICY_DESTDIR = $(LIBDIR)/security
-UNSIGNED_POLICY_BUILDDIR = $(UNSIGNED_DIR)/policy
-
-build-policy: unlimited limited
-
-#
-# Build the unsigned unlimited policy files.
-#
-unlimited: \
- $(UNSIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar \
- $(UNSIGNED_POLICY_BUILDDIR)/unlimited/local_policy.jar
-
-$(UNSIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar: \
- policy/unlimited/default_US_export.policy \
- policy/unlimited/UNLIMITED
- $(prep-target)
- $(BOOT_JAR_CMD) cmf policy/unlimited/UNLIMITED $@ \
- -C policy/unlimited default_US_export.policy \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-$(UNSIGNED_POLICY_BUILDDIR)/unlimited/local_policy.jar: \
- policy/unlimited/default_local.policy \
- policy/unlimited/UNLIMITED
- $(prep-target)
- $(BOOT_JAR_CMD) cmf policy/unlimited/UNLIMITED $@ \
- -C policy/unlimited default_local.policy \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-#
-# Build the unsigned limited policy files.
-#
-# NOTE: We currently do not place restrictions on our limited export
-# policy. This was not a typo.
-#
-limited: \
- $(UNSIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar \
- $(UNSIGNED_POLICY_BUILDDIR)/limited/local_policy.jar
-
-$(UNSIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar: \
- $(UNSIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar
- $(install-file)
-
-$(UNSIGNED_POLICY_BUILDDIR)/limited/local_policy.jar: \
- policy/limited/default_local.policy \
- policy/limited/exempt_local.policy \
- policy/limited/LIMITED
- $(prep-target)
- $(BOOT_JAR_CMD) cmf policy/limited/LIMITED $@ \
- -C policy/limited default_local.policy \
- -C policy/limited exempt_local.policy \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-UNSIGNED_POLICY_FILES = \
- $(UNSIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar \
- $(UNSIGNED_POLICY_BUILDDIR)/unlimited/local_policy.jar \
- $(UNSIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar \
- $(UNSIGNED_POLICY_BUILDDIR)/limited/local_policy.jar \
-
-
-ifndef OPENJDK
-# =====================================================
-# Sign the various jar files. Not needed for OpenJDK.
-#
-
-SIGNED_DIR = $(JCE_BUILD_DIR)/signed
-SIGNED_POLICY_BUILDDIR = $(SIGNED_DIR)/policy
-
-SIGNED_POLICY_FILES = \
- $(patsubst $(UNSIGNED_POLICY_BUILDDIR)/%,$(SIGNED_POLICY_BUILDDIR)/%, \
- $(UNSIGNED_POLICY_FILES))
-
-sign: sign-jar sign-policy
-
-sign-jar: $(SIGNED_DIR)/jce.jar
-
-sign-policy: $(SIGNED_POLICY_FILES)
-
-ifndef ALT_JCE_BUILD_DIR
-$(SIGNED_DIR)/jce.jar: $(UNSIGNED_DIR)/jce.jar
-else
-#
-# We have to remove the build dependency, otherwise, we'll try to rebuild it
-# which we can't do on a read-only filesystem.
-#
-$(SIGNED_DIR)/jce.jar:
- @if [ ! -r $(UNSIGNED_DIR)/jce.jar ] ; then \
- $(ECHO) "Couldn't find $(UNSIGNED_DIR)/jce.jar"; \
- exit 1; \
- fi
-endif
- $(call sign-file, $(UNSIGNED_DIR)/jce.jar)
-
-$(SIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar: \
- $(UNSIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar
- $(call sign-file, $<)
-
-$(SIGNED_POLICY_BUILDDIR)/unlimited/local_policy.jar: \
- $(UNSIGNED_POLICY_BUILDDIR)/unlimited/local_policy.jar
- $(call sign-file, $<)
-
-$(SIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar: \
- $(UNSIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar
- $(call sign-file, $<)
-
-$(SIGNED_POLICY_BUILDDIR)/limited/local_policy.jar: \
- $(UNSIGNED_POLICY_BUILDDIR)/limited/local_policy.jar
- $(call sign-file, $<)
-
-
-# =====================================================
-# Create the Release Engineering files. Signed builds,
-# unlimited policy file distribution, etc.
-#
-
-CLOSED_DIR = $(BUILDDIR)/closed/javax/crypto
-
-release: $(SIGNED_DIR)/jce.jar sign-policy $(CLOSED_DIR)/doc/README.txt
- $(RM) -r \
- $(JCE_BUILD_DIR)/release/UnlimitedJCEPolicy \
- $(JCE_BUILD_DIR)/release/jce.jar \
- $(JCE_BUILD_DIR)/release/US_export_policy.jar \
- $(JCE_BUILD_DIR)/release/local_policy.jar \
- $(JCE_BUILD_DIR)/release/UnlimitedJCEPolicy.zip
- $(MKDIR) -p $(JCE_BUILD_DIR)/release/UnlimitedJCEPolicy
- $(CP) $(SIGNED_DIR)/jce.jar $(JCE_BUILD_DIR)/release
- $(CP) \
- $(SIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar \
- $(SIGNED_POLICY_BUILDDIR)/limited/local_policy.jar \
- $(JCE_BUILD_DIR)/release
- $(CP) \
- $(SIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar \
- $(SIGNED_POLICY_BUILDDIR)/unlimited/local_policy.jar \
- $(CLOSED_DIR)/doc/README.txt \
- $(JCE_BUILD_DIR)/release/UnlimitedJCEPolicy
- cd $(JCE_BUILD_DIR)/release ; \
- $(ZIPEXE) -qr UnlimitedJCEPolicy.zip UnlimitedJCEPolicy
- $(release-warning)
-
-endif # OPENJDK
-
-
-# =====================================================
-# Install routines.
-#
-
-#
-# Install jce.jar, depending on which type is requested.
-#
-install-jar jar: $(JAR_DESTFILE)
-ifndef OPENJDK
- $(release-warning)
-endif
-
-ifdef OPENJDK
-$(JAR_DESTFILE): $(UNSIGNED_DIR)/jce.jar
-else
-$(JAR_DESTFILE): $(SIGNED_DIR)/jce.jar
-endif
- $(install-file)
-
-#
-# Install the appropriate policy file, depending on the type of build.
-#
-ifdef OPENJDK
-INSTALL_POLICYDIR = $(UNSIGNED_POLICY_BUILDDIR)
-else
-INSTALL_POLICYDIR = $(SIGNED_POLICY_BUILDDIR)
-endif
-
-install-limited-jars: \
- $(INSTALL_POLICYDIR)/limited/US_export_policy.jar \
- $(INSTALL_POLICYDIR)/limited/local_policy.jar
- $(MKDIR) -p $(POLICY_DESTDIR)
- $(RM) \
- $(POLICY_DESTDIR)/US_export_policy.jar \
- $(POLICY_DESTDIR)/local_policy.jar
- $(CP) $^ $(POLICY_DESTDIR)
-
-install-limited: install-limited-jars
-ifndef OPENJDK
- $(release-warning)
-endif
-
-install-unlimited-jars: \
- $(INSTALL_POLICYDIR)/unlimited/US_export_policy.jar \
- $(INSTALL_POLICYDIR)/unlimited/local_policy.jar
- $(MKDIR) -p $(POLICY_DESTDIR)
- $(RM) \
- $(POLICY_DESTDIR)/US_export_policy.jar \
- $(POLICY_DESTDIR)/local_policy.jar
- $(CP) $^ $(POLICY_DESTDIR)
-
-install-unlimited: install-unlimited-jars
-ifndef OPENJDK
- $(release-warning)
-endif
-
-ifndef OPENJDK
-install-prebuilt-jars:
- @$(ECHO) "\n>>>Installing prebuilt JCE framework..."
- $(RM) $(JAR_DESTFILE) \
- $(POLICY_DESTDIR)/US_export_policy.jar \
- $(POLICY_DESTDIR)/local_policy.jar
- $(CP) $(PREBUILT_DIR)/jce/jce.jar $(JAR_DESTFILE)
- $(CP) \
- $(PREBUILT_DIR)/jce/US_export_policy.jar \
- $(PREBUILT_DIR)/jce/local_policy.jar \
- $(POLICY_DESTDIR)
-
-install-prebuilt: install-prebuilt-jars
-endif
-
-# =====================================================
-# Support routines.
-#
-
-clobber clean::
- $(RM) -r $(JAR_DESTFILE) $(POLICY_DESTDIR)/US_export_policy.jar \
- $(POLICY_DESTDIR)/local_policy.jar $(DELETE_DIRS) $(TEMPDIR) \
- $(JCE_BUILD_DIR)
-
-.PHONY: build-jar jar build-policy unlimited limited install-jar \
- install-limited install-unlimited
-ifndef OPENJDK
-.PHONY: sign sign-jar sign-policy release install-prebuilt
-endif
diff --git a/jdk/make/javax/imageio/Makefile b/jdk/make/javax/imageio/Makefile
deleted file mode 100644
index c73f6f5..0000000
--- a/jdk/make/javax/imageio/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of JIIO (Java Image I/O) API
-#
-
-BUILDDIR = ../..
-PACKAGE = javax.imageio
-PRODUCT = jiio
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = javax/imageio com/sun/imageio
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-OTHER_PROPERTIES = com/sun/imageio/plugins/common/iio-plugin.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-build: copy-files
-
-copy-files: $(FILES_copy)
-
-.PHONY: copy-files
-
diff --git a/jdk/make/javax/management/Makefile b/jdk/make/javax/management/Makefile
deleted file mode 100644
index 7887a2a..0000000
--- a/jdk/make/javax/management/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of JMX
-#
-
-BUILDDIR = ../..
-PACKAGE = javax.management
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_JAVA_PRUNE = snmp
-AUTO_FILES_JAVA_DIRS = javax/management com/sun/jmx com/sun/management/jmx
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Clean up internal-use-only package.
-#
-clean clobber::
- $(RM) -r $(CLASSDESTDIR)/com/sun/jmx \
- $(CLASSDESTDIR)/com/sun/management/jmx \
- $(CLASSDESTDIR)/org/omg/stub/javax/management/remote/rmi \
-
diff --git a/jdk/make/javax/others/Makefile b/jdk/make/javax/others/Makefile
deleted file mode 100644
index 7ee1151..0000000
--- a/jdk/make/javax/others/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building javax (other classes)
-#
-
-BUILDDIR = ../..
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-JAVAC_LINT_OPTIONS += -Xlint:-deprecation
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = \
- javax/naming \
- com/sun/naming/internal \
- javax/net \
- javax/script \
- javax/tools \
- javax/xml
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/javax/print/Makefile b/jdk/make/javax/print/Makefile
deleted file mode 100644
index 6e1c5c9..0000000
--- a/jdk/make/javax/print/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of JPS (Java Print Service) API
-#
-
-BUILDDIR = ../..
-PACKAGE = javax.print
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = javax/print sun/print
-
-#
-# Files that just need cp.
-#
-SERVICEDIR = $(CLASSBINDIR)/META-INF/services
-
-FILES_copy = \
- $(SERVICEDIR)/javax.print.StreamPrintServiceFactory \
- $(SERVICEDIR)/javax.print.PrintServiceLookup
-
-FILES_mkdirs = \
- $(CLASSBINDIR)/META-INF \
- $(CLASSBINDIR)/META-INF/services
-
-FILES_copydirs = \
- $(FILES_mkdirs)
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_COMPILED_PROPERTIES = sun/print/resources/serviceui.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Rules that copy files.
-#
-
-build: copy-files properties
-
-_PSFONTPROPS = \
- psfontj2d.properties \
- psfont.properties.ja \
-
-PSFONTPROPS_SRC = $(SHARE_SRC)/classes/sun/print
-PSFONTPROPS = $(_PSFONTPROPS:%=$(LIBDIR)/%)
-
-_RESOURCES_PRINT = \
- orientLandscape.png \
- orientPortrait.png \
- orientRevLandscape.png \
- orientRevPortrait.png \
- oneside.png \
- duplex.png \
- tumble.png
-
-
-RESDIR_PRINT = $(CLASSBINDIR)/sun/print/resources
-RESOURCES_PRINT = $(_RESOURCES_PRINT:%=$(RESDIR_PRINT)/%)
-
-$(LIBDIR)/%: $(PSFONTPROPS_SRC)/% $(FONTPROPS)
- $(install-file)
-
-$(RESDIR_PRINT)/%: $(SHARE_SRC)/classes/sun/print/resources/%
- $(install-file)
-
-properties: $(LIBDIR) $(PSFONTPROPS) $(RESOURCES_PRINT)
-
-properties.clean:
- $(RM) $(PSFONTPROPS)
- $(RM) -r $(RESDIR_PRINT)
-
-copy-files: $(FILES_copy)
-
-$(SERVICEDIR)/%: $(PLATFORM_SRC)/classes/sun/print/services/%
- $(install-file)
-
-#
-# Clean up internal-use-only package.
-#
-clean::
- $(RM) -r $(CLASSDESTDIR)/javax/print $(CLASSDESTDIR)/sun/print
-
-.PHONY: copy-files
diff --git a/jdk/make/javax/rmi/Makefile b/jdk/make/javax/rmi/Makefile
deleted file mode 100644
index a540008..0000000
--- a/jdk/make/javax/rmi/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for javax/rmi
-#
-
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = ssl
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/javax/rmi/ssl/Makefile b/jdk/make/javax/rmi/ssl/Makefile
deleted file mode 100644
index d03a73f..0000000
--- a/jdk/make/javax/rmi/ssl/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building RMI SSL socket factories
-#
-
-BUILDDIR = ../../..
-PACKAGE = javax.rmi.ssl
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = javax/rmi/ssl
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/javax/security/Makefile b/jdk/make/javax/security/Makefile
deleted file mode 100644
index 63caae8..0000000
--- a/jdk/make/javax/security/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building javax (security classes)
-#
-
-BUILDDIR = ../..
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = \
- javax/security/auth \
- javax/security/cert \
- javax/security/sasl \
- javax/smartcardio
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/javax/sound/FILES_c.gmk b/jdk/make/javax/sound/FILES_c.gmk
deleted file mode 100644
index aa5d257..0000000
--- a/jdk/make/javax/sound/FILES_c.gmk
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- Utilities.c \
- Platform.c
-
-FILES_solaris = \
- PLATFORM_API_SolarisOS_Utils.c \
- PLATFORM_API_SolarisOS_Ports.c \
- PLATFORM_API_SolarisOS_PCM.c
-
-FILES_linux =
-
-FILES_bsd =
-
-FILES_macosx = \
- PLATFORM_API_MacOSX_MidiIn.c \
- PLATFORM_API_MacOSX_MidiOut.c \
- PLATFORM_API_MacOSX_MidiUtils.c
-
-FILES_cpp_macosx = \
- PLATFORM_API_MacOSX_Utils.cpp \
- PLATFORM_API_MacOSX_PCM.cpp \
- PLATFORM_API_MacOSX_Ports.cpp
-
-FILES_windows = \
- PLATFORM_API_WinOS_MidiIn.c \
- PLATFORM_API_WinOS_MidiOut.c \
- PLATFORM_API_WinOS_Util.c \
- PLATFORM_API_WinOS_Ports.c
-
-FILES_export = \
- com/sun/media/sound/Platform.java
-
diff --git a/jdk/make/javax/sound/Makefile b/jdk/make/javax/sound/Makefile
deleted file mode 100644
index cb455a7..0000000
--- a/jdk/make/javax/sound/Makefile
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = javax.sound
-LIBRARY = jsound
-PRODUCT = sun
-
-ifeq ($(PLATFORM),macosx)
-CPLUSPLUSLIBRARY = true
-endif
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# include defines for sound
-include SoundDefs.gmk
-
-# support for different mixer provider files on different platforms
-#MXSP = javax.sound.sampled.spi.MixerProvider
-# Mixer Service Provider Additional path
-#MXSPP_ADD =
-
-#
-# Add use of mapfile
-#
-FILES_m = mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-#
-# Files
-#
-include FILES_c.gmk
-
-# add java files
-AUTO_FILES_JAVA_DIRS = javax/sound com/sun/media/sound
-
-#
-# Files that just need cp.
-#
-SERVICEDIR = $(CLASSBINDIR)/META-INF/services
-
-FILES_copy = \
- $(SERVICEDIR)/javax.sound.midi.spi.MidiDeviceProvider \
- $(SERVICEDIR)/javax.sound.midi.spi.MidiFileWriter \
- $(SERVICEDIR)/javax.sound.midi.spi.MidiFileReader \
- $(SERVICEDIR)/javax.sound.midi.spi.SoundbankReader \
- $(SERVICEDIR)/javax.sound.sampled.spi.AudioFileWriter \
- $(SERVICEDIR)/javax.sound.sampled.spi.AudioFileReader \
- $(SERVICEDIR)/javax.sound.sampled.spi.FormatConversionProvider \
- $(SERVICEDIR)/javax.sound.sampled.spi.MixerProvider \
- $(LIBDIR)/sound.properties
-
-FILES_mkdirs = \
- $(CLASSBINDIR)/META-INF \
- $(CLASSBINDIR)/META-INF/services
-
-FILES_copydirs = \
- $(CLASSBINDIR) \
- $(LIBDIR) \
- $(FILES_mkdirs)
-
-FILES_c += $(FILES_$(PLATFORM))
-FILES_cpp += $(FILES_cpp_$(PLATFORM))
-
-
-#
-# system dependent flags
-#
-ifeq ($(PLATFORM), windows)
- CPPFLAGS += -DUSE_PLATFORM_MIDI_OUT=TRUE \
- -DUSE_PLATFORM_MIDI_IN=TRUE \
- -DUSE_PORTS=TRUE
- LDLIBS += winmm.lib
-
- # Windows always provides MIDI and ports
- INCLUDE_MIDI = TRUE
- INCLUDE_PORTS = TRUE
-
- # DirectSound handles directaudio (both i586 and amd64)
- SUBDIRS += jsoundds
- EXTRA_SOUND_JNI_LIBS += jsoundds
- #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
-endif # PLATFORM win32
-
-ifeq ($(PLATFORM), linux)
- # ALSA handles directaudio, ports, and MIDI
- SUBDIRS += jsoundalsa
- EXTRA_SOUND_JNI_LIBS += jsoundalsa
- #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
-endif # PLATFORM linux
-
-ifeq ($(PLATFORM), macosx)
- CPPFLAGS += -DUSE_PORTS=TRUE \
- -DUSE_DAUDIO=TRUE \
- -DUSE_PLATFORM_MIDI_OUT=TRUE \
- -DUSE_PLATFORM_MIDI_IN=TRUE
-
- INCLUDE_PORTS = TRUE
- INCLUDE_DAUDIO = TRUE
- INCLUDE_MIDI = TRUE
-
- LDFLAGS += -framework CoreAudio -framework CoreFoundation \
- -framework CoreServices -framework AudioUnit -lstdc++ \
- -framework CoreMIDI -framework AudioToolbox
- CXXFLAGS += -I`xcode-select -print-path`/Extras/CoreAudio/PublicUtility
-endif
-
-ifeq ($(PLATFORM), solaris)
- # build with ports and direct audio
- CPPFLAGS += -DUSE_PORTS=TRUE \
- -DUSE_DAUDIO=TRUE
-
- INCLUDE_PORTS = TRUE
- INCLUDE_DAUDIO = TRUE
- # build with empty MIDI i/o
- INCLUDE_MIDI = TRUE
-endif # PLATFORM solaris
-
-# for dynamic inclusion of extra sound libs: these
-# JNI libs will be loaded from Platform.java
-CPPFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
-
-# integrate MIDI i/o in jsound lib
-ifeq ($(INCLUDE_MIDI),TRUE)
- FILES_c += $(MIDIFILES_c)
- FILES_export += $(MIDIFILES_export)
-endif
-
-# integrate port files in jsound lib
-ifeq ($(INCLUDE_PORTS),TRUE)
- FILES_c += $(PORTFILES_c)
- FILES_export += $(PORTFILES_export)
-endif
-
-# integrate port files in jsound lib
-ifeq ($(INCLUDE_DAUDIO),TRUE)
- FILES_c += $(DAUDIOFILES_c)
- FILES_export += $(DAUDIOFILES_export)
-endif
-
-#
-# Extra cc/linker flags.
-#
-CPPFLAGS += \
- -I$(SHARE_SRC)/native/com/sun/media/sound
-
-ifeq ($(PLATFORM), macosx)
-vpath %.c $(call NativeSrcDirList,,native/com/sun/media/sound)
-vpath %.cpp $(call NativeSrcDirList,,native/com/sun/media/sound)
-
-else
-#
-# Add to the ambient VPATH.
-#
-vpath %.c $(SHARE_SRC)/native/com/sun/media/sound
-vpath %.c $(PLATFORM_SRC)/native/com/sun/media/sound
-vpath %.cpp $(PLATFORM_SRC)/native/com/sun/media/sound
-
-endif
-
-#
-# Include rules
-#
-include $(BUILDDIR)/common/Library.gmk
-include $(BUILDDIR)/common/Subdirs.gmk
-
-#
-# Rules that copy files.
-#
-
-build: copy-files
- $(SUBDIRS-loop)
-
-copy-files: $(FILES_copy)
-
-#$(SERVICEDIR)/$(MXSP): $(SHARE_SRC)/classes/com/sun/media/sound/services/$(MXSPP_ADD)$(MXSP)
-# $(install-file)
-
-$(SERVICEDIR)/%: $(SHARE_SRC)/classes/com/sun/media/sound/services/%
- $(install-file)
-
-$(LIBDIR)/audio/%: $(SHARE_SRC)/lib/audio/%
- $(install-file)
-
-$(LIBDIR)/%: $(SHARE_SRC)/lib/%
- $(install-file)
-
-#
-# Since we build more than the javax.sound (as stated in the
-# PACKAGE variable), we need to nuke the extra packages explicitly.
-#
-clean clobber::
- $(SUBDIRS-loop)
-
-clean clobber::
- $(RM) -r $(CLASSBINDIR)/com/sun/media/sound $(LIBDIR)/audio
- $(RM) $(FILES_copy)
-
-#
-# Declare extra phony targets.
-#
-.PHONY: copy-files
diff --git a/jdk/make/javax/sound/SoundDefs.gmk b/jdk/make/javax/sound/SoundDefs.gmk
deleted file mode 100644
index 26ec376..0000000
--- a/jdk/make/javax/sound/SoundDefs.gmk
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# defines common for all Java Sound native code
-
-SUBDIRS=
-EXTRA_SOUND_JNI_LIBS=
-
-#
-# Extra cc/linker flags.
-#
-# system dependent flags
-ifeq ($(PLATFORM), windows)
- CPPFLAGS += -DX_PLATFORM=X_WINDOWS
-endif # PLATFORM windows
-
-ifeq ($(PLATFORM), linux)
- CPPFLAGS += -DX_PLATFORM=X_LINUX
-endif # PLATFORM linux
-
-ifeq ($(PLATFORM), macosx)
- CPPFLAGS += -DX_PLATFORM=X_MACOSX
-endif # PLATFORM macosx
-
-ifeq ($(PLATFORM), solaris)
- CPPFLAGS += -DX_PLATFORM=X_SOLARIS
-
- # Solaris needs specific binding to libc
- LDFLAGS += -lc
-
- #
- # Turn off C++ exception handling.
- #
- ifneq ($(CC_VERSION),gcc)
- CXXFLAGS += -noex
- endif # CC_VERSION
-
-endif # PLATFORM solaris
-
-ifeq ($(ZERO_BUILD), true)
- CPPFLAGS += -DX_ARCH=X_ZERO
-else
- ifeq ($(ARCH), i586)
- CPPFLAGS += -DX_ARCH=X_I586
- endif # ARCH i586
-
- ifeq ($(ARCH), sparc)
- CPPFLAGS += -DX_ARCH=X_SPARC
- endif # ARCH sparc
-
- ifeq ($(ARCH), sparcv9)
- CPPFLAGS += -DX_ARCH=X_SPARCV9
- endif # ARCH sparcv9
-
- ifeq ($(ARCH), amd64)
- CPPFLAGS += -DX_ARCH=X_AMD64
- endif # ARCH amd64
-
- ifeq ($(ARCH), arm)
- CPPFLAGS += -DX_ARCH=X_ARM
- endif # ARCH arm
-
- ifeq ($(ARCH), ppc)
- CPPFLAGS += -DX_ARCH=X_PPC
- endif # ARCH ppc
-
-endif
-
-
-# files needed for MIDI i/o
-MIDIFILES_c = \
- MidiInDevice.c \
- MidiInDeviceProvider.c \
- MidiOutDevice.c \
- MidiOutDeviceProvider.c \
- PlatformMidi.c
-
-MIDIFILES_export = \
- com/sun/media/sound/MidiInDevice.java \
- com/sun/media/sound/MidiInDeviceProvider.java \
- com/sun/media/sound/MidiOutDevice.java \
- com/sun/media/sound/MidiOutDeviceProvider.java
-
-# files needed for ports
-PORTFILES_c = \
- PortMixerProvider.c \
- PortMixer.c
-
-PORTFILES_export = \
- com/sun/media/sound/PortMixer.java \
- com/sun/media/sound/PortMixerProvider.java
-
-# files needed for direct audio
-DAUDIOFILES_c = \
- DirectAudioDeviceProvider.c \
- DirectAudioDevice.c
-
-DAUDIOFILES_export = \
- com/sun/media/sound/DirectAudioDeviceProvider.java \
- com/sun/media/sound/DirectAudioDevice.java
-
-
diff --git a/jdk/make/javax/sound/jsoundalsa/Makefile b/jdk/make/javax/sound/jsoundalsa/Makefile
deleted file mode 100644
index 79974bf..0000000
--- a/jdk/make/javax/sound/jsoundalsa/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = javax.sound
-LIBRARY = jsoundalsa
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-# this Makefile compiles the native files for alsa support in java sound
-
-# include defines for sound
-include ../SoundDefs.gmk
-
-#
-# Use mapfile
-#
-FILES_m = mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-#
-# Files
-#
-
-FILES_c = \
- Utilities.c \
- $(DAUDIOFILES_c) \
- $(MIDIFILES_c) \
- $(PORTFILES_c)
-
-# platform dependent files
-FILES_c += \
- PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \
- PLATFORM_API_LinuxOS_ALSA_PCM.c \
- PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \
- PLATFORM_API_LinuxOS_ALSA_MidiIn.c \
- PLATFORM_API_LinuxOS_ALSA_MidiOut.c \
- PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
- PLATFORM_API_LinuxOS_ALSA_Ports.c
-
-FILES_export = \
- $(DAUDIOFILES_export) \
- $(MIDIFILES_export) \
- $(PORTFILES_export)
-
-OTHER_LDLIBS += -lasound
-
-CPPFLAGS += \
- -DUSE_DAUDIO=TRUE \
- -DUSE_PORTS=TRUE \
- -DUSE_PLATFORM_MIDI_OUT=TRUE \
- -DUSE_PLATFORM_MIDI_IN=TRUE \
- -I$(SHARE_SRC)/native/com/sun/media/sound
-
-#
-# Add to the ambient VPATH.
-#
-vpath %.c $(SHARE_SRC)/native/com/sun/media/sound
-vpath %.c $(PLATFORM_SRC)/native/com/sun/media/sound
-vpath %.cpp $(PLATFORM_SRC)/native/com/sun/media/sound
-
-
-#
-# Include rules
-#
-include $(BUILDDIR)/common/Library.gmk
-
-
-
diff --git a/jdk/make/javax/sound/jsoundalsa/mapfile-vers b/jdk/make/javax/sound/jsoundalsa/mapfile-vers
deleted file mode 100644
index 336fb3b..0000000
--- a/jdk/make/javax/sound/jsoundalsa/mapfile-vers
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- global:
- Java_com_sun_media_sound_DirectAudioDeviceProvider_nGetNumDevices;
- Java_com_sun_media_sound_DirectAudioDeviceProvider_nNewDirectAudioDeviceInfo;
- Java_com_sun_media_sound_DirectAudioDevice_nAvailable;
- Java_com_sun_media_sound_DirectAudioDevice_nClose;
- Java_com_sun_media_sound_DirectAudioDevice_nFlush;
- Java_com_sun_media_sound_DirectAudioDevice_nGetBufferSize;
- Java_com_sun_media_sound_DirectAudioDevice_nGetBytePosition;
- Java_com_sun_media_sound_DirectAudioDevice_nGetFormats;
- Java_com_sun_media_sound_DirectAudioDevice_nIsStillDraining;
- Java_com_sun_media_sound_DirectAudioDevice_nOpen;
- Java_com_sun_media_sound_DirectAudioDevice_nRead;
- Java_com_sun_media_sound_DirectAudioDevice_nRequiresServicing;
- Java_com_sun_media_sound_DirectAudioDevice_nService;
- Java_com_sun_media_sound_DirectAudioDevice_nSetBytePosition;
- Java_com_sun_media_sound_DirectAudioDevice_nStart;
- Java_com_sun_media_sound_DirectAudioDevice_nStop;
- Java_com_sun_media_sound_DirectAudioDevice_nWrite;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetDescription;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetName;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetNumDevices;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetVendor;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetVersion;
- Java_com_sun_media_sound_MidiInDevice_nClose;
- Java_com_sun_media_sound_MidiInDevice_nGetMessages;
- Java_com_sun_media_sound_MidiInDevice_nGetTimeStamp;
- Java_com_sun_media_sound_MidiInDevice_nOpen;
- Java_com_sun_media_sound_MidiInDevice_nStart;
- Java_com_sun_media_sound_MidiInDevice_nStop;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetDescription;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetName;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetNumDevices;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetVendor;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetVersion;
- Java_com_sun_media_sound_MidiOutDevice_nClose;
- Java_com_sun_media_sound_MidiOutDevice_nGetTimeStamp;
- Java_com_sun_media_sound_MidiOutDevice_nOpen;
- Java_com_sun_media_sound_MidiOutDevice_nSendLongMessage;
- Java_com_sun_media_sound_MidiOutDevice_nSendShortMessage;
- Java_com_sun_media_sound_PortMixerProvider_nGetNumDevices;
- Java_com_sun_media_sound_PortMixerProvider_nNewPortMixerInfo;
- Java_com_sun_media_sound_PortMixer_nClose;
- Java_com_sun_media_sound_PortMixer_nControlGetFloatValue;
- Java_com_sun_media_sound_PortMixer_nControlGetIntValue;
- Java_com_sun_media_sound_PortMixer_nControlSetFloatValue;
- Java_com_sun_media_sound_PortMixer_nControlSetIntValue;
- Java_com_sun_media_sound_PortMixer_nGetControls;
- Java_com_sun_media_sound_PortMixer_nGetPortCount;
- Java_com_sun_media_sound_PortMixer_nGetPortName;
- Java_com_sun_media_sound_PortMixer_nGetPortType;
- Java_com_sun_media_sound_PortMixer_nOpen;
- local:
- *;
-};
diff --git a/jdk/make/javax/sound/jsoundds/Makefile b/jdk/make/javax/sound/jsoundds/Makefile
deleted file mode 100644
index a747d69..0000000
--- a/jdk/make/javax/sound/jsoundds/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = javax.sound
-LIBRARY = jsoundds
-PRODUCT = sun
-CPLUSPLUSLIBRARY = true
-include $(BUILDDIR)/common/Defs.gmk
-
-# this Makefile compiles the native files for DirectSound support in java sound
-
-# include defines for sound
-include ../SoundDefs.gmk
-
-#
-# Files
-#
-
-FILES_c = \
- Utilities.c \
- $(DAUDIOFILES_c)
-
-FILES_cpp = \
- PLATFORM_API_WinOS_DirectSound.cpp
-
-FILES_export = \
- $(DAUDIOFILES_export)
-
-#
-# Extra cc/linker flags.
-#
-LDLIBS += dsound.lib winmm.lib user32.lib ole32.lib
-CPPFLAGS += \
- -DUSE_DAUDIO=TRUE \
- -I$(SHARE_SRC)/native/com/sun/media/sound
-
-#
-# Add to the ambient VPATH.
-#
-vpath %.c $(SHARE_SRC)/native/com/sun/media/sound
-vpath %.c $(PLATFORM_SRC)/native/com/sun/media/sound
-vpath %.cpp $(PLATFORM_SRC)/native/com/sun/media/sound
-
-#
-# Include rules
-#
-include $(BUILDDIR)/common/Library.gmk
diff --git a/jdk/make/javax/sound/mapfile-vers b/jdk/make/javax/sound/mapfile-vers
deleted file mode 100644
index f63771f..0000000
--- a/jdk/make/javax/sound/mapfile-vers
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- global:
- Java_com_sun_media_sound_DirectAudioDevice_nAvailable;
- Java_com_sun_media_sound_DirectAudioDevice_nClose;
- Java_com_sun_media_sound_DirectAudioDevice_nFlush;
- Java_com_sun_media_sound_DirectAudioDevice_nGetBufferSize;
- Java_com_sun_media_sound_DirectAudioDevice_nGetBytePosition;
- Java_com_sun_media_sound_DirectAudioDevice_nGetFormats;
- Java_com_sun_media_sound_DirectAudioDevice_nIsStillDraining;
- Java_com_sun_media_sound_DirectAudioDevice_nOpen;
- Java_com_sun_media_sound_DirectAudioDevice_nRead;
- Java_com_sun_media_sound_DirectAudioDevice_nRequiresServicing;
- Java_com_sun_media_sound_DirectAudioDevice_nService;
- Java_com_sun_media_sound_DirectAudioDevice_nSetBytePosition;
- Java_com_sun_media_sound_DirectAudioDevice_nStart;
- Java_com_sun_media_sound_DirectAudioDevice_nStop;
- Java_com_sun_media_sound_DirectAudioDevice_nWrite;
- Java_com_sun_media_sound_DirectAudioDeviceProvider_nGetNumDevices;
- Java_com_sun_media_sound_DirectAudioDeviceProvider_nNewDirectAudioDeviceInfo;
- Java_com_sun_media_sound_MidiInDevice_nClose;
- Java_com_sun_media_sound_MidiInDevice_nGetMessages;
- Java_com_sun_media_sound_MidiInDevice_nGetTimeStamp;
- Java_com_sun_media_sound_MidiInDevice_nOpen;
- Java_com_sun_media_sound_MidiInDevice_nStart;
- Java_com_sun_media_sound_MidiInDevice_nStop;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetDescription;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetName;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetNumDevices;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetVendor;
- Java_com_sun_media_sound_MidiInDeviceProvider_nGetVersion;
- Java_com_sun_media_sound_MidiOutDevice_nClose;
- Java_com_sun_media_sound_MidiOutDevice_nGetTimeStamp;
- Java_com_sun_media_sound_MidiOutDevice_nOpen;
- Java_com_sun_media_sound_MidiOutDevice_nSendLongMessage;
- Java_com_sun_media_sound_MidiOutDevice_nSendShortMessage;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetDescription;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetName;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetNumDevices;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetVendor;
- Java_com_sun_media_sound_MidiOutDeviceProvider_nGetVersion;
- Java_com_sun_media_sound_Platform_nGetExtraLibraries;
- Java_com_sun_media_sound_Platform_nGetLibraryForFeature;
- Java_com_sun_media_sound_Platform_nIsBigEndian;
- Java_com_sun_media_sound_Platform_nIsSigned8;
- Java_com_sun_media_sound_PortMixer_nClose;
- Java_com_sun_media_sound_PortMixer_nControlGetFloatValue;
- Java_com_sun_media_sound_PortMixer_nControlGetIntValue;
- Java_com_sun_media_sound_PortMixer_nControlSetFloatValue;
- Java_com_sun_media_sound_PortMixer_nControlSetIntValue;
- Java_com_sun_media_sound_PortMixer_nGetControls;
- Java_com_sun_media_sound_PortMixer_nGetPortCount;
- Java_com_sun_media_sound_PortMixer_nGetPortName;
- Java_com_sun_media_sound_PortMixer_nGetPortType;
- Java_com_sun_media_sound_PortMixer_nOpen;
- Java_com_sun_media_sound_PortMixerProvider_nGetNumDevices;
- Java_com_sun_media_sound_PortMixerProvider_nNewPortMixerInfo;
- local:
- *;
-};
diff --git a/jdk/make/javax/sql/Makefile b/jdk/make/javax/sql/Makefile
deleted file mode 100644
index cd138cb..0000000
--- a/jdk/make/javax/sql/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JDBC API and JDBC RowSet
-#
-
-BUILDDIR = ../..
-PACKAGE = javax.sql
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-AUTO_FILES_JAVA_DIRS = javax/sql
-
-#
-# Resources
-#
-OTHER_PROPERTIES = $(PKGDIR)/rowset/rowset.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/javax/swing/FILES.gmk b/jdk/make/javax/swing/FILES.gmk
deleted file mode 100644
index c1ba62f..0000000
--- a/jdk/make/javax/swing/FILES.gmk
+++ /dev/null
@@ -1,235 +0,0 @@
-#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-MISC_FILES = \
- $(CLASSBINDIR)/javax/swing/text/html/default.css \
- $(CLASSBINDIR)/javax/swing/text/rtf/charsets/NeXT.txt \
- $(CLASSBINDIR)/javax/swing/text/rtf/charsets/ansi.txt \
- $(CLASSBINDIR)/javax/swing/text/rtf/charsets/cpg437.txt \
- $(CLASSBINDIR)/javax/swing/text/rtf/charsets/cpg850.txt \
- $(CLASSBINDIR)/javax/swing/text/rtf/charsets/mac.txt
-
-BEANINFO_DOC = \
- $(BUILDDIR)/tools/swing-beans/SwingBeanInfo.template
-
-BEANIMAGES = $(BUILDDIR)/tools/swing-beans/beaninfo/images
-BEANINFO_IMG = \
- $(BEANIMAGES)/AbstractButtonColor16.gif \
- $(BEANIMAGES)/BorderColor16.gif \
- $(BEANIMAGES)/JAppletColor16.gif \
- $(BEANIMAGES)/JAppletColor32.gif \
- $(BEANIMAGES)/JAppletMono16.gif \
- $(BEANIMAGES)/JAppletMono32.gif \
- $(BEANIMAGES)/JButtonColor32.gif \
- $(BEANIMAGES)/JButtonColor16.gif \
- $(BEANIMAGES)/JButtonMono32.gif \
- $(BEANIMAGES)/JButtonMono16.gif \
- $(BEANIMAGES)/JCheckBoxColor32.gif \
- $(BEANIMAGES)/JCheckBoxColor16.gif \
- $(BEANIMAGES)/JCheckBoxMono32.gif \
- $(BEANIMAGES)/JCheckBoxMono16.gif \
- $(BEANIMAGES)/JCheckBoxMenuItemColor32.gif \
- $(BEANIMAGES)/JCheckBoxMenuItemColor16.gif \
- $(BEANIMAGES)/JCheckBoxMenuItemMono32.gif \
- $(BEANIMAGES)/JCheckBoxMenuItemMono16.gif \
- $(BEANIMAGES)/JComboBoxColor32.gif \
- $(BEANIMAGES)/JComboBoxColor16.gif \
- $(BEANIMAGES)/JComboBoxMono32.gif \
- $(BEANIMAGES)/JComboBoxMono16.gif \
- $(BEANIMAGES)/JComponentColor16.gif \
- $(BEANIMAGES)/JDesktopPaneColor32.gif \
- $(BEANIMAGES)/JDesktopPaneColor16.gif \
- $(BEANIMAGES)/JDesktopPaneMono32.gif \
- $(BEANIMAGES)/JDesktopPaneMono16.gif \
- $(BEANIMAGES)/JDialogColor32.gif \
- $(BEANIMAGES)/JDialogColor16.gif \
- $(BEANIMAGES)/JDialogMono16.gif \
- $(BEANIMAGES)/JDialogMono32.gif \
- $(BEANIMAGES)/JEditorPaneColor32.gif \
- $(BEANIMAGES)/JEditorPaneColor16.gif \
- $(BEANIMAGES)/JEditorPaneMono32.gif \
- $(BEANIMAGES)/JEditorPaneMono16.gif \
- $(BEANIMAGES)/JFrameColor32.gif \
- $(BEANIMAGES)/JFrameColor16.gif \
- $(BEANIMAGES)/JFrameMono32.gif \
- $(BEANIMAGES)/JFrameMono16.gif \
- $(BEANIMAGES)/JInternalFrameColor32.gif \
- $(BEANIMAGES)/JInternalFrameColor16.gif \
- $(BEANIMAGES)/JInternalFrameMono32.gif \
- $(BEANIMAGES)/JInternalFrameMono16.gif \
- $(BEANIMAGES)/JLabelColor32.gif \
- $(BEANIMAGES)/JLabelColor16.gif \
- $(BEANIMAGES)/JLabelMono32.gif \
- $(BEANIMAGES)/JLabelMono16.gif \
- $(BEANIMAGES)/JLayeredPaneColor32.gif \
- $(BEANIMAGES)/JLayeredPaneColor16.gif \
- $(BEANIMAGES)/JLayeredPaneMono32.gif \
- $(BEANIMAGES)/JLayeredPaneMono16.gif \
- $(BEANIMAGES)/JListColor32.gif \
- $(BEANIMAGES)/JListColor16.gif \
- $(BEANIMAGES)/JListMono32.gif \
- $(BEANIMAGES)/JListMono16.gif \
- $(BEANIMAGES)/JMenuBarColor32.gif \
- $(BEANIMAGES)/JMenuBarColor16.gif \
- $(BEANIMAGES)/JMenuBarMono32.gif \
- $(BEANIMAGES)/JMenuBarMono16.gif \
- $(BEANIMAGES)/JMenuColor32.gif \
- $(BEANIMAGES)/JMenuColor16.gif \
- $(BEANIMAGES)/JMenuMono32.gif \
- $(BEANIMAGES)/JMenuMono16.gif \
- $(BEANIMAGES)/JMenuItemColor32.gif \
- $(BEANIMAGES)/JMenuItemColor16.gif \
- $(BEANIMAGES)/JMenuItemMono32.gif \
- $(BEANIMAGES)/JMenuItemMono16.gif \
- $(BEANIMAGES)/JPanelColor32.gif \
- $(BEANIMAGES)/JPanelColor16.gif \
- $(BEANIMAGES)/JPanelMono32.gif \
- $(BEANIMAGES)/JPanelMono16.gif \
- $(BEANIMAGES)/JPasswordFieldColor32.gif \
- $(BEANIMAGES)/JPasswordFieldColor16.gif \
- $(BEANIMAGES)/JPasswordFieldMono32.gif \
- $(BEANIMAGES)/JPasswordFieldMono16.gif \
- $(BEANIMAGES)/JPopupMenuColor32.gif \
- $(BEANIMAGES)/JPopupMenuColor16.gif \
- $(BEANIMAGES)/JPopupMenuMono32.gif \
- $(BEANIMAGES)/JPopupMenuMono16.gif \
- $(BEANIMAGES)/JProgressBarColor32.gif \
- $(BEANIMAGES)/JProgressBarColor16.gif \
- $(BEANIMAGES)/JProgressBarMono32.gif \
- $(BEANIMAGES)/JProgressBarMono16.gif \
- $(BEANIMAGES)/JRadioButtonColor32.gif \
- $(BEANIMAGES)/JRadioButtonColor16.gif \
- $(BEANIMAGES)/JRadioButtonMono32.gif \
- $(BEANIMAGES)/JRadioButtonMono16.gif \
- $(BEANIMAGES)/JRadioButtonMenuItemColor32.gif \
- $(BEANIMAGES)/JRadioButtonMenuItemColor16.gif \
- $(BEANIMAGES)/JRadioButtonMenuItemMono32.gif \
- $(BEANIMAGES)/JRadioButtonMenuItemMono16.gif \
- $(BEANIMAGES)/JRootPaneColor32.gif \
- $(BEANIMAGES)/JRootPaneColor16.gif \
- $(BEANIMAGES)/JRootPaneMono32.gif \
- $(BEANIMAGES)/JRootPaneMono16.gif \
- $(BEANIMAGES)/JScrollPaneColor32.gif \
- $(BEANIMAGES)/JScrollPaneColor16.gif \
- $(BEANIMAGES)/JScrollPaneMono32.gif \
- $(BEANIMAGES)/JScrollPaneMono16.gif \
- $(BEANIMAGES)/JScrollBarColor32.gif \
- $(BEANIMAGES)/JScrollBarColor16.gif \
- $(BEANIMAGES)/JScrollBarMono32.gif \
- $(BEANIMAGES)/JScrollBarMono16.gif \
- $(BEANIMAGES)/JSeparatorColor32.gif \
- $(BEANIMAGES)/JSeparatorColor16.gif \
- $(BEANIMAGES)/JSeparatorMono32.gif \
- $(BEANIMAGES)/JSeparatorMono16.gif \
- $(BEANIMAGES)/JSliderColor32.gif \
- $(BEANIMAGES)/JSliderColor16.gif \
- $(BEANIMAGES)/JSliderMono32.gif \
- $(BEANIMAGES)/JSliderMono16.gif \
- $(BEANIMAGES)/JTextPaneColor32.gif \
- $(BEANIMAGES)/JTextPaneColor16.gif \
- $(BEANIMAGES)/JTextPaneMono32.gif \
- $(BEANIMAGES)/JTextPaneMono16.gif \
- $(BEANIMAGES)/JToggleButtonColor32.gif \
- $(BEANIMAGES)/JToggleButtonColor16.gif \
- $(BEANIMAGES)/JToggleButtonMono32.gif \
- $(BEANIMAGES)/JToggleButtonMono16.gif \
- $(BEANIMAGES)/JToolBarColor32.gif \
- $(BEANIMAGES)/JToolBarColor16.gif \
- $(BEANIMAGES)/JToolBarMono32.gif \
- $(BEANIMAGES)/JToolBarMono16.gif \
- $(BEANIMAGES)/JTabbedPaneColor32.gif \
- $(BEANIMAGES)/JTabbedPaneColor16.gif \
- $(BEANIMAGES)/JTabbedPaneMono32.gif \
- $(BEANIMAGES)/JTabbedPaneMono16.gif \
- $(BEANIMAGES)/JTreeColor32.gif \
- $(BEANIMAGES)/JTreeColor16.gif \
- $(BEANIMAGES)/JTreeMono32.gif \
- $(BEANIMAGES)/JTreeMono16.gif \
- $(BEANIMAGES)/JTextAreaColor32.gif \
- $(BEANIMAGES)/JTextAreaColor16.gif \
- $(BEANIMAGES)/JTextAreaMono32.gif \
- $(BEANIMAGES)/JTextAreaMono16.gif \
- $(BEANIMAGES)/JTextFieldColor32.gif \
- $(BEANIMAGES)/JTextFieldColor16.gif \
- $(BEANIMAGES)/JTextFieldMono32.gif \
- $(BEANIMAGES)/JTextFieldMono16.gif \
- $(BEANIMAGES)/JViewportColor32.gif \
- $(BEANIMAGES)/JViewportColor16.gif \
- $(BEANIMAGES)/JViewportMono32.gif \
- $(BEANIMAGES)/JViewportMono16.gif \
- $(BEANIMAGES)/JWindowColor32.gif \
- $(BEANIMAGES)/JWindowColor16.gif \
- $(BEANIMAGES)/JWindowMono32.gif \
- $(BEANIMAGES)/JWindowMono16.gif \
- $(BEANIMAGES)/JTableColor32.gif \
- $(BEANIMAGES)/JTableColor16.gif \
- $(BEANIMAGES)/JTableMono32.gif \
- $(BEANIMAGES)/JTableMono16.gif
-
-BEANS = \
- AbstractButton \
- JComponent
-
-# These classes get listed in the swingall.jar manifest file and are
-# used during BeanInfo source generation.
-BEANS_MANIFEST = \
- JApplet \
- JButton \
- JCheckBox \
- JCheckBoxMenuItem \
- JComboBox \
- JDialog \
- JEditorPane \
- JFrame \
- JInternalFrame \
- JLabel \
- JList \
- JMenu \
- JMenuBar \
- JMenuItem \
- JOptionPane \
- JPanel \
- JPasswordField \
- JPopupMenu \
- JProgressBar \
- JRadioButton \
- JRadioButtonMenuItem \
- JRootPane \
- JScrollBar \
- JScrollPane \
- JSeparator \
- JSlider \
- JSpinner \
- JSplitPane \
- JTabbedPane \
- JTable \
- JTextArea \
- JTextField \
- JTextPane \
- JToggleButton \
- JToolBar \
- JTree \
- JViewport \
- JWindow
diff --git a/jdk/make/javax/swing/Makefile b/jdk/make/javax/swing/Makefile
deleted file mode 100644
index 4c67858..0000000
--- a/jdk/make/javax/swing/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = javax.swing
-PRODUCT = com
-SWING_SRC = $(SHARE_SRC)/classes/javax/swing
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES.gmk
-AUTO_FILES_JAVA_DIRS = javax/swing sun/swing com/sun/java/swing
-AUTO_JAVA_PRUNE = plaf
-
-SUBDIRS = html32dtd plaf
-
-include $(BUILDDIR)/common/Classes.gmk
-include $(BUILDDIR)/common/Subdirs.gmk
-
-build: other_files
- $(SUBDIRS-loop)
-
-clean clobber::
- $(SUBDIRS-loop)
-
-other_files: $(MISC_FILES)
-
-$(CLASSBINDIR)/%.wav: $(SHARE_SRC)/classes/%.wav
- $(install-file)
-
-$(CLASSBINDIR)/%.gif: $(SHARE_SRC)/classes/%.gif
- $(install-file)
-
-$(CLASSBINDIR)/%.css: $(SHARE_SRC)/classes/%.css
- $(install-file)
-
-$(CLASSBINDIR)/%.txt: $(SHARE_SRC)/classes/%.txt
- $(install-file)
-
diff --git a/jdk/make/javax/swing/beaninfo/FILES.gmk b/jdk/make/javax/swing/beaninfo/FILES.gmk
deleted file mode 100644
index 126d02b..0000000
--- a/jdk/make/javax/swing/beaninfo/FILES.gmk
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# There are the Swing classes for which a BeanInfo class is generated.
-#
-
-# this is used for solaris
-
-BEANS = AbstractButton \
- Box \
- JComponent \
- JApplet \
- JButton \
- JCheckBox \
- JCheckBoxMenuItem \
- JComboBox \
- JColorChooser \
- JDesktopPane \
- JDialog \
- JEditorPane \
- JFileChooser \
- JFrame \
- JFormattedTextField \
- JInternalFrame \
- JLabel \
- JLayeredPane \
- JList \
- JMenu \
- JMenuBar \
- JMenuItem \
- JOptionPane \
- JPanel \
- JPasswordField \
- JPopupMenu \
- JProgressBar \
- JRadioButton \
- JRadioButtonMenuItem\
- JScrollBar \
- JScrollPane \
- JSeparator \
- JSlider \
- JSplitPane \
- JSpinner \
- JTabbedPane \
- JTable \
- JTextArea \
- JTextField \
- JTextPane \
- JToggleButton \
- JToolBar \
- JTree \
- JWindow
-
-# in a separate package
-BEANS_TEXT = JTextComponent \
-
-# and this is used for windows
-
-BEANS_SOURCES = ..\..\..\..\..\src\share\classes\javax\swing\AbstractButton.java \
- ..\..\..\..\..\src\share\classes\javax\swing\Box.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JComponent.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JColorChooser.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JApplet.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JButton.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JCheckBox.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JCheckBoxMenuItem.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JComboBox.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JDesktopPane.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JDialog.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JEditorPane.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JFileChooser.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JFormattedTextField.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JFrame.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JInternalFrame.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JLabel.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JLayeredPane.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JList.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JMenu.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JMenuBar.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JMenuItem.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JOptionPane.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JPanel.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JPasswordField.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JPopupMenu.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JProgressBar.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JRadioButton.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JRadioButtonMenuItem.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JScrollBar.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JScrollPane.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JSeparator.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JSlider.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JSpinner.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JSplitPane.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JTabbedPane.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JTable.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JTextArea.java \
- ..\..\..\..\..\src\share\classes\javax\swing\text\JTextComponent.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JTextField.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JTextPane.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JToggleButton.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JToolBar.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JTree.java \
- ..\..\..\..\..\src\share\classes\javax\swing\JWindow.java
diff --git a/jdk/make/javax/swing/beaninfo/Makefile b/jdk/make/javax/swing/beaninfo/Makefile
deleted file mode 100644
index 4ac5408..0000000
--- a/jdk/make/javax/swing/beaninfo/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Create 1.1 version of BeanInfo files needed by Swing.
-#
-# Note that this makefile gets visited only during release engineering
-# time.
-#
-
-BUILDDIR = ../../..
-include $(BUILDDIR)/common/Defs.gmk
-include SwingBeans.gmk
-
-all build: swing-1.2-beans
-
diff --git a/jdk/make/javax/swing/beaninfo/SwingBeans.gmk b/jdk/make/javax/swing/beaninfo/SwingBeans.gmk
deleted file mode 100644
index eecf212..0000000
--- a/jdk/make/javax/swing/beaninfo/SwingBeans.gmk
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the BeanInfo generation tool (ie, a doclet), and
-# then the beaninfo itself. Swing versions prior to 1.2 are no longer
-# built.
-#
-# This makefile could be a lot simpler if we made it more regular.
-#
-
-# identify this as a swingbeans product - used only to identify a
-# unique name for OBJDIR
-PRODUCT = swing-beans
-
-#
-# Main targets provided by this makefile.
-#
-swing-1.2-beans:
- $(MAKE) DEBUG_FLAG=false make-swing-beans
-swing-1.2-beans-debug:
- $(MAKE) DEBUG_FLAG=true make-swing-beans
-
-
-# get the absolute path to the jar command.
-PREFIX = 1.2
-JAVADOCFLAGS += $(NO_PROPRIETARY_API_WARNINGS) $(LANGUAGE_VERSION)
-SWINGPKG = javax/swing
-LOCAL_JAVAC_FLAGS = $(OTHER_JAVACFLAGS)
-# since JAVADOC_CMD runs on ALT_BOOTDIR, the doclet and all its classes must be compiled to match
-DOCLET_JAVAC_FLAGS = -source 6 -target 6
-
-include FILES.gmk
-include $(BUILDDIR)/common/Release.gmk
-
-DOCLETSRC = $(BUILDDIR)/tools/swing-beans
-DOCLETDST = $(TEMPDIR)
-
-FILES_java = GenSwingBeanInfo.java GenDocletBeanInfo.java DocBeanInfo.java
-FILES_class = $(FILES_java:%.java=$(DOCLETDST)/%.class)
-FAKESRC = $(TOPDIR)/src/share/classes
-BEANSRCDIR = $(TEMPDIR)/$(PREFIX)src
-BEANCLASSDIR = $(TEMPDIR)/$(PREFIX)classes
-FILES_beans = $(BEANS:%=$(BEANSRCDIR)/%BeanInfo.java) \
- $(BEANS_TEXT:%=$(BEANSRCDIR)/text/%BeanInfo.java) \
- $(BEANSRCDIR)/SwingBeanInfoBase.java \
- $(BEANSRCDIR)/BeanInfoUtils.java
-
-FILES_bclass = $(FILES_beans:$(BEANSRCDIR)/%.java=$(BEANCLASSDIR)/$(SWINGPKG)/%.class)
-DOCLETFLAGS = -doclet GenDocletBeanInfo
-LOCAL_CLASSPATH = "$(CLASSBINDIR)$(CLASSPATH_SEPARATOR)$(BEANCLASSDIR)$(CLASSPATH_SEPARATOR)."
-
-#
-# Main target.
-#
-make-swing-beans: mkdoclet mkbeaninfo mkclasses mkpackaging
-
-#
-# Make the doclet.
-#
-mkdoclet: $(DOCLETDST) $(FILES_class) .SwingBeanInfo
-
-$(OBJDIR) $(BEANCLASSDIR) $(BEANSRCDIR) $(DOCLETDST)::
- @$(ECHO) "Making directory..." $@
- @$(MKDIR) -p $@
-
-$(DOCLETDST)/%.class: $(DOCLETSRC)/%.java
- $(JAVAC_CMD) $(LOCAL_JAVAC_FLAGS) $(DOCLET_JAVAC_FLAGS) -classpath "$(CLASSBINDIR)$(CLASSPATH_SEPARATOR)$(DOCLETSRC)" -d $(DOCLETDST) $?
- @$(java-vm-cleanup)
-
-# To run, the doclet needs SwingBeanInfoBase class. Also Notice the lie
-# here, SwingBeanInfoBase.class goes elswhere.
-
-.SwingBeanInfo: $(OBJDIR) $(BEANCLASSDIR) $(BEANSRCDIR) $(SWINGPKG)/BeanInfoUtils.class $(SWINGPKG)/SwingBeanInfoBase.class
-
-$(SWINGPKG)/BeanInfoUtils.class: $(BEANSRCDIR)/BeanInfoUtils.java
- $(JAVAC_CMD) $(LOCAL_JAVAC_FLAGS) $(DOCLET_JAVAC_FLAGS) -d $(BEANCLASSDIR) $<
- @$(java-vm-cleanup)
-
-$(SWINGPKG)/SwingBeanInfoBase.class: $(BEANSRCDIR)/SwingBeanInfoBase.java $(BEANSRCDIR)/BeanInfoUtils.java
- $(JAVAC_CMD) $(LOCAL_JAVAC_FLAGS) $(DOCLET_JAVAC_FLAGS) -classpath $(BEANCLASSDIR) -d $(BEANCLASSDIR) $<
- @$(java-vm-cleanup)
-
-#
-# Stage 1: Generate *BeanInfo.java files.
-#
-mkbeaninfo: $(BEANSRCDIR) .delete.beanlist $(FILES_beans) .javadoc.beanlist
-
-.delete.beanlist:
- @$(RM) $(TEMPDIR)/.beans.list
-
-.javadoc.beanlist:
- if [ -s $(TEMPDIR)/.beans.list ]; \
- then $(JAVADOC_CMD) $(DOCLETFLAGS) -x $(DEBUG_FLAG) -d $(BEANSRCDIR) -t $(DOCLETSRC)/SwingBeanInfo.template -docletpath $(DOCLETDST) \
- $(shell if [ -s $(TEMPDIR)/.beans.list ]; then $(CAT) $(TEMPDIR)/.beans.list; fi); \
- fi
- @$(java-vm-cleanup)
-
-$(BEANSRCDIR)/text/%BeanInfo.java: $(FAKESRC)/$(SWINGPKG)/text/%.java
- @$(ECHO) $< >> $(TEMPDIR)/.beans.list
-
-$(BEANSRCDIR)/%BeanInfo.java: $(FAKESRC)/$(SWINGPKG)/%.java
- @$(ECHO) $< >> $(TEMPDIR)/.beans.list
-
-$(BEANSRCDIR)/SwingBeanInfoBase.java: $(DOCLETSRC)/javax/swing/SwingBeanInfoBase.java
- $(CP) $< $@
-
-$(BEANSRCDIR)/BeanInfoUtils.java: $(DOCLETSRC)/sun/swing/BeanInfoUtils.java
- $(CP) $< $@
-
-#
-# Compile the generated *BeanInfo.java files.
-#
-mkclasses: .delete.classlist $(BEANCLASSDIR)/$(SWINGPKG)/SwingBeanInfoBase.class \
- $(BEANCLASSDIR)/$(SWINGPKG)/text/JTextComponentBeanInfo.class \
- .create.classlist $(FILES_bclass) .compile.classlist
-
-$(BEANCLASSDIR)/$(SWINGPKG)/SwingBeanInfoBase.class:: \
- $(BEANSRCDIR)/SwingBeanInfoBase.java
-
-$(BEANCLASSDIR)/$(SWINGPKG)/text/JTextComponentBeanInfo.class:: \
- $(BEANSRCDIR)/JTextComponentBeanInfo.java
-
-$(FILES_bclass):: $(FILES_beans)
-
-# all the sources are in one directory, so make sure that the list does
-# not have the /text direcotry in it. Kludgy, this is...
-.create.classlist:
- @$(ECHO) $(subst /text/,/,$(FILES_beans)) >> $(TEMPDIR)/.classes.list
-
-.delete.classlist:
- @$(ECHO) "Deleting classes.list..."
- @$(RM) $(TEMPDIR)/.classes.list
-
-.compile.classlist:
- if [ -s $(TEMPDIR)/.classes.list ] ; then \
- $(JAVAC_CMD) $(LOCAL_JAVAC_FLAGS) -classpath $(LOCAL_CLASSPATH) -d $(BEANCLASSDIR) \
- $(shell if [ -s $(TEMPDIR)/.classes.list ] ; then $(CAT) $(TEMPDIR)/.classes.list; fi ) ; \
- fi
- @$(java-vm-cleanup)
-
-#
-# Packaging
-#
-mkpackaging:
- $(RM) -r $(BEANCLASSDIR)/$(SWINGPKG)/beaninfo/images
- $(MKDIR) -p $(BEANCLASSDIR)/$(SWINGPKG)/beaninfo/images
- $(CP) $(DOCLETSRC)/beaninfo/images/*.gif $(BEANCLASSDIR)/$(SWINGPKG)/beaninfo/images
- $(BOOT_JAR_CMD) cf $(TEMPDIR)/tmp.jar \
- -C $(BEANCLASSDIR) javax \
- -C $(BEANCLASSDIR) sun \
- $(BOOT_JAR_JFLAGS)
- $(MV) $(TEMPDIR)/tmp.jar $(JDK_IMAGE_DIR)/lib/dt.jar
- @$(java-vm-cleanup)
-
-#
-# Cleanliness.
-#
-swingbeans.clean swingbeans.clobber::
- $(RM) -r 1.2src 1.2classes
- $(RM) -r java javax
- $(RM) *.class
- $(RM) $(TEMPDIR)/.beans.list $(TEMPDIR)/.classes.list beaninfo.jar
-
-#
-# Utility.
-#
-
-
-#
-# Debugging targets for looking at variables.
-#
-show-vars:
- @$(ECHO) FILES_beans = $(FILES_beans)
- @$(ECHO) FILES_bclass = $(FILES_bclass)
-
-.PRECIOUS: $(FILES_beans)
-
-.PHONY: swing-1.2-beans swing-1.2-beans-debug \
- make-swing-beans mkdoclet .SwingBeanInfo mkbeaninfo .delete.beanlist \
- .javadoc.beanlist mkclasses .create.classlist .delete.classlist \
- .compile.classlist mkpackaging mkpackaging swingbeans.clean \
- swingbeans.clobber show-vars
diff --git a/jdk/make/javax/swing/html32dtd/Makefile b/jdk/make/javax/swing/html32dtd/Makefile
deleted file mode 100644
index 997e761..0000000
--- a/jdk/make/javax/swing/html32dtd/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = javax/swing/html/parser
-PRODUCT = swing
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Shared defintions.
-#
-HTML32DTD = $(CLASSBINDIR)/javax/swing/text/html/parser/html32.bdtd
-DTDBUILDER_JARFILE = $(BUILDTOOLJARDIR)/dtdbuilder.jar
-DTDDATA = $(BUILDDIR)/tools/dtdbuilder/dtds
-
-$(HTML32DTD): $(DTDBUILDER_JARFILE)
- @$(prep-target)
- ($(BOOT_JAVA_CMD) -Ddtd_home=$(DTDDATA) \
- -jar $(DTDBUILDER_JARFILE) html32 > $@) || exit 1
- @$(java-vm-cleanup)
-
-all build: $(HTML32DTD)
-
-include $(BUILDDIR)/common/Rules.gmk
-
diff --git a/jdk/make/javax/swing/plaf/FILES.gmk b/jdk/make/javax/swing/plaf/FILES.gmk
deleted file mode 100644
index b30da35..0000000
--- a/jdk/make/javax/swing/plaf/FILES.gmk
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-MISC_SWING_FILES = \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Computer.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/DetailsView.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Directory.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Error.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/File.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/HardDrive.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Inform.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/ListView.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/NewFolder.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Question.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/UpFolder.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Warn.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/image-delayed.png \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/image-failed.png \
-\
- $(CLASSBINDIR)/javax/swing/plaf/basic/icons/image-delayed.png \
- $(CLASSBINDIR)/javax/swing/plaf/basic/icons/image-failed.png \
-\
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/Error.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/Inform.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/Question.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/sortDown.png \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/sortUp.png \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/Warn.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/close.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/close-pressed.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/collapsed.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/computer.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/directory.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/error.png \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/expanded.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/file.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/floppy.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/hardDrive.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/homeFolder.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/iconify.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/info.png \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/maximize.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/menu.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/minimize.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/newFolder.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/paletteClose.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/question.png \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/upFolder.gif \
- $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/warning.png \
- $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/FrameClose.wav \
- $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/FrameMaximize.wav \
- $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/FrameMinimize.wav \
- $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav \
- $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav \
- $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/MenuItemCommand.wav \
- $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav \
- $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav \
- $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/OptionPaneError.wav \
- $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav \
- $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav
-
-MISC_SWING_FILES_MOTIF_GIF = \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/Inform.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/Question.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/Warn.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/Error.gif
-
-MISC_SWING_FILES_MOTIF_PNG = \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/image-delayed.png \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/image-failed.png
-
-MISC_SWING_FILES_UNIX = \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/gtk/icons/Directory.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/gtk/icons/File.gif \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/gtk/icons/image-delayed.png \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/gtk/icons/image-failed.png \
- $(CLASSBINDIR)/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml
-
-LOGO_ICONS=\
- $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/JavaCup32.png \
- $(CLASSBINDIR)/javax/swing/plaf/basic/icons/JavaCup16.png
-
diff --git a/jdk/make/javax/swing/plaf/Makefile b/jdk/make/javax/swing/plaf/Makefile
deleted file mode 100644
index 394657f..0000000
--- a/jdk/make/javax/swing/plaf/Makefile
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = javax.swing.plaf
-PRODUCT = com
-SWING_SRC = $(SHARE_SRC)/classes/javax/swing
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES.gmk
-AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf
-
-ifeq ($(PLATFORM), windows)
- # Don't build GTK L&F on Windows
- AUTO_JAVA_PRUNE = gtk
-endif
-
-ifdef DISABLE_NIMBUS
- AUTO_JAVA_PRUNE += nimbus
-endif
-
-MISC_FILES = $(MISC_SWING_FILES)
-ifneq ($(PLATFORM), windows)
- # Only include GTK icons on Solaris/Linux
- MISC_FILES += $(MISC_SWING_FILES_UNIX)
-endif
-
-NIMBUS_GENSRC_DIR = $(GENSRCDIR)/javax/swing/plaf/nimbus
-NIMBUS_SKIN_FILE = $(SWING_SRC)/plaf/nimbus/skin.laf
-NIMBUS_GENERATOR_JAR = $(BUILDTOOLJARDIR)/generatenimbus.jar
-
-FILES_java = $(FILES_SWING_java)
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_COMPILED_PROPERTIES = \
- com/sun/swing/internal/plaf/basic/resources/basic.properties \
- com/sun/swing/internal/plaf/metal/resources/metal.properties \
- com/sun/swing/internal/plaf/synth/resources/synth.properties \
- com/sun/java/swing/plaf/motif/resources/motif.properties \
- com/sun/java/swing/plaf/windows/resources/windows.properties
-ifneq ($(PLATFORM), windows)
- # Only compile GTK resource bundles on Solaris/Linux
- RESOURCE_BUNDLES_COMPILED_PROPERTIES += \
- com/sun/java/swing/plaf/gtk/resources/gtk.properties
-endif
-
-#
-# Rules.
-# Process LOGO_ICONS and Motif Icons first.
-#
-build: $(LOGO_ICONS) $(MISC_SWING_FILES_MOTIF_GIF) $(MISC_SWING_FILES_MOTIF_PNG) other_files
-
-$(NIMBUS_GENSRC_DIR): $(NIMBUS_SKIN_FILE) $(NIMBUS_GENERATOR_JAR)
- @$(ECHO) "Generating Nimbus source files:"
- $(RM) -r $(NIMBUS_GENSRC_DIR)
- $(BOOT_JAVA_CMD) -jar $(NIMBUS_GENERATOR_JAR) \
- -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(GENSRCDIR) \
- -packagePrefix $(PACKAGE).nimbus -lafName Nimbus
- @$(ECHO) "Finished generating Nimbus source files"
-
-clean:: classes.clean
- $(RM) -r $(NIMBUS_GENSRC_DIR)
-
-#
-# Include
-#
-ifndef DISABLE_NIMBUS
- CLASSES_INIT = $(NIMBUS_GENSRC_DIR)
-endif
-
-include $(BUILDDIR)/common/Classes.gmk
-
-ifndef OPENJDK
-$(LOGO_ICONS): $(CLASSBINDIR)/%.png: $(CLOSED_SRC)/share/classes/%.png
- $(install-file)
-
-$(MISC_SWING_FILES_MOTIF_GIF): $(CLASSBINDIR)/%.gif: $(CLOSED_SRC)/share/classes/%.gif
- $(install-file)
-
-$(MISC_SWING_FILES_MOTIF_PNG): $(CLASSBINDIR)/%.png: $(CLOSED_SRC)/share/classes/%.png
- $(install-file)
-endif
-
-other_files: $(MISC_FILES)
-
-$(CLASSBINDIR)/%.wav: $(SHARE_SRC)/classes/%.wav
- $(install-file)
-
-$(CLASSBINDIR)/%.gif: $(SHARE_SRC)/classes/%.gif
- $(install-file)
-
-$(CLASSBINDIR)/%.png: $(SHARE_SRC)/classes/%.png
- $(install-file)
-
-$(CLASSBINDIR)/%.xml: $(SHARE_SRC)/classes/%.xml
- $(install-file)
-
-$(CLASSBINDIR)/%.css: $(SHARE_SRC)/classes/%.css
- $(install-file)
-
-$(CLASSBINDIR)/%.bdtd: $(SHARE_SRC)/classes/%.bdtd
- $(install-file)
-
-$(CLASSBINDIR)/%.txt: $(SHARE_SRC)/classes/%.txt
- $(install-file)
-
diff --git a/jdk/make/jdk/Makefile b/jdk/make/jdk/Makefile
deleted file mode 100644
index 686c94a..0000000
--- a/jdk/make/jdk/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ..
-PACKAGE = jdk
-PRODUCT = jdk
-JAVAC_LINT_OPTIONS=-Xlint:all
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = jdk
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/jdk_generic_profile.sh b/jdk/make/jdk_generic_profile.sh
deleted file mode 100644
index 1103a56..0000000
--- a/jdk/make/jdk_generic_profile.sh
+++ /dev/null
@@ -1,420 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-
-#############################################################################
-#
-# Generic build profile.sh for all platforms, works in bash, sh, and ksh.
-#
-# Copy this file to your own area, and edit it to suit your needs.
-#
-# Ideally you either won't need to set the ALT_* variables because the
-# build system will find what it needs through system provided paths
-# or environment variables, or you have installed the component in the
-# recommended default path.
-#
-# If you find yourself forced to set an ALT_* environment variable and
-# suspect we could have figured it out automatically, please let us know.
-#
-# Most ALT_* directory defaults are based on being in the parent directory in
-# ALT_SLASH_JAVA, so it's possible to create for example a "C:/jdk6"
-# directory, assign that to ALT_SLASH_JAVA, and place all the components
-# in that directory. This could also minimize the ALT_* environment
-# variables you need to set.
-#
-########
-#
-# Assumes basic unix utilities are in the PATH already (uname, hostname, etc.).
-#
-# On Windows, assumes PROCESSOR_IDENTIFIER, VS100COMNTOOLS,
-# SYSTEMROOT (or SystemRoot), COMPUTERNAME (or hostname works), and
-# USERNAME is defined in the environment.
-# This profile does not rely on using vcvars32.bat and 64bit Setup.bat.
-# Uses CYGWIN cygpath to make sure paths are space-free.
-#
-# The JDK Makefiles may change in the future, making some of these
-# settings unnecessary or redundant.
-#
-# This is a working example, but may or may not work on all systems.
-#
-#############################################################################
-#
-# WARNING: This file will clobber the value of some environment variables.
-#
-# Sets up these environment variables for doing JDK builds:
-# USERNAME
-# COMPUTERNAME
-# PATH
-# Windows Only:
-# LIB
-# INCLUDE
-# PS1
-# SHELL
-#
-# Attempts to set these variables for the JDK builds:
-# ALT_COMPILER_PATH
-# ALT_BOOTDIR
-# Windows Only:
-# ALT_UNIXCOMMAND_PATH
-# ALT_MSVCRNN_DLL_PATH
-#
-#############################################################################
-#
-# Keep in mind that at this point, we are running in some kind of shell
-# (sh, ksh, or bash). We don't know if it's solaris, linux, or windows
-# CYGWIN. We need to figure that out.
-
-# Find user name
-if [ "${USERNAME}" = "" ] ; then
- USERNAME="${LOGNAME}"
-fi
-if [ "${USERNAME}" = "" ] ; then
- USERNAME="${USER}"
-fi
-export USERNAME
-
-# Find machine name
-if [ "${COMPUTERNAME}" = "" ] ; then
- COMPUTERNAME="$(hostname)"
-fi
-export COMPUTERNAME
-
-# Boot jdk
-bootjdk=jdk1.6.0
-importjdk=jdk1.7.0
-
-# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
-osname=$(uname -s)
-if [ "${osname}" = SunOS ] ; then
-
- # System place where JDK installed images are stored?
- jdk_instances=/usr/jdk/instances
-
- # Get the Sun Studio compilers (and latest patches for them too)
- if [ "${ALT_COMPILER_PATH}" = "" ] ; then
- ALT_COMPILER_PATH=/opt/SUNWspro/bin
- export ALT_COMPILER_PATH
- fi
- if [ ! -d ${ALT_COMPILER_PATH} ] ; then
- echo "WARNING: Cannot access ALT_COMPILER_PATH=${ALT_COMPILER_PATH}"
- fi
-
- # Place compiler path early in PATH to avoid 'cc' conflicts.
- path4sdk=${ALT_COMPILER_PATH}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin
-
- # Make sure these are unset
- unset JAVA_HOME
- unset LD_LIBRARY_PATH
-
- # Build in C locale
- LANG=C
- export LANG
- LC_ALL=C
- export LC_ALL
-
- umask 002
-
-elif [ "${osname}" = Linux ] ; then
-
- # System place where JDK installed images are stored?
- jdk_instances=/opt/java
-
- # Use compilers from /usr/bin
- path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
-
- # Make sure these are unset
- unset JAVA_HOME
- unset LD_LIBRARY_PATH
-
- # Build in C locale
- LANG=C
- export LANG
- LC_ALL=C
- export LC_ALL
-
- umask 002
-
-else
-
- # System place where JDK installed images are stored?
- jdk_instances="C:"
-
- # Windows: Differs on CYGWIN and the compiler available.
- # Also, blanks in pathnames gives make headaches, so anything placed
- # in any ALT_* variable should be the short windows DOS names.
-
- # Check CYGWIN (should have already been done)
- # Assumption here is that you are in a shell window via cygwin.
- proc_arch=`echo "${PROCESSOR_IDENTIFIER}" | expand | cut -d' ' -f1 | sed -e 's@x86@X86@g' -e 's@Intel64@X64@g' -e 's@em64t@X64@g' -e 's@EM64T@X64@g' -e 's@amd64@X64@g' -e 's@AMD64@X64@g' -e 's@ia64@IA64@g'`
- if [ "${proc_arch}" = "X64" ] ; then
- windows_arch=amd64
- else
- windows_arch=i586
- fi
-
- repo=`hg root | sed -e 's@\\\\@/@g'`
- # We need to check if we are running a CYGWIN shell
- if [ "$(echo ${osname} | fgrep Cygwin)" != "" -a -f /bin/cygpath ] ; then
- # For CYGWIN, uname will have "Cygwin" in it, and /bin/cygpath should exist
- # Utility to convert to short pathnames without spaces
- cygpath="/usr/bin/cygpath -a -m -s"
- cygpathp="/usr/bin/cygpath -p"
- # Most unix utilities are in the /usr/bin
- unixcommand_path="/usr/bin"
- # Make the prompt tell you CYGWIN
- export PS1="CYGWIN:${COMPUTERNAME}:${USERNAME}[\!] "
- elif [ "$(echo ${osname} | fgrep MINGW)" != "" ] ; then
- # Utility to convert to short pathnames without spaces
- cygpath="${repo}/make/tools/msys_build_scripts/dospath.sh"
- if [ ! -f ${cygpath} ] ; then
- echo "ERROR: Cannot find cygpath or equivalent on this machine"
- exit 1
- fi
- # Utility to fix a path to MinGW/MSYS format - the equivalent of 'cygpath -p'
- for tfile in "${repo}/make/scripts/fixpath.pl" "${repo}/../make/scripts/fixpath.pl"; do
- if [ -f ${tfile} ] ; then
- cygpathp="/bin/perl ${tfile} -m"
- fi
- done;
- if [ -z "${cygpathp}" ] ; then
- echo "ERROR: Cannot find make/scripts/fixpath.pl on this machine"
- exit 1
- fi
- unixcommand_path="/usr/bin"
- else
- echo "ERROR: Cannot find CYGWIN or MinGW/MSYS on this machine"
- exit 1
- fi
- if [ "${ALT_UNIXCOMMAND_PATH}" != "" ] ; then
- unixcommand_path=${ALT_UNIXCOMMAND_PATH}
- fi
-
- # Default shell
- export SHELL="${unixcommand_path}/sh"
-
- # Setup path system (verify this is right)
- if [ "${SystemRoot}" != "" ] ; then
- sys_root=$(${cygpath} "${SystemRoot}")
- elif [ "${SYSTEMROOT}" != "" ] ; then
- sys_root=$(${cygpath} "${SYSTEMROOT}")
- else
- sys_root=$(${cygpath} "C:/WINNT")
- fi
- if [ ! -d "${sys_root}" ] ; then
- echo "WARNING: No system root found at: ${sys_root}"
- fi
-
- # Build a : separated path making sure each segment is acceptable to ${osname}
- path4sdk="${unixcommand_path}:"`${cygpathp} "${sys_root}/system32;${sys_root};${sys_root}/System32/Wbem"`
-
- # Compiler setup (nasty part)
- # NOTE: You can use vcvars32.bat to set PATH, LIB, and INCLUDE.
- # NOTE: CYGWIN has a link.exe too, make sure the compilers are first
-
- # Use supplied vsvars.sh
- if [ -f "${repo}/make/scripts/vsvars.sh" ] ; then
- eval `sh ${repo}/make/scripts/vsvars.sh -v10`
- elif [ -f "${repo}/../make/scripts/vsvars.sh" ] ; then
- eval `sh ${repo}/../make/scripts/vsvars.sh -v10`
- else
- echo "WARNING: No make/scripts/vsvars.sh file found"
- fi
-
-fi
-
-# Get the previous JDK to be used to bootstrap the build
-if [ "${ALT_BOOTDIR}" = "" ] ; then
- ALT_BOOTDIR=${jdk_instances}/${bootjdk}
- export ALT_BOOTDIR
-fi
-if [ ! -d ${ALT_BOOTDIR} ] ; then
- echo "WARNING: Cannot access ALT_BOOTDIR=${ALT_BOOTDIR}"
-fi
-
-# Get the import JDK to be used to get hotspot VM if not built
-if [ "${ALT_JDK_IMPORT_PATH}" = "" -a -d ${jdk_instances}/${importjdk} ] ; then
- ALT_JDK_IMPORT_PATH=${jdk_instances}/${importjdk}
- export ALT_JDK_IMPORT_PATH
-fi
-
-# Export PATH setting
-PATH="${path4sdk}"
-export PATH
-
-# Export variables required for Zero
-if [ "${SHARK_BUILD}" = true ] ; then
- ZERO_BUILD=true
- export ZERO_BUILD
-fi
-if [ "${ZERO_BUILD}" = true ] ; then
- # ZERO_LIBARCH is the name of the architecture-specific
- # subdirectory under $JAVA_HOME/jre/lib
- arch=$(uname -m)
- case "${arch}" in
- x86_64) ZERO_LIBARCH=amd64 ;;
- i?86) ZERO_LIBARCH=i386 ;;
- sparc64) ZERO_LIBARCH=sparcv9 ;;
- arm*) ZERO_LIBARCH=arm ;;
- *) ZERO_LIBARCH="$(arch)"
- esac
- export ZERO_LIBARCH
-
- # ARCH_DATA_MODEL is the number of bits in a pointer
- case "${ZERO_LIBARCH}" in
- i386|ppc|s390|sparc|arm)
- ARCH_DATA_MODEL=32
- ;;
- amd64|ppc64|s390x|sparcv9|ia64|alpha)
- ARCH_DATA_MODEL=64
- ;;
- *)
- echo "ERROR: Unable to determine ARCH_DATA_MODEL for ${ZERO_LIBARCH}"
- exit 1
- esac
- export ARCH_DATA_MODEL
-
- # ZERO_ENDIANNESS is the endianness of the processor
- case "${ZERO_LIBARCH}" in
- i386|amd64|ia64)
- ZERO_ENDIANNESS=little
- ;;
- ppc*|s390*|sparc*|alpha)
- ZERO_ENDIANNESS=big
- ;;
- *)
- echo "ERROR: Unable to determine ZERO_ENDIANNESS for ${ZERO_LIBARCH}"
- exit 1
- esac
- export ZERO_ENDIANNESS
-
- # ZERO_ARCHDEF is used to enable architecture-specific code
- case "${ZERO_LIBARCH}" in
- i386) ZERO_ARCHDEF=IA32 ;;
- ppc*) ZERO_ARCHDEF=PPC ;;
- s390*) ZERO_ARCHDEF=S390 ;;
- sparc*) ZERO_ARCHDEF=SPARC ;;
- *) ZERO_ARCHDEF=$(echo "${ZERO_LIBARCH}" | tr a-z A-Z)
- esac
- export ZERO_ARCHDEF
-
- # ZERO_ARCHFLAG tells the compiler which mode to build for
- case "${ZERO_LIBARCH}" in
- s390)
- ZERO_ARCHFLAG="-m31"
- ;;
- *)
- ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}"
- esac
- export ZERO_ARCHFLAG
-
- # LIBFFI_CFLAGS and LIBFFI_LIBS tell the compiler how to compile and
- # link against libffi
- pkgconfig=$(which pkg-config 2>/dev/null)
- if [ -x "${pkgconfig}" ] ; then
- if [ "${LIBFFI_CFLAGS}" = "" ] ; then
- LIBFFI_CFLAGS=$("${pkgconfig}" --cflags libffi)
- fi
- if [ "${LIBFFI_LIBS}" = "" ] ; then
- LIBFFI_LIBS=$("${pkgconfig}" --libs libffi)
- fi
- fi
- if [ "${LIBFFI_LIBS}" = "" ] ; then
- LIBFFI_LIBS="-lffi"
- fi
- export LIBFFI_CFLAGS
- export LIBFFI_LIBS
-
- # LLVM_CFLAGS, LLVM_LDFLAGS and LLVM_LIBS tell the compiler how to
- # compile and link against LLVM
- if [ "${SHARK_BUILD}" = true ] ; then
- if [ "${LLVM_CONFIG}" = "" ] ; then
- LLVM_CONFIG=$(which llvm-config 2>/dev/null)
- fi
- if [ ! -x "${LLVM_CONFIG}" ] ; then
- echo "ERROR: Unable to locate llvm-config"
- exit 1
- fi
- llvm_components="jit engine nativecodegen"
-
- unset LLVM_CFLAGS
- for flag in $("${LLVM_CONFIG}" --cxxflags $llvm_components); do
- if echo "${flag}" | grep -q '^-[ID]'; then
- if [ "${flag}" != "-D_DEBUG" ] ; then
- if [ "${LLVM_CFLAGS}" != "" ] ; then
- LLVM_CFLAGS="${LLVM_CFLAGS} "
- fi
- LLVM_CFLAGS="${LLVM_CFLAGS}${flag}"
- fi
- fi
- done
- llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//')
- LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}"
-
- unset LLVM_LDFLAGS
- for flag in $("${LLVM_CONFIG}" --ldflags $llvm_components); do
- if echo "${flag}" | grep -q '^-L'; then
- if [ "${LLVM_LDFLAGS}" != "" ] ; then
- LLVM_LDFLAGS="${LLVM_LDFLAGS} "
- fi
- LLVM_LDFLAGS="${LLVM_LDFLAGS}${flag}"
- fi
- done
-
- unset LLVM_LIBS
- for flag in $("${LLVM_CONFIG}" --libs $llvm_components); do
- if echo "${flag}" | grep -q '^-l'; then
- if [ "${LLVM_LIBS}" != "" ] ; then
- LLVM_LIBS="${LLVM_LIBS} "
- fi
- LLVM_LIBS="${LLVM_LIBS}${flag}"
- fi
- done
-
- export LLVM_CFLAGS
- export LLVM_LDFLAGS
- export LLVM_LIBS
- fi
-fi
-
-# Export variables for system zlib
-# ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
-# link against zlib
-pkgconfig=$(which pkg-config 2>/dev/null)
-if [ -x "${pkgconfig}" ] ; then
- if [ "${ZLIB_CFLAGS}" = "" ] ; then
- ZLIB_CFLAGS=$("${pkgconfig}" --cflags zlib)
- fi
- if [ "${ZLIB_LIBS}" = "" ] ; then
- ZLIB_LIBS=$("${pkgconfig}" --libs zlib)
- fi
-fi
-if [ "${ZLIB_LIBS}" = "" ] ; then
- ZLIB_LIBS="-lz"
-fi
-export ZLIB_CFLAGS
-export ZLIB_LIBS
-
diff --git a/jdk/make/jpda/Makefile b/jdk/make/jpda/Makefile
deleted file mode 100644
index ae6fb8b..0000000
--- a/jdk/make/jpda/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of JPDA, including JDWP, JDI, and
-# example debuggers. See also included files.
-#
-
-BUILDDIR = ..
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Core.
-#
-SUBDIRS = jdwp back front transport expr tty bdi gui
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/jpda/back/Makefile b/jdk/make/jpda/back/Makefile
deleted file mode 100644
index 8c23009..0000000
--- a/jdk/make/jpda/back/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the JDI back-end implementation
-#
-
-BUILDDIR = ../..
-LIBRARY = jdwp
-PRODUCT = jpda
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-FILES_m = mapfile-vers
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# Use the mapfile-vers (See the mapfile located with this Makefile)
-ifdef FILES_m
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-endif
-
-OTHER_INCLUDES = -I$(SHARE_SRC)/transport/export \
- -I$(SHARE_SRC)/back/export \
- -I$(SHARE_SRC)/npt \
- -I$(PLATFORM_SRC)/npt \
- -I$(SHARE_SRC)/back \
- -I$(PLATFORM_SRC)/back \
- -I$(GENNATIVESRCDIR)/jdwp
-
-ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS += $(LIBDL)
-endif # PLATFORM
-
-#
-# This controls the ability to do logging in the library.
-#
-CPPFLAGS_DBG += -DJDWP_LOGGING
-CPPFLAGS_OPT += -DJDWP_LOGGING
-
-#
-# Files to compile.
-#
-FILES_c = \
- ArrayReferenceImpl.c \
- ArrayTypeImpl.c \
- ClassTypeImpl.c \
- ClassLoaderReferenceImpl.c \
- ClassObjectReferenceImpl.c \
- EventRequestImpl.c \
- FieldImpl.c \
- FrameID.c \
- MethodImpl.c \
- ObjectReferenceImpl.c \
- ReferenceTypeImpl.c \
- SDE.c \
- StackFrameImpl.c \
- StringReferenceImpl.c \
- ThreadGroupReferenceImpl.c \
- ThreadReferenceImpl.c \
- VirtualMachineImpl.c \
- bag.c \
- commonRef.c \
- classTrack.c \
- debugDispatch.c \
- debugInit.c \
- debugLoop.c \
- error_messages.c \
- eventFilter.c \
- eventHandler.c \
- eventHelper.c \
- inStream.c \
- invoker.c \
- log_messages.c \
- outStream.c \
- standardHandlers.c \
- stepControl.c \
- stream.c \
- threadControl.c \
- transport.c \
- util.c \
- linker_md.c \
- exec_md.c
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-# We don't want to link against -ljava
-JAVALIB=
-
-#
-# Add to ambient vpath so we pick up the library files
-#
-ifeq ($(PLATFORM), windows)
-vpath %.c $(SHARE_SRC)/back:$(SHARE_SRC)/back
-endif # PLATFORM
-vpath %.c $(SHARE_SRC)/back:$(PLATFORM_SRC)/back
-
diff --git a/jdk/make/jpda/back/mapfile-vers b/jdk/make/jpda/back/mapfile-vers
deleted file mode 100644
index a7a6349..0000000
--- a/jdk/make/jpda/back/mapfile-vers
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Agent_OnLoad;
- Agent_OnUnload;
- local:
- *;
-};
diff --git a/jdk/make/jpda/bdi/Makefile b/jdk/make/jpda/bdi/Makefile
deleted file mode 100644
index b47be2d..0000000
--- a/jdk/make/jpda/bdi/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the BDI interface
-#
-
-BUILDDIR = ../..
-PACKAGE = com.sun.tools.example.debug.bdi
-PRODUCT = jpda
-include $(BUILDDIR)/common/Defs.gmk
-
-# Where to look for sources
-AUTO_FILES_JAVA_DIRS = \
- com/sun/tools/example/debug/bdi \
- com/sun/tools/example/debug/event
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/jpda/expr/Makefile b/jdk/make/jpda/expr/Makefile
deleted file mode 100644
index eb502e8..0000000
--- a/jdk/make/jpda/expr/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building client expression parsing code.
-#
-
-BUILDDIR = ../..
-PACKAGE = com.sun.tools.example.debug.expr
-PRODUCT = jpda
-include $(BUILDDIR)/common/Defs.gmk
-
-# Packages of java sources to compiler
-AUTO_FILES_JAVA_DIRS = com/sun/tools/example/debug/expr
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/jpda/front/Makefile b/jdk/make/jpda/front/Makefile
deleted file mode 100644
index 5a86b22..0000000
--- a/jdk/make/jpda/front/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the JDI interface and
-# front-end implementation
-#
-
-BUILDDIR = ../..
-PACKAGE = com.sun.tools.jdi
-PRODUCT = jpda
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Java Files to compile are found automatically.
-#
-AUTO_FILES_JAVA_DIRS = com/sun/jdi com/sun/tools/jdi
-
-#
-# Files that need to be copied
-#
-SERVICEDIR = $(CLASSBINDIR)/META-INF/services
-
-FILES_copy = \
- $(SERVICEDIR)/com.sun.jdi.connect.spi.TransportService \
- $(SERVICEDIR)/com.sun.jdi.connect.Connector
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_COMPILED_PROPERTIES = \
- com/sun/tools/jdi/resources/jdi.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Copy the service provider configuration files into the resource
-# directory. Copy the configuration file also uncomments any
-# providers that need to be enabled for this platform.
-#
-
-build: copy-files
-
-copy-files: $(FILES_copy)
-
-$(SERVICEDIR)/%: $(SHARE_SRC)/classes/com/sun/tools/jdi/META-INF/services/%
- $(prep-target)
- $(RM) $@.temp
- @$(CAT) $< | $(SED) -e "s/^#\[$(PLATFORM)\]//" > $@.temp
- $(MV) $@.temp $@
-
-clean clobber::
- $(RM) $(FILES_copy)
-
-.PHONY: copy-files
-
diff --git a/jdk/make/jpda/gui/Makefile b/jdk/make/jpda/gui/Makefile
deleted file mode 100644
index 0816820..0000000
--- a/jdk/make/jpda/gui/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the GUI debugger
-#
-
-BUILDDIR = ../..
-PACKAGE = com.sun.tools.example.debug.gui
-PRODUCT = jpda
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Java Files to compile are found automatically.
-#
-AUTO_FILES_JAVA_DIRS = com/sun/tools/example/debug/gui
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/jpda/jdwp/Makefile b/jdk/make/jpda/jdwp/Makefile
deleted file mode 100644
index fb44007..0000000
--- a/jdk/make/jpda/jdwp/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JDWP
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../..
-PACKAGE = com.sun.tools.jdwp
-PRODUCT = jpda
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Where do generated Java source files go?
-#
-JAVA_SRC_DEST_DIR = $(GENSRCDIR)
-
-#
-# Where do generated C source files go?
-# the jdwp build is what needs the generated C files
-# so they are being placed there for automatic pickup by
-# the value of GENNATIVESRCDIR when jdwp is being built.
-#
-C_SRC_DEST_DIR = $(GENNATIVESRCDIR)/jdwp
-
-JDIPKGDIR = com/sun/tools/jdi
-GEN_JDWP_JAVA_DIR = $(JAVA_SRC_DEST_DIR)/$(JDIPKGDIR)
-GEN_JDWP_JAVA = $(GEN_JDWP_JAVA_DIR)/JDWP.java
-GEN_JDWP_C = $(C_SRC_DEST_DIR)/JDWPCommands.h
-
-JDWP_SPEC = $(BUILDDIR)/jpda/jdwp/jdwp.spec
-JDWPGEN_JARFILE = $(BUILDTOOLJARDIR)/jdwpgen.jar
-
-build: $(GEN_JDWP_JAVA) $(GEN_JDWP_C)
-
-$(GEN_JDWP_JAVA) $(GEN_JDWP_C): $(JDWP_SPEC) $(JDWPGEN_JARFILE)
- $(MKDIR) -p $(GEN_JDWP_JAVA_DIR)
- $(MKDIR) -p $(C_SRC_DEST_DIR)
- $(BOOT_JAVA_CMD) -jar $(JDWPGEN_JARFILE) $(JDWP_SPEC) \
- -jdi $(GEN_JDWP_JAVA) \
- -include $(GEN_JDWP_C)
- @$(java-vm-cleanup)
-
-#
-# Extra clean.
-#
-clean clobber::
- $(RM) -r $(C_SRC_DEST_DIR)
- $(RM) -r $(JAVA_SRC_DEST_DIR)/$(JDIPKGDIR)
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Rules.gmk
-
diff --git a/jdk/make/jpda/jdwp/jdwp.spec b/jdk/make/jpda/jdwp/jdwp.spec
deleted file mode 100644
index 0080c50..0000000
--- a/jdk/make/jpda/jdwp/jdwp.spec
+++ /dev/null
@@ -1,3148 +0,0 @@
-/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-JDWP "Java(tm) Debug Wire Protocol"
-(CommandSet VirtualMachine=1
- (Command Version=1
- "Returns the JDWP version implemented by the target VM. "
- "The version string format is implementation dependent. "
- (Out
- )
- (Reply
- (string description "Text information on the VM version")
- (int jdwpMajor "Major JDWP Version number")
- (int jdwpMinor "Minor JDWP Version number")
- (string vmVersion "Target VM JRE version, as in the java.version property")
- (string vmName "Target VM name, as in the java.vm.name property")
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command ClassesBySignature=2
- "Returns reference types for all the classes loaded by the target VM "
- "which match the given signature. "
- "Multple reference types will be returned if two or more class "
- "loaders have loaded a class of the same name. "
- "The search is confined to loaded classes only; no attempt is made "
- "to load a class of the given signature. "
- (Out
- (string signature "JNI signature of the class to find "
- "(for example, \"Ljava/lang/String;\"). "
- )
- )
- (Reply
- (Repeat classes "Number of reference types that follow."
- (Group ClassInfo
- (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
- "of following reference type. ")
- (referenceTypeID typeID "Matching loaded reference type")
- (int status "The current class "
- "<a href=\"#JDWP_ClassStatus\">status.</a> ")
- )
- )
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command AllClasses=3
- "Returns reference types for all classes currently loaded by the "
- "target VM."
- (Out
- )
- (Reply
- (Repeat classes "Number of reference types that follow."
- (Group ClassInfo
- (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
- "of following reference type. ")
- (referenceTypeID typeID "Loaded reference type")
- (string signature
- "The JNI signature of the loaded reference type")
- (int status "The current class "
- "<a href=\"#JDWP_ClassStatus\">status.</a> ")
- )
- )
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command AllThreads=4
- "Returns all threads currently running in the target VM . "
- "The returned list contains threads created through "
- "java.lang.Thread, all native threads attached to "
- "the target VM through JNI, and system threads created "
- "by the target VM. Threads that have not yet been started "
- "and threads that have completed their execution are not "
- "included in the returned list. "
- (Out
- )
- (Reply
- (Repeat threads "Number of threads that follow."
- (threadObject thread "A running thread")
- )
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command TopLevelThreadGroups=5
- "Returns all thread groups that do not have a parent. This command "
- "may be used as the first step in building a tree (or trees) of the "
- "existing thread groups."
- (Out
- )
- (Reply
- (Repeat groups "Number of thread groups that follow."
- (threadGroupObject group "A top level thread group")
- )
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command Dispose=6
- "Invalidates this virtual machine mirror. "
- "The communication channel to the target VM is closed, and "
- "the target VM prepares to accept another subsequent connection "
- "from this debugger or another debugger, including the "
- "following tasks: "
- "<ul>"
- "<li>All event requests are cancelled. "
- "<li>All threads suspended by the thread-level "
- "<a href=\"#JDWP_ThreadReference_Resume\">resume</a> command "
- "or the VM-level "
- "<a href=\"#JDWP_VirtualMachine_Resume\">resume</a> command "
- "are resumed as many times as necessary for them to run. "
- "<li>Garbage collection is re-enabled in all cases where it was "
- "<a href=\"#JDWP_ObjectReference_DisableCollection\">disabled</a> "
- "</ul>"
- "Any current method invocations executing in the target VM "
- "are continued after the disconnection. Upon completion of any such "
- "method invocation, the invoking thread continues from the "
- "location where it was originally stopped. "
- "<p>"
- "Resources originating in "
- "this VirtualMachine (ObjectReferences, ReferenceTypes, etc.) "
- "will become invalid. "
- (Out
- )
- (Reply
- )
- (ErrorSet
- )
- )
- (Command IDSizes=7
- "Returns the sizes of variably-sized data types in the target VM."
- "The returned values indicate the number of bytes used by the "
- "identifiers in command and reply packets."
- (Out
- )
- (Reply
- (int fieldIDSize "fieldID size in bytes ")
- (int methodIDSize "methodID size in bytes ")
- (int objectIDSize "objectID size in bytes ")
- (int referenceTypeIDSize "referenceTypeID size in bytes ")
- (int frameIDSize "frameID size in bytes ")
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command Suspend=8
- "Suspends the execution of the application running in the target "
- "VM. All Java threads currently running will be suspended. "
- "<p>"
- "Unlike java.lang.Thread.suspend, "
- "suspends of both the virtual machine and individual threads are "
- "counted. Before a thread will run again, it must be resumed through "
- "the <a href=\"#JDWP_VirtualMachine_Resume\">VM-level resume</a> command "
- "or the <a href=\"#JDWP_ThreadReference_Resume\">thread-level resume</a> command "
- "the same number of times it has been suspended. "
- (Out
- )
- (Reply
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command Resume=9
- "Resumes execution of the application after the suspend "
- "command or an event has stopped it. "
- "Suspensions of the Virtual Machine and individual threads are "
- "counted. If a particular thread is suspended n times, it must "
- "resumed n times before it will continue. "
- (Out
- )
- (Reply
- )
- (ErrorSet
- )
- )
- (Command Exit=10
- "Terminates the target VM with the given exit code. "
- "On some platforms, the exit code might be truncated, for "
- "example, to the low order 8 bits. "
- "All ids previously returned from the target VM become invalid. "
- "Threads running in the VM are abruptly terminated. "
- "A thread death exception is not thrown and "
- "finally blocks are not run."
- (Out
- (int exitCode "the exit code")
- )
- (Reply
- )
- (ErrorSet
- )
- )
- (Command CreateString=11
- "Creates a new string object in the target VM and returns "
- "its id. "
- (Out
- (string utf "UTF-8 characters to use in the created string. ")
- )
- (Reply
- (stringObject stringObject
- "Created string (instance of java.lang.String) ")
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command Capabilities=12
- "Retrieve this VM's capabilities. The capabilities are returned "
- "as booleans, each indicating the presence or absence of a "
- "capability. The commands associated with each capability will "
- "return the NOT_IMPLEMENTED error if the cabability is not "
- "available."
- (Out
- )
- (Reply
- (boolean canWatchFieldModification
- "Can the VM watch field modification, and therefore "
- "can it send the Modification Watchpoint Event?")
- (boolean canWatchFieldAccess
- "Can the VM watch field access, and therefore "
- "can it send the Access Watchpoint Event?")
- (boolean canGetBytecodes
- "Can the VM get the bytecodes of a given method? ")
- (boolean canGetSyntheticAttribute
- "Can the VM determine whether a field or method is "
- "synthetic? (that is, can the VM determine if the "
- "method or the field was invented by the compiler?) ")
- (boolean canGetOwnedMonitorInfo
- "Can the VM get the owned monitors infornation for "
- "a thread?")
- (boolean canGetCurrentContendedMonitor
- "Can the VM get the current contended monitor of a thread?")
- (boolean canGetMonitorInfo
- "Can the VM get the monitor information for a given object? ")
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command ClassPaths=13
- "Retrieve the classpath and bootclasspath of the target VM. "
- "If the classpath is not defined, returns an empty list. If the "
- "bootclasspath is not defined returns an empty list."
- (Out
- )
- (Reply
- (string baseDir "Base directory used to resolve relative "
- "paths in either of the following lists.")
- (Repeat classpaths "Number of paths in classpath."
- (string path "One component of classpath") )
- (Repeat bootclasspaths "Number of paths in bootclasspath."
- (string path "One component of bootclasspath") )
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command DisposeObjects=14
- "Releases a list of object IDs. For each object in the list, the "
- "following applies. "
- "The count of references held by the back-end (the reference "
- "count) will be decremented by refCnt. "
- "If thereafter the reference count is less than "
- "or equal to zero, the ID is freed. "
- "Any back-end resources associated with the freed ID may "
- "be freed, and if garbage collection was "
- "disabled for the object, it will be re-enabled. "
- "The sender of this command "
- "promises that no further commands will be sent "
- "referencing a freed ID.
- "<p>"
- "Use of this command is not required. If it is not sent, "
- "resources associated with each ID will be freed by the back-end "
- "at some time after the corresponding object is garbage collected. "
- "It is most useful to use this command to reduce the load on the "
- "back-end if a very large number of "
- "objects has been retrieved from the back-end (a large array, "
- "for example) but may not be garbage collected any time soon. "
- "<p>"
- "IDs may be re-used by the back-end after they "
- "have been freed with this command."
- "This description assumes reference counting, "
- "a back-end may use any implementation which operates "
- "equivalently. "
- (Out
- (Repeat requests "Number of object dispose requests that follow"
- (Group Request
- (object object "The object ID")
- (int refCnt "The number of times this object ID has been "
- "part of a packet received from the back-end. "
- "An accurate count prevents the object ID "
- "from being freed on the back-end if "
- "it is part of an incoming packet, not yet "
- "handled by the front-end.")
- )
- )
- )
- (Reply
- )
- (ErrorSet
- )
- )
- (Command HoldEvents=15
- "Tells the target VM to stop sending events. Events are not discarded; "
- "they are held until a subsequent ReleaseEvents command is sent. "
- "This command is useful to control the number of events sent "
- "to the debugger VM in situations where very large numbers of events "
- "are generated. "
- "While events are held by the debugger back-end, application "
- "execution may be frozen by the debugger back-end to prevent "
- "buffer overflows on the back end.
- "Responses to commands are never held and are not affected by this
- "command. If events are already being held, this command is "
- "ignored."
- (Out
- )
- (Reply
- )
- (ErrorSet
- )
- )
- (Command ReleaseEvents=16
- "Tells the target VM to continue sending events. This command is "
- "used to restore normal activity after a HoldEvents command. If "
- "there is no current HoldEvents command in effect, this command is "
- "ignored."
- (Out
- )
- (Reply
- )
- (ErrorSet
- )
- )
- (Command CapabilitiesNew=17
- "Retrieve all of this VM's capabilities. The capabilities are returned "
- "as booleans, each indicating the presence or absence of a "
- "capability. The commands associated with each capability will "
- "return the NOT_IMPLEMENTED error if the cabability is not "
- "available."
- "Since JDWP version 1.4."
- (Out
- )
- (Reply
- (boolean canWatchFieldModification
- "Can the VM watch field modification, and therefore "
- "can it send the Modification Watchpoint Event?")
- (boolean canWatchFieldAccess
- "Can the VM watch field access, and therefore "
- "can it send the Access Watchpoint Event?")
- (boolean canGetBytecodes
- "Can the VM get the bytecodes of a given method? ")
- (boolean canGetSyntheticAttribute
- "Can the VM determine whether a field or method is "
- "synthetic? (that is, can the VM determine if the "
- "method or the field was invented by the compiler?) ")
- (boolean canGetOwnedMonitorInfo
- "Can the VM get the owned monitors infornation for "
- "a thread?")
- (boolean canGetCurrentContendedMonitor
- "Can the VM get the current contended monitor of a thread?")
- (boolean canGetMonitorInfo
- "Can the VM get the monitor information for a given object? ")
- (boolean canRedefineClasses
- "Can the VM redefine classes?")
- (boolean canAddMethod
- "Can the VM add methods when redefining "
- "classes?")
- (boolean canUnrestrictedlyRedefineClasses
- "Can the VM redefine classes"
- "in arbitrary ways?")
- (boolean canPopFrames
- "Can the VM pop stack frames?")
- (boolean canUseInstanceFilters
- "Can the VM filter events by specific object?")
- (boolean canGetSourceDebugExtension
- "Can the VM get the source debug extension?")
- (boolean canRequestVMDeathEvent
- "Can the VM request VM death events?")
- (boolean canSetDefaultStratum
- "Can the VM set a default stratum?")
- (boolean canGetInstanceInfo
- "Can the VM return instances, counts of instances of classes "
- "and referring objects?")
- (boolean canRequestMonitorEvents
- "Can the VM request monitor events?")
- (boolean canGetMonitorFrameInfo
- "Can the VM get monitors with frame depth info?")
- (boolean canUseSourceNameFilters
- "Can the VM filter class prepare events by source name?")
- (boolean canGetConstantPool
- "Can the VM return the constant pool information?")
- (boolean canForceEarlyReturn
- "Can the VM force early return from a method?")
- (boolean reserved22
- "Reserved for future capability")
- (boolean reserved23
- "Reserved for future capability")
- (boolean reserved24
- "Reserved for future capability")
- (boolean reserved25
- "Reserved for future capability")
- (boolean reserved26
- "Reserved for future capability")
- (boolean reserved27
- "Reserved for future capability")
- (boolean reserved28
- "Reserved for future capability")
- (boolean reserved29
- "Reserved for future capability")
- (boolean reserved30
- "Reserved for future capability")
- (boolean reserved31
- "Reserved for future capability")
- (boolean reserved32
- "Reserved for future capability")
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command RedefineClasses=18
- "Installs new class definitions. "
- "If there are active stack frames in methods of the redefined classes in the "
- "target VM then those active frames continue to run the bytecodes of the "
- "original method. These methods are considered obsolete - see "
- "<a href=\"#JDWP_Method_IsObsolete\">IsObsolete</a>. The methods in the "
- "redefined classes will be used for new invokes in the target VM. "
- "The original method ID refers to the redefined method. "
- "All breakpoints in the redefined classes are cleared."
- "If resetting of stack frames is desired, the "
- "<a href=\"#JDWP_StackFrame_PopFrames\">PopFrames</a> command can be used "
- "to pop frames with obsolete methods."
- "<p>"
- "Requires canRedefineClasses capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
- "In addition to the canRedefineClasses capability, the target VM must "
- "have the canAddMethod capability to add methods when redefining classes, "
- "or the canUnrestrictedlyRedefineClasses to redefine classes in arbitrary "
- "ways."
- (Out
- (Repeat classes "Number of reference types that follow."
- (Group ClassDef
- (referenceType refType "The reference type.")
- (Repeat classfile "Number of bytes defining class (below)"
- (byte classbyte "byte in JVM class file "
- "format.")
- )
- )
- )
- )
- (Reply
- )
- (ErrorSet
- (Error INVALID_CLASS "One of the refTypes is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "One of the refTypes is not a known ID.")
- (Error UNSUPPORTED_VERSION)
- (Error INVALID_CLASS_FORMAT)
- (Error CIRCULAR_CLASS_DEFINITION)
- (Error FAILS_VERIFICATION)
- (Error NAMES_DONT_MATCH)
- (Error NOT_IMPLEMENTED "No aspect of this functionality is implemented "
- "(CapabilitiesNew.canRedefineClasses is false)")
- (Error ADD_METHOD_NOT_IMPLEMENTED)
- (Error SCHEMA_CHANGE_NOT_IMPLEMENTED)
- (Error HIERARCHY_CHANGE_NOT_IMPLEMENTED)
- (Error DELETE_METHOD_NOT_IMPLEMENTED)
- (Error CLASS_MODIFIERS_CHANGE_NOT_IMPLEMENTED)
- (Error METHOD_MODIFIERS_CHANGE_NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
- (Command SetDefaultStratum=19
- "Set the default stratum. Requires canSetDefaultStratum capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
- (Out
- (string stratumID "default stratum, or empty string to use "
- "reference type default.")
- )
- (Reply
- )
- (ErrorSet
- (Error NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
- (Command AllClassesWithGeneric=20
- "Returns reference types for all classes currently loaded by the "
- "target VM. "
- "Both the JNI signature and the generic signature are "
- "returned for each class. "
- "Generic signatures are described in the signature attribute "
- "section in "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "Since JDWP version 1.5."
- (Out
- )
- (Reply
- (Repeat classes "Number of reference types that follow."
- (Group ClassInfo
- (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
- "of following reference type. ")
- (referenceTypeID typeID "Loaded reference type")
- (string signature
- "The JNI signature of the loaded reference type.")
- (string genericSignature
- "The generic signature of the loaded reference type "
- "or an empty string if there is none.")
- (int status "The current class "
- "<a href=\"#JDWP_ClassStatus\">status.</a> ")
- )
- )
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
-
- (Command InstanceCounts=21
- "Returns the number of instances of each reference type in the input list. "
- "Only instances that are reachable for the purposes of "
- "garbage collection are counted. If a reference type is invalid, "
- "eg. it has been unloaded, zero is returned for its instance count."
- "<p>Since JDWP version 1.6. Requires canGetInstanceInfo capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
- (Out
- (Repeat refTypesCount "Number of reference types that follow. Must be non-negative."
- (referenceType refType "A reference type ID.")
- )
- )
- (Reply
- (Repeat counts "The number of counts that follow."
- (long instanceCount "The number of instances for the corresponding reference type "
- "in 'Out Data'.")
- )
- )
- (ErrorSet
- (Error ILLEGAL_ARGUMENT "refTypesCount is less than zero.")
- (Error NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
-)
-
-(CommandSet ReferenceType=2
- (Command Signature=1
- "Returns the JNI signature of a reference type. "
- "JNI signature formats are described in the "
- "<a href=\"http://java.sun.com/products/jdk/1.2/docs/guide/jni/index.html\">Java Native Inteface Specification</a>"
- "<p>
- "For primitive classes "
- "the returned signature is the signature of the corresponding primitive "
- "type; for example, \"I\" is returned as the signature of the class "
- "represented by java.lang.Integer.TYPE."
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (string signature
- "The JNI signature for the reference type.")
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command ClassLoader=2
- "Returns the instance of java.lang.ClassLoader which loaded "
- "a given reference type. If the reference type was loaded by the "
- "system class loader, the returned object ID is null."
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (classLoaderObject classLoader "The class loader for the reference type. ")
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Modifiers=3
- "Returns the modifiers (also known as access flags) for a reference type. "
- "The returned bit mask contains information on the declaration "
- "of the reference type. If the reference type is an array or "
- "a primitive class (for example, java.lang.Integer.TYPE), the "
- "value of the returned bit mask is undefined."
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (int modBits "Modifier bits as defined in Chapter 4 of "
- "<cite>The Java™ Virtual Machine Specification</cite>")
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Fields=4
- "Returns information for each field in a reference type. "
- "Inherited fields are not included. "
- "The field list will include any synthetic fields created "
- "by the compiler. "
- "Fields are returned in the order they occur in the class file."
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (Repeat declared "Number of declared fields."
- (Group FieldInfo
- (field fieldID "Field ID.")
- (string name "Name of field.")
- (string signature "JNI Signature of field.")
- (int modBits "The modifier bit flags (also known as access flags) "
- "which provide additional information on the "
- "field declaration. Individual flag values are "
- "defined in Chapter 4 of "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "In addition, The <code>0xf0000000</code> bit identifies "
- "the field as synthetic, if the synthetic attribute "
- "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
- )
- )
- )
- (ErrorSet
- (Error CLASS_NOT_PREPARED)
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Methods=5
- "Returns information for each method in a reference type. "
- "Inherited methods are not included. The list of methods will "
- "include constructors (identified with the name \"<init>\"), "
- "the initialization method (identified with the name \"<clinit>\") "
- "if present, and any synthetic methods created by the compiler. "
- "Methods are returned in the order they occur in the class file."
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (Repeat declared "Number of declared methods."
- (Group MethodInfo
- (method methodID "Method ID.")
- (string name "Name of method.")
- (string signature "JNI signature of method.")
- (int modBits "The modifier bit flags (also known as access flags) "
- "which provide additional information on the "
- "method declaration. Individual flag values are "
- "defined in Chapter 4 of "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "In addition, The <code>0xf0000000</code> bit identifies "
- "the method as synthetic, if the synthetic attribute "
- "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
- )
- )
- )
- (ErrorSet
- (Error CLASS_NOT_PREPARED)
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command GetValues=6
- "Returns the value of one or more static fields of the "
- "reference type. Each field must be member of the reference type "
- "or one of its superclasses, superinterfaces, or implemented interfaces. "
- "Access control is not enforced; for example, the values of private "
- "fields can be obtained."
- (Out
- (referenceType refType "The reference type ID.")
- (Repeat fields "The number of values to get"
- (Group Field
- (field fieldID "A field to get")
- )
- )
- )
- (Reply
- (Repeat values "The number of values returned, always equal to fields, "
- "the number of values to get."
- (value value "The field value")
- )
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error INVALID_FIELDID)
- (Error VM_DEAD)
- )
- )
- (Command SourceFile=7
- "Returns the name of source file in which a reference type was "
- "declared. "
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (string sourceFile "The source file name. No path information "
- "for the file is included")
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error ABSENT_INFORMATION "The source file attribute is absent.")
- (Error VM_DEAD)
- )
- )
- (Command NestedTypes=8
- "Returns the classes and interfaces directly nested within this type."
- "Types further nested within those types are not included. "
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (Repeat classes "The number of nested classes and interfaces"
- (Group TypeInfo
- (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
- "of following reference type. ")
- (referenceTypeID typeID "The nested class or interface ID.")
- )
- )
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Status=9
- "Returns the current status of the reference type. The status "
- "indicates the extent to which the reference type has been "
- "initialized, as described in section 2.1.6 of "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "If the class is linked the PREPARED and VERIFIED bits in the returned status bits "
- "will be set. If the class is initialized the INITIALIZED bit in the returned "
- "status bits will be set. If an error occured during initialization then the "
- "ERROR bit in the returned status bits will be set. "
- "The returned status bits are undefined for array types and for "
- "primitive classes (such as java.lang.Integer.TYPE). "
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (int status "<a href=\"#JDWP_ClassStatus\">Status</a> bits:"
- "See <a href=\"#JDWP_ClassStatus\">JDWP.ClassStatus</a>")
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Interfaces=10
- "Returns the interfaces declared as implemented by this class. "
- "Interfaces indirectly implemented (extended by the implemented "
- "interface or implemented by a superclass) are not included."
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (Repeat interfaces "The number of implemented interfaces"
- (interfaceType interfaceType "implemented interface.")
- )
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command ClassObject=11
- "Returns the class object corresponding to this type. "
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (classObject classObject "class object.")
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command SourceDebugExtension=12
- "Returns the value of the SourceDebugExtension attribute. "
- "Since JDWP version 1.4. Requires canGetSourceDebugExtension capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (string extension "extension attribute")
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error ABSENT_INFORMATION "If the extension is not specified.")
- (Error NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
- (Command SignatureWithGeneric=13
- "Returns the JNI signature of a reference type along with the "
- "generic signature if there is one. "
- "Generic signatures are described in the signature attribute "
- "section in "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "Since JDWP version 1.5."
- "<p>
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (string signature
- "The JNI signature for the reference type.")
- (string genericSignature
- "The generic signature for the reference type or an empty "
- "string if there is none.")
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command FieldsWithGeneric=14
- "Returns information, including the generic signature if any, "
- "for each field in a reference type. "
- "Inherited fields are not included. "
- "The field list will include any synthetic fields created "
- "by the compiler. "
- "Fields are returned in the order they occur in the class file. "
- "Generic signatures are described in the signature attribute "
- "section in "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "Since JDWP version 1.5."
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (Repeat declared "Number of declared fields."
- (Group FieldInfo
- (field fieldID "Field ID.")
- (string name "The name of the field.")
- (string signature "The JNI signature of the field.")
- (string genericSignature "The generic signature of the "
- "field, or an empty string if there is none.")
- (int modBits "The modifier bit flags (also known as access flags) "
- "which provide additional information on the "
- "field declaration. Individual flag values are "
- "defined in Chapter 4 of "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "In addition, The <code>0xf0000000</code> bit identifies "
- "the field as synthetic, if the synthetic attribute "
- "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
- )
- )
- )
- (ErrorSet
- (Error CLASS_NOT_PREPARED)
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command MethodsWithGeneric=15
- "Returns information, including the generic signature if any, "
- "for each method in a reference type. "
- "Inherited methodss are not included. The list of methods will "
- "include constructors (identified with the name \"<init>\"), "
- "the initialization method (identified with the name \"<clinit>\") "
- "if present, and any synthetic methods created by the compiler. "
- "Methods are returned in the order they occur in the class file. "
- "Generic signatures are described in the signature attribute "
- "section in "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "Since JDWP version 1.5."
- (Out
- (referenceType refType "The reference type ID.")
- )
- (Reply
- (Repeat declared "Number of declared methods."
- (Group MethodInfo
- (method methodID "Method ID.")
- (string name "The name of the method.")
- (string signature "The JNI signature of the method.")
- (string genericSignature "The generic signature of the method, or "
- "an empty string if there is none.")
- (int modBits "The modifier bit flags (also known as access flags) "
- "which provide additional information on the "
- "method declaration. Individual flag values are "
- "defined in Chapter 4 of "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "In addition, The <code>0xf0000000</code> bit identifies "
- "the method as synthetic, if the synthetic attribute "
- "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
- )
- )
- )
- (ErrorSet
- (Error CLASS_NOT_PREPARED)
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Instances=16
- "Returns instances of this reference type. "
- "Only instances that are reachable for the purposes of "
- "garbage collection are returned. "
- "<p>Since JDWP version 1.6. Requires canGetInstanceInfo capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
- (Out
- (referenceType refType "The reference type ID.")
- (int maxInstances "Maximum number of instances to return. Must be non-negative. "
- "If zero, all instances are returned.")
- )
- (Reply
- (Repeat instances "The number of instances that follow."
- (tagged-object instance "An instance of this reference type.")
- )
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error ILLEGAL_ARGUMENT "maxInstances is less than zero.")
- (Error NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
- (Command ClassFileVersion=17
- "Returns the class file major and minor version numbers, as defined in the class "
- "file format of the Java Virtual Machine specification. "
- "<p>Since JDWP version 1.6. "
- (Out
- (referenceType refType "The class.")
- )
- (Reply
- (int majorVersion "Major version number")
- (int minorVersion "Minor version number")
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error ABSENT_INFORMATION "The class file version information is "
- "absent for primitive and array types.")
- (Error VM_DEAD)
- )
- )
- (Command ConstantPool=18
- "Return the raw bytes of the constant pool in the format of the "
- "constant_pool item of the Class File Format in "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "<p>Since JDWP version 1.6. Requires canGetConstantPool capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>.""
- (Out
- (referenceType refType "The class.")
- )
- (Reply
- (int count "Total number of constant pool entries plus one. This "
- "corresponds to the constant_pool_count item of the "
- "Class File Format in "
- "<cite>The Java™ Virtual Machine Specification</cite>. ")
- (Repeat bytes
- (byte cpbytes "Raw bytes of constant pool")
- )
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error NOT_IMPLEMENTED "If the target virtual machine does not "
- "support the retrieval of constant pool information.")
- (Error ABSENT_INFORMATION "The Constant Pool information is "
- "absent for primitive and array types.")
- (Error VM_DEAD)
- )
- )
-)
-(CommandSet ClassType=3
- (Command Superclass=1
- "Returns the immediate superclass of a class."
- (Out
- (classType clazz "The class type ID.")
- )
- (Reply
- (classType superclass
- "The superclass (null if the class ID for java.lang.Object is specified).")
- )
- (ErrorSet
- (Error INVALID_CLASS "clazz is not the ID of a class.")
- (Error INVALID_OBJECT "clazz is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command SetValues=2
- "Sets the value of one or more static fields. "
- "Each field must be member of the class type "
- "or one of its superclasses, superinterfaces, or implemented interfaces. "
- "Access control is not enforced; for example, the values of private "
- "fields can be set. Final fields cannot be set."
- "For primitive values, the value's type must match the "
- "field's type exactly. For object values, there must exist a "
- "widening reference conversion from the value's type to the
- "field's type and the field's type must be loaded. "
- (Out
- (classType clazz "The class type ID.")
- (Repeat values "The number of fields to set."
- (Group FieldValue "A Field/Value pair."
- (field fieldID "Field to set.")
- (untagged-value value "Value to put in the field.")
- )
- )
- )
- (Reply "none"
- )
- (ErrorSet
- (Error INVALID_CLASS "clazz is not the ID of a class.")
- (Error CLASS_NOT_PREPARED)
- (Error INVALID_OBJECT "clazz is not a known ID or a value of an "
- "object field is not a known ID.")
- (Error INVALID_FIELDID)
- (Error VM_DEAD)
- )
- )
- (Command InvokeMethod=3
- "Invokes a static method. "
- "The method must be member of the class type "
- "or one of its superclasses, superinterfaces, or implemented interfaces. "
- "Access control is not enforced; for example, private "
- "methods can be invoked."
- "<p>"
- "The method invocation will occur in the specified thread. "
- "Method invocation can occur only if the specified thread "
- "has been suspended by an event. "
- "Method invocation is not supported "
- "when the target VM has been suspended by the front-end. "
- "<p>"
- "The specified method is invoked with the arguments in the specified "
- "argument list. "
- "The method invocation is synchronous; the reply packet is not "
- "sent until the invoked method returns in the target VM. "
- "The return value (possibly the void value) is "
- "included in the reply packet. "
- "If the invoked method throws an exception, the "
- "exception object ID is set in the reply packet; otherwise, the "
- "exception object ID is null. "
- "<p>"
- "For primitive arguments, the argument value's type must match the "
- "argument's type exactly. For object arguments, there must exist a "
- "widening reference conversion from the argument value's type to the "
- "argument's type and the argument's type must be loaded. "
- "<p>"
- "By default, all threads in the target VM are resumed while "
- "the method is being invoked if they were previously "
- "suspended by an event or by command. "
- "This is done to prevent the deadlocks "
- "that will occur if any of the threads own monitors "
- "that will be needed by the invoked method. It is possible that "
- "breakpoints or other events might occur during the invocation. "
- "Note, however, that this implicit resume acts exactly like "
- "the ThreadReference resume command, so if the thread's suspend "
- "count is greater than 1, it will remain in a suspended state "
- "during the invocation. By default, when the invocation completes, "
- "all threads in the target VM are suspended, regardless their state "
- "before the invocation. "
- "<p>"
- "The resumption of other threads during the invoke can be prevented "
- "by specifying the INVOKE_SINGLE_THREADED "
- "bit flag in the <code>options</code> field; however, "
- "there is no protection against or recovery from the deadlocks "
- "described above, so this option should be used with great caution. "
- "Only the specified thread will be resumed (as described for all "
- "threads above). Upon completion of a single threaded invoke, the invoking thread "
- "will be suspended once again. Note that any threads started during "
- "the single threaded invocation will not be suspended when the "
- "invocation completes. "
- "<p>"
- "If the target VM is disconnected during the invoke (for example, through "
- "the VirtualMachine dispose command) the method invocation continues. "
- (Out
- (classType clazz "The class type ID.")
- (threadObject thread "The thread in which to invoke.")
- (method methodID "The method to invoke.")
- (Repeat arguments
- (value arg "The argument value.")
- )
- (int options "Invocation <a href=\"#JDWP_InvokeOptions\">options</a>")
- )
- (Reply
- (value returnValue "The returned value.")
- (tagged-object exception "The thrown exception.")
- )
- (ErrorSet
- (Error INVALID_CLASS "clazz is not the ID of a class.")
- (Error INVALID_OBJECT "clazz is not a known ID.")
- (Error INVALID_METHODID "methodID is not the ID of a method.")
- (Error INVALID_THREAD)
- (Error THREAD_NOT_SUSPENDED)
- (Error VM_DEAD)
- )
- )
- (Command NewInstance=4
- "Creates a new object of this type, invoking the specified "
- "constructor. The constructor method ID must be a member of "
- "the class type."
- "<p>"
- "Instance creation will occur in the specified thread. "
- "Instance creation can occur only if the specified thread "
- "has been suspended by an event. "
- "Method invocation is not supported "
- "when the target VM has been suspended by the front-end. "
- "<p>"
- "The specified constructor is invoked with the arguments in the specified "
- "argument list. "
- "The constructor invocation is synchronous; the reply packet is not "
- "sent until the invoked method returns in the target VM. "
- "The return value (possibly the void value) is "
- "included in the reply packet. "
- "If the constructor throws an exception, the "
- "exception object ID is set in the reply packet; otherwise, the "
- "exception object ID is null. "
- "<p>"
- "For primitive arguments, the argument value's type must match the "
- "argument's type exactly. For object arguments, there must exist a "
- "widening reference conversion from the argument value's type to the "
- "argument's type and the argument's type must be loaded. "
- "<p>"
- "By default, all threads in the target VM are resumed while "
- "the method is being invoked if they were previously "
- "suspended by an event or by command. "
- "This is done to prevent the deadlocks "
- "that will occur if any of the threads own monitors "
- "that will be needed by the invoked method. It is possible that "
- "breakpoints or other events might occur during the invocation. "
- "Note, however, that this implicit resume acts exactly like "
- "the ThreadReference resume command, so if the thread's suspend "
- "count is greater than 1, it will remain in a suspended state "
- "during the invocation. By default, when the invocation completes, "
- "all threads in the target VM are suspended, regardless their state "
- "before the invocation. "
- "<p>"
- "The resumption of other threads during the invoke can be prevented "
- "by specifying the INVOKE_SINGLE_THREADED "
- "bit flag in the <code>options</code> field; however, "
- "there is no protection against or recovery from the deadlocks "
- "described above, so this option should be used with great caution. "
- "Only the specified thread will be resumed (as described for all "
- "threads above). Upon completion of a single threaded invoke, the invoking thread "
- "will be suspended once again. Note that any threads started during "
- "the single threaded invocation will not be suspended when the "
- "invocation completes. "
- "<p>"
- "If the target VM is disconnected during the invoke (for example, through "
- "the VirtualMachine dispose command) the method invocation continues. "
- (Out
- (classType clazz "The class type ID.")
- (threadObject thread "The thread in which to invoke the constructor.")
- (method methodID "The constructor to invoke.")
- (Repeat arguments
- (value arg "The argument value.")
- )
- (int options "Constructor invocation <a href=\"#JDWP_InvokeOptions\">options</a>")
- )
- (Reply
- (tagged-object newObject "The newly created object, or null "
- "if the constructor threw an exception.")
- (tagged-object exception "The thrown exception, if any; otherwise, null.")
- )
- (ErrorSet
- (Error INVALID_CLASS "clazz is not the ID of a class.")
- (Error INVALID_OBJECT "clazz is not a known ID or a value of an "
- "object parameter is not a known ID..")
- (Error INVALID_METHODID "methodID is not the ID of a method.")
- (Error INVALID_OBJECT)
- (Error INVALID_THREAD)
- (Error THREAD_NOT_SUSPENDED)
- (Error VM_DEAD)
- )
- )
-)
-(CommandSet ArrayType=4
- (Command NewInstance=1
- "Creates a new array object of this type with a given length."
- (Out
- (arrayType arrType "The array type of the new instance.")
- (int length "The length of the array.")
- )
- (Reply
- (tagged-object newArray "The newly created array object. ")
- )
- (ErrorSet
- (Error INVALID_ARRAY)
- (Error INVALID_OBJECT)
- (Error VM_DEAD)
- )
- )
-)
-(CommandSet InterfaceType=5
-)
-(CommandSet Method=6
- (Command LineTable=1
- "Returns line number information for the method, if present. "
- "The line table maps source line numbers to the initial code index "
- "of the line. The line table "
- "is ordered by code index (from lowest to highest). The line number "
- "information is constant unless a new class definition is installed "
- "using <a href=\"#JDWP_VirtualMachine_RedefineClasses\">RedefineClasses</a>."
- (Out
- (referenceType refType "The class.")
- (method methodID "The method.")
- )
- (Reply
- (long start "Lowest valid code index for the method, >=0, or -1 if the method is native ")
- (long end "Highest valid code index for the method, >=0, or -1 if the method is native")
- (Repeat lines "The number of entries in the line table for this method."
- (Group LineInfo
- (long lineCodeIndex "Initial code index of the line, "
- "start <= lineCodeIndex < end")
- (int lineNumber "Line number.")
- )
- )
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error INVALID_METHODID "methodID is not the ID of a method.")
- (Error VM_DEAD)
- )
- )
- (Command VariableTable=2
- "Returns variable information for the method. The variable table "
- "includes arguments and locals declared within the method. For "
- "instance methods, the \"this\" reference is included in the "
- "table. Also, synthetic variables may be present. "
- (Out
- (referenceType refType "The class.")
- (method methodID "The method.")
- )
- (Reply
- (int argCnt "The number of words in the frame used by arguments. "
- "Eight-byte arguments use two words; all others use one. ")
- (Repeat slots "The number of variables."
- (Group SlotInfo "Information about the variable."
- (long codeIndex
- "First code index at which the variable is visible (unsigned). "
- "Used in conjunction with <code>length</code>. "
- "The variable can be get or set only when the current "
- "<code>codeIndex</code> <= current frame code index < <code>codeIndex + length</code> ")
- (string name "The variable's name.")
- (string signature "The variable type's JNI signature.")
- (int length
- "Unsigned value used in conjunction with <code>codeIndex</code>. "
- "The variable can be get or set only when the current "
- "<code>codeIndex</code> <= current frame code index < <code>code index + length</code> ")
- (int slot "The local variable's index in its frame")
- )
- )
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error INVALID_METHODID "methodID is not the ID of a method.")
- (Error ABSENT_INFORMATION "there is no variable information for the method.")
- (Error VM_DEAD)
- )
- )
- (Command Bytecodes=3
- "Retrieve the method's bytecodes as defined in "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "Requires canGetBytecodes capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
- (Out
- (referenceType refType "The class.")
- (method methodID "The method.")
- )
- (Reply
- (Repeat bytes
- (byte bytecode "A Java bytecode.")
- )
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error INVALID_METHODID "methodID is not the ID of a method.")
- (Error NOT_IMPLEMENTED "If the target virtual machine does not "
- "support the retrieval of bytecodes.")
- (Error VM_DEAD)
- )
- )
- (Command IsObsolete=4
- "Determine if this method is obsolete. A method is obsolete if it has been replaced "
- "by a non-equivalent method using the "
- "<a href=\"#JDWP_VirtualMachine_RedefineClasses\">RedefineClasses</a> command. "
- "The original and redefined methods are considered equivalent if their bytecodes are "
- "the same except for indices into the constant pool and the referenced constants are "
- "equal."
- (Out
- (referenceType refType "The class.")
- (method methodID "The method.")
- )
- (Reply
- (boolean isObsolete "true if this method has been replaced"
- "by a non-equivalent method using"
- "the RedefineClasses command.")
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error INVALID_METHODID "methodID is not the ID of a method.")
- (Error NOT_IMPLEMENTED "If the target virtual machine does "
- "not support this query.")
- (Error VM_DEAD)
- )
- )
- (Command VariableTableWithGeneric=5
- "Returns variable information for the method, including "
- "generic signatures for the variables. The variable table "
- "includes arguments and locals declared within the method. For "
- "instance methods, the \"this\" reference is included in the "
- "table. Also, synthetic variables may be present. "
- "Generic signatures are described in the signature attribute "
- "section in "
- "<cite>The Java™ Virtual Machine Specification</cite>. "
- "Since JDWP version 1.5."
- (Out
- (referenceType refType "The class.")
- (method methodID "The method.")
- )
- (Reply
- (int argCnt "The number of words in the frame used by arguments. "
- "Eight-byte arguments use two words; all others use one. ")
- (Repeat slots "The number of variables."
- (Group SlotInfo "Information about the variable."
- (long codeIndex
- "First code index at which the variable is visible (unsigned). "
- "Used in conjunction with <code>length</code>. "
- "The variable can be get or set only when the current "
- "<code>codeIndex</code> <= current frame code index < <code>codeIndex + length</code> ")
- (string name "The variable's name.")
- (string signature "The variable type's JNI signature.")
- (string genericSignature "The variable type's generic "
- "signature or an empty string if there is none.")
- (int length
- "Unsigned value used in conjunction with <code>codeIndex</code>. "
- "The variable can be get or set only when the current "
- "<code>codeIndex</code> <= current frame code index < <code>code index + length</code> ")
- (int slot "The local variable's index in its frame")
- )
- )
- )
- (ErrorSet
- (Error INVALID_CLASS "refType is not the ID of a reference "
- "type.")
- (Error INVALID_OBJECT "refType is not a known ID.")
- (Error INVALID_METHODID "methodID is not the ID of a method.")
- (Error ABSENT_INFORMATION "there is no variable information for the method.")
- (Error VM_DEAD)
- )
- )
-
-)
-(CommandSet Field=8
-)
-(CommandSet ObjectReference=9
- (Command ReferenceType=1
- "Returns the runtime type of the object. "
- "The runtime type will be a class or an array. "
- (Out
- (object object "The object ID")
- )
- (Reply
- (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
- "of following reference type. ")
- (referenceTypeID typeID "The runtime reference type.")
- )
- (ErrorSet
- (Error INVALID_OBJECT)
- (Error VM_DEAD)
- )
- )
- (Command GetValues=2
- "Returns the value of one or more instance fields. "
- "Each field must be member of the object's type "
- "or one of its superclasses, superinterfaces, or implemented interfaces. "
- "Access control is not enforced; for example, the values of private "
- "fields can be obtained."
- (Out
- (object object "The object ID")
- (Repeat fields "The number of values to get"
- (Group Field
- (field fieldID "Field to get.")
- )
- )
- )
- (Reply
- (Repeat values "The number of values returned, always equal to 'fields', "
- "the number of values to get. Field values are ordered "
- "in the reply in the same order as corresponding fieldIDs "
- "in the command."
- (value value "The field value")
- )
- )
- (ErrorSet
- (Error INVALID_OBJECT)
- (Error INVALID_FIELDID)
- (Error VM_DEAD)
- )
- )
- (Command SetValues=3
- "Sets the value of one or more instance fields. "
- "Each field must be member of the object's type "
- "or one of its superclasses, superinterfaces, or implemented interfaces. "
- "Access control is not enforced; for example, the values of private "
- "fields can be set. "
- "For primitive values, the value's type must match the "
- "field's type exactly. For object values, there must be a "
- "widening reference conversion from the value's type to the
- "field's type and the field's type must be loaded. "
- (Out
- (object object "The object ID")
- (Repeat values "The number of fields to set."
- (Group FieldValue "A Field/Value pair."
- (field fieldID "Field to set.")
- (untagged-value value "Value to put in the field.")
- )
- )
- )
- (Reply "none"
- )
- (ErrorSet
- (Error INVALID_OBJECT)
- (Error INVALID_FIELDID)
- (Error VM_DEAD)
- )
- )
- (Command MonitorInfo=5
- "Returns monitor information for an object. All threads int the VM must "
- "be suspended."
- "Requires canGetMonitorInfo capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
- (Out
- (object object "The object ID")
- )
- (Reply
- (threadObject owner "The monitor owner, or null if it is not currently owned.")
- (int entryCount "The number of times the monitor has been entered.")
- (Repeat waiters "The number of threads that are waiting for the monitor "
- "0 if there is no current owner"
- (threadObject thread "A thread waiting for this monitor.")
- )
- )
- (ErrorSet
- (Error INVALID_OBJECT)
- (Error NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
- (Command InvokeMethod=6
- "Invokes a instance method. "
- "The method must be member of the object's type "
- "or one of its superclasses, superinterfaces, or implemented interfaces. "
- "Access control is not enforced; for example, private "
- "methods can be invoked."
- "<p>"
- "The method invocation will occur in the specified thread. "
- "Method invocation can occur only if the specified thread "
- "has been suspended by an event. "
- "Method invocation is not supported "
- "when the target VM has been suspended by the front-end. "
- "<p>"
- "The specified method is invoked with the arguments in the specified "
- "argument list. "
- "The method invocation is synchronous; the reply packet is not "
- "sent until the invoked method returns in the target VM. "
- "The return value (possibly the void value) is "
- "included in the reply packet. "
- "If the invoked method throws an exception, the "
- "exception object ID is set in the reply packet; otherwise, the "
- "exception object ID is null. "
- "<p>"
- "For primitive arguments, the argument value's type must match the "
- "argument's type exactly. For object arguments, there must be a "
- "widening reference conversion from the argument value's type to the "
- "argument's type and the argument's type must be loaded. "
- "<p>"
- "By default, all threads in the target VM are resumed while "
- "the method is being invoked if they were previously "
- "suspended by an event or by command. "
- "This is done to prevent the deadlocks "
- "that will occur if any of the threads own monitors "
- "that will be needed by the invoked method. It is possible that "
- "breakpoints or other events might occur during the invocation. "
- "Note, however, that this implicit resume acts exactly like "
- "the ThreadReference resume command, so if the thread's suspend "
- "count is greater than 1, it will remain in a suspended state "
- "during the invocation. By default, when the invocation completes, "
- "all threads in the target VM are suspended, regardless their state "
- "before the invocation. "
- "<p>"
- "The resumption of other threads during the invoke can be prevented "
- "by specifying the INVOKE_SINGLE_THREADED "
- "bit flag in the <code>options</code> field; however, "
- "there is no protection against or recovery from the deadlocks "
- "described above, so this option should be used with great caution. "
- "Only the specified thread will be resumed (as described for all "
- "threads above). Upon completion of a single threaded invoke, the invoking thread "
- "will be suspended once again. Note that any threads started during "
- "the single threaded invocation will not be suspended when the "
- "invocation completes. "
- "<p>"
- "If the target VM is disconnected during the invoke (for example, through "
- "the VirtualMachine dispose command) the method invocation continues. "
- (Out
- (object object "The object ID")
- (threadObject thread "The thread in which to invoke.")
- (classType clazz "The class type.")
- (method methodID "The method to invoke.")
- (Repeat arguments "The number of arguments."
- (value arg "The argument value.")
- )
- (int options "Invocation <a href=\"#JDWP_InvokeOptions\">options</a>")
- )
- (Reply
- (value returnValue "The returned value, or null if an exception is thrown.")
- (tagged-object exception "The thrown exception, if any.")
- )
- (ErrorSet
- (Error INVALID_OBJECT)
- (Error INVALID_CLASS "clazz is not the ID of a reference "
- "type.")
- (Error INVALID_METHODID "methodID is not the ID of a method.")
- (Error INVALID_THREAD)
- (Error THREAD_NOT_SUSPENDED)
- (Error VM_DEAD)
- )
- )
- (Command DisableCollection=7
- "Prevents garbage collection for the given object. By "
- "default all objects in back-end replies may be "
- "collected at any time the target VM is running. A call to "
- "this command guarantees that the object will not be "
- "collected. The "
- "<a href=\"#JDWP_ObjectReference_EnableCollection\">EnableCollection</a> "
- "command can be used to "
- "allow collection once again. "
- "<p>"
- "Note that while the target VM is suspended, no garbage "
- "collection will occur because all threads are suspended. "
- "The typical examination of variables, fields, and arrays "
- "during the suspension is safe without explicitly disabling "
- "garbage collection. "
- "<p>"
- "This method should be used sparingly, as it alters the "
- "pattern of garbage collection in the target VM and, "
- "consequently, may result in application behavior under the "
- "debugger that differs from its non-debugged behavior. "
- (Out
- (object object "The object ID")
- )
- (Reply "none"
- )
- (ErrorSet
- (Error INVALID_OBJECT)
- (Error VM_DEAD)
- )
- )
- (Command EnableCollection=8
- "Permits garbage collection for this object. By default all "
- "objects returned by JDWP may become unreachable in the target VM, "
- "and hence may be garbage collected. A call to this command is "
- "necessary only if garbage collection was previously disabled with "
- "the <a href=\"#JDWP_ObjectReference_DisableCollection\">DisableCollection</a> "
- "command."
- (Out
- (object object "The object ID")
- )
- (Reply "none"
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
- (Command IsCollected=9
- "Determines whether an object has been garbage collected in the "
- "target VM. "
- (Out
- (object object "The object ID")
- )
- (Reply
- (boolean isCollected "true if the object has been collected; false otherwise")
- )
- (ErrorSet
- (Error INVALID_OBJECT)
- (Error VM_DEAD)
- )
- )
- (Command ReferringObjects=10
- "Returns objects that directly reference this object. "
- "Only objects that are reachable for the purposes "
- "of garbage collection are returned. "
- "Note that an object can also be referenced in other ways, "
- "such as from a local variable in a stack frame, or from a JNI global "
- "reference. Such non-object referrers are not returned by this command. "
- "<p>Since JDWP version 1.6. Requires canGetInstanceInfo capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
- (Out
- (object object "The object ID")
- (int maxReferrers "Maximum number of referring objects to return. "
- "Must be non-negative. If zero, all referring "
- "objects are returned.")
- )
- (Reply
- (Repeat referringObjects "The number of objects that follow."
- (tagged-object instance "An object that references this object.")
- )
- )
- (ErrorSet
- (Error INVALID_OBJECT "object is not a known ID.")
- (Error ILLEGAL_ARGUMENT "maxReferrers is less than zero.")
- (Error NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
-)
-
-(CommandSet StringReference=10
- (Command Value=1
- "Returns the characters contained in the string. "
- (Out
- (object stringObject "The String object ID. ")
- )
- (Reply
- (string stringValue "UTF-8 representation of the string value.")
- )
- (ErrorSet
- (Error INVALID_STRING)
- (Error INVALID_OBJECT)
- (Error VM_DEAD)
- )
- )
-)
-(CommandSet ThreadReference=11
- (Command Name=1
- "Returns the thread name. "
- (Out
- (threadObject thread "The thread object ID. ")
- )
- (Reply
- (string threadName "The thread name.")
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Suspend=2
- "Suspends the thread. "
- "<p>"
- "Unlike java.lang.Thread.suspend(), suspends of both "
- "the virtual machine and individual threads are counted. Before "
- "a thread will run again, it must be resumed the same number "
- "of times it has been suspended. "
- "<p>"
- "Suspending single threads with command has the same "
- "dangers java.lang.Thread.suspend(). If the suspended "
- "thread holds a monitor needed by another running thread, "
- "deadlock is possible in the target VM (at least until the "
- "suspended thread is resumed again). "
- "<p>"
- "The suspended thread is guaranteed to remain suspended until "
- "resumed through one of the JDI resume methods mentioned above; "
- "the application in the target VM cannot resume the suspended thread "
- "through {@link java.lang.Thread#resume}. "
- "<p>"
- "Note that this doesn't change the status of the thread (see the "
- "<a href=\"#JDWP_ThreadReference_Status\">ThreadStatus</a> command.) "
- "For example, if it was "
- "Running, it will still appear running to other threads. "
- (Out
- (threadObject thread "The thread object ID. ")
- )
- (Reply "none"
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Resume=3
- "Resumes the execution of a given thread. If this thread was "
- "not previously suspended by the front-end, "
- "calling this command has no effect. "
- "Otherwise, the count of pending suspends on this thread is "
- "decremented. If it is decremented to 0, the thread will "
- "continue to execute. "
- (Out
- (threadObject thread "The thread object ID. ")
- )
- (Reply "none"
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Status=4
- "Returns the current status of a thread. The thread status "
- "reply indicates the thread status the last time it was running. "
- "the suspend status provides information on the thread's "
- "suspension, if any."
- (Out
- (threadObject thread "The thread object ID. ")
- )
- (Reply
- (int threadStatus "One of the thread status codes "
- "See <a href=\"#JDWP_ThreadStatus\">JDWP.ThreadStatus</a>")
- (int suspendStatus "One of the suspend status codes "
- "See <a href=\"#JDWP_SuspendStatus\">JDWP.SuspendStatus</a>")
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command ThreadGroup=5
- "Returns the thread group that contains a given thread. "
- (Out
- (threadObject thread "The thread object ID. ")
- )
- (Reply
- (threadGroupObject group "The thread group of this thread. ")
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Frames=6
- "Returns the current call stack of a suspended thread. "
- "The sequence of frames starts with "
- "the currently executing frame, followed by its caller, "
- "and so on. The thread must be suspended, and the returned "
- "frameID is valid only while the thread is suspended. "
- (Out
- (threadObject thread "The thread object ID. ")
- (int startFrame "The index of the first frame to retrieve.")
- (int length
- "The count of frames to retrieve "
- "(-1 means all remaining). ")
- )
- (Reply
- (Repeat frames "The number of frames retreived"
- (Group Frame
- (frame frameID "The ID of this frame. ")
- (location location "The current location of this frame")
- )
- )
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command FrameCount=7
- "Returns the count of frames on this thread's stack. "
- "The thread must be suspended, and the returned "
- "count is valid only while the thread is suspended. "
- "Returns JDWP.Error.errorThreadNotSuspended if not suspended. "
- (Out
- (threadObject thread "The thread object ID. ")
- )
- (Reply
- (int frameCount "The count of frames on this thread's stack. ")
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command OwnedMonitors=8
- "Returns the objects whose monitors have been entered by this thread. "
- "The thread must be suspended, and the returned information is "
- "relevant only while the thread is suspended. "
- "Requires canGetOwnedMonitorInfo capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
- (Out
- (threadObject thread "The thread object ID. ")
- )
- (Reply
- (Repeat owned "The number of owned monitors"
- (tagged-object monitor "An owned monitor")
- )
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
- (Command CurrentContendedMonitor=9
- "Returns the object, if any, for which this thread is waiting. The "
- "thread may be waiting to enter a monitor, or it may be waiting, via "
- "the java.lang.Object.wait method, for another thread to invoke the "
- "notify method. "
- "The thread must be suspended, and the returned information is "
- "relevant only while the thread is suspended. "
- "Requires canGetCurrentContendedMonitor capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
- (Out
- (threadObject thread "The thread object ID. ")
- )
- (Reply
- (tagged-object monitor "The contended monitor, or null if "
- "there is no current contended monitor. ")
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
- (Command Stop=10
- "Stops the thread with an asynchronous exception, as if done by "
- "java.lang.Thread.stop "
- (Out
- (threadObject thread "The thread object ID. ")
- (object throwable "Asynchronous exception. This object must "
- "be an instance of java.lang.Throwable or a subclass")
- )
- (Reply "none"
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "If thread is not a known ID or the asynchronous "
- "exception has been garbage collected.")
- (Error VM_DEAD)
- )
- )
- (Command Interrupt=11
- "Interrupt the thread, as if done by java.lang.Thread.interrupt "
- (Out
- (threadObject thread "The thread object ID. ")
- )
- (Reply "none"
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command SuspendCount=12
- "Get the suspend count for this thread. The suspend count is the "
- "number of times the thread has been suspended through the "
- "thread-level or VM-level suspend commands without a corresponding resume "
- (Out
- (threadObject thread "The thread object ID. ")
- )
- (Reply
- (int suspendCount "The number of outstanding suspends of this thread. ")
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command OwnedMonitorsStackDepthInfo=13
- "Returns monitor objects owned by the thread, along with stack depth at which "
- "the monitor was acquired. Returns stack depth of -1 if "
- "the implementation cannot determine the stack depth "
- "(e.g., for monitors acquired by JNI MonitorEnter)."
- "The thread must be suspended, and the returned information is "
- "relevant only while the thread is suspended. "
- "Requires canGetMonitorFrameInfo capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
- "<p>Since JDWP version 1.6. "
-
- (Out
- (threadObject thread "The thread object ID. ")
- )
- (Reply
- (Repeat owned "The number of owned monitors"
- (Group monitor
- (tagged-object monitor "An owned monitor")
- (int stack_depth "Stack depth location where monitor was acquired")
- )
- )
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
- (Command ForceEarlyReturn=14
- "Force a method to return before it reaches a return "
- "statement. "
- "<p>"
- "The method which will return early is referred to as the "
- "called method. The called method is the current method (as "
- "defined by the Frames section in "
- "<cite>The Java™ Virtual Machine Specification</cite>) "
- "for the specified thread at the time this command "
- "is received. "
- "<p>"
- "The specified thread must be suspended. "
- "The return occurs when execution of Java programming "
- "language code is resumed on this thread. Between sending this "
- "command and resumption of thread execution, the "
- "state of the stack is undefined. "
- "<p>"
- "No further instructions are executed in the called "
- "method. Specifically, finally blocks are not executed. Note: "
- "this can cause inconsistent states in the application. "
- "<p>"
- "A lock acquired by calling the called method (if it is a "
- "synchronized method) and locks acquired by entering "
- "synchronized blocks within the called method are "
- "released. Note: this does not apply to JNI locks or "
- "java.util.concurrent.locks locks. "
- "<p>"
- "Events, such as MethodExit, are generated as they would be in "
- "a normal return. "
- "<p>"
- "The called method must be a non-native Java programming "
- "language method. Forcing return on a thread with only one "
- "frame on the stack causes the thread to exit when resumed. "
- "<p>"
- "For void methods, the value must be a void value. "
- "For methods that return primitive values, the value's type must "
- "match the return type exactly. For object values, there must be a "
- "widening reference conversion from the value's type to the "
- "return type type and the return type must be loaded. "
- "<p>"
- "Since JDWP version 1.6. Requires canForceEarlyReturn capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
- (Out
- (threadObject thread "The thread object ID. ")
- (value value "The value to return. ")
- )
- (Reply "none"
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "Thread or value is not a known ID.")
- (Error THREAD_NOT_SUSPENDED)
- (Error THREAD_NOT_ALIVE)
- (Error OPAQUE_FRAME "Attempted to return early from "
- "a frame corresponding to a native "
- "method. Or the implementation is "
- "unable to provide this functionality "
- "on this frame.")
- (Error NO_MORE_FRAMES)
- (Error NOT_IMPLEMENTED)
- (Error TYPE_MISMATCH "Value is not an appropriate type for the "
- "return value of the method.")
- (Error VM_DEAD)
- )
- )
-
-)
-(CommandSet ThreadGroupReference=12
- (Command Name=1
- "Returns the thread group name. "
- (Out
- (threadGroupObject group "The thread group object ID. ")
- )
- (Reply
- (string groupName "The thread group's name.")
- )
- (ErrorSet
- (Error INVALID_THREAD_GROUP)
- (Error INVALID_OBJECT "group is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Parent=2
- "Returns the thread group, if any, which contains a given thread group. "
- (Out
- (threadGroupObject group "The thread group object ID. ")
- )
- (Reply
- (threadGroupObject parentGroup "The parent thread group object, or "
- "null if the given thread group "
- "is a top-level thread group")
- )
- (ErrorSet
- (Error INVALID_THREAD_GROUP)
- (Error INVALID_OBJECT "group is not a known ID.")
- (Error VM_DEAD)
- )
- )
- (Command Children=3
- "Returns the live threads and active thread groups directly contained "
- "in this thread group. Threads and thread groups in child "
- "thread groups are not included. "
- "A thread is alive if it has been started and has not yet been stopped. "
- "See <a href=../../../api/java/lang/ThreadGroup.html>java.lang.ThreadGroup </a>
- "for information about active ThreadGroups.
- (Out
- (threadGroupObject group "The thread group object ID. ")
- )
- (Reply
- (Repeat childThreads "The number of live child threads. "
- (threadObject childThread "A direct child thread ID. ")
- )
- (Repeat childGroups "The number of active child thread groups. "
- (threadGroupObject childGroup "A direct child thread group ID. ")
- )
- )
- (ErrorSet
- (Error INVALID_THREAD_GROUP)
- (Error INVALID_OBJECT "group is not a known ID.")
- (Error VM_DEAD)
- )
- )
-)
-(CommandSet ArrayReference=13
- (Command Length=1
- "Returns the number of components in a given array. "
- (Out
- (arrayObject arrayObject "The array object ID. ")
- )
- (Reply
- (int arrayLength "The length of the array.")
- )
- (ErrorSet
- (Error INVALID_OBJECT "arrayObject is not a known ID.")
- (Error INVALID_ARRAY)
- (Error VM_DEAD)
- )
- )
- (Command GetValues=2
- "Returns a range of array components. The specified range must "
- "be within the bounds of the array. "
- (Out
- (arrayObject arrayObject "The array object ID. ")
- (int firstIndex "The first index to retrieve.")
- (int length "The number of components to retrieve.")
- )
- (Reply
- (typed-sequence values "The retrieved values. If the values "
- "are objects, they are tagged-values; "
- "otherwise, they are untagged-values")
- )
- (ErrorSet
- (Error INVALID_LENGTH "If index is beyond the end of this array.")
- (Error INVALID_OBJECT "arrayObject is not a known ID.")
- (Error INVALID_ARRAY)
- (Error VM_DEAD)
- )
- )
- (Command SetValues=3
- "Sets a range of array components. The specified range must "
- "be within the bounds of the array. "
- "For primitive values, each value's type must match the "
- "array component type exactly. For object values, there must be a "
- "widening reference conversion from the value's type to the
- "array component type and the array component type must be loaded. "
- (Out
- (arrayObject arrayObject "The array object ID. ")
- (int firstIndex "The first index to set.")
- (Repeat values "The number of values to set. "
- (untagged-value value "A value to set. ")
- )
- )
- (Reply "none"
- )
- (ErrorSet
- (Error INVALID_LENGTH "If index is beyond the end of this array.")
- (Error INVALID_OBJECT "arrayObject is not a known ID.")
- (Error INVALID_ARRAY)
- (Error VM_DEAD)
- )
- )
-)
-(CommandSet ClassLoaderReference=14
- (Command VisibleClasses=1
- "Returns a list of all classes which this class loader has "
- "been requested to load. This class loader is considered to be "
- "an <i>initiating</i> class loader for each class in the returned "
- "list. The list contains each "
- "reference type defined by this loader and any types for which "
- "loading was delegated by this class loader to another class loader. "
- "<p>"
- "The visible class list has useful properties with respect to "
- "the type namespace. A particular type name will occur at most "
- "once in the list. Each field or variable declared with that "
- "type name in a class defined by "
- "this class loader must be resolved to that single type. "
- "<p>"
- "No ordering of the returned list is guaranteed. "
- (Out
- (classLoaderObject classLoaderObject "The class loader object ID. ")
- )
- (Reply
- (Repeat classes "The number of visible classes. "
- (Group ClassInfo
- (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
- "of following reference type. ")
- (referenceTypeID typeID
- "A class visible to this class loader.")
- )
- )
- )
- (ErrorSet
- (Error INVALID_OBJECT)
- (Error INVALID_CLASS_LOADER)
- (Error VM_DEAD)
- )
- )
-)
-(CommandSet EventRequest=15
- (Command Set=1
- "Set an event request. When the event described by this request "
- "occurs, an <a href=\"#JDWP_Event\">event</a> is sent from the "
- "target VM. If an event occurs that has not been requested then it is not sent "
- "from the target VM. The two exceptions to this are the VM Start Event and "
- "the VM Death Event which are automatically generated events - see "
- "<a href=\"#JDWP_Event_Composite\">Composite Command</a> for further details."
- (Out
- (byte eventKind "Event kind to request. "
- "See <a href=\"#JDWP_EventKind\">JDWP.EventKind</a> "
- "for a complete list of events that can be requested; "
- "some events may require a capability in order to be requested. "
- )
- (byte suspendPolicy
- "What threads are suspended when this event occurs? "
- "Note that the order of events and command replies "
- "accurately reflects the order in which threads are "
- "suspended and resumed. For example, if a "
- "<a href=\"#JDWP_VirtualMachine_Resume\">VM-wide resume</a> "
- "is processed before an event occurs which suspends the "
- "VM, the reply to the resume command will be written to "
- "the transport before the suspending event.")
- (Repeat modifiers "Constraints used to control the number "
- "of generated events."
- "Modifiers specify additional tests that "
- "an event must satisfy before it is placed "
- "in the event queue. Events are filtered by "
- "applying each modifier to an event in the "
- "order they are specified in this collection "
- "Only events that satisfy all modifiers "
- "are reported. A value of 0 means there are no "
- "modifiers in the request."
- "<p>"
- "Filtering can improve "
- "debugger performance dramatically by
- "reducing the "
- "amount of event traffic sent from the "
- "target VM to the debugger VM. "
- (Select Modifier
- (byte modKind "Modifier kind")
- (Alt Count=1
- "Limit the requested event to be reported at most once after a "
- "given number of occurrences. The event is not reported "
- "the first <code>count - 1</code> times this filter is reached. "
- "To request a one-off event, call this method with a count of 1. "
- "<p>"
- "Once the count reaches 0, any subsequent filters in this request "
- "are applied. If none of those filters cause the event to be "
- "suppressed, the event is reported. Otherwise, the event is not "
- "reported. In either case subsequent events are never reported for "
- "this request. "
- "This modifier can be used with any event kind."
-
- (int count "Count before event. One for one-off.")
- )
- (Alt Conditional=2 "Conditional on expression"
- (int exprID "For the future")
- )
- (Alt ThreadOnly=3
- "Restricts reported events to "
- "those in the given thread. "
- "This modifier can be used with any event kind "
- "except for class unload. "
-
- (threadObject thread "Required thread")
- )
- (Alt ClassOnly=4
- "For class prepare events, restricts the events "
- "generated by this request to be the "
- "preparation of the given reference type and any subtypes. "
- "For monitor wait and waited events, restricts the events "
- "generated by this request to those whose monitor object "
- "is of the given reference type or any of its subtypes. "
- "For other events, restricts the events generated "
- "by this request to those "
- "whose location is in the given reference type or any of its subtypes. "
- "An event will be generated for any location in a reference type that can "
- "be safely cast to the given reference type. "
- "This modifier can be used with any event kind except "
- "class unload, thread start, and thread end. "
-
- (referenceType clazz "Required class")
- )
- (Alt ClassMatch=5
- "Restricts reported events to those for classes whose name "
- "matches the given restricted regular expression. "
- "For class prepare events, the prepared class name "
- "is matched. For class unload events, the "
- "unloaded class name is matched. For monitor wait "
- "and waited events, the name of the class of the "
- "monitor object is matched. For other events, "
- "the class name of the event's location is matched. "
- "This modifier can be used with any event kind except "
- "thread start and thread end. "
-
- (string classPattern "Required class pattern. "
- "Matches are limited to exact matches of the "
- "given class pattern and matches of patterns that "
- "begin or end with '*'; for example, "
- "\"*.Foo\" or \"java.*\". "
- )
-
- )
- (Alt ClassExclude=6
- "Restricts reported events to those for classes whose name "
- "does not match the given restricted regular expression. "
- "For class prepare events, the prepared class name "
- "is matched. For class unload events, the "
- "unloaded class name is matched. For monitor wait and "
- "waited events, the name of the class of the monitor "
- "object is matched. For other events, "
- "the class name of the event's location is matched. "
- "This modifier can be used with any event kind except "
- "thread start and thread end. "
-
- (string classPattern "Disallowed class pattern. "
- "Matches are limited to exact matches of the "
- "given class pattern and matches of patterns that "
- "begin or end with '*'; for example, "
- "\"*.Foo\" or \"java.*\". "
- )
- )
- (Alt LocationOnly=7
- "Restricts reported events to those that occur at "
- "the given location. "
- "This modifier can be used with "
- "breakpoint, field access, field modification, "
- "step, and exception event kinds. "
-
- (location loc "Required location")
- )
- (Alt ExceptionOnly=8
- "Restricts reported exceptions by their class and "
- "whether they are caught or uncaught. "
- "This modifier can be used with "
- "exception event kinds only. "
-
- (referenceType exceptionOrNull
- "Exception to report. Null (0) means report "
- "exceptions of all types. "
- "A non-null type restricts the reported exception "
- "events to exceptions of the given type or "
- "any of its subtypes. "
- )
- (boolean caught "Report caught exceptions")
- (boolean uncaught "Report uncaught exceptions. "
- "Note that it "
- "is not always possible to determine whether an "
- "exception is caught or uncaught at the time it is "
- "thrown. See the exception event catch location under "
- "<a href=\"#JDWP_Event_Composite\">composite events</a> "
- "for more information. "
- )
-
- )
- (Alt FieldOnly=9
- "Restricts reported events to those that occur for "
- "a given field. "
- "This modifier can be used with "
- "field access and field modification event kinds only. "
-
- (referenceType declaring "Type in which field is declared.")
- (field fieldID "Required field")
- )
- (Alt Step=10
- "Restricts reported step events "
- "to those which satisfy "
- "depth and size constraints. "
- "This modifier can be used with "
- "step event kinds only. "
-
- (threadObject thread "Thread in which to step")
- (int size "size of each step. "
- "See <a href=\"#JDWP_StepSize\">JDWP.StepSize</a>")
- (int depth "relative call stack limit. "
- "See <a href=\"#JDWP_StepDepth\">JDWP.StepDepth</a>")
- )
- (Alt InstanceOnly=11
- "Restricts reported events to those whose "
- "active 'this' object is the given object. "
- "Match value is the null object for static methods. "
- "This modifier can be used with any event kind "
- "except class prepare, class unload, thread start, "
- "and thread end. Introduced in JDWP version 1.4."
-
- (object instance "Required 'this' object")
- )
- (Alt SourceNameMatch=12
- "Restricts reported class prepare events to those "
- "for reference types which have a source name "
- "which matches the given restricted regular expression. "
- "The source names are determined by the reference type's "
- "<a href=\"#JDWP_ReferenceType_SourceDebugExtension\"> "
- "SourceDebugExtension</a>. "
- "This modifier can only be used with class prepare "
- "events. "
- "Since JDWP version 1.6. Requires the canUseSourceNameFilters "
- "capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
-
- (string sourceNamePattern "Required source name pattern. "
- "Matches are limited to exact matches of the "
- "given pattern and matches of patterns that "
- "begin or end with '*'; for example, "
- "\"*.Foo\" or \"java.*\". "
- )
- )
-
- )
- )
- )
- (Reply
- (int requestID "ID of created request")
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_CLASS)
- (Error INVALID_STRING)
- (Error INVALID_OBJECT)
- (Error INVALID_COUNT)
- (Error INVALID_FIELDID)
- (Error INVALID_METHODID)
- (Error INVALID_LOCATION)
- (Error INVALID_EVENT_TYPE)
- (Error NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
- (Command Clear=2
- "Clear an event request. See <a href=\"#JDWP_EventKind\">JDWP.EventKind</a> "
- "for a complete list of events that can be cleared. Only the event request matching "
- "the specified event kind and requestID is cleared. If there isn't a matching event "
- "request the command is a no-op and does not result in an error. Automatically "
- "generated events do not have a corresponding event request and may not be cleared "
- "using this command."
- (Out
- (byte eventKind "Event kind to clear")
- (int requestID "ID of request to clear")
- )
- (Reply "none"
- )
- (ErrorSet
- (Error VM_DEAD)
- (Error INVALID_EVENT_TYPE)
- )
- )
- (Command ClearAllBreakpoints=3
- "Removes all set breakpoints, a no-op if there are no breakpoints set."
- (Out "none"
- )
- (Reply "none"
- )
- (ErrorSet
- (Error VM_DEAD)
- )
- )
-)
-(CommandSet StackFrame=16
- (Command GetValues=1
- "Returns the value of one or more local variables in a "
- "given frame. Each variable must be visible at the frame's code index. "
- "Even if local variable information is not available, values can "
- "be retrieved if the front-end is able to "
- "determine the correct local variable index. (Typically, this "
- "index can be determined for method arguments from the method "
- "signature without access to the local variable table information.) "
- (Out
- (threadObject thread "The frame's thread. ")
- (frame frame "The frame ID. ")
- (Repeat slots "The number of values to get. "
- (Group SlotInfo
- (int slot "The local variable's index in the frame. ")
- (byte sigbyte "A <a href=\"#JDWP_Tag\">tag</a> "
- "identifying the type of the variable ")
- )
- )
- )
- (Reply
- (Repeat values "The number of values retrieved, always equal to slots, "
- "the number of values to get."
- (value slotValue "The value of the local variable. ")
- )
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT)
- (Error INVALID_FRAMEID)
- (Error INVALID_SLOT)
- (Error VM_DEAD)
- )
- )
- (Command SetValues=2
- "Sets the value of one or more local variables. "
- "Each variable must be visible at the current frame code index. "
- "For primitive values, the value's type must match the "
- "variable's type exactly. For object values, there must be a "
- "widening reference conversion from the value's type to the
- "variable's type and the variable's type must be loaded. "
- "<p>"
- "Even if local variable information is not available, values can "
- "be set, if the front-end is able to "
- "determine the correct local variable index. (Typically, this
- "index can be determined for method arguments from the method "
- "signature without access to the local variable table information.) "
- (Out
- (threadObject thread "The frame's thread. ")
- (frame frame "The frame ID. ")
- (Repeat slotValues "The number of values to set. "
- (Group SlotInfo
- (int slot "The slot ID. ")
- (value slotValue "The value to set. ")
- )
- )
- )
- (Reply "none"
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT)
- (Error INVALID_FRAMEID)
- (Error VM_DEAD)
- )
- )
- (Command ThisObject=3
- "Returns the value of the 'this' reference for this frame. "
- "If the frame's method is static or native, the reply "
- "will contain the null object reference. "
- (Out
- (threadObject thread "The frame's thread. ")
- (frame frame "The frame ID. ")
- )
- (Reply
- (tagged-object objectThis "The 'this' object for this frame. ")
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT)
- (Error INVALID_FRAMEID)
- (Error VM_DEAD)
- )
- )
- (Command PopFrames=4
- "Pop the top-most stack frames of the thread stack, up to, and including 'frame'. "
- "The thread must be suspended to perform this command. "
- "The top-most stack frames are discarded and the stack frame previous to 'frame' "
- "becomes the current frame. The operand stack is restored -- the argument values "
- "are added back and if the invoke was not <code>invokestatic</code>, "
- "<code>objectref</code> is added back as well. The Java virtual machine "
- "program counter is restored to the opcode of the invoke instruction."
- "<p>"
- "Since JDWP version 1.4. Requires canPopFrames capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
- (Out
- (threadObject thread "The thread object ID. ")
- (frame frame "The frame ID. ")
- )
- (Reply "none"
- )
- (ErrorSet
- (Error INVALID_THREAD)
- (Error INVALID_OBJECT "thread is not a known ID.")
- (Error INVALID_FRAMEID)
- (Error THREAD_NOT_SUSPENDED)
- (Error NO_MORE_FRAMES)
- (Error INVALID_FRAMEID)
- (Error NOT_IMPLEMENTED)
- (Error VM_DEAD)
- )
- )
-)
-(CommandSet ClassObjectReference=17
- (Command ReflectedType = 1
- "Returns the reference type reflected by this class object."
- (Out
- (classObject classObject "The class object. ")
- )
- (Reply
- (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
- "of following reference type. ")
- (referenceTypeID typeID "reflected reference type")
- )
- (ErrorSet
- (Error INVALID_OBJECT)
- (Error VM_DEAD)
- )
- )
-)
-(CommandSet Event=64
- (Command Composite=100
- "Several events may occur at a given time in the target VM. "
- "For example, there may be more than one breakpoint request "
- "for a given location "
- "or you might single step to the same location as a "
- "breakpoint request. These events are delivered "
- "together as a composite event. For uniformity, a "
- "composite event is always used "
- "to deliver events, even if there is only one event to report. "
- "<P>"
- "The events that are grouped in a composite event are restricted in the "
- "following ways: "
- "<P>"
- "<UL>"
- "<LI>Only with other thread start events for the same thread:"
- " <UL>"
- " <LI>Thread Start Event"
- " </UL>"
- "<LI>Only with other thread death events for the same thread:"
- " <UL>"
- " <LI>Thread Death Event"
- " </UL>"
- "<LI>Only with other class prepare events for the same class:"
- " <UL>"
- " <LI>Class Prepare Event"
- " </UL>"
- "<LI>Only with other class unload events for the same class:"
- " <UL>"
- " <LI>Class Unload Event"
- " </UL>"
- "<LI>Only with other access watchpoint events for the same field access:"
- " <UL>"
- " <LI>Access Watchpoint Event"
- " </UL>"
- "<LI>Only with other modification watchpoint events for the same field "
- "modification:"
- " <UL>"
- " <LI>Modification Watchpoint Event"
- " </UL>"
- "<LI>Only with other Monitor contended enter events for the same monitor object: "
- " <UL>"
- " <LI>Monitor Contended Enter Event"
- " </UL>"
- "<LI>Only with other Monitor contended entered events for the same monitor object: "
- " <UL>"
- " <LI>Monitor Contended Entered Event"
- " </UL>"
- "<LI>Only with other Monitor wait events for the same monitor object: "
- " <UL>"
- " <LI>Monitor Wait Event"
- " </UL>"
- "<LI>Only with other Monitor waited events for the same monitor object: "
- " <UL>"
- " <LI>Monitor Waited Event"
- " </UL>"
- "<LI>Only with other ExceptionEvents for the same exception occurrance:"
- " <UL>"
- " <LI>ExceptionEvent"
- " </UL>"
- "<LI>Only with other members of this group, at the same location "
- "and in the same thread: "
- " <UL>"
- " <LI>Breakpoint Event"
- " <LI>Step Event"
- " <LI>Method Entry Event"
- " <LI>Method Exit Event"
- " </UL>"
- "</UL>"
- "<P>"
- "The VM Start Event and VM Death Event are automatically generated events. "
- "This means they do not need to be requested using the "
- "<a href=\"#JDWP_EventRequest_Set\">EventRequest.Set</a> command. "
- "The VM Start event signals the completion of VM initialization. The VM Death "
- "event signals the termination of the VM."
- "If there is a debugger connected at the time when an automatically generated "
- "event occurs it is sent from the target VM. Automatically generated events may "
- "also be requested using the EventRequest.Set command and thus multiple events "
- "of the same event kind will be sent from the target VM when an event occurs."
- "Automatically generated events are sent with the requestID field "
- "in the Event Data set to 0. The value of the suspendPolicy field in the "
- "Event Data depends on the event. For the automatically generated VM Start "
- "Event the value of suspendPolicy is not defined and is therefore implementation "
- "or configuration specific. In the Sun implementation, for example, the "
- "suspendPolicy is specified as an option to the JDWP agent at launch-time."
- "The automatically generated VM Death Event will have the suspendPolicy set to "
- "NONE."
-
- (Event "Generated event"
- (byte suspendPolicy
- "Which threads where suspended by this composite event?")
- (Repeat events "Events in set."
- (Select Events
- (byte eventKind "Event kind selector")
- (Alt VMStart=JDWP.EventKind.VM_START
- "Notification of initialization of a target VM. This event is "
- "received before the main thread is started and before any "
- "application code has been executed. Before this event occurs "
- "a significant amount of system code has executed and a number "
- "of system classes have been loaded. "
- "This event is always generated by the target VM, even "
- "if not explicitly requested."
-
- (int requestID
- "Request that generated event (or 0 if this "
- "event is automatically generated.")
- (threadObject thread "Initial thread")
- )
- (Alt SingleStep=JDWP.EventKind.SINGLE_STEP
- "Notification of step completion in the target VM. The step event "
- "is generated before the code at its location is executed. "
-
- (int requestID "Request that generated event")
- (threadObject thread "Stepped thread")
- (location location "Location stepped to")
- )
- (Alt Breakpoint=JDWP.EventKind.BREAKPOINT
- "Notification of a breakpoint in the target VM. The breakpoint event "
- "is generated before the code at its location is executed. "
-
- (int requestID "Request that generated event")
- (threadObject thread "Thread which hit breakpoint")
- (location location "Location hit")
- )
- (Alt MethodEntry=JDWP.EventKind.METHOD_ENTRY
- "Notification of a method invocation in the target VM. This event "
- "is generated before any code in the invoked method has executed. "
- "Method entry events are generated for both native and non-native "
- "methods. "
- "<P>"
- "In some VMs method entry events can occur for a particular thread "
- "before its thread start event occurs if methods are called "
- "as part of the thread's initialization. "
-
- (int requestID "Request that generated event")
- (threadObject thread "Thread which entered method")
- (location location "The initial executable location in the method.")
- )
- (Alt MethodExit=JDWP.EventKind.METHOD_EXIT
- "Notification of a method return in the target VM. This event "
- "is generated after all code in the method has executed, but the "
- "location of this event is the last executed location in the method. "
- "Method exit events are generated for both native and non-native "
- "methods. Method exit events are not generated if the method terminates "
- "with a thrown exception. "
-
- (int requestID "Request that generated event")
- (threadObject thread "Thread which exited method")
- (location location "Location of exit")
- )
- (Alt MethodExitWithReturnValue=JDWP.EventKind.METHOD_EXIT_WITH_RETURN_VALUE
- "Notification of a method return in the target VM. This event "
- "is generated after all code in the method has executed, but the "
- "location of this event is the last executed location in the method. "
- "Method exit events are generated for both native and non-native "
- "methods. Method exit events are not generated if the method terminates "
- "with a thrown exception. <p>Since JDWP version 1.6. "
-
- (int requestID "Request that generated event")
- (threadObject thread "Thread which exited method")
- (location location "Location of exit")
- (value value "Value that will be returned by the method")
- )
- (Alt MonitorContendedEnter=JDWP.EventKind.MONITOR_CONTENDED_ENTER
- "Notification that a thread in the target VM is attempting "
- "to enter a monitor that is already acquired by another thread. "
- "Requires canRequestMonitorEvents capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
- "<p>Since JDWP version 1.6. "
-
- (int requestID
- "Request that generated event")
- (threadObject thread "Thread which is trying to enter the monitor")
- (tagged-object object "Monitor object reference")
- (location location "Location of contended monitor enter")
- )
- (Alt MonitorContendedEntered=JDWP.EventKind.MONITOR_CONTENDED_ENTERED
- "Notification of a thread in the target VM is entering a monitor "
- "after waiting for it to be released by another thread. "
- "Requires canRequestMonitorEvents capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
- "<p>Since JDWP version 1.6. "
-
- (int requestID
- "Request that generated event")
- (threadObject thread "Thread which entered monitor")
- (tagged-object object "Monitor object reference")
- (location location "Location of contended monitor enter")
- )
- (Alt MonitorWait=JDWP.EventKind.MONITOR_WAIT
- "Notification of a thread about to wait on a monitor object. "
- "Requires canRequestMonitorEvents capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
- "<p>Since JDWP version 1.6. "
-
- (int requestID
- "Request that generated event")
- (threadObject thread "Thread which is about to wait")
- (tagged-object object "Monitor object reference")
- (location location "Location at which the wait will occur")
- (long timeout "Thread wait time in milliseconds")
- )
- (Alt MonitorWaited=JDWP.EventKind.MONITOR_WAITED
- "Notification that a thread in the target VM has finished waiting on "
- "Requires canRequestMonitorEvents capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
- "a monitor object. "
- "<p>Since JDWP version 1.6. "
-
- (int requestID
- "Request that generated event")
- (threadObject thread "Thread which waited")
- (tagged-object object "Monitor object reference")
- (location location "Location at which the wait occured")
- (boolean timed_out "True if timed out")
- )
- (Alt Exception=JDWP.EventKind.EXCEPTION
- "Notification of an exception in the target VM. "
- "If the exception is thrown from a non-native method, "
- "the exception event is generated at the location where the "
- "exception is thrown. "
- "If the exception is thrown from a native method, the exception event "
- "is generated at the first non-native location reached after the exception "
- "is thrown. "
-
- (int requestID "Request that generated event")
- (threadObject thread "Thread with exception")
- (location location "Location of exception throw "
- "(or first non-native location after throw if thrown from a native method)")
- (tagged-object exception "Thrown exception")
- (location catchLocation
- "Location of catch, or 0 if not caught. An exception "
- "is considered to be caught if, at the point of the throw, the "
- "current location is dynamically enclosed in a try statement that "
- "handles the exception. (See the JVM specification for details). "
- "If there is such a try statement, the catch location is the "
- "first location in the appropriate catch clause. "
- "<p>"
- "If there are native methods in the call stack at the time of the "
- "exception, there are important restrictions to note about the "
- "returned catch location. In such cases, "
- "it is not possible to predict whether an exception will be handled "
- "by some native method on the call stack. "
- "Thus, it is possible that exceptions considered uncaught "
- "here will, in fact, be handled by a native method and not cause "
- "termination of the target VM. Furthermore, it cannot be assumed that the "
- "catch location returned here will ever be reached by the throwing "
- "thread. If there is "
- "a native frame between the current location and the catch location, "
- "the exception might be handled and cleared in that native method "
- "instead. "
- "<p>"
- "Note that compilers can generate try-catch blocks in some cases "
- "where they are not explicit in the source code; for example, "
- "the code generated for <code>synchronized</code> and "
- "<code>finally</code> blocks can contain implicit try-catch blocks. "
- "If such an implicitly generated try-catch is "
- "present on the call stack at the time of the throw, the exception "
- "will be considered caught even though it appears to be uncaught from "
- "examination of the source code. "
- )
- )
- (Alt ThreadStart=JDWP.EventKind.THREAD_START
- "Notification of a new running thread in the target VM. "
- "The new thread can be the result of a call to "
- "<code>java.lang.Thread.start</code> or the result of "
- "attaching a new thread to the VM though JNI. The "
- "notification is generated by the new thread some time before "
- "its execution starts. "
- "Because of this timing, it is possible to receive other events "
- "for the thread before this event is received. (Notably, "
- "Method Entry Events and Method Exit Events might occur "
- "during thread initialization. "
- "It is also possible for the "
- "<a href=\"#JDWP_VirtualMachine_AllThreads\">VirtualMachine AllThreads</a> "
- "command to return "
- "a thread before its thread start event is received. "
- "<p>"
- "Note that this event gives no information "
- "about the creation of the thread object which may have happened "
- "much earlier, depending on the VM being debugged. "
-
- (int requestID "Request that generated event")
- (threadObject thread "Started thread")
- )
- (Alt ThreadDeath=JDWP.EventKind.THREAD_DEATH
- "Notification of a completed thread in the target VM. The "
- "notification is generated by the dying thread before it terminates. "
- "Because of this timing, it is possible "
- "for {@link VirtualMachine#allThreads} to return this thread "
- "after this event is received. "
- "<p>"
- "Note that this event gives no information "
- "about the lifetime of the thread object. It may or may not be collected "
- "soon depending on what references exist in the target VM. "
-
- (int requestID "Request that generated event")
- (threadObject thread "Ending thread")
- )
- (Alt ClassPrepare=JDWP.EventKind.CLASS_PREPARE
- "Notification of a class prepare in the target VM. See the JVM "
- "specification for a definition of class preparation. Class prepare "
- "events are not generated for primtiive classes (for example, "
- "java.lang.Integer.TYPE). "
-
- (int requestID "Request that generated event")
- (threadObject thread "Preparing thread. "
- "In rare cases, this event may occur in a debugger system "
- "thread within the target VM. Debugger threads take precautions "
- "to prevent these events, but they cannot be avoided under some "
- "conditions, especially for some subclasses of "
- "java.lang.Error. "
- "If the event was generated by a debugger system thread, the "
- "value returned by this method is null, and if the requested "
- "<a href=\"#JDWP_SuspendPolicy\">suspend policy</a> "
- "for the event was EVENT_THREAD "
- "all threads will be suspended instead, and the "
- "composite event's suspend policy will reflect this change. "
- "<p>"
- "Note that the discussion above does not apply to system threads "
- "created by the target VM during its normal (non-debug) operation. "
- )
- (byte refTypeTag "Kind of reference type. "
- "See <a href=\"#JDWP_TypeTag\">JDWP.TypeTag</a>")
- (referenceTypeID typeID "Type being prepared")
- (string signature "Type signature")
- (int status "Status of type. "
- "See <a href=\"#JDWP_ClassStatus\">JDWP.ClassStatus</a>")
- )
- (Alt ClassUnload=JDWP.EventKind.CLASS_UNLOAD
- "Notification of a class unload in the target VM. "
- "<p>"
- "There are severe constraints on the debugger back-end during "
- "garbage collection, so unload information is greatly limited. "
-
- (int requestID "Request that generated event")
- (string signature "Type signature")
- )
- (Alt FieldAccess=JDWP.EventKind.FIELD_ACCESS
- "Notification of a field access in the target VM. "
- "Field modifications "
- "are not considered field accesses. "
- "Requires canWatchFieldAccess capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
-
- (int requestID "Request that generated event")
- (threadObject thread "Accessing thread")
- (location location "Location of access")
- (byte refTypeTag "Kind of reference type. "
- "See <a href=\"#JDWP_TypeTag\">JDWP.TypeTag</a>")
- (referenceTypeID typeID "Type of field")
- (field fieldID "Field being accessed")
- (tagged-object object
- "Object being accessed (null=0 for statics")
- )
- (Alt FieldModification=JDWP.EventKind.FIELD_MODIFICATION
- "Notification of a field modification in the target VM. "
- "Requires canWatchFieldModification capability - see "
- "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
-
- (int requestID "Request that generated event")
- (threadObject thread "Modifying thread")
- (location location "Location of modify")
- (byte refTypeTag "Kind of reference type. "
- "See <a href=\"#JDWP_TypeTag\">JDWP.TypeTag</a>")
- (referenceTypeID typeID "Type of field")
- (field fieldID "Field being modified")
- (tagged-object object
- "Object being modified (null=0 for statics")
- (value valueToBe "Value to be assigned")
- )
- (Alt VMDeath=JDWP.EventKind.VM_DEATH
- (int requestID
- "Request that generated event")
- )
- )
- )
- )
- )
-)
-(ConstantSet Error
- (Constant NONE =0 "No error has occurred.")
- (Constant INVALID_THREAD =10 "Passed thread is null, is not a valid thread or has exited.")
- (Constant INVALID_THREAD_GROUP =11 "Thread group invalid.")
- (Constant INVALID_PRIORITY =12 "Invalid priority.")
- (Constant THREAD_NOT_SUSPENDED =13 "If the specified thread has not been "
- "suspended by an event.")
- (Constant THREAD_SUSPENDED =14 "Thread already suspended.")
- (Constant THREAD_NOT_ALIVE =15 "Thread has not been started or is now dead.")
-
- (Constant INVALID_OBJECT =20 "If this reference type has been unloaded "
- "and garbage collected.")
- (Constant INVALID_CLASS =21 "Invalid class.")
- (Constant CLASS_NOT_PREPARED =22 "Class has been loaded but not yet prepared.")
- (Constant INVALID_METHODID =23 "Invalid method.")
- (Constant INVALID_LOCATION =24 "Invalid location.")
- (Constant INVALID_FIELDID =25 "Invalid field.")
- (Constant INVALID_FRAMEID =30 "Invalid jframeID.")
- (Constant NO_MORE_FRAMES =31 "There are no more Java or JNI frames on the "
- "call stack.")
- (Constant OPAQUE_FRAME =32 "Information about the frame is not available.")
- (Constant NOT_CURRENT_FRAME =33 "Operation can only be performed on current frame.")
- (Constant TYPE_MISMATCH =34 "The variable is not an appropriate type for "
- "the function used.")
- (Constant INVALID_SLOT =35 "Invalid slot.")
- (Constant DUPLICATE =40 "Item already set.")
- (Constant NOT_FOUND =41 "Desired element not found.")
- (Constant INVALID_MONITOR =50 "Invalid monitor.")
- (Constant NOT_MONITOR_OWNER =51 "This thread doesn't own the monitor.")
- (Constant INTERRUPT =52 "The call has been interrupted before completion.")
- (Constant INVALID_CLASS_FORMAT =60 "The virtual machine attempted to read a class "
- "file and determined that the file is malformed "
- "or otherwise cannot be interpreted as a class file.")
- (Constant CIRCULAR_CLASS_DEFINITION
- =61 "A circularity has been detected while "
- "initializing a class.")
- (Constant FAILS_VERIFICATION =62 "The verifier detected that a class file, "
- "though well formed, contained some sort of "
- "internal inconsistency or security problem.")
- (Constant ADD_METHOD_NOT_IMPLEMENTED
- =63 "Adding methods has not been implemented.")
- (Constant SCHEMA_CHANGE_NOT_IMPLEMENTED
- =64 "Schema change has not been implemented.")
- (Constant INVALID_TYPESTATE =65 "The state of the thread has been modified, "
- "and is now inconsistent.")
- (Constant HIERARCHY_CHANGE_NOT_IMPLEMENTED
- =66 "A direct superclass is different for the new class "
- "version, or the set of directly implemented "
- "interfaces is different "
- "and canUnrestrictedlyRedefineClasses is false.")
- (Constant DELETE_METHOD_NOT_IMPLEMENTED
- =67 "The new class version does not declare a method "
- "declared in the old class version "
- "and canUnrestrictedlyRedefineClasses is false.")
- (Constant UNSUPPORTED_VERSION =68 "A class file has a version number not supported "
- "by this VM.")
- (Constant NAMES_DONT_MATCH =69 "The class name defined in the new class file is "
- "different from the name in the old class object.")
- (Constant CLASS_MODIFIERS_CHANGE_NOT_IMPLEMENTED
- =70 "The new class version has different modifiers and "
- "and canUnrestrictedlyRedefineClasses is false.")
- (Constant METHOD_MODIFIERS_CHANGE_NOT_IMPLEMENTED
- =71 "A method in the new class version has "
- "different modifiers "
- "than its counterpart in the old class version and "
- "and canUnrestrictedlyRedefineClasses is false.")
- (Constant NOT_IMPLEMENTED =99 "The functionality is not implemented in "
- "this virtual machine.")
- (Constant NULL_POINTER =100 "Invalid pointer.")
- (Constant ABSENT_INFORMATION =101 "Desired information is not available.")
- (Constant INVALID_EVENT_TYPE =102 "The specified event type id is not recognized.")
- (Constant ILLEGAL_ARGUMENT =103 "Illegal argument.")
- (Constant OUT_OF_MEMORY =110 "The function needed to allocate memory and "
- "no more memory was available for allocation.")
- (Constant ACCESS_DENIED =111 "Debugging has not been enabled in this "
- "virtual machine. JVMTI cannot be used.")
- (Constant VM_DEAD =112 "The virtual machine is not running.")
- (Constant INTERNAL =113 "An unexpected internal error has occurred.")
- (Constant UNATTACHED_THREAD =115 "The thread being used to call this function "
- "is not attached to the virtual machine. "
- "Calls must be made from attached threads.")
- (Constant INVALID_TAG =500 "object type id or class tag.")
- (Constant ALREADY_INVOKING =502 "Previous invoke not complete.")
- (Constant INVALID_INDEX =503 "Index is invalid.")
- (Constant INVALID_LENGTH =504 "The length is invalid.")
- (Constant INVALID_STRING =506 "The string is invalid.")
- (Constant INVALID_CLASS_LOADER =507 "The class loader is invalid.")
- (Constant INVALID_ARRAY =508 "The array is invalid.")
- (Constant TRANSPORT_LOAD =509 "Unable to load the transport.")
- (Constant TRANSPORT_INIT =510 "Unable to initialize the transport.")
- (Constant NATIVE_METHOD =511 )
- (Constant INVALID_COUNT =512 "The count is invalid.")
-)
-(ConstantSet EventKind
- (Constant SINGLE_STEP =1 )
- (Constant BREAKPOINT =2 )
- (Constant FRAME_POP =3 )
- (Constant EXCEPTION =4 )
- (Constant USER_DEFINED =5 )
- (Constant THREAD_START =6 )
- (Constant THREAD_DEATH =7 )
- (Constant THREAD_END =7 "obsolete - was used in jvmdi")
- (Constant CLASS_PREPARE =8 )
- (Constant CLASS_UNLOAD =9 )
- (Constant CLASS_LOAD =10 )
- (Constant FIELD_ACCESS =20 )
- (Constant FIELD_MODIFICATION =21 )
- (Constant EXCEPTION_CATCH =30 )
- (Constant METHOD_ENTRY =40 )
- (Constant METHOD_EXIT =41 )
- (Constant METHOD_EXIT_WITH_RETURN_VALUE =42 )
- (Constant MONITOR_CONTENDED_ENTER =43 )
- (Constant MONITOR_CONTENDED_ENTERED =44 )
- (Constant MONITOR_WAIT =45 )
- (Constant MONITOR_WAITED =46 )
- (Constant VM_START =90 )
- (Constant VM_INIT =90 "obsolete - was used in jvmdi")
- (Constant VM_DEATH =99 )
- (Constant VM_DISCONNECTED =100 "Never sent across JDWP")
-)
-
-(ConstantSet ThreadStatus
- (Constant ZOMBIE =0 )
- (Constant RUNNING =1 )
- (Constant SLEEPING =2 )
- (Constant MONITOR =3 )
- (Constant WAIT =4 )
-)
-
-(ConstantSet SuspendStatus
- (Constant SUSPEND_STATUS_SUSPENDED = 0x1 )
-)
-(ConstantSet ClassStatus
- (Constant VERIFIED =1 )
- (Constant PREPARED =2 )
- (Constant INITIALIZED =4 )
- (Constant ERROR =8 )
-)
-(ConstantSet TypeTag
- (Constant CLASS=1 "ReferenceType is a class. ")
- (Constant INTERFACE=2 "ReferenceType is an interface. ")
- (Constant ARRAY=3 "ReferenceType is an array. ")
-)
-(ConstantSet Tag
- (Constant ARRAY = '[' "'[' - an array object (objectID size). ")
- (Constant BYTE = 'B' "'B' - a byte value (1 byte).")
- (Constant CHAR = 'C' "'C' - a character value (2 bytes).")
- (Constant OBJECT = 'L' "'L' - an object (objectID size).")
- (Constant FLOAT = 'F' "'F' - a float value (4 bytes).")
- (Constant DOUBLE = 'D' "'D' - a double value (8 bytes).")
- (Constant INT = 'I' "'I' - an int value (4 bytes).")
- (Constant LONG = 'J' "'J' - a long value (8 bytes).")
- (Constant SHORT = 'S' "'S' - a short value (2 bytes).")
- (Constant VOID = 'V' "'V' - a void value (no bytes).")
- (Constant BOOLEAN = 'Z' "'Z' - a boolean value (1 byte).")
- (Constant STRING = 's' "'s' - a String object (objectID size). ")
- (Constant THREAD = 't' "'t' - a Thread object (objectID size). ")
- (Constant THREAD_GROUP = 'g'
- "'g' - a ThreadGroup object (objectID size). ")
- (Constant CLASS_LOADER = 'l'
- "'l' - a ClassLoader object (objectID size). ")
- (Constant CLASS_OBJECT = 'c'
- "'c' - a class object object (objectID size). ")
-)
-
-(ConstantSet StepDepth
- (Constant INTO = 0
- "Step into any method calls that occur before the end of the step. ")
- (Constant OVER = 1
- "Step over any method calls that occur before the end of the step. ")
- (Constant OUT = 2
- "Step out of the current method. ")
-)
-
-(ConstantSet StepSize
- (Constant MIN = 0
- "Step by the minimum possible amount (often a bytecode instruction). ")
- (Constant LINE = 1
- "Step to the next source line unless there is no line number information in which case a MIN step is done instead.")
-)
-
-(ConstantSet SuspendPolicy
- (Constant NONE = 0
- "Suspend no threads when this event is encountered. ")
- (Constant EVENT_THREAD = 1
- "Suspend the event thread when this event is encountered. ")
- (Constant ALL = 2
- "Suspend all threads when this event is encountered. ")
-)
-
-(ConstantSet InvokeOptions
- "The invoke options are a combination of zero or more of the following bit flags:"
- (Constant INVOKE_SINGLE_THREADED = 0x01
- "otherwise, all threads started. ")
- (Constant INVOKE_NONVIRTUAL = 0x02
- "otherwise, normal virtual invoke (instance methods only)")
-)
-
-
diff --git a/jdk/make/jpda/transport/Makefile b/jdk/make/jpda/transport/Makefile
deleted file mode 100644
index 6d8311b..0000000
--- a/jdk/make/jpda/transport/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of the transports
-#
-
-BUILDDIR = ../..
-PRODUCT = jpda
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = socket
-ifeq ($(PLATFORM), windows)
-SUBDIRS += shmem
-endif # PLATFORM
-
-include $(BUILDDIR)/common/Subdirs.gmk
-all build clean clobber::
- $(SUBDIRS-loop)
-
-#
-# Copy jdwpTransport.h into the SDK include directory
-#
-FILES_h = $(INCLUDEDIR)/jdwpTransport.h
-
-$(INCLUDEDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
- $(install-file)
-
-all:: $(FILES_h)
-
-clean clobber::
- $(RM) $(FILES_h)
-
diff --git a/jdk/make/jpda/transport/shmem/Makefile b/jdk/make/jpda/transport/shmem/Makefile
deleted file mode 100644
index 58987c8..0000000
--- a/jdk/make/jpda/transport/shmem/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JDI shared memory transport implementation
-#
-
-BUILDDIR = ../../..
-LIBRARY = dt_shmem
-PRODUCT = jbug
-
-# Mapfile only used on Solaris/Linux
-FILES_m = mapfile-vers
-
-include $(BUILDDIR)/common/Defs.gmk
-
-FILES_c = \
- SharedMemoryTransport.c \
- SharedMemoryConnection.c \
- shmemBack.c \
- shmemBase.c \
- shmem_md.c
-
-OTHER_INCLUDES = -I$(INCLUDEDIR) -I$(PLATFORM_INCLUDE) \
- -I$(SHARE_SRC)/transport/export \
- -I$(SHARE_SRC)/transport/shmem \
- -I$(SHARE_SRC)/back/export \
- -I$(PLATFORM_SRC)/transport/shmem
-
-#
-# Stuff to feed into javah.
-#
-FILES_export = \
- com/sun/tools/jdi/SharedMemoryConnection.java \
- com/sun/tools/jdi/SharedMemoryTransportService.java
-
-# Use the mapfile-vers (See the mapfile located with this Makefile)
-ifdef FILES_m
- include $(BUILDDIR)/common/Mapfile-vers.gmk
-endif
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-# Add -export options to explicitly spell exported symbols
-ifeq ($(PLATFORM), windows)
- OTHER_LCF += -export:jdwpTransport_OnLoad
-endif
-
-#
-# vpaths for the transport (should not be seen by others)
-#
-vpath %.c $(SHARE_SRC)/native/com/sun/tools/jdi:$(SHARE_SRC)/transport/shmem:$(PLATFORM_SRC)/transport/shmem
diff --git a/jdk/make/jpda/transport/shmem/mapfile-vers b/jdk/make/jpda/transport/shmem/mapfile-vers
deleted file mode 100644
index 13b7361..0000000
--- a/jdk/make/jpda/transport/shmem/mapfile-vers
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- jdwpTransport_OnLoad;
- local:
- *;
-};
diff --git a/jdk/make/jpda/transport/socket/Makefile b/jdk/make/jpda/transport/socket/Makefile
deleted file mode 100644
index 6e44f34..0000000
--- a/jdk/make/jpda/transport/socket/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the JDI back-end implementation
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-LIBRARY = dt_socket
-PRODUCT = jbug
-
-# Mapfile only used on Solaris/Linux
-FILES_m = mapfile-vers
-
-include $(BUILDDIR)/common/Defs.gmk
-
-ifeq ($(PLATFORM), linux)
- OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
-endif
-
-ifeq ($(PLATFORM), macosx)
- LIBSOCKET =
- OTHER_LDLIBS += -pthread
-endif
-
-ifeq ($(PLATFORM), solaris)
- OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET)
-endif
-
-ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS += ws2_32.lib
-endif
-
-OTHER_INCLUDES = -I$(INCLUDEDIR) -I$(PLATFORM_INCLUDE) \
- -I$(SHARE_SRC)/transport/export \
- -I$(SHARE_SRC)/transport/socket \
- -I$(PLATFORM_SRC)/transport/socket \
- -I$(SHARE_SRC)/back/export \
- -I$(PLATFORM_SRC)/back
-
-#
-# Files to compile.
-#
-FILES_c = \
- socketTransport.c \
- socket_md.c
-
-# Use the mapfile-vers (See the mapfile located with this Makefile)
-ifdef FILES_m
- include $(BUILDDIR)/common/Mapfile-vers.gmk
-endif
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-# We don't want to link against -ljava
-JAVALIB=
-
-# Add -export options to explicitly spell exported symbols
-ifeq ($(PLATFORM), windows)
- OTHER_LCF += -export:jdwpTransport_OnLoad
-endif
-
-#
-# Add to ambient vpath so we pick up the library files
-#
-vpath %.c $(SHARE_SRC)/transport/socket:$(PLATFORM_SRC)/transport/socket
diff --git a/jdk/make/jpda/transport/socket/mapfile-vers b/jdk/make/jpda/transport/socket/mapfile-vers
deleted file mode 100644
index 13b7361..0000000
--- a/jdk/make/jpda/transport/socket/mapfile-vers
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- jdwpTransport_OnLoad;
- local:
- *;
-};
diff --git a/jdk/make/jpda/tty/Makefile b/jdk/make/jpda/tty/Makefile
deleted file mode 100644
index e2935af..0000000
--- a/jdk/make/jpda/tty/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the tty (aka JDB) on JDI
-#
-
-BUILDDIR = ../..
-PACKAGE = com.sun.tools.example.debug.tty
-PRODUCT = jpda
-PROGRAM = jdb
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# This program must contain a manifest that defines the execution level
-# needed to follow standard Vista User Access Control Guidelines
-# This must be set before Program.gmk is included
-#
-BUILD_MANIFEST=true
-
-#
-# Java Files to compile are found automatically.
-#
-AUTO_FILES_JAVA_DIRS = com/sun/tools/example/debug/tty
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_JAVA = com/sun/tools/example/debug/tty/TTYResources.java
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/jprt.gmk b/jdk/make/jprt.gmk
deleted file mode 100644
index 117e934..0000000
--- a/jdk/make/jprt.gmk
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# JPRT rule to build this workspace
-
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
-
-ifeq ($(PLATFORM),windows)
- ZIPFLAGS=-q
-else
- # store symbolic links as the link
- ZIPFLAGS=-q -y
-endif
-
-jprt_build_product: all images
- ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
- $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-jprt_build_fastdebug: fastdebug images
- ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
- $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-jprt_build_debug: debug images
- ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
- $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-#
-# Phonies to avoid accidents.
-#
-.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
-
diff --git a/jdk/make/jprt.properties b/jdk/make/jprt.properties
deleted file mode 100644
index c34540e..0000000
--- a/jdk/make/jprt.properties
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Properties for jprt
-
-# Locked down to jdk8
-jprt.tools.default.release=jdk8
-
-# The different build flavors we want, we override here so we just get these 2
-jprt.build.flavors=product,fastdebug
-
-# Standard list of jprt build targets for this source tree
-jprt.build.targets= \
- solaris_sparcv9_5.10-{product|fastdebug}, \
- solaris_x64_5.10-{product|fastdebug}, \
- linux_i586_2.6-{product|fastdebug}, \
- linux_x64_2.6-{product|fastdebug}, \
- macosx_x64_10.7-{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}
-
-# Test target list (no fastdebug & limited c2 testing)
-jprt.my.test.target.set= \
- solaris_sparcv9_5.10-product-c2-TESTNAME, \
- solaris_x64_5.10-product-c2-TESTNAME, \
- linux_i586_2.6-product-{c1|c2}-TESTNAME, \
- linux_x64_2.6-product-c2-TESTNAME, \
- macosx_x64_10.7-product-c2-TESTNAME, \
- windows_i586_6.1-product-c1-TESTNAME, \
- windows_x64_6.1-product-c2-TESTNAME
-
-# Default vm test targets (testset=default)
-jprt.vm.default.test.targets= \
- ${jprt.my.test.target.set:TESTNAME=jvm98}
-
-# Default jdk test targets (testset=default)
-# NOTE: This does not match test/Makefile :: jdk_default
-jprt.make.rule.default.test.targets= \
- ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_math}
-
-# Default vm test targets (testset=core)
-jprt.vm.core.test.targets= \
- ${jprt.vm.default.test.targets}
-
-# Core jdk test targets (testset=core)
-# NOTE: please keep this in sync with test/Makefile :: jdk_core
-jprt.make.rule.core.test.targets= \
- ${jprt.make.rule.default.test.targets}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_util}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_io}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_net}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_text}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_time}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_other}
-
-# All vm test targets (testset=all)
-jprt.vm.all.test.targets= \
- ${jprt.vm.default.test.targets}, \
- ${jprt.my.test.target.set:TESTNAME=runThese}, \
- ${jprt.my.test.target.set:TESTNAME=jbb_default}
-
-# All jdk test targets (testset=all)
-# NOTE: This does not match test/Makefile :: jdk_all
-jprt.make.rule.all.test.targets= \
- ${jprt.make.rule.core.test.targets}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_awt}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_sound}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_swing}
-
-# JCK test targets in test/Makefile (no windows)
-jprt.my.jck.test.target.set= \
- solaris_sparcv9_5.10-product-c2-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.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.vm..test.targets=${jprt.vm.default.test.targets}
-jprt.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets}
-
-# Directories to be excluded from the source bundles
-jprt.bundle.exclude.src.dirs=build dist webrev
-
diff --git a/jdk/make/launchers/Makefile b/jdk/make/launchers/Makefile
deleted file mode 100644
index 4764515..0000000
--- a/jdk/make/launchers/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building simple launchers
-#
-
-BUILDDIR = ..
-PACKAGE = launchers
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-# Run MAKE $@ for a launcher for the corba module:
-# $(call make-launcher, name, mainclass, java-args, main-args)
-define make-corba-launcher
-$(CD) $(BUILDDIR)/launchers && \
-$(MAKE) -f Makefile.launcher \
- PROGRAM=$(strip $1) \
- MAIN_CLASS=$(strip $2) \
- MAIN_JAVA_ARGS="$(strip $3)" \
- MAIN_ARGS="$(strip $4)"
-endef
-
-# Run MAKE $@ for all generic launchers
-ifndef BUILD_HEADLESS_ONLY
-define make-appletviewer
-$(call make-launcher, appletviewer, sun.applet.Main, , )
-endef
-else
-define make-appletviewer
-endef
-endif
-
-define make-all-launchers
-$(make-appletviewer)
-$(call make-launcher, extcheck, com.sun.tools.extcheck.Main, , )
-$(call make-launcher, idlj, com.sun.tools.corba.se.idl.toJavaPortable.Compile, , )
-$(call make-launcher, jar, sun.tools.jar.Main, , )
-$(call make-launcher, jarsigner, sun.security.tools.jarsigner.Main, , )
-$(call make-launcher, javac, com.sun.tools.javac.Main, , )
-$(call make-launcher, javadoc, com.sun.tools.javadoc.Main, , )
-$(call make-launcher, javah, com.sun.tools.javah.Main, , )
-$(call make-launcher, javap, com.sun.tools.javap.Main, , )
-$(call make-launcher, jdeps, com.sun.tools.jdeps.Main, , )
-$(call make-launcher, jcmd, sun.tools.jcmd.JCmd, , )
-$(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \
- -J-Djconsole.showOutputViewer, )
-$(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , )
-$(call make-launcher, jhat, com.sun.tools.hat.Main, , )
-$(call make-launcher, jinfo, sun.tools.jinfo.JInfo, \
- -J-Dsun.jvm.hotspot.debugger.useProcDebugger \
- -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
-$(call make-launcher, jmap, sun.tools.jmap.JMap, \
- -J-Dsun.jvm.hotspot.debugger.useProcDebugger \
- -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
-$(call make-launcher, jps, sun.tools.jps.Jps, , )
-$(call make-launcher, jrunscript, com.sun.tools.script.shell.Main, , )
-$(call make-launcher, jjs, jdk.nashorn.tools.Shell, , )
-$(call make-launcher, jsadebugd, sun.jvm.hotspot.jdi.SADebugServer, , )
-$(call make-launcher, jstack, sun.tools.jstack.JStack, \
- -J-Dsun.jvm.hotspot.debugger.useProcDebugger \
- -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
-$(call make-launcher, jstat, sun.tools.jstat.Jstat, , )
-$(call make-launcher, jstatd, sun.tools.jstatd.Jstatd, , )
-$(call make-launcher, native2ascii, sun.tools.native2ascii.Main, , )
-$(call make-launcher, rmic, sun.rmi.rmic.Main, , )
-$(call make-launcher, schemagen, com.sun.tools.internal.jxc.SchemaGenerator, , )
-$(call make-launcher, serialver, sun.tools.serialver.SerialVer, , )
-$(call make-launcher, xjc, com.sun.tools.internal.xjc.Driver, , )
-$(call make-launcher, wsgen, com.sun.tools.internal.ws.WsGen, , )
-$(call make-launcher, wsimport, com.sun.tools.internal.ws.WsImport, , )
-$(call make-corba-launcher, orbd, com.sun.corba.se.impl.activation.ORBD, \
- -J-Dcom.sun.CORBA.activation.DbDir=./orb.db \
- -J-Dcom.sun.CORBA.activation.Port=1049 \
- -J-Dcom.sun.CORBA.POA.ORBServerId=1, )
-$(call make-corba-launcher, servertool, com.sun.corba.se.impl.activation.ServerTool, , )
-$(call make-corba-launcher, tnameserv, com.sun.corba.se.impl.naming.cosnaming.TransientNameServer, \
- -J-Dcom.sun.CORBA.activation.DbDir=./orb.db \
- -J-Djava.util.logging.LoggingPermission=contol \
- -J-Dcom.sun.CORBA.POA.ORBServerId=1, )
-endef
-
-build:
- $(make-all-launchers)
-
-clean clobber::
- $(make-all-launchers)
-
-include $(BUILDDIR)/common/Rules.gmk
-
diff --git a/jdk/make/launchers/Makefile.launcher b/jdk/make/launchers/Makefile.launcher
deleted file mode 100644
index bb06f80..0000000
--- a/jdk/make/launchers/Makefile.launcher
+++ /dev/null
@@ -1,212 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building simple launchers
-#
-
-PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ..
-PACKAGE = launcher
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-# The PROGRAM and MAIN_CLASS must be defined
-ifndef PROGRAM
- build: no_program
- no_program:
- $(ECHO) "No PROGRAM name defined"
- exit 1
-endif
-ifndef MAIN_CLASS
- build: no_main
- no_main:
- $(ECHO) "No MAIN_CLASS name defined"
- exit 1
-endif
-
-# Some tools need the wildcard expansion option
-ifeq ($(PROGRAM),javac)
- WILDCARDS=true
- MAIN_JAVA_ARGS += -J-Xss4m -J-ea:com.sun.tools...
- NEVER_ACT_AS_SERVER_CLASS_MACHINE=true
-endif
-ifeq ($(PROGRAM),javadoc)
- WILDCARDS=true
- NEVER_ACT_AS_SERVER_CLASS_MACHINE=true
-endif
-ifeq ($(PROGRAM),javap)
- WILDCARDS=true
- NEVER_ACT_AS_SERVER_CLASS_MACHINE=true
-endif
-ifeq ($(PROGRAM),jdeps)
- WILDCARDS=true
- NEVER_ACT_AS_SERVER_CLASS_MACHINE=true
-endif
-ifeq ($(PROGRAM),javah)
- WILDCARDS=true
- NEVER_ACT_AS_SERVER_CLASS_MACHINE=true
-endif
-ifeq ($(PROGRAM),serialver)
- WILDCARDS=true
-endif
-
-# GUI tools need X11
-ifeq ($(PROGRAM),appletviewer)
- GUI_TOOL=true
-endif
-ifeq ($(PROGRAM),policytool)
- GUI_TOOL=true
-endif
-
-# SA tools
-ifeq ($(PROGRAM),jstack)
- SA_TOOL=true
- INFO_PLIST_FILE=Info-privileged.plist
-endif
-ifeq ($(PROGRAM),jsadebugd)
- SA_TOOL=true
- INFO_PLIST_FILE=Info-privileged.plist
-endif
-ifeq ($(PROGRAM),jinfo)
- SA_TOOL=true
- INFO_PLIST_FILE=Info-privileged.plist
-endif
-ifeq ($(PROGRAM),jmap)
- SA_TOOL=true
- INFO_PLIST_FILE=Info-privileged.plist
-endif
-
-# special idlj launcher
-ifeq ($(PROGRAM),orbd)
- IDLJ_TOOL=true
-endif
-ifeq ($(PROGRAM),servertool)
- IDLJ_TOOL=true
-endif
-ifeq ($(PROGRAM),tnameserv)
- IDLJ_TOOL=true
-endif
-
-# idlj itself only
-ifeq ($(PROGRAM),idlj)
- ifndef STANDALONE_CORBA_WS
- FILES_c = $(SHARE_SRC)/native/bin/$(PROGRAM).c \
- $(SHARE_SRC)/native/bin/utility.c
- endif
-endif
-
-# rmic only
-ifeq ($(PROGRAM),rmic)
- ifdef STANDALONE_CORBA_WS
- FILES_c = $(SHARE_SRC)/native/bin/$(PROGRAM).c \
- $(SHARE_SRC)/native/bin/utility.c
- endif
- WILDCARDS=true
-endif
-
-# IDLJ_TOOL only uses different source files
-ifeq ($(IDLJ_TOOL),true)
- ifdef STANDALONE_CORBA_WS
- FILES_c = $(SHARE_SRC)/native/bin/idlj.c \
- $(SHARE_SRC)/native/bin/utility.c
- endif
-endif
-
-# jdb only
-ifeq ($(PROGRAM),jdb)
- # Override the default APP_CLASSPATH to pick up sa-jdi.jar also.
- # Default is defined in src/[solaris,windows]/bin/java_md.h
- # PROGRAM, JAVA_ARGS, and APP_CLASSPATH are used in src/share/bin/java.c
- # SA is currently not available on windows (for any ARCH), or linux-ia64:
- ifneq ($(ARCH), ia64)
- JDB_CLASSPATH = { "/lib/tools.jar", "/lib/sa-jdi.jar", "/classes" }
- OTHER_CPPFLAGS += -DAPP_CLASSPATH='$(JDB_CLASSPATH)'
- endif
-endif
-
-# jconsole only
-ifeq ($(PROGRAM),jconsole)
- JCONSOLE_CLASSPATH = { "/lib/jconsole.jar", "/lib/tools.jar", "/classes" }
- OTHER_CPPFLAGS += -DAPP_CLASSPATH='$(JCONSOLE_CLASSPATH)'
- ifeq ($(PLATFORM), windows)
- OTHER_CPPFLAGS += -DJAVAW
- LDLIBS_COMMON += user32.lib
- MAIN_JAVA_ARGS += -J-Djconsole.showOutputViewer
- endif
-endif
-
-# GUI tools
-ifeq ($(GUI_TOOL),true)
- ifneq ($(PLATFORM), windows)
- ifneq ($(PLATFORM), macosx)
- # Anything with a GUI needs X11 to be linked in.
- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
- endif
- endif
-endif
-
-# SA tools need special app classpath
-ifeq ($(SA_TOOL),true)
- SA_CLASSPATH = { "/lib/tools.jar", "/lib/sa-jdi.jar", "/classes" }
- OTHER_CPPFLAGS += -DAPP_CLASSPATH='$(SA_CLASSPATH)'
-endif
-
-# Wildcards
-ifeq ($(WILDCARDS),true)
- OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
-endif
-
-# Always tell native code what the main class is
-OTHER_CPPFLAGS += -DMAIN_CLASS='"$(MAIN_CLASS)"'
-
-# Construct initializer for initial arguments to java
-ALL_ARGS = -J-ms8m $(MAIN_JAVA_ARGS) $(MAIN_CLASS) $(MAIN_ARGS)
-JAVA_ARGS = { $(ALL_ARGS:%="%",) }
-
-# Always report launcher info
-build: launcher_info
-
-# Print info macro
-define printLauncherSetting
-if [ "$2" != "" ] ; then $(PRINTF) "%-16s %s\n" "$1:" "$2"; fi
-endef
-
-# Report basic information about this launcher
-launcher_info:
- @$(ECHO) "========================================================="
- @$(call printLauncherSetting,LAUNCHER,$(PROGRAM))
- @$(call printLauncherSetting,MAIN_CLASS,$(MAIN_CLASS))
- @$(call printLauncherSetting,MAIN_JAVA_ARGS,$(MAIN_JAVA_ARGS))
- @$(call printLauncherSetting,MAIN_ARGS,$(MAIN_ARGS))
- @$(call printLauncherSetting,ALL_ARGS,$(ALL_ARGS))
- @$(ECHO) "========================================================="
-
-#
-# Rules for building a program
-#
-include $(BUILDDIR)/common/Program.gmk
-
diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
new file mode 100644
index 0000000..61d893e
--- /dev/null
+++ b/jdk/make/lib/Awt2dLibraries.gmk
@@ -0,0 +1,1498 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Openwin is defined on Solaris.
+OPENWIN_LIB := $(OPENWIN_HOME)/lib
+
+WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
+
+##########################################################################################
+
+BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib
+BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
+ -I$(BUILD_LIBMLIB_SRC) \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/medialib
+
+BUILD_LIBMLIB_LDLIBS :=
+BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers
+
+BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
+
+ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+ BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), windows)
+ BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
+ LIBRARY := mlib_image, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBMLIB_SRC), \
+ EXCLUDE_FILES := awt_ImagingLib.c mlib_c_ImageBlendTable.c, \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(BUILD_LIBMLIB_CFLAGS), \
+ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(BUILD_LIBMLIB_LDLIBS) \
+ $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=mlib_image.dll" \
+ -D "JDK_INTERNAL_NAME=mlib_image" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBMLIB_IMAGE): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
+
+ BUILD_LIBMLIB_IMAGE_V_FILES := \
+ mlib_v_ImageLookUp.c \
+ mlib_ImageCreate.c \
+ mlib_ImageAffine.c \
+ mlib_ImageConvMxN.c \
+ mlib_ImageConvKernelConvert.c \
+ mlib_sys.c \
+ mlib_ImageLookUp_64.c \
+ mlib_ImageLookUp_Bit.c \
+ mlib_ImageColorTrue2Index.c \
+ mlib_c_ImageThresh1_U8.c \
+ mlib_v_ImageLookUpS16S16Func.c \
+ mlib_v_ImageLookUpS16S32Func.c \
+ mlib_v_ImageLookUpS16U16Func.c \
+ mlib_v_ImageLookUpS16U8Func.c \
+ mlib_v_ImageLookUpS32S16Func.c \
+ mlib_v_ImageLookUpS32S32Func.c \
+ mlib_v_ImageLookUpS32U16Func.c \
+ mlib_v_ImageLookUpS32U8Func.c \
+ mlib_v_ImageLookUpSIS16S16Func.c \
+ mlib_v_ImageLookUpSIS16S32Func.c \
+ mlib_v_ImageLookUpSIS16U16Func.c \
+ mlib_v_ImageLookUpSIS16U8Func.c \
+ mlib_v_ImageLookUpSIS32S16Func.c \
+ mlib_v_ImageLookUpSIS32S32Func.c \
+ mlib_v_ImageLookUpSIS32U16Func.c \
+ mlib_v_ImageLookUpSIS32U8Func.c \
+ mlib_v_ImageLookUpSIU16S16Func.c \
+ mlib_v_ImageLookUpSIU16S32Func.c \
+ mlib_v_ImageLookUpSIU16U16Func.c \
+ mlib_v_ImageLookUpSIU16U8Func.c \
+ mlib_v_ImageLookUpSIU8S16Func.c \
+ mlib_v_ImageLookUpSIU8S32Func.c \
+ mlib_v_ImageLookUpSIU8U16Func.c \
+ mlib_v_ImageLookUpSIU8U8Func.c \
+ mlib_v_ImageLookUpU16S16Func.c \
+ mlib_v_ImageLookUpU16S32Func.c \
+ mlib_v_ImageLookUpU16U16Func.c \
+ mlib_v_ImageLookUpU16U8Func.c \
+ mlib_v_ImageLookUpU8S16Func.c \
+ mlib_v_ImageLookUpU8S32Func.c \
+ mlib_v_ImageLookUpU8U16Func.c \
+ mlib_v_ImageLookUpU8U8Func.c \
+ mlib_v_ImageAffineIndex_BC.c \
+ mlib_v_ImageAffine_BC.c \
+ mlib_v_ImageAffine_BC_S16.c \
+ mlib_v_ImageAffine_BC_U16.c \
+ mlib_v_ImageAffine_BL.c \
+ mlib_v_ImageAffine_BL_S16.c \
+ mlib_v_ImageAffine_BL_U16.c \
+ mlib_v_ImageAffine_NN.c \
+ mlib_v_ImageFilters.c \
+ mlib_ImageAffineEdge.c \
+ mlib_ImageAffine_BC_D64.c \
+ mlib_ImageAffine_BC_F32.c \
+ mlib_ImageAffine_BC_S32.c \
+ mlib_ImageAffine_BL_D64.c \
+ mlib_ImageAffine_BL_F32.c \
+ mlib_ImageAffine_BL_S32.c \
+ mlib_ImageAffine_NN.c \
+ mlib_ImageAffine_NN_Bit.c \
+ mlib_ImageFilters.c \
+ mlib_ImageScanPoly.c \
+ mlib_ImageConv_8nw.c \
+ mlib_ImageConv_8ext.c \
+ mlib_ImageConv_16nw.c \
+ mlib_ImageConv_16ext.c \
+ mlib_ImageConv_u16nw.c \
+ mlib_ImageConv_u16ext.c \
+ mlib_ImageConv_32nw.c \
+ mlib_ImageConv_F32nw.c \
+ mlib_ImageConvMxN_Fp.c \
+ mlib_ImageConvMxN_ext.c \
+ mlib_ImageConv_D64nw.c \
+ mlib_ImageClipping.c \
+ mlib_ImageConvCopyEdge_Bit.c \
+ mlib_ImageConvClearEdge_Bit.c \
+ mlib_ImageConv2x2_f.c \
+ mlib_ImageConvClearEdge_Fp.c \
+ mlib_v_ImageConvMxN_8.c \
+ mlib_v_ImageConvClearEdge.c \
+ mlib_v_ImageConvCopyEdge.c \
+ mlib_v_ImageConvMxN_8ext.c \
+ mlib_v_ImageConvVersion.c \
+ mlib_v_ImageConv_8nw.c \
+ mlib_ImageConvCopyEdge_Fp.c \
+ mlib_v_ImageChannelInsert_1.c \
+ mlib_v_ImageChannelExtract_43.c \
+ mlib_v_ImageChannelExtract_1.c \
+ mlib_ImageCopy_Bit.c \
+ mlib_v_ImageCopy_f.c \
+ mlib_ImageUtils.c \
+ mlib_ImageDivTables.c
+
+ BUILD_LIBMLIB_V_CFLAGS := $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V, \
+ LIBRARY := mlib_image_v, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
+ $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib, \
+ LANG := C, \
+ INCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_FILES), \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := -xarch=sparcvis \
+ $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il \
+ $(BUILD_LIBMLIB_V_CFLAGS) \
+ $(CFLAGS_JDKLIB), \
+ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image_v, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
+
+endif
+
+##########################################################################################
+
+LIBAWT_DIRS := \
+ $(JDK_TOPDIR)/src/share/native/sun/awt \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image/gif \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/share/native/sun/font
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBAWT_DIRS += \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
+else ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBAWT_DIRS += \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
+endif
+
+LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
+ $(X_CFLAGS) \
+ $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
+
+LIBAWT_FILES := \
+ gifdecoder.c \
+ imageInitIDs.c \
+ img_globals.c \
+ SurfaceData.c \
+ Region.c \
+ BufImgSurfaceData.c \
+ Disposer.c \
+ Trace.c \
+ GraphicsPrimitiveMgr.c \
+ Blit.c \
+ BlitBg.c \
+ ScaledBlit.c \
+ FillRect.c \
+ FillSpans.c \
+ FillParallelogram.c \
+ DrawParallelogram.c \
+ DrawLine.c \
+ DrawRect.c \
+ DrawPolygons.c \
+ DrawPath.c \
+ FillPath.c \
+ ProcessPath.c \
+ MaskBlit.c \
+ MaskFill.c \
+ TransformHelper.c \
+ AlphaMath.c \
+ AlphaMacros.c \
+ AnyByte.c \
+ ByteBinary1Bit.c \
+ ByteBinary2Bit.c \
+ ByteBinary4Bit.c \
+ ByteIndexed.c \
+ ByteGray.c \
+ Index8Gray.c \
+ Index12Gray.c \
+ AnyShort.c \
+ Ushort555Rgb.c \
+ Ushort565Rgb.c \
+ Ushort4444Argb.c \
+ Ushort555Rgbx.c \
+ UshortGray.c \
+ UshortIndexed.c \
+ Any3Byte.c \
+ ThreeByteBgr.c \
+ AnyInt.c \
+ IntArgb.c \
+ IntArgbPre.c \
+ IntArgbBm.c \
+ IntRgb.c \
+ IntBgr.c \
+ IntRgbx.c \
+ Any4Byte.c \
+ FourByteAbgr.c \
+ FourByteAbgrPre.c \
+ BufferedMaskBlit.c \
+ BufferedRenderPipe.c \
+ ShapeSpanIterator.c \
+ SpanClipRenderer.c \
+ awt_ImageRep.c \
+ awt_ImagingLib.c \
+ awt_Mlib.c \
+ awt_parseImage.c \
+ DataBufferNative.c \
+ dither.c \
+ debug_assert.c \
+ debug_mem.c \
+ debug_trace.c \
+ debug_util.c
+
+ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris linux))
+ LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBAWT_FILES += awt_LoadLibrary.c img_colors.c
+ LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
+endif
+
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
+ LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
+ LIBAWT_CFLAGS += -xarch=sparcvis
+ LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il
+ LIBAWT_CFLAGS += \
+ -I$(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
+ -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/medialib \
+ -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
+
+ LIBAWT_DIRS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
+ $(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
+
+ LIBAWT_FILES += \
+ vis_FuncArray.c \
+ java2d_Mlib.c \
+ mlib_ImageCreate.c \
+ mlib_ImageZoom_NN.c \
+ mlib_ImageCopy_Bit.c \
+ mlib_sys.c \
+ mlib_v_ImageClear.c \
+ mlib_v_ImageClear_f.c \
+ mlib_v_ImageConstXor.c \
+ mlib_v_ImageCopy.c \
+ mlib_v_ImageCopy_f.c \
+ mlib_v_ImageXor.c \
+ mlib_v_ImageZoom_NN_f.c \
+ vis_Interp.c \
+ vis_AlphaMacros.c \
+ vis_AlphaMaskBlit.c \
+ vis_AlphaMaskFill.c \
+ vis_ByteGray.c \
+ vis_ByteGray_FromRgb.c \
+ vis_ByteGray_Mask.c \
+ vis_ByteIndexed.c \
+ vis_DrawLine.c \
+ vis_FourByteAbgr.c \
+ vis_IntArgb.c \
+ vis_IntArgbPre.c \
+ vis_IntArgbPre_Mask.c \
+ vis_IntBgr.c \
+ vis_IntRgb.c \
+ vis_IntRgbx.c \
+ vis_SrcMaskFill.c \
+ vis_SrcOverMaskBlit.c \
+ vis_SrcOverMaskFill.c \
+ vis_FourByteAbgrPre.c \
+ vis_GlyphList.c \
+ vis_GlyphListXor.c \
+ vis_IntArgbBm.c \
+ vis_ThreeByteBgr.c \
+ vis_UshortGray.c \
+ vis_UshortGray_FromRgb.c \
+ vis_XorBlit.c \
+ mlib_v_ImageCopy_blk.s
+
+ ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
+ LIBAWT_ASFLAGS = -P -xarch=v9a
+ else
+ LIBAWT_ASFLAGS = -P -xarch=v8plusa
+ endif
+else
+ LIBAWT_FILES += MapAccelFunc.c
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
+endif
+
+LIBAWT_LANG := C
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBAWT_FILES += AccelGlyphCache.c \
+ ShaderList.c \
+ CmdIDList.cpp \
+ Hashtable.cpp \
+ GDIHashtable.cpp \
+ Devices.cpp \
+ ObjectList.cpp \
+ GDIBlitLoops.cpp \
+ GDIRenderer.cpp \
+ GDIWindowSurfaceData.cpp \
+ WindowsFlags.cpp \
+ WPrinterJob.cpp \
+ awt_%.cpp \
+ D3DBlitLoops.cpp \
+ D3DBufImgOps.cpp \
+ D3DContext.cpp \
+ D3DGlyphCache.cpp \
+ D3DGraphicsDevice.cpp \
+ D3DMaskBlit.cpp \
+ D3DMaskCache.cpp \
+ D3DMaskFill.cpp \
+ D3DPipelineManager.cpp \
+ D3DPaints.cpp \
+ D3DRenderer.cpp \
+ D3DRenderQueue.cpp \
+ D3DResourceManager.cpp \
+ D3DSurfaceData.cpp \
+ D3DTextRenderer.cpp \
+ D3DVertexCacher.cpp \
+ ShellFolder2.cpp \
+ ThemeReader.cpp \
+ ComCtl32Util.cpp \
+ DllUtil.cpp \
+ initIDs.cpp \
+ MouseInfo.cpp \
+ rect.c \
+ OGLBlitLoops.c \
+ OGLBufImgOps.c \
+ OGLContext.c \
+ OGLFuncs.c \
+ OGLMaskBlit.c \
+ OGLMaskFill.c \
+ OGLPaints.c \
+ OGLRenderQueue.c \
+ OGLRenderer.c \
+ OGLSurfaceData.c \
+ OGLTextRenderer.c \
+ OGLVertexCache.c \
+ WGLGraphicsConfig.c \
+ WGLSurfaceData.c
+
+ LIBAWT_LANG := C++
+ LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+ LIBAWT_CFLAGS += -DMLIB_OS64BIT
+ endif
+
+ ifdef OPENJDK
+ LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/windows/resource/icons"
+ else
+ LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
+ endif
+ LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/native/sun/windows/awt.rc
+endif
+
+ifeq ($(MILESTONE), internal)
+ LIBAWT_CFLAGS += -DINTERNAL_BUILD
+endif
+
+LIBAWT_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt/mapfile-vers
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ LIBAWT_MAPFILE :=
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
+ LIBRARY := awt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBAWT_DIRS), \
+ INCLUDE_FILES := $(LIBAWT_FILES), \
+ LANG := $(LIBAWT_LANG), \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
+ ASFLAGS := $(LIBAWT_ASFLAGS), \
+ MAPFILE := $(LIBAWT_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
+ LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \
+ LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \
+ LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \
+ -framework Cocoa \
+ -framework OpenGL \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ -framework JavaRuntimeSupport \
+ -framework ApplicationServices \
+ -framework AudioToolbox \
+ -ljava, \
+ LDFLAGS_SUFFIX_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
+ imm32.lib ole32.lib uuid.lib shell32.lib \
+ comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
+ delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
+ -DELAYLOAD:user32.dll -DELAYLOAD:gdi32.dll \
+ -DELAYLOAD:shell32.dll -DELAYLOAD:winmm.dll \
+ -DELAYLOAD:winspool.drv -DELAYLOAD:imm32.dll \
+ -DELAYLOAD:ole32.dll -DELAYLOAD:comdlg32.dll \
+ -DELAYLOAD:comctl32.dll -DELAYLOAD:shlwapi.dll, \
+ VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
+ RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
+ -D "JDK_FNAME=awt.dll" \
+ -D "JDK_INTERNAL_NAME=awt" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBAWT): $(BUILD_LIBJAVA)
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
+endif
+
+BUILD_LIBRARIES += $(BUILD_LIBAWT)
+
+##########################################################################################
+
+ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
+ ifndef BUILD_HEADLESS_ONLY
+
+ LIBAWT_XAWT_DIRS := \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
+ $(JDK_TOPDIR)/src/share/native/sun/font \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \
+
+ LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \
+ -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
+ $(CUPS_CFLAGS) \
+ $(foreach dir, $(LIBAWT_XAWT_DIRS), -I$(dir)) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga
+
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ ifndef OPENJDK
+ include $(JDK_TOPDIR)/make/closed/xawt.gmk
+ endif
+
+ ifeq ($(DISABLE_XRENDER), true)
+ LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
+ endif
+ endif
+
+ ifeq ($(MILESTONE), internal)
+ LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD
+ endif
+
+ LIBAWT_XAWT_FILES := \
+ XlibWrapper.c \
+ XWindow.c \
+ XToolkit.c \
+ X11Color.c \
+ X11SurfaceData.c \
+ awt_GraphicsEnv.c \
+ awt_InputMethod.c \
+ robot_common.c \
+ awt_Robot.c \
+ list.c \
+ multiVis.c \
+ initIDs.c \
+ awt_util.c \
+ awt_Desktop.c \
+ awt_UNIXToolkit.c \
+ X11FontScaler_md.c \
+ X11TextRenderer_md.c \
+ fontpath.c \
+ awt_Insets.c \
+ awt_Event.c \
+ X11Renderer.c \
+ X11PMBlitLoops.c \
+ OGLBlitLoops.c \
+ OGLBufImgOps.c \
+ OGLContext.c \
+ OGLFuncs.c \
+ OGLMaskBlit.c \
+ OGLMaskFill.c \
+ OGLPaints.c \
+ OGLRenderQueue.c \
+ OGLRenderer.c \
+ OGLSurfaceData.c \
+ OGLTextRenderer.c \
+ OGLVertexCache.c \
+ GLXGraphicsConfig.c \
+ GLXSurfaceData.c \
+ AccelGlyphCache.c \
+ awt_Font.c \
+ multi_font.c \
+ awt_AWTEvent.c \
+ awt_DrawingSurface.c \
+ jawt.c \
+ CUPSfuncs.c \
+ debug_assert.c \
+ debug_mem.c \
+ debug_trace.c \
+ debug_util.c \
+ awt_Plugin.c \
+ gnome_interface.c \
+ gtk2_interface.c \
+ swing_GTKEngine.c \
+ swing_GTKStyle.c \
+ rect.c \
+ sun_awt_X11_GtkFileDialogPeer.c \
+ XRSurfaceData.c \
+ XRBackendNative.c
+
+ LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
+
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ # To match old build, add this to LDFLAGS instead of suffix.
+ LIBAWT_XAWT_LDFLAGS += -lpthread
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \
+ LIBRARY := awt_xawt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBAWT_XAWT_DIRS), \
+ INCLUDE_FILES := $(LIBAWT_XAWT_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
+ $(X_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS), \
+ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN) \
+ $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
+ LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
+ -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
+ -R$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
+ -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
+ -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
+ $(call SET_SHARED_LIBRARY_ORIGIN) \
+ $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
+ LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=xawt.dll" \
+ -D "JDK_INTERNAL_NAME=xawt" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_xawt, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBAWT_XAWT): $(BUILD_LIBJAVA)
+
+ $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
+
+ BUILD_LIBRARIES += $(BUILD_LIBAWT_XAWT)
+
+ endif
+endif
+
+##########################################################################################
+
+# TODO: Update awt lib path when awt is converted
+$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
+ LIBRARY := lcms, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
+ $(SHARED_LIBRARY_FLAGS) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
+ CFLAGS_solaris := -xc99=no_lib, \
+ CFLAGS_windows := -DCMS_IS_WINDOWS_, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
+ LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
+ LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
+ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
+ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=lcms.dll" \
+ -D "JDK_INTERNAL_NAME=lcms" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBLCMS)
+
+$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
+
+##########################################################################################
+
+ifdef OPENJDK
+ BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
+else
+ BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
+ BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
+ BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
+endif
+
+BUILD_LIBJPEG_REORDER :=
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+ BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
+ endif
+endif
+
+# Suppress gcc warnings like "variable might be clobbered by 'longjmp'
+# or 'vfork'": this warning indicates that some variable is placed to
+# a register by optimized compiler and it's value might be lost on longjmp().
+# Recommended way to avoid such warning is to declare the variable as
+# volatile to prevent the optimization. However, this approach does not
+# work because we have to declare all variables as volatile in result.
+#ifndef CROSS_COMPILE_ARCH
+# CC_43_OR_NEWER := \
+# $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
+# \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
+# ifeq ($(CC_43_OR_NEWER), 1)
+# BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered
+# endif
+#endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \
+ LIBRARY := jpeg, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
+ LANG := C, \
+ OPTIMIZATION := HIGHEST, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
+ MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jpeg.dll" \
+ -D "JDK_INTERNAL_NAME=jpeg" \
+ -D "JDK_FTYPE=0x2L", \
+ REORDER := $(BUILD_LIBJPEG_REORDER), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBJPEG)
+
+##########################################################################################
+
+ifndef OPENJDK
+ FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k
+ BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
+ LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
+else
+ FONT_HEADERS := $(FREETYPE_CFLAGS)
+ BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers.openjdk
+ BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS)
+endif
+
+LIBFONTMANAGER_OPTIMIZATION := HIGH
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
+ X11TextRenderer.c
+ LIBFONTMANAGER_OPTIMIZATION := HIGHEST
+else ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
+ X11TextRenderer.c \
+ fontpath.c \
+ lcdglyph.c
+else
+ LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
+ lcdglyph.c
+endif
+
+BUILD_LIBFONTMANAGER_CFLAGS_COMMON := \
+ $(X_CFLAGS) \
+ -DLE_STANDALONE -DHEADLESS \
+ $(FONT_HEADERS) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/font \
+ -I$(JDK_TOPDIR)/src/share/native/sun/font/layout \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d
+
+# Turn off aliasing with GCC for ExtensionSubtables.cpp
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
+ LIBRARY := fontmanager, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/font \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font, \
+ EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
+ AccelGlyphCache.c, \
+ LANG := C++, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
+ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
+ OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
+ CFLAGS_windows = -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
+ -DCC_NOEX, \
+ MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
+ LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
+ LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
+ LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
+ LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
+ -ljava -ljvm, \
+ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
+ $(WIN_AWT_LIB), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=fontmanager.dll" \
+ -D "JDK_INTERNAL_NAME=fontmanager" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfontmanager, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_XAWT)
+endif
+
+BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER)
+
+##########################################################################################
+
+ifndef OPENJDK
+
+ #ifeq ($(OPENJDK_TARGET_OS), linux)
+ # ifeq ("$(CC_VER_MAJOR)", "3")
+ # OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
+ # endif
+ #endif
+ #
+ # The resulting size of the t2k lib file is (at least on linux) dependant on the order of
+ # the input .o files. Because of this the new build will differ in size to the old build.
+ BUILD_LIBT2K_CFLAGS_COMMON := -I$(JDK_TOPDIR)/src/share/native/sun/font \
+ -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
+ -I$(JDK_TOPDIR)/src/closed/share/native/sun/font \
+ -I$(JDK_TOPDIR)/src/share/share/native/sun/font \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \
+ LIBRARY := t2k, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/font \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k/ttHints, \
+ EXCLUDE_FILES := orion.c, \
+ LANG := C++, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
+ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
+ CFLAGS_windows = -DCC_NOEX, \
+ CXXFLAGS_windows = -DCC_NOEX, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libt2k/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
+ LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \
+ LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=t2k.dll" \
+ -D "JDK_INTERNAL_NAME=t2k" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libt2k, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ # t2k is linked against fontmanager
+ $(BUILD_LIBT2K): $(BUILD_LIBFONTMANAGER)
+
+ BUILD_LIBRARIES += $(BUILD_LIBT2K)
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ ifeq ($(OPENJDK_TARGET_CPU), x86)
+ KERNEL32_LIB := kernel32.lib
+ endif
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
+ LIBRARY := jawt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows, \
+ INCLUDE_FILES := jawt.cpp, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CXXFLAGS_JDKLIB) \
+ -EHsc -DUNICODE -D_UNICODE \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \
+ advapi32.lib $(WIN_AWT_LIB), \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jawt.dll" \
+ -D "JDK_INTERNAL_NAME=jawt" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
+
+ $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
+ $(ECHO) Copying $(@F)
+ $(CP) $(JDK_OUTPUTDIR)/objs/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
+
+ BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
+
+else # OPENJDK_TARGET_OS not windows
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ JAWT_FILES := jawt.m
+ JAWT_LIBS := -lawt_lwawt
+ else
+ JAWT_FILES := jawt.c
+ JAWT_LIBS :=
+ ifneq ($(OPENJDK_TARGET_OS), solaris)
+ JAWT_LIBS += -lawt
+ endif
+ ifndef BUILD_HEADLESS_ONLY
+ JAWT_LIBS += -lawt_xawt
+ else
+ JAWT_LIBS += -lawt_headless
+ HEADLESS_CFLAG += -DHEADLESS
+ endif
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
+ LIBRARY := jawt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
+ $(JDK_TOPDIR)/src/macosx/native/sun/awt, \
+ INCLUDE_FILES := $(JAWT_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB), \
+ CFLAGS_linux := $(HEADLESS_CFLAG), \
+ CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
+ LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \
+ LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \
+ -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ ifndef BUILD_HEADLESS_ONLY
+ $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
+ else
+ $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
+ endif
+
+endif # OPENJDK_TARGET_OS
+
+BUILD_LIBRARIES += $(BUILD_LIBJAWT)
+
+##########################################################################################
+
+ifndef OPENJDK
+
+ BUILD_LIBKCMS_EXCLUDE_FILES :=
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+ BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c
+ else
+ BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c
+ endif
+
+ BUILD_LIBKCMS_FLAGS := $(CFLAGS_JDKLIB)
+
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ # This particular library uses a feature called PIC_CODE_SMALL (on solaris)
+ # implement it like this...since it's only used here
+ BUILD_LIBKCMS_FLAGS := $(patsubst -KPIC, -Kpic, $(BUILD_LIBKCMS_FLAGS))
+ else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
+ BUILD_LIBKCMS_FLAGS := $(patsubst -fPIC, -fpic, $(BUILD_LIBKCMS_FLAGS))
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \
+ LIBRARY := kcms, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms, \
+ LANG := C, \
+ EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(BUILD_LIBKCMS_FLAGS) \
+ -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \
+ CFLAGS_linux := -Wno-missing-field-initializers, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libkcms/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := -lc -lpthread, \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
+ LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=kcms.dll" \
+ -D "JDK_INTERNAL_NAME=kcms" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBKCMS): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBKCMS)
+
+endif
+
+##########################################################################################
+
+ifndef OPENJDK
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+
+ ifeq ($(shell if test "$(OS_VERSION_MAJOR)" -eq 5 -a "$(OS_VERSION_MINOR)" -le 10; then $(ECHO) ok; fi), ok)
+
+ SUNWJDGA_MAPFILE :=
+ ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+ SUNWJDGA_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdga/mapfile-vers
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \
+ LIBRARY := sunwjdga, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/solaris/native/sun/jdga, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/javavm/export \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
+ -I$(OPENWIN_HOME)/include, \
+ MAPFILE := $(SUNWJDGA_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -ldga -lX11 $(LIBDL) -lc, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA)
+
+ endif
+ endif
+ endif
+endif
+
+##########################################################################################
+
+ifeq ($(BUILD_HEADLESS), true)
+ # Mac and Windows only use the native AWT lib, do not build libawt_headless
+ ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
+
+ LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/solaris/native/sun/font \
+ $(JDK_TOPDIR)/src/solaris/native/sun/awt \
+ $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBAWT_HEADLESS_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/font
+ endif
+
+ LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \
+ -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
+ $(CUPS_CFLAGS) \
+ $(X_CFLAGS) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
+ $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBAWT_HEADLESS_CFLAGS += \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
+ endif
+
+ LIBAWT_HEADLESS_FILES := \
+ awt_Font.c \
+ HeadlessToolkit.c \
+ fontpath.c \
+ VDrawingArea.c \
+ X11Color.c \
+ X11Renderer.c \
+ X11PMBlitLoops.c \
+ X11SurfaceData.c \
+ X11FontScaler_md.c \
+ X11TextRenderer_md.c \
+ OGLBlitLoops.c \
+ OGLBufImgOps.c \
+ OGLContext.c \
+ OGLFuncs.c \
+ OGLMaskBlit.c \
+ OGLMaskFill.c \
+ OGLPaints.c \
+ OGLRenderQueue.c \
+ OGLRenderer.c \
+ OGLSurfaceData.c \
+ OGLTextRenderer.c \
+ OGLVertexCache.c \
+ GLXGraphicsConfig.c \
+ GLXSurfaceData.c \
+ AccelGlyphCache.c \
+ CUPSfuncs.c
+
+ LIBAWT_HEADLESS_REORDER :=
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+ LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
+ endif
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
+ LIBRARY := awt_headless, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBAWT_HEADLESS_DIRS), \
+ INCLUDE_FILES := $(LIBAWT_HEADLESS_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
+ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..) \
+ -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
+ -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
+ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \
+ REORDER := $(LIBAWT_HEADLESS_REORDER), \
+ LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \
+ LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
+
+ BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS)
+
+ endif
+endif
+
+##########################################################################################
+
+ifndef BUILD_HEADLESS_ONLY
+ LIBSPLASHSCREEN_DIRS := \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
+ $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
+
+ ifeq ($(USE_EXTERNAL_LIBGIF), true)
+ GIFLIB_LDFLAGS := -lgif
+ else
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
+ GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
+ endif
+
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
+ else
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
+ endif
+
+ LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
+ $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
+ $(LIBSPLASHSCREEN_CFLAGS) \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
+ LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
+
+ LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
+ LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
+
+ else ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
+ else ifeq ($(OPENJDK_TARGET_OS), solaris)
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
+ else
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
+ endif
+
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX :=
+
+ ifneq ($(USE_EXTERNAL_LIBZ), true)
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
+ LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
+ endif
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \
+ -framework ApplicationServices \
+ -framework Foundation \
+ -framework Cocoa \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation
+ else ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
+ else ifeq ($(OPENJDK_TARGET_OS), solaris)
+ # Solaris still uses OPENWIN_LIB ..
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
+ else # .. all other Unixes can use X_LIBS
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
+ endif
+
+ $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \
+ LIBRARY := splashscreen, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBSPLASHSCREEN_DIRS), \
+ EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(GIFLIB_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=splashscreen.dll" \
+ -D "JDK_INTERNAL_NAME=splashscreen" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsplashscreen, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(LIBSPLASHSCREEN)
+
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ $(LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
+ endif
+
+endif
+
+##########################################################################################
+
+ifndef OPENJDK
+
+ LIBDCPR_SRC_DIRS := \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/dc/doe \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/dc/path \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/dc/pr \
+ $(JDK_TOPDIR)/src/closed/share/native/sun/dc/util
+
+ LIBDCPR_CFLAGS := $(foreach dir, $(LIBDCPR_SRC_DIRS), -I$(dir)) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBDCPR, \
+ LIBRARY := dcpr, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBDCPR_SRC_DIRS), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(LIBDCPR_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdcpr/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LIBM) $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_posix := -lm, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=dcpr.dll" \
+ -D "JDK_INTERNAL_NAME=dcpr" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdcpr, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBDCPR): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBDCPR)
+
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+
+ LIBAWT_LWAWT_FILES := \
+ awt.m \
+ ApplicationDelegate.m \
+ CFRetainedResource.m \
+ CGLGraphicsConfig.m \
+ CGLSurfaceData.m \
+ CGLLayer.m \
+ CGraphicsConfig.m \
+ CGraphicsDevice.m \
+ CGraphicsEnv.m \
+ CCharToGlyphMapper.m \
+ CSystemColors.m \
+ AWTFont.m \
+ CGGlyphOutlines.m \
+ CGGlyphImages.m \
+ CoreTextSupport.m \
+ AWTStrike.m \
+ InitIDs.m \
+ AWTEvent.m \
+ AWTView.m \
+ AWTWindow.m \
+ AWTSurfaceLayers.m \
+ CCursorManager.m \
+ CClipboard.m \
+ CDataTransferer.m \
+ CDragSource.m \
+ CDragSourceContextPeer.m \
+ CDropTarget.m \
+ CDropTargetContextPeer.m \
+ CInputMethod.m \
+ CDesktopPeer.m \
+ OSVersion.m \
+ DnDUtilities.m \
+ CFileDialog.m \
+ CImage.m \
+ CMenu.m \
+ CMenuBar.m \
+ CMenuComponent.m \
+ CMenuItem.m \
+ CPopupMenu.m \
+ CRobot.m \
+ CTrayIcon.m \
+ CWrapper.m \
+ JavaAccessibilityAction.m \
+ JavaAccessibilityUtilities.m \
+ JavaComponentAccessibility.m \
+ JavaTextAccessibility.m \
+ LWCToolkit.m \
+ GeomUtilities.m \
+ CPrinterJob.m \
+ PrintModel.m \
+ PrinterSurfaceData.m \
+ PrinterView.m \
+ QuartzSurfaceData.m \
+ QuartzRenderer.m \
+ CTextPipe.m \
+ ImageSurfaceData.m \
+ awt_DrawingSurface.m \
+ \
+ OGLBlitLoops.c \
+ OGLBufImgOps.c \
+ OGLContext.c \
+ OGLFuncs.c \
+ OGLMaskBlit.c \
+ OGLMaskFill.c \
+ OGLPaints.c \
+ OGLRenderQueue.c \
+ OGLRenderer.c \
+ OGLSurfaceData.c \
+ OGLTextRenderer.c \
+ OGLVertexCache.c \
+ AccelGlyphCache.c \
+ CUPSfuncs.c
+
+
+ LIBAWT_LWAWT_DIRS := \
+ $(JDK_TOPDIR)/src/macosx/native/sun/awt \
+ $(JDK_TOPDIR)/src/macosx/native/sun/font \
+ $(JDK_TOPDIR)/src/macosx/native/sun/java2d/opengl \
+ $(JDK_TOPDIR)/src/solaris/native/sun/awt \
+ $(JDK_TOPDIR)/src/share/native/sun/font \
+ $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
+ LIBRARY := awt_lwawt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBAWT_LWAWT_DIRS), \
+ LANG := C, \
+ INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(X_CFLAGS) \
+ $(X_LIBS) \
+ $(foreach dir, $(LIBAWT_LWAWT_DIRS), -I$(dir)) \
+ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
+ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
+ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
+ -framework Accelerate \
+ -framework ApplicationServices \
+ -framework AudioToolbox \
+ -framework Carbon \
+ -framework Cocoa \
+ -framework Security \
+ -framework ExceptionHandling \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ -framework JavaRuntimeSupport \
+ -framework OpenGL \
+ -framework QuartzCore -ljava, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT)
+
+ $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
+
+ $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
+
+ $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBOSXAPP)
+
+ $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBJAVA)
+
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \
+ LIBRARY := osxui, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/macosx/native/com/apple/laf, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \
+ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
+ -I$(JDK_TOPDIR)/src/macosx/native/sun/awt \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN) \
+ -Xlinker -rpath -Xlinker @loader_path, \
+ LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \
+ -framework Cocoa \
+ -framework Carbon \
+ -framework ApplicationServices \
+ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
+ -framework JavaNativeFoundation \
+ -framework JavaRuntimeSupport \
+ -ljava -ljvm, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBOSXUI)
+
+ $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
+
+ $(BUILD_LIBOSXUI): $(BUILD_LIBOSXAPP)
+
+ $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
+
+ #$(BUILD_LIBOSXUI): $(BUILD_LIBJAVA)
+
+endif
diff --git a/jdk/make/lib/CoreLibraries.gmk b/jdk/make/lib/CoreLibraries.gmk
new file mode 100644
index 0000000..ba10b67
--- /dev/null
+++ b/jdk/make/lib/CoreLibraries.gmk
@@ -0,0 +1,509 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+WIN_VERIFY_LIB := $(JDK_OUTPUTDIR)/objs/libverify/verify.lib
+
+##########################################################################################
+
+BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ BUILD_LIBFDLIBM_OPTIMIZATION := NONE
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \
+ STATIC_LIBRARY := fdlibm, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
+ SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
+ LANG := C, \
+ OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
+ CFLAGS_windows_debug := -DLOGGING, \
+ ARFLAGS := $(ARFLAGS), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+else
+
+ # On macosx the old build does partial (incremental) linking of fdlibm instead of
+ # a plain static library.
+ $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC, \
+ LIBRARY := fdlibm, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
+ SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
+ LANG := C, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
+ LDFLAGS := -nostdlib -r -arch x86_64, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
+ $(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC)
+ $(call install-file)
+
+endif
+
+BUILD_LIBRARIES += $(BUILD_LIBFDLIBM)
+
+##########################################################################################
+
+BUILD_LIBVERIFY_SRC := check_code.c check_format.c
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+ BUILD_LIBVERIFY_REORDER := $(JDK_TOPDIR)/make/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
+ endif
+endif
+
+LIBVERIFY_OPTIMIZATION := HIGH
+ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
+ ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+ LIBVERIFY_OPTIMIZATION := LOW
+ endif
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \
+ LIBRARY := verify, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/common, \
+ INCLUDE_FILES := $(BUILD_LIBVERIFY_SRC), \
+ LANG := C, \
+ OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
+ CFLAGS := $(CFLAGS_JDKLIB), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libverify/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_posix := -ljvm -lc, \
+ LDFLAGS_SUFFIX_windows := jvm.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=verify.dll" \
+ -D "JDK_INTERNAL_NAME=verify" \
+ -D "JDK_FTYPE=0x2L", \
+ REORDER := $(BUILD_LIBVERIFY_REORDER), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libverify, \
+ DEBUG_SYMBOLS := true))
+
+BUILD_LIBRARIES += $(BUILD_LIBVERIFY)
+
+##########################################################################################
+
+LIBJAVA_SRC_DIRS := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lang \
+ $(JDK_TOPDIR)/src/share/native/java/lang \
+ $(JDK_TOPDIR)/src/share/native/java/lang/reflect \
+ $(JDK_TOPDIR)/src/share/native/java/io \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
+ $(JDK_TOPDIR)/src/share/native/java/nio \
+ $(JDK_TOPDIR)/src/share/native/java/security \
+ $(JDK_TOPDIR)/src/share/native/common \
+ $(JDK_TOPDIR)/src/share/native/sun/misc \
+ $(JDK_TOPDIR)/src/share/native/sun/reflect \
+ $(JDK_TOPDIR)/src/share/native/java/util \
+ $(JDK_TOPDIR)/src/share/native/java/util/concurrent/atomic \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/util/locale/provider
+else
+ LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/util/locale/provider
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/provider \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io
+endif
+
+LIBJAVA_CFLAGS := $(foreach dir, $(LIBJAVA_SRC_DIRS), -I$(dir)) \
+ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \
+ -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
+
+LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
+ -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
+ -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
+ -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
+
+ifneq (, $(JDK_UPDATE_VERSION))
+ LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
+endif
+
+LIBJAVA_EXCLUDE_FILES := check_code.c check_format.c jspawnhelper.c
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBJAVA_EXCLUDE_FILES += java_props_macosx.c
+else
+ BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
+ BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBJAVA_EXCLUDE_FILES += \
+ UNIXProcess_md.c \
+ UnixFileSystem_md.c \
+ FileSystemPreferences.c
+else
+ LIBJAVA_EXCLUDE_FILES += \
+ ProcessImpl_md.c \
+ WinNTFileSystem_md.c \
+ dirent_md.c \
+ WindowsPreferences.c \
+ sun/security/provider/WinCAPISeedGenerator.c \
+ sun/io/Win32ErrorMode.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+ LIBJAVA_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
+ endif
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
+ LIBRARY := java, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBJAVA_SRC_DIRS), \
+ EXCLUDES := fdlibm/src zip, \
+ EXCLUDE_FILES := $(LIBJAVA_EXCLUDE_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(LIBJAVA_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_posix := -ljvm -lverify, \
+ LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
+ LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
+ LDFLAGS_SUFFIX_macosx := -L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \
+ -framework CoreFoundation \
+ -framework Foundation \
+ -framework Security -framework SystemConfiguration, \
+ LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \
+ jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
+ shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
+ advapi32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=java.dll" \
+ -D "JDK_INTERNAL_NAME=java" \
+ -D "JDK_FTYPE=0x2L", \
+ REORDER := $(LIBJAVA_REORDER), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBJAVA)
+
+$(BUILD_LIBJAVA): $(LIBJLI_BINARY)
+
+$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
+
+$(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
+
+##########################################################################################
+
+BUILD_LIBZIP_EXCLUDES :=
+ifeq ($(USE_EXTERNAL_LIBZ), true)
+ LIBZ := -lz
+ LIBZIP_EXCLUDES += zlib-1.2.5
+else
+ ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
+endif
+
+BUILD_LIBZIP_REORDER :=
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+ BUILD_LIBZIP_REORDER := $(JDK_TOPDIR)/make/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
+ endif
+endif
+
+ifeq ($(LIBZIP_CAN_USE_MMAP), true)
+ BUILD_LIBZIP_MMAP := -DUSE_MMAP
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
+ LIBRARY := zip, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ SRC := $(JDK_TOPDIR)/src/share/native/java/util/zip, \
+ EXCLUDES := $(LIBZIP_EXCLUDES), \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(ZLIB_CPPFLAGS) \
+ -I$(JDK_TOPDIR)/src/share/native/java/io \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io, \
+ CFLAGS_posix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libzip/mapfile-vers, \
+ REORDER := $(BUILD_LIBZIP_REORDER), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN) \
+ $(EXPORT_ZIP_FUNCS), \
+ LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
+ -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \
+ $(WIN_JAVA_LIB), \
+ LDFLAGS_SUFFIX_linux := -ljvm -ljava $(LIBZ), \
+ LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \
+ LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=zip.dll" \
+ -D "JDK_INTERNAL_NAME=zip" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libzip, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+
+$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBZIP)
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \
+ LIBRARY := unpack, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \
+ EXCLUDE_FILES := main.cpp, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CXXFLAGS_JDKLIB) \
+ -DNO_ZLIB -DUNPACK_JNI -DFULL, \
+ CFLAGS_release := -DPRODUCT, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_windows := -map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \
+ jvm.lib $(WIN_JAVA_LIB), \
+ LDFLAGS_SUFFIX_posix := -ljvm $(LIBCXX) -ljava -lc, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libunpack, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=unpack.dll" \
+ -D "JDK_INTERNAL_NAME=unpack" \
+ -D "JDK_FTYPE=0x2L", \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBUNPACK): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBUNPACK)
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.map: $(BUILD_LIBUNPACK)
+ $(ECHO) Copying $(@F)
+ $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.map, $<) $@
+
+ $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.pdb: $(BUILD_LIBUNPACK)
+ $(ECHO) Copying $(@F)
+ $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.pdb, $<) $@
+endif
+
+##########################################################################################
+
+BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin
+LIBJLI_CFLAGS := $(CFLAGS_JDKLIB) $(foreach dir, $(BUILD_LIBJLI_SRC_DIRS), -I$(dir))
+
+BUILD_LIBJLI_FILES := \
+ java.c \
+ splashscreen_stubs.c \
+ parse_manifest.c \
+ version_comp.c \
+ wildcard.c \
+ jli_util.c
+
+ifeq ($(JVM_VARIANT_ZERO), true)
+ ERGO_FAMILY := zero
+else
+ ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
+ ERGO_FAMILY := i586
+ else
+ ERGO_FAMILY := $(OPENJDK_TARGET_CPU_ARCH)
+ endif
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBJLI_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/bin
+ BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/bin
+ BUILD_LIBJLI_FILES += java_md_common.c java_md_macosx.c
+
+ BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c
+ BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS := -x objective-c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ BUILD_LIBJLI_FILES += java_md.c \
+ cmdtoargs.c
+ # Staticically link with c runtime on windows.
+ LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS))
+else ifneq ($(OPENJDK_TARGET_OS), macosx)
+
+ BUILD_LIBJLI_FILES += java_md_common.c
+ BUILD_LIBJLI_FILES += java_md_solinux.c ergo.c
+
+ ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
+
+ # if the architecture specific ergo file exists then
+ # use it, else use the generic definitions from ergo.c
+ ifneq ($(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(ERGO_ARCH_FILE)), )
+ BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE)
+ else # !ERGO_ARCH_FILE
+ LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
+ endif # ERGO_ARCH_FILE
+endif #WINDOWS
+
+# Append defines depending on target platform
+LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS)
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+endif
+
+ifneq ($(USE_EXTERNAL_LIBZ), true)
+ BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
+ LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
+ BUILD_LIBJLI_FILES += \
+ inflate.c \
+ inftrees.c \
+ inffast.c \
+ zadler32.c \
+ zcrc32.c \
+ zutil.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
+else
+ LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
+ LIBRARY := jli, \
+ OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
+ SRC := $(BUILD_LIBJLI_SRC_DIRS), \
+ INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(LIBJLI_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjli/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
+ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
+ LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
+ LDFLAGS_SUFFIX_solaris := $(LIBZ) $(LIBDL) -lc, \
+ LDFLAGS_SUFFIX_linux := $(LIBZ) $(LIBDL) -lc -lpthread, \
+ LDFLAGS_SUFFIX_macosx := $(LIBZ), \
+ LDFLAGS_SUFFIX_windows := \
+ -export:JLI_Launch \
+ -export:JLI_ManifestIterate \
+ -export:JLI_SetTraceLauncher \
+ -export:JLI_ReportErrorMessage \
+ -export:JLI_ReportErrorMessageSys \
+ -export:JLI_ReportMessage \
+ -export:JLI_ReportExceptionDescription \
+ -export:JLI_MemAlloc \
+ -export:JLI_CmdToArgs \
+ -export:JLI_GetStdArgc \
+ -export:JLI_GetStdArgs \
+ advapi32.lib \
+ comctl32.lib \
+ user32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jli.dll" \
+ -D "JDK_INTERNAL_NAME=jli" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBJLI)
+
+# On windows, the static library has the same suffix as the import library created by
+# with the shared library, so the static library is given a different name. No harm
+# in doing it for all platform to reduce complexity.
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
+ STATIC_LIBRARY := jli_static, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
+ SRC := $(BUILD_LIBJLI_SRC_DIRS), \
+ INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
+ ARFLAGS := $(ARFLAGS), \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
+
+else ifeq ($(OPENJDK_TARGET_OS), macosx)
+ #
+ # On macosx they do partial (incremental) linking of libjli_static.a
+ # code it here...rather than add support to NativeCompilation
+ # as this is first time I see it
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
+ LIBRARY := jli_static, \
+ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
+ SRC := $(BUILD_LIBJLI_SRC_DIRS), \
+ INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
+ LDFLAGS := -nostdlib -r, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(JDK_OUTPUTDIR)/objs/libjli_static.a: $(BUILD_LIBJLI_STATIC)
+ $(call install-file)
+
+ BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
+endif
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \
+ LIBRARY := npt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/npt $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/npt \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_macosx := -liconv, \
+ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=npt.dll" \
+ -D "JDK_INTERNAL_NAME=npt" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnpt, \
+ DEBUG_SYMBOLS := true))
+
+BUILD_LIBRARIES += $(BUILD_LIBNPT)
diff --git a/jdk/make/lib/NetworkingLibraries.gmk b/jdk/make/lib/NetworkingLibraries.gmk
new file mode 100644
index 0000000..9f5173e
--- /dev/null
+++ b/jdk/make/lib/NetworkingLibraries.gmk
@@ -0,0 +1,98 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+LIBNET_SRC_DIRS := $(JDK_TOPDIR)/src/share/native/java/net \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/dns \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/spi
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/www/protocol/http/ntlm
+else
+ LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/sdp
+endif
+
+LIBNET_CFLAGS := $(foreach dir, $(LIBNET_SRC_DIRS), -I$(dir))
+
+LIBNET_EXCLUDE_FILES :=
+ifneq ($(OPENJDK_TARGET_OS), linux)
+ LIBNET_EXCLUDE_FILES += linux_close.c
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBNET_EXCLUDE_FILES += bsd_close.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBNET_EXCLUDE_FILES += PlainSocketImpl.c PlainDatagramSocketImpl.c SdpSupport.c
+else
+ LIBNET_EXCLUDE_FILES += TwoStacksPlainSocketImpl.c DualStackPlainSocketImpl.c \
+ TwoStacksPlainDatagramSocketImpl.c DualStackPlainDatagramSocketImpl.c \
+ NTLMAuthSequence.c NetworkInterface_winXP.c
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBNET, \
+ LIBRARY := net, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBNET_SRC_DIRS), \
+ EXCLUDE_FILES := $(LIBNET_EXCLUDE_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(LIBNET_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnet/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_macosx := -ljvm -ljava, \
+ LDFLAGS_SUFFIX_solaris := -ljvm -ljava -lnsl -lsocket $(LIBDL) -lc, \
+ LDFLAGS_SUFFIX_linux := $(LIBDL) -ljvm -lpthread -ljava, \
+ LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \
+ delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \
+ -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=net.dll" \
+ -D "JDK_INTERNAL_NAME=net" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnet, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBNET): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBNET)
+
+$(JDK_OUTPUTDIR)/lib/net.properties: $(JDK_TOPDIR)/src/share/lib/net.properties
+ $(ECHO) $(LOG_INFO) Copying $(@F)
+ $(call install-file)
+
+COPY_FILES += $(JDK_OUTPUTDIR)/lib/net.properties
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/${OPENJDK_TARGET_OS_API_DIR}/lib/sdp/sdp.conf.template
+ $(ECHO) $(LOG_INFO) Copying $(@F)
+ $(call install-file)
+
+ COPY_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template
+endif
diff --git a/jdk/make/lib/NioLibraries.gmk b/jdk/make/lib/NioLibraries.gmk
new file mode 100644
index 0000000..05ff4ce
--- /dev/null
+++ b/jdk/make/lib/NioLibraries.gmk
@@ -0,0 +1,186 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+BUILD_LIBNIO_SRC := \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/nio \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
+
+BUILD_LIBNIO_CFLAGS := \
+ -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
+ -I$(JDK_TOPDIR)/src/share/native/java/io \
+ -I$(JDK_TOPDIR)/src/share/native/java/net \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net
+
+BUILD_LIBNIO_FILES := \
+ DatagramChannelImpl.c \
+ DatagramDispatcher.c \
+ FileChannelImpl.c \
+ FileDispatcherImpl.c \
+ FileKey.c \
+ IOUtil.c \
+ MappedByteBuffer.c \
+ Net.c \
+ ServerSocketChannelImpl.c \
+ SocketChannelImpl.c \
+ SocketDispatcher.c
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ BUILD_LIBNIO_FILES += \
+ Iocp.c \
+ RegistryFileTypeDetector.c \
+ WindowsAsynchronousFileChannelImpl.c \
+ WindowsAsynchronousServerSocketChannelImpl.c \
+ WindowsAsynchronousSocketChannelImpl.c \
+ WindowsNativeDispatcher.c \
+ WindowsSelectorImpl.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+ BUILD_LIBNIO_FILES += \
+ EPoll.c \
+ EPollArrayWrapper.c \
+ EPollPort.c \
+ InheritedChannel.c \
+ NativeThread.c \
+ PollArrayWrapper.c \
+ UnixAsynchronousServerSocketChannelImpl.c \
+ UnixAsynchronousSocketChannelImpl.c \
+ GnomeFileTypeDetector.c \
+ MagicFileTypeDetector.c \
+ LinuxNativeDispatcher.c \
+ LinuxWatchService.c \
+ UnixCopyFile.c \
+ UnixNativeDispatcher.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+ BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/macosx/native/sun/nio/ch
+ BUILD_LIBNIO_FILES += \
+ InheritedChannel.c \
+ NativeThread.c \
+ PollArrayWrapper.c \
+ UnixAsynchronousServerSocketChannelImpl.c \
+ UnixAsynchronousSocketChannelImpl.c \
+ BsdNativeDispatcher.c \
+ MacOSXNativeDispatcher.c \
+ UnixCopyFile.c \
+ UnixNativeDispatcher.c \
+ KQueue.c \
+ KQueuePort.c \
+ KQueueArrayWrapper.c
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+ BUILD_LIBNIO_FILES += \
+ DevPollArrayWrapper.c \
+ InheritedChannel.c \
+ NativeThread.c \
+ PollArrayWrapper.c \
+ SolarisEventPort.c \
+ UnixAsynchronousServerSocketChannelImpl.c \
+ UnixAsynchronousSocketChannelImpl.c \
+ GnomeFileTypeDetector.c \
+ SolarisNativeDispatcher.c \
+ SolarisWatchService.c \
+ UnixCopyFile.c \
+ UnixNativeDispatcher.c
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \
+ LIBRARY := nio, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBNIO_SRC), \
+ INCLUDE_FILES := $(BUILD_LIBNIO_FILES), \
+ LANG := C, \
+ OPTIMIZATION := HIGH, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(BUILD_LIBNIO_CFLAGS), \
+ MAPFILE := $(BUILD_LIBNIO_MAPFILE), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := -ljava -lnet -lpthread $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \
+ -lsendfile -ljava -lnet -lc, \
+ LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \
+ $(JDK_OUTPUTDIR)/objs/libnet/net.lib \
+ advapi32.lib, \
+ LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \
+ LDFLAGS_SUFFIX :=, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=nio.dll" \
+ -D "JDK_INTERNAL_NAME=nio" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnio, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBNIO)
+
+$(BUILD_LIBNIO): $(BUILD_LIBNET)
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS_API), posix)
+
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+
+ # Suppress unused parameters required by exported JNI functions.
+ SCTP_WERROR := -Werror -Wno-error=unused-parameter
+ ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
+ SCTP_WERROR :=
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \
+ LIBRARY := sctp, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch/sctp, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
+ -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch/sctp \
+ -I$(JDK_TOPDIR)/src/share/native/java/net \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net, \
+ CFLAGS_linux := $(SCTP_WERROR), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \
+ LDFLAGS_SUFFIX_posix := -lnio -lnet, \
+ LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \
+ LDFLAGS_SUFFIX_macosx := -ljava -ljvm, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsctp, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBSCTP)
+
+ $(BUILD_LIBSCTP): $(BUILD_LIBNIO)
+ endif
+endif
diff --git a/jdk/makefiles/lib/PlatformLibraries.gmk b/jdk/make/lib/PlatformLibraries.gmk
similarity index 100%
rename from jdk/makefiles/lib/PlatformLibraries.gmk
rename to jdk/make/lib/PlatformLibraries.gmk
diff --git a/jdk/make/lib/SecurityLibraries.gmk b/jdk/make/lib/SecurityLibraries.gmk
new file mode 100644
index 0000000..2a1721b
--- /dev/null
+++ b/jdk/make/lib/SecurityLibraries.gmk
@@ -0,0 +1,289 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+LIBJAAS_MAPFILE :=
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ LIBJAAS_EXCLUDE_FILES := Solaris.c
+else
+ # only on solaris...wonder why
+ LIBJAAS_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjaas/mapfile-vers
+endif
+
+LIBJAAS_NAME := jaas_unix
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBJAAS_NAME := jaas_nt
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJAAS, \
+ LIBRARY := $(LIBJAAS_NAME), \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/security/auth/module, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB), \
+ MAPFILE := $(LIBJAAS_MAPFILE), \
+ LDFLAGS := $(filter-out -ljava, $(LDFLAGS_JDKLIB)) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib, \
+ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ EXCLUDE_FILES := $(LIBJAAS_EXCLUDE_FILES), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \
+ -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjaas, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBJAAS): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBJAAS)
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \
+ LIBRARY := j2pcsc, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio, \
+ LANG := C, \
+ CFLAGS_posix := -D__sun_jdk, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio/MUSCLE, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pcsc/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_posix := $(LIBDL), \
+ LDFLAGS_SUFFIX_windows := winscard.lib, \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=j2pcsc.dll" \
+ -D "JDK_INTERNAL_NAME=j2pcsc" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pcsc, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC)
+
+##########################################################################################
+
+ifneq ($(OPENJDK_TARGET_OS), windows)
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS, \
+ LIBRARY := j2gss, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2gss, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
+endif
+
+##########################################################################################
+
+ifneq ($(BUILD_CRYPTO), no)
+ BUILD_LIBKRB5_NAME :=
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+ BUILD_LIBKRB5_NAME := w2k_lsa_auth
+ BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5
+ BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
+ gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
+ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
+ else ifeq ($(OPENJDK_TARGET_OS), macosx)
+ BUILD_LIBKRB5_NAME := osxkrb5
+ BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/share/native/sun/security/krb5
+ BUILD_LIBKRB5_LIBS := -framework Kerberos
+ endif
+
+ ifneq ($(BUILD_LIBKRB5_NAME), )
+ $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \
+ LIBRARY := $(BUILD_LIBKRB5_NAME), \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBKRB5_SRC), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/krb5 \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
+ -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkrb5, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBKRB5)
+ endif
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI, \
+ LIBRARY := sunmscapi, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := Crypt32.Lib advapi32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=sunmscapi.dll" \
+ -D "JDK_INTERNAL_NAME=sunmscapi" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunmscapi, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBSUNMSCAPI)
+endif
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \
+ LIBRARY := j2pkcs11, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
+ $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_posix := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=j2pkcs11.dll" \
+ -D "JDK_INTERNAL_NAME=j2pkcs11" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pkcs11, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11)
+
+##########################################################################################
+
+ifeq ($(ENABLE_INTREE_EC), yes)
+
+ BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
+ -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
+
+ #
+ # On sol-sparc...all libraries are compiled with -xregs=no%appl
+ # (set in CFLAGS_REQUIRED_sparc)
+ #
+ # except!!! libsunec.so
+ #
+ ECC_JNI_SOLSPARC_FILTER :=
+ ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+ ECC_JNI_SOLSPARC_FILTER := -xregs=no%appl
+ endif
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
+ LIBRARY := sunec, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
+ $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
+ $(BUILD_LIBSUNEC_FLAGS) \
+ -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
+ CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
+ $(BUILD_LIBSUNEC_FLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
+ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LIBCXX), \
+ LDFLAGS_SUFFIX_linux := -lc, \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=sunec.dll" \
+ -D "JDK_INTERNAL_NAME=sunec" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunec, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBSUNEC)
+endif
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ ifndef OPENJDK
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2UCRYPTO, \
+ LIBRARY := j2ucrypto, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2ucrypto/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB), \
+ LDFLAGS_SUFFIX := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBJ2UCRYPTO)
+
+ endif
+endif
diff --git a/jdk/make/lib/ServiceabilityLibraries.gmk b/jdk/make/lib/ServiceabilityLibraries.gmk
new file mode 100644
index 0000000..9d95209
--- /dev/null
+++ b/jdk/make/lib/ServiceabilityLibraries.gmk
@@ -0,0 +1,424 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+LIBATTACH_EXCLUDE_FILES :=
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ LIBATTACH_EXCLUDE_FILES += SolarisVirtualMachine.c
+endif
+ifneq ($(OPENJDK_TARGET_OS), linux)
+ LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c
+endif
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ LIBATTACH_EXCLUDE_FILES += BsdVirtualMachine.c
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \
+ LIBRARY := attach, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tools/attach, \
+ EXCLUDE_FILES := $(LIBATTACH_EXCLUDE_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB), \
+ CFLAGS_windows := /Gy, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=attach.dll" \
+ -D "JDK_INTERNAL_NAME=attach" \
+ -D "JDK_FTYPE=0x2L", \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := -ldoor, \
+ LDFLAGS_windows := /ORDER:@$(JDK_TOPDIR)/make/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libattach, \
+ DEBUG_SYMBOLS := true))
+
+$(BUILD_LIBATTACH): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBATTACH)
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \
+ LIBRARY := dt_socket, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/transport/socket \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
+ -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
+ -I$(JDK_TOPDIR)/src/share/transport/socket \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket \
+ -I$(JDK_TOPDIR)/src/share/back/export \
+ -I$(JDK_TOPDIR)/src/share/back, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := -lpthread, \
+ LDFLAGS_SUFFIX_solaris := -lnsl -lsocket -lc, \
+ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=dt_socket.dll" \
+ -D "JDK_INTERNAL_NAME=dt_socket" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_socket, \
+ DEBUG_SYMBOLS := true))
+
+$(BUILD_LIBDT_SOCKET): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBDT_SOCKET)
+
+##########################################################################################
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SHMEM, \
+ LIBRARY := dt_shmem, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/com/sun/tools/jdi \
+ $(JDK_TOPDIR)/src/share/transport/shmem \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
+ -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
+ -I$(JDK_TOPDIR)/src/share/transport/shmem \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem \
+ -I$(JDK_TOPDIR)/src/share/back/export, \
+ LDFLAGS := $(LDFLAGS_JDKLIB), \
+ LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=dt_shmem.dll" \
+ -D "JDK_INTERNAL_NAME=dt_shmem" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_shmem, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBDT_SHMEM)
+
+endif # OPENJDK_TARGET_OS
+
+##########################################################################################
+
+# JDWP_LOGGING causes log messages to be compiled into the library.
+$(eval $(call SetupNativeCompilation,BUILD_LIBJDWP, \
+ LIBRARY := jdwp, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/back $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
+ -I$(JDK_TOPDIR)/src/share/transport/export \
+ -I$(JDK_TOPDIR)/src/share/back/export \
+ -I$(JDK_TOPDIR)/src/share/npt \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
+ -I$(JDK_TOPDIR)/src/share/back \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back \
+ -I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := $(LIBDL) -lc, \
+ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jdwp.dll" \
+ -D "JDK_INTERNAL_NAME=jdwp" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjdwp, \
+ DEBUG_SYMBOLS := true))
+
+$(BUILD_LIBJDWP): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBJDWP)
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJSDT, \
+ LIBRARY := jsdt, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tracing/dtrace, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsdt/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_linux := $(LIBDL), \
+ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL), \
+ LDFLAGS_SUFFIX_macosx := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jsdt.dll" \
+ -D "JDK_INTERNAL_NAME=jsdt" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsdt, \
+ DEBUG_SYMBOLS := true))
+
+$(BUILD_LIBJSDT): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBJSDT)
+
+##########################################################################################
+
+LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/share/instrument \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument
+
+LIBINSTRUMENT_FILES := \
+ EncodingSupport.c \
+ EncodingSupport_md.c \
+ FileSystemSupport_md.c \
+ InstrumentationImplNativeMethods.c \
+ InvocationAdapter.c \
+ JarFacade.c \
+ JPLISAgent.c \
+ JPLISAssert.c \
+ JavaExceptions.c \
+ PathCharsValidator.c \
+ Reentrancy.c \
+ Utilities.c \
+ canonicalize_md.c
+
+LIBINSTRUMENT_DIR := $(JDK_OUTPUTDIR)/objs/libinstrument
+LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/instrument \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument \
+ -I$(JDK_TOPDIR)/src/share/bin
+
+LIBINSTRUMENT_LDFLAGS :=
+LIBINSTRUMENT_LDFLAGS_SUFFIX :=
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ LIBINSTRUMENT_LDFLAGS += $(JDK_OUTPUTDIR)/objs/jli_static.lib $(WIN_JAVA_LIB) \
+ -export:Agent_OnAttach advapi32.lib
+ # Statically link the C runtime so that there are not dependencies on modules
+ # not on the search patch when invoked from the Windows system directory
+ # (or elsewhere).
+ LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS))
+ # equivalent of strcasecmp is stricmp on Windows
+ LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \
+ LIBRARY := instrument, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBINSTRUMENT_SRC), \
+ INCLUDE_FILES := $(LIBINSTRUMENT_FILES), \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
+ CFLAGS_debug := -DJPLIS_LOGGING, \
+ CFLAGS_release := -DNO_JPLIS_LOGGING, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN) \
+ $(LIBINSTRUMENT_LDFLAGS), \
+ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
+ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
+ LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
+ -framework Cocoa -framework Security -framework ApplicationServices, \
+ LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \
+ LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \
+ LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
+ LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=instrument.dll" \
+ -D "JDK_INTERNAL_NAME=instrument" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(LIBINSTRUMENT_DIR), \
+ DEBUG_SYMBOLS := true))
+
+ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows))
+ $(BUILD_LIBINSTRUMENT): $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX)
+else
+ $(BUILD_LIBINSTRUMENT): $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX)
+endif
+$(BUILD_LIBINSTRUMENT): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBINSTRUMENT)
+
+##########################################################################################
+
+BUILD_LIBMANAGEMENT_SRC := $(JDK_TOPDIR)/src/share/native/sun/management \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/management
+
+BUILD_LIBMANAGEMENT_EXCLUDES :=
+
+BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/management
+
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c
+endif
+
+ifneq ($(OPENJDK_TARGET_OS), macosx)
+ BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c
+endif
+
+LIBMANAGEMENT_OPTIMIZATION := HIGH
+ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
+ ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+ LIBMANAGEMENT_OPTIMIZATION := LOW
+ endif
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \
+ LIBRARY := management, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBMANAGEMENT_SRC), \
+ EXCLUDE_FILES := $(BUILD_LIBMANAGEMENT_EXCLUDES), \
+ LANG := C, \
+ OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
+ CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBMANAGEMENT_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_solaris := -lkstat, \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=management.dll" \
+ -D "JDK_INTERNAL_NAME=management" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmanagement, \
+ DEBUG_SYMBOLS := true))
+
+$(BUILD_LIBMANAGEMENT): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBMANAGEMENT)
+
+##########################################################################################
+
+BUILD_LIBHPROF_SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/hprof $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/hprof
+BUILD_LIBHPROF_CFLAGS := -I$(JDK_TOPDIR)/src/share/demo/jvmti/hprof \
+ -I$(JDK_TOPDIR)/src/share/npt \
+ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
+ -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo
+
+BUILD_LIBHPROF_LDFLAGS :=
+
+LIBHPROF_OPTIMIZATION := HIGHEST
+ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
+ ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+ LIBHPROF_OPTIMIZATION := LOW
+ endif
+endif
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBHPROF, \
+ LIBRARY := hprof, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(BUILD_LIBHPROF_SRC), \
+ LANG := C, \
+ OPTIMIZATION := $(LIBHPROF_OPTIMIZATION), \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(BUILD_LIBHPROF_CFLAGS), \
+ CFLAGS_debug := -DHPROF_LOGGING, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libhprof/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_windows := wsock32.lib winmm.lib advapi32.lib, \
+ LDFLAGS_SUFFIX_linux := $(LIBDL), \
+ LDFLAGS_SUFFIX_macosx := $(LIBDL), \
+ LDFLAGS_SUFFIX_solaris := -lsocket -lnsl $(LIBDL) -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=hprof.dll" \
+ -D "JDK_INTERNAL_NAME=hprof" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libhprof_jvmti, \
+ DEBUG_SYMBOLS := true))
+
+BUILD_LIBRARIES += $(BUILD_LIBHPROF)
+
+##########################################################################################
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA_CRW_DEMO, \
+ LIBRARY := java_crw_demo, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava_crw_demo/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=java_crw_demo.dll" \
+ -D "JDK_INTERNAL_NAME=java_crw_demo" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava_crw_demo, \
+ DEBUG_SYMBOLS := true))
+
+BUILD_LIBRARIES += $(BUILD_LIBJAVA_CRW_DEMO)
+
+##########################################################################################
+
+ifndef OPENJDK
+ ifeq ($(ENABLE_JFR), true)
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJFR, \
+ LIBRARY := jfr, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(JDK_TOPDIR)/src/closed/share/native/oracle/jfr, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ -I$(JDK_TOPDIR)/src/closed/share/javavm/export, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjfr/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jfr.dll" \
+ -D "JDK_INTERNAL_NAME=jfr" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjfr, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ BUILD_LIBRARIES += $(BUILD_LIBJFR)
+
+ endif
+endif
diff --git a/jdk/make/lib/SoundLibraries.gmk b/jdk/make/lib/SoundLibraries.gmk
new file mode 100644
index 0000000..6227900
--- /dev/null
+++ b/jdk/make/lib/SoundLibraries.gmk
@@ -0,0 +1,237 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+LIBJSOUND_SRC_DIRS := \
+ $(JDK_TOPDIR)/src/share/native/com/sun/media/sound \
+ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/media/sound
+
+LIBJSOUND_SRC_FILES := Utilities.c Platform.c
+
+LIBJSOUND_LANG := C
+LIBJSOUND_CFLAGS := $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir))
+
+EXTRA_SOUND_JNI_LIBS :=
+
+LIBJSOUND_MIDIFILES := \
+ MidiInDevice.c \
+ MidiInDeviceProvider.c \
+ MidiOutDevice.c \
+ MidiOutDeviceProvider.c \
+ PlatformMidi.c
+
+# files needed for ports
+LIBJSOUND_PORTFILES := \
+ PortMixerProvider.c \
+ PortMixer.c
+
+# files needed for direct audio
+LIBJSOUND_DAUDIOFILES := \
+ DirectAudioDeviceProvider.c \
+ DirectAudioDevice.c
+
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ EXTRA_SOUND_JNI_LIBS += jsoundds
+ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_WINDOWS \
+ -DUSE_PLATFORM_MIDI_OUT=TRUE \
+ -DUSE_PLATFORM_MIDI_IN=TRUE \
+ -DUSE_PORTS=TRUE
+ LIBJSOUND_SRC_FILES += \
+ PLATFORM_API_WinOS_MidiIn.cpp \
+ PLATFORM_API_WinOS_MidiOut.c \
+ PLATFORM_API_WinOS_Util.c \
+ PLATFORM_API_WinOS_Ports.c
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
+endif # OPENJDK_TARGET_OS windows
+
+ifeq ($(OPENJDK_TARGET_OS), linux)
+ EXTRA_SOUND_JNI_LIBS += jsoundalsa
+ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX
+endif # OPENJDK_TARGET_OS linux
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ LIBJSOUND_LANG := C++
+ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \
+ -DUSE_PORTS=TRUE \
+ -DUSE_DAUDIO=TRUE \
+ -DUSE_PLATFORM_MIDI_OUT=TRUE \
+ -DUSE_PLATFORM_MIDI_IN=TRUE
+ LIBJSOUND_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/com/sun/media/sound
+ LIBJSOUND_SRC_FILES += \
+ PLATFORM_API_MacOSX_Utils.cpp \
+ PLATFORM_API_MacOSX_PCM.cpp \
+ PLATFORM_API_MacOSX_Ports.cpp \
+ PLATFORM_API_MacOSX_MidiIn.c \
+ PLATFORM_API_MacOSX_MidiOut.c \
+ PLATFORM_API_MacOSX_MidiUtils.c
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
+endif # OPENJDK_TARGET_OS macosx
+
+ifeq ($(OPENJDK_TARGET_OS), solaris)
+ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_SOLARIS \
+ -DUSE_PORTS=TRUE \
+ -DUSE_DAUDIO=TRUE
+ LIBJSOUND_SRC_FILES += \
+ PLATFORM_API_SolarisOS_Utils.c \
+ PLATFORM_API_SolarisOS_Ports.c \
+ PLATFORM_API_SolarisOS_PCM.c
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
+ LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
+endif # OPENJDK_TARGET_OS solaris
+
+
+ifeq ($(JVM_VARIANT_ZERO), true)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_ZERO
+else
+ ifeq ($(OPENJDK_TARGET_CPU), x86)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_I586
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), sparc)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARC
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARCV9
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), x86_64)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_AMD64
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), arm)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_ARM
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), ppc)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC
+ endif
+endif
+
+LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
+ LIBRARY := jsound, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBJSOUND_SRC_DIRS), \
+ INCLUDE_FILES := $(LIBJSOUND_SRC_FILES), \
+ LANG := $(LIBJSOUND_LANG), \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(LIBJSOUND_CFLAGS), \
+ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsound/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_macosx := -framework CoreAudio -framework CoreFoundation \
+ -framework CoreServices -framework AudioUnit $(LIBCXX) \
+ -framework CoreMIDI -framework AudioToolbox, \
+ LDFLAGS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \
+ LDFLAGS_SUFFIX_posix := -ljava -ljvm, \
+ LDFLAGS_SUFFIX_solaris := -lc, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jsound.dll" \
+ -D "JDK_INTERNAL_NAME=jsound" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsound, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBJSOUND): $(BUILD_LIBJAVA)
+
+BUILD_LIBRARIES += $(BUILD_LIBJSOUND)
+
+##########################################################################################
+
+ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), )
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA, \
+ LIBRARY := jsoundalsa, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBJSOUND_SRC_DIRS), \
+ INCLUDE_FILES := Utilities.c $(LIBJSOUND_MIDIFILES) $(LIBJSOUND_PORTFILES) \
+ $(LIBJSOUND_DAUDIOFILES) \
+ PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \
+ PLATFORM_API_LinuxOS_ALSA_PCM.c \
+ PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \
+ PLATFORM_API_LinuxOS_ALSA_MidiIn.c \
+ PLATFORM_API_LinuxOS_ALSA_MidiOut.c \
+ PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
+ PLATFORM_API_LinuxOS_ALSA_Ports.c, \
+ LANG := C, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(ALSA_CFLAGS) \
+ $(LIBJSOUND_CFLAGS) \
+ -DUSE_DAUDIO=TRUE \
+ -DUSE_PORTS=TRUE \
+ -DUSE_PLATFORM_MIDI_OUT=TRUE \
+ -DUSE_PLATFORM_MIDI_IN=TRUE, \
+ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsoundalsa/mapfile-vers, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBJSOUNDALSA)
+
+endif
+
+##########################################################################################
+
+ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)), )
+
+ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDDS, \
+ LIBRARY := jsoundds, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(LIBJSOUND_SRC_DIRS), \
+ INCLUDE_FILES := Utilities.c $(LIBJSOUND_DAUDIOFILES) \
+ PLATFORM_API_WinOS_DirectSound.cpp, \
+ LANG := C++, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) \
+ $(LIBJSOUND_CFLAGS) \
+ -DUSE_DAUDIO=TRUE, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib, \
+ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+ RC_FLAGS := $(RC_FLAGS) \
+ -D "JDK_FNAME=jsoundds.dll" \
+ -D "JDK_INTERNAL_NAME=jsoundds" \
+ -D "JDK_FTYPE=0x2L", \
+ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundds, \
+ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+ $(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA)
+
+ BUILD_LIBRARIES += $(BUILD_LIBJSOUNDDS)
+
+endif
diff --git a/jdk/makefiles/mapfiles/launchers/mapfile-sparc b/jdk/make/mapfiles/launchers/mapfile-sparc
similarity index 100%
rename from jdk/makefiles/mapfiles/launchers/mapfile-sparc
rename to jdk/make/mapfiles/launchers/mapfile-sparc
diff --git a/jdk/makefiles/mapfiles/launchers/mapfile-sparcv9 b/jdk/make/mapfiles/launchers/mapfile-sparcv9
similarity index 100%
rename from jdk/makefiles/mapfiles/launchers/mapfile-sparcv9
rename to jdk/make/mapfiles/launchers/mapfile-sparcv9
diff --git a/jdk/makefiles/mapfiles/launchers/mapfile-x86 b/jdk/make/mapfiles/launchers/mapfile-x86
similarity index 100%
rename from jdk/makefiles/mapfiles/launchers/mapfile-x86
rename to jdk/make/mapfiles/launchers/mapfile-x86
diff --git a/jdk/makefiles/mapfiles/launchers/mapfile-x86_64 b/jdk/make/mapfiles/launchers/mapfile-x86_64
similarity index 100%
rename from jdk/makefiles/mapfiles/launchers/mapfile-x86_64
rename to jdk/make/mapfiles/launchers/mapfile-x86_64
diff --git a/jdk/makefiles/mapfiles/libattach/mapfile-linux b/jdk/make/mapfiles/libattach/mapfile-linux
similarity index 100%
rename from jdk/makefiles/mapfiles/libattach/mapfile-linux
rename to jdk/make/mapfiles/libattach/mapfile-linux
diff --git a/jdk/makefiles/mapfiles/libattach/mapfile-solaris b/jdk/make/mapfiles/libattach/mapfile-solaris
similarity index 100%
rename from jdk/makefiles/mapfiles/libattach/mapfile-solaris
rename to jdk/make/mapfiles/libattach/mapfile-solaris
diff --git a/jdk/makefiles/mapfiles/libattach/reorder-windows-x86 b/jdk/make/mapfiles/libattach/reorder-windows-x86
similarity index 100%
rename from jdk/makefiles/mapfiles/libattach/reorder-windows-x86
rename to jdk/make/mapfiles/libattach/reorder-windows-x86
diff --git a/jdk/makefiles/mapfiles/libattach/reorder-windows-x86_64 b/jdk/make/mapfiles/libattach/reorder-windows-x86_64
similarity index 100%
rename from jdk/makefiles/mapfiles/libattach/reorder-windows-x86_64
rename to jdk/make/mapfiles/libattach/reorder-windows-x86_64
diff --git a/jdk/makefiles/mapfiles/libawt/mapfile-mawt-vers b/jdk/make/mapfiles/libawt/mapfile-mawt-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libawt/mapfile-mawt-vers
rename to jdk/make/mapfiles/libawt/mapfile-mawt-vers
diff --git a/jdk/makefiles/mapfiles/libawt/mapfile-vers b/jdk/make/mapfiles/libawt/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libawt/mapfile-vers
rename to jdk/make/mapfiles/libawt/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libawt/mapfile-vers-linux b/jdk/make/mapfiles/libawt/mapfile-vers-linux
similarity index 100%
rename from jdk/makefiles/mapfiles/libawt/mapfile-vers-linux
rename to jdk/make/mapfiles/libawt/mapfile-vers-linux
diff --git a/jdk/makefiles/mapfiles/libawt_headless/mapfile-vers b/jdk/make/mapfiles/libawt_headless/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libawt_headless/mapfile-vers
rename to jdk/make/mapfiles/libawt_headless/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libawt_headless/reorder-sparc b/jdk/make/mapfiles/libawt_headless/reorder-sparc
similarity index 100%
rename from jdk/makefiles/mapfiles/libawt_headless/reorder-sparc
rename to jdk/make/mapfiles/libawt_headless/reorder-sparc
diff --git a/jdk/makefiles/mapfiles/libawt_headless/reorder-sparcv9 b/jdk/make/mapfiles/libawt_headless/reorder-sparcv9
similarity index 100%
rename from jdk/makefiles/mapfiles/libawt_headless/reorder-sparcv9
rename to jdk/make/mapfiles/libawt_headless/reorder-sparcv9
diff --git a/jdk/makefiles/mapfiles/libawt_headless/reorder-x86 b/jdk/make/mapfiles/libawt_headless/reorder-x86
similarity index 100%
rename from jdk/makefiles/mapfiles/libawt_headless/reorder-x86
rename to jdk/make/mapfiles/libawt_headless/reorder-x86
diff --git a/jdk/makefiles/mapfiles/libawt_xawt/mapfile-vers b/jdk/make/mapfiles/libawt_xawt/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libawt_xawt/mapfile-vers
rename to jdk/make/mapfiles/libawt_xawt/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libdcpr/mapfile-vers b/jdk/make/mapfiles/libdcpr/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libdcpr/mapfile-vers
rename to jdk/make/mapfiles/libdcpr/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libdt_socket/mapfile-vers b/jdk/make/mapfiles/libdt_socket/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libdt_socket/mapfile-vers
rename to jdk/make/mapfiles/libdt_socket/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libfontmanager/mapfile-vers b/jdk/make/mapfiles/libfontmanager/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libfontmanager/mapfile-vers
rename to jdk/make/mapfiles/libfontmanager/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk b/jdk/make/mapfiles/libfontmanager/mapfile-vers.openjdk
similarity index 100%
rename from jdk/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk
rename to jdk/make/mapfiles/libfontmanager/mapfile-vers.openjdk
diff --git a/jdk/makefiles/mapfiles/libhprof/mapfile-vers b/jdk/make/mapfiles/libhprof/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libhprof/mapfile-vers
rename to jdk/make/mapfiles/libhprof/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libinstrument/mapfile-vers b/jdk/make/mapfiles/libinstrument/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libinstrument/mapfile-vers
rename to jdk/make/mapfiles/libinstrument/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libj2gss/mapfile-vers b/jdk/make/mapfiles/libj2gss/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libj2gss/mapfile-vers
rename to jdk/make/mapfiles/libj2gss/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libj2pcsc/mapfile-vers b/jdk/make/mapfiles/libj2pcsc/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libj2pcsc/mapfile-vers
rename to jdk/make/mapfiles/libj2pcsc/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libj2pkcs11/mapfile-vers b/jdk/make/mapfiles/libj2pkcs11/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libj2pkcs11/mapfile-vers
rename to jdk/make/mapfiles/libj2pkcs11/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libj2ucrypto/mapfile-vers b/jdk/make/mapfiles/libj2ucrypto/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libj2ucrypto/mapfile-vers
rename to jdk/make/mapfiles/libj2ucrypto/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjaas/mapfile-vers b/jdk/make/mapfiles/libjaas/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjaas/mapfile-vers
rename to jdk/make/mapfiles/libjaas/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjava/mapfile-vers b/jdk/make/mapfiles/libjava/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjava/mapfile-vers
rename to jdk/make/mapfiles/libjava/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjava/reorder-sparc b/jdk/make/mapfiles/libjava/reorder-sparc
similarity index 100%
rename from jdk/makefiles/mapfiles/libjava/reorder-sparc
rename to jdk/make/mapfiles/libjava/reorder-sparc
diff --git a/jdk/makefiles/mapfiles/libjava/reorder-sparcv9 b/jdk/make/mapfiles/libjava/reorder-sparcv9
similarity index 100%
rename from jdk/makefiles/mapfiles/libjava/reorder-sparcv9
rename to jdk/make/mapfiles/libjava/reorder-sparcv9
diff --git a/jdk/makefiles/mapfiles/libjava/reorder-x86 b/jdk/make/mapfiles/libjava/reorder-x86
similarity index 100%
rename from jdk/makefiles/mapfiles/libjava/reorder-x86
rename to jdk/make/mapfiles/libjava/reorder-x86
diff --git a/jdk/makefiles/mapfiles/libjava_crw_demo/mapfile-vers b/jdk/make/mapfiles/libjava_crw_demo/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjava_crw_demo/mapfile-vers
rename to jdk/make/mapfiles/libjava_crw_demo/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjawt/mapfile-vers b/jdk/make/mapfiles/libjawt/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjawt/mapfile-vers
rename to jdk/make/mapfiles/libjawt/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjdga/mapfile-vers b/jdk/make/mapfiles/libjdga/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjdga/mapfile-vers
rename to jdk/make/mapfiles/libjdga/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjdwp/mapfile-vers b/jdk/make/mapfiles/libjdwp/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjdwp/mapfile-vers
rename to jdk/make/mapfiles/libjdwp/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjfr/mapfile-vers b/jdk/make/mapfiles/libjfr/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjfr/mapfile-vers
rename to jdk/make/mapfiles/libjfr/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjli/mapfile-vers b/jdk/make/mapfiles/libjli/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjli/mapfile-vers
rename to jdk/make/mapfiles/libjli/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjpeg/mapfile-vers b/jdk/make/mapfiles/libjpeg/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjpeg/mapfile-vers
rename to jdk/make/mapfiles/libjpeg/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjpeg/mapfile-vers-closed b/jdk/make/mapfiles/libjpeg/mapfile-vers-closed
similarity index 100%
rename from jdk/makefiles/mapfiles/libjpeg/mapfile-vers-closed
rename to jdk/make/mapfiles/libjpeg/mapfile-vers-closed
diff --git a/jdk/makefiles/mapfiles/libjpeg/reorder-sparc b/jdk/make/mapfiles/libjpeg/reorder-sparc
similarity index 100%
rename from jdk/makefiles/mapfiles/libjpeg/reorder-sparc
rename to jdk/make/mapfiles/libjpeg/reorder-sparc
diff --git a/jdk/makefiles/mapfiles/libjpeg/reorder-sparcv9 b/jdk/make/mapfiles/libjpeg/reorder-sparcv9
similarity index 100%
rename from jdk/makefiles/mapfiles/libjpeg/reorder-sparcv9
rename to jdk/make/mapfiles/libjpeg/reorder-sparcv9
diff --git a/jdk/makefiles/mapfiles/libjpeg/reorder-x86 b/jdk/make/mapfiles/libjpeg/reorder-x86
similarity index 100%
rename from jdk/makefiles/mapfiles/libjpeg/reorder-x86
rename to jdk/make/mapfiles/libjpeg/reorder-x86
diff --git a/jdk/makefiles/mapfiles/libjsdt/mapfile-vers b/jdk/make/mapfiles/libjsdt/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjsdt/mapfile-vers
rename to jdk/make/mapfiles/libjsdt/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjsound/mapfile-vers b/jdk/make/mapfiles/libjsound/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjsound/mapfile-vers
rename to jdk/make/mapfiles/libjsound/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libjsoundalsa/mapfile-vers b/jdk/make/mapfiles/libjsoundalsa/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libjsoundalsa/mapfile-vers
rename to jdk/make/mapfiles/libjsoundalsa/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libkcms/mapfile-vers b/jdk/make/mapfiles/libkcms/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libkcms/mapfile-vers
rename to jdk/make/mapfiles/libkcms/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/liblcms/mapfile-vers b/jdk/make/mapfiles/liblcms/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/liblcms/mapfile-vers
rename to jdk/make/mapfiles/liblcms/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libmanagement/mapfile-vers b/jdk/make/mapfiles/libmanagement/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libmanagement/mapfile-vers
rename to jdk/make/mapfiles/libmanagement/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libmlib_image/mapfile-vers b/jdk/make/mapfiles/libmlib_image/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libmlib_image/mapfile-vers
rename to jdk/make/mapfiles/libmlib_image/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libnet/mapfile-vers b/jdk/make/mapfiles/libnet/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libnet/mapfile-vers
rename to jdk/make/mapfiles/libnet/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libnio/mapfile-linux b/jdk/make/mapfiles/libnio/mapfile-linux
similarity index 100%
rename from jdk/makefiles/mapfiles/libnio/mapfile-linux
rename to jdk/make/mapfiles/libnio/mapfile-linux
diff --git a/jdk/makefiles/mapfiles/libnio/mapfile-macosx b/jdk/make/mapfiles/libnio/mapfile-macosx
similarity index 100%
rename from jdk/makefiles/mapfiles/libnio/mapfile-macosx
rename to jdk/make/mapfiles/libnio/mapfile-macosx
diff --git a/jdk/makefiles/mapfiles/libnio/mapfile-solaris b/jdk/make/mapfiles/libnio/mapfile-solaris
similarity index 100%
rename from jdk/makefiles/mapfiles/libnio/mapfile-solaris
rename to jdk/make/mapfiles/libnio/mapfile-solaris
diff --git a/jdk/makefiles/mapfiles/libnio/reorder-sparc b/jdk/make/mapfiles/libnio/reorder-sparc
similarity index 100%
rename from jdk/makefiles/mapfiles/libnio/reorder-sparc
rename to jdk/make/mapfiles/libnio/reorder-sparc
diff --git a/jdk/makefiles/mapfiles/libnio/reorder-sparcv9 b/jdk/make/mapfiles/libnio/reorder-sparcv9
similarity index 100%
rename from jdk/makefiles/mapfiles/libnio/reorder-sparcv9
rename to jdk/make/mapfiles/libnio/reorder-sparcv9
diff --git a/jdk/makefiles/mapfiles/libnio/reorder-x86 b/jdk/make/mapfiles/libnio/reorder-x86
similarity index 100%
rename from jdk/makefiles/mapfiles/libnio/reorder-x86
rename to jdk/make/mapfiles/libnio/reorder-x86
diff --git a/jdk/makefiles/mapfiles/libnpt/mapfile-vers b/jdk/make/mapfiles/libnpt/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libnpt/mapfile-vers
rename to jdk/make/mapfiles/libnpt/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libsctp/mapfile-vers b/jdk/make/mapfiles/libsctp/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libsctp/mapfile-vers
rename to jdk/make/mapfiles/libsctp/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libsplashscreen/mapfile-vers b/jdk/make/mapfiles/libsplashscreen/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libsplashscreen/mapfile-vers
rename to jdk/make/mapfiles/libsplashscreen/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libsunec/mapfile-vers b/jdk/make/mapfiles/libsunec/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libsunec/mapfile-vers
rename to jdk/make/mapfiles/libsunec/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libt2k/mapfile-vers b/jdk/make/mapfiles/libt2k/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libt2k/mapfile-vers
rename to jdk/make/mapfiles/libt2k/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libunpack/mapfile-vers b/jdk/make/mapfiles/libunpack/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libunpack/mapfile-vers
rename to jdk/make/mapfiles/libunpack/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libunpack/mapfile-vers-unpack200 b/jdk/make/mapfiles/libunpack/mapfile-vers-unpack200
similarity index 100%
rename from jdk/makefiles/mapfiles/libunpack/mapfile-vers-unpack200
rename to jdk/make/mapfiles/libunpack/mapfile-vers-unpack200
diff --git a/jdk/makefiles/mapfiles/libverify/mapfile-vers b/jdk/make/mapfiles/libverify/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libverify/mapfile-vers
rename to jdk/make/mapfiles/libverify/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libverify/reorder-sparc b/jdk/make/mapfiles/libverify/reorder-sparc
similarity index 100%
rename from jdk/makefiles/mapfiles/libverify/reorder-sparc
rename to jdk/make/mapfiles/libverify/reorder-sparc
diff --git a/jdk/makefiles/mapfiles/libverify/reorder-sparcv9 b/jdk/make/mapfiles/libverify/reorder-sparcv9
similarity index 100%
rename from jdk/makefiles/mapfiles/libverify/reorder-sparcv9
rename to jdk/make/mapfiles/libverify/reorder-sparcv9
diff --git a/jdk/makefiles/mapfiles/libverify/reorder-x86 b/jdk/make/mapfiles/libverify/reorder-x86
similarity index 100%
rename from jdk/makefiles/mapfiles/libverify/reorder-x86
rename to jdk/make/mapfiles/libverify/reorder-x86
diff --git a/jdk/makefiles/mapfiles/libzip/mapfile-vers b/jdk/make/mapfiles/libzip/mapfile-vers
similarity index 100%
rename from jdk/makefiles/mapfiles/libzip/mapfile-vers
rename to jdk/make/mapfiles/libzip/mapfile-vers
diff --git a/jdk/makefiles/mapfiles/libzip/reorder-sparc b/jdk/make/mapfiles/libzip/reorder-sparc
similarity index 100%
rename from jdk/makefiles/mapfiles/libzip/reorder-sparc
rename to jdk/make/mapfiles/libzip/reorder-sparc
diff --git a/jdk/makefiles/mapfiles/libzip/reorder-sparcv9 b/jdk/make/mapfiles/libzip/reorder-sparcv9
similarity index 100%
rename from jdk/makefiles/mapfiles/libzip/reorder-sparcv9
rename to jdk/make/mapfiles/libzip/reorder-sparcv9
diff --git a/jdk/makefiles/mapfiles/libzip/reorder-x86 b/jdk/make/mapfiles/libzip/reorder-x86
similarity index 100%
rename from jdk/makefiles/mapfiles/libzip/reorder-x86
rename to jdk/make/mapfiles/libzip/reorder-x86
diff --git a/jdk/make/mkdemo/Makefile b/jdk/make/mkdemo/Makefile
deleted file mode 100644
index 6bf93e5..0000000
--- a/jdk/make/mkdemo/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all the demos
-#
-
-BUILDDIR = ..
-PRODUCT = demos
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = jni nio
-SUBDIRS_desktop = applets jfc
-SUBDIRS_management = management
-SUBDIRS_misc = scripting
-SUBDIRS_tools = jpda jvmti
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-TOPLEVEL_FILES = \
- $(DEMODIR)/README
-
-all build:: nbproject
- $(SUBDIRS-loop)
-
-all build:: $(TOPLEVEL_FILES)
-
-nbproject:
- $(RM) -r $(DEMODIR)/nbproject
- $(MKDIR) -p $(DEMODIR)
- ( $(CD) $(SHARE_SRC)/demo && $(TAR) -cf - \
- `$(FIND) nbproject $(SCM_DIRS_prune) -o -type f -print` ) | \
- ( $(CD) $(DEMODIR) && $(TAR) -xf - )
-ifndef OPENJDK
- ( $(CD) $(CLOSED_SHARE_SRC)/demo && $(TAR) -cf - \
- `$(FIND) nbproject $(SCM_DIRS_prune) -o -type f -print` ) | \
- ( $(CD) $(DEMODIR) && $(TAR) -xf - )
-endif
-
-$(DEMODIR)/%: $(DEMOSRCDIR)/%
- $(install-file)
-
-clean clobber::
- $(SUBDIRS-loop)
- $(RM) -r $(DEMODIR)
- $(RM) -r $(DEMOCLASSDIR)
diff --git a/jdk/make/mkdemo/applets/Animator/Makefile b/jdk/make/mkdemo/applets/Animator/Makefile
deleted file mode 100644
index 541b4aa..0000000
--- a/jdk/make/mkdemo/applets/Animator/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = Animator
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(CLOSED_SRC)/share/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/ArcTest/Makefile b/jdk/make/mkdemo/applets/ArcTest/Makefile
deleted file mode 100644
index 105e022..0000000
--- a/jdk/make/mkdemo/applets/ArcTest/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = ArcTest
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/BarChart/Makefile b/jdk/make/mkdemo/applets/BarChart/Makefile
deleted file mode 100644
index abc8303..0000000
--- a/jdk/make/mkdemo/applets/BarChart/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = BarChart
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
-
diff --git a/jdk/make/mkdemo/applets/Blink/Makefile b/jdk/make/mkdemo/applets/Blink/Makefile
deleted file mode 100644
index 8c75a80..0000000
--- a/jdk/make/mkdemo/applets/Blink/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = Blink
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/CardTest/Makefile b/jdk/make/mkdemo/applets/CardTest/Makefile
deleted file mode 100644
index 9896ebf..0000000
--- a/jdk/make/mkdemo/applets/CardTest/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = CardTest
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/Clock/Makefile b/jdk/make/mkdemo/applets/Clock/Makefile
deleted file mode 100644
index 4b3dba1..0000000
--- a/jdk/make/mkdemo/applets/Clock/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = Clock
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/DitherTest/Makefile b/jdk/make/mkdemo/applets/DitherTest/Makefile
deleted file mode 100644
index cd0507d..0000000
--- a/jdk/make/mkdemo/applets/DitherTest/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = DitherTest
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/DrawTest/Makefile b/jdk/make/mkdemo/applets/DrawTest/Makefile
deleted file mode 100644
index fc26b1b..0000000
--- a/jdk/make/mkdemo/applets/DrawTest/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = DrawTest
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/Fractal/Makefile b/jdk/make/mkdemo/applets/Fractal/Makefile
deleted file mode 100644
index 7beda9f..0000000
--- a/jdk/make/mkdemo/applets/Fractal/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = Fractal
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/GraphLayout/Makefile b/jdk/make/mkdemo/applets/GraphLayout/Makefile
deleted file mode 100644
index 0bd20e3..0000000
--- a/jdk/make/mkdemo/applets/GraphLayout/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-DEMONAME = GraphLayout
-PRODUCT = demo/applets
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(CLOSED_SRC)/share/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/GraphicsTest/Makefile b/jdk/make/mkdemo/applets/GraphicsTest/Makefile
deleted file mode 100644
index 7353e6e..0000000
--- a/jdk/make/mkdemo/applets/GraphicsTest/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = GraphicsTest
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/JumpingBox/Makefile b/jdk/make/mkdemo/applets/JumpingBox/Makefile
deleted file mode 100644
index ae898b7..0000000
--- a/jdk/make/mkdemo/applets/JumpingBox/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = JumpingBox
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(CLOSED_SRC)/share/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/Makefile b/jdk/make/mkdemo/applets/Makefile
deleted file mode 100644
index 370ad81..0000000
--- a/jdk/make/mkdemo/applets/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the demo applets
-#
-
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS_CLOSED = Animator GraphLayout JumpingBox TicTacToe
-SUBDIRS = ArcTest BarChart Blink CardTest Clock DitherTest DrawTest \
- Fractal GraphicsTest MoleculeViewer \
- NervousText SimpleGraph SortDemo SpreadSheet WireFrame
-ifndef OPENJDK
-SUBDIRS += $(SUBDIRS_CLOSED)
-endif
-
-SUBDIRS_MAKEFLAGS += DEMO_IS_APPLET=true
-
-include $(BUILDDIR)/common/Subdirs.gmk
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clobber clean::
- $(RM) -r $(DEMODIR)/applets
diff --git a/jdk/make/mkdemo/applets/MoleculeViewer/Makefile b/jdk/make/mkdemo/applets/MoleculeViewer/Makefile
deleted file mode 100644
index 497e5da..0000000
--- a/jdk/make/mkdemo/applets/MoleculeViewer/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = MoleculeViewer
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/NervousText/Makefile b/jdk/make/mkdemo/applets/NervousText/Makefile
deleted file mode 100644
index cb6d9ef..0000000
--- a/jdk/make/mkdemo/applets/NervousText/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = NervousText
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/SimpleGraph/Makefile b/jdk/make/mkdemo/applets/SimpleGraph/Makefile
deleted file mode 100644
index 71a1ac0..0000000
--- a/jdk/make/mkdemo/applets/SimpleGraph/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = SimpleGraph
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/SortDemo/Makefile b/jdk/make/mkdemo/applets/SortDemo/Makefile
deleted file mode 100644
index eba1f7b..0000000
--- a/jdk/make/mkdemo/applets/SortDemo/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = SortDemo
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/SpreadSheet/Makefile b/jdk/make/mkdemo/applets/SpreadSheet/Makefile
deleted file mode 100644
index d860940..0000000
--- a/jdk/make/mkdemo/applets/SpreadSheet/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = SpreadSheet
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/TicTacToe/Makefile b/jdk/make/mkdemo/applets/TicTacToe/Makefile
deleted file mode 100644
index 5ca8cb0..0000000
--- a/jdk/make/mkdemo/applets/TicTacToe/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = TicTacToe
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(CLOSED_SRC)/share/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/applets/WireFrame/Makefile b/jdk/make/mkdemo/applets/WireFrame/Makefile
deleted file mode 100644
index 2940feb..0000000
--- a/jdk/make/mkdemo/applets/WireFrame/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build applet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/applets
-DEMONAME = WireFrame
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/applets/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/applets/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/CodePointIM/Makefile b/jdk/make/mkdemo/jfc/CodePointIM/Makefile
deleted file mode 100644
index e53ebd2..0000000
--- a/jdk/make/mkdemo/jfc/CodePointIM/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the CodePointInputMethod
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = CodePointIM
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./README.html ./README_ja.html ./README_zh_CN.html
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESCRIPTOR = java.awt.im.spi.InputMethodDescriptor
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/FileChooserDemo/Makefile b/jdk/make/mkdemo/jfc/FileChooserDemo/Makefile
deleted file mode 100644
index ffdad66..0000000
--- a/jdk/make/mkdemo/jfc/FileChooserDemo/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the FileChooser demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = FileChooserDemo
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/Font2DTest/Makefile b/jdk/make/mkdemo/jfc/Font2DTest/Makefile
deleted file mode 100644
index 4eee7bd..0000000
--- a/jdk/make/mkdemo/jfc/Font2DTest/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the Font2DTest Demo
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = Font2DTest
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt ./$(DEMONAME).html
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/Java2D/Makefile b/jdk/make/mkdemo/jfc/Java2D/Makefile
deleted file mode 100644
index 2833fc4..0000000
--- a/jdk/make/mkdemo/jfc/Java2D/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the Java 2D Demo
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = Java2Demo
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(CLOSED_SRC)/share/demo/jfc/Java2D
-DEMO_TOPFILES = ./README.txt ./$(DEMONAME).html
-DEMO_MAINCLASS = java2d.Java2Demo
-DEMO_DESTDIR = $(DEMODIR)/jfc/Java2D
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/Laffy/Makefile b/jdk/make/mkdemo/jfc/Laffy/Makefile
deleted file mode 100644
index 7685f1e..0000000
--- a/jdk/make/mkdemo/jfc/Laffy/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the Laffy demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = Laffy
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(CLOSED_SRC)/share/demo/jfc/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./readme.html ./laffy.png
-DEMO_SKIP_SRCZIP = true
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
diff --git a/jdk/make/mkdemo/jfc/Makefile b/jdk/make/mkdemo/jfc/Makefile
deleted file mode 100644
index c106377..0000000
--- a/jdk/make/mkdemo/jfc/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the jfc demos
-#
-
-BUILDDIR = ../..
-PRODUCT = demos
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = \
- CodePointIM \
- FileChooserDemo \
- Font2DTest \
- Metalworks \
- Notepad \
- SampleTree \
- SwingApplet \
- TableExample \
- TransparentRuler
-
-# Some demos aren't currently included in OpenJDK
-ifndef OPENJDK
- SUBDIRS += Java2D Laffy SwingSet2 SwingSet3 Stylepad
-endif
-
-include $(BUILDDIR)/common/Subdirs.gmk
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/mkdemo/jfc/Metalworks/Makefile b/jdk/make/mkdemo/jfc/Metalworks/Makefile
deleted file mode 100644
index 014aa38..0000000
--- a/jdk/make/mkdemo/jfc/Metalworks/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the Metalworks demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = Metalworks
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/Notepad/Makefile b/jdk/make/mkdemo/jfc/Notepad/Makefile
deleted file mode 100644
index 9b5d694..0000000
--- a/jdk/make/mkdemo/jfc/Notepad/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the Notepad demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = Notepad
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/SampleTree/Makefile b/jdk/make/mkdemo/jfc/SampleTree/Makefile
deleted file mode 100644
index 047016c..0000000
--- a/jdk/make/mkdemo/jfc/SampleTree/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the SampleTree demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = SampleTree
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/Stylepad/Makefile b/jdk/make/mkdemo/jfc/Stylepad/Makefile
deleted file mode 100644
index 14317ad..0000000
--- a/jdk/make/mkdemo/jfc/Stylepad/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the Stylepad demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = Stylepad
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(CLOSED_SRC)/share/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-
-# Notepad files need to be added to the demo
-DEMO_EXTRA_SRCDIR = $(SHARE_SRC)/demo/jfc/Notepad
-DEMO_EXTRA_FILES := Notepad.java ElementTreePanel.java \
- $(shell $(CD) $(DEMO_EXTRA_SRCDIR) \
- && $(FIND) resources $(SCM_DIRS_prune) -o -type f -print )
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/SwingApplet/Makefile b/jdk/make/mkdemo/jfc/SwingApplet/Makefile
deleted file mode 100644
index e739c67..0000000
--- a/jdk/make/mkdemo/jfc/SwingApplet/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the SwingApplet demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = SwingApplet
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt ./$(DEMONAME).html
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/SwingSet2/Makefile b/jdk/make/mkdemo/jfc/SwingSet2/Makefile
deleted file mode 100644
index 8cfef8b..0000000
--- a/jdk/make/mkdemo/jfc/SwingSet2/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the SwingSet2 demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = SwingSet2
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(CLOSED_SRC)/share/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt ./$(DEMONAME).html
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_MANIFEST_ATTR = SplashScreen-Image: resources/images/splash.png
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-DEMO_INCL_SRC = true
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/SwingSet3/Makefile b/jdk/make/mkdemo/jfc/SwingSet3/Makefile
deleted file mode 100644
index 5ba7886..0000000
--- a/jdk/make/mkdemo/jfc/SwingSet3/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the SwingSet3 demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = SwingSet3
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(CLOSED_SRC)/share/demo/jfc/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./readme.html ./swingset3.png
-DEMO_SKIP_SRCZIP = true
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
diff --git a/jdk/make/mkdemo/jfc/TableExample/Makefile b/jdk/make/mkdemo/jfc/TableExample/Makefile
deleted file mode 100644
index 7926429..0000000
--- a/jdk/make/mkdemo/jfc/TableExample/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the Table demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = TableExample
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jfc/TransparentRuler/Makefile b/jdk/make/mkdemo/jfc/TransparentRuler/Makefile
deleted file mode 100644
index 7092b87..0000000
--- a/jdk/make/mkdemo/jfc/TransparentRuler/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the TransparentRuler demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jfc
-DEMONAME = TransparentRuler
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = transparentruler.Ruler
-DEMO_DESTDIR = $(DEMODIR)/jfc/$(DEMONAME)
-
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
diff --git a/jdk/make/mkdemo/jni/Makefile b/jdk/make/mkdemo/jni/Makefile
deleted file mode 100644
index b24a5f3..0000000
--- a/jdk/make/mkdemo/jni/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the jni demo(s)
-#
-
-BUILDDIR = ../..
-PRODUCT = demos
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS =
-
-ifeq ($(PLATFORM),solaris)
- SUBDIRS += Poller
-endif
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/mkdemo/jni/Poller/Makefile b/jdk/make/mkdemo/jni/Poller/Makefile
deleted file mode 100644
index baf23e3..0000000
--- a/jdk/make/mkdemo/jni/Poller/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build Poller class demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/jni
-DEMONAME = Poller
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(PLATFORM_SRC)/demo/jni/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = Client
-DEMO_NATIVECLASS= $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jni/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jpda/Makefile b/jdk/make/mkdemo/jpda/Makefile
deleted file mode 100644
index 443deb5..0000000
--- a/jdk/make/mkdemo/jpda/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PRODUCT = demo/jpda
-DEMONAME = jpda
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/classes
-DEMO_PKGDIR = com/sun/tools/example
-DEMO_TOPFILES = ./com/sun/tools/example/README
-DEMO_DESTDIR = $(DEMODIR)/jpda
-DEMO_JAR_NAME = examples.jar
-DEMO_ONLY_SRC = true
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jvmti/Makefile b/jdk/make/mkdemo/jvmti/Makefile
deleted file mode 100644
index 630c65b..0000000
--- a/jdk/make/mkdemo/jvmti/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the jvmti demo(s)
-#
-
-BUILDDIR = ../..
-PRODUCT = demos
-include $(BUILDDIR)/common/Defs.gmk
-
-# Can be built in any order, the JRE version of hprof and java_crw_demo are
-# really built in make/java.
-# The hprof target here just delivers the sources and README files.
-# The java_crw_demo and agent_util files are copied into each demo that
-# uses them.
-SUBDIRS = \
- versionCheck \
- compiledMethodLoad \
- gctest \
- heapViewer \
- heapTracker \
- minst \
- mtrace \
- waiters \
- hprof
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-all build :: $(DEMODIR)/jvmti/index.html
-
-$(DEMODIR)/jvmti/index.html: $(SHARE_SRC)/demo/jvmti/index.html
- $(install-file)
-
diff --git a/jdk/make/mkdemo/jvmti/README.txt b/jdk/make/mkdemo/jvmti/README.txt
deleted file mode 100644
index 99e2a8f..0000000
--- a/jdk/make/mkdemo/jvmti/README.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-Instructions on adding a jvmti demo agent.
-
-Basically you want to mimic the jvmti demo agent "mtrace".
-
-* Create and populate a source directory at src/share/demo/jvmti
- (Try and re-use code in agent_util area like src/share/demo/jvmti/mtrace)
- (This should include a small README.txt document on what this demo is)
-
-* Make sure the appropriate "demo" copyright notice is added to all the
- source files.
-
-* Edit src/share/demo/jvmti/index.html and add in reference to this demo.
-
-* Create make directory at make/mkdemo/jvmti
- (Mimic make/mkdemo/jvmti/mtrace/Makefile)
-
-* Edit make/mkdemo/jvmti/Makefile and add in the new demo
-
-* Create test directory at test/demo/jvmti, create at least one test
- (Use test/demo/jvmti/mtrace as a template)
-
-* Don't forget to check in all the new files
-
-* Build and create images (cd make && gnumake && gnumake images)
- (Do this on Solaris, Linux, and at least one Windows platform)
-
-* Verify that browsing build/*/j2sdk-images/demo/jvmti looks right
-
-* Run the tests: cd test/demo/jvmti && runregress .
- (Do this on Solaris, Linux, and at least one Windows platform)
-
-Contact: serviceability-dev@openjdk.java.net for more information or help.
-
diff --git a/jdk/make/mkdemo/jvmti/compiledMethodLoad/Makefile b/jdk/make/mkdemo/jvmti/compiledMethodLoad/Makefile
deleted file mode 100644
index 955ad68..0000000
--- a/jdk/make/mkdemo/jvmti/compiledMethodLoad/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-PRODUCT = demo/jvmti
-DEMONAME = compiledMethodLoad
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jvmti/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_DESTDIR = $(DEMODIR)/jvmti/$(DEMONAME)
-
-DEMO_OBJECTS = agent_util.$(OBJECT_SUFFIX)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jvmti/gctest/Makefile b/jdk/make/mkdemo/jvmti/gctest/Makefile
deleted file mode 100644
index 537c073..0000000
--- a/jdk/make/mkdemo/jvmti/gctest/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-PRODUCT = demo/jvmti
-DEMONAME = gctest
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jvmti/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_DESTDIR = $(DEMODIR)/jvmti/$(DEMONAME)
-
-DEMO_OBJECTS = agent_util.$(OBJECT_SUFFIX)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jvmti/heapTracker/Makefile b/jdk/make/mkdemo/jvmti/heapTracker/Makefile
deleted file mode 100644
index e58dccc..0000000
--- a/jdk/make/mkdemo/jvmti/heapTracker/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-PRODUCT = demo/jvmti
-DEMONAME = heapTracker
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jvmti/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_DESTDIR = $(DEMODIR)/jvmti/$(DEMONAME)
-
-DEMO_OBJECTS = agent_util.$(OBJECT_SUFFIX) java_crw_demo.$(OBJECT_SUFFIX)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jvmti/heapViewer/Makefile b/jdk/make/mkdemo/jvmti/heapViewer/Makefile
deleted file mode 100644
index 2431f3d..0000000
--- a/jdk/make/mkdemo/jvmti/heapViewer/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-PRODUCT = demo/jvmti
-DEMONAME = heapViewer
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jvmti/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_DESTDIR = $(DEMODIR)/jvmti/$(DEMONAME)
-
-DEMO_OBJECTS = agent_util.$(OBJECT_SUFFIX)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jvmti/hprof/Makefile b/jdk/make/mkdemo/jvmti/hprof/Makefile
deleted file mode 100644
index 29d71b5..0000000
--- a/jdk/make/mkdemo/jvmti/hprof/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-PRODUCT = demo/jvmti
-DEMONAME = hprof
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jvmti/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_PSRCDIR = $(PLATFORM_SRC)/demo/jvmti/$(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/jvmti/$(DEMONAME)
-
-DEMO_OBJECTS = java_crw_demo.$(OBJECT_SUFFIX)
-
-ifeq ($(PLATFORM), windows)
- EXTRA_LIBS += wsock32.lib winmm.lib
-else
- OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBDL)
-ifeq ($(PLATFORM), linux)
- OTHER_LDLIBS += -lpthread
-endif
-endif
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jvmti/mapfile-vers b/jdk/make/mkdemo/jvmti/mapfile-vers
deleted file mode 100644
index 5d57404..0000000
--- a/jdk/make/mkdemo/jvmti/mapfile-vers
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface for a Java JVMTI agent library (Solaris & Linux).
-
-SUNWprivate_1.1 {
- global:
- Agent_OnLoad;
- Agent_OnUnload;
- local:
- *;
-};
diff --git a/jdk/make/mkdemo/jvmti/minst/Makefile b/jdk/make/mkdemo/jvmti/minst/Makefile
deleted file mode 100644
index bc0bd56..0000000
--- a/jdk/make/mkdemo/jvmti/minst/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-PRODUCT = demo/jvmti
-DEMONAME = minst
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jvmti/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_DESTDIR = $(DEMODIR)/jvmti/$(DEMONAME)
-
-DEMO_OBJECTS = agent_util.$(OBJECT_SUFFIX) java_crw_demo.$(OBJECT_SUFFIX)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jvmti/mtrace/Makefile b/jdk/make/mkdemo/jvmti/mtrace/Makefile
deleted file mode 100644
index 6057c96..0000000
--- a/jdk/make/mkdemo/jvmti/mtrace/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-PRODUCT = demo/jvmti
-DEMONAME = mtrace
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jvmti/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_DESTDIR = $(DEMODIR)/jvmti/$(DEMONAME)
-
-DEMO_OBJECTS = agent_util.$(OBJECT_SUFFIX) java_crw_demo.$(OBJECT_SUFFIX)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jvmti/versionCheck/Makefile b/jdk/make/mkdemo/jvmti/versionCheck/Makefile
deleted file mode 100644
index a850ba2..0000000
--- a/jdk/make/mkdemo/jvmti/versionCheck/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-PRODUCT = demo/jvmti
-DEMONAME = versionCheck
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jvmti/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_DESTDIR = $(DEMODIR)/jvmti/$(DEMONAME)
-
-DEMO_OBJECTS = agent_util.$(OBJECT_SUFFIX)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/jvmti/waiters/Makefile b/jdk/make/mkdemo/jvmti/waiters/Makefile
deleted file mode 100644
index dd850b4..0000000
--- a/jdk/make/mkdemo/jvmti/waiters/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-PRODUCT = demo/jvmti
-DEMONAME = waiters
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/jvmti/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_DESTDIR = $(DEMODIR)/jvmti/$(DEMONAME)
-
-DEMO_OBJECTS = agent_util.$(OBJECT_SUFFIX)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/management/FullThreadDump/Makefile b/jdk/make/mkdemo/management/FullThreadDump/Makefile
deleted file mode 100644
index ee8e069..0000000
--- a/jdk/make/mkdemo/management/FullThreadDump/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/management
-DEMONAME = FullThreadDump
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/management/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/management/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/management/JTop/Makefile b/jdk/make/mkdemo/management/JTop/Makefile
deleted file mode 100644
index ef12650..0000000
--- a/jdk/make/mkdemo/management/JTop/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/management
-DEMONAME = JTop
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/management/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/management/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/management/Makefile b/jdk/make/mkdemo/management/Makefile
deleted file mode 100644
index 40ec42c..0000000
--- a/jdk/make/mkdemo/management/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the java.lang.management demo(s)
-#
-
-BUILDDIR = ../..
-PRODUCT = demos
-include $(BUILDDIR)/common/Defs.gmk
-
-# Can be built in any order
-SUBDIRS = FullThreadDump \
- VerboseGC \
- MemoryMonitor \
- JTop
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-all build :: $(DEMODIR)/management/index.html
-
-$(DEMODIR)/management/index.html: $(SHARE_SRC)/demo/management/index.html
- $(install-file)
-
diff --git a/jdk/make/mkdemo/management/MemoryMonitor/Makefile b/jdk/make/mkdemo/management/MemoryMonitor/Makefile
deleted file mode 100644
index cb609d7..0000000
--- a/jdk/make/mkdemo/management/MemoryMonitor/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/management
-DEMONAME = MemoryMonitor
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/management/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/management/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/management/README.txt b/jdk/make/mkdemo/management/README.txt
deleted file mode 100644
index ab667a1..0000000
--- a/jdk/make/mkdemo/management/README.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-Instructions on adding a java.lang.management demo.
-
-Basically you want to mimic the java.lang.management demo "FullThreadDump".
-
-* Create and populate a source directory at src/demo/management
- (This should include a small README.txt document on what this demo is)
-
-* Make sure the appropriate "demo" copyright notice is added to all the
- source files.
-
-* Edit src/share/demo/management/index.html and add in reference to this demo.
-
-* Create make directory at make/mkdemo/management
- (Mimic make/mkdemo/management/FullThreadDump/Makefile)
-
-* Edit make/mkdemo/management/Makefile and add in the new demo
-
-* Create test directory at test/demo/management, create at least one test
- (Use test/demo/management/FullThreadDump as a template)
-
-* Don't forget to put all files under SCM control
-
-* Build and create images (cd make && gnumake && gnumake images)
- (Do this on Solaris, Linux, and at least one Windows platform)
-
-* Verify that browsing build/*/j2sdk-images/demo/management looks right
-
-* Run the tests: cd test/demo/management && runregress .
- (Do this on Solaris, Linux, and at least one Windows platform)
-
-Contact: jk-svc-group@sun.com for more information or help.
-
diff --git a/jdk/make/mkdemo/management/VerboseGC/Makefile b/jdk/make/mkdemo/management/VerboseGC/Makefile
deleted file mode 100644
index 08432b4..0000000
--- a/jdk/make/mkdemo/management/VerboseGC/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/management
-DEMONAME = VerboseGC
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/management/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt
-DEMO_MAINCLASS = $(DEMONAME)
-DEMO_DESTDIR = $(DEMODIR)/management/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mkdemo/nio/Makefile b/jdk/make/mkdemo/nio/Makefile
deleted file mode 100644
index 9bb3b0b..0000000
--- a/jdk/make/mkdemo/nio/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the jfc demos
-#
-
-BUILDDIR = ../..
-PRODUCT = demos
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = zipfs
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/mkdemo/nio/zipfs/Makefile b/jdk/make/mkdemo/nio/zipfs/Makefile
deleted file mode 100644
index 2696c41..0000000
--- a/jdk/make/mkdemo/nio/zipfs/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile to build the ZipFileSystem demo.
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/zipfs
-DEMONAME = zipfs
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/nio/$(DEMONAME)
-DEMO_TOPFILES = README.txt Demo.java
-DEMO_SRCDIR = $(DEMO_ROOT)/src
-DEMO_DESTDIR = $(DEMODIR)/nio/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
-EXTJAR = $(EXTDIR)/$(DEMONAME).jar
-
-all : build $(EXTJAR)
-
-$(EXTJAR) : $(DEMO_JAR)
- $(prep-target)
- $(CP) $(DEMO_JAR) $(EXTJAR)
diff --git a/jdk/make/mkdemo/scripting/Makefile b/jdk/make/mkdemo/scripting/Makefile
deleted file mode 100644
index 0bf3fe7..0000000
--- a/jdk/make/mkdemo/scripting/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the scripting demo(s)
-#
-
-BUILDDIR = ../..
-PRODUCT = demos
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = jconsole-plugin
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/mkdemo/scripting/jconsole-plugin/Makefile b/jdk/make/mkdemo/scripting/jconsole-plugin/Makefile
deleted file mode 100644
index 141ca05..0000000
--- a/jdk/make/mkdemo/scripting/jconsole-plugin/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the jconsole-plugin
-#
-
-BUILDDIR = ../../..
-PRODUCT = demo/scripting
-DEMONAME = jconsole-plugin
-include $(BUILDDIR)/common/Defs.gmk
-
-DEMO_ROOT = $(SHARE_SRC)/demo/scripting/$(DEMONAME)
-DEMO_TOPFILES = ./README.txt ./build.xml
-DEMO_SRCDIR = $(DEMO_ROOT)/src
-DEMO_DESTDIR = $(DEMODIR)/scripting/$(DEMONAME)
-
-#
-# Demo jar building rules.
-#
-include $(BUILDDIR)/common/Demo.gmk
-
diff --git a/jdk/make/mksample/Makefile b/jdk/make/mksample/Makefile
deleted file mode 100644
index b1c93da..0000000
--- a/jdk/make/mksample/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all the samples
-#
-
-BUILDDIR = ..
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-ifdef OPENJDK
- WEBSERVICES_SUBDIR =
-else
- WEBSERVICES_SUBDIR = webservices
-endif
-
-SUBDIRS =
-SUBDIRS_misc = nio scripting nbproject forkjoin
-SUBDIRS_enterprise = $(WEBSERVICES_SUBDIR)
-SUBDIRS_management = jmx
-
-# include dtrace samples in Solaris builds
-ifeq ($(PLATFORM), solaris)
- SUBDIRS += dtrace
-endif
-
-# and Mac OS X too
-ifeq ($(PLATFORM), macosx)
- SUBDIRS += dtrace
-endif
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-TOPLEVEL_FILES = \
- $(SAMPLEDIR)/README
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-all build:: $(TOPLEVEL_FILES)
-
-$(SAMPLEDIR)/%: $(SAMPLESRCDIR)/%
- $(install-file)
-
-clobber clean ::
- $(RM) -r $(SAMPLEDIR)
diff --git a/jdk/make/mksample/dtrace/Makefile b/jdk/make/mksample/dtrace/Makefile
deleted file mode 100644
index 040be7b..0000000
--- a/jdk/make/mksample/dtrace/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for the dtrace sample code
-#
-
-BUILDDIR = ../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(PLATFORM_SRC)/sample/dtrace
-SAMPLE_DST_DIR = $(SAMPLEDIR)/dtrace
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/README.txt \
- $(SAMPLE_DST_DIR)/helpers/dtrace_helper.d \
- $(SAMPLE_DST_DIR)/hotspot_jni/README.txt \
- $(SAMPLE_DST_DIR)/hotspot_jni/CriticalSection.d \
- $(SAMPLE_DST_DIR)/hotspot_jni/CriticalSection_slow.d \
- $(SAMPLE_DST_DIR)/hotspot_jni/hotspot_jni_calls_stat.d \
- $(SAMPLE_DST_DIR)/hotspot_jni/hotspot_jni_calls_tree.d \
- $(SAMPLE_DST_DIR)/hotspot/README.txt \
- $(SAMPLE_DST_DIR)/hotspot/class_loading_stat.d \
- $(SAMPLE_DST_DIR)/hotspot/gc_time_stat.d \
- $(SAMPLE_DST_DIR)/hotspot/hotspot_calls_tree.d \
- $(SAMPLE_DST_DIR)/hotspot/method_compile_stat.d \
- $(SAMPLE_DST_DIR)/hotspot/method_invocation_stat.d \
- $(SAMPLE_DST_DIR)/hotspot/method_invocation_stat_filter.d \
- $(SAMPLE_DST_DIR)/hotspot/method_invocation_tree.d \
- $(SAMPLE_DST_DIR)/hotspot/monitors.d \
- $(SAMPLE_DST_DIR)/hotspot/object_allocation_stat.d
-
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/mksample/forkjoin/Makefile b/jdk/make/mksample/forkjoin/Makefile
deleted file mode 100644
index b9f557a..0000000
--- a/jdk/make/mksample/forkjoin/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all the samples under the forkjoin subdirectory.
-#
-
-BUILDDIR = ../..
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = mergesort
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clobber clean ::
- $(RM) -r $(SAMPLEDIR)/forkjoin
diff --git a/jdk/make/mksample/forkjoin/mergesort/Makefile b/jdk/make/mksample/forkjoin/mergesort/Makefile
deleted file mode 100644
index e611d76..0000000
--- a/jdk/make/mksample/forkjoin/mergesort/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for the forkjoin/mergesort sample code
-#
-
-BUILDDIR = ../../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(SHARE_SRC)/sample/forkjoin/mergesort
-SAMPLE_DST_DIR = $(SAMPLEDIR)/forkjoin/mergesort
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/MergeDemo.java \
- $(SAMPLE_DST_DIR)/MergeSort.java
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/mksample/jmx/Makefile b/jdk/make/mksample/jmx/Makefile
deleted file mode 100644
index 5a2e2ea..0000000
--- a/jdk/make/mksample/jmx/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all the samples under the jmx subdirectory.
-#
-
-BUILDDIR = ../..
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = jmx-scandir
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clobber clean ::
- $(RM) -r $(SAMPLEDIR)/jmx
diff --git a/jdk/make/mksample/jmx/jmx-scandir/Makefile b/jdk/make/mksample/jmx/jmx-scandir/Makefile
deleted file mode 100644
index cb23dc6..0000000
--- a/jdk/make/mksample/jmx/jmx-scandir/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for the nioserver sample code
-#
-
-BUILDDIR = ../../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(SHARE_SRC)/sample/jmx/jmx-scandir
-SAMPLE_DST_DIR = $(SAMPLEDIR)/jmx/jmx-scandir
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/build.xml \
- $(SAMPLE_DST_DIR)/build.properties \
- $(SAMPLE_DST_DIR)/index.html \
- $(SAMPLE_DST_DIR)/keystore \
- $(SAMPLE_DST_DIR)/logging.properties \
- $(SAMPLE_DST_DIR)/manifest.mf \
- $(SAMPLE_DST_DIR)/truststore \
- $(SAMPLE_DST_DIR)/docfiles/connect-local-ant-run.jpg \
- $(SAMPLE_DST_DIR)/docfiles/connect-local-java-jar.jpg \
- $(SAMPLE_DST_DIR)/docfiles/connect-local.jpg \
- $(SAMPLE_DST_DIR)/docfiles/remote-connection-failed.jpg \
- $(SAMPLE_DST_DIR)/docfiles/remote-connection.jpg \
- $(SAMPLE_DST_DIR)/docfiles/scandir-config.jpg \
- $(SAMPLE_DST_DIR)/docfiles/scandir-result.jpg \
- $(SAMPLE_DST_DIR)/docfiles/scandir-start.jpg \
- $(SAMPLE_DST_DIR)/nbproject/file-targets.xml \
- $(SAMPLE_DST_DIR)/nbproject/jdk.xml \
- $(SAMPLE_DST_DIR)/nbproject/netbeans-targets.xml \
- $(SAMPLE_DST_DIR)/nbproject/project.xml \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/DirectoryScanner.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/ResultLogManager.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/ResultLogManagerMXBean.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/ScanDirAgent.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/ScanDirClient.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/ScanDirConfig.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/ScanDirConfigMXBean.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/ScanManager.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/ScanManagerMXBean.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/package.html \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/config/FileMatch.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/config/ResultLogConfig.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/config/ResultRecord.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/config/ScanManagerConfig.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/config/XmlConfigUtils.java \
- $(SAMPLE_DST_DIR)/src/com/sun/jmx/examples/scandir/config/package.html \
- $(SAMPLE_DST_DIR)/src/etc/access.properties \
- $(SAMPLE_DST_DIR)/src/etc/management.properties \
- $(SAMPLE_DST_DIR)/src/etc/password.properties \
- $(SAMPLE_DST_DIR)/src/etc/testconfig.xml \
- $(SAMPLE_DST_DIR)/test/com/sun/jmx/examples/scandir/DirectoryScannerTest.java \
- $(SAMPLE_DST_DIR)/test/com/sun/jmx/examples/scandir/ScanDirConfigTest.java \
- $(SAMPLE_DST_DIR)/test/com/sun/jmx/examples/scandir/ScanManagerTest.java \
- $(SAMPLE_DST_DIR)/test/com/sun/jmx/examples/scandir/TestUtils.java \
- $(SAMPLE_DST_DIR)/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java
-
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/mksample/nbproject/Makefile b/jdk/make/mksample/nbproject/Makefile
deleted file mode 100644
index d280b5d..0000000
--- a/jdk/make/mksample/nbproject/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for the nbproject sample code
-#
-
-BUILDDIR = ../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(SHARE_SRC)/sample/nbproject
-SAMPLE_DST_DIR = $(SAMPLEDIR)/nbproject
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/project.xml \
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/mksample/nio/Makefile b/jdk/make/mksample/nio/Makefile
deleted file mode 100644
index 29123090..0000000
--- a/jdk/make/mksample/nio/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all the samples under the nio subdirectory.
-#
-
-BUILDDIR = ../..
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = chatserver file multicast server
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clobber clean ::
- $(RM) -r $(SAMPLEDIR)/nio
diff --git a/jdk/make/mksample/nio/chatserver/Makefile b/jdk/make/mksample/nio/chatserver/Makefile
deleted file mode 100644
index c2a2430..0000000
--- a/jdk/make/mksample/nio/chatserver/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for the nio/chatserver sample code
-#
-
-BUILDDIR = ../../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(SHARE_SRC)/sample/nio/chatserver
-SAMPLE_DST_DIR = $(SAMPLEDIR)/nio/chatserver
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/ChatServer.java \
- $(SAMPLE_DST_DIR)/Client.java \
- $(SAMPLE_DST_DIR)/ClientReader.java \
- $(SAMPLE_DST_DIR)/DataReader.java \
- $(SAMPLE_DST_DIR)/MessageReader.java \
- $(SAMPLE_DST_DIR)/NameReader.java \
- $(SAMPLE_DST_DIR)/README.txt
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/mksample/nio/file/Makefile b/jdk/make/mksample/nio/file/Makefile
deleted file mode 100644
index 62fcfc2..0000000
--- a/jdk/make/mksample/nio/file/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for the nio/file sample code
-#
-
-BUILDDIR = ../../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(SHARE_SRC)/sample/nio/file
-SAMPLE_DST_DIR = $(SAMPLEDIR)/nio/file
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/AclEdit.java \
- $(SAMPLE_DST_DIR)/Chmod.java \
- $(SAMPLE_DST_DIR)/Copy.java \
- $(SAMPLE_DST_DIR)/DiskUsage.java \
- $(SAMPLE_DST_DIR)/FileType.java \
- $(SAMPLE_DST_DIR)/WatchDir.java \
- $(SAMPLE_DST_DIR)/Xdd.java
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/mksample/nio/multicast/Makefile b/jdk/make/mksample/nio/multicast/Makefile
deleted file mode 100644
index 57c9e30..0000000
--- a/jdk/make/mksample/nio/multicast/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for the nio/multicast sample code
-#
-
-BUILDDIR = ../../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(SHARE_SRC)/sample/nio/multicast
-SAMPLE_DST_DIR = $(SAMPLEDIR)/nio/multicast
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/Reader.java \
- $(SAMPLE_DST_DIR)/Sender.java \
- $(SAMPLE_DST_DIR)/MulticastAddress.java
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/mksample/nio/server/Makefile b/jdk/make/mksample/nio/server/Makefile
deleted file mode 100644
index 14b7f5b..0000000
--- a/jdk/make/mksample/nio/server/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for the nioserver sample code
-#
-
-BUILDDIR = ../../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(SHARE_SRC)/sample/nio/server
-SAMPLE_DST_DIR = $(SAMPLEDIR)/nio/server
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/AcceptHandler.java \
- $(SAMPLE_DST_DIR)/Acceptor.java \
- $(SAMPLE_DST_DIR)/B1.java \
- $(SAMPLE_DST_DIR)/BN.java \
- $(SAMPLE_DST_DIR)/BP.java \
- $(SAMPLE_DST_DIR)/ChannelIO.java \
- $(SAMPLE_DST_DIR)/ChannelIOSecure.java \
- $(SAMPLE_DST_DIR)/Content.java \
- $(SAMPLE_DST_DIR)/Dispatcher.java \
- $(SAMPLE_DST_DIR)/Dispatcher1.java \
- $(SAMPLE_DST_DIR)/DispatcherN.java \
- $(SAMPLE_DST_DIR)/FileContent.java \
- $(SAMPLE_DST_DIR)/Handler.java \
- $(SAMPLE_DST_DIR)/MalformedRequestException.java \
- $(SAMPLE_DST_DIR)/N1.java \
- $(SAMPLE_DST_DIR)/N2.java \
- $(SAMPLE_DST_DIR)/README.txt \
- $(SAMPLE_DST_DIR)/Reply.java \
- $(SAMPLE_DST_DIR)/Request.java \
- $(SAMPLE_DST_DIR)/RequestHandler.java \
- $(SAMPLE_DST_DIR)/RequestServicer.java \
- $(SAMPLE_DST_DIR)/Sendable.java \
- $(SAMPLE_DST_DIR)/Server.java \
- $(SAMPLE_DST_DIR)/StringContent.java \
- $(SAMPLE_DST_DIR)/URLDumper.java
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/mksample/scripting/Makefile b/jdk/make/mksample/scripting/Makefile
deleted file mode 100644
index 96a096e..0000000
--- a/jdk/make/mksample/scripting/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all the samples under the scripting subdirectory.
-#
-
-BUILDDIR = ../..
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = scriptpad
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clobber clean ::
- $(RM) -r $(SAMPLEDIR)/scripting
diff --git a/jdk/make/mksample/scripting/scriptpad/Makefile b/jdk/make/mksample/scripting/scriptpad/Makefile
deleted file mode 100644
index bc641c0..0000000
--- a/jdk/make/mksample/scripting/scriptpad/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for the scriptpad sample code
-#
-
-BUILDDIR = ../../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(SHARE_SRC)/sample/scripting/scriptpad
-SAMPLE_DST_DIR = $(SAMPLEDIR)/scripting/scriptpad
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/build.xml \
- $(SAMPLE_DST_DIR)/build.properties \
- $(SAMPLE_DST_DIR)/README.txt \
- $(SAMPLE_DST_DIR)/nbproject/file-targets.xml \
- $(SAMPLE_DST_DIR)/nbproject/jdk.xml \
- $(SAMPLE_DST_DIR)/nbproject/netbeans-targets.xml \
- $(SAMPLE_DST_DIR)/nbproject/project.xml \
- $(SAMPLE_DST_DIR)/src/com/sun/sample/scriptpad/Main.java \
- $(SAMPLE_DST_DIR)/src/META-INF/manifest.mf \
- $(SAMPLE_DST_DIR)/src/resources/conc.js \
- $(SAMPLE_DST_DIR)/src/resources/gui.js \
- $(SAMPLE_DST_DIR)/src/resources/Main.js \
- $(SAMPLE_DST_DIR)/src/resources/mm.js \
- $(SAMPLE_DST_DIR)/src/resources/scriptpad.js \
- $(SAMPLE_DST_DIR)/src/scripts/browse.js \
- $(SAMPLE_DST_DIR)/src/scripts/insertfile.js \
- $(SAMPLE_DST_DIR)/src/scripts/linewrap.js \
- $(SAMPLE_DST_DIR)/src/scripts/mail.js \
- $(SAMPLE_DST_DIR)/src/scripts/memmonitor.js \
- $(SAMPLE_DST_DIR)/src/scripts/memory.bat \
- $(SAMPLE_DST_DIR)/src/scripts/memory.sh \
- $(SAMPLE_DST_DIR)/src/scripts/memory.js \
- $(SAMPLE_DST_DIR)/src/scripts/README.txt \
- $(SAMPLE_DST_DIR)/src/scripts/textcolor.js
-
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/mksample/webservices/EbayClient/Makefile b/jdk/make/mksample/webservices/EbayClient/Makefile
deleted file mode 100644
index ac3d931..0000000
--- a/jdk/make/mksample/webservices/EbayClient/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for the EbayClient sample code
-#
-
-BUILDDIR = ../../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(CLOSED_SHARE_SRC)/sample/webservices/EbayClient
-SAMPLE_DST_DIR = $(SAMPLEDIR)/webservices/EbayClient
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/src/ebay/client/MainGUIApp.java \
- $(SAMPLE_DST_DIR)/src/ebay/client/ViewItemDetails.java \
- $(SAMPLE_DST_DIR)/src/ebay/client/handler/RequesterCredentials.java \
- $(SAMPLE_DST_DIR)/build.xml \
- $(SAMPLE_DST_DIR)/build.properties \
- $(SAMPLE_DST_DIR)/eBaySvc.wsdl \
- $(SAMPLE_DST_DIR)/ebay.properties \
- $(SAMPLE_DST_DIR)/jax-ws-catalog.xml \
- $(SAMPLE_DST_DIR)/manifest.mf \
- $(SAMPLE_DST_DIR)/index.html \
- $(SAMPLE_DST_DIR)/nbproject/file-targets.xml \
- $(SAMPLE_DST_DIR)/nbproject/project.xml \
- $(SAMPLE_DST_DIR)/nbproject/jdk.xml \
- $(SAMPLE_DST_DIR)/nbproject/netbeans-targets.xml \
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/mksample/webservices/EbayServer/Makefile b/jdk/make/mksample/webservices/EbayServer/Makefile
deleted file mode 100644
index a3ece43..0000000
--- a/jdk/make/mksample/webservices/EbayServer/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for the EbayServer sample code
-#
-
-BUILDDIR = ../../..
-
-PRODUCT = java
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SAMPLE_SRC_DIR = $(CLOSED_SHARE_SRC)/sample/webservices/EbayServer
-SAMPLE_DST_DIR = $(SAMPLEDIR)/webservices/EbayServer
-
-SAMPLE_FILES = \
- $(SAMPLE_DST_DIR)/src/ebay/server/Main.java \
- $(SAMPLE_DST_DIR)/src/ebay/server/Ebay.java \
- $(SAMPLE_DST_DIR)/src/ebay/server/ImageProvider.java \
- $(SAMPLE_DST_DIR)/build.xml \
- $(SAMPLE_DST_DIR)/build.properties \
- $(SAMPLE_DST_DIR)/eBaySvc.wsdl \
- $(SAMPLE_DST_DIR)/manifest.mf \
- $(SAMPLE_DST_DIR)/index.html \
- $(SAMPLE_DST_DIR)/nbproject/project.xml \
- $(SAMPLE_DST_DIR)/nbproject/jdk.xml \
- $(SAMPLE_DST_DIR)/nbproject/netbeans-targets.xml \
- $(SAMPLE_DST_DIR)/nbproject/file-targets.xml \
- $(SAMPLE_DST_DIR)/images/8d_2.jpg \
- $(SAMPLE_DST_DIR)/images/sun_blade_1000_h400px.jpg \
- $(SAMPLE_DST_DIR)/images/Sun_Fire_E20K_Server.jpg \
-
-all build: $(SAMPLE_FILES)
-
-$(SAMPLE_DST_DIR)/%: $(SAMPLE_SRC_DIR)/%
- $(install-file)
-
-clean clobber:
- $(RM) -r $(SAMPLE_DST_DIR)
-
-.PHONY: all build clean clobber
diff --git a/jdk/make/mksample/webservices/Makefile b/jdk/make/mksample/webservices/Makefile
deleted file mode 100644
index bb26fd9..0000000
--- a/jdk/make/mksample/webservices/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all the samples under the webservices subdirectory.
-#
-
-BUILDDIR = ../..
-PRODUCT = java
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = EbayClient EbayServer
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clobber clean ::
- $(RM) -r $(SAMPLEDIR)/webservices
diff --git a/jdk/make/netbeans/jdwpgen/nbproject/project.properties b/jdk/make/netbeans/jdwpgen/nbproject/project.properties
index 19b2cff..3cc3b8f 100644
--- a/jdk/make/netbeans/jdwpgen/nbproject/project.properties
+++ b/jdk/make/netbeans/jdwpgen/nbproject/project.properties
@@ -20,8 +20,8 @@
dist.jar=${dist.dir}/jdwpgen.jar
dist.javadoc.dir=${dist.dir}/javadoc
excludes=
-file.reference.tools-jdwpgen=../../tools/src/build/tools/jdwpgen
-file.reference.tools-src=../../tools/src
+file.reference.tools-jdwpgen=../../src/classes/build/tools/jdwpgen
+file.reference.tools-src=../../src/classes
includes=build/tools/jdwpgen/**
jar.compress=false
javac.classpath=
diff --git a/jdk/make/tools/reorder/Makefile b/jdk/make/non-build-utils/reorder/Makefile
similarity index 100%
rename from jdk/make/tools/reorder/Makefile
rename to jdk/make/non-build-utils/reorder/Makefile
diff --git a/jdk/make/tools/reorder/tests/Exit.java b/jdk/make/non-build-utils/reorder/tests/Exit.java
similarity index 100%
rename from jdk/make/tools/reorder/tests/Exit.java
rename to jdk/make/non-build-utils/reorder/tests/Exit.java
diff --git a/jdk/make/tools/reorder/tests/Hello.java b/jdk/make/non-build-utils/reorder/tests/Hello.java
similarity index 100%
rename from jdk/make/tools/reorder/tests/Hello.java
rename to jdk/make/non-build-utils/reorder/tests/Hello.java
diff --git a/jdk/make/tools/reorder/tests/IntToString.java b/jdk/make/non-build-utils/reorder/tests/IntToString.java
similarity index 100%
rename from jdk/make/tools/reorder/tests/IntToString.java
rename to jdk/make/non-build-utils/reorder/tests/IntToString.java
diff --git a/jdk/make/tools/reorder/tests/JHello.java b/jdk/make/non-build-utils/reorder/tests/JHello.java
similarity index 100%
rename from jdk/make/tools/reorder/tests/JHello.java
rename to jdk/make/non-build-utils/reorder/tests/JHello.java
diff --git a/jdk/make/tools/reorder/tests/LoadFrame.java b/jdk/make/non-build-utils/reorder/tests/LoadFrame.java
similarity index 100%
rename from jdk/make/tools/reorder/tests/LoadFrame.java
rename to jdk/make/non-build-utils/reorder/tests/LoadFrame.java
diff --git a/jdk/make/tools/reorder/tests/LoadJFrame.java b/jdk/make/non-build-utils/reorder/tests/LoadJFrame.java
similarity index 100%
rename from jdk/make/tools/reorder/tests/LoadJFrame.java
rename to jdk/make/non-build-utils/reorder/tests/LoadJFrame.java
diff --git a/jdk/make/tools/reorder/tests/LoadToolkit.java b/jdk/make/non-build-utils/reorder/tests/LoadToolkit.java
similarity index 100%
rename from jdk/make/tools/reorder/tests/LoadToolkit.java
rename to jdk/make/non-build-utils/reorder/tests/LoadToolkit.java
diff --git a/jdk/make/tools/reorder/tests/Null.java b/jdk/make/non-build-utils/reorder/tests/Null.java
similarity index 100%
rename from jdk/make/tools/reorder/tests/Null.java
rename to jdk/make/non-build-utils/reorder/tests/Null.java
diff --git a/jdk/make/tools/reorder/tests/Sleep.java b/jdk/make/non-build-utils/reorder/tests/Sleep.java
similarity index 100%
rename from jdk/make/tools/reorder/tests/Sleep.java
rename to jdk/make/non-build-utils/reorder/tests/Sleep.java
diff --git a/jdk/make/tools/reorder/tools/Combine.java b/jdk/make/non-build-utils/reorder/tools/Combine.java
similarity index 100%
rename from jdk/make/tools/reorder/tools/Combine.java
rename to jdk/make/non-build-utils/reorder/tools/Combine.java
diff --git a/jdk/make/tools/reorder/tools/MaxTime.java b/jdk/make/non-build-utils/reorder/tools/MaxTime.java
similarity index 100%
rename from jdk/make/tools/reorder/tools/MaxTime.java
rename to jdk/make/non-build-utils/reorder/tools/MaxTime.java
diff --git a/jdk/make/tools/reorder/tools/mcount.c b/jdk/make/non-build-utils/reorder/tools/mcount.c
similarity index 100%
rename from jdk/make/tools/reorder/tools/mcount.c
rename to jdk/make/non-build-utils/reorder/tools/mcount.c
diff --git a/jdk/make/tools/reorder/tools/remove_mcount.c b/jdk/make/non-build-utils/reorder/tools/remove_mcount.c
similarity index 100%
rename from jdk/make/tools/reorder/tools/remove_mcount.c
rename to jdk/make/non-build-utils/reorder/tools/remove_mcount.c
diff --git a/jdk/make/tools/reorder/tools/util-i586.il b/jdk/make/non-build-utils/reorder/tools/util-i586.il
similarity index 100%
rename from jdk/make/tools/reorder/tools/util-i586.il
rename to jdk/make/non-build-utils/reorder/tools/util-i586.il
diff --git a/jdk/make/tools/reorder/tools/util-sparc.il b/jdk/make/non-build-utils/reorder/tools/util-sparc.il
similarity index 100%
rename from jdk/make/tools/reorder/tools/util-sparc.il
rename to jdk/make/non-build-utils/reorder/tools/util-sparc.il
diff --git a/jdk/make/tools/reorder/tools/util-sparcv9.il b/jdk/make/non-build-utils/reorder/tools/util-sparcv9.il
similarity index 100%
rename from jdk/make/tools/reorder/tools/util-sparcv9.il
rename to jdk/make/non-build-utils/reorder/tools/util-sparcv9.il
diff --git a/jdk/make/tools/sharing/README.txt b/jdk/make/non-build-utils/sharing/README.txt
similarity index 100%
rename from jdk/make/tools/sharing/README.txt
rename to jdk/make/non-build-utils/sharing/README.txt
diff --git a/jdk/make/tools/sharing/tests/GHello.java b/jdk/make/non-build-utils/sharing/tests/GHello.java
similarity index 100%
rename from jdk/make/tools/sharing/tests/GHello.java
rename to jdk/make/non-build-utils/sharing/tests/GHello.java
diff --git a/jdk/make/tools/sharing/tests/Hello.java b/jdk/make/non-build-utils/sharing/tests/Hello.java
similarity index 100%
rename from jdk/make/tools/sharing/tests/Hello.java
rename to jdk/make/non-build-utils/sharing/tests/Hello.java
diff --git a/jdk/make/tools/sharing/tests/JHello.java b/jdk/make/non-build-utils/sharing/tests/JHello.java
similarity index 100%
rename from jdk/make/tools/sharing/tests/JHello.java
rename to jdk/make/non-build-utils/sharing/tests/JHello.java
diff --git a/jdk/make/tools/src/build/tools/commentchecker/CommentChecker.java b/jdk/make/non-build-utils/src/build/tools/commentchecker/CommentChecker.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/commentchecker/CommentChecker.java
rename to jdk/make/non-build-utils/src/build/tools/commentchecker/CommentChecker.java
diff --git a/jdk/make/tools/src/build/tools/dirdiff/DirDiff.java b/jdk/make/non-build-utils/src/build/tools/dirdiff/DirDiff.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/dirdiff/DirDiff.java
rename to jdk/make/non-build-utils/src/build/tools/dirdiff/DirDiff.java
diff --git a/jdk/make/tools/src/build/tools/makeclasslist/MakeClasslist.java b/jdk/make/non-build-utils/src/build/tools/makeclasslist/MakeClasslist.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/makeclasslist/MakeClasslist.java
rename to jdk/make/non-build-utils/src/build/tools/makeclasslist/MakeClasslist.java
diff --git a/jdk/make/org/Makefile b/jdk/make/org/Makefile
deleted file mode 100644
index 19e7251..0000000
--- a/jdk/make/org/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of java
-#
-
-BUILDDIR = ..
-PRODUCT = org
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = ietf jcp
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
diff --git a/jdk/make/org/ietf/Makefile b/jdk/make/org/ietf/Makefile
deleted file mode 100644
index 175d0cf..0000000
--- a/jdk/make/org/ietf/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building Java GSS-API API classes
-#
-
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = jgss
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/org/ietf/jgss/FILES_java.gmk b/jdk/make/org/ietf/jgss/FILES_java.gmk
deleted file mode 100644
index d96eaa5..0000000
--- a/jdk/make/org/ietf/jgss/FILES_java.gmk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_java = \
- org/ietf/jgss/Oid.java \
- org/ietf/jgss/GSSName.java \
- org/ietf/jgss/GSSManager.java \
- org/ietf/jgss/ChannelBinding.java \
- org/ietf/jgss/GSSException.java \
- org/ietf/jgss/MessageProp.java \
- org/ietf/jgss/GSSContext.java \
- org/ietf/jgss/GSSCredential.java
diff --git a/jdk/make/org/ietf/jgss/Makefile b/jdk/make/org/ietf/jgss/Makefile
deleted file mode 100644
index 6c4f0d0..0000000
--- a/jdk/make/org/ietf/jgss/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = org.ietf.jgss
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_java.gmk
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/org/jcp/Makefile b/jdk/make/org/jcp/Makefile
deleted file mode 100644
index 0a171a7..0000000
--- a/jdk/make/org/jcp/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building packages under org.jcp
-#
-
-BUILDDIR = ../..
-PACKAGE = org.jcp
-PRODUCT = jcp
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = org/jcp
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/makefiles/profile-includes.txt b/jdk/make/profile-includes.txt
similarity index 100%
rename from jdk/makefiles/profile-includes.txt
rename to jdk/make/profile-includes.txt
diff --git a/jdk/makefiles/profile-rtjar-includes.txt b/jdk/make/profile-rtjar-includes.txt
similarity index 100%
rename from jdk/makefiles/profile-rtjar-includes.txt
rename to jdk/make/profile-rtjar-includes.txt
diff --git a/jdk/makefiles/scripts/addNotices.sh b/jdk/make/scripts/addNotices.sh
similarity index 100%
rename from jdk/makefiles/scripts/addNotices.sh
rename to jdk/make/scripts/addNotices.sh
diff --git a/jdk/makefiles/scripts/genCharsetProvider.sh b/jdk/make/scripts/genCharsetProvider.sh
similarity index 100%
rename from jdk/makefiles/scripts/genCharsetProvider.sh
rename to jdk/make/scripts/genCharsetProvider.sh
diff --git a/jdk/makefiles/scripts/genExceptions.sh b/jdk/make/scripts/genExceptions.sh
similarity index 100%
rename from jdk/makefiles/scripts/genExceptions.sh
rename to jdk/make/scripts/genExceptions.sh
diff --git a/jdk/makefiles/scripts/localelist.sh b/jdk/make/scripts/localelist.sh
similarity index 100%
rename from jdk/makefiles/scripts/localelist.sh
rename to jdk/make/scripts/localelist.sh
diff --git a/jdk/make/tools/src/build/tools/addjsum/AddJsum.java b/jdk/make/src/classes/build/tools/addjsum/AddJsum.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/addjsum/AddJsum.java
rename to jdk/make/src/classes/build/tools/addjsum/AddJsum.java
diff --git a/jdk/make/tools/src/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java b/jdk/make/src/classes/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java
rename to jdk/make/src/classes/build/tools/addtorestrictedpkgs/AddToRestrictedPkgs.java
diff --git a/jdk/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java b/jdk/make/src/classes/build/tools/buildmetaindex/BuildMetaIndex.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java
rename to jdk/make/src/classes/build/tools/buildmetaindex/BuildMetaIndex.java
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/DBCS.java b/jdk/make/src/classes/build/tools/charsetmapping/DBCS.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/charsetmapping/DBCS.java
rename to jdk/make/src/classes/build/tools/charsetmapping/DBCS.java
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/EUC_TW.java b/jdk/make/src/classes/build/tools/charsetmapping/EUC_TW.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/charsetmapping/EUC_TW.java
rename to jdk/make/src/classes/build/tools/charsetmapping/EUC_TW.java
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/HKSCS.java b/jdk/make/src/classes/build/tools/charsetmapping/HKSCS.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/charsetmapping/HKSCS.java
rename to jdk/make/src/classes/build/tools/charsetmapping/HKSCS.java
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/JIS0213.java b/jdk/make/src/classes/build/tools/charsetmapping/JIS0213.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/charsetmapping/JIS0213.java
rename to jdk/make/src/classes/build/tools/charsetmapping/JIS0213.java
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/Main.java b/jdk/make/src/classes/build/tools/charsetmapping/Main.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/charsetmapping/Main.java
rename to jdk/make/src/classes/build/tools/charsetmapping/Main.java
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/SBCS.java b/jdk/make/src/classes/build/tools/charsetmapping/SBCS.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/charsetmapping/SBCS.java
rename to jdk/make/src/classes/build/tools/charsetmapping/SBCS.java
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/Utils.java b/jdk/make/src/classes/build/tools/charsetmapping/Utils.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/charsetmapping/Utils.java
rename to jdk/make/src/classes/build/tools/charsetmapping/Utils.java
diff --git a/jdk/make/tools/src/build/tools/classfile/RemoveMethods.java b/jdk/make/src/classes/build/tools/classfile/RemoveMethods.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/classfile/RemoveMethods.java
rename to jdk/make/src/classes/build/tools/classfile/RemoveMethods.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/AbstractLDMLHandler.java b/jdk/make/src/classes/build/tools/cldrconverter/AbstractLDMLHandler.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/AbstractLDMLHandler.java
rename to jdk/make/src/classes/build/tools/cldrconverter/AbstractLDMLHandler.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/Bundle.java b/jdk/make/src/classes/build/tools/cldrconverter/Bundle.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/Bundle.java
rename to jdk/make/src/classes/build/tools/cldrconverter/Bundle.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/BundleGenerator.java b/jdk/make/src/classes/build/tools/cldrconverter/BundleGenerator.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/BundleGenerator.java
rename to jdk/make/src/classes/build/tools/cldrconverter/BundleGenerator.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/CLDRConverter.java b/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/CLDRConverter.java
rename to jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/CalendarType.java b/jdk/make/src/classes/build/tools/cldrconverter/CalendarType.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/CalendarType.java
rename to jdk/make/src/classes/build/tools/cldrconverter/CalendarType.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/Container.java b/jdk/make/src/classes/build/tools/cldrconverter/Container.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/Container.java
rename to jdk/make/src/classes/build/tools/cldrconverter/Container.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/CopyrightHeaders.java b/jdk/make/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/CopyrightHeaders.java
rename to jdk/make/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/Entry.java b/jdk/make/src/classes/build/tools/cldrconverter/Entry.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/Entry.java
rename to jdk/make/src/classes/build/tools/cldrconverter/Entry.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/IgnoredContainer.java b/jdk/make/src/classes/build/tools/cldrconverter/IgnoredContainer.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/IgnoredContainer.java
rename to jdk/make/src/classes/build/tools/cldrconverter/IgnoredContainer.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/KeyContainer.java b/jdk/make/src/classes/build/tools/cldrconverter/KeyContainer.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/KeyContainer.java
rename to jdk/make/src/classes/build/tools/cldrconverter/KeyContainer.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/LDMLParseHandler.java b/jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/LDMLParseHandler.java
rename to jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/MetaZonesParseHandler.java b/jdk/make/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/MetaZonesParseHandler.java
rename to jdk/make/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/NumberingSystemsParseHandler.java b/jdk/make/src/classes/build/tools/cldrconverter/NumberingSystemsParseHandler.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/NumberingSystemsParseHandler.java
rename to jdk/make/src/classes/build/tools/cldrconverter/NumberingSystemsParseHandler.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/ResourceBundleGenerator.java b/jdk/make/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/ResourceBundleGenerator.java
rename to jdk/make/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/StringArrayElement.java b/jdk/make/src/classes/build/tools/cldrconverter/StringArrayElement.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/StringArrayElement.java
rename to jdk/make/src/classes/build/tools/cldrconverter/StringArrayElement.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/StringArrayEntry.java b/jdk/make/src/classes/build/tools/cldrconverter/StringArrayEntry.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/StringArrayEntry.java
rename to jdk/make/src/classes/build/tools/cldrconverter/StringArrayEntry.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/StringEntry.java b/jdk/make/src/classes/build/tools/cldrconverter/StringEntry.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/StringEntry.java
rename to jdk/make/src/classes/build/tools/cldrconverter/StringEntry.java
diff --git a/jdk/make/tools/src/build/tools/cldrconverter/SupplementDataParseHandler.java b/jdk/make/src/classes/build/tools/cldrconverter/SupplementDataParseHandler.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/cldrconverter/SupplementDataParseHandler.java
rename to jdk/make/src/classes/build/tools/cldrconverter/SupplementDataParseHandler.java
diff --git a/jdk/make/tools/src/build/tools/compilefontconfig/CompileFontConfig.java b/jdk/make/src/classes/build/tools/compilefontconfig/CompileFontConfig.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/compilefontconfig/CompileFontConfig.java
rename to jdk/make/src/classes/build/tools/compilefontconfig/CompileFontConfig.java
diff --git a/jdk/make/tools/src/build/tools/compileproperties/CompileProperties.java b/jdk/make/src/classes/build/tools/compileproperties/CompileProperties.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/compileproperties/CompileProperties.java
rename to jdk/make/src/classes/build/tools/compileproperties/CompileProperties.java
diff --git a/jdk/make/tools/src/build/tools/deps/CheckDeps.java b/jdk/make/src/classes/build/tools/deps/CheckDeps.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/deps/CheckDeps.java
rename to jdk/make/src/classes/build/tools/deps/CheckDeps.java
diff --git a/jdk/make/tools/src/build/tools/dtdbuilder/DTDBuilder.java b/jdk/make/src/classes/build/tools/dtdbuilder/DTDBuilder.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/dtdbuilder/DTDBuilder.java
rename to jdk/make/src/classes/build/tools/dtdbuilder/DTDBuilder.java
diff --git a/jdk/make/tools/src/build/tools/dtdbuilder/DTDInputStream.java b/jdk/make/src/classes/build/tools/dtdbuilder/DTDInputStream.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/dtdbuilder/DTDInputStream.java
rename to jdk/make/src/classes/build/tools/dtdbuilder/DTDInputStream.java
diff --git a/jdk/make/tools/src/build/tools/dtdbuilder/DTDParser.java b/jdk/make/src/classes/build/tools/dtdbuilder/DTDParser.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/dtdbuilder/DTDParser.java
rename to jdk/make/src/classes/build/tools/dtdbuilder/DTDParser.java
diff --git a/jdk/make/tools/src/build/tools/dtdbuilder/PublicMapping.java b/jdk/make/src/classes/build/tools/dtdbuilder/PublicMapping.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/dtdbuilder/PublicMapping.java
rename to jdk/make/src/classes/build/tools/dtdbuilder/PublicMapping.java
diff --git a/jdk/make/tools/src/build/tools/dtdbuilder/README.txt b/jdk/make/src/classes/build/tools/dtdbuilder/README.txt
similarity index 100%
rename from jdk/make/tools/src/build/tools/dtdbuilder/README.txt
rename to jdk/make/src/classes/build/tools/dtdbuilder/README.txt
diff --git a/jdk/make/tools/src/build/tools/generatebreakiteratordata/BreakIteratorRBControl.java b/jdk/make/src/classes/build/tools/generatebreakiteratordata/BreakIteratorRBControl.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatebreakiteratordata/BreakIteratorRBControl.java
rename to jdk/make/src/classes/build/tools/generatebreakiteratordata/BreakIteratorRBControl.java
diff --git a/jdk/make/tools/src/build/tools/generatebreakiteratordata/CharSet.java b/jdk/make/src/classes/build/tools/generatebreakiteratordata/CharSet.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatebreakiteratordata/CharSet.java
rename to jdk/make/src/classes/build/tools/generatebreakiteratordata/CharSet.java
diff --git a/jdk/make/tools/src/build/tools/generatebreakiteratordata/CharacterCategory.java b/jdk/make/src/classes/build/tools/generatebreakiteratordata/CharacterCategory.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatebreakiteratordata/CharacterCategory.java
rename to jdk/make/src/classes/build/tools/generatebreakiteratordata/CharacterCategory.java
diff --git a/jdk/make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java b/jdk/make/src/classes/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java
rename to jdk/make/src/classes/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java
diff --git a/jdk/make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java b/jdk/make/src/classes/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java
rename to jdk/make/src/classes/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java
diff --git a/jdk/make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java b/jdk/make/src/classes/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java
rename to jdk/make/src/classes/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java
diff --git a/jdk/make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java b/jdk/make/src/classes/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java
rename to jdk/make/src/classes/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java
diff --git a/jdk/make/tools/src/build/tools/generatecharacter/CharacterName.java b/jdk/make/src/classes/build/tools/generatecharacter/CharacterName.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatecharacter/CharacterName.java
rename to jdk/make/src/classes/build/tools/generatecharacter/CharacterName.java
diff --git a/jdk/make/tools/src/build/tools/generatecharacter/CharacterScript.java b/jdk/make/src/classes/build/tools/generatecharacter/CharacterScript.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatecharacter/CharacterScript.java
rename to jdk/make/src/classes/build/tools/generatecharacter/CharacterScript.java
diff --git a/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java b/jdk/make/src/classes/build/tools/generatecharacter/GenerateCharacter.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
rename to jdk/make/src/classes/build/tools/generatecharacter/GenerateCharacter.java
diff --git a/jdk/make/tools/src/build/tools/generatecharacter/PrintCharacterRanges.java b/jdk/make/src/classes/build/tools/generatecharacter/PrintCharacterRanges.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatecharacter/PrintCharacterRanges.java
rename to jdk/make/src/classes/build/tools/generatecharacter/PrintCharacterRanges.java
diff --git a/jdk/make/tools/src/build/tools/generatecharacter/PropList.java b/jdk/make/src/classes/build/tools/generatecharacter/PropList.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatecharacter/PropList.java
rename to jdk/make/src/classes/build/tools/generatecharacter/PropList.java
diff --git a/jdk/make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java b/jdk/make/src/classes/build/tools/generatecharacter/SpecialCaseMap.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java
rename to jdk/make/src/classes/build/tools/generatecharacter/SpecialCaseMap.java
diff --git a/jdk/make/tools/src/build/tools/generatecharacter/UnicodeSpec.java b/jdk/make/src/classes/build/tools/generatecharacter/UnicodeSpec.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatecharacter/UnicodeSpec.java
rename to jdk/make/src/classes/build/tools/generatecharacter/UnicodeSpec.java
diff --git a/jdk/make/tools/src/build/tools/generatecharacter/Utility.java b/jdk/make/src/classes/build/tools/generatecharacter/Utility.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatecharacter/Utility.java
rename to jdk/make/src/classes/build/tools/generatecharacter/Utility.java
diff --git a/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java b/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
rename to jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/AbstractGradient.java b/jdk/make/src/classes/build/tools/generatenimbus/AbstractGradient.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/AbstractGradient.java
rename to jdk/make/src/classes/build/tools/generatenimbus/AbstractGradient.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Border.java b/jdk/make/src/classes/build/tools/generatenimbus/Border.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Border.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Border.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Canvas.java b/jdk/make/src/classes/build/tools/generatenimbus/Canvas.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Canvas.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Canvas.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/ComponentColor.java b/jdk/make/src/classes/build/tools/generatenimbus/ComponentColor.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/ComponentColor.java
rename to jdk/make/src/classes/build/tools/generatenimbus/ComponentColor.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Dimension.java b/jdk/make/src/classes/build/tools/generatenimbus/Dimension.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Dimension.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Dimension.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Ellipse.java b/jdk/make/src/classes/build/tools/generatenimbus/Ellipse.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Ellipse.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Ellipse.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Generator.java b/jdk/make/src/classes/build/tools/generatenimbus/Generator.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Generator.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Generator.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Gradient.java b/jdk/make/src/classes/build/tools/generatenimbus/Gradient.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Gradient.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Gradient.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/GradientStop.java b/jdk/make/src/classes/build/tools/generatenimbus/GradientStop.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/GradientStop.java
rename to jdk/make/src/classes/build/tools/generatenimbus/GradientStop.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Insets.java b/jdk/make/src/classes/build/tools/generatenimbus/Insets.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Insets.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Insets.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Layer.java b/jdk/make/src/classes/build/tools/generatenimbus/Layer.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Layer.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Layer.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Matte.java b/jdk/make/src/classes/build/tools/generatenimbus/Matte.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Matte.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Matte.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/ObjectFactory.java b/jdk/make/src/classes/build/tools/generatenimbus/ObjectFactory.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/ObjectFactory.java
rename to jdk/make/src/classes/build/tools/generatenimbus/ObjectFactory.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Paint.java b/jdk/make/src/classes/build/tools/generatenimbus/Paint.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Paint.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Paint.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/PainterGenerator.java b/jdk/make/src/classes/build/tools/generatenimbus/PainterGenerator.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/PainterGenerator.java
rename to jdk/make/src/classes/build/tools/generatenimbus/PainterGenerator.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Path.java b/jdk/make/src/classes/build/tools/generatenimbus/Path.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Path.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Path.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Point.java b/jdk/make/src/classes/build/tools/generatenimbus/Point.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Point.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Point.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/RadialGradient.java b/jdk/make/src/classes/build/tools/generatenimbus/RadialGradient.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/RadialGradient.java
rename to jdk/make/src/classes/build/tools/generatenimbus/RadialGradient.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Rectangle.java b/jdk/make/src/classes/build/tools/generatenimbus/Rectangle.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Rectangle.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Rectangle.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Shape.java b/jdk/make/src/classes/build/tools/generatenimbus/Shape.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Shape.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Shape.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/SynthModel.java b/jdk/make/src/classes/build/tools/generatenimbus/SynthModel.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/SynthModel.java
rename to jdk/make/src/classes/build/tools/generatenimbus/SynthModel.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Typeface.java b/jdk/make/src/classes/build/tools/generatenimbus/Typeface.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Typeface.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Typeface.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIColor.java b/jdk/make/src/classes/build/tools/generatenimbus/UIColor.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/UIColor.java
rename to jdk/make/src/classes/build/tools/generatenimbus/UIColor.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIComponent.java b/jdk/make/src/classes/build/tools/generatenimbus/UIComponent.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/UIComponent.java
rename to jdk/make/src/classes/build/tools/generatenimbus/UIComponent.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIDefault.java b/jdk/make/src/classes/build/tools/generatenimbus/UIDefault.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/UIDefault.java
rename to jdk/make/src/classes/build/tools/generatenimbus/UIDefault.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIFont.java b/jdk/make/src/classes/build/tools/generatenimbus/UIFont.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/UIFont.java
rename to jdk/make/src/classes/build/tools/generatenimbus/UIFont.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIIconRegion.java b/jdk/make/src/classes/build/tools/generatenimbus/UIIconRegion.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/UIIconRegion.java
rename to jdk/make/src/classes/build/tools/generatenimbus/UIIconRegion.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIProperty.java b/jdk/make/src/classes/build/tools/generatenimbus/UIProperty.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/UIProperty.java
rename to jdk/make/src/classes/build/tools/generatenimbus/UIProperty.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIRegion.java b/jdk/make/src/classes/build/tools/generatenimbus/UIRegion.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/UIRegion.java
rename to jdk/make/src/classes/build/tools/generatenimbus/UIRegion.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIState.java b/jdk/make/src/classes/build/tools/generatenimbus/UIState.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/UIState.java
rename to jdk/make/src/classes/build/tools/generatenimbus/UIState.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIStateType.java b/jdk/make/src/classes/build/tools/generatenimbus/UIStateType.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/UIStateType.java
rename to jdk/make/src/classes/build/tools/generatenimbus/UIStateType.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIStyle.java b/jdk/make/src/classes/build/tools/generatenimbus/UIStyle.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/UIStyle.java
rename to jdk/make/src/classes/build/tools/generatenimbus/UIStyle.java
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Utils.java b/jdk/make/src/classes/build/tools/generatenimbus/Utils.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/generatenimbus/Utils.java
rename to jdk/make/src/classes/build/tools/generatenimbus/Utils.java
diff --git a/jdk/make/tools/src/build/tools/hasher/Hasher.java b/jdk/make/src/classes/build/tools/hasher/Hasher.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/hasher/Hasher.java
rename to jdk/make/src/classes/build/tools/hasher/Hasher.java
diff --git a/jdk/make/src/classes/build/tools/icondata/awt/ToBin.java b/jdk/make/src/classes/build/tools/icondata/awt/ToBin.java
new file mode 100644
index 0000000..0fb3846
--- /dev/null
+++ b/jdk/make/src/classes/build/tools/icondata/awt/ToBin.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package build.tools.icondata.awt;
+
+import java.io.*;
+import java.awt.image.*;
+import javax.imageio.*;
+import java.awt.*;
+
+public class ToBin {
+ public static void main(String[] args) throws Exception {
+ BufferedImage im = ImageIO.read(System.in);
+ BufferedImage bi = null;
+ int iconWidth = im.getWidth(null);
+ int iconHeight = im.getHeight(null);
+ if (im != null && iconHeight != 0 && iconWidth != 0) {
+ bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB);
+ Graphics g = bi.getGraphics();
+ try {
+ g.drawImage(im, 0, 0, iconWidth, iconHeight, null);
+ } finally {
+ g.dispose();
+ }
+ }
+ DataBuffer srcBuf = bi.getData().getDataBuffer();
+ int[] buf = ((DataBufferInt)srcBuf).getData();
+ System.out.print(iconWidth + ",");
+ System.out.println(iconHeight + ",");
+ for (int i = 0; i < buf.length; i++) {
+ System.out.print("0x" + Integer.toHexString(buf[i]) + ", ");
+ if (i % 10 == 0) {
+ System.out.println();
+ }
+ }
+ }
+}
diff --git a/jdk/make/src/classes/build/tools/icondata/osxapp/ToBin.java b/jdk/make/src/classes/build/tools/icondata/osxapp/ToBin.java
new file mode 100644
index 0000000..36a442b
--- /dev/null
+++ b/jdk/make/src/classes/build/tools/icondata/osxapp/ToBin.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package build.tools.icondata.osxapp;
+
+import java.io.*;
+
+public class ToBin {
+ public static void main(String[] args) throws Exception {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ int nRead;
+ byte[] data = new byte[4096];
+
+ while ((nRead = System.in.read(data, 0, data.length)) != -1) {
+ baos.write(data, 0, nRead);
+ }
+
+ baos.flush();
+
+ byte[] buf = baos.toByteArray();
+ for (int i = 0; i < buf.length; i++) {
+ System.out.print(String.format("0x%1$02X", buf[i]) + ", ");
+ if (i % 20 == 0) {
+ System.out.println();
+ }
+ }
+ }
+}
diff --git a/jdk/make/tools/src/build/tools/jarreorder/JarReorder.java b/jdk/make/src/classes/build/tools/jarreorder/JarReorder.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jarreorder/JarReorder.java
rename to jdk/make/src/classes/build/tools/jarreorder/JarReorder.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java b/jdk/make/src/classes/build/tools/jdwpgen/AbstractCommandNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/AbstractCommandNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java b/jdk/make/src/classes/build/tools/jdwpgen/AbstractGroupNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/AbstractGroupNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java b/jdk/make/src/classes/build/tools/jdwpgen/AbstractNamedNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/AbstractNamedNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/AbstractSimpleNode.java b/jdk/make/src/classes/build/tools/jdwpgen/AbstractSimpleNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/AbstractSimpleNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/AbstractSimpleNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/AbstractSimpleTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/AbstractSimpleTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/AbstractSimpleTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/AbstractSimpleTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java b/jdk/make/src/classes/build/tools/jdwpgen/AbstractTypeListNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/AbstractTypeListNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/AbstractTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/AbstractTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/AbstractTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/AbstractTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/AltNode.java b/jdk/make/src/classes/build/tools/jdwpgen/AltNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/AltNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/AltNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ArrayObjectTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ArrayObjectTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ArrayObjectTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ArrayObjectTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ArrayRegionTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ArrayRegionTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ArrayRegionTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ArrayRegionTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ArrayTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ArrayTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ArrayTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ArrayTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/BooleanTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/BooleanTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/BooleanTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/BooleanTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ByteTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ByteTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ByteTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ByteTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ClassLoaderObjectTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ClassLoaderObjectTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ClassLoaderObjectTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ClassLoaderObjectTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ClassObjectTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ClassObjectTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ClassObjectTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ClassObjectTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ClassTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ClassTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ClassTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ClassTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/CommandNode.java b/jdk/make/src/classes/build/tools/jdwpgen/CommandNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/CommandNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/CommandNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/CommandSetNode.java b/jdk/make/src/classes/build/tools/jdwpgen/CommandSetNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/CommandSetNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/CommandSetNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/CommentNode.java b/jdk/make/src/classes/build/tools/jdwpgen/CommentNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/CommentNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/CommentNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ConstantNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ConstantNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ConstantNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ConstantNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ConstantSetNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ConstantSetNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/Context.java b/jdk/make/src/classes/build/tools/jdwpgen/Context.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/Context.java
rename to jdk/make/src/classes/build/tools/jdwpgen/Context.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ErrorNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ErrorNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ErrorNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ErrorNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ErrorSetNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ErrorSetNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ErrorSetNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ErrorSetNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/EventNode.java b/jdk/make/src/classes/build/tools/jdwpgen/EventNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/EventNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/EventNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/FieldTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/FieldTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/FieldTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/FieldTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/FrameTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/FrameTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/FrameTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/FrameTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/GroupNode.java b/jdk/make/src/classes/build/tools/jdwpgen/GroupNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/GroupNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/GroupNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/IntTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/IntTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/IntTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/IntTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/InterfaceTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/InterfaceTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/InterfaceTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/InterfaceTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/LocationTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/LocationTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/LocationTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/LocationTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/LongTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/LongTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/LongTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/LongTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/Main.java b/jdk/make/src/classes/build/tools/jdwpgen/Main.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/Main.java
rename to jdk/make/src/classes/build/tools/jdwpgen/Main.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/MethodTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/MethodTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/MethodTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/MethodTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/NameNode.java b/jdk/make/src/classes/build/tools/jdwpgen/NameNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/NameNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/NameNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/NameValueNode.java b/jdk/make/src/classes/build/tools/jdwpgen/NameValueNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/NameValueNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/NameValueNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/Node.java b/jdk/make/src/classes/build/tools/jdwpgen/Node.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/Node.java
rename to jdk/make/src/classes/build/tools/jdwpgen/Node.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ObjectTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ObjectTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ObjectTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ObjectTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/OutNode.java b/jdk/make/src/classes/build/tools/jdwpgen/OutNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/OutNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/OutNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/Parse.java b/jdk/make/src/classes/build/tools/jdwpgen/Parse.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/Parse.java
rename to jdk/make/src/classes/build/tools/jdwpgen/Parse.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ReferenceIDTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ReferenceIDTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ReferenceIDTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ReferenceIDTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ReferenceTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ReferenceTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ReferenceTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ReferenceTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/RepeatNode.java b/jdk/make/src/classes/build/tools/jdwpgen/RepeatNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/RepeatNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/RepeatNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ReplyNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ReplyNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ReplyNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ReplyNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/RootNode.java b/jdk/make/src/classes/build/tools/jdwpgen/RootNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/RootNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/RootNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/SelectNode.java b/jdk/make/src/classes/build/tools/jdwpgen/SelectNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/SelectNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/SelectNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/StringObjectTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/StringObjectTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/StringObjectTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/StringObjectTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/StringTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/StringTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/StringTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/StringTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/TaggedObjectTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/TaggedObjectTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/TaggedObjectTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/TaggedObjectTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ThreadGroupObjectTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ThreadGroupObjectTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ThreadGroupObjectTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ThreadGroupObjectTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ThreadObjectTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ThreadObjectTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ThreadObjectTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ThreadObjectTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/TypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/TypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/TypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/TypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/UntaggedValueTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/UntaggedValueTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/UntaggedValueTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/UntaggedValueTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ValueTypeNode.java b/jdk/make/src/classes/build/tools/jdwpgen/ValueTypeNode.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/jdwpgen/ValueTypeNode.java
rename to jdk/make/src/classes/build/tools/jdwpgen/ValueTypeNode.java
diff --git a/jdk/make/tools/src/build/tools/spp/Spp.java b/jdk/make/src/classes/build/tools/spp/Spp.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/spp/Spp.java
rename to jdk/make/src/classes/build/tools/spp/Spp.java
diff --git a/jdk/make/tools/src/build/tools/stripproperties/StripProperties.java b/jdk/make/src/classes/build/tools/stripproperties/StripProperties.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/stripproperties/StripProperties.java
rename to jdk/make/src/classes/build/tools/stripproperties/StripProperties.java
diff --git a/jdk/make/src/classes/build/tools/swingbeaninfo/DocBeanInfo.java b/jdk/make/src/classes/build/tools/swingbeaninfo/DocBeanInfo.java
new file mode 100644
index 0000000..8e7e7a3
--- /dev/null
+++ b/jdk/make/src/classes/build/tools/swingbeaninfo/DocBeanInfo.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package build.tools.swingbeaninfo;
+
+import java.util.HashMap;
+
+/**
+ * Class that holds information for populating a FeatureDescriptor. For the class,
+ * This information represents the BeanDescriptor, for a property, it represents
+ * a PropertyDescriptor.
+ */
+public class DocBeanInfo {
+
+ // Values of the BeanFlags
+ public static final int BOUND = 1;
+ public static final int EXPERT = 2;
+ public static final int CONSTRAINED = 4;
+ public static final int HIDDEN = 8;
+ public static final int PREFERRED = 16 ;
+
+ public String name;
+ public int beanflags;
+ public String desc;
+ public String displayname;
+ public String propertyeditorclass;
+ public String customizerclass;
+
+ public HashMap attribs;
+ public HashMap enums;
+
+ public DocBeanInfo(){}
+
+ public DocBeanInfo(String p, int flags, String d,
+ String displayname, String pec, String cc,
+ HashMap attribs, HashMap enums) {
+ this.name = p;
+ this.beanflags = flags;
+ this.desc = d;
+ this.displayname = displayname;
+ this.propertyeditorclass = pec;
+ this.customizerclass = cc;
+
+ this.attribs = attribs;
+ this.enums = enums;
+ }
+
+ public String toString() {
+ StringBuffer buffer = new StringBuffer("*****");
+ buffer.append("\nProperty: " + name);
+ buffer.append("\tDescription: " + desc);
+ buffer.append("\nDisplayname: " + displayname);
+ buffer.append("\nPropertyEditorClass: " + propertyeditorclass);
+ buffer.append("\nCustomizerClass: " + customizerclass);
+
+ if ((beanflags & BOUND) != 0)
+ buffer.append("\nBound: true");
+
+ if ((beanflags & EXPERT) != 0)
+ buffer.append("\nExpert: true");
+
+ if ((beanflags & CONSTRAINED) != 0)
+ buffer.append("\nConstrained: true");
+
+ if ((beanflags & HIDDEN) !=0)
+ buffer.append("\nHidden: true");
+
+ if ((beanflags & PREFERRED) !=0)
+
+ if (attribs != null)
+ buffer.append(attribs.toString());
+
+ if (enums != null)
+ buffer.append(enums.toString());
+
+ return buffer.toString();
+ }
+
+}
diff --git a/jdk/make/src/classes/build/tools/swingbeaninfo/GenDocletBeanInfo.java b/jdk/make/src/classes/build/tools/swingbeaninfo/GenDocletBeanInfo.java
new file mode 100644
index 0000000..88e4585
--- /dev/null
+++ b/jdk/make/src/classes/build/tools/swingbeaninfo/GenDocletBeanInfo.java
@@ -0,0 +1,447 @@
+/*
+ * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package build.tools.swingbeaninfo;
+
+import com.sun.javadoc.ClassDoc;
+import com.sun.javadoc.MethodDoc;
+import com.sun.javadoc.RootDoc;
+import com.sun.javadoc.Tag;
+
+import java.beans.Introspector;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.StringTokenizer;
+
+/**
+ * Properties supported and tag syntax:
+ *
+ * @beaninfo
+ * bound: flag
+ * constrained: flag
+ * expert: flag
+ * hidden: flag
+ * preferred: flag
+ * description: string
+ * displayname: string
+ * propertyeditorclass: string (with dots: foo.bar.MyPropertyEditor
+ * customizerclass: string (w/dots: foo.bar.MyCustomizer)
+ * attribute: key1 value1
+ * attribute: key2 value2
+ *
+ * TODO: getValue and genDocletInfo needs some cleaning.
+ *
+ * @author Hans Muller
+ * @author Rich Schiavi
+ * @author Mark Davidson
+ */
+public class GenDocletBeanInfo {
+
+ static String[] ATTRIBUTE_NAMES = { "bound",
+ "constrained",
+ "expert",
+ "hidden",
+ "preferred",
+ "displayname",
+ "propertyeditorclass",
+ "customizerclass",
+ "displayname",
+ "description",
+ "enum",
+ "attribute" };
+ private static boolean DEBUG = false;
+
+ private static String fileDir = "";
+ private static String templateDir = "";
+
+ public static final String TRUE = "true";
+ public static final String FALSE = "false";
+
+ /**
+ * Method called from the javadoc environment to determint the options length.
+ * Doclet options:
+ * -t template location
+ * -d outputdir
+ * -x true Enable debug output.
+ */
+ public static int optionLength(String option) {
+ // remind: this needs to be cleaned up
+ if (option.equals("-t"))
+ return 2;
+ if (option.equals("-d"))
+ return 2;
+ if (option.equals("-x"))
+ return 2;
+ return 0;
+ }
+
+ /** @beaninfo
+ * bound:true
+ * constrained:false
+ * expert:true
+ * hidden:true
+ * preferred:false
+ * description: the description of this method can
+ * do all sorts of funky things. if it \n
+ * is indented like this, we have to remove
+ * all char spaces greater than 2 and also any hard-coded \n
+ * newline characters and all newlines
+ * displayname: theString
+ * propertyeditorclass: foo.bar.MyPropertyEditorClass
+ * customizerclass: foo.bar.MyCustomizerClass
+ * attribute:key1 value1
+ * attribute: key2 value2
+ *
+ */
+ public static boolean start(RootDoc doc) {
+ readOptions(doc.options());
+
+ if (templateDir.length() == 0) {
+ System.err.println("-t option not specified");
+ return false;
+ }
+ if (fileDir.length() == 0) {
+ System.err.println("-d option not specified");
+ return false;
+ }
+
+ GenSwingBeanInfo generator = new GenSwingBeanInfo(fileDir, templateDir, DEBUG);
+ Hashtable dochash = new Hashtable();
+ DocBeanInfo dbi;
+
+ /* "javadoc Foo.java Bar.java" will return:
+ * "Foo Foo.I1 Foo.I2 Bar Bar.I1 Bar.I2"
+ * i.e., with all the innerclasses of classes specified in the command
+ * line. We don't want to generate BeanInfo for any of these inner
+ * classes, so we ignore these by remembering what the last outer
+ * class was. A hack, I admit, but makes the build faster.
+ */
+ String previousClass = null;
+
+ ClassDoc[] classes = doc.classes();
+
+ for (int cnt = 0; cnt < classes.length; cnt++) {
+ String className = classes[cnt].qualifiedName();
+ if (previousClass != null &&
+ className.startsWith(previousClass) &&
+ className.charAt(previousClass.length()) == '.') {
+ continue;
+ }
+ previousClass = className;
+
+ // XXX - debug
+ System.out.println("\n>>> Generating beaninfo for " + className + "...");
+
+ // Examine the javadoc tags and look for the the @beaninfo tag
+ // This first block looks at the javadoc for the class
+ Tag[] tags = classes[cnt].tags();
+ for (int i = 0; i < tags.length; i++) {
+ if (tags[i].kind().equalsIgnoreCase("@beaninfo")) {
+ if (DEBUG)
+ System.out.println("GenDocletBeanInfo: found @beaninfo tagged Class: " + tags[i].text());
+ dbi = genDocletInfo(tags[i].text(), classes[cnt].name());
+ dochash.put(dbi.name, dbi);
+ break;
+ }
+ }
+
+ // This block looks at the javadoc for the class methods.
+ int startPos = -1;
+ MethodDoc[] methods = classes[cnt].methods();
+ for (int j = 0; j < methods.length; j++) {
+ // actually don't "introspect" - look for all
+ // methods with a @beaninfo tag
+ tags = methods[j].tags();
+ for (int x = 0; x < tags.length; x++){
+ if (tags[x].kind().equalsIgnoreCase("@beaninfo")){
+ if ((methods[j].name().startsWith("get")) ||
+ (methods[j].name().startsWith("set")))
+ startPos = 3;
+ else if (methods[j].name().startsWith("is"))
+ startPos = 2;
+ else
+ startPos = 0;
+ String propDesc =
+ Introspector.decapitalize((methods[j].name()).substring(startPos));
+ if (DEBUG)
+ System.out.println("GenDocletBeanInfo: found @beaninfo tagged Method: " + tags[x].text());
+ dbi = genDocletInfo(tags[x].text(), propDesc);
+ dochash.put(dbi.name, dbi);
+ break;
+ }
+ }
+ }
+ if (DEBUG) {
+ // dump our classes doc beaninfo
+ System.out.println(">>>>DocletBeanInfo for class: " + classes[cnt].name());
+ Enumeration e = dochash.elements();
+ while (e.hasMoreElements()) {
+ DocBeanInfo db = (DocBeanInfo)e.nextElement();
+ System.out.println(db.toString());
+ }
+ }
+
+ // Use the generator to create the beaninfo code for the class.
+ generator.genBeanInfo(classes[cnt].containingPackage().name(),
+ classes[cnt].name(), dochash);
+ // reset the values!
+ dochash.clear();
+ } // end for loop
+ return true;
+ }
+
+ /**
+ * Reads the command line options.
+ * Side Effect, sets class variables templateDir, fileDir and DEBUG
+ */
+ private static void readOptions(String[][] options) {
+ // Parse the command line args
+ for (int i = 0; i < options.length; i++){
+ if (options[i][0].equals("-t")) {
+ templateDir = options[i][1];
+ } else if (options[i][0].equals("-d")) {
+ fileDir = options[i][1];
+ } else if (options[i][0].equals("-x")){
+ if (options[i][1].equals("true"))
+ DEBUG=true;
+ else
+ DEBUG=false;
+ }
+ }
+ }
+
+ /**
+ * Create a "BeanInfo" data structure from the tag. This is a data structure
+ * which contains all beaninfo data for a method or a class.
+ *
+ * @param text All the text after the @beaninfo tag.
+ * @param name Name of the property i.e., mnemonic for setMnemonic
+ */
+ private static DocBeanInfo genDocletInfo(String text, String name) {
+ int beanflags = 0;
+ String desc = "null";
+ String displayname = "null";
+ String propertyeditorclass = "null";
+ String customizerclass = "null";
+ String value = "null";
+ HashMap attribs = null;
+ HashMap enums = null;
+
+ int index;
+
+ for (int j = 0; j < ATTRIBUTE_NAMES.length; j++){
+ index = 0;
+ if ((index = text.indexOf(ATTRIBUTE_NAMES[j])) != -1){
+ value = getValue((text).substring(index),ATTRIBUTE_NAMES[j]);
+
+ if (ATTRIBUTE_NAMES[j].equalsIgnoreCase("attribute")) {
+ attribs = getAttributeMap(value, " ");
+ }
+ if (ATTRIBUTE_NAMES[j].equalsIgnoreCase("enum")) {
+ enums = getAttributeMap(value, " \n");
+ }
+ else if (ATTRIBUTE_NAMES[j].equals("displayname")){
+ displayname = value;
+ }
+ else if (ATTRIBUTE_NAMES[j].equalsIgnoreCase("propertyeditorclass")) {
+ propertyeditorclass = value;
+ }
+ else if (ATTRIBUTE_NAMES[j].equalsIgnoreCase("customizerclass")){
+ customizerclass = value;
+ }
+ else if ((ATTRIBUTE_NAMES[j].equalsIgnoreCase("bound"))
+ && (value.equalsIgnoreCase(TRUE)))
+ beanflags = beanflags | DocBeanInfo.BOUND;
+ else if ((ATTRIBUTE_NAMES[j].equalsIgnoreCase("expert"))
+ && (value.equalsIgnoreCase(TRUE)))
+ beanflags = beanflags | DocBeanInfo.EXPERT;
+ else if ((ATTRIBUTE_NAMES[j].equalsIgnoreCase("constrained"))
+ && (value.equalsIgnoreCase(TRUE)))
+ beanflags = beanflags | DocBeanInfo.CONSTRAINED;
+ else if ((ATTRIBUTE_NAMES[j].equalsIgnoreCase("hidden"))
+ && (value.equalsIgnoreCase(TRUE)))
+ beanflags = beanflags | DocBeanInfo.HIDDEN;
+ else if ((ATTRIBUTE_NAMES[j].equalsIgnoreCase("preferred"))
+ && (value.equalsIgnoreCase(TRUE)))
+ beanflags = beanflags | DocBeanInfo.PREFERRED;
+ else if (ATTRIBUTE_NAMES[j].equalsIgnoreCase("description")){
+ desc = value;
+ }
+ }
+ }
+ /** here we create our doclet-beaninfo data structure, which we read in
+ * later if it has anything worthwhile
+ */
+
+ // Construct a new Descriptor class
+ return new DocBeanInfo(name, beanflags, desc,displayname,
+ propertyeditorclass, customizerclass,
+ attribs, enums);
+ }
+
+ /**
+ * Parses the substring and returns the cleaned up value for the attribute.
+ * @param substring Full String of the attrib tag.
+ * i.e., "attribute: visualUpdate true" will return "visualUpdate true";
+ */
+ private static String getValue(String substring, String prop) {
+ StringTokenizer t;
+ String value = "null";
+
+ try {
+ /** if the ATTRIBUTE_NAMES is NOT the description, then we
+ * parse until newline
+ * if it is the description we read until the next token
+ * and then look for a match in the last MAXMATCH index
+ * and truncate the description
+ * if it is the attribute we wead until no more
+ */
+ if (prop.equalsIgnoreCase("attribute")){
+ StringBuffer tmp = new StringBuffer();
+ try {
+ t = new StringTokenizer(substring, " :\n");
+ t.nextToken().trim();//the prop
+ // we want to return : key1 value1 key2 value2
+ while (t.hasMoreTokens()){
+ tmp.append(t.nextToken().trim()).append(" ");
+ tmp.append(t.nextToken().trim()).append(" ");
+ String test = t.nextToken().trim();
+ if (!(test.equalsIgnoreCase("attribute")))
+ break;
+ }
+ } catch (Exception e){
+ }
+ value = tmp.toString();
+ }
+ else if (prop.equalsIgnoreCase("enum")){
+ t = new StringTokenizer(substring, ":");
+ t.nextToken().trim(); // the prop we already know
+ StringBuffer tmp = new StringBuffer(t.nextToken().trim());
+ for (int i = 0; i < ATTRIBUTE_NAMES.length; i++){
+ if (tmp.toString().endsWith(ATTRIBUTE_NAMES[i])){
+ int len = ATTRIBUTE_NAMES[i].length();
+ // trim off that
+ tmp.setLength(tmp.length() - len);
+ break;
+ }
+ }
+ value = tmp.toString();
+ }
+ else if (prop.equalsIgnoreCase("description")){
+ t = new StringTokenizer(substring, ":");
+ t.nextToken().trim(); // the prop we already know
+ StringBuffer tmp = new StringBuffer(t.nextToken().trim());
+ for (int i = 0; i < ATTRIBUTE_NAMES.length; i++){
+ if (tmp.toString().endsWith(ATTRIBUTE_NAMES[i])){
+ int len = ATTRIBUTE_NAMES[i].length();
+ // trim off that
+ tmp.setLength(tmp.length() - len);
+ break;
+ }
+ }
+ value = hansalizeIt(tmp.toString());
+ }
+ else {
+ // Single value properties like bound: true
+ t = new StringTokenizer(substring, ":\n");
+ t.nextToken().trim(); // the prop we already know
+ value = t.nextToken().trim();
+ }
+
+ // now we need to look for a match of any of the
+ // property
+
+ return value;
+ }
+ catch (Exception e){
+ return "invalidValue";
+ }
+ }
+
+ /**
+ * Creates a HashMap containing the key value pair for the parsed values
+ * of the "attributes" and "enum" tags.
+ * ie. For attribute value: visualUpdate true
+ * The HashMap will have key: visualUpdate, value: true
+ */
+ private static HashMap getAttributeMap(String str, String delim) {
+ StringTokenizer t = new StringTokenizer(str, delim);
+ HashMap map = null;
+ String key;
+ String value;
+
+ int num = t.countTokens()/2;
+ if (num > 0) {
+ map = new HashMap();
+ for (int i = 0; i < num; i++) {
+ key = t.nextToken().trim();
+ value = t.nextToken().trim();
+ map.put(key, value);
+ }
+ }
+ return map;
+ }
+
+ // looks for extra spaces, \n hard-coded and invisible,etc
+ private static String hansalizeIt(String from){
+ char [] chars = from.toCharArray();
+ int len = chars.length;
+ int toss = 0;
+
+ // remove double spaces
+ for (int i = 0; i < len; i++){
+ if ((chars[i] == ' ')) {
+ if (i+1 < len) {
+ if ((chars[i+1] == ' ' ) || (chars[i+1] == '\n'))
+ {
+ --len;
+ System.arraycopy(chars,i+1,chars,i,len-i);
+ --i;
+ }
+ }
+ }
+
+ if (chars[i] == '\n'){
+ chars[i] = ' ';
+ i -= 2;
+ }
+
+ if (chars[i] == '\\') {
+ if (i+1 < len) {
+ if (chars[i+1] == 'n'){
+ chars[i+1] = ' ';
+ --len;
+ System.arraycopy(chars,i+1, chars,i, len-i);
+ --i;
+ }
+ }
+ }
+ }
+ return new String(chars,0,len);
+ }
+
+}
diff --git a/jdk/make/src/classes/build/tools/swingbeaninfo/GenSwingBeanInfo.java b/jdk/make/src/classes/build/tools/swingbeaninfo/GenSwingBeanInfo.java
new file mode 100644
index 0000000..d188cb9
--- /dev/null
+++ b/jdk/make/src/classes/build/tools/swingbeaninfo/GenSwingBeanInfo.java
@@ -0,0 +1,532 @@
+/*
+ * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package build.tools.swingbeaninfo;
+
+import java.beans.BeanInfo;
+import java.beans.BeanDescriptor;
+import java.beans.Introspector;
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+
+import java.io.*;
+
+import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Iterator;
+
+/**
+ * A utlity for generating a BeanInfo source file from a template and a
+ * Hashtable with hints that were generated from a doclet.
+ * it's neccessary to write things like the per property descriptions
+ * by hand. To run the application:
+ * <pre>
+ * java GenSwingBeanInfo <class name>
+ * </pre>
+ * Code for a bean info class is written to out. If the class is
+ * swing package, you don't need to fully specify its name.
+ *
+ * @author Hans Muller
+ * @author Rich Schiavi
+ * @author Mark Davidson
+ */
+public class GenSwingBeanInfo {
+ private final static String BEANINFO_SUFFIX = "BeanInfo.java";
+
+ // Tokens in @(...)
+ private final static String TOK_BEANPACKAGE = "BeanPackageName";
+ private final static String TOK_BEANCLASS = "BeanClassName";
+ private final static String TOK_BEANOBJECT = "BeanClassObject";
+ private final static String TOK_CLASSDESC = "ClassDescriptors";
+ private final static String TOK_BEANDESC = "BeanDescription";
+ private final static String TOK_PROPDESC = "BeanPropertyDescriptors";
+ private final static String TOK_ENUMVARS = "EnumVariables";
+
+ private String enumcode; // Generated code for enumerated properties.
+
+ private boolean DEBUG = false;
+
+ private String fileDir;
+ private String templateFilename;
+
+ /**
+ * Public constructor
+ * @param fileDir Location to put the generated source files.
+ * @param templateFilename Location of the BeanInfo template
+ * @param debug Flag to turn on debugging
+ */
+ public GenSwingBeanInfo(String fileDir, String templateFilename, boolean debug) {
+ this.fileDir = fileDir;
+ this.templateFilename = templateFilename;
+ this.DEBUG = debug;
+ }
+
+ /**
+ * Opens a BeanInfo PrintStream for the class.
+ */
+ private PrintStream initOutputFile(String classname) {
+ try {
+ OutputStream out = new FileOutputStream(fileDir + File.separator + classname + BEANINFO_SUFFIX);
+ BufferedOutputStream bout = new BufferedOutputStream(out);
+ return new PrintStream(out);
+ } catch (IOException e){
+ // System.err.println("GenSwingBeanInfo: " + e.toString());
+ }
+ return null;
+ }
+
+ private static void messageAndExit(String msg) {
+ System.err.println("\n" + msg);
+ System.exit(1);
+ }
+
+
+ /**
+ * Load the contents of the BeanInfo template into a string and
+ * return the string.
+ */
+ private String loadTemplate() {
+ String template = "<no template>";
+
+ try {
+ File file = new File(templateFilename);
+ DataInputStream stream = new DataInputStream(new FileInputStream(file));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+ StringBuffer buffer = new StringBuffer();
+
+ int c;
+ while((c = reader.read()) != -1) {
+ buffer.append((char)c);
+ }
+
+ template = buffer.toString();
+ reader.close();
+ } catch (IOException e) {
+ System.out.println(e.getMessage());
+ messageAndExit("GenSwingBeanInfo: Couldn't load template: " + templateFilename + e);
+ }
+ return template;
+ }
+
+
+ /**
+ * Generates a string for the BeanDescriptor
+ */
+ private String genBeanDescriptor(DocBeanInfo dbi) {
+ String code = "";
+ int beanflags = dbi.beanflags;
+
+ // we support export, hidden, preferred
+ if ((beanflags & DocBeanInfo.EXPERT) != 0)
+ code += " sun.swing.BeanInfoUtils.EXPERT, Boolean.TRUE,\n";
+ if ((beanflags & DocBeanInfo.HIDDEN) !=0)
+ code += " sun.swing.BeanInfoUtils.HIDDEN, Boolean.TRUE,\n";
+ /* 1.2 only - make sure build flag build using 1.2 */
+ if ((beanflags & DocBeanInfo.PREFERRED) !=0)
+ code += " sun.swing.BeanInfoUtils.PREFERRED, Boolean.TRUE,\n";
+ if (!(dbi.customizerclass.equals("null")))
+ code += " sun.swing.BeanInfoUtils.CUSTOMIZERCLASS, " + dbi.customizerclass + ".class,\n";
+
+ if (dbi.attribs != null) {
+ code += genAttributes(dbi.attribs);
+ }
+
+ return code;
+ }
+
+ /**
+ * Generates the code for the attributes table.
+ */
+ private String genAttributes(HashMap attribs) {
+ StringBuffer code = new StringBuffer();
+ String key;
+ String value;
+
+ Iterator iterator = attribs.keySet().iterator();
+ while(iterator.hasNext()) {
+ key = (String)iterator.next();
+ value = (String)attribs.get(key);
+
+ if (value.equals("true") || value.equals("false")) {
+ // Substitute the "true" and "false" for codegen Boolean values.
+ if(value.equals("true"))
+ value = "Boolean.TRUE";
+ else
+ value = "Boolean.FALSE";
+
+ code.append(" \"").append(key).append("\", ").append(value).append(",\n");
+ } else {
+ code.append(" \"").append(key).append("\", \"").append(value).append("\",\n");
+ }
+ }
+ return code.toString();
+ }
+
+ /**
+ * Generates the code for the enumeration.
+ * XXX - side effect: Modifies the enumcode field variable.
+ */
+ private String genEnumeration(String propName, HashMap enums) {
+ String objectName = propName + "Enumeration";
+ String key;
+ String value;
+
+ StringBuffer code = new StringBuffer("\n\t\tObject[] ");
+ code.append(objectName).append(" = new Object[] { \n");
+
+ Iterator iterator = enums.keySet().iterator();
+ while(iterator.hasNext()) {
+ key = (String)iterator.next();
+ value = (String)enums.get(key);
+
+ code.append("\t\t\t\"").append(key).append("\" , new Integer(");
+ code.append(value).append("), \"").append(value).append("\",\n");
+ }
+ // Close the statically initialized Object[]
+ code.replace(code.length() - 2, code.length(), "\n\t\t};\n");
+
+ // Add this string to the enumeration code.
+ enumcode += code.toString();
+
+ // Return the PropertyDescriptor init string;
+ return " \"enumerationValues\", " + objectName + ",\n";
+ }
+
+ /**
+ * Generate the createPropertyDescriptor() calls, one per property.
+ * A fully specified createPropertyDescriptor() call looks like this:
+ * <pre>
+ * createPropertyDescriptor("contentPane", new Object[] {
+ * BOUND, Boolean.TRUE,
+ * CONSTRAINED, Boolean.TRUE,
+ * PROPERTYEDITORCLASS, package.MyEditor.cl
+ * WRITEMETHOD, "setContentPane",
+ * DISPLAYNAME, "contentPane",
+ * EXPERT, Boolean.FALSE,
+ * HIDDEN, Boolean.FALSE,
+ * PREFERRED, Boolean.TRUE,
+ * SHORTDESCRIPTION, "A top level window with a window manager border",
+ * "random attribute","random value"
+ * }
+ * );
+ * </pre>
+ *
+ * @param info The actual BeanInfo class generated from from the Intospector.
+ * @param dochash Set of DocBeanInfo pairs for each property. This information
+ * is used to suplement the instrospected properties.
+ * @return A snippet of source code which would construct all the PropertyDescriptors.
+ */
+ private String genPropertyDescriptors(BeanInfo info, Hashtable dochash) {
+ String code = "";
+ enumcode = " "; // code for enumerated properties.
+ PropertyDescriptor[] pds = info.getPropertyDescriptors();
+ boolean hash_match = false;
+ DocBeanInfo dbi = null;
+
+ for(int i = 0; i < pds.length; i++) {
+ if (pds[i].getReadMethod() != null) {
+ code += "\ncreatePropertyDescriptor(\"" + pds[i].getName() + "\", new Object[] {\n";
+
+ if (DEBUG)
+ System.out.println("Introspected propertyDescriptor: " + pds[i].getName());
+
+ if (dochash.size() > 0 && dochash.containsKey(pds[i].getName())) {
+ dbi = (DocBeanInfo)dochash.remove(pds[i].getName());
+ // override/set properties on this *introspected*
+ // BeanInfo pds using our DocBeanInfo class values
+ setDocInfoProps(dbi, pds[i]);
+ hash_match = true;
+ if (DEBUG)
+ System.out.println("DocBeanInfo class exists for propertyDescriptor: " + pds[i].getName() + "\n");
+ } else {
+ hash_match = false;
+ }
+
+ // Do I need to do anything with this property descriptor
+ if (hash_match) {
+ if ((dbi.beanflags & DocBeanInfo.BOUND) != 0) {
+ code += " sun.swing.BeanInfoUtils.BOUND, Boolean.TRUE,\n";
+ } else {
+ code += " sun.swing.BeanInfoUtils.BOUND, Boolean.FALSE,\n";
+ }
+ }
+
+ if (pds[i].isConstrained()) {
+ code += " sun.swing.BeanInfoUtils.CONSTRAINED, Boolean.TRUE,\n";
+ }
+
+ if (pds[i].getPropertyEditorClass() != null) {
+ String className = pds[i].getPropertyEditorClass().getName();
+ code += " sun.swing.BeanInfoUtils.PROPERTYEDITORCLASS, " + className + ".class,\n";
+ } else if ((hash_match) && (!(dbi.propertyeditorclass.equals("null")))) {
+ code += " sun.swing.BeanInfoUtils.PROPERTYEDITORCLASS, " + dbi.propertyeditorclass + ".class,\n";
+ }
+
+ if ((hash_match) && (!(dbi.customizerclass.equals("null")))) {
+ code += " sun.swing.BeanInfoUtils.CUSTOMIZERCLASS, " + dbi.customizerclass + ".class,\n";
+ }
+
+ if ((hash_match) && (dbi.enums != null)) {
+ code += genEnumeration(pds[i].getName(), dbi.enums);
+ }
+
+ if (!pds[i].getDisplayName().equals(pds[i].getName())) {
+ code += " sun.swing.BeanInfoUtils.DISPLAYNAME, \"" + pds[i].getDisplayName() + "\",\n";
+ }
+
+ if (pds[i].isExpert()) {
+ code += " sun.swing.BeanInfoUtils.EXPERT, Boolean.TRUE,\n";
+ }
+
+ if (pds[i].isHidden()) {
+ code += " sun.swing.BeanInfoUtils.HIDDEN, Boolean.TRUE,\n";
+ }
+
+ if (pds[i].isPreferred()) {
+ code += " sun.swing.BeanInfoUtils.PREFERRED, Boolean.TRUE,\n";
+ }
+
+ // user attributes
+ if (hash_match) {
+ if (dbi.attribs != null) {
+ code += genAttributes(dbi.attribs);
+ }
+ }
+ code += " sun.swing.BeanInfoUtils.SHORTDESCRIPTION, \"" + pds[i].getShortDescription() + "\",\n";
+
+ // Print the closing brackets. If this is the last array initializer,
+ // don't print the trailing comma.
+ if (i == (pds.length - 1)) {
+ code += " }\n)\n";
+ } else {
+ code += " }\n),\n";
+ }
+
+ } // end if ( readMethod != null )
+ } // end for
+ return code;
+ }
+
+ /**
+ * Sets properties from the BeanInfo supplement on the
+ * introspected PropertyDescriptor
+ */
+ private void setDocInfoProps(DocBeanInfo dbi, PropertyDescriptor pds) {
+ int beanflags = dbi.beanflags;
+
+ if ((beanflags & DocBeanInfo.BOUND) != 0)
+ pds.setBound(true);
+ if ((beanflags & DocBeanInfo.EXPERT) != 0)
+ pds.setExpert(true);
+ if ((beanflags & DocBeanInfo.CONSTRAINED) != 0)
+ pds.setConstrained(true);
+ if ((beanflags & DocBeanInfo.HIDDEN) !=0)
+ pds.setHidden(true);
+ if ((beanflags & DocBeanInfo.PREFERRED) !=0)
+ pds.setPreferred(true);
+
+ if (!(dbi.desc.equals("null"))){
+ pds.setShortDescription(dbi.desc);
+ }
+ if (!(dbi.displayname.equals("null"))){
+ pds.setDisplayName(dbi.displayname);
+ }
+ }
+
+ /**
+ * Generates the BeanInfo source file using instrospection and a
+ * Hashtable full of hints. This the only public method in this class.
+ *
+ * @param classname Root name of the class. i.e., JButton
+ * @param dochash A hashtable containing the DocBeanInfo.
+ */
+ public void genBeanInfo(String packageName, String classname, Hashtable dochash) {
+ // The following initial values are just examples. All of these
+ // fields are initialized below.
+ String beanClassName = "JInternalFrame";
+ String beanClassObject = "javax.swing.JInternalFrame.class";
+ String beanDescription = "<A description of this component>.";
+ String beanPropertyDescriptors = "<createSwingPropertyDescriptor code>";
+ String classPropertyDescriptors = "<createSwingClassPropertyDescriptor code>";
+
+ Class cls = getClass(packageName, classname);
+ if (cls == null){
+ messageAndExit("Can't find class: " + classname);
+ }
+
+ // Get the output stream.
+ PrintStream out = initOutputFile(classname);
+
+ // Run the Introspector and initialize the variables
+
+ BeanInfo beanInfo = null;
+ BeanDescriptor beanDescriptor = null;
+
+ try {
+ if (cls == javax.swing.JComponent.class) {
+ // Go all the way up the heirarchy for JComponent
+ beanInfo = Introspector.getBeanInfo(cls);
+ } else {
+ beanInfo = Introspector.getBeanInfo(cls, cls.getSuperclass());
+ }
+ beanDescriptor = beanInfo.getBeanDescriptor();
+ beanDescription = beanDescriptor.getShortDescription();
+ } catch (IntrospectionException e) {
+ messageAndExit("Introspection failed for " + cls.getName() + " " + e);
+ }
+
+ beanClassName = beanDescriptor.getName();
+ beanClassObject = cls.getName() + ".class";
+
+ if (DEBUG){
+ System.out.println(">>>>GenSwingBeanInfo class: " + beanClassName);
+ }
+ // Generate the Class BeanDescriptor information first
+ if (dochash.size() > 0) {
+ if (dochash.containsKey(beanClassName)) {
+ DocBeanInfo dbi = (DocBeanInfo)dochash.remove(beanClassName);
+ classPropertyDescriptors = genBeanDescriptor(dbi);
+ if (DEBUG)
+ System.out.println("ClassPropertyDescriptors: " + classPropertyDescriptors);
+ if (!(dbi.desc.equals("null")))
+ beanDescription = dbi.desc;
+ } else
+ beanDescription = beanDescriptor.getShortDescription();
+ } else
+ beanDescription = beanDescriptor.getShortDescription();
+
+ // Generate the Property descriptors
+ beanPropertyDescriptors = genPropertyDescriptors(beanInfo,dochash);
+
+ // Dump the template to out, substituting values for
+ // @(token) tokens as they're encountered.
+
+ int currentIndex = 0;
+ // not loading this to get around build issue for now
+ String template = loadTemplate();
+
+ // This loop substitutes the "@(...)" tags in the template with the ones for the
+ // current class.
+ while (currentIndex < template.length()) {
+ // Find the Token
+ int tokenStart = template.indexOf("@(", currentIndex);
+ if (tokenStart != -1) {
+ out.print(template.substring(currentIndex, tokenStart));
+
+ int tokenEnd = template.indexOf(")", tokenStart);
+ if (tokenEnd == -1) {
+ messageAndExit("Bad @(<token>) beginning at " + tokenStart);
+ }
+ String token = template.substring(tokenStart+2, tokenEnd);
+
+ if (token.equals(TOK_BEANCLASS)) {
+ out.print(beanClassName);
+ } else if (token.equals(TOK_CLASSDESC)) {
+ if (!(classPropertyDescriptors.equals("<createSwingClassPropertyDescriptor code>"))) {
+ printDescriptors(out, classPropertyDescriptors, template, tokenStart);
+ }
+ } else if (token.equals(TOK_BEANPACKAGE)){
+ out.print(packageName);
+ } else if (token.equals(TOK_BEANOBJECT)) {
+ out.print(beanClassObject);
+ } else if (token.equals(TOK_BEANDESC)) {
+ out.print(beanDescription);
+ } else if (token.equals(TOK_ENUMVARS)){
+ out.print(enumcode);
+ } else if (token.equals(TOK_PROPDESC)) {
+ printDescriptors(out, beanPropertyDescriptors, template, tokenStart);
+ } else if (token.equals("#")) {
+ // Ignore the @(#) Version Control tag if it exists.
+ } else {
+ messageAndExit("Unrecognized token @(" + token + ")");
+ }
+ currentIndex = tokenEnd + 1;
+ } else {
+ // tokenStart == -1 - We are finsihed.
+ out.print(template.substring(currentIndex, template.length()));
+ break;
+ }
+ }
+ out.close();
+ }
+
+ /**
+ * Returns the class from the package name and the class root name.
+ *
+ * @param packageName The name of the package of the containing class.
+ * @param rootname The root name of the class. i.e, JButton
+ * @return The class instance or null.
+ */
+ private Class getClass(String packageName, String rootname) {
+ Class cls = null;
+ String classname = rootname;
+
+ if (packageName != null || !packageName.equals("")) {
+ classname = packageName + "." + rootname;
+ }
+
+ try {
+ cls = Class.forName(classname);
+ } catch (ClassNotFoundException e) {
+ // Fail silently.
+ }
+ return cls;
+ }
+
+ /**
+ * Prints the formated descriptors to the PrintStream
+ * @param out Open PrintStream
+ * @param s String descriptor
+ * @param template Template
+ * @param tokenStart Index into the template
+ */
+ private void printDescriptors(PrintStream out, String s,
+ String template, int tokenStart) {
+ String indent = "";
+
+ // Find the newline that preceeds @(BeanPropertyDescriptors) to
+ // calculate the indent.
+ for (int i = tokenStart; i >= 0; i--) {
+ if (template.charAt(i) == '\n') {
+ char[] chars = new char[tokenStart - i];
+ for (int j = 0; j < chars.length; j++) {
+ chars[j] = ' ';
+ }
+ indent = new String(chars);
+ break;
+ }
+ }
+
+ int i = 0;
+ while(i < s.length()) {
+ int nlIndex = s.indexOf('\n', i);
+ out.print(s.substring(i, nlIndex+1));
+ out.print(indent);
+ i = nlIndex + 1;
+ }
+ }
+
+
+}
diff --git a/jdk/make/tools/src/build/tools/tzdb/ChronoField.java b/jdk/make/src/classes/build/tools/tzdb/ChronoField.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/ChronoField.java
rename to jdk/make/src/classes/build/tools/tzdb/ChronoField.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/DateTimeException.java b/jdk/make/src/classes/build/tools/tzdb/DateTimeException.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/DateTimeException.java
rename to jdk/make/src/classes/build/tools/tzdb/DateTimeException.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/LocalDate.java b/jdk/make/src/classes/build/tools/tzdb/LocalDate.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/LocalDate.java
rename to jdk/make/src/classes/build/tools/tzdb/LocalDate.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/LocalDateTime.java b/jdk/make/src/classes/build/tools/tzdb/LocalDateTime.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/LocalDateTime.java
rename to jdk/make/src/classes/build/tools/tzdb/LocalDateTime.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/LocalTime.java b/jdk/make/src/classes/build/tools/tzdb/LocalTime.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/LocalTime.java
rename to jdk/make/src/classes/build/tools/tzdb/LocalTime.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/TimeDefinition.java b/jdk/make/src/classes/build/tools/tzdb/TimeDefinition.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/TimeDefinition.java
rename to jdk/make/src/classes/build/tools/tzdb/TimeDefinition.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/TzdbZoneRulesCompiler.java b/jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesCompiler.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/TzdbZoneRulesCompiler.java
rename to jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesCompiler.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/Utils.java b/jdk/make/src/classes/build/tools/tzdb/Utils.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/Utils.java
rename to jdk/make/src/classes/build/tools/tzdb/Utils.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/ZoneOffset.java b/jdk/make/src/classes/build/tools/tzdb/ZoneOffset.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/ZoneOffset.java
rename to jdk/make/src/classes/build/tools/tzdb/ZoneOffset.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/ZoneOffsetTransition.java b/jdk/make/src/classes/build/tools/tzdb/ZoneOffsetTransition.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/ZoneOffsetTransition.java
rename to jdk/make/src/classes/build/tools/tzdb/ZoneOffsetTransition.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/ZoneOffsetTransitionRule.java b/jdk/make/src/classes/build/tools/tzdb/ZoneOffsetTransitionRule.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/ZoneOffsetTransitionRule.java
rename to jdk/make/src/classes/build/tools/tzdb/ZoneOffsetTransitionRule.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/ZoneRules.java b/jdk/make/src/classes/build/tools/tzdb/ZoneRules.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/ZoneRules.java
rename to jdk/make/src/classes/build/tools/tzdb/ZoneRules.java
diff --git a/jdk/make/tools/src/build/tools/tzdb/ZoneRulesBuilder.java b/jdk/make/src/classes/build/tools/tzdb/ZoneRulesBuilder.java
similarity index 100%
rename from jdk/make/tools/src/build/tools/tzdb/ZoneRulesBuilder.java
rename to jdk/make/src/classes/build/tools/tzdb/ZoneRulesBuilder.java
diff --git a/jdk/make/tools/add_gnu_debuglink/add_gnu_debuglink.c b/jdk/make/src/native/add_gnu_debuglink/add_gnu_debuglink.c
similarity index 100%
rename from jdk/make/tools/add_gnu_debuglink/add_gnu_debuglink.c
rename to jdk/make/src/native/add_gnu_debuglink/add_gnu_debuglink.c
diff --git a/jdk/make/tools/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c b/jdk/make/src/native/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c
similarity index 100%
rename from jdk/make/tools/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c
rename to jdk/make/src/native/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c
diff --git a/jdk/make/sun/Makefile b/jdk/make/sun/Makefile
deleted file mode 100644
index c9d6f9c..0000000
--- a/jdk/make/sun/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of sun tools
-#
-
-BUILDDIR = ..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-# Non windows subdirs
-ifneq ($(PLATFORM), windows)
- ifndef OPENJDK
- ifeq ($(PLATFORM), solaris)
- ifneq ($(ARCH), amd64)
- # Solaris 11 does not have support for new compilation of DGA code.
- OS_VERSION = $(shell uname -r)
- OS_MAJOR_VERSION := $(call MajorVersion,$(OS_VERSION))
- OS_MINOR_VERSION := $(call MinorVersion,$(OS_VERSION))
- ifeq ($(shell $(EXPR) $(OS_MAJOR_VERSION) == 5), 1)
- ifeq ($(shell $(EXPR) $(OS_MINOR_VERSION) \<= 10), 1)
- DGA_SUBDIR = jdga
- endif
- endif
- endif
- endif
- endif
- HEADLESS_SUBDIR = headless
- XAWT_SUBDIR = xawt
-endif
-
-ifeq ($(PLATFORM), macosx)
- LWAWT_PRE_SUBDIR = osxapp
- LWAWT_SUBDIR = lwawt
-endif
-
-ifdef OPENJDK
- RENDER_SUBDIR = pisces
-else
- RENDER_SUBDIR = dcpr
-endif
-
-# nio need to be compiled before awt to have all charsets ready
-SUBDIRS = jar security misc net nio text util launcher cldr tzdb
-
-ifdef BUILD_HEADLESS_ONLY
- DISPLAY_LIBS = awt $(HEADLESS_SUBDIR)
- DISPLAY_TOOLS =
-else
- DISPLAY_LIBS = awt splashscreen $(XAWT_SUBDIR) $(HEADLESS_SUBDIR)
- DISPLAY_TOOLS = applet
-endif
-SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \
- $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \
- jawt font jpeg cmm $(DISPLAY_TOOLS)
-SUBDIRS_management = management
-SUBDIRS_misc = rmi tracing
-SUBDIRS_tools = native2ascii serialver tools jconsole
-
-ifndef OPENJDK
- SUBDIRS += usagetracker
-endif
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/sun/applet/Makefile b/jdk/make/sun/applet/Makefile
deleted file mode 100644
index f647374..0000000
--- a/jdk/make/sun/applet/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for appletviewer classes, wrappers, and resources.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.applet
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-# This program must contain a manifest that defines the execution level
-# needed to follow standard Vista User Access Control Guidelines
-# This must be set before Program.gmk is included
-#
-BUILD_MANIFEST=true
-
-#
-# Files to compile.
-#
-AUTO_FILES_JAVA_DIRS = sun/applet
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_JAVA = sun/applet/resources/MsgAppletViewer.java
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/sun/audio/Makefile b/jdk/make/sun/audio/Makefile
deleted file mode 100644
index d65468c..0000000
--- a/jdk/make/sun/audio/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building sun.audio
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.audio
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = sun/audio
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/sun/awt/CondenseRules.awk b/jdk/make/sun/awt/CondenseRules.awk
deleted file mode 100644
index 89cfd68..0000000
--- a/jdk/make/sun/awt/CondenseRules.awk
+++ /dev/null
@@ -1,21 +0,0 @@
-BEGIN {
- previous="";
- prefix="";
- ORS="";
- OFS="";
-}
-{
- if ($1 != previous) {
- if (previous != "") {
- print "\n\n";
- }
- previous = $1;
- print $1;
- prefix="\t";
- }
- print prefix $2;
- prefix=" ";
-}
-END {
- print "\n";
-}
diff --git a/jdk/make/sun/awt/Depend.mak b/jdk/make/sun/awt/Depend.mak
deleted file mode 100644
index 95e5615..0000000
--- a/jdk/make/sun/awt/Depend.mak
+++ /dev/null
@@ -1,163 +0,0 @@
-#
-# This makefile must be executed on a system with makedepend, such as Solaris.
-# In my copious amount of spare time, I hope to write a Java-based makedepend
-# to eliminate this dependency (no pun intended). TB
-
-BUILD_DIR = ../..
-TOPDIR = ../../..
-
-STUBDIR = WindowsSystemHeaderStubs
-BUILDSTUBDIR = BuildStubs
-
-SHARE_SRC = $(TOPDIR)/src/share
-SUN_SRC = $(SHARE_SRC)/native/sun
-COMP_SRC = $(SUN_SRC)/awt/alphacomposite
-DEBUG_SRC = $(SUN_SRC)/awt/debug
-IMG_SRC = $(SUN_SRC)/awt/image
-MEDIA_SRC = $(SUN_SRC)/awt/medialib
-J2D_SRC = $(SUN_SRC)/java2d
-J2D_FONT_SRC = $(SUN_SRC)/font
-J2D_WINDOWS_SRC = $(WINDOWS_SRC)/native/sun/java2d
-AWT_WINDOWS_SRC = $(WINDOWS_SRC)/native/sun/awt
-LOOP_SRC = $(SUN_SRC)/java2d/loops
-PIPE_SRC = $(SUN_SRC)/java2d/pipe
-WINDOWS_SRC = $(TOPDIR)/src/windows
-SRC = $(WINDOWS_SRC)/native/sun/windows
-
-# ensure consistent sort order
-LC_ALL:= C
-
-SRCDIRS = \
- $(COMP_SRC) \
- $(DEBUG_SRC) \
- $(IMG_SRC) \
- $(IMG_SRC)/cvutils \
- $(IMG_SRC)/gif \
- $(MEDIA_SRC) \
- $(J2D_SRC) \
- $(J2D_FONT_SRC) \
- $(J2D_SRC)/opengl \
- $(J2D_WINDOWS_SRC)/windows \
- $(J2D_WINDOWS_SRC)/d3d \
- $(J2D_WINDOWS_SRC)/opengl \
- $(LOOP_SRC) \
- $(PIPE_SRC) \
- $(SRC)
-
-INCLUDES = \
- -I$(STUBDIR) \
- -I$(BUILDSTUBDIR) \
- -I$(SHARE_SRC)/javavm/export \
- -I$(WINDOWS_SRC)/javavm/export \
- -I$(SHARE_SRC)/native/common \
- -I$(WINDOWS_SRC)/native/common \
- -I$(SUN_SRC)/dc/doe \
- -I$(SUN_SRC)/dc/path \
- -I$(COMP_SRC) \
- -I$(DEBUG_SRC) \
- -I$(IMG_SRC) \
- -I$(IMG_SRC)/cvutils \
- -I$(MEDIA_SRC) \
- -I$(J2D_SRC) \
- -I$(J2D_FONT_SRC) \
- -I$(J2D_SRC)/opengl \
- -I$(J2D_WINDOWS_SRC) \
- -I$(J2D_WINDOWS_SRC)/windows \
- -I$(J2D_WINDOWS_SRC)/d3d \
- -I$(J2D_WINDOWS_SRC)/opengl \
- -I$(AWT_WINDOWS_SRC) \
- -I$(LOOP_SRC) \
- -I$(PIPE_SRC) \
- -I$(SRC)
-
-STUBFILES = \
- $(STUBDIR)/ddraw.h \
- $(STUBDIR)/d3d.h \
- $(STUBDIR)/d3d9.h \
- $(STUBDIR)/Ole2.h \
- $(STUBDIR)/Zmouse.h \
- $(STUBDIR)/cderr.h \
- $(STUBDIR)/comdef.h \
- $(STUBDIR)/commctrl.h \
- $(STUBDIR)/commdlg.h \
- $(STUBDIR)/comutil.h \
- $(STUBDIR)/direct.h \
- $(STUBDIR)/d3dcom.h \
- $(STUBDIR)/imm.h \
- $(STUBDIR)/ime.h \
- $(STUBDIR)/io.h \
- $(STUBDIR)/map \
- $(STUBDIR)/mmsystem.h \
- $(STUBDIR)/new.h \
- $(STUBDIR)/new \
- $(STUBDIR)/ole2.h \
- $(STUBDIR)/process.h \
- $(STUBDIR)/richole.h \
- $(STUBDIR)/richedit.h \
- $(STUBDIR)/shellapi.h \
- $(STUBDIR)/shlwapi.h \
- $(STUBDIR)/shlobj.h \
- $(STUBDIR)/tchar.h \
- $(STUBDIR)/winbase.h \
- $(STUBDIR)/windef.h \
- $(STUBDIR)/windows.h \
- $(STUBDIR)/Windows.h \
- $(STUBDIR)/windowsx.h \
- $(STUBDIR)/winspool.h \
- $(STUBDIR)/winuser.h \
- $(STUBDIR)/wtypes.h \
- $(STUBDIR)/zmouse.h \
-
-EXTRAFILES_c = \
- img_colors.c
-
-default: dependencies
-
-include FILES_c_windows.gmk
-
-dependencies:
- rm -rf make.depend
- rm -rf make.tmp make.tmp2 make.tmp.bak
- rm -rf $(STUBDIR) $(BUILDSTUBDIR) depend.filelist
- for file in $(FILES_c) $(FILES_cpp) $(EXTRAFILES_c); do \
- for dir in $(SRCDIRS); do \
- if [ -f $$dir/$$file ]; then \
- echo $$dir/$$file >>depend.filelist; \
- fi; \
- if [ -f $$dir/$${file}pp ]; then \
- echo $$dir/$${file}pp >>depend.filelist; \
- fi; \
- done; \
- done
- touch make.tmp
- mkdir $(STUBDIR)
- touch $(STUBFILES)
- mkdir $(BUILDSTUBDIR)
- gnumake -f Depend.mak classhdrstubs
- touch $(BUILDSTUBDIR)/awt_colors.h
- cat depend.filelist | xargs -n 100 makedepend \
- -DWIN32 -D_X86X -Dx86 -DDEBUG -D_MSC_VER -DMLIB_NO_LIBSUNMATH \
- -DUNICODE -D_UNICODE \
- -a -f make.tmp -o.obj $(INCLUDES)
- fgrep .obj make.tmp | sed -f Depend.sed | sort -f -u | nawk -f CondenseRules.awk > make.depend
- rm -rf make.tmp make.tmp2 make.tmp.bak
- rm -rf $(STUBDIR) $(BUILDSTUBDIR) depend.filelist
-
-
-include FILES_export_windows.gmk
-
-EXTRAFILES_java = \
- sun/java2d/opengl/OGLContext/OGLContextCaps.java \
- sun/java2d/d3d/D3DPaints/MultiGradient.java \
- sun/java2d/d3d/D3DContext/D3DContextCaps.java \
- java/lang/Integer.java
-
-FILES_java = $(FILES_export) $(FILES_export2) $(FILES_export3) \
- $(EXTRAFILES_java)
-
-classhdrstubs:
- for file in `echo $(FILES_java) | \
- tr ' ' '\n' | \
- sed -e 'y/\//_/' -e 's/\.java/.h/'`; do \
- echo "#include <jni.h>" > $(BUILDSTUBDIR)/$$file; \
- done
diff --git a/jdk/make/sun/awt/Depend.sed b/jdk/make/sun/awt/Depend.sed
deleted file mode 100644
index 00a4bdd..0000000
--- a/jdk/make/sun/awt/Depend.sed
+++ /dev/null
@@ -1,32 +0,0 @@
-# Unqualify std headers
-# remove headers with no extension as well (e.g. C++ 94 STL headers) - robi
-# s/ \/usr\/include[^ ]*\.h//g
-s/ \/usr\/include[^ ]*//g
-
-# Unqualify std Windows headers
-# remove headers with no extension as well (e.g. C++ 94 STL headers) - robi
-# s/ WindowsSystemHeaderStubs[^ ]*\.h//g
-s/ WindowsSystemHeaderStubs[^ ]*//g
-
-# ####################################
-# Rules to allow for generation of dependencies on an unbuilt tree...
-#
-# BuildStubs is populated with stubs for include files that are
-# generated by the build and then dependencies are adjusted here
-#
-# Adjust awt_colors.h
-# Change BuildStubs to .
-s/ BuildStubs\/awt_colors.h/ $(OBJDIR)\/awt_colors.h/g
-#
-# Adjust CClassHeaders
-# Change BuildStubs to CClassHeaders
-s/ BuildStubs/ $(CLASSHDRDIR)/g
-#
-# End of unbuilt tree adjustments
-# ####################################
-
-# Remove any empty rules
-/:[ ]*$/d
-
-# Change .obj path from src to proper awt/obj or awt/obj_g directory
-s/^.*\/\(.*:\)/$(OBJDIR)\/\1:/
diff --git a/jdk/make/sun/awt/FILES_c_unix.gmk b/jdk/make/sun/awt/FILES_c_unix.gmk
deleted file mode 100644
index b8d0e05..0000000
--- a/jdk/make/sun/awt/FILES_c_unix.gmk
+++ /dev/null
@@ -1,183 +0,0 @@
-#
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# The debug_* files included here aren't for 2D specifically but they
-# have no X dependency.
-
-FILES_2D_vis = \
- vis_FuncArray.c \
- java2d_Mlib.c \
- mlib_ImageCreate.c \
- mlib_ImageZoom_NN.c \
- mlib_ImageCopy_Bit.c \
- mlib_sys.c \
- mlib_v_ImageClear.c \
- mlib_v_ImageClear_f.c \
- mlib_v_ImageConstXor.c \
- mlib_v_ImageCopy.c \
- mlib_v_ImageCopy_f.c \
- mlib_v_ImageXor.c \
- mlib_v_ImageZoom_NN_f.c \
- vis_Interp.c \
- vis_AlphaMacros.c \
- vis_AlphaMaskBlit.c \
- vis_AlphaMaskFill.c \
- vis_ByteGray.c \
- vis_ByteGray_FromRgb.c \
- vis_ByteGray_Mask.c \
- vis_ByteIndexed.c \
- vis_DrawLine.c \
- vis_FourByteAbgr.c \
- vis_IntArgb.c \
- vis_IntArgbPre.c \
- vis_IntArgbPre_Mask.c \
- vis_IntBgr.c \
- vis_IntRgb.c \
- vis_IntRgbx.c \
- vis_SrcMaskFill.c \
- vis_SrcOverMaskBlit.c \
- vis_SrcOverMaskFill.c \
- vis_FourByteAbgrPre.c \
- vis_GlyphList.c \
- vis_GlyphListXor.c \
- vis_IntArgbBm.c \
- vis_ThreeByteBgr.c \
- vis_UshortGray.c \
- vis_UshortGray_FromRgb.c \
- vis_XorBlit.c
-
-FILES_2D_c = \
- gifdecoder.c \
- imageInitIDs.c \
- img_colors.c \
- img_globals.c \
- SurfaceData.c \
- Region.c \
- BufImgSurfaceData.c \
- Disposer.c \
- Trace.c \
- GraphicsPrimitiveMgr.c \
- Blit.c \
- BlitBg.c \
- ScaledBlit.c \
- FillRect.c \
- FillSpans.c \
- FillParallelogram.c \
- DrawParallelogram.c \
- DrawLine.c \
- DrawRect.c \
- DrawPolygons.c \
- DrawPath.c \
- FillPath.c \
- ProcessPath.c \
- MaskBlit.c \
- MaskFill.c \
- TransformHelper.c \
- AlphaMath.c \
- AlphaMacros.c \
- AnyByte.c \
- ByteBinary1Bit.c \
- ByteBinary2Bit.c \
- ByteBinary4Bit.c \
- ByteIndexed.c \
- ByteGray.c \
- Index8Gray.c \
- Index12Gray.c \
- AnyShort.c \
- Ushort555Rgb.c \
- Ushort565Rgb.c \
- Ushort4444Argb.c \
- Ushort555Rgbx.c \
- UshortGray.c \
- UshortIndexed.c \
- Any3Byte.c \
- ThreeByteBgr.c \
- AnyInt.c \
- IntArgb.c \
- IntArgbPre.c \
- IntArgbBm.c \
- IntRgb.c \
- IntBgr.c \
- IntRgbx.c \
- Any4Byte.c \
- FourByteAbgr.c \
- FourByteAbgrPre.c \
- BufferedMaskBlit.c \
- BufferedRenderPipe.c \
- ShapeSpanIterator.c \
- SpanClipRenderer.c \
- awt_ImageRep.c \
- awt_ImagingLib.c \
- awt_Mlib.c \
- awt_parseImage.c \
- DataBufferNative.c \
- dither.c \
- debug_assert.c \
- debug_mem.c \
- debug_trace.c \
- debug_util.c
-
-# These files are required to be built, with or without motif. Some of
-# these are only dependent on X11, and some contain native source that
-# is required, even in a headless build.
-
-FILES_NO_MOTIF_c = \
- awt_Font.c \
- HeadlessToolkit.c \
- fontpath.c \
- VDrawingArea.c \
- X11Color.c \
- X11Renderer.c \
- X11PMBlitLoops.c \
- X11SurfaceData.c \
- X11FontScaler_md.c \
- X11TextRenderer_md.c \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- GLXGraphicsConfig.c \
- GLXSurfaceData.c \
- AccelGlyphCache.c \
- CUPSfuncs.c
-
-ifeq ($(PLATFORM), macosx)
-FILES_NO_MOTIF_objc = \
- AWTFont.m \
- AWTStrike.m \
- CCharToGlyphMapper.m \
- CGGlyphImages.m \
- CGGlyphOutlines.m \
- CoreTextSupport.m
-endif # PLATFORM
diff --git a/jdk/make/sun/awt/FILES_c_windows.gmk b/jdk/make/sun/awt/FILES_c_windows.gmk
deleted file mode 100644
index ec512b7..0000000
--- a/jdk/make/sun/awt/FILES_c_windows.gmk
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- GraphicsPrimitiveMgr.c \
- Blit.c \
- BlitBg.c \
- ScaledBlit.c \
- FillRect.c \
- FillSpans.c \
- FillParallelogram.c \
- DrawParallelogram.c \
- DrawLine.c \
- DrawRect.c \
- DrawPolygons.c \
- DrawPath.c \
- FillPath.c \
- ProcessPath.c \
- MaskBlit.c \
- MaskFill.c \
- TransformHelper.c \
- AlphaMath.c \
- AlphaMacros.c \
- AnyByte.c \
- ByteBinary1Bit.c \
- ByteBinary2Bit.c \
- ByteBinary4Bit.c \
- ByteIndexed.c \
- ByteGray.c \
- Index8Gray.c \
- Index12Gray.c \
- AnyShort.c \
- Ushort555Rgb.c \
- Ushort565Rgb.c \
- Ushort4444Argb.c \
- Ushort555Rgbx.c \
- UshortGray.c \
- UshortIndexed.c \
- Any3Byte.c \
- ThreeByteBgr.c \
- AnyInt.c \
- IntArgb.c \
- IntArgbPre.c \
- IntArgbBm.c \
- IntRgb.c \
- IntBgr.c \
- IntRgbx.c \
- Any4Byte.c \
- FourByteAbgr.c \
- FourByteAbgrPre.c \
- BufferedMaskBlit.c \
- BufferedRenderPipe.c \
- ShapeSpanIterator.c \
- SpanClipRenderer.c \
- SurfaceData.c \
- Region.c \
- DataBufferNative.c \
- BufImgSurfaceData.c \
- Disposer.c \
- Trace.c \
- img_globals.c \
- gifdecoder.c \
- awt_parseImage.c \
- awt_ImageRep.c \
- awt_ImagingLib.c \
- dither.c \
- imageInitIDs.c \
- debug_assert.c \
- debug_mem.c \
- debug_trace.c \
- debug_util.c \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- WGLGraphicsConfig.c \
- WGLSurfaceData.c \
- AccelGlyphCache.c \
- rect.c
-
-FILES_cpp = \
- CmdIDList.cpp \
- Hashtable.cpp \
- GDIHashtable.cpp \
- Devices.cpp \
- ObjectList.cpp \
- GDIBlitLoops.cpp \
- GDIRenderer.cpp \
- GDIWindowSurfaceData.cpp \
- WindowsFlags.cpp \
- WPrinterJob.cpp \
- awt_AWTEvent.cpp \
- awt_BitmapUtil.cpp \
- awt_Brush.cpp \
- awt_Button.cpp \
- awt_Canvas.cpp \
- awt_Checkbox.cpp \
- awt_Choice.cpp \
- awt_Clipboard.cpp \
- awt_Color.cpp \
- awt_Component.cpp \
- awt_Container.cpp \
- awt_Cursor.cpp \
- awt_DataTransferer.cpp \
- awt_Debug.cpp \
- awt_Dimension.cpp \
- awt_Desktop.cpp \
- awt_DesktopProperties.cpp \
- awt_Dialog.cpp \
- awt_DrawingSurface.cpp \
- awt_FileDialog.cpp \
- awt_Event.cpp \
- awt_Font.cpp \
- awt_Frame.cpp \
- awt_GDIObject.cpp \
- awt_IconCursor.cpp \
- awt_InputEvent.cpp \
- awt_InputMethod.cpp \
- awt_InputTextInfor.cpp \
- awt_Insets.cpp \
- awt_KeyEvent.cpp \
- awt_KeyboardFocusManager.cpp \
- awt_Label.cpp \
- awt_List.cpp \
- awt_Menu.cpp \
- awt_MenuBar.cpp \
- awt_MenuItem.cpp \
- awt_MouseEvent.cpp \
- awt_Object.cpp \
- awt_Palette.cpp \
- awt_Panel.cpp \
- awt_PopupMenu.cpp \
- awt_Pen.cpp \
- awt_PrintControl.cpp \
- awt_PrintDialog.cpp \
- awt_PrintJob.cpp \
- awt_Rectangle.cpp \
- awt_Robot.cpp \
- awt_Scrollbar.cpp \
- awt_ScrollPane.cpp \
- awt_TextArea.cpp \
- awt_TextComponent.cpp \
- awt_TextField.cpp \
- awt_Toolkit.cpp \
- awt_Window.cpp \
- awt_Win32GraphicsEnv.cpp \
- awt_Win32GraphicsDevice.cpp \
- awt_Win32GraphicsConfig.cpp \
- awt_DnDDT.cpp \
- awt_DnDDS.cpp \
- awt_Mlib.cpp \
- awt_new.cpp \
- awt_TrayIcon.cpp \
- awt_DCHolder.cpp \
- awt_ole.cpp \
- ShaderList.cpp \
- D3DBlitLoops.cpp \
- D3DBufImgOps.cpp \
- D3DContext.cpp \
- D3DGlyphCache.cpp \
- D3DGraphicsDevice.cpp \
- D3DMaskBlit.cpp \
- D3DMaskCache.cpp \
- D3DMaskFill.cpp \
- D3DPipelineManager.cpp \
- D3DPaints.cpp \
- D3DRenderer.cpp \
- D3DRenderQueue.cpp \
- D3DResourceManager.cpp \
- D3DSurfaceData.cpp \
- D3DTextRenderer.cpp \
- D3DVertexCacher.cpp \
- ShellFolder2.cpp \
- ThemeReader.cpp \
- ComCtl32Util.cpp \
- DllUtil.cpp \
- initIDs.cpp \
- MouseInfo.cpp
diff --git a/jdk/make/sun/awt/FILES_export_unix.gmk b/jdk/make/sun/awt/FILES_export_unix.gmk
deleted file mode 100644
index 11f65e9..0000000
--- a/jdk/make/sun/awt/FILES_export_unix.gmk
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# FILES_export definitions for Solaris and Linux
-
-FILES_export = \
- sun/font/FontManager.java \
- sun/awt/image/ImageRepresentation.java \
- sun/awt/image/GifImageDecoder.java \
- sun/awt/image/NativeLibLoader.java \
- sun/java2d/loops/Blit.java \
- sun/java2d/loops/BlitBg.java \
- sun/java2d/loops/ScaledBlit.java \
- sun/java2d/loops/TransformBlit.java \
- sun/java2d/loops/FillRect.java \
- sun/java2d/loops/FillSpans.java \
- sun/java2d/loops/FillParallelogram.java \
- sun/java2d/loops/DrawParallelogram.java \
- sun/java2d/loops/DrawGlyphList.java \
- sun/java2d/loops/DrawGlyphListAA.java \
- sun/java2d/loops/DrawGlyphListLCD.java \
- sun/java2d/loops/DrawLine.java \
- sun/java2d/loops/DrawRect.java \
- sun/java2d/loops/DrawPolygons.java \
- sun/java2d/loops/DrawPath.java \
- sun/java2d/loops/FillPath.java \
- sun/java2d/loops/MaskBlit.java \
- sun/java2d/loops/MaskFill.java \
- sun/java2d/loops/TransformHelper.java \
- sun/java2d/loops/GraphicsPrimitiveMgr.java \
- sun/java2d/loops/GraphicsPrimitive.java \
- sun/java2d/pipe/hw/AccelSurface.java \
- sun/java2d/pipe/hw/AccelDeviceEventNotifier.java \
- sun/java2d/pipe/hw/ContextCapabilities.java \
- sun/awt/image/ImagingLib.java \
- sun/java2d/SurfaceData.java \
- sun/java2d/SunGraphics2D.java \
- sun/awt/KeyboardFocusManagerPeerImpl.java \
- sun/awt/image/BufImgSurfaceData.java \
- sun/awt/image/DataBufferNative.java \
- \
- sun/awt/X11InputMethod.java \
- sun/awt/motif/MFontConfiguration.java \
- sun/awt/DebugSettings.java \
- sun/awt/EmbeddedFrame.java \
- sun/awt/PlatformFont.java \
- sun/awt/FontDescriptor.java \
- sun/awt/NativeLibLoader.java \
- sun/awt/X11GraphicsEnvironment.java \
- sun/awt/X11GraphicsDevice.java \
- sun/awt/X11GraphicsConfig.java \
- sun/awt/CharsetString.java \
- sun/awt/UNIXToolkit.java \
- sun/java2d/pipe/BufferedContext.java \
- sun/java2d/pipe/BufferedMaskBlit.java \
- sun/java2d/pipe/BufferedOpCodes.java \
- sun/java2d/pipe/BufferedMaskBlit.java \
- sun/java2d/pipe/BufferedPaints.java \
- sun/java2d/pipe/BufferedRenderPipe.java \
- sun/java2d/pipe/BufferedTextPipe.java \
- sun/java2d/pipe/RenderBuffer.java \
- sun/java2d/pipe/ShapeSpanIterator.java \
- sun/java2d/pipe/SpanClipRenderer.java \
- sun/java2d/pipe/RegionIterator.java \
- sun/awt/image/IntegerComponentRaster.java \
- sun/java2d/cmm/CMSManager.java \
- sun/java2d/cmm/PCMM.java \
- sun/java2d/cmm/ColorTransform.java \
- sun/awt/datatransfer/DataTransferer.java \
- sun/awt/dnd/SunDragSourceContextPeer.java \
- sun/java2d/opengl/OGLBlitLoops.java \
- sun/java2d/opengl/OGLContext.java \
- sun/java2d/opengl/OGLMaskFill.java \
- sun/java2d/opengl/OGLPaints.java \
- sun/java2d/opengl/OGLRenderer.java \
- sun/java2d/opengl/OGLRenderQueue.java \
- sun/java2d/opengl/OGLSurfaceData.java \
- sun/java2d/opengl/OGLTextRenderer.java \
- sun/java2d/opengl/GLXGraphicsConfig.java \
- sun/java2d/opengl/GLXSurfaceData.java \
- sun/java2d/x11/X11PMBlitLoops.java \
- sun/java2d/x11/X11PMBlitBgLoops.java \
- sun/java2d/x11/X11Renderer.java \
- sun/java2d/x11/X11SurfaceData.java \
- com/sun/java/swing/plaf/gtk/GTKEngine.java \
- com/sun/java/swing/plaf/gtk/GTKStyle.java \
- sun/awt/ExtendedKeyCodes.java
-
-
-FILES_export2 = \
- java/awt/AlphaComposite.java \
- java/awt/MouseInfo.java \
- java/awt/Cursor.java \
- java/awt/Graphics.java \
- java/awt/Color.java \
- java/awt/Image.java \
- java/awt/Rectangle.java \
- java/awt/Event.java \
- java/awt/Font.java \
- java/awt/Insets.java \
- java/awt/Point.java \
- java/awt/FontMetrics.java \
- java/awt/Toolkit.java \
- java/awt/Component.java \
- java/awt/Container.java \
- java/awt/Canvas.java \
- java/awt/Button.java \
- java/awt/List.java \
- java/awt/Adjustable.java \
- java/awt/Scrollbar.java \
- java/awt/ScrollPane.java \
- java/awt/ScrollPaneAdjustable.java \
- java/awt/Window.java \
- java/awt/TextField.java \
- java/awt/Label.java \
- java/awt/Choice.java \
- java/awt/TextArea.java \
- java/awt/MenuBar.java \
- java/awt/Menu.java \
- java/awt/MenuComponent.java \
- java/awt/PopupMenu.java \
- java/awt/Dialog.java \
- java/awt/FileDialog.java \
- java/awt/MenuItem.java \
- java/awt/Checkbox.java \
- java/awt/CheckboxMenuItem.java \
- java/awt/CheckboxGroup.java \
- java/awt/Frame.java \
- java/awt/Transparency.java \
- java/awt/AWTException.java \
- java/awt/AWTEvent.java \
- java/awt/AWTKeyStroke.java \
- java/awt/KeyboardFocusManager.java \
- java/awt/Dimension.java \
- java/awt/SystemColor.java \
- java/awt/TrayIcon.java \
- java/awt/DisplayMode.java \
- java/awt/color/ColorSpace.java \
- java/awt/color/ICC_Profile.java \
- java/awt/geom/PathIterator.java \
- java/awt/image/AffineTransformOp.java \
- java/awt/image/ImageConsumer.java \
- java/awt/image/ImageObserver.java \
- java/awt/image/BufferedImage.java \
- java/awt/image/ColorModel.java \
- java/awt/image/ConvolveOp.java \
- java/awt/image/DirectColorModel.java \
- java/awt/image/IndexColorModel.java \
- java/awt/image/DataBuffer.java \
- java/awt/datatransfer/Transferable.java \
- java/awt/datatransfer/DataFlavor.java \
- java/awt/datatransfer/UnsupportedFlavorException.java \
- java/awt/datatransfer/Clipboard.java \
- java/awt/datatransfer/ClipboardOwner.java \
- java/awt/datatransfer/StringSelection.java \
- java/awt/event/AdjustmentEvent.java \
- java/awt/event/KeyEvent.java \
- java/awt/event/MouseEvent.java \
- java/awt/event/MouseWheelEvent.java \
- java/awt/event/FocusEvent.java \
- java/awt/event/InputEvent.java \
- java/awt/event/WindowEvent.java \
- java/awt/event/NativeLibLoader.java \
- java/awt/peer/ComponentPeer.java \
- java/awt/dnd/DnDConstants.java \
- sun/awt/CausedFocusEvent.java
-
-ifeq ($(PLATFORM), macosx)
-ifeq ($(HEADLESS), true)
-FILES_export += \
- sun/awt/SunHints.java \
- sun/font/CCharToGlyphMapper.java \
- sun/font/CFont.java \
- sun/font/CFontManager.java \
- sun/font/CStrike.java \
- sun/font/CStrikeDisposer.java
-endif # HEADLESS
-endif # PLATFORM
diff --git a/jdk/make/sun/awt/FILES_export_windows.gmk b/jdk/make/sun/awt/FILES_export_windows.gmk
deleted file mode 100644
index 81e90e8..0000000
--- a/jdk/make/sun/awt/FILES_export_windows.gmk
+++ /dev/null
@@ -1,252 +0,0 @@
-#
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# FILES_export definitions for Win32
-
-FILES_export = \
- java/awt/AlphaComposite.java \
- java/awt/MouseInfo.java \
- java/awt/Graphics.java \
- java/awt/Color.java \
- java/awt/Image.java \
- java/awt/Rectangle.java \
- java/awt/Event.java \
- java/awt/Font.java \
- java/awt/FontMetrics.java \
- java/awt/Toolkit.java \
- java/awt/Component.java \
- java/awt/Container.java \
- java/awt/Canvas.java \
- java/awt/Button.java \
- java/awt/List.java \
- java/awt/Adjustable.java \
- java/awt/Scrollbar.java \
- java/awt/ScrollPane.java \
- java/awt/ScrollPaneAdjustable.java \
- java/awt/Transparency.java \
- java/awt/Window.java \
- java/awt/TextField.java \
- java/awt/Label.java \
- java/awt/Choice.java \
- java/awt/TextComponent.java \
- java/awt/TextArea.java \
- java/awt/MenuBar.java \
- java/awt/Menu.java \
- java/awt/Dialog.java \
- java/awt/FileDialog.java \
- java/awt/MenuItem.java \
- java/awt/MenuComponent.java \
- java/awt/Checkbox.java \
- java/awt/CheckboxGroup.java \
- java/awt/CheckboxMenuItem.java \
- java/awt/Frame.java \
- java/awt/Insets.java \
- java/awt/Cursor.java \
- java/awt/Dimension.java \
- java/awt/PopupMenu.java \
- java/awt/AWTEvent.java \
- java/awt/AWTException.java \
- java/awt/AWTKeyStroke.java \
- java/awt/KeyboardFocusManager.java \
- java/awt/DisplayMode.java \
- java/awt/TrayIcon.java \
- java/awt/datatransfer/StringSelection.java \
- java/awt/datatransfer/Transferable.java \
- java/awt/dnd/DnDConstants.java \
- java/awt/event/ActionEvent.java \
- java/awt/event/AdjustmentEvent.java \
- java/awt/event/ComponentEvent.java \
- java/awt/event/FocusEvent.java \
- java/awt/event/ItemEvent.java \
- java/awt/event/InputEvent.java \
- java/awt/event/InvocationEvent.java \
- java/awt/event/KeyEvent.java \
- java/awt/event/MouseEvent.java \
- java/awt/event/MouseWheelEvent.java \
- java/awt/event/WindowEvent.java \
- java/awt/event/InputMethodEvent.java \
- java/awt/im/InputMethodHighlight.java \
- java/awt/im/spi/InputMethod.java \
- java/awt/font/TextHitInfo.java \
- java/text/AttributedCharacterIterator.java \
- java/text/AttributedString.java \
- java/awt/geom/PathIterator.java \
- java/awt/image/AffineTransformOp.java \
- java/awt/image/ImageConsumer.java \
- java/awt/image/ImageObserver.java \
- java/awt/image/BufferedImage.java \
- java/awt/image/ColorModel.java \
- java/awt/image/ConvolveOp.java \
- java/awt/image/DirectColorModel.java \
- java/awt/image/IndexColorModel.java \
- java/awt/image/Raster.java \
- java/awt/color/ColorSpace.java \
- java/awt/color/ICC_Profile.java \
- java/awt/peer/ComponentPeer.java \
- java/awt/peer/MenuComponentPeer.java \
- java/io/InputStream.java
-
-FILES_export2 = \
- sun/awt/im/InputMethodContext.java \
- sun/awt/EmbeddedFrame.java \
- sun/awt/KeyboardFocusManagerPeerImpl.java \
- sun/awt/windows/WEmbeddedFrame.java \
- sun/awt/windows/WEmbeddedFramePeer.java \
- sun/awt/Win32FontManager.java \
- sun/awt/Win32GraphicsEnvironment.java \
- sun/awt/Win32GraphicsDevice.java \
- sun/awt/Win32GraphicsConfig.java \
- sun/java2d/SunGraphicsEnvironment.java \
- sun/java2d/SunGraphics2D.java \
- sun/java2d/SurfaceData.java \
- sun/awt/image/IntegerComponentRaster.java \
- sun/awt/image/ImagingLib.java \
- sun/awt/image/BufImgSurfaceData.java \
- sun/awt/image/DataBufferNative.java \
- sun/awt/shell/Win32ShellFolder2.java \
- sun/java2d/windows/GDIBlitLoops.java \
- sun/java2d/windows/GDIRenderer.java \
- sun/java2d/windows/GDIWindowSurfaceData.java \
- sun/java2d/windows/WindowsFlags.java \
- sun/java2d/loops/Blit.java \
- sun/java2d/loops/BlitBg.java \
- sun/java2d/loops/ScaledBlit.java \
- sun/java2d/loops/FillRect.java \
- sun/java2d/loops/FillSpans.java \
- sun/java2d/loops/FillParallelogram.java \
- sun/java2d/loops/DrawParallelogram.java \
- sun/java2d/loops/DrawGlyphList.java \
- sun/java2d/loops/DrawGlyphListAA.java \
- sun/java2d/loops/DrawGlyphListLCD.java \
- sun/java2d/loops/DrawLine.java \
- sun/java2d/loops/DrawRect.java \
- sun/java2d/loops/DrawPolygons.java \
- sun/java2d/loops/DrawPath.java \
- sun/java2d/loops/FillPath.java \
- sun/java2d/loops/MaskBlit.java \
- sun/java2d/loops/MaskFill.java \
- sun/java2d/loops/TransformHelper.java \
- sun/java2d/loops/GraphicsPrimitiveMgr.java \
- sun/java2d/loops/GraphicsPrimitive.java \
- sun/java2d/cmm/CMSManager.java \
- sun/java2d/cmm/PCMM.java \
- sun/java2d/cmm/ColorTransform.java \
- sun/awt/ScrollPaneWheelScroller.java \
- sun/awt/datatransfer/DataTransferer.java \
- sun/awt/datatransfer/SunClipboard.java \
- sun/awt/dnd/SunDragSourceContextPeer.java \
- sun/awt/windows/WToolkitThreadBlockedHandler.java
-
-FILES_export3 = \
- java/awt/CheckboxMenuItem.java \
- java/awt/Menu.java \
- java/awt/MenuBar.java \
- java/awt/MenuComponent.java \
- java/awt/MenuItem.java \
- sun/awt/PlatformFont.java \
- sun/awt/FontDescriptor.java \
- sun/awt/CharsetString.java \
- java/awt/image/DataBuffer.java \
- sun/awt/image/GifImageDecoder.java \
- sun/awt/image/ImageRepresentation.java \
- sun/awt/windows/WCustomCursor.java \
- sun/awt/windows/WDefaultFontCharset.java \
- sun/awt/windows/WButtonPeer.java \
- sun/awt/windows/WCanvasPeer.java \
- sun/awt/windows/WCheckboxPeer.java \
- sun/awt/windows/WCheckboxMenuItemPeer.java \
- sun/awt/windows/WChoicePeer.java \
- sun/awt/windows/WClipboard.java \
- sun/awt/windows/WColor.java \
- sun/awt/windows/WDataTransferer.java \
- sun/awt/windows/WDesktopPeer.java \
- sun/awt/windows/WDesktopProperties.java \
- sun/awt/windows/WDialogPeer.java \
- sun/awt/windows/WDragSourceContextPeer.java \
- sun/awt/windows/WDropTargetContextPeer.java \
- sun/awt/windows/WFileDialogPeer.java \
- sun/awt/windows/WFontPeer.java \
- sun/awt/windows/WFontMetrics.java \
- sun/awt/windows/WFramePeer.java \
- sun/awt/windows/WGlobalCursorManager.java \
- sun/awt/windows/WInputMethod.java \
- sun/awt/windows/WInputMethodDescriptor.java \
- sun/awt/windows/WComponentPeer.java \
- sun/awt/windows/WLabelPeer.java \
- sun/awt/windows/WListPeer.java \
- sun/awt/windows/WMenuBarPeer.java \
- sun/awt/windows/WMenuItemPeer.java \
- sun/awt/windows/WMenuPeer.java \
- sun/awt/windows/WObjectPeer.java \
- sun/awt/windows/WPopupMenuPeer.java \
- sun/awt/windows/WPrintDialog.java \
- sun/awt/windows/WPrintDialogPeer.java \
- sun/awt/windows/WPrinterJob.java \
- sun/awt/windows/WRobotPeer.java \
- sun/awt/windows/WScrollbarPeer.java \
- sun/awt/windows/WScrollPanePeer.java \
- sun/awt/windows/WTextAreaPeer.java \
- sun/awt/windows/WTextComponentPeer.java \
- sun/awt/windows/WTextFieldPeer.java \
- sun/awt/windows/WPanelPeer.java \
- sun/awt/windows/WToolkit.java \
- sun/awt/windows/WWindowPeer.java \
- sun/awt/windows/ThemeReader.java \
- sun/awt/windows/WBufferStrategy.java \
- sun/awt/windows/WTrayIconPeer.java \
- sun/awt/image/ImagingLib.java \
- sun/awt/ExtendedKeyCodes.java \
- sun/java2d/pipe/hw/AccelSurface.java \
- sun/java2d/pipe/hw/AccelDeviceEventNotifier.java \
- sun/java2d/pipe/hw/ContextCapabilities.java \
- sun/java2d/pipe/BufferedContext.java \
- sun/java2d/pipe/BufferedMaskBlit.java \
- sun/java2d/pipe/BufferedOpCodes.java \
- sun/java2d/pipe/BufferedPaints.java \
- sun/java2d/pipe/BufferedRenderPipe.java \
- sun/java2d/pipe/BufferedTextPipe.java \
- sun/java2d/pipe/RenderBuffer.java \
- sun/java2d/pipe/ShapeSpanIterator.java \
- sun/java2d/pipe/SpanClipRenderer.java \
- sun/java2d/pipe/RegionIterator.java \
- sun/java2d/opengl/OGLBlitLoops.java \
- sun/java2d/opengl/OGLContext.java \
- sun/java2d/opengl/OGLMaskFill.java \
- sun/java2d/opengl/OGLPaints.java \
- sun/java2d/opengl/OGLRenderQueue.java \
- sun/java2d/opengl/OGLRenderer.java \
- sun/java2d/opengl/OGLSurfaceData.java \
- sun/java2d/opengl/OGLTextRenderer.java \
- sun/java2d/opengl/WGLGraphicsConfig.java \
- sun/java2d/opengl/WGLSurfaceData.java \
- sun/java2d/d3d/D3DBlitLoops.java \
- sun/java2d/d3d/D3DGraphicsDevice.java \
- sun/java2d/d3d/D3DSurfaceData.java \
- sun/java2d/d3d/D3DMaskFill.java \
- sun/java2d/d3d/D3DPaints.java \
- sun/java2d/d3d/D3DRenderQueue.java \
- sun/java2d/d3d/D3DRenderer.java \
- sun/java2d/d3d/D3DTextRenderer.java \
- sun/java2d/d3d/D3DContext.java
diff --git a/jdk/make/sun/awt/Makefile b/jdk/make/sun/awt/Makefile
deleted file mode 100644
index 9f11638..0000000
--- a/jdk/make/sun/awt/Makefile
+++ /dev/null
@@ -1,648 +0,0 @@
-#
-# Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.awt
-LIBRARY = awt
-PRODUCT = sun
-
-# Tell Defs.gmk that VIS is needed
-VIS_NEEDED=true
-
-# Use highest optimization level
-OPTMIZATION_LEVEL = HIGHEST
-
-include $(BUILDDIR)/common/Defs.gmk
-
-OTHER_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES
-
-ifneq ($(PLATFORM), windows)
-CLASSES_INIT += $(TEMPDIR)/.gen_icons
-endif
-
-#
-# Files
-#
-
-#
-# Include all Java source files in sun/awt and sun/java2d, except for:
-# sun/awt/resources handled by java/awt/Makefile
-# sun/java2d/pisces handled by sun/pisces/Makefile
-#
-AUTO_FILES_JAVA_DIRS = sun/awt sun/java2d com/sun/awt
-AUTO_JAVA_PRUNE = resources pisces
-
-ifeq ($(PLATFORM), windows)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS
-
-#
-# Files
-#
-include FILES_c_windows.gmk
-include FILES_export_windows.gmk
-
-#
-# Prune files that are currently unused on Windows (but still used on
-# Solaris/Linux).
-#
-AUTO_JAVA_PRUNE += RemoteOffScreenImage.java
-
-OTHER_CFLAGS += $(GX_OPTION) -DMLIB_NO_LIBSUNMATH -DUNICODE -D_UNICODE
-OTHER_CXXFLAGS += $(GX_OPTION) -DUNICODE -D_UNICODE
-
-ifeq ($(ARCH_DATA_MODEL), 64)
- OTHER_CFLAGS += -DMLIB_OS64BIT
-endif
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
-endif # PLATFORM
-
-ifneq ($(PLATFORM), windows)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX
-
-#
-# Files
-#
-include FILES_c_unix.gmk
-include FILES_export_unix.gmk
-#
-# Prune the sun/awt/X11 subdirectory, which is handled by sun/xawt/Makefile.
-# Also prune files that are currently unused on Solaris/Linux (but still
-# used on Windows).
-#
-AUTO_JAVA_PRUNE += X11 AWTCharset.java
-
-ifeq ($(PLATFORM), solaris)
-FILES_c = $(FILES_2D_c)
-FILES_c += awt_LoadLibrary.c
-OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
-ifeq ($(CC_VER), 5.8)
- ifndef REMOVE_ALL_WORKAROUNDS
- ifeq ($(ARCH_FAMILY), i586)
- # If on Solaris 11 (or dlfcn.h has unknown_control_flow pragmas in it)
- # we trigger a SS11 bug that causes the compiler to crash (bug 6343678)
- # Here we check to see if we need this workaround and change the opt
- # settings for this one file.
- USE_WORKAROUND:=$(shell $(GREP) unknown_control_flow /usr/include/dlfcn.h)
- ifneq ($(USE_WORKAROUND),)
- ifeq ($(FASTDEBUG), true)
- CFLAGS_DBG/awt_Mlib.o = -xO0 \
- $(warning "WARNING: Using workaround for SS11 bug 6343678, on $@")
- endif
- # Compiler bug 6343678 need to prevent a SEGV in the compiler
- CFLAGS_OPT/awt_Mlib.o = -g \
- $(warning "WARNING: Using workaround for SS11 bug 6343678, on $@")
- endif
- endif
- endif
-endif
-endif
-
-ifeq ($(PLATFORM), linux)
-FILES_c = $(FILES_2D_c)
-FILES_c += awt_LoadLibrary.c
-OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
-OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
-endif
-
-FILES_c += initIDs.c
-
-ifeq ($(PLATFORM), macosx)
-FILES_c = $(FILES_2D_c)
-FILES_c += awt_LoadLibrary.c
-OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
-OTHER_LDLIBS = $(JVMLIB) $(LIBM)
-endif
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
-endif # PLATFORM
-
-ifeq ($(PLATFORM), macosx)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv MAC OS X
-
-#
-# Files
-#
-
-FILES_objc = $(FILES_AWT_objc)
-OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) \
- -framework Cocoa \
- -framework OpenGL \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -framework ApplicationServices \
- -framework AudioToolbox
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MAC OS X
-endif # PLATFORM
-
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS-SPARC
-# solaris-sparc and solaris-sparcv9 both build 'vis'
-ifeq ("$(PLATFORM)-$(ARCH_FAMILY)", "solaris-sparc")
- FILES_c += $(FILES_2D_vis)
- ASFLAGS += -P
- FILES_s += mlib_v_ImageCopy_blk.s
- INLINE_VIS = $(PLATFORM_SRC)/native/sun/awt/medialib/vis_$(ARCH_DATA_MODEL).il
- CFLAGS_sparcv9 = -DMLIB_OS64BIT
-
- CFLAGS += $(CFLAGS_$(ARCH)) -DMLIB_ADD_SUFF $(INLINE_VIS) \
- -I$(SHARE_SRC)/native/sun/awt/medialib \
- -I$(PLATFORM_SRC)/native/sun/awt/medialib \
- -I$(PLATFORM_SRC)/native/sun/java2d/loops
-
-vpath %.c $(PLATFORM_SRC)/native/sun/java2d/loops
-vpath %.c $(SHARE_SRC)/native/sun/awt/medialib
-vpath %.c $(PLATFORM_SRC)/native/sun/awt/medialib
-vpath %.s $(PLATFORM_SRC)/native/sun/awt/medialib
-
-else
- FILES_c += MapAccelFunc.c
-endif
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS-SPARC
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-ifeq ($(PLATFORM), windows)
- RESOURCE_BUNDLES_COMPILED_PROPERTIES += \
- sun/awt/windows/awtLocalization.properties
-endif
-
-#
-# Rules
-#
-ifeq ($(PLATFORM), linux)
- FILES_m = mapfile-vers-linux
- # libawt.so on Linux is statically linked with Motif and contains all the
- # Xm symbols. Mapfile is disabled so the symbols will remain public.
- LDNOMAP=true
-endif
-
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-COMPILEFONTCONFIG_FLAGS =
-ifdef ALT_COMPILEFONTCONFIG_FLAGS
- COMPILEFONTCONFIG_FLAGS += $(ALT_COMPILEFONTCONFIG_FLAGS)
-endif
-build: fontconfigs
-
-ifneq ($(PLATFORM), windows)
-
-GEN_DIR=$(GENSRCDIR)/sun/awt/
-
-ifdef OPENJDK
- ICONS_PATH_PREFIX=$(PLATFORM_SRC)
-else
- ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris
-endif
-
-ICONS = \
- $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
- $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \
- $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \
- $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
-
-ICONPATH=$(SHARE_SRC)/classes/sun/awt/resources
-
-ICONS += \
- $(ICONPATH)/security-icon-bw16.png \
- $(ICONPATH)/security-icon-interim16.png \
- $(ICONPATH)/security-icon-yellow16.png \
- $(ICONPATH)/security-icon-bw24.png \
- $(ICONPATH)/security-icon-interim24.png \
- $(ICONPATH)/security-icon-yellow24.png \
- $(ICONPATH)/security-icon-bw32.png \
- $(ICONPATH)/security-icon-interim32.png \
- $(ICONPATH)/security-icon-yellow32.png \
- $(ICONPATH)/security-icon-bw48.png \
- $(ICONPATH)/security-icon-interim48.png \
- $(ICONPATH)/security-icon-yellow48.png
-
-TEMPDIR_CLASSES = $(TEMPDIR)/classes
-
-generated.clean:
- $(RM) -r $(GEN_DIR)/*.java
- $(RM) -r $(TEMPDIR)/.gen_icons
-
-$(TEMPDIR_CLASSES)/sun/awt/ToBin.class: ToBin.java
- @$(prep-target)
- $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
-
-$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/ToBin.class $(ICONS)
- $(prep-target)
- for i in $(ICONS); do \
- filename=`basename $$i`; \
- name=`$(ECHO) $$filename | $(TR) '\-.' '__'`; \
- classname=$(GEN_DIR)/AWTIcon32_$$name.java; \
- $(RM) $$classname; \
- $(ECHO) "package sun.awt;" >> $$classname ; \
- $(ECHO) "public class AWTIcon32_$$name {" >> $$classname; \
- $(ECHO) "public final static int[] $$name = { " >> $$classname; \
- $(CAT) $$i | \
- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \
- -Djava.awt.headless=true \
- sun.awt.ToBin >> $$classname; \
- $(ECHO) "}; }" >> $$classname; \
- classname=$(GEN_DIR)/AWTIcon64_$$name.java; \
- $(RM) $$classname; \
- $(ECHO) "package sun.awt;" >> $$classname ; \
- $(ECHO) "public class AWTIcon64_$$name {" >> $$classname; \
- $(ECHO) "public final static long[] $$name = { " >> $$classname; \
- $(CAT) $$i | \
- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \
- -Djava.awt.headless=true \
- sun.awt.ToBin >> $$classname; \
- $(ECHO) "}; }" >> $$classname; \
- done
- $(TOUCH) $@
-
-clean clobber:: generated.clean
-endif
-
-
-ifeq ($(PLATFORM), windows)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS
-#
-# Additional dependencies.
-#
-# If make.depend is not working correctly, then it can be omitted
-# if you always build from a clean workspace.
-
-include make.depend
-
-# required additional rules:
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
-endif # PLATFORM
-
-ifneq ($(PLATFORM), windows)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX
-
-ifndef OPENJDK
-build: dgalibs
-endif
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
-endif # PLATFORM
-
-clobber clean:: java2d.clean fontconfigs.clean
-
-ifndef OPENJDK
-clobber clean:: dgalib.clean
-endif
-
-java2d.clean:
- $(RM) -r $(CLASSBINDIR)/sun/java2d .classes.*
-
-#
-# Add to the ambient vpath to pick up files in subdirectories
-#
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/gif
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/cvutils
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/shell
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/medialib
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/debug
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/utility
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe
-vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)/image
-ifeq ($(PLATFORM), windows)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS
-vpath %.cpp $(PLATFORM_SRC)/native/sun/windows
-vpath %.cpp $(PLATFORM_SRC)/native/$(PKGDIR)
-vpath %.cpp $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/windows
-vpath %.cpp $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/d3d
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../font
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
-endif # PLATFORM
-
-ifneq (,$(findstring $(PLATFORM), linux bsd))
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../font
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ LINUX
-endif # PLATFORM
-
-ifeq ($(PLATFORM), macosx)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv MAC OS X
-vpath %.m $(call NativeSrcDirList,,native/com/apple/resources)
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MAC OS X
-endif # PLATFORM
-
-ifeq ($(PLATFORM), windows)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS
-OTHER_LDLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \
- imm32.lib ole32.lib uuid.lib shell32.lib \
- comdlg32.lib winmm.lib comctl32.lib \
- shlwapi.lib delayimp.lib \
- $(JVMLIB) \
- /DELAYLOAD:user32.dll /DELAYLOAD:gdi32.dll \
- /DELAYLOAD:shell32.dll /DELAYLOAD:winmm.dll \
- /DELAYLOAD:winspool.drv /DELAYLOAD:imm32.dll \
- /DELAYLOAD:ole32.dll /DELAYLOAD:comdlg32.dll \
- /DELAYLOAD:comctl32.dll /DELAYLOAD:shlwapi.dll
-
-clean:: awt.clean
-
-awt.clean:
- $(RM) $(TEMPDIR)/awt.ico
- $(RM) $(TEMPDIR)/awt.res
- $(RM) $(TEMPDIR)/hand.cur
- $(RM) $(TEMPDIR)/check.bmp
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
-endif # PLATFORM
-
-ifneq ($(PLATFORM), windows)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX
-
-LIBXTST = -lXtst
-
-# Use -lXmu for EditRes support
-LIBXMU_DBG = -lXmu
-LIBXMU_OPT =
-LIBXMU = $(LIBXMU_$(VARIANT))
-
-#
-# Extra C flags.
-#
-
-
-ifndef OPENJDK
-
-#
-# Solaris X11 Direct Graphics Access library
-#
-
-_DGALIBS_sparc = \
- libxinerama.so \
- libjdgaSUNWcg6.so \
- libjdgaSUNWffb.so \
- libjdgaSUNWm64.so \
- libjdgaSUNWafb.so
-
-_DGALIBS_sparcv9 = \
- libxinerama.so \
- libjdgaSUNWcg6.so \
- libjdgaSUNWffb.so \
- libjdgaSUNWm64.so \
- libjdgaSUNWafb.so
-
-_DGALIBS_i586 = # no i586 library yet
-
-_DGALIBS_amd64 = # no amd64 library yet
-
-DGALIBS = $(_DGALIBS_$(ARCH):%=$(LIBDIR)/$(LIBARCH)/%)
-
-dgalibs: $(DGALIBS)
-
-$(LIBDIR)/$(LIBARCH)/libxinerama.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libxinerama.so
- $(install-file)
- $(call chmod-file, a+x)
-
-$(LIBDIR)/$(LIBARCH)/libjdgaSUNW%.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libjdgaSUNW%.so
- $(install-file)
- $(call chmod-file, a+x)
-
-$(LIBDIR)/$(LIBARCH)/libjdgaSUNWafb.so: $(LIBDIR)/$(LIBARCH)/libjdgaSUNWffb.so
- $(prep-target)
- $(call install-sym-link, libjdgaSUNWffb.so)
-
-clean:: dgalib.clean
-
-dgalib.clean:
- $(RM) $(LIBDIR)/$(LIBARCH)/libjdgaSUNW* $(LIBDIR)/$(LIBARCH)/libxinerama.so
-endif
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
-endif # PLATFORM
-
-#
-# Font configs
-#
-
-ifeq ($(PLATFORM), windows)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS
-
-FONTCONFIGS_SRC = $(PLATFORM_SRC)/classes/sun/awt/windows
-_FONTCONFIGS = \
- fontconfig.properties
-
-FONTCONFIGS_SRC_PREFIX =
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
-endif # PLATFORM
-
-ifeq ($(PLATFORM), linux)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX
-ifdef OPENJDK
-
-FONTCONFIGS_SRC =
-_FONTCONFIGS =
-
-else
-
-FONTCONFIGS_SRC = $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs
-_FONTCONFIGS = \
- fontconfig.properties \
- fontconfig.RedHat.5.properties \
- fontconfig.RedHat.6.properties \
- fontconfig.Turbo.properties \
- fontconfig.SuSE.10.properties \
- fontconfig.SuSE.11.properties
-endif
-
-FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ LINUX
-endif # PLATFORM
-
-ifeq ($(PLATFORM), solaris)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS
-
-FONTCONFIGS_SRC = $(PLATFORM_SRC)/classes/sun/awt/fontconfigs
-_FONTCONFIGS = \
- fontconfig.properties
-
-FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
-endif # PLATFORM
-
-
-ifeq ($(PLATFORM), macosx)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv MAC OS X
-
-FONTCONFIGS_SRC = $(JDK_TOPDIR)/src/macosx/classes/sun/awt/fontconfigs
-_FONTCONFIGS = \
- fontconfig.properties
-
-FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MAC OS X
-endif # PLATFORM
-
-FONTCONFIGS = $(_FONTCONFIGS:%=$(LIBDIR)/%.src)
-BINARYFONTCONFIGS = $(_FONTCONFIGS:%.properties=$(LIBDIR)/%.bfc)
-
-ifneq ("x$(_FONTCONFIGS)", "x")
-fontconfigs: $(FONTCONFIGS) $(BINARYFONTCONFIGS)
-else
-fontconfigs:
-endif
-
-$(LIBDIR)/%.src: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%
- $(install-file)
-
-COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
-
-$(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
- $(COMPILEFONTCONFIG_JARFILE)
- $(prep-target)
- $(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $(COMPILEFONTCONFIG_FLAGS) $< $@
- $(call chmod-file, 444)
- @$(java-vm-cleanup)
-
-ifneq ("x$(_FONTCONFIGS)", "x")
-fontconfigs.clean :
- $(RM) $(FONTCONFIGS)
- $(RM) $(BINARYFONTCONFIGS)
-else
-fontconfigs.clean :
-endif
-
-ifeq ($(PLATFORM), windows)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS
-OTHER_CFLAGS += $(GX_OPTION) -DUNICODE -D_UNICODE
-
-ifeq ($(MILESTONE), internal)
- CPPFLAGS += -DINTERNAL_BUILD
-endif
-
-#
-# Useful variables that name parts of the src tree.
-#
-WINAWT_native = $(PLATFORM_SRC)/native/sun/windows
-WINAWT_COMMON_native = $(PLATFORM_SRC)/native/sun/awt_common
-
-# FIXME: awt shouldn't have to see the VM's private headers.
-# FIXME: if you re-order this list, the build breaks, possibly because
-# of filename collision. Such a collision, if present, is pure
-# evil. Need to investigate this.
-
-OTHER_INCLUDES += -I$(CLASSHDRDIR)/../../java/jvm \
- -I$(OBJDIR) \
- -I$(SHARE_SRC)/native/common \
- -I$(WINAWT_native) \
- -I$(SHARE_SRC)/native/sun/awt/image/cvutils \
- -I$(SHARE_SRC)/native/sun/awt/image \
- -I$(SHARE_SRC)/native/sun/java2d/loops \
- -I$(SHARE_SRC)/native/sun/java2d \
- -I$(PLATFORM_SRC)/native/sun/java2d \
- -I$(SHARE_SRC)/native/sun/java2d/opengl \
- -I$(PLATFORM_SRC)/native/sun/java2d/d3d \
- -I$(PLATFORM_SRC)/native/sun/java2d/opengl \
- -I$(PLATFORM_SRC)/native/sun/java2d/windows \
- -I$(SHARE_SRC)/native/sun/font \
- -I$(SHARE_SRC)/native/sun/java2d/pipe \
- -I$(SHARE_SRC)/native/sun/dc/path \
- -I$(SHARE_SRC)/native/sun/dc/doe \
- -I$(SHARE_SRC)/native/sun/awt/debug \
- -I$(PLATFORM_SRC)/native/sun/awt
-# -I$(WINAWT_COMMON_native)
-
-# this is only required for compiling )/native/sun/awt/medialib/*.c files
-#
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/sun/awt/medialib
-
-#
-# .res file construction.
-#
-
-ifdef OPENJDK
- RC_FLAGS += -i "$(PLATFORM_SRC)/resource/icons"
-else
- RC_FLAGS += -i "$(CLOSED_SRC)/windows/native/sun/windows"
-endif
-VERSIONINFO_RESOURCE = $(WINAWT_native)/awt.rc
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
-endif # PLATFORM
-
-ifneq ($(PLATFORM), windows)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX
-
-#
-# Other extra flags needed for compiling.
-#
-
-ifeq ($(PLATFORM), linux)
-CPPFLAGS += -I$(OPENWIN_HOME)/include \
- -I$(OPENWIN_HOME)/include/X11/extensions \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
-endif
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
- -I$(SHARE_SRC)/native/$(PKGDIR)/image \
- -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
- -I$(SHARE_SRC)/native/$(PKGDIR)/shell \
- -I$(SHARE_SRC)/native/$(PKGDIR)/medialib \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11 \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
- -I$(PLATFORM_SRC)/native/$(PKGDIR) \
- $(EVENT_MODEL)
-
-ifeq ($(PLATFORM), linux)
-LDFLAGS += -L$(OPENWIN_LIB)
-endif
-
-LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
- $(AWT_RUNPATH)
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
-endif # PLATFORM
-
-CLASSES.export += java.io.InputStream \
- java.lang.Integer \
- java.lang.ThreadGroup
-
-.PHONY: dgalibs dgalib.clean fontconfigs fontconfigs.clean generated.clean
-
diff --git a/jdk/make/sun/awt/README b/jdk/make/sun/awt/README
deleted file mode 100644
index 2fe5bb6..0000000
--- a/jdk/make/sun/awt/README
+++ /dev/null
@@ -1,26 +0,0 @@
-README:
-
-This directory builds the new version of the Windows AWT. It's been built
-successfully with Visual C++ 4.1, but since it uses very little of VC++'s
-runtime, it will probably work with other versions of that compiler.
-
-Included in this project is a generated file, make.depend, which lists
-all interdependencies of the source files. This file is generated *on
-Solaris or Linux* with the following command:
-
- % gnumake -f Depend.mak
-
-This step only needs to be run when new files are added to the project,
-or include statements are changed.
-
-Also, if new CClassHeader dependencies are added for Java class files
-that are not built from a Java source file listed in java_awt.jmk or
-windows_awt.jmk then you need to update the FILES_java list in the
-"else" part of the "ifdef JFILES" branch in Depend.mak.
-At some point we should look at a way to share the explicit list of
-exported files between Depend.mak and GNUmakefile.
-
-****NOTE****
- In order to run this command, the executable
-/usr/openwin/bin/makedepend is required to be in your $PATH.
-****NOTE****
diff --git a/jdk/make/sun/awt/ToBin.java b/jdk/make/sun/awt/ToBin.java
deleted file mode 100644
index db97240..0000000
--- a/jdk/make/sun/awt/ToBin.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt;
-
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-import java.awt.*;
-
-public class ToBin {
- public static void main(String[] args) throws Exception {
- BufferedImage im = ImageIO.read(System.in);
- BufferedImage bi = null;
- int iconWidth = im.getWidth(null);
- int iconHeight = im.getHeight(null);
- if (im != null && iconHeight != 0 && iconWidth != 0) {
- bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB);
- Graphics g = bi.getGraphics();
- try {
- g.drawImage(im, 0, 0, iconWidth, iconHeight, null);
- } finally {
- g.dispose();
- }
- }
- DataBuffer srcBuf = bi.getData().getDataBuffer();
- int[] buf = ((DataBufferInt)srcBuf).getData();
- System.out.print(iconWidth + ",");
- System.out.println(iconHeight + ",");
- for (int i = 0; i < buf.length; i++) {
- System.out.print("0x" + Integer.toHexString(buf[i]) + ", ");
- if (i % 10 == 0) {
- System.out.println();
- }
- }
- }
-}
diff --git a/jdk/make/sun/awt/make.depend b/jdk/make/sun/awt/make.depend
deleted file mode 100644
index 85097bc..0000000
--- a/jdk/make/sun/awt/make.depend
+++ /dev/null
@@ -1,357 +0,0 @@
-$(OBJDIR)/AccelGlyphCache.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/AlphaMacros.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/AlphaMath.obj:: ../../../src/share/native/sun/java2d/loops/AlphaMath.h
-
-$(OBJDIR)/Any3Byte.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/Any3Byte.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/Any4Byte.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/Any4Byte.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/AnyByte.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByte.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/AnyInt.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/AnyShort.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/awt_AWTEvent.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_BitmapUtil.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_BitmapUtil.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Brush.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Button.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Button.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WButtonPeer.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Button.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Canvas.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsConfig.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Checkbox.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Checkbox.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WCheckboxPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Checkbox.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Choice.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Choice.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Toolkit.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WChoicePeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Choice.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dimension.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Clipboard.obj:: $(CLASSHDRDIR)/sun_awt_windows_WClipboard.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Clipboard.h ../../../src/windows/native/sun/windows/awt_DataTransferer.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Color.obj:: $(CLASSHDRDIR)/sun_awt_windows_WColor.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Color.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Component.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Color.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_InputMethodEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_MouseWheelEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Insets.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_Toolkit.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WInputMethod.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPanelPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jawt.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_BitmapUtil.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Cursor.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dimension.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_InputEvent.h ../../../src/windows/native/sun/windows/awt_InputTextInfor.h ../../../src/windows/native/sun/windows/awt_Insets.h ../../../src/windows/native/sun/windows/awt_KeyEvent.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_MouseEvent.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Container.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Cursor.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Cursor.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WCustomCursor.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WGlobalCursorManager.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Cursor.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_IconCursor.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_DataTransferer.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_TextComponent.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDataTransferer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/common/locale_str.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_DataTransferer.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_TextComponent.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_DCHolder.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_DCHolder.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_ole.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Debug.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Desktop.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_DesktopProperties.obj:: $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_windows_WDesktopProperties.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DesktopProperties.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Dialog.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Dimension.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dimension.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_DnDDS.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_dnd_DnDConstants.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_dnd_SunDragSourceContextPeer.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDragSourceContextPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Cursor.h ../../../src/windows/native/sun/windows/awt_DataTransferer.h ../../../src/windows/native/sun/windows/awt_DCHolder.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DnDDS.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_ole.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_DnDDT.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_dnd_DnDConstants.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDropTargetContextPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_DataTransferer.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DnDDS.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_ole.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_DrawingSurface.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jawt.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jawt_md.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DrawingSurface.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Event.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Event.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_FileDialog.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_FileDialog.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFileDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_FileDialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Font.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDefaultFontCharset.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFontPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/Disposer.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Frame.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/java_lang_Integer.h $(CLASSHDRDIR)/sun_awt_EmbeddedFrame.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WEmbeddedFrame.h $(CLASSHDRDIR)/sun_awt_windows_WEmbeddedFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_IconCursor.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_GDIObject.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_IconCursor.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_IconCursor.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_ImageRep.obj:: $(CLASSHDRDIR)/sun_awt_image_ImageRepresentation.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/image/awt_parseImage.h ../../../src/share/native/sun/awt/image/imageInitIDs.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/awt_ImagingLib.obj:: $(CLASSHDRDIR)/java_awt_color_ColorSpace.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_image_BufferedImage.h $(CLASSHDRDIR)/java_awt_image_ConvolveOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_image_ImagingLib.h $(CLASSHDRDIR)/sun_awt_image_IntegerComponentRaster.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/image/awt_parseImage.h ../../../src/share/native/sun/awt/image/imageInitIDs.h ../../../src/share/native/sun/awt/medialib/awt_ImagingLib.h ../../../src/share/native/sun/awt/medialib/mlib_image_get.h ../../../src/share/native/sun/awt/medialib/mlib_image_types.h ../../../src/share/native/sun/awt/medialib/mlib_status.h ../../../src/share/native/sun/awt/medialib/mlib_types.h ../../../src/share/native/sun/awt/medialib/safe_alloc.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/awt_Mlib.h
-
-$(OBJDIR)/awt_InputEvent.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_InputEvent.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_InputMethod.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputMethodEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WInputMethod.h $(CLASSHDRDIR)/sun_awt_windows_WInputMethodDescriptor.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/common/locale_str.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_InputTextInfor.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_InputTextInfor.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Insets.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Insets.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_KeyboardFocusManager.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_KeyboardFocusManager.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_KeyEvent.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_KeyEvent.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Label.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Label.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WLabelPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Label.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_List.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_List.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WListPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dimension.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_List.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Menu.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_MenuBar.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_MenuItem.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_CheckboxMenuItem.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_Toolkit.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCheckboxMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DesktopProperties.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Mlib.obj:: $(CLASSHDRDIR)/java_awt_image_BufferedImage.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/medialib/awt_ImagingLib.h ../../../src/share/native/sun/awt/medialib/mlib_image_get.h ../../../src/share/native/sun/awt/medialib/mlib_image_types.h ../../../src/share/native/sun/awt/medialib/mlib_status.h ../../../src/share/native/sun/awt/medialib/mlib_types.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt_Mlib.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_MouseEvent.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_MouseEvent.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_new.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_new.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Object.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_ole.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_ole.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Palette.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_CustomPaletteDef.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/img_util_md.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Panel.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Panel.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_parseImage.obj:: $(CLASSHDRDIR)/java_awt_color_ColorSpace.h $(CLASSHDRDIR)/java_awt_image_BufferedImage.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_image_ImagingLib.h $(CLASSHDRDIR)/sun_awt_image_IntegerComponentRaster.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/image/awt_parseImage.h ../../../src/share/native/sun/awt/image/imageInitIDs.h ../../../src/share/native/sun/awt/medialib/awt_ImagingLib.h ../../../src/share/native/sun/awt/medialib/mlib_image_get.h ../../../src/share/native/sun/awt/medialib/mlib_image_types.h ../../../src/share/native/sun/awt/medialib/mlib_status.h ../../../src/share/native/sun/awt/medialib/mlib_types.h ../../../src/share/native/sun/awt/medialib/safe_alloc.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/awt_Mlib.h
-
-$(OBJDIR)/awt_Pen.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_PopupMenu.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_PopupMenu.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPopupMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Event.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_PopupMenu.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_PrintControl.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_PrintControl.h ../../../src/windows/native/sun/windows/awt_PrintDialog.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_PrintDialog.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPrintDialog.h $(CLASSHDRDIR)/sun_awt_windows_WPrintDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_PrintControl.h ../../../src/windows/native/sun/windows/awt_PrintDialog.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_PrintJob.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPrinterJob.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_PrintControl.h ../../../src/windows/native/sun/windows/awt_PrintDialog.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Rectangle.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Rectangle.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Robot.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WRobotPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Robot.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Scrollbar.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Scrollbar.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WScrollbarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Scrollbar.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_ScrollPane.obj:: $(CLASSHDRDIR)/java_awt_Adjustable.h $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_AdjustmentEvent.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Insets.h $(CLASSHDRDIR)/java_awt_Scrollbar.h $(CLASSHDRDIR)/java_awt_ScrollPane.h $(CLASSHDRDIR)/java_awt_ScrollPaneAdjustable.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WScrollbarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WScrollPanePeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Insets.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Panel.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Scrollbar.h ../../../src/windows/native/sun/windows/awt_ScrollPane.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_TextArea.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_TextArea.h $(CLASSHDRDIR)/java_awt_TextComponent.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextAreaPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_TextArea.h ../../../src/windows/native/sun/windows/awt_TextComponent.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_TextComponent.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_TextComponent.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_TextComponent.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_TextField.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_TextComponent.h $(CLASSHDRDIR)/java_awt_TextField.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextFieldPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_TextComponent.h ../../../src/windows/native/sun/windows/awt_TextField.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Toolkit.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputMethodEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_FileDialog.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_List.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_ComponentPeer.h $(CLASSHDRDIR)/java_awt_PopupMenu.h $(CLASSHDRDIR)/java_awt_Toolkit.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFileDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WListPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPopupMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jawt.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jawt_md.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Clipboard.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Cursor.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DesktopProperties.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_DnDDS.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_DrawingSurface.h ../../../src/windows/native/sun/windows/awt_FileDialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_InputEvent.h ../../../src/windows/native/sun/windows/awt_KeyEvent.h ../../../src/windows/native/sun/windows/awt_List.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_new.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_PopupMenu.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/CmdIDList.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/DllUtil.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_TrayIcon.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_ActionEvent.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_TrayIcon.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WTrayIconPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_TrayIcon.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Win32GraphicsConfig.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_image_DataBuffer.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_Win32GraphicsConfig.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsConfig.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Win32GraphicsDevice.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_color_ColorSpace.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_image_DataBuffer.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_Win32GraphicsDevice.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/awt/image/dither.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/img_util_md.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Win32GraphicsEnv.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_Win32FontManager.h $(CLASSHDRDIR)/sun_awt_Win32GraphicsEnvironment.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/java2d/windows/WindowsFlags.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/DllUtil.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/awt_Window.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Container.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_ComponentEvent.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Insets.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_BitmapUtil.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_IconCursor.h ../../../src/windows/native/sun/windows/awt_Insets.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Panel.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/Blit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_Blit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/BlitBg.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_BlitBg.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/BufferedMaskBlit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedMaskBlit.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedOpCodes.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntBgr.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/BufferedRenderPipe.obj:: $(CLASSHDRDIR)/sun_java2d_pipe_BufferedOpCodes.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedRenderPipe.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/BufImgSurfaceData.obj:: $(CLASSHDRDIR)/sun_awt_image_BufImgSurfaceData.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/image/BufImgSurfaceData.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/img_util_md.h
-
-$(OBJDIR)/ByteBinary1Bit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByteBinary.h ../../../src/share/native/sun/java2d/loops/ByteBinary1Bit.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/ByteBinary2Bit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByteBinary.h ../../../src/share/native/sun/java2d/loops/ByteBinary2Bit.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/ByteBinary4Bit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByteBinary.h ../../../src/share/native/sun/java2d/loops/ByteBinary4Bit.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/ByteGray.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/Index8Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/ByteIndexed.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/CmdIDList.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/CmdIDList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/ComCtl32Util.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/D3DBlitLoops.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DBlitLoops.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntBgr.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/Ushort555Rgb.h ../../../src/share/native/sun/java2d/loops/Ushort565Rgb.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DBlitLoops.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/D3DBufImgOps.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DBufImgOps.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/D3DContext.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DBufImgOps.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DGlyphCache.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPaints.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DShaders.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DTextRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/D3DGlyphCache.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DGlyphCache.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DTextRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/D3DGraphicsDevice.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DGraphicsDevice.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/D3DMaskBlit.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskBlit.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/D3DMaskCache.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/D3DMaskFill.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DMaskFill.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskFill.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/D3DPaints.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DPaints_MultiGradient.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPaints.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/D3DPipelineManager.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DBadHardware.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/WindowsFlags.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/D3DRenderer.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DRenderer.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedRenderPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/D3DRenderQueue.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DBlitLoops.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedOpCodes.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedRenderPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DBlitLoops.h ../../../src/windows/native/sun/java2d/d3d/D3DBufImgOps.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskBlit.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskFill.h ../../../src/windows/native/sun/java2d/d3d/D3DPaints.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DTextRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/D3DResourceManager.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPaints.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DTextRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/D3DSurfaceData.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_BitmapUtil.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/D3DTextRenderer.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DTextRenderer.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DGlyphCache.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DTextRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/D3DVertexCacher.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPaints.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/DataBufferNative.obj:: $(CLASSHDRDIR)/sun_awt_image_DataBufferNative.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/debug_assert.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/debug_mem.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/debug_trace.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/debug_util.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/Devices.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/Disposer.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/Disposer.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/dither.obj:: ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/awt/image/dither.h ../../../src/windows/native/sun/windows/colordata.h
-
-$(OBJDIR)/DllUtil.obj:: ../../../src/windows/native/sun/windows/DllUtil.h
-
-$(OBJDIR)/DrawLine.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_DrawLine.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/DrawParallelogram.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_DrawParallelogram.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/ParallelogramUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/DrawPath.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_DrawPath.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/DrawPath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/ProcessPath.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/DrawPolygons.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_DrawPolygons.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/DrawRect.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_DrawRect.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/FillParallelogram.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_FillParallelogram.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/ParallelogramUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/FillPath.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_FillPath.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/DrawPath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/ProcessPath.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/FillRect.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_FillRect.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/FillSpans.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_FillSpans.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/FourByteAbgr.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/Any4Byte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/FourByteAbgr.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/FourByteAbgrPre.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/Any4Byte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/FourByteAbgrPre.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/GDIBlitLoops.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_windows_GDIBlitLoops.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/GDIHashtable.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/GDIRenderer.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_geom_PathIterator.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_windows_GDIRenderer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/GDIWindowSurfaceData.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_windows_GDIWindowSurfaceData.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/Disposer.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/java2d/windows/WindowsFlags.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/gifdecoder.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/GraphicsPrimitiveMgr.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_GraphicsPrimitiveMgr.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/Hashtable.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/imageInitIDs.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/image/imageInitIDs.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/img_colors.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/img_globals.obj:: $(CLASSHDRDIR)/java_awt_image_DirectColorModel.h $(CLASSHDRDIR)/java_awt_image_IndexColorModel.h $(CLASSHDRDIR)/java_awt_Transparency.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/windows/javavm/export/jni_md.h
-
-$(OBJDIR)/Index12Gray.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/Index8Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/Index8Gray.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/Index8Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/initIDs.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/IntArgb.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/IntArgbBm.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/IntArgbPre.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/IntBgr.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/Index8Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntBgr.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/IntRgb.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/IntRgbx.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/IntRgbx.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/MaskBlit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_MaskBlit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/MaskFill.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_MaskFill.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/ParallelogramUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/MouseInfo.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/ObjectList.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/OGLBlitLoops.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLBlitLoops.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLBlitLoops.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/OGLBufImgOps.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLBufImgOps.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/OGLContext.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/OGLFuncs.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/OGLMaskBlit.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLMaskBlit.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/OGLMaskFill.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLMaskFill.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLMaskFill.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/opengl/OGLVertexCache.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/OGLPaints.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedPaints.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLPaints.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/OGLRenderer.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLRenderer.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedRenderPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderer.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/OGLRenderQueue.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLBlitLoops.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedOpCodes.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedRenderPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLBlitLoops.h ../../../src/share/native/sun/java2d/opengl/OGLBufImgOps.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLMaskBlit.h ../../../src/share/native/sun/java2d/opengl/OGLMaskFill.h ../../../src/share/native/sun/java2d/opengl/OGLPaints.h ../../../src/share/native/sun/java2d/opengl/OGLRenderer.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/opengl/OGLTextRenderer.h ../../../src/share/native/sun/java2d/opengl/OGLVertexCache.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/OGLSurfaceData.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/OGLTextRenderer.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLTextRenderer.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/opengl/OGLTextRenderer.h ../../../src/share/native/sun/java2d/opengl/OGLVertexCache.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/OGLVertexCache.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLPaints.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/opengl/OGLVertexCache.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
-
-$(OBJDIR)/ProcessPath.obj:: $(CLASSHDRDIR)/java_awt_geom_PathIterator.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/ProcessPath.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/Region.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h
-
-$(OBJDIR)/ScaledBlit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_ScaledBlit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/ShapeSpanIterator.obj:: $(CLASSHDRDIR)/java_awt_geom_PathIterator.h $(CLASSHDRDIR)/sun_java2d_pipe_ShapeSpanIterator.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/pipe/PathConsumer2D.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/ShellFolder2.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/SpanClipRenderer.obj:: $(CLASSHDRDIR)/sun_java2d_pipe_RegionIterator.h $(CLASSHDRDIR)/sun_java2d_pipe_SpanClipRenderer.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/SurfaceData.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/Disposer.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/ThemeReader.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_ThemeReader.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/ThreeByteBgr.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/Any3Byte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/Trace.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h
-
-$(OBJDIR)/TransformHelper.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_loops_TransformHelper.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/Ushort4444Argb.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/Ushort4444Argb.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/Ushort555Rgb.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/Ushort555Rgb.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/Ushort555Rgbx.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/Ushort555Rgbx.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/Ushort565Rgb.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/Ushort4444Argb.h ../../../src/share/native/sun/java2d/loops/Ushort565Rgb.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/UshortGray.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/UshortIndexed.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/loops/UshortIndexed.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
-
-$(OBJDIR)/WGLGraphicsConfig.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_opengl_WGLGraphicsConfig.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h ../../../src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h ../../../src/windows/native/sun/java2d/opengl/WGLSurfaceData.h
-
-$(OBJDIR)/WGLSurfaceData.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_opengl_WGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h ../../../src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h ../../../src/windows/native/sun/java2d/opengl/WGLSurfaceData.h
-
-$(OBJDIR)/WindowsFlags.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/WindowsFlags.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h
-
-$(OBJDIR)/WPrinterJob.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_PrintControl.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h
diff --git a/jdk/make/sun/awt/mapfile-mawt-vers b/jdk/make/sun/awt/mapfile-mawt-vers
deleted file mode 100644
index 6cc59bd..0000000
--- a/jdk/make/sun/awt/mapfile-mawt-vers
+++ /dev/null
@@ -1,285 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-# Java_java_awt_KeyboardFocusManager_getGlobalHeavyweightFocusOwner;
-
-# Define public interface.
-# These are the libmawt exports. See mapfile-vers for the libawt exports
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
-
- Java_sun_awt_DefaultMouseInfoPeer_fillPointWithCoords;
- Java_sun_awt_DefaultMouseInfoPeer_isWindowUnderMouse;
- Java_java_awt_AWTEvent_nativeSetSource;
- Java_java_awt_Checkbox_initIDs;
- Java_java_awt_Component_initIDs;
- Java_java_awt_Dialog_initIDs;
- Java_java_awt_Font_initIDs;
- Java_java_awt_KeyboardFocusManager_initIDs;
- Java_java_awt_Menu_initIDs;
- Java_java_awt_MenuComponent_initIDs;
- Java_java_awt_MenuItem_initIDs;
- Java_java_awt_Scrollbar_initIDs;
- Java_java_awt_ScrollPane_initIDs;
- Java_java_awt_TextArea_initIDs;
- Java_sun_awt_FontDescriptor_initIDs;
- Java_sun_awt_KeyboardFocusManagerPeerImpl_clearNativeGlobalFocusOwner;
- Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusOwner;
- Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusedWindow;
- Java_sun_awt_UNIXToolkit_check_1gtk;
- Java_sun_awt_UNIXToolkit_load_1gtk;
- Java_sun_awt_UNIXToolkit_unload_1gtk;
- Java_sun_awt_UNIXToolkit_load_1stock_1icon;
- Java_sun_awt_UNIXToolkit_load_1gtk_1icon;
- Java_sun_awt_UNIXToolkit_nativeSync;
- Java_sun_awt_X11InputMethod_disposeXIC;
- Java_sun_awt_X11InputMethod_isCompositionEnabledNative;
- Java_sun_awt_X11InputMethod_resetXIC;
- Java_sun_awt_X11InputMethod_setCompositionEnabledNative;
- Java_sun_awt_X11InputMethod_turnoffStatusWindow;
- Java_sun_awt_SunToolkit_closeSplashScreen;
- Java_sun_awt_PlatformFont_initIDs;
- Java_sun_awt_X11GraphicsConfig_init;
- Java_sun_awt_X11GraphicsConfig_dispose;
- Java_sun_awt_X11GraphicsConfig_pGetBounds;
- Java_sun_awt_X11GraphicsConfig_getNumColors;
- Java_sun_awt_X11GraphicsConfig_getXResolution;
- Java_sun_awt_X11GraphicsConfig_getYResolution;
- Java_sun_awt_X11GraphicsConfig_createBackBuffer;
- Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
- Java_sun_awt_X11GraphicsConfig_swapBuffers;
- Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
- Java_sun_awt_X11GraphicsDevice_isDBESupported;
- Java_sun_awt_X11GraphicsDevice_getDisplay;
- Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
- Java_sun_awt_X11GraphicsDevice_getNumConfigs;
- Java_sun_awt_X11GraphicsDevice_initIDs;
- Java_sun_awt_X11GraphicsDevice_initXrandrExtension;
- Java_sun_awt_X11GraphicsDevice_enterFullScreenExclusive;
- Java_sun_awt_X11GraphicsDevice_exitFullScreenExclusive;
- Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode;
- Java_sun_awt_X11GraphicsDevice_enumDisplayModes;
- Java_sun_awt_X11GraphicsDevice_configDisplayMode;
- Java_sun_awt_X11GraphicsDevice_resetNativeData;
- Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
- Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
- Java_sun_awt_X11GraphicsEnvironment_getDisplayString;
- Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
- Java_sun_awt_X11GraphicsEnvironment_initDisplay;
- Java_sun_awt_X11GraphicsEnvironment_initGLX;
- 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;
- Java_java_awt_Container_initIDs;
- Java_java_awt_Cursor_finalizeImpl;
- Java_java_awt_Cursor_initIDs;
- Java_java_awt_Event_initIDs;
- Java_java_awt_event_InputEvent_initIDs;
- Java_java_awt_event_KeyEvent_initIDs;
- Java_java_awt_FileDialog_initIDs;
- Java_java_awt_Frame_initIDs;
- Java_java_awt_Insets_initIDs;
- Java_java_awt_TextField_initIDs;
- Java_java_awt_Window_initIDs;
- Java_sun_awt_X11GraphicsConfig_init;
- Java_sun_awt_X11GraphicsConfig_initIDs;
- Java_sun_awt_X11GraphicsConfig_makeColorModel;
- Java_sun_awt_X11GraphicsDevice_getConfigVisualId;
- Java_sun_awt_X11GraphicsDevice_getConfigColormap;
- Java_sun_awt_X11GraphicsDevice_getConfigDepth;
-
- Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
- Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask;
- Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
- Java_sun_java2d_x11_X11Renderer_XFillSpans;
- Java_sun_java2d_x11_X11Renderer_XDrawArc;
- Java_sun_java2d_x11_X11Renderer_XDrawLine;
- Java_sun_java2d_x11_X11Renderer_XDrawOval;
- Java_sun_java2d_x11_X11Renderer_XDrawPoly;
- Java_sun_java2d_x11_X11Renderer_XDrawRect;
- Java_sun_java2d_x11_X11Renderer_XDrawRoundRect;
- Java_sun_java2d_x11_X11Renderer_XDoPath;
- Java_sun_java2d_x11_X11Renderer_XFillArc;
- Java_sun_java2d_x11_X11Renderer_XFillOval;
- Java_sun_java2d_x11_X11Renderer_XFillPoly;
- Java_sun_java2d_x11_X11Renderer_XFillRect;
- Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
- Java_sun_java2d_x11_X11Renderer_devCopyArea;
- Java_sun_java2d_x11_X11SurfaceData_initIDs;
- Java_sun_java2d_x11_X11SurfaceData_initOps;
- Java_sun_java2d_x11_X11SurfaceData_initSurface;
- Java_sun_java2d_x11_X11SurfaceData_isDgaAvailable;
- Java_sun_java2d_x11_X11SurfaceData_isShmPMAvailable;
- Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode;
- Java_sun_java2d_x11_X11SurfaceData_XSetXorMode;
- Java_sun_java2d_x11_X11SurfaceData_XSetForeground;
-
- Java_sun_java2d_x11_XSurfaceData_initOps;
- Java_sun_java2d_x11_XSurfaceData_XCreateGC;
- Java_sun_java2d_x11_XSurfaceData_XResetClip;
- Java_sun_java2d_x11_XSurfaceData_XSetClip;
- Java_sun_java2d_x11_XSurfaceData_flushNativeSurface;
- Java_sun_java2d_x11_XSurfaceData_isDrawableValid;
- Java_sun_java2d_x11_XSurfaceData_setInvalid;
- Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures;
- Java_sun_java2d_xr_XRSurfaceData_initXRPicture;
- Java_sun_java2d_xr_XRSurfaceData_initIDs;
- Java_sun_java2d_xr_XRSurfaceData_XRInitSurface;
- Java_sun_java2d_xr_XRSurfaceData_freeXSDOPicture;
- Java_sun_java2d_xr_XRBackendNative_initIDs;
- Java_sun_java2d_xr_XIDGenerator_bufferXIDs;
- Java_sun_java2d_xr_XRBackendNative_freeGC;
- Java_sun_java2d_xr_XRBackendNative_createGC;
- Java_sun_java2d_xr_XRBackendNative_createPixmap;
- Java_sun_java2d_xr_XRBackendNative_createPictureNative;
- Java_sun_java2d_xr_XRBackendNative_freePicture;
- Java_sun_java2d_xr_XRBackendNative_freePixmap;
- Java_sun_java2d_xr_XRBackendNative_setPictureRepeat;
- Java_sun_java2d_xr_XRBackendNative_setGCExposures;
- Java_sun_java2d_xr_XRBackendNative_setGCForeground;
- Java_sun_java2d_xr_XRBackendNative_copyArea;
- Java_sun_java2d_xr_XRBackendNative_renderComposite;
- Java_sun_java2d_xr_XRBackendNative_renderRectangle;
- Java_sun_java2d_xr_XRBackendNative_XRenderRectanglesNative;
- Java_sun_java2d_xr_XRBackendNative_XRSetTransformNative;
- Java_sun_java2d_xr_XRBackendNative_XRCreateLinearGradientPaintNative;
- Java_sun_java2d_xr_XRBackendNative_XRCreateRadialGradientPaintNative;
- Java_sun_java2d_xr_XRBackendNative_setFilter;
- Java_sun_java2d_xr_XRBackendNative_XRSetClipNative;
- Java_sun_java2d_xr_XRBackendNative_putMaskNative;
- Java_sun_java2d_xr_XRBackendNative_XRAddGlyphsNative;
- Java_sun_java2d_xr_XRBackendNative_XRFreeGlyphsNative;
- Java_sun_java2d_xr_XRBackendNative_XRenderCreateGlyphSetNative;
- Java_sun_java2d_xr_XRBackendNative_XRenderCompositeTextNative;
- Java_sun_java2d_xr_XRBackendNative_setGCMode;
- Java_sun_java2d_xr_XRBackendNative_GCRectanglesNative;
- Java_sun_java2d_xr_XRUtils_initFormatPtrs;
- Java_sun_java2d_xr_XRBackendNative_renderCompositeTrapezoidsNative;
- XRT_DrawGlyphList;
-
- Java_sun_java2d_opengl_OGLContext_getOGLIdString;
- Java_sun_java2d_opengl_OGLMaskFill_maskFill;
- Java_sun_java2d_opengl_OGLRenderer_drawPoly;
- Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer;
- Java_sun_java2d_opengl_OGLSurfaceData_initTexture;
- Java_sun_java2d_opengl_OGLSurfaceData_initFBObject;
- Java_sun_java2d_opengl_OGLSurfaceData_initFlipBackbuffer;
- Java_sun_java2d_opengl_OGLSurfaceData_getTextureID;
- Java_sun_java2d_opengl_OGLSurfaceData_getTextureTarget;
- Java_sun_java2d_opengl_OGLTextRenderer_drawGlyphList;
- Java_sun_java2d_opengl_GLXGraphicsConfig_getGLXConfigInfo;
- Java_sun_java2d_opengl_GLXGraphicsConfig_initConfig;
- Java_sun_java2d_opengl_GLXGraphicsConfig_getOGLCapabilities;
- Java_sun_java2d_opengl_GLXSurfaceData_initOps;
- Java_sun_java2d_opengl_GLXSurfaceData_initPbuffer;
-
- Java_sun_print_CUPSPrinter_initIDs;
- Java_sun_print_CUPSPrinter_getCupsServer;
- Java_sun_print_CUPSPrinter_getCupsPort;
- Java_sun_print_CUPSPrinter_canConnect;
- Java_sun_print_CUPSPrinter_getMedia;
- Java_sun_print_CUPSPrinter_getPageSizes;
-
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1arrow;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box_1gap;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1check;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1expander;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1extension;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1flat_1box;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1focus;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1handle;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1hline;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1option;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1shadow;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1slider;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1vline;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1background;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeStartPainting;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeFinishPainting;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1switch_1theme;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1get_1gtk_1setting;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeSetRangeValue;
- Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetXThickness;
- Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetYThickness;
- 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;
- awt_GetDrawingSurface;
- awt_FreeDrawingSurface;
- awt_GetComponent;
-
- X11SurfaceData_GetOps;
- getDefaultConfig;
- Java_sun_font_FontConfigManager_getFontConfig;
- Java_sun_font_FontConfigManager_getFontConfigAASettings;
- Java_sun_awt_X11FontManager_getFontPathNative;
- Java_sun_font_SunFontManager_populateFontFileNameMap;
-
- # CDE private entry point
- Java_sun_awt_motif_XsessionWMcommand;
- Java_sun_awt_motif_XsessionWMcommand_New;
-
- # Java Plugin
- getAwtLockFunctions;
- getAwtData;
- getAwtDisplay;
-
- # libfontmanager entry points
- AWTIsHeadless;
- AWTCountFonts;
- AWTLoadFont;
- AWTFreeFont;
- AWTFontAscent;
- AWTFontDescent;
- AWTFontMinByte1;
- AWTFontMaxByte1;
- AWTFontMinCharOrByte2;
- AWTFontMaxCharOrByte2;
- AWTFontDefaultChar;
- AWTFontPerChar;
- AWTFontMaxBounds;
- AWTFontTextExtents16;
- AWTFreeChar;
- AWTFontGenerateImage;
- AWTCharAdvance;
- AWTCharLBearing;
- AWTCharRBearing;
- AWTCharAscent;
- AWTCharDescent;
- AWTDrawGlyphList;
- AccelGlyphCache_RemoveAllCellInfos;
-
- local:
- *;
-};
-
diff --git a/jdk/make/sun/awt/mapfile-vers b/jdk/make/sun/awt/mapfile-vers
deleted file mode 100644
index f68ef5c..0000000
--- a/jdk/make/sun/awt/mapfile-vers
+++ /dev/null
@@ -1,198 +0,0 @@
-#
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-# These are the libawt exports, mapfile-mawt-vers contains the libmawt exports.
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
-
- Java_java_awt_CheckboxMenuItem_initIDs;
- Java_java_awt_Color_initIDs;
- Java_java_awt_FontMetrics_initIDs;
- Java_java_awt_image_BufferedImage_initIDs;
- Java_sun_awt_image_DataBufferNative_getElem;
- Java_sun_awt_image_DataBufferNative_setElem;
- Java_java_awt_image_ColorModel_initIDs;
- Java_java_awt_image_ComponentSampleModel_initIDs;
- Java_java_awt_image_IndexColorModel_initIDs;
- Java_java_awt_image_Kernel_initIDs;
- Java_java_awt_image_Raster_initIDs;
- Java_java_awt_image_SampleModel_initIDs;
- Java_java_awt_Label_initIDs;
- 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_image_ByteComponentRaster_initIDs;
- Java_sun_awt_image_GifImageDecoder_initIDs;
- Java_sun_awt_image_GifImageDecoder_parseImage;
- Java_sun_awt_image_ImageRepresentation_initIDs;
- Java_sun_awt_image_ImageRepresentation_setDiffICM;
- Java_sun_awt_image_ImageRepresentation_setICMpixels;
- Java_sun_awt_image_ImagingLib_convolveBI;
- Java_sun_awt_image_ImagingLib_convolveRaster;
- Java_sun_awt_image_ImagingLib_init;
- Java_sun_awt_image_ImagingLib_transformBI;
- Java_sun_awt_image_ImagingLib_transformRaster;
- Java_sun_awt_image_IntegerComponentRaster_initIDs;
- Java_sun_awt_image_ShortComponentRaster_initIDs;
- Java_sun_java2d_pipe_BufferedMaskBlit_enqueueTile;
- Java_sun_java2d_pipe_BufferedRenderPipe_fillSpans;
- Java_sun_java2d_pipe_SpanClipRenderer_eraseTile;
- Java_sun_java2d_pipe_SpanClipRenderer_fillTile;
- Java_sun_java2d_pipe_ShapeSpanIterator_addSegment;
- Java_sun_java2d_pipe_ShapeSpanIterator_moveTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_lineTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_quadTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_curveTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_closePath;
- Java_sun_java2d_pipe_ShapeSpanIterator_pathDone;
- Java_sun_java2d_pipe_ShapeSpanIterator_getNativeConsumer;
- Java_sun_java2d_pipe_ShapeSpanIterator_appendPoly;
- Java_sun_java2d_pipe_ShapeSpanIterator_dispose;
- Java_sun_java2d_pipe_ShapeSpanIterator_getNativeIterator;
- Java_sun_java2d_pipe_ShapeSpanIterator_getPathBox;
- Java_sun_java2d_pipe_ShapeSpanIterator_initIDs;
- Java_sun_java2d_pipe_ShapeSpanIterator_intersectClipBox;
- Java_sun_java2d_pipe_ShapeSpanIterator_nextSpan;
- Java_sun_java2d_pipe_ShapeSpanIterator_setNormalize;
- Java_sun_java2d_pipe_ShapeSpanIterator_setOutputAreaXYXY;
- Java_sun_java2d_pipe_ShapeSpanIterator_setRule;
- Java_sun_java2d_pipe_ShapeSpanIterator_skipDownTo;
-
- Java_java_awt_Dimension_initIDs;
- Java_java_awt_Choice_initIDs;
- Java_java_awt_event_MouseEvent_initIDs;
- Java_java_awt_image_DataBufferInt_initIDs;
- Java_java_awt_image_SinglePixelPackedSampleModel_initIDs;
- Java_java_awt_Rectangle_initIDs;
- Java_sun_awt_image_BufImgSurfaceData_initIDs;
- Java_sun_awt_image_BufImgSurfaceData_initRaster;
- Java_sun_awt_image_BufImgSurfaceData_freeNativeICMData;
- Java_sun_awt_image_BytePackedRaster_initIDs;
- Java_sun_awt_image_ImagingLib_lookupByteBI;
- Java_sun_awt_image_ImagingLib_lookupByteRaster;
- Java_sun_java2d_SurfaceData_initIDs;
- Java_sun_java2d_SurfaceData_isOpaqueGray;
- Java_sun_java2d_Disposer_initIDs;
- Java_sun_java2d_DefaultDisposerRecord_invokeNativeDispose;
- Java_sun_java2d_loops_BlitBg_BlitBg;
- Java_sun_java2d_loops_Blit_Blit;
- Java_sun_java2d_loops_ScaledBlit_Scale;
- Java_sun_java2d_loops_DrawLine_DrawLine;
- Java_sun_java2d_loops_DrawPolygons_DrawPolygons;
- Java_sun_java2d_loops_DrawPath_DrawPath;
- Java_sun_java2d_loops_FillPath_FillPath;
-
- Java_sun_java2d_loops_DrawRect_DrawRect;
- Java_sun_java2d_loops_FillRect_FillRect;
- Java_sun_java2d_loops_FillSpans_FillSpans;
- Java_sun_java2d_loops_FillParallelogram_FillParallelogram;
- Java_sun_java2d_loops_DrawParallelogram_DrawParallelogram;
- Java_sun_java2d_loops_GraphicsPrimitiveMgr_initIDs;
- Java_sun_java2d_loops_GraphicsPrimitiveMgr_registerNativeLoops;
- Java_sun_java2d_loops_MaskBlit_MaskBlit;
- Java_sun_java2d_loops_MaskFill_MaskFill;
- Java_sun_java2d_loops_MaskFill_FillAAPgram;
- Java_sun_java2d_loops_MaskFill_DrawAAPgram;
- Java_sun_java2d_loops_TransformHelper_Transform;
- Java_sun_java2d_pipe_Region_initIDs;
- Java_sun_java2d_pipe_SpanClipRenderer_initIDs;
- sun_awt_image_GifImageDecoder_initIDs;
-
- # libmawt entry points
- SurfaceData_InitOps;
- SurfaceData_ThrowInvalidPipeException;
- SurfaceData_IntersectBlitBounds;
- SurfaceData_IntersectBoundsXYXY;
- Region_GetBounds;
- Region_GetInfo;
- Region_StartIteration;
- Region_CountIterationRects;
- Region_NextIteration;
- Region_EndIteration;
- RegionToYXBandedRectangles;
- GrPrim_CompGetXorInfo;
- GrPrim_CompGetAlphaInfo;
- J2dTraceImpl;
- J2dTraceInit;
- img_makePalette;
- initInverseGrayLut;
- make_dither_arrays;
- make_uns_ordered_dither_array;
-
- # variables exported to libmawt
- std_img_oda_red;
- std_img_oda_blue;
- std_img_oda_green;
- std_odas_computed;
- g_CMpDataID;
- colorValueID;
- mul8table;
- jvm;
-
- # ProcessPath entry points and data
- doDrawPath;
- doFillPath;
- path2DNumTypesID;
- path2DTypesID;
- path2DWindingRuleID;
- path2DFloatCoordsID;
- sg2dStrokeHintID;
- sunHints_INTVAL_STROKE_PURE;
-
- # CDE private entry points
- # These are in awt_LoadLibrary.c and falls through to libmawt.
- # Evidently CDE needs this for backward compatability.
- Java_sun_awt_motif_XsessionWMcommand;
- Java_sun_awt_motif_XsessionWMcommand_New;
-
- # Java Plugin
- # This is in awt_LoadLibrary.c and falls through to libmawt.
- # Evidently plugin needs this for backward compatability.
- getAwtLockFunctions;
- getAwtData;
- getAwtDisplay;
-
- # libfontmanager entry points
- AWTIsHeadless;
- GrPrim_Sg2dGetCompInfo;
- GrPrim_Sg2dGetClip;
- GetNativePrim;
- SurfaceData_IntersectBounds;
- SurfaceData_GetOps;
- Disposer_AddRecord;
- GrPrim_Sg2dGetEaRGB;
- GrPrim_Sg2dGetPixel;
- GrPrim_Sg2dGetLCDTextContrast;
-
- local:
- *;
-};
-
diff --git a/jdk/make/sun/awt/mapfile-vers-bsd b/jdk/make/sun/awt/mapfile-vers-bsd
deleted file mode 100644
index dcc59f0..0000000
--- a/jdk/make/sun/awt/mapfile-vers-bsd
+++ /dev/null
@@ -1,578 +0,0 @@
-#
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface for libawt.so on Bsd.
-# Bsd port does not use mawt, all public symbols are in libawt.so
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
-
- Java_java_awt_CheckboxMenuItem_initIDs;
- Java_java_awt_Color_initIDs;
- Java_java_awt_FontMetrics_initIDs;
- Java_java_awt_image_BufferedImage_initIDs;
- Java_sun_awt_image_DataBufferNative_getElem;
- Java_sun_awt_image_DataBufferNative_setElem;
- Java_java_awt_image_ColorModel_initIDs;
- Java_java_awt_image_ComponentSampleModel_initIDs;
- Java_java_awt_image_IndexColorModel_initIDs;
- Java_java_awt_image_Kernel_initIDs;
- Java_java_awt_image_Raster_initIDs;
- Java_java_awt_image_SampleModel_initIDs;
- Java_java_awt_Label_initIDs;
- Java_java_awt_MenuBar_initIDs;
- 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_image_ByteComponentRaster_initIDs;
- Java_sun_awt_image_GifImageDecoder_initIDs;
- Java_sun_awt_image_GifImageDecoder_parseImage;
- Java_sun_awt_image_Image_initIDs;
- Java_sun_awt_image_ImageRepresentation_initIDs;
- Java_sun_awt_image_ImageRepresentation_setDiffICM;
- Java_sun_awt_image_ImageRepresentation_setICMpixels;
- Java_sun_awt_image_ImagingLib_convolveBI;
- Java_sun_awt_image_ImagingLib_convolveRaster;
- Java_sun_awt_image_ImagingLib_init;
- Java_sun_awt_image_ImagingLib_transformBI;
- Java_sun_awt_image_ImagingLib_transformRaster;
- Java_sun_awt_image_IntegerComponentRaster_initIDs;
- Java_sun_awt_image_ShortComponentRaster_initIDs;
- Java_sun_java2d_pipe_SpanClipRenderer_eraseTile;
- Java_sun_java2d_pipe_SpanClipRenderer_fillTile;
- Java_sun_java2d_pipe_ShapeSpanIterator_addSegment;
- Java_sun_java2d_pipe_ShapeSpanIterator_moveTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_lineTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_quadTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_curveTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_closePath;
- Java_sun_java2d_pipe_ShapeSpanIterator_pathDone;
- Java_sun_java2d_pipe_ShapeSpanIterator_getNativeConsumer;
- Java_sun_java2d_pipe_ShapeSpanIterator_appendPoly;
- Java_sun_java2d_pipe_ShapeSpanIterator_dispose;
- Java_sun_java2d_pipe_ShapeSpanIterator_getNativeIterator;
- Java_sun_java2d_pipe_ShapeSpanIterator_getPathBox;
- Java_sun_java2d_pipe_ShapeSpanIterator_initIDs;
- Java_sun_java2d_pipe_ShapeSpanIterator_intersectClipBox;
- Java_sun_java2d_pipe_ShapeSpanIterator_nextSpan;
- Java_sun_java2d_pipe_ShapeSpanIterator_setNormalize;
- Java_sun_java2d_pipe_ShapeSpanIterator_setOutputAreaXYXY;
- Java_sun_java2d_pipe_ShapeSpanIterator_setRule;
- Java_sun_java2d_pipe_ShapeSpanIterator_skipDownTo;
-
- Java_java_awt_Dimension_initIDs;
- Java_java_awt_Choice_initIDs;
- Java_java_awt_event_MouseEvent_initIDs;
- Java_java_awt_image_DataBufferInt_initIDs;
- Java_java_awt_image_SinglePixelPackedSampleModel_initIDs;
- Java_java_awt_Rectangle_initIDs;
- Java_sun_awt_image_BufImgSurfaceData_getSurfaceData;
- Java_sun_awt_image_BufImgSurfaceData_initIDs;
- Java_sun_awt_image_BufImgSurfaceData_initRaster;
- Java_sun_awt_image_BufImgSurfaceData_setSurfaceData;
- Java_sun_awt_image_BufImgSurfaceData_freeNativeICMData;
- Java_sun_awt_image_BytePackedRaster_initIDs;
- Java_sun_awt_image_ImagingLib_lookupByteBI;
- Java_sun_awt_image_ImagingLib_lookupByteRaster;
- Java_sun_java2d_SurfaceData_initIDs;
- Java_sun_java2d_SurfaceData_isOpaqueGray;
- Java_sun_java2d_Disposer_initIDs;
- Java_sun_java2d_DefaultDisposerRecord_invokeNativeDispose;
- Java_sun_java2d_loops_BlitBg_BlitBg;
- Java_sun_java2d_loops_Blit_Blit;
- Java_sun_java2d_loops_ScaledBlit_Scale;
- Java_sun_java2d_loops_DrawLine_DrawLine;
- Java_sun_java2d_loops_DrawPolygons_DrawPolygons;
- Java_sun_java2d_loops_DrawRect_DrawRect;
- Java_sun_java2d_loops_FillRect_FillRect;
- Java_sun_java2d_loops_FillSpans_FillSpans;
- Java_sun_java2d_loops_GraphicsPrimitiveMgr_initIDs;
- Java_sun_java2d_loops_GraphicsPrimitiveMgr_registerNativeLoops;
- Java_sun_java2d_loops_MaskBlit_MaskBlit;
- Java_sun_java2d_loops_MaskFill_MaskFill;
- Java_sun_java2d_loops_MaskFill_FillAAPgram;
- Java_sun_java2d_loops_MaskFill_DrawAAPgram;
- Java_sun_java2d_pipe_BufferedRenderPipe_fillSpans;
- Java_sun_java2d_pipe_SpanClipRenderer_initIDs;
- sun_awt_image_GifImageDecoder_initIDs;
-
- # libmawt entry points
- SurfaceData_InitOps;
- SurfaceData_ThrowInvalidPipeException;
- Region_GetBounds;
- Region_GetInfo;
- Region_StartIteration;
- Region_CountIterationRects;
- Region_NextIteration;
- Region_EndIteration;
- GrPrim_CompGetXorInfo;
- GrPrim_CompGetAlphaInfo;
- img_makePalette;
- initInverseGrayLut;
- make_dither_arrays;
- make_uns_ordered_dither_array;
-
- # variables exported to libmawt
- std_img_oda_red;
- std_img_oda_blue;
- std_img_oda_green;
- std_odas_computed;
- g_CMpDataID;
- colorValueID;
- jvm;
-
- # CDE private entry point
- # This is in awt_LoadLibrary.c and falls through to libmawt.
- # Evidently CDE needs this for backward compatability.
- Java_sun_awt_motif_XsessionWMcommand;
-
- # Java Plugin
- # This is in awt_LoadLibrary.c and falls through to libmawt.
- # Evidently plugin needs this for backward compatability.
- getAwtLockFunctions;
- getAwtData;
- getAwtDisplay;
-
- # libfontmanager entry points
- AWTIsHeadless;
- GrPrim_Sg2dGetCompInfo;
- GrPrim_Sg2dGetClip;
- GetNativePrim;
- SurfaceData_IntersectBounds;
- SurfaceData_GetOps;
- Disposer_AddRecord;
- GrPrim_Sg2dGetEaRGB;
- GrPrim_Sg2dGetPixel;
- GrPrim_Sg2dGetLCDTextContrast;
-
- #Java_sun_awt_motif_MComponentPeer_restoreFocus;
- Java_sun_awt_DefaultMouseInfoPeer_fillPointWithCoords;
- Java_sun_awt_DefaultMouseInfoPeer_isWindowUnderMouse;
- Java_java_awt_AWTEvent_nativeSetSource;
- Java_java_awt_Checkbox_initIDs;
- Java_java_awt_Component_initIDs;
- Java_java_awt_Dialog_initIDs;
- Java_java_awt_Font_initIDs;
- Java_sun_awt_KeyboardFocusManagerPeerImpl_clearNativeGlobalFocusOwner;
- Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusOwner;
- Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusedWindow;
- Java_java_awt_KeyboardFocusManager_initIDs;
- Java_java_awt_Menu_initIDs;
- Java_java_awt_MenuComponent_initIDs;
- Java_java_awt_MenuItem_initIDs;
- Java_java_awt_Scrollbar_initIDs;
- Java_java_awt_ScrollPane_initIDs;
- Java_java_awt_TextArea_initIDs;
- Java_sun_awt_FontDescriptor_initIDs;
- #Java_sun_awt_motif_MButtonPeer_create;
- #Java_sun_awt_motif_MButtonPeer_setLabel;
- #Java_sun_awt_motif_MCanvasPeer_create;
- #Java_sun_awt_motif_MCanvasPeer_initIDs;
- #Java_sun_awt_motif_MCanvasPeer_resetTargetGC;
- #Java_sun_awt_motif_MCheckboxMenuItemPeer_pSetState;
- #Java_sun_awt_motif_MCheckboxPeer_create;
- #Java_sun_awt_motif_MCheckboxPeer_setCheckboxGroup;
- #Java_sun_awt_motif_MCheckboxPeer_setLabel;
- #Java_sun_awt_motif_MCheckboxPeer_pSetState;
- #Java_sun_awt_motif_MCheckboxPeer_pGetState;
- #Java_sun_awt_motif_MChoicePeer_addItem;
- #Java_sun_awt_motif_MChoicePeer_appendItems;
- #Java_sun_awt_motif_MChoicePeer_create;
- #Java_sun_awt_motif_MChoicePeer_pReshape;
- #Java_sun_awt_motif_MChoicePeer_remove;
- #Java_sun_awt_motif_MChoicePeer_removeAll;
- #Java_sun_awt_motif_MChoicePeer_setBackground;
- #Java_sun_awt_motif_MChoicePeer_pSelect;
- #Java_sun_awt_motif_MChoicePeer_setFont;
- #Java_sun_awt_motif_MChoicePeer_setForeground;
- #Java_sun_awt_motif_MComponentPeer_addNativeDropTarget;
- #Java_sun_awt_motif_MComponentPeer_createBackBuffer;
- #Java_sun_awt_motif_MComponentPeer_destroyBackBuffer;
- #Java_sun_awt_motif_MComponentPeer_getNativeColor;
- #Java_sun_awt_motif_MComponentPeer_getWindow;
- #Java_sun_awt_motif_MComponentPeer_pDisable;
- #Java_sun_awt_motif_MComponentPeer_pDispose;
- #Java_sun_awt_motif_MComponentPeer_pEnable;
- #Java_sun_awt_motif_MComponentPeer_pGetLocationOnScreen;
- #Java_sun_awt_motif_MComponentPeer_pGetLocationOnScreen2;
- #Java_sun_awt_motif_MComponentPeer_pHide;
- #Java_sun_awt_motif_MComponentPeer_pInitialize;
- #Java_sun_awt_motif_MComponentPeer_pMakeCursorVisible;
- #Java_sun_awt_motif_MComponentPeer_pReshape;
- #Java_sun_awt_motif_MComponentPeer_pShow;
- #Java_sun_awt_motif_MComponentPeer_removeNativeDropTarget;
- #Java_sun_awt_motif_MComponentPeer_swapBuffers;
- #Java_sun_awt_motif_MComponentPeer_pSetBackground;
- #Java_sun_awt_motif_MComponentPeer_pSetFont;
- #Java_sun_awt_motif_MComponentPeer_processSynchronousLightweightTransfer;
- #Java_sun_awt_motif_MComponentPeer__1requestFocus;
- #Java_sun_awt_motif_MCheckboxMenuItemPeer_getState;
- #Java_sun_awt_motif_MComponentPeer_pSetForeground;
- #Java_sun_awt_motif_MDragSourceContextPeer_startDrag;
- #Java_sun_awt_motif_MDragSourceContextPeer_setNativeCursor;
- #Java_sun_awt_motif_MDropTargetContextPeer_addTransfer;
- #Java_sun_awt_motif_MDropTargetContextPeer_dropDone;
- #Java_sun_awt_motif_MDropTargetContextPeer_startTransfer;
- #Java_sun_awt_motif_X11DragSourceContextPeer_startDrag;
- #Java_sun_awt_motif_X11DragSourceContextPeer_setNativeCursor;
- #Java_sun_awt_motif_X11DropTargetContextPeer_sendResponse;
- #Java_sun_awt_motif_X11DropTargetContextPeer_dropDone;
- #Java_sun_awt_motif_X11DropTargetContextPeer_getData;
- #Java_sun_awt_motif_MEmbeddedFramePeer_NEFcreate;
- #Java_sun_awt_motif_MEmbeddedFramePeer_pShowImpl;
- #Java_sun_awt_motif_MEmbeddedFramePeer_pReshapePrivate;
- #Java_sun_awt_motif_MEmbeddedFramePeer_getBoundsPrivate;
- #Java_sun_awt_motif_MFramePeer_pSetIconImage___3B_3I_3SII;
- #Java_sun_awt_motif_MEmbeddedFramePeer_requestXEmbedFocus;
- #Java_sun_awt_motif_MEmbeddedFramePeer_isXEmbedApplicationActive;
- #Java_sun_awt_motif_MEmbeddedFramePeer_isXEmbedActive;
- #Java_sun_awt_motif_MEmbeddedFrame_getWidget;
- #Java_sun_awt_motif_MEmbeddedFrame_mapWidget;
- #Java_sun_awt_motif_MFileDialogPeer_create;
- #Java_sun_awt_motif_MFileDialogPeer_pDispose;
- #Java_sun_awt_motif_MFileDialogPeer_pHide;
- #Java_sun_awt_motif_MFileDialogPeer_pReshape;
- #Java_sun_awt_motif_MFileDialogPeer_pShow;
- #Java_sun_awt_motif_MFileDialogPeer_setFileEntry;
- #Java_sun_awt_motif_MFileDialogPeer_setFont;
- #Java_sun_awt_motif_MFramePeer_pGetIconSize;
- #Java_sun_awt_motif_MGlobalCursorManager_cacheInit;
- #Java_sun_awt_motif_MGlobalCursorManager_findComponentAt;
- #Java_sun_awt_motif_MGlobalCursorManager_findHeavyweightUnderCursor;
- #Java_sun_awt_motif_MGlobalCursorManager_getCursorPos;
- #Java_sun_awt_motif_MGlobalCursorManager_getLocationOnScreen;
- #Java_sun_awt_motif_MLabelPeer_create;
- #Java_sun_awt_motif_MLabelPeer_setAlignment;
- #Java_sun_awt_motif_MLabelPeer_setText;
- #Java_sun_awt_motif_MListPeer_addItem;
- #Java_sun_awt_motif_MListPeer_create;
- #Java_sun_awt_motif_MListPeer_delItems;
- #Java_sun_awt_motif_MListPeer_deselect;
- #Java_sun_awt_motif_MListPeer_isSelected;
- #Java_sun_awt_motif_MListPeer_makeVisible;
- #Java_sun_awt_motif_MListPeer_select;
- #Java_sun_awt_motif_MListPeer_setMultipleSelections;
- #Java_sun_awt_motif_MMenuBarPeer_create;
- #Java_sun_awt_motif_MMenuItemPeer_createMenuItem;
- #Java_sun_awt_motif_MMenuItemPeer_pDisable;
- #Java_sun_awt_motif_MMenuItemPeer_pDispose;
- #Java_sun_awt_motif_MMenuItemPeer_pEnable;
- #Java_sun_awt_motif_MMenuItemPeer_pSetLabel;
- #Java_sun_awt_motif_MMenuPeer_createMenu;
- #Java_sun_awt_motif_MMenuPeer_createSubMenu;
- #Java_sun_awt_motif_MMenuPeer_pDispose;
- #Java_sun_awt_motif_MPopupMenuPeer_createMenu;
- #Java_sun_awt_motif_MPopupMenuPeer_pDispose;
- #Java_sun_awt_motif_MPopupMenuPeer_pShow;
- #Java_sun_awt_motif_MRobotPeer_getRGBPixelsImpl;
- #Java_sun_awt_motif_MRobotPeer_keyPressImpl;
- #Java_sun_awt_motif_MRobotPeer_keyReleaseImpl;
- #Java_sun_awt_motif_MRobotPeer_mouseMoveImpl;
- #Java_sun_awt_motif_MRobotPeer_mousePressImpl;
- #Java_sun_awt_motif_MRobotPeer_mouseReleaseImpl;
- #Java_sun_awt_motif_MRobotPeer_mouseWheelImpl;
- #Java_sun_awt_motif_MRobotPeer_setup;
- #Java_sun_awt_motif_MScrollbarPeer_create;
- #Java_sun_awt_motif_MScrollbarPeer_setLineIncrement;
- #Java_sun_awt_motif_MScrollbarPeer_setPageIncrement;
- #Java_sun_awt_motif_MScrollbarPeer_pSetValues;
- #Java_sun_awt_motif_MScrollPanePeer_create;
- #Java_sun_awt_motif_MScrollPanePeer_pGetBlockIncrement;
- #Java_sun_awt_motif_MScrollPanePeer_pGetScrollbarSpace;
- #Java_sun_awt_motif_MScrollPanePeer_pGetShadow;
- #Java_sun_awt_motif_MScrollPanePeer_pInsets;
- #Java_sun_awt_motif_MScrollPanePeer_pSetIncrement;
- #Java_sun_awt_motif_MScrollPanePeer_pSetScrollChild;
- #Java_sun_awt_motif_MScrollPanePeer_setScrollPosition;
- #Java_sun_awt_motif_MTextAreaPeer_initIDs;
- #Java_sun_awt_motif_MTextAreaPeer_pCreate;
- #Java_sun_awt_motif_MTextAreaPeer_getCaretPosition;
- #Java_sun_awt_motif_MTextAreaPeer_getExtraHeight;
- #Java_sun_awt_motif_MTextAreaPeer_getExtraWidth;
- #Java_sun_awt_motif_MTextAreaPeer_getSelectionEnd;
- #Java_sun_awt_motif_MTextAreaPeer_getSelectionStart;
- #Java_sun_awt_motif_MTextAreaPeer_getText;
- #Java_sun_awt_motif_MTextAreaPeer_insert;
- #Java_sun_awt_motif_MTextAreaPeer_pMakeCursorVisible;
- #Java_sun_awt_motif_MTextAreaPeer_pSetEditable;
- #Java_sun_awt_motif_MTextAreaPeer_pShow2;
- #Java_sun_awt_motif_MTextAreaPeer_replaceRange;
- #Java_sun_awt_motif_MTextAreaPeer_select;
- #Java_sun_awt_motif_MTextAreaPeer_setCaretPosition;
- #Java_sun_awt_motif_MTextAreaPeer_setFont;
- #Java_sun_awt_motif_MTextAreaPeer_setText;
- #Java_sun_awt_motif_MTextAreaPeer_setTextBackground;
- #Java_sun_awt_motif_MTextFieldPeer_initIDs;
- #Java_sun_awt_motif_MTextFieldPeer_pCreate;
- #Java_sun_awt_motif_MTextFieldPeer_getCaretPosition;
- #Java_sun_awt_motif_MTextFieldPeer_getSelectionEnd;
- #Java_sun_awt_motif_MTextFieldPeer_getSelectionStart;
- #Java_sun_awt_motif_MTextFieldPeer_getText;
- #Java_sun_awt_motif_MTextFieldPeer_insertReplaceText;
- #Java_sun_awt_motif_MTextFieldPeer_preDispose;
- #Java_sun_awt_motif_MTextFieldPeer_pSetEditable;
- #Java_sun_awt_motif_MTextFieldPeer_select;
- #Java_sun_awt_motif_MTextFieldPeer_setCaretPosition;
- #Java_sun_awt_motif_MTextFieldPeer_setEchoChar;
- #Java_sun_awt_motif_MTextFieldPeer_setFont;
- #Java_sun_awt_motif_MTextFieldPeer_setText;
- Java_sun_awt_motif_MToolkit_beep;
- Java_sun_awt_motif_MToolkit_getLockingKeyStateNative;
- Java_sun_awt_motif_MToolkit_getMulticlickTime;
- Java_sun_awt_motif_MToolkit_getNumMouseButtons;
- Java_sun_awt_motif_MToolkit_getScreenHeight;
- Java_sun_awt_motif_MToolkit_getScreenResolution;
- Java_sun_awt_motif_MToolkit_getScreenWidth;
- Java_sun_awt_motif_MToolkit_init;
- Java_sun_awt_motif_MToolkit_isDynamicLayoutSupportedNative;
- Java_sun_awt_motif_MToolkit_isFrameStateSupported;
- Java_sun_awt_motif_MToolkit_loadSystemColors;
- Java_sun_awt_motif_MToolkit_makeColorModel;
- Java_sun_awt_motif_MToolkit_run;
- Java_sun_awt_motif_MToolkit_sync;
- Java_sun_awt_motif_MToolkit_isAlwaysOnTopSupported;
- Java_sun_awt_motif_MWindowAttributes_initIDs;
- #Java_sun_awt_motif_MWindowPeer_pDispose;
- #Java_sun_awt_motif_MWindowPeer_pHide;
- #Java_sun_awt_motif_MWindowPeer_pReshape;
- #Java_sun_awt_motif_MWindowPeer_pSetTitle;
- #Java_sun_awt_motif_MWindowPeer_pShow;
- #Java_sun_awt_motif_MWindowPeer_setResizable;
- #Java_sun_awt_motif_MWindowPeer_toBack;
- #Java_sun_awt_motif_MWindowPeer_addTextComponentNative;
- #Java_sun_awt_motif_MWindowPeer_getState;
- #Java_sun_awt_motif_MWindowPeer_pSetIMMOption;
- #Java_sun_awt_motif_MWindowPeer_pSetMenuBar;
- #Java_sun_awt_motif_MWindowPeer_pShowModal;
- #Java_sun_awt_motif_MWindowPeer_removeTextComponentNative;
- #Java_sun_awt_motif_MWindowPeer_setSaveUnder;
- #Java_sun_awt_motif_MWindowPeer_setState;
- #Java_sun_awt_motif_MWindowPeer_resetTargetGC;
- #Java_sun_awt_motif_MWindowPeer_registerX11DropTarget;
- #Java_sun_awt_motif_MWindowPeer_unregisterX11DropTarget;
- #Java_sun_awt_motif_MWindowPeer_updateAlwaysOnTop;
- #Java_sun_awt_motif_X11CustomCursor_cacheInit;
- #Java_sun_awt_motif_X11CustomCursor_createCursor;
- #Java_sun_awt_motif_X11CustomCursor_queryBestCursor;
- Java_sun_awt_motif_X11FontMetrics_bytesWidth;
- Java_sun_awt_motif_X11FontMetrics_getMFCharsWidth;
- Java_sun_awt_motif_X11FontMetrics_init;
- Java_sun_awt_X11InputMethod_disposeXIC;
- Java_sun_awt_X11InputMethod_isCompositionEnabledNative;
- Java_sun_awt_X11InputMethod_resetXIC;
- Java_sun_awt_X11InputMethod_setCompositionEnabledNative;
- Java_sun_awt_X11InputMethod_turnoffStatusWindow;
- #Java_sun_awt_motif_MInputMethod_openXIMNative;
- #Java_sun_awt_motif_MInputMethod_configureStatusAreaNative;
- #Java_sun_awt_motif_MInputMethod_createXICNative;
- #Java_sun_awt_motif_MInputMethod_reconfigureXICNative;
- #Java_sun_awt_motif_MInputMethod_setXICFocusNative;
- #Java_sun_awt_motif_X11Clipboard_getClipboardData;
- #Java_sun_awt_motif_X11Clipboard_getClipboardFormats;
- #Java_sun_awt_motif_X11Clipboard_registerClipboardViewer;
- #Java_sun_awt_motif_X11Clipboard_unregisterClipboardViewer;
- #Java_sun_awt_motif_X11Selection_init;
- #Java_sun_awt_motif_X11Selection_pGetSelectionOwnership;
- #Java_sun_awt_motif_X11Selection_clearNativeContext;
- Java_sun_awt_SunToolkit_closeSplashScreen;
- Java_sun_awt_PlatformFont_initIDs;
- Java_sun_awt_X11GraphicsConfig_init;
- Java_sun_awt_X11GraphicsConfig_dispose;
- Java_sun_awt_X11GraphicsConfig_pGetBounds;
- Java_sun_awt_X11GraphicsConfig_getNumColors;
- Java_sun_awt_X11GraphicsConfig_getXResolution;
- Java_sun_awt_X11GraphicsConfig_getYResolution;
- Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
- Java_sun_awt_X11GraphicsDevice_isDBESupported;
- Java_sun_awt_X11GraphicsDevice_getDisplay;
- Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
- Java_sun_awt_X11GraphicsDevice_getNumConfigs;
- Java_sun_awt_X11GraphicsDevice_initIDs;
- Java_sun_awt_X11GraphicsDevice_initXrandrExtension;
- Java_sun_awt_X11GraphicsDevice_enterFullScreenExclusive;
- Java_sun_awt_X11GraphicsDevice_exitFullScreenExclusive;
- Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode;
- Java_sun_awt_X11GraphicsDevice_enumDisplayModes;
- Java_sun_awt_X11GraphicsDevice_configDisplayMode;
- Java_sun_awt_X11GraphicsDevice_resetNativeData;
- Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
- Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
- Java_sun_awt_X11GraphicsEnvironment_getDisplayString;
- Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
- Java_sun_awt_X11GraphicsEnvironment_initDisplay;
- 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;
- Java_java_awt_Container_initIDs;
- Java_java_awt_Cursor_finalizeImpl;
- Java_java_awt_Cursor_initIDs;
- Java_java_awt_Event_initIDs;
- Java_java_awt_event_InputEvent_initIDs;
- Java_java_awt_event_KeyEvent_initIDs;
- Java_java_awt_FileDialog_initIDs;
- Java_java_awt_Frame_initIDs;
- Java_java_awt_Insets_initIDs;
- Java_java_awt_TextField_initIDs;
- Java_java_awt_Window_initIDs;
- #Java_sun_awt_motif_MCheckboxPeer_getIndicatorSize;
- #Java_sun_awt_motif_MCheckboxPeer_getSpacing;
- #Java_sun_awt_motif_MChoicePeer_freeNativeData;
- #Java_sun_awt_motif_MComponentPeer_getComponents_1NoClientCode;
- #Java_sun_awt_motif_MComponentPeer_getParent_1NoClientCode;
- #Java_sun_awt_motif_MComponentPeer_initIDs;
- #Java_sun_awt_motif_MComponentPeer_nativeHandleEvent;
- #Java_sun_awt_motif_MComponentPeer_pSetCursor;
- #Java_sun_awt_motif_MComponentPeer_pSetInnerForeground;
- #Java_sun_awt_motif_MComponentPeer_pSetScrollbarBackground;
- #Java_sun_awt_motif_MComponentPeer_setTargetBackground;
- #Java_sun_awt_motif_MDataTransferer_dragQueryFile;
- #Java_sun_awt_motif_MDataTransferer_getAtomForTarget;
- #Java_sun_awt_motif_MDataTransferer_getTargetNameForAtom;
- #Java_sun_awt_motif_MFileDialogPeer_insertReplaceFileDialogText;
- Java_sun_awt_motif_MFontPeer_initIDs;
- #Java_sun_awt_motif_MListPeer_setBackground;
- #Java_sun_awt_motif_MMenuBarPeer_initIDs;
- #Java_sun_awt_motif_MMenuBarPeer_pDispose;
- #Java_sun_awt_motif_MMenuItemPeer_getParent_1NoClientCode;
- #Java_sun_awt_motif_MMenuItemPeer_initIDs;
- #Java_sun_awt_motif_MMenuItemPeer_pSetShortcut;
- #Java_sun_awt_motif_MPopupMenuPeer_initIDs;
- #Java_sun_awt_motif_MScrollbarPeer_initIDs;
- #Java_sun_awt_motif_MScrollPanePeer_initIDs;
- #Java_sun_awt_motif_MTextAreaPeer_pSetCursor;
- Java_sun_awt_motif_MToolkit_shutdown;
- #Java_sun_awt_motif_MWindowPeer_initIDs;
- #Java_sun_awt_motif_MWindowPeer_pCreate;
- #Java_sun_awt_motif_MWindowPeer_wrapInSequenced;
- Java_sun_awt_motif_X11FontMetrics_initIDs;
- #Java_sun_awt_X11InputMethod_initIDs;
- Java_sun_awt_motif_X11OffScreenImage_updateBitmask;
- #Java_sun_awt_motif_X11Selection_initIDs;
- Java_sun_awt_motif_MToolkitThreadBlockedHandler_enter;
- Java_sun_awt_motif_MToolkitThreadBlockedHandler_exit;
- Java_sun_awt_X11GraphicsConfig_init;
- Java_sun_awt_X11GraphicsConfig_initIDs;
- Java_sun_awt_X11GraphicsConfig_makeColorModel;
- Java_sun_awt_X11GraphicsDevice_getConfigVisualId;
- Java_sun_awt_X11PMBlitLoops_Blit;
- Java_sun_awt_X11PMBlitBgLoops_nativeBlitBg;
- Java_sun_awt_X11Renderer_devFillSpans;
- Java_sun_awt_X11Renderer_doDrawArc;
- Java_sun_awt_X11Renderer_doDrawLine;
- Java_sun_awt_X11Renderer_doDrawOval;
- Java_sun_awt_X11Renderer_doDrawPoly;
- Java_sun_awt_X11Renderer_doDrawRect;
- Java_sun_awt_X11Renderer_doDrawRoundRect;
- Java_sun_awt_X11Renderer_doFillArc;
- Java_sun_awt_X11Renderer_doFillOval;
- Java_sun_awt_X11Renderer_doFillPoly;
- Java_sun_awt_X11Renderer_doFillRect;
- Java_sun_awt_X11Renderer_doFillRoundRect;
- Java_sun_awt_X11Renderer_devCopyArea;
- Java_sun_awt_X11SurfaceData_initIDs;
- Java_sun_awt_X11SurfaceData_initOps;
- Java_sun_awt_X11SurfaceData_initSurface;
- Java_sun_awt_X11SurfaceData_isDgaAvailable;
- Java_sun_awt_X11SurfaceData_setInvalid;
- Java_sun_awt_X11SurfaceData_flushNativeSurface;
- #Java_sun_awt_motif_MEmbedCanvasPeer_initXEmbedServer;
- #Java_sun_awt_motif_MEmbedCanvasPeer_destroyXEmbedServer;
- #Java_sun_awt_motif_MEmbedCanvasPeer_isXEmbedActive;
- #Java_sun_awt_motif_MEmbedCanvasPeer_initDispatching;
- #Java_sun_awt_motif_MEmbedCanvasPeer_endDispatching;
- #Java_sun_awt_motif_MEmbedCanvasPeer_embedChild;
- #Java_sun_awt_motif_MEmbedCanvasPeer_childDestroyed;
- #Java_sun_awt_motif_MEmbedCanvasPeer_getEmbedPreferredSize;
- #Java_sun_awt_motif_MEmbedCanvasPeer_getEmbedMinimumSize;
- #Java_sun_awt_motif_MEmbedCanvasPeer_getClientBounds;
- #Java_sun_awt_motif_MEmbedCanvasPeer_notifyChildEmbedded;
- #Java_sun_awt_motif_MEmbedCanvasPeer_detachChild;
- #Java_sun_awt_motif_MEmbedCanvasPeer_forwardKeyEvent;
- #Java_sun_awt_motif_MEmbedCanvasPeer_getAWTKeyCodeForKeySym;
- #Java_sun_awt_motif_MEmbedCanvasPeer_sendMessage__I;
- #Java_sun_awt_motif_MEmbedCanvasPeer_sendMessage__IJJJ;
- #Java_sun_awt_motif_MEmbedCanvasPeer_getWindow;
- #Java_sun_awt_motif_MEmbedCanvasPeer_forwardEventToEmbedded;
- #Java_sun_awt_motif_GrabbedKey_initKeySymAndModifiers;
- #Java_sun_awt_motif_MEmbeddedFramePeer_traverseOut;
- awt_display;
- awt_lock;
- awt_Lock;
- awt_Unlock;
- awt_GetDrawingSurface;
- awt_FreeDrawingSurface;
- awt_GetComponent;
-
- X11SurfaceData_GetOps;
- getDefaultConfig;
- Java_sun_font_FontConfigManager_getFontConfig;
- Java_sun_font_FontConfigManager_getFontConfigAASettings;
- Java_sun_awt_X11FontManager_getFontPathNative;
- Java_sun_font_SunFontManager_populateFontFileNameMap;
-
- # CDE private entry point
- Java_sun_awt_motif_XsessionWMcommand;
-
- # Java Plugin
- getAwtLockFunctions;
- getAwtData;
- getAwtDisplay;
-
- # libfontmanager entry points
- AWTIsHeadless;
- AWTCountFonts;
- AWTLoadFont;
- AWTFreeFont;
- AWTFontMinByte1;
- AWTFontMaxByte1;
- AWTFontMinCharOrByte2;
- AWTFontMaxCharOrByte2;
- AWTFontDefaultChar;
- AWTFontPerChar;
- AWTFontMaxBounds;
- AWTFontTextExtents16;
- AWTFreeChar;
- AWTFontGenerateImage;
- AWTCharAdvance;
- AWTCharLBearing;
- AWTCharRBearing;
- AWTCharAscent;
- AWTCharDescent;
- AWTDrawGlyphList;
- AccelGlyphCache_RemoveAllCellInfos;
-
- local:
- *;
-};
-
diff --git a/jdk/make/sun/awt/mapfile-vers-linux b/jdk/make/sun/awt/mapfile-vers-linux
deleted file mode 100644
index 03f0cc0..0000000
--- a/jdk/make/sun/awt/mapfile-vers-linux
+++ /dev/null
@@ -1,317 +0,0 @@
-#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface for libawt.so on Linux.
-# Linux port does not use mawt, all public symbols are in libawt.so
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
-
- Java_java_awt_CheckboxMenuItem_initIDs;
- Java_java_awt_Color_initIDs;
- Java_java_awt_FontMetrics_initIDs;
- Java_java_awt_image_BufferedImage_initIDs;
- Java_sun_awt_image_DataBufferNative_getElem;
- Java_sun_awt_image_DataBufferNative_setElem;
- Java_java_awt_image_ColorModel_initIDs;
- Java_java_awt_image_ComponentSampleModel_initIDs;
- Java_java_awt_image_IndexColorModel_initIDs;
- Java_java_awt_image_Kernel_initIDs;
- Java_java_awt_image_Raster_initIDs;
- Java_java_awt_image_SampleModel_initIDs;
- Java_java_awt_Label_initIDs;
- Java_java_awt_MenuBar_initIDs;
- 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_image_ByteComponentRaster_initIDs;
- Java_sun_awt_image_GifImageDecoder_initIDs;
- Java_sun_awt_image_GifImageDecoder_parseImage;
- Java_sun_awt_image_Image_initIDs;
- Java_sun_awt_image_ImageRepresentation_initIDs;
- Java_sun_awt_image_ImageRepresentation_setDiffICM;
- Java_sun_awt_image_ImageRepresentation_setICMpixels;
- Java_sun_awt_image_ImagingLib_convolveBI;
- Java_sun_awt_image_ImagingLib_convolveRaster;
- Java_sun_awt_image_ImagingLib_init;
- Java_sun_awt_image_ImagingLib_transformBI;
- Java_sun_awt_image_ImagingLib_transformRaster;
- Java_sun_awt_image_IntegerComponentRaster_initIDs;
- Java_sun_awt_image_ShortComponentRaster_initIDs;
- Java_sun_java2d_pipe_SpanClipRenderer_eraseTile;
- Java_sun_java2d_pipe_SpanClipRenderer_fillTile;
- Java_sun_java2d_pipe_ShapeSpanIterator_addSegment;
- Java_sun_java2d_pipe_ShapeSpanIterator_moveTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_lineTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_quadTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_curveTo;
- Java_sun_java2d_pipe_ShapeSpanIterator_closePath;
- Java_sun_java2d_pipe_ShapeSpanIterator_pathDone;
- Java_sun_java2d_pipe_ShapeSpanIterator_getNativeConsumer;
- Java_sun_java2d_pipe_ShapeSpanIterator_appendPoly;
- Java_sun_java2d_pipe_ShapeSpanIterator_dispose;
- Java_sun_java2d_pipe_ShapeSpanIterator_getNativeIterator;
- Java_sun_java2d_pipe_ShapeSpanIterator_getPathBox;
- Java_sun_java2d_pipe_ShapeSpanIterator_initIDs;
- Java_sun_java2d_pipe_ShapeSpanIterator_intersectClipBox;
- Java_sun_java2d_pipe_ShapeSpanIterator_nextSpan;
- Java_sun_java2d_pipe_ShapeSpanIterator_setNormalize;
- Java_sun_java2d_pipe_ShapeSpanIterator_setOutputAreaXYXY;
- Java_sun_java2d_pipe_ShapeSpanIterator_setRule;
- Java_sun_java2d_pipe_ShapeSpanIterator_skipDownTo;
-
- Java_java_awt_Dimension_initIDs;
- Java_java_awt_Choice_initIDs;
- Java_java_awt_event_MouseEvent_initIDs;
- Java_java_awt_image_DataBufferInt_initIDs;
- Java_java_awt_image_SinglePixelPackedSampleModel_initIDs;
- Java_java_awt_Rectangle_initIDs;
- Java_sun_awt_image_BufImgSurfaceData_getSurfaceData;
- Java_sun_awt_image_BufImgSurfaceData_initIDs;
- Java_sun_awt_image_BufImgSurfaceData_initRaster;
- Java_sun_awt_image_BufImgSurfaceData_setSurfaceData;
- Java_sun_awt_image_BufImgSurfaceData_freeNativeICMData;
- Java_sun_awt_image_BytePackedRaster_initIDs;
- Java_sun_awt_image_ImagingLib_lookupByteBI;
- Java_sun_awt_image_ImagingLib_lookupByteRaster;
- Java_sun_java2d_SurfaceData_initIDs;
- Java_sun_java2d_SurfaceData_isOpaqueGray;
- Java_sun_java2d_Disposer_initIDs;
- Java_sun_java2d_DefaultDisposerRecord_invokeNativeDispose;
- Java_sun_java2d_loops_BlitBg_BlitBg;
- Java_sun_java2d_loops_Blit_Blit;
- Java_sun_java2d_loops_ScaledBlit_Scale;
- Java_sun_java2d_loops_DrawLine_DrawLine;
- Java_sun_java2d_loops_DrawPolygons_DrawPolygons;
- Java_sun_java2d_loops_DrawRect_DrawRect;
- Java_sun_java2d_loops_FillRect_FillRect;
- Java_sun_java2d_loops_FillSpans_FillSpans;
- Java_sun_java2d_loops_GraphicsPrimitiveMgr_initIDs;
- Java_sun_java2d_loops_GraphicsPrimitiveMgr_registerNativeLoops;
- Java_sun_java2d_loops_MaskBlit_MaskBlit;
- Java_sun_java2d_loops_MaskFill_MaskFill;
- Java_sun_java2d_loops_MaskFill_FillAAPgram;
- Java_sun_java2d_loops_MaskFill_DrawAAPgram;
- Java_sun_java2d_pipe_BufferedRenderPipe_fillSpans;
- Java_sun_java2d_pipe_SpanClipRenderer_initIDs;
- sun_awt_image_GifImageDecoder_initIDs;
-
- # libmawt entry points
- SurfaceData_InitOps;
- SurfaceData_ThrowInvalidPipeException;
- Region_GetBounds;
- Region_GetInfo;
- Region_StartIteration;
- Region_CountIterationRects;
- Region_NextIteration;
- Region_EndIteration;
- GrPrim_CompGetXorInfo;
- GrPrim_CompGetAlphaInfo;
- img_makePalette;
- initInverseGrayLut;
- make_dither_arrays;
- make_uns_ordered_dither_array;
-
- # variables exported to libmawt
- std_img_oda_red;
- std_img_oda_blue;
- std_img_oda_green;
- std_odas_computed;
- g_CMpDataID;
- colorValueID;
- jvm;
-
- # CDE private entry point
- # This is in awt_LoadLibrary.c and falls through to libmawt.
- # Evidently CDE needs this for backward compatability.
- Java_sun_awt_motif_XsessionWMcommand;
-
- # Java Plugin
- # This is in awt_LoadLibrary.c and falls through to libmawt.
- # Evidently plugin needs this for backward compatability.
- getAwtLockFunctions;
- getAwtData;
- getAwtDisplay;
-
- # libfontmanager entry points
- AWTIsHeadless;
- GrPrim_Sg2dGetCompInfo;
- GrPrim_Sg2dGetClip;
- GetNativePrim;
- SurfaceData_IntersectBounds;
- SurfaceData_GetOps;
- Disposer_AddRecord;
- GrPrim_Sg2dGetEaRGB;
- GrPrim_Sg2dGetPixel;
- GrPrim_Sg2dGetLCDTextContrast;
-
- Java_sun_awt_DefaultMouseInfoPeer_fillPointWithCoords;
- Java_sun_awt_DefaultMouseInfoPeer_isWindowUnderMouse;
- Java_java_awt_AWTEvent_nativeSetSource;
- Java_java_awt_Checkbox_initIDs;
- Java_java_awt_Component_initIDs;
- Java_java_awt_Dialog_initIDs;
- Java_java_awt_Font_initIDs;
- Java_sun_awt_KeyboardFocusManagerPeerImpl_clearNativeGlobalFocusOwner;
- Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusOwner;
- Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusedWindow;
- Java_java_awt_KeyboardFocusManager_initIDs;
- Java_java_awt_Menu_initIDs;
- Java_java_awt_MenuComponent_initIDs;
- Java_java_awt_MenuItem_initIDs;
- Java_java_awt_Scrollbar_initIDs;
- Java_java_awt_ScrollPane_initIDs;
- Java_java_awt_TextArea_initIDs;
- Java_sun_awt_FontDescriptor_initIDs;
- Java_sun_awt_X11InputMethod_disposeXIC;
- Java_sun_awt_X11InputMethod_isCompositionEnabledNative;
- Java_sun_awt_X11InputMethod_resetXIC;
- Java_sun_awt_X11InputMethod_setCompositionEnabledNative;
- Java_sun_awt_X11InputMethod_turnoffStatusWindow;
- Java_sun_awt_SunToolkit_closeSplashScreen;
- Java_sun_awt_PlatformFont_initIDs;
- Java_sun_awt_X11GraphicsConfig_init;
- Java_sun_awt_X11GraphicsConfig_dispose;
- Java_sun_awt_X11GraphicsConfig_pGetBounds;
- Java_sun_awt_X11GraphicsConfig_getNumColors;
- Java_sun_awt_X11GraphicsConfig_getXResolution;
- Java_sun_awt_X11GraphicsConfig_getYResolution;
- Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
- Java_sun_awt_X11GraphicsDevice_isDBESupported;
- Java_sun_awt_X11GraphicsDevice_getDisplay;
- Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
- Java_sun_awt_X11GraphicsDevice_getNumConfigs;
- Java_sun_awt_X11GraphicsDevice_initIDs;
- Java_sun_awt_X11GraphicsDevice_initXrandrExtension;
- Java_sun_awt_X11GraphicsDevice_enterFullScreenExclusive;
- Java_sun_awt_X11GraphicsDevice_exitFullScreenExclusive;
- Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode;
- Java_sun_awt_X11GraphicsDevice_enumDisplayModes;
- Java_sun_awt_X11GraphicsDevice_configDisplayMode;
- Java_sun_awt_X11GraphicsDevice_resetNativeData;
- Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
- Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
- Java_sun_awt_X11GraphicsEnvironment_getDisplayString;
- Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
- Java_sun_awt_X11GraphicsEnvironment_initDisplay;
- 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;
- Java_java_awt_Container_initIDs;
- Java_java_awt_Cursor_finalizeImpl;
- Java_java_awt_Cursor_initIDs;
- Java_java_awt_Event_initIDs;
- Java_java_awt_event_InputEvent_initIDs;
- Java_java_awt_event_KeyEvent_initIDs;
- Java_java_awt_FileDialog_initIDs;
- Java_java_awt_Frame_initIDs;
- Java_java_awt_Insets_initIDs;
- Java_java_awt_TextField_initIDs;
- Java_java_awt_Window_initIDs;
- Java_sun_awt_motif_X11OffScreenImage_updateBitmask;
- Java_sun_awt_X11GraphicsConfig_init;
- Java_sun_awt_X11GraphicsConfig_initIDs;
- Java_sun_awt_X11GraphicsConfig_makeColorModel;
- Java_sun_awt_X11GraphicsDevice_getConfigVisualId;
- Java_sun_awt_X11PMBlitLoops_Blit;
- Java_sun_awt_X11PMBlitBgLoops_nativeBlitBg;
- Java_sun_awt_X11Renderer_devFillSpans;
- Java_sun_awt_X11Renderer_doDrawArc;
- Java_sun_awt_X11Renderer_doDrawLine;
- Java_sun_awt_X11Renderer_doDrawOval;
- Java_sun_awt_X11Renderer_doDrawPoly;
- Java_sun_awt_X11Renderer_doDrawRect;
- Java_sun_awt_X11Renderer_doDrawRoundRect;
- Java_sun_awt_X11Renderer_doFillArc;
- Java_sun_awt_X11Renderer_doFillOval;
- Java_sun_awt_X11Renderer_doFillPoly;
- Java_sun_awt_X11Renderer_doFillRect;
- Java_sun_awt_X11Renderer_doFillRoundRect;
- Java_sun_awt_X11Renderer_devCopyArea;
- Java_sun_awt_X11SurfaceData_initIDs;
- Java_sun_awt_X11SurfaceData_initOps;
- Java_sun_awt_X11SurfaceData_initSurface;
- Java_sun_awt_X11SurfaceData_isDgaAvailable;
- Java_sun_awt_X11SurfaceData_setInvalid;
- Java_sun_awt_X11SurfaceData_flushNativeSurface;
- awt_display;
- awt_lock;
- awt_Lock;
- awt_Unlock;
- awt_GetDrawingSurface;
- awt_FreeDrawingSurface;
- awt_GetComponent;
-
- X11SurfaceData_GetOps;
- getDefaultConfig;
- Java_sun_font_FontConfigManager_getFontConfig;
- Java_sun_font_FontConfigManager_getFontConfigAASettings;
- Java_sun_awt_X11FontManager_getFontPathNative;
- Java_sun_font_SunFontManager_populateFontFileNameMap;
-
- # CDE private entry point
- Java_sun_awt_motif_XsessionWMcommand;
-
- # Java Plugin
- getAwtLockFunctions;
- getAwtData;
- getAwtDisplay;
-
- # libfontmanager entry points
- AWTIsHeadless;
- AWTCountFonts;
- AWTLoadFont;
- AWTFreeFont;
- AWTFontMinByte1;
- AWTFontMaxByte1;
- AWTFontMinCharOrByte2;
- AWTFontMaxCharOrByte2;
- AWTFontDefaultChar;
- AWTFontPerChar;
- AWTFontMaxBounds;
- AWTFontTextExtents16;
- AWTFreeChar;
- AWTFontGenerateImage;
- AWTCharAdvance;
- AWTCharLBearing;
- AWTCharRBearing;
- AWTCharAscent;
- AWTCharDescent;
- AWTDrawGlyphList;
- AccelGlyphCache_RemoveAllCellInfos;
-
- local:
- *;
-};
-
diff --git a/jdk/make/sun/awt/mawt.gmk b/jdk/make/sun/awt/mawt.gmk
deleted file mode 100644
index 7ca0520..0000000
--- a/jdk/make/sun/awt/mawt.gmk
+++ /dev/null
@@ -1,245 +0,0 @@
-#
-# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# to create directory:
-#
-INIT += $(LIB_LOCATION)
-
-#
-# Files
-#
-# mawt.gmk is just used in building X/Motif native code, so
-# this list of java files is no longer included.
-#include FILES_java_unix.gmk
-include $(BUILDDIR)/sun/awt/FILES_c_unix.gmk
-
-include $(BUILDDIR)/sun/awt/FILES_export_unix.gmk
-
-# Check which C files should be built. Headless uses only
-# non-motif files. Also, a version-specific motif file is
-# compiled based on the motif version.
-FILES_c = $(FILES_NO_MOTIF_c)
-
-ifeq ($(PLATFORM), macosx)
-FILES_objc = $(FILES_NO_MOTIF_objc)
-endif # PLATFORM
-
-ifeq ($(PLATFORM), solaris)
- ifneq ($(ARCH), amd64)
- FILES_reorder += reorder-$(ARCH)
- endif
-endif
-
-#
-# Rules
-#
-
-# Class files should be built & clobbered in make/sun/awt
-# If removing this line, also reinclude sun_awt.jmk
-DONT_CLOBBER_CLASSES = true
-
-
-ifndef HEADLESS
-ifeq ($(VARIANT), OPT)
-FILES_m = ../awt/mapfile-mawt-vers
-endif
-endif
-
-# Since this library will be living in a subdirectory below the other libraries
-# we need to add an extra runpath so that libraries in the upper directory
-# are found at runtime.
-LD_RUNPATH_EXTRAS = ..
-
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-$(LIB_LOCATION):
- $(MKDIR) -p $@
-
-clean::
-
-#
-# Add to the ambient vpath to pick up files in subdirectories
-#
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/alphacomposite
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/gif
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/cvutils
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/shell
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/medialib
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/debug
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../font
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe
-vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)/image
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/robot_child
-
-ifeq ($(PLATFORM), macosx)
-vpath %.m $(call NativeSrcDirList,,native/sun/font)
-endif # PLATFORM
-
-#
-# Libraries to link in.
-#
-
-
-ifeq ($(DEBUG_BINARIES), true)
- CFLAGS += -g
-endif
-ifeq ($(HEADLESS),true)
-CFLAGS += -DHEADLESS=$(HEADLESS)
-CPPFLAGS += -DHEADLESS=$(HEADLESS)
-OTHER_LDLIBS =
-else
-LIBXTST = -lXtst
-ifeq ($(PLATFORM), linux)
- ifeq ($(ARCH_DATA_MODEL), 64)
- # XXX what about the rest of them?
- LIBXT = -lXt
- else
- # Allows for builds on Debian GNU Linux, X11 is in a different place
- LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
- $(wildcard /usr/lib/libXt.a))
- LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
- $(wildcard /usr/lib/libSM.a))
- LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
- $(wildcard /usr/lib/libICE.a))
- LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
- $(wildcard /usr/lib/libXtst.a))
- endif
-endif
-
-# Use -lXmu for EditRes support
-LIBXMU_DBG = -lXmu
-LIBXMU_OPT =
-LIBXMU = $(LIBXMU_$(VARIANT))
-
-ifeq ($(PLATFORM), solaris)
-OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
-endif
-
-ifneq (,$(findstring $(PLATFORM), linux macosx))
-OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
-# XXX what is this define below? Isn't it motif-related?
-OTHER_CFLAGS += -DXMSTRINGDEFINES=1
-OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
-endif
-
-endif
-# !HEADLESS
-
-OTHER_LDLIBS += $(JVMLIB) $(LIBCXX) \
- -lawt $(LIBM) $(LIBDL)
-
-#
-# Sun CC with -Xa misdefines __STDC__ to 0 (zero).
-# The following will force checking of X11 prototypes.
-#
-ifneq ($(CC_VERSION),gcc)
-CPPFLAGS += -DFUNCPROTO=15
-endif
-
-#
-# Other extra flags needed for compiling.
-#
-CPPFLAGS += -I$(CUPS_HEADERS_PATH)
-
-ifndef HEADLESS
-CPPFLAGS += -I$(OPENWIN_HOME)/include
-LDFLAGS += -L$(OPENWIN_LIB)
-
-endif # !HEADLESS
-
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
- -I$(SHARE_SRC)/native/$(PKGDIR)/image \
- -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
- -I$(SHARE_SRC)/native/$(PKGDIR)/shell \
- -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
- -I$(SHARE_SRC)/native/$(PKGDIR)/medialib \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11 \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
- -I$(PLATFORM_SRC)/native/$(PKGDIR) \
- $(EVENT_MODEL)
-
-ifeq ($(PLATFORM), macosx)
-CPPFLAGS += -I$(CUPS_HEADERS_PATH) \
- $(call NativeSrcDirList,-I,native/sun/awt) \
- $(call NativeSrcDirList,-I,native/sun/font)
-
-ifndef HEADLESS
-CPPFLAGS += -I$(MOTIF_DIR)/include \
- -I$(OPENWIN_HOME)/include
-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
-else
-LDFLAGS += -framework Accelerate \
- -framework ApplicationServices \
- -framework Cocoa \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport
-endif # !HEADLESS
-endif # PLATFORM
-
-ifeq ($(PLATFORM), linux)
- # Checking for the X11/extensions headers at the additional location
- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
- $(wildcard /usr/include/X11/extensions))
-endif
-
-ifeq ($(PLATFORM), macosx)
- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
- -I$(OPENWIN_HOME)/include
-endif
-
-ifeq ($(PLATFORM), solaris)
- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
-endif
-
-ifeq ($(PLATFORM), macosx)
- CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
-endif
-
-LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
- $(AWT_RUNPATH)
-
-CLASSES.export += java.io.InputStream \
- java.lang.ThreadGroup
-
diff --git a/jdk/make/sun/cldr/Makefile b/jdk/make/sun/cldr/Makefile
deleted file mode 100644
index eaf5bac..0000000
--- a/jdk/make/sun/cldr/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for CLDR locale data.
-#
-
-BUILDDIR = ../..
-
-PACKAGE = sun.text.resources.cldr
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# Re-direct classes to another location (we are building cldrdata.jar)
-CLASSDESTDIR = $(TEMPDIR)/classes
-CLDRVERSION = 21.0.1
-CLDRSRCDIR = $(SHARE_SRC)/classes/sun/util/cldr/resources/$(subst .,_,$(CLDRVERSION))
-CLDRDATA_JAR = $(EXTDIR)/cldrdata.jar
-CLDRCONVERTER_JAR = $(BUILDTOOLJARDIR)/cldrconverter.jar
-
-#
-# Files
-#
-CLDRGENSRCDIR = $(GENSRCDIR)/sun/text/resources/cldr \
- $(GENSRCDIR)/sun/util/cldr \
- $(GENSRCDIR)/sun/util/resources/cldr
-MANIFEST_FILE = $(TEMPDIR)/manifest.mf
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-gensrc: $(GENSRCDIR)/sun/util/cldr/CLDRLocaleDataMetaInfo.java
-
-$(GENSRCDIR)/sun/util/cldr/CLDRLocaleDataMetaInfo.java: \
- $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
- $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
- $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml)
- $(prep-target)
- @$(BOOT_JAVA_CMD) -jar $(CLDRCONVERTER_JAR) \
- -base $(CLDRSRCDIR) \
- -o $(GENSRCDIR)
- @$(java-vm-cleanup)
-
-$(CLDRDATA_JAR): $(EXTDIR) $(GENSRCDIR)/sun/util/cldr/CLDRLocaleDataMetaInfo.java $(MANIFEST_FILE)
- $(prep-target)
- $(MKDIR) -p $(CLASSDESTDIR)
- $(shell \
- for dir in $(GENSRCDIR); do \
- if [ -d $$dir ] ; then \
- ( $(CD) $$dir; \
- for sdir in $(CLDRGENSRCDIR); do \
- if [ -d $$sdir ] ; then \
- $(FIND) $$sdir \
- -name '*.java' -print >> $(JAVA_SOURCE_LIST) ; \
- fi ; \
- done \
- ); \
- fi; \
- done \
- )
- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST)
- $(BOOT_JAR_CMD) -cmf $(MANIFEST_FILE) $@ -C $(CLASSDESTDIR) sun \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-$(MANIFEST_FILE):
- @$(prep-target)
- $(ECHO) "CLDR-Version: $(CLDRVERSION)" > $@
-
-build: gensrc $(CLDRDATA_JAR)
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR)
- $(RM) -r $(GENSRCDIR)/sun/text/resources/cldr
- $(RM) -r $(GENSRCDIR)/sun/util/cldr
- $(RM) -r $(GENSRCDIR)/sun/util/resources/cldr
- $(RM) $(MANIFEST_FILE)
- $(RM) $(CLDRDATA_JAR)
-
-.PHONY: gensrc
diff --git a/jdk/make/sun/cmm/Makefile b/jdk/make/sun/cmm/Makefile
deleted file mode 100644
index 137b8d3..0000000
--- a/jdk/make/sun/cmm/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS += lcms
-
-ifdef OPENJDK
- ICCPROFILE_SRC_DIR = $(SHARE_SRC)/lib/cmm/lcms
-else # !OPENJDK
- SUBDIRS += kcms
- ICCPROFILE_SRC_DIR = $(CLOSED_SRC)/share/lib/cmm/kcms
-endif # OPENJDK
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-#
-# ICC Profiles used by the CMM.
-#
-ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm
-
-iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \
- $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \
- $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
-
-$(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf
- $(install-file)
- $(call chmod-file, 444)
-
-$(ICCPROFILE_DEST_DIR)/GRAY.pf: $(ICCPROFILE_SRC_DIR)/GRAY.pf
- $(install-file)
- $(call chmod-file, 444)
-
-$(ICCPROFILE_DEST_DIR)/CIEXYZ.pf: $(ICCPROFILE_SRC_DIR)/CIEXYZ.pf
- $(install-file)
- $(call chmod-file, 444)
-
-$(ICCPROFILE_DEST_DIR)/PYCC.pf: $(ICCPROFILE_SRC_DIR)/PYCC.pf
- $(install-file)
- $(call chmod-file, 444)
-
-$(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf: $(ICCPROFILE_SRC_DIR)/LINEAR_RGB.pf
- $(install-file)
- $(call chmod-file, 444)
-
-iccprofiles.clean:
- $(RM) -r $(ICCPROFILE_DEST_DIR)
-
-
-clobber: iccprofiles.clean
- $(SUBDIRS-loop)
-
-clean: iccprofiles.clean
- $(SUBDIRS-loop)
-
-all build:: iccprofiles
- $(SUBDIRS-loop)
-
-openjdk::
- $(MAKE) OPENJDK=true build
-
-.PHONY: iccprofiles iccprofiles.clean copy-files openjdk
diff --git a/jdk/make/sun/cmm/kcms/FILES_c_unix.gmk b/jdk/make/sun/cmm/kcms/FILES_c_unix.gmk
deleted file mode 100644
index cd20c77..0000000
--- a/jdk/make/sun/cmm/kcms/FILES_c_unix.gmk
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- attrmgr.c \
- auxpt.c \
- calc.c \
- calcgtbl.c \
- calcitbl.c \
- calcmtbl.c \
- calcotbl.c \
- chainsu.c \
- chnrules.c \
- cmpsatt.c \
- cmpsattf.c \
- cmyklin.c \
- combine.c \
- compilut.c \
- compitbl.c \
- compose.c \
- compotbl.c \
- convert1.c \
- copy.c \
- crc32.c \
- dispatch.c \
- doevalsw.c \
- eval.c \
- evalth13.c \
- evalth14.c \
- evalth1c.c \
- evalth1g.c \
- f4lex.c \
- filemap.c \
- fmtdata.c \
- futiomem.c \
- futiotbl.c \
- futmft2.c \
- fwdmono.c \
- fwdxform.c \
- fxnull.c \
- invmono.c \
- invxform.c \
- io.c \
- io_swab.c \
- ioencode.c \
- iomf.c \
- iotable.c \
- kcms_io.c \
- kcpmgr.c \
- kcpmgru.c \
- kpfile.c \
- kplib.c \
- kpmd5.c \
- lab2uvl.c \
- lab2xyz.c \
- lensity.c \
- linlab.c \
- logrgb.c \
- loguvl.c \
- malloc.c \
- mat2fut.c \
- matrix.c \
- memory.c \
- moncurv.c \
- new.c \
- outmat.c \
- profile.c \
- profilem.c \
- ptchain.c \
- pteval.c \
- ptinvert.c \
- ptiomem.c \
- pttmgr.c \
- rel2abs.c \
- resize.c \
- share.c \
- solvemat.c \
- spattpr.c \
- spattr.c \
- spattrio.c \
- spcvrt.c \
- speval.c \
- splink.c \
- splut.c \
- sprofile.c \
- sprofpr.c \
- spsave.c \
- spsearch.c \
- spsys.c \
- spsystem.c \
- sptagio.c \
- sptagmgr.c \
- sputilpr.c \
- spxf_gen.c \
- spxfcvrt.c \
- spxfgpr.c \
- spxfmtag.c \
- spxform.c \
- spxfprv.c \
- spxfromr.c \
- sync.c \
- systime.c \
- thread.c \
- thredmem.c \
- ukcpmgr.c \
- unixmem.c \
- util.c \
- uvl2lab.c \
- xfers.c \
- xyz2lab.c \
- xyzmap.c \
- CMM.c
diff --git a/jdk/make/sun/cmm/kcms/FILES_c_windows.gmk b/jdk/make/sun/cmm/kcms/FILES_c_windows.gmk
deleted file mode 100644
index de1a929..0000000
--- a/jdk/make/sun/cmm/kcms/FILES_c_windows.gmk
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- attrmgr.c \
- auxpt.c \
- calc.c \
- calcgtbl.c \
- calcitbl.c \
- calcmtbl.c \
- calcotbl.c \
- chainsu.c \
- chnrules.c \
- cmmdll.c \
- cmpsatt.c \
- cmpsattf.c \
- cmyklin.c \
- combine.c \
- compilut.c \
- compitbl.c \
- compose.c \
- compotbl.c \
- convert1.c \
- copy.c \
- crc32.c \
- dispatch.c \
- doevalsw.c \
- eval.c \
- evalth13.c \
- evalth14.c \
- evalth1c.c \
- evalth1g.c \
- f4lex.c \
- filemap.c \
- fmtdata.c \
- futiomem.c \
- futiotbl.c \
- futmft2.c \
- fwdmono.c \
- fwdxform.c \
- fxnull.c \
- invmono.c \
- invxform.c \
- io.c \
- io_swab.c \
- ioencode.c \
- iomf.c \
- iotable.c \
- kcms_io.c \
- kcpmgr.c \
- kcpmgru.c \
- kpfile.c \
- kplib.c \
- kpmd5.c \
- lab2uvl.c \
- lab2xyz.c \
- lensity.c \
- linlab.c \
- logrgb.c \
- loguvl.c \
- malloc.c \
- mat2fut.c \
- matrix.c \
- memory.c \
- moncurv.c \
- new.c \
- outmat.c \
- profile.c \
- profilem.c \
- ptchain.c \
- pteval.c \
- ptinvert.c \
- ptiomem.c \
- pttmgr.c \
- registry.c \
- rel2abs.c \
- resize.c \
- share.c \
- solvemat.c \
- spattpr.c \
- spattr.c \
- spattrio.c \
- spcvrt.c \
- speval.c \
- splink.c \
- splut.c \
- sprofile.c \
- sprofpr.c \
- spsave.c \
- spsearch.c \
- spsys.c \
- spsystem.c \
- sptagio.c \
- sptagmgr.c \
- sputilpr.c \
- spxf_gen.c \
- spxfcvrt.c \
- spxffile.c \
- spxfgpr.c \
- spxfmtag.c \
- spxform.c \
- spxfprv.c \
- spxfromr.c \
- sync.c \
- sysinfo.c \
- systime.c \
- thread.c \
- thredmem.c \
- util.c \
- uvl2lab.c \
- winmem.c \
- wkcpmgr.c \
- xfers.c \
- xyz2lab.c \
- xyzmap.c \
- CMM.c
diff --git a/jdk/make/sun/cmm/kcms/Makefile b/jdk/make/sun/cmm/kcms/Makefile
deleted file mode 100644
index 65372af..0000000
--- a/jdk/make/sun/cmm/kcms/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.java2d.cmm.kcms
-LIBRARY = kcms
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-ifeq ($(PLATFORM), windows)
-include FILES_c_windows.gmk
-else # PLATFORM
-include FILES_c_unix.gmk
-endif # PLATFORM
-
-FILES_java = \
- sun/java2d/cmm/kcms/CMM.java
-
-FILES_export = \
- sun/java2d/cmm/kcms/CMM.java
-
-ifeq ($(PLATFORM), windows)
- # Override the default version info with our own resource file (see 5043594)
- VERSIONINFO_RESOURCE = $(CLOSED_SRC)/share/native/sun/java2d/cmm/kcms/cmm.rc
-endif
-
-# Rules
-#
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-SERVICEDIR = $(CLASSBINDIR)/META-INF/services
-
-FILES_copy = \
- $(SERVICEDIR)/sun.java2d.cmm.CMMServiceProvider
-
-
-build: copy-files
-
-copy-files: $(FILES_copy)
-
-$(SERVICEDIR)/%: $(CLOSED_SRC)/share/classes/sun/java2d/cmm/kcms/META-INF/services/%
- $(install-file)
-
-#
-# Extra rules
-#
-ifeq ($(PLATFORM), linux)
- LDLIBS += -lpthread
- OTHER_CFLAGS += -Wno-missing-field-initializers
-endif
-
-clean clobber::
- $(RM) $(FILES_copy)
-
-#
-# Add to ambient vpath to get files in a subdirectory
-#
-vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)
-
-ifeq ($(PLATFORM), windows)
-
-OTHER_LDLIBS = user32.lib version.lib
-
-clean:: res.clean
-
-res.clean:
- $(RM) $(OBJDIR)/cmm.rc
- $(RM) $(OBJDIR)/cmm.res
- $(RM) $(OBJDIR)/cmm.h
-
-else # PLATFORM
-OTHER_LDLIBS = $(LIBM)
-
-# Use pic instead of PIC on this library
-GLOBAL_KPIC = $(PIC_CODE_SMALL)
-
-CPPFLAGS += -I$(CLASSHDRDIR) \
-
-endif # PLATFORM
-
-CFLAGS += -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST
-
diff --git a/jdk/make/sun/cmm/kcms/mapfile-vers b/jdk/make/sun/cmm/kcms/mapfile-vers
deleted file mode 100644
index 33b0d30..0000000
--- a/jdk/make/sun/cmm/kcms/mapfile-vers
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Java_sun_java2d_cmm_kcms_CMM_cmmGetTagSize;
- Java_sun_java2d_cmm_kcms_CMM_cmmGetNumComponents;
- Java_sun_java2d_cmm_kcms_CMM_cmmColorConvert;
- Java_sun_java2d_cmm_kcms_CMM_cmmInit;
- Java_sun_java2d_cmm_kcms_CMM_cmmCombineTransforms;
- Java_sun_java2d_cmm_kcms_CMM_cmmGetTagData;
- Java_sun_java2d_cmm_kcms_CMM_cmmSetTagData;
- Java_sun_java2d_cmm_kcms_CMM_cmmGetProfileData;
- Java_sun_java2d_cmm_kcms_CMM_cmmFreeProfile;
- Java_sun_java2d_cmm_kcms_CMM_cmmTerminate;
- Java_sun_java2d_cmm_kcms_CMM_cmmLoadProfile;
- Java_sun_java2d_cmm_kcms_CMM_cmmGetTransform;
- Java_sun_java2d_cmm_kcms_CMM_cmmFreeTransform;
- Java_sun_java2d_cmm_kcms_CMM_cmmGetProfileSize;
-
- local:
- *;
-};
diff --git a/jdk/make/sun/cmm/lcms/FILES_c_unix.gmk b/jdk/make/sun/cmm/lcms/FILES_c_unix.gmk
deleted file mode 100644
index 58e39e3..0000000
--- a/jdk/make/sun/cmm/lcms/FILES_c_unix.gmk
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- cmscam02.c \
- cmscgats.c \
- cmscnvrt.c \
- cmserr.c \
- cmsgamma.c \
- cmsgmt.c \
- cmshalf.c \
- cmsintrp.c \
- cmsio0.c \
- cmsio1.c \
- cmslut.c \
- cmsmd5.c \
- cmsmtrx.c \
- cmsnamed.c \
- cmsopt.c \
- cmspack.c \
- cmspcs.c \
- cmsplugin.c \
- cmsps2.c \
- cmssamp.c \
- cmssm.c \
- cmstypes.c \
- cmsvirt.c \
- cmswtpnt.c \
- cmsxform.c \
- LCMS.c
diff --git a/jdk/make/sun/cmm/lcms/FILES_c_windows.gmk b/jdk/make/sun/cmm/lcms/FILES_c_windows.gmk
deleted file mode 100644
index 58e39e3..0000000
--- a/jdk/make/sun/cmm/lcms/FILES_c_windows.gmk
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- cmscam02.c \
- cmscgats.c \
- cmscnvrt.c \
- cmserr.c \
- cmsgamma.c \
- cmsgmt.c \
- cmshalf.c \
- cmsintrp.c \
- cmsio0.c \
- cmsio1.c \
- cmslut.c \
- cmsmd5.c \
- cmsmtrx.c \
- cmsnamed.c \
- cmsopt.c \
- cmspack.c \
- cmspcs.c \
- cmsplugin.c \
- cmsps2.c \
- cmssamp.c \
- cmssm.c \
- cmstypes.c \
- cmsvirt.c \
- cmswtpnt.c \
- cmsxform.c \
- LCMS.c
diff --git a/jdk/make/sun/cmm/lcms/Makefile b/jdk/make/sun/cmm/lcms/Makefile
deleted file mode 100644
index 15afe61..0000000
--- a/jdk/make/sun/cmm/lcms/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.java2d.cmm.lcms
-LIBRARY = lcms
-PRODUCT = sun
-
-# Use highest level of optimization on this library
-OPTIMIZATION_LEVEL = HIGHEST
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-ifeq ($(PLATFORM), windows)
-include FILES_c_windows.gmk
-else # PLATFORM
-include FILES_c_unix.gmk
-endif # PLATFORM
-
-FILES_java = \
- $(TAGDIR)sun/java2d/cmm/lcms/LCMS.java \
- $(TAGDIR)sun/java2d/cmm/lcms/LCMSImageLayout.java \
- $(TAGDIR)sun/java2d/cmm/lcms/LCMSTransform.java
-
-FILES_export = sun/java2d/cmm/lcms/LCMS.java
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-SERVICEDIR = $(CLASSBINDIR)/META-INF/services
-
-FILES_copy = \
- $(SERVICEDIR)/sun.java2d.cmm.CMMServiceProvider
-
-build: copy-files
-
-copy-files: $(FILES_copy)
-
-$(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/java2d/cmm/lcms/META-INF/services/%
- $(install-file)
-
-#
-# Extra rules
-#
-
-ifeq ($(PLATFORM), solaris)
-CFLAGS := $(subst -xc99=%none,-xc99=no_lib,$(CFLAGS))
-endif
-
-clean clobber::
- $(RM) $(FILES_copy)
-
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
-vpath %.c $(SHARE_SRC)/native/sun/java2d
-
-ifeq ($(PLATFORM), windows)
-OTHER_CFLAGS += -DCMS_IS_WINDOWS_
-
-OTHER_LDLIBS = $(OBJDIR)/../../../sun.awt/awt/$(OBJDIRNAME)/awt.lib
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/sun/java2d \
- -I$(SHARE_SRC)/native/sun/awt/debug
-
-clean:: res.clean
-
-res.clean:
- $(RM) $(OBJDIR)/cmm.rc
- $(RM) $(OBJDIR)/cmm.res
- $(RM) $(OBJDIR)/cmm.h
-
-else
-ifeq ($(PLATFORM), macosx)
-OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/xawt
-else
-OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt
-endif
-CPPFLAGS += -I$(SHARE_SRC)/native/sun/java2d \
- -I$(SHARE_SRC)/native/sun/awt/debug
-endif
-
diff --git a/jdk/make/sun/cmm/lcms/mapfile-vers b/jdk/make/sun/cmm/lcms/mapfile-vers
deleted file mode 100644
index 949ff9b..0000000
--- a/jdk/make/sun/cmm/lcms/mapfile-vers
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Java_sun_java2d_cmm_lcms_LCMS_loadProfileNative;
- Java_sun_java2d_cmm_lcms_LCMS_getProfileSizeNative;
- Java_sun_java2d_cmm_lcms_LCMS_getProfileDataNative;
- Java_sun_java2d_cmm_lcms_LCMS_getTagNative;
- Java_sun_java2d_cmm_lcms_LCMS_setTagDataNative;
- Java_sun_java2d_cmm_lcms_LCMS_colorConvert;
- Java_sun_java2d_cmm_lcms_LCMS_getProfileID;
- Java_sun_java2d_cmm_lcms_LCMS_initLCMS;
- Java_sun_java2d_cmm_lcms_LCMS_createNativeTransform;
- JNI_OnLoad;
-
- local:
- *;
-};
diff --git a/jdk/make/sun/dcpr/FILES_c.gmk b/jdk/make/sun/dcpr/FILES_c.gmk
deleted file mode 100644
index 898f66e..0000000
--- a/jdk/make/sun/dcpr/FILES_c.gmk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- CJError.c \
- doeObject.c \
- doeSun.c \
- dcPool.c \
- CJPathConsumer.c \
- CJPathConsumer2D.c \
- dcPathConsumer.c \
- dcPathStore.c \
- dcPathError.c \
- dcPathException.c \
- PathFiller.c \
- PathDasher.c \
- PathStroker.c \
- dcLLFiller.c \
- dcLLFillerH.c \
- dcLLFillerS.c \
- dcPRError.c \
- dcPRException.c \
- dcPathFiller.c \
- dcPathDasher.c \
- dcPathStorage.c \
- dcPathStroker.c \
- affine.c \
- angles.c \
- arcs.c \
diff --git a/jdk/make/sun/dcpr/Makefile b/jdk/make/sun/dcpr/Makefile
deleted file mode 100644
index fb22b1d..0000000
--- a/jdk/make/sun/dcpr/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.dc
-LIBRARY = dcpr
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_c.gmk
-
-FILES_java = \
- sun/dc/DuctusRenderingEngine.java \
- sun/dc/path/FastPathProducer.java \
- sun/dc/path/PathConsumer.java \
- sun/dc/path/PathError.java \
- sun/dc/path/PathException.java \
- sun/dc/pr/PathDasher.java \
- sun/dc/pr/PathFiller.java \
- sun/dc/pr/PathStroker.java \
- sun/dc/pr/PRError.java \
- sun/dc/pr/PRException.java \
- sun/dc/pr/Rasterizer.java
-
-FILES_export = \
- sun/dc/pr/PathDasher.java \
- sun/dc/pr/PathFiller.java \
- sun/dc/pr/PathStroker.java
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-SERVICEDIR = $(CLASSBINDIR)/META-INF/services
-
-FILES_copy = \
- $(SERVICEDIR)/sun.java2d.pipe.RenderingEngine
-
-build: copy-files
-
-copy-files: $(FILES_copy)
-
-$(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/dc/META-INF/services/%
- $(install-file)
-
-#
-# Add to the ambient vpath to pick up files in subdirectories
-#
-vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)/doe
-vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)/path
-vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)/pr
-vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)/util
-vpath %.c $(SHARE_SRC)/native/sun/java2d/pipe
-
-ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS = $(LIBM)
-endif # PLATFORM
-
-CPPFLAGS += \
- -I$(CLOSED_SRC)/share/native/$(PKGDIR)/doe \
- -I$(CLOSED_SRC)/share/native/$(PKGDIR)/path \
- -I$(CLOSED_SRC)/share/native/$(PKGDIR)/pr \
- -I$(CLOSED_SRC)/share/native/$(PKGDIR)/util \
- -I$(SHARE_SRC)/native/sun/java2d/pipe \
- -I$(PLATFORM_SRC)/native/sun/java2d
-
diff --git a/jdk/make/sun/dcpr/mapfile-vers b/jdk/make/sun/dcpr/mapfile-vers
deleted file mode 100644
index 9662897..0000000
--- a/jdk/make/sun/dcpr/mapfile-vers
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Java_sun_dc_pr_PathDasher_beginPath;
- Java_sun_dc_pr_PathFiller_getTileState;
- Java_sun_dc_pr_PathStroker_setCaps;
- Java_sun_dc_pr_PathStroker_setCorners;
- Java_sun_dc_pr_PathFiller_writeAlpha16;
- Java_sun_dc_pr_PathFiller_closedSubpath;
- Java_sun_dc_pr_PathStroker_beginPath;
- Java_sun_dc_pr_PathDasher_setDashT4;
- Java_sun_dc_pr_PathFiller_dispose;
- Java_sun_dc_pr_PathStroker_closedSubpath;
- Java_sun_dc_pr_PathDasher_appendLine;
- Java_sun_dc_pr_PathStroker_dispose;
- Java_sun_dc_pr_PathDasher_setOutputConsumer;
- Java_sun_dc_pr_PathStroker_reset;
- Java_sun_dc_pr_PathFiller_beginSubpath;
- Java_sun_dc_pr_PathFiller_writeAlpha8;
- Java_sun_dc_pr_PathDasher_closedSubpath;
- Java_sun_dc_pr_PathFiller_appendQuadratic;
- Java_sun_dc_pr_PathDasher_setOutputT6;
- Java_sun_dc_pr_PathStroker_setPenFitting;
- Java_sun_dc_pr_PathStroker_endPath;
- Java_sun_dc_pr_PathDasher_setDash;
- Java_sun_dc_pr_PathFiller_nextTile;
- Java_sun_dc_pr_PathStroker_setOutputConsumer;
- Java_sun_dc_pr_PathFiller_setFillMode;
- Java_sun_dc_pr_PathFiller_appendLine;
- Java_sun_dc_pr_PathStroker_appendQuadratic;
- Java_sun_dc_pr_PathFiller_endPath;
- Java_sun_dc_pr_PathStroker_appendCubic;
- Java_sun_dc_pr_PathDasher_appendCubic;
- Java_sun_dc_pr_PathStroker_setPenDiameter;
- Java_sun_dc_pr_PathFiller_setOutputArea;
- Java_sun_dc_pr_PathFiller_getAlphaBox;
- Java_sun_dc_pr_PathStroker_appendLine;
- Java_sun_dc_pr_PathStroker_setOutputT6;
- Java_sun_dc_pr_PathFiller_beginPath;
- Java_sun_dc_pr_PathDasher_dispose;
- Java_sun_dc_pr_PathDasher_reset;
- Java_sun_dc_pr_PathFiller_reset;
- Java_sun_dc_pr_PathDasher_endPath;
- Java_sun_dc_pr_PathStroker_beginSubpath;
- Java_sun_dc_pr_PathStroker_setPenT4;
- Java_sun_dc_pr_PathDasher_appendQuadratic;
- Java_sun_dc_pr_PathDasher_beginSubpath;
- Java_sun_dc_pr_PathFiller_appendCubic;
-
- Java_sun_dc_pr_PathDasher_cClassFinalize;
- Java_sun_dc_pr_PathDasher_cClassInitialize;
- Java_sun_dc_pr_PathDasher_cInitialize;
- Java_sun_dc_pr_PathFiller_cClassFinalize;
- Java_sun_dc_pr_PathFiller_cClassInitialize;
- Java_sun_dc_pr_PathFiller_cInitialize;
- Java_sun_dc_pr_PathStroker_cClassFinalize;
- Java_sun_dc_pr_PathStroker_cClassInitialize;
- Java_sun_dc_pr_PathStroker_cInitialize;
- Java_sun_dc_pr_PathStroker_cInitialize2D;
-
- Java_sun_dc_pr_PathDasher_getCPathConsumer;
- Java_sun_dc_pr_PathFiller_getCPathConsumer;
- Java_sun_dc_pr_PathStroker_getCPathConsumer;
-
- local:
- *;
-};
diff --git a/jdk/make/sun/font/FILES_c.gmk b/jdk/make/sun/font/FILES_c.gmk
deleted file mode 100644
index b1895c5..0000000
--- a/jdk/make/sun/font/FILES_c.gmk
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c_shared = \
- DrawGlyphList.c \
- sunFont.c
-
-ifdef OPENJDK
-FILES_c_shared += $(TARGDIR)freetypeScaler.c
-endif
-
-FILES_cpp_shared = \
- CursiveAttachmentSubtables.cpp \
- ExtensionSubtables.cpp \
- MPreFixups.cpp \
- HanLayoutEngine.cpp \
- LEFontInstance.cpp \
- ContextualGlyphSubstProc.cpp \
- IndicRearrangementProcessor.cpp \
- LigatureSubstProc.cpp \
- LookupTables.cpp \
- MorphTables.cpp \
- NonContextualGlyphSubstProc.cpp \
- SegmentArrayProcessor.cpp \
- SegmentSingleProcessor.cpp \
- SimpleArrayProcessor.cpp \
- SingleTableProcessor.cpp \
- StateTableProcessor.cpp \
- SubtableProcessor.cpp \
- TrimmedArrayProcessor.cpp \
- AlternateSubstSubtables.cpp \
- AnchorTables.cpp \
- CanonData.cpp \
- CanonShaping.cpp \
- ClassDefinitionTables.cpp \
- ContextualSubstSubtables.cpp \
- CoverageTables.cpp \
- DeviceTables.cpp \
- Features.cpp \
- GDEFMarkFilter.cpp \
- GlyphDefinitionTables.cpp \
- GlyphIterator.cpp \
- GlyphLookupTables.cpp \
- GlyphPositionAdjustments.cpp \
- GlyphPosnLookupProc.cpp \
- GlyphPositioningTables.cpp \
- GlyphSubstLookupProc.cpp \
- GlyphSubstitutionTables.cpp \
- HangulLayoutEngine.cpp \
- IndicClassTables.cpp \
- IndicReordering.cpp \
- KernTable.cpp \
- KhmerLayoutEngine.cpp \
- KhmerReordering.cpp \
- LEGlyphStorage.cpp \
- LEInsertionList.cpp \
- LigatureSubstSubtables.cpp \
- LookupProcessor.cpp \
- Lookups.cpp \
- MarkArrays.cpp \
- MarkToBasePosnSubtables.cpp \
- MarkToLigaturePosnSubtables.cpp \
- MarkToMarkPosnSubtables.cpp \
- MirroredCharData.cpp \
- MultipleSubstSubtables.cpp \
- OpenTypeUtilities.cpp \
- PairPositioningSubtables.cpp \
- ScriptAndLanguage.cpp \
- ShapingTypeData.cpp \
- SinglePositioningSubtables.cpp \
- SingleSubstitutionSubtables.cpp \
- SubstitutionLookups.cpp \
- ThaiShaping.cpp \
- ThaiStateTables.cpp \
- TibetanLayoutEngine.cpp \
- TibetanReordering.cpp \
- ValueRecords.cpp \
- ArabicLayoutEngine.cpp \
- ArabicShaping.cpp \
- GXLayoutEngine.cpp \
- IndicLayoutEngine.cpp \
- LayoutEngine.cpp \
- SunLayoutEngine.cpp \
- OpenTypeLayoutEngine.cpp \
- ThaiLayoutEngine.cpp \
- ScriptAndLanguageTags.cpp \
- FontInstanceAdapter.cpp \
- ContextualGlyphInsertionProc2.cpp \
- ContextualGlyphSubstProc2.cpp \
- GXLayoutEngine2.cpp \
- IndicRearrangementProcessor2.cpp \
- LigatureSubstProc2.cpp \
- MorphTables2.cpp \
- NonContextualGlyphSubstProc2.cpp \
- SegmentArrayProcessor2.cpp \
- SegmentSingleProcessor2.cpp \
- SimpleArrayProcessor2.cpp \
- SingleTableProcessor2.cpp \
- StateTableProcessor2.cpp \
- SubtableProcessor2.cpp \
- TrimmedArrayProcessor2.cpp
-
-
-ifeq ($(PLATFORM),windows)
-FILES_c_platform = fontpath.c \
- lcdglyph.c
-
-FILES_cpp_platform =
-else
-FILES_c_platform = X11FontScaler.c \
- X11TextRenderer.c
-FILES_cpp_platform =
-endif
-
-FILES_c = $(FILES_c_shared) $(FILES_c_platform)
-FILES_cpp = $(FILES_cpp_shared) $(FILES_cpp_platform)
diff --git a/jdk/make/sun/font/Makefile b/jdk/make/sun/font/Makefile
deleted file mode 100644
index fd8c8a2..0000000
--- a/jdk/make/sun/font/Makefile
+++ /dev/null
@@ -1,232 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building all of font tools
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.font
-LIBRARY = fontmanager
-PRODUCT = sun
-
-# Indicate we want the C++ compiler to do the linking.
-CPLUSPLUSLIBRARY=true
-
-# Use higher optimization level
-ifeq ($(PLATFORM), windows)
-OPTIMIZATION_LEVEL = HIGHEST
-else
-OPTIMIZATION_LEVEL = HIGHER
-endif
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Created without -z defs on linux
-#
-ifeq ($(PLATFORM), linux)
- LDFLAGS_DEFS_OPTION =
-endif
-
-#
-# Files
-#
-
-include FILES_c.gmk
-
-AUTO_FILES_JAVA_DIRS = sun/font
-FILES_java += java/awt/Font.java java/text/Bidi.java
-
-FILES_export = \
- sun/font/SunLayoutEngine.java \
- java/awt/Font.java \
- java/text/Bidi.java \
- sun/font/FileFont.java \
- sun/font/FileFontStrike.java \
- sun/font/SunFontManager.java \
- sun/font/GlyphList.java \
- sun/font/NativeFont.java \
- sun/font/StrikeCache.java \
- sun/font/NullFontScaler.java \
- sun/font/FreetypeFontScaler.java \
- sun/java2d/loops/DrawGlyphList.java \
- sun/java2d/loops/DrawGlyphListAA.java \
- sun/java2d/loops/DrawGlyphListLCD.java \
- sun/java2d/loops/GraphicsPrimitive.java
-
-ifeq ($(PLATFORM), windows)
-
- LDLIBS += user32.lib gdi32.lib $(OBJDIR)/../../../sun.awt/awt/$(OBJDIRNAME)/awt.lib
-
- OTHER_CFLAGS += -DCC_NOEX
- OTHER_CXXFLAGS += -DCC_NOEX
-
-else # PLATFORM unix
-
- FILES_export += \
- sun/font/NativeStrike.java \
- sun/font/NativeStrikeDisposer.java \
- sun/font/X11TextRenderer.java \
- sun/awt/X11GraphicsEnvironment.java
-
-endif # PLATFORM
-
-# Turn off aliasing with GCC for ExtensionSubtables.cpp
-ifeq ($(PLATFORM), linux)
- CXXFLAGS += $(CXXFLAGS_$(@F))
- CXXFLAGS_ExtensionSubtables.o = -fno-strict-aliasing
-endif
-
-#In the non-OpenJDK mode we need to build T2K
-ifndef OPENJDK
-t2k:
- $(ECHO) "lib=" $(ACTUAL_LIBRARY)
- $(MAKE) -C t2k
-
-all build: t2k
-t2k: library
-clean clobber::
- $(MAKE) -C t2k clean
-else
-
-FILES_m=mapfile-vers.openjdk
-
-#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).
-#
-# 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
-#
-#TODO: rework this to avoid hardcoding library name in the makefile
-#
-ifeq ($(PLATFORM), windows)
- FREETYPE_LIB = $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX)
- OTHER_LDLIBS += $(FREETYPE_LIB_PATH)/freetype.lib
-else
- ifeq ($(USING_SYSTEM_FT_LIB), false)
- FREETYPE_LIB = $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX).6
- endif
- OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -lfreetype
-endif
-
-library:: $(FREETYPE_LIB)
-
-$(FREETYPE_LIB):
- $(CP) $(FREETYPE_LIB_PATH)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX) $@
-endif
-
-#ifeq ($(PLATFORM), solaris)
-# FILES_reorder += reorder-$(ARCH)
-#endif
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-.PHONY: t2k build all clean clobber
-
-#
-# Add to the ambient vpath to pick up files in subdirectories
-#
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)
-vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)/layout
-vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
-
-#
-# Fontmanager is headless (independent of X/Motif)
-#
-CFLAGS += -DHEADLESS
-CXXFLAGS += -DHEADLESS
-
-ifndef OPENJDK
- CPPFLAGS += -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k
-else
- CPPFLAGS += -I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2
-endif
-
-ifeq ($(PLATFORM), windows)
-vpath %.cpp $(PLATFORM_SRC)/native/sun/windows
-else # PLATFORM
-
-#
-# Libraries to link, and other C flags.
-#
-
-ifeq ($(PLATFORM), macosx)
-OTHER_INCLUDES += -I$(X11_PATH)/include
-OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX)
- ifeq ($(OS_VENDOR),Apple)
- # XXXDARWIN Match BSD/Linux behavior -- the mawt.dylib symbols will
- # be available at runtime.
- OTHER_LDLIBS += -undefined dynamic_lookup
- endif
-else
-ifeq ($(PLATFORM), solaris)
- # Note that on Solaris, fontmanager is built against the headless library.
- LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/headless
- OTHER_LDLIBS += -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX)
-else # PLATFORM is linux
- OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX)
- ifeq ("$(CC_VER_MAJOR)", "3")
- OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
- endif
-endif
-endif
-
-endif # PLATFORM
-
-# set up compile flags..
-
-ifeq ($(PLATFORM), macosx)
-CPPFLAGS += -I$(CLASSHDRDIR)
-endif
-
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR) \
- -I$(SHARE_SRC)/native/$(PKGDIR)/layout \
- -I$(SHARE_SRC)/native/sun/awt/image/cvutils \
- -I$(PLATFORM_SRC)/native/sun/awt \
- -I$(SHARE_SRC)/native/sun/awt/debug \
- -I$(SHARE_SRC)/native/sun/java2d/loops \
- -I$(SHARE_SRC)/native/sun/java2d/pipe \
- -I$(PLATFORM_SRC)/native/sun/java2d \
- -I$(SHARE_SRC)/native/sun/java2d \
- -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders
-
-ifeq ($(PLATFORM), windows)
-CPPFLAGS += -I$(PLATFORM_SRC)/native/sun/windows
-endif
-
-# Make the Layout Engine build standalone
-CPPFLAGS += -DLE_STANDALONE
-
-
diff --git a/jdk/make/sun/font/mapfile-vers b/jdk/make/sun/font/mapfile-vers
deleted file mode 100644
index 60710b6..0000000
--- a/jdk/make/sun/font/mapfile-vers
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- getSunFontIDs;
- newLayoutTableCache;
- freeLayoutTableCache;
- isNullScalerContext;
- Java_sun_font_NullFontScaler_getNullScalerContext;
- Java_sun_font_NullFontScaler_getGlyphImage;
- Java_sun_font_SunFontManager_initIDs;
- Java_sun_font_StrikeCache_getGlyphCacheDescription;
- Java_sun_font_StrikeCache_freeIntPointer;
- Java_sun_font_StrikeCache_freeLongPointer;
- Java_sun_font_StrikeCache_freeIntMemory;
- Java_sun_font_StrikeCache_freeLongMemory;
- Java_sun_font_SunLayoutEngine_initGVIDs;
- Java_sun_font_SunLayoutEngine_nativeLayout;
- Java_sun_font_X11TextRenderer_doDrawGlyphList;
- Java_sun_java2d_loops_DrawGlyphListAA_DrawGlyphListAA;
- Java_sun_java2d_loops_DrawGlyphListLCD_DrawGlyphListLCD;
- Java_sun_java2d_loops_DrawGlyphList_DrawGlyphList;
- Java_sun_font_NativeStrikeDisposer_freeNativeScalerContext;
- Java_sun_font_NativeStrike_createNullScalerContext;
- Java_sun_font_NativeStrike_createScalerContext;
- Java_sun_font_NativeStrike_getMaxGlyph;
- Java_sun_font_NativeFont_fontExists;
- Java_sun_font_NativeFont_haveBitmapFonts;
- Java_sun_font_NativeFont_countGlyphs;
- Java_sun_font_NativeFont_getGlyphAdvance;
- Java_sun_font_NativeFont_getGlyphImage;
- Java_sun_font_NativeFont_getGlyphImageNoDefault;
- Java_sun_font_NativeFont_getFontMetrics;
- local:
- *;
-};
diff --git a/jdk/make/sun/font/mapfile-vers.openjdk b/jdk/make/sun/font/mapfile-vers.openjdk
deleted file mode 100644
index 0dd3ece..0000000
--- a/jdk/make/sun/font/mapfile-vers.openjdk
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-# In addition to regular symbols also include Freetype scaler
-
-SUNWprivate_1.1 {
- global:
- getSunFontIDs;
- newLayoutTableCache;
- freeLayoutTableCache;
- isNullScalerContext;
- Java_sun_font_NullFontScaler_getNullScalerContext;
- Java_sun_font_NullFontScaler_getGlyphImage;
- Java_sun_font_SunFontManager_initIDs;
- Java_sun_font_StrikeCache_getGlyphCacheDescription;
- Java_sun_font_StrikeCache_freeIntPointer;
- Java_sun_font_StrikeCache_freeLongPointer;
- Java_sun_font_StrikeCache_freeIntMemory;
- Java_sun_font_StrikeCache_freeLongMemory;
- Java_sun_font_SunLayoutEngine_initGVIDs;
- Java_sun_font_SunLayoutEngine_nativeLayout;
- Java_sun_font_X11TextRenderer_doDrawGlyphList;
- Java_sun_java2d_loops_DrawGlyphListAA_DrawGlyphListAA;
- Java_sun_java2d_loops_DrawGlyphListLCD_DrawGlyphListLCD;
- Java_sun_java2d_loops_DrawGlyphList_DrawGlyphList;
- Java_sun_font_NativeStrikeDisposer_freeNativeScalerContext;
- Java_sun_font_NativeStrike_createNullScalerContext;
- Java_sun_font_NativeStrike_createScalerContext;
- Java_sun_font_NativeStrike_getMaxGlyph;
- Java_sun_font_NativeFont_fontExists;
- Java_sun_font_NativeFont_haveBitmapFonts;
- Java_sun_font_NativeFont_countGlyphs;
- Java_sun_font_NativeFont_getGlyphAdvance;
- Java_sun_font_NativeFont_getGlyphImage;
- Java_sun_font_NativeFont_getGlyphImageNoDefault;
- Java_sun_font_NativeFont_getFontMetrics;
- Java_sun_font_FreetypeFontScaler_initIDs;
- Java_sun_font_FreetypeFontScaler_createScalerContextNative;
- Java_sun_font_FreetypeFontScaler_disposeNativeScaler;
- Java_sun_font_FreetypeFontScaler_getFontMetricsNative;
- Java_sun_font_FreetypeFontScaler_getGlyphAdvanceNative;
- Java_sun_font_FreetypeFontScaler_getGlyphCodeNative;
- Java_sun_font_FreetypeFontScaler_getGlyphImageNative;
- Java_sun_font_FreetypeFontScaler_getGlyphMetricsNative;
- Java_sun_font_FreetypeFontScaler_getGlyphOutlineBoundsNative;
- Java_sun_font_FreetypeFontScaler_getGlyphOutlineNative;
- Java_sun_font_FreetypeFontScaler_getGlyphVectorOutlineNative;
- Java_sun_font_FreetypeFontScaler_getLayoutTableCacheNative;
- Java_sun_font_FreetypeFontScaler_getMissingGlyphCodeNative;
- Java_sun_font_FreetypeFontScaler_getNumGlyphsNative;
- Java_sun_font_FreetypeFontScaler_getUnitsPerEMNative;
- Java_sun_font_FreetypeFontScaler_initNativeScaler;
- Java_sun_font_FreetypeFontScaler_getGlyphPointNative;
- local:
- *;
-};
diff --git a/jdk/make/sun/font/reorder-i586 b/jdk/make/sun/font/reorder-i586
deleted file mode 100644
index b634801..0000000
--- a/jdk/make/sun/font/reorder-i586
+++ /dev/null
@@ -1,481 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%_init;
-text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2kScalerContext.o;
-text: .text%__SLIP.INIT_A: t2kScalerContext.o;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__2t6Ml_v_;
-text: .text%JNI_OnLoad;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getType1FontVar;
-text: .text%Java_sun_awt_font_NativeFontWrapper_registerFonts;
-text: .text%__1cHJNIEnv_QCallObjectMethod6MpnI_jobject_pnK_jmethodID_E_2_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cSsfntFileFontObjectEInit6MpkHipkc4nLFontFormats_i_c_;
-text: .text%__1cOfileFontObjectJReadChunk6MLLpv_pkv_;
-text: .text%__1cSfontfilecachecheck6FpnKfontObject__v_;
-text: .text%__1cOfileFontObjectMReleaseChunk6Mpkv_v_;
-text: .text%__1cNReadNameTable6FpnSsfntFileFontObject__c_;
-text: .text%__1cKfontObjectJReadTable6MLpL_pkv_;
-text: .text%__1cSsfntFileFontObjectNFindTableSize6MLpL_L_;
-text: .text%__1cSVerifyTrueTypeFile6FpnSsfntFileFontObject__c_;
-text: .text%__1cOInitializeCMAP6FrnSsfntFileFontObject_rpC_v_;
-text: .text%__1cOfileFontObjectJreadBlock6MIIpc_v_;
-text: .text%__1cQaddToTheListTail6FipnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cMsetRealStyle6FpnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cSsfntFileFontObjectHGetName6MrH111pH_i_;
-text: .text%swapWord;
-text: .text%__1cMAssignStyles6FipH_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cOUnicodeToLower6FpHi_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cUstrDupASCIItoUNICODE6Fpkcrii_pH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cScopyAsciiToUnicode6FpkcpHi_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cVUnicodeStringContains6FpHh0h_c_;
-text: .text%__1cQMakeNativeMapper6Fpkc_v_;
-text: .text%__1cOhsDynamicArray4nKMapperPair__2t6Ml_v_;
-text: .text%__1cUX11CharToGlyphMapper2t6MpkchpcHH_v_;
-text: .text%__1cOhsDynamicArray4nKMapperPair__GAppend6Mrkn0A__l_;
-text: .text%__1cKMapperPair2t6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/R0xva37e7zem2Kv52VUt.o;
-text: .text%__1cNhsGFontScalerIRegister6FLp0_v_;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__2t6Ml_v_;
-text: .text%__1cIhsRefCntDRef6M_v_;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__GAppend6Mrkn0A__l_;
-text: .text%__1cOFontScalerPair2t6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/qE6SU8HOyoxWRjh8Gvd7.o;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__EFind6kMrkn0A__l_;
-text: .text%__1cTGetNativeFontObject6F_pnOfileFontObject__;
-text: .text%__1cOfileFontObjectEInit6MpkHipkc4nLFontFormats_i_c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cNX11FontObjectHGetName6MrH111pH_i_;
-text: .text%__1cNX11FontObjectMMakeFontName6M_i_;
-text: .text%__1cOfileFontObjectRGetFontNativeName6kM_pkc_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cOhsDynamicArray4nKMapperPair__EFind6kMrkn0A__l_;
-text: .text%__1cHJNIEnv_JNewObject6MpnH_jclass_pnK_jmethodID_E_pnI_jobject__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/FontWrapper.o;
-text: .text%__1cHJNIEnv_OCallVoidMethod6MpnI_jobject_pnK_jmethodID_E_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%__1cHJNIEnv_NCallIntMethod6MpnI_jobject_pnK_jmethodID_E_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cKMapperPair2T6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/R0xva37e7zem2Kv52VUt.o;
-text: .text%__1cOfileFontObjectJFileClose6M_v_;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getFullNameByFileName;
-text: .text%__1cNGetFontObject6FpkHi_pnKfontObject__;
-text: .text%__1cOfileFontObjectLGetFileName6kMri_pkH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%Java_sun_awt_font_NativeFontWrapper_registerCompositeFont;
-text: .text%__1cNCompositeFont2t6MpnHJNIEnv__pnI_jstring__v_;
-text: .text%__1cNCompositeFontJaddRanges6MpnHJNIEnv__pnK_jintArray__v_;
-text: .text%__1cNCompositeFontNaddMaxIndices6MpnHJNIEnv__pnK_jintArray__v_;
-text: .text%__1cNCompositeFontVregisterComponentName6MirnNJStringBuffer__v_;
-text: .text%__1cNCompositeFontHisValid6M_i_;
-text: .text%__1cMregisterFont6FnLFontFormats_pnKfontObject__v_;
-text: .text%__1cQaddToTheListHead6FipnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cNCompositeFontHGetName6MrH111pH_i_;
-text: .text%__1cKfontObjectLGetFileName6kMri_pkH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/CompositeFont.o;
-text: .text%__SLIP.FINAL__A: t2kScalerContext.o;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__2T6M_v_;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__FReset6M_v_;
-# Test LoadFrame
-text: .text%Java_sun_awt_font_NativeFontWrapper_initializeFont;
-text: .text%FindFontObject;
-text: .text%__1cVequalUnicodeToAsciiNC6FpkHipkci_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cGfindFO6FpkHii_pnKfontObject__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cNCompositeFontJMatchName6MipkHi_c_;
-text: .text%__1cKfontObjectMGetRealStyle6M_kH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/CompositeFont.o;
-text: .text%__1cKsetFontPtr6FpnHJNIEnv__pnI_jobject_pnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/FontWrapper.o;
-# Test LoadJFrame
-# Test JHello
-text: .text%Java_sun_awt_font_NativeFontWrapper_getFontMetrics;
-text: .text%__1cKgetFontPtr6FpnHJNIEnv__pnI_jobject__pnKfontObject__;
-text: .text%__1cKfontObjectJgetStrike6MrnNFontTransform_CC_rnGStrike__;
-text: .text%__1cKfontObjectLgetScalerID6MrnNFontTransform_CC_nLFontFormats__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/CompositeFont.o;
-text: .text%__1cGStrike2t6MrnKfontObject_rnNFontTransform_CC_v_;
-text: .text%__1cGStrikeNGetLineHeight6MrnNhsFixedPoint2_2222_v_;
-text: .text%__1cNCompositeFontKcountSlots6M_i_;
-text: .text%__1cGStrikeWcompositeStrikeForSlot6Mi_pnOhsGGlyphStrike__;
-text: .text%__1cGStrikePallocateStrikes6M_v_;
-text: .text%__1cGStrikeNallocateDescs6M_v_;
-text: .text%__1cNCompositeFontLgetSlotFont6Mi_pnKfontObject__;
-text: .text%__1cSsfntFileFontObjectJMatchName6MipkHi_c_;
-text: .text%__1cGStrikeQalgorithmicStyle6FrknNCompositeFont_rknKfontObject_i_i_;
-text: .text%__1cNCompositeFontLGetFontName6Mri_pkH_;
-text: .text%__1cSsfntFileFontObjectLgetScalerID6MrnNFontTransform_CC_nLFontFormats__;
-text: .text%__1cPuseNativeScaler6F_i_;
-text: .text%__1cUttContainsHintsTable6FpnSsfntFileFontObject__C_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cGStrike2t6MrnKfontObject_nLFontFormats_rnNFontTransform_CC_v_;
-text: .text%__1cQhsDescriptor_New6FLpkL_pnShsDescriptorHeader__;
-text: .text%__1cYhsDescriptor_ComputeSize6FLpkL_L_;
-text: .text%__1cQhsDescriptor_New6FL_pnShsDescriptorHeader__;
-text: .text%__1cIHSMemoryDNew6FL_pv_;
-text: .text%__1cShsDescriptor_Reset6FpnShsDescriptorHeader__v_;
-text: .text%__1cQhsDescriptor_Add6FpnShsDescriptorHeader_LL_pv_;
-text: .text%__1cKVALID_DESC6FpknShsDescriptorHeader__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/hsDescriptor.o;
-text: .text%__1cbBhsDescriptor_UpdateCheckSum6FpnShsDescriptorHeader__v_;
-text: .text%__1cOhsGGlyphStrikeJRefStrike6FpknShsDescriptorHeader__p0_;
-text: .text%__1cOhsDynamicArray4CpnOhsGGlyphStrike__2t6Ml_v_;
-text: .text%__1cIMemCache2t6MHHLc_v_;
-text: .text%__1cIMemEntry2t6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/MemCache.o;
-text: .text%__1cNhsGGlyphCacheKFindStrike6MpknShsDescriptorHeader__pnOhsGGlyphStrike__;
-text: .text%__1cOhsGGlyphStrike2t6MpknShsDescriptorHeader__v_;
-text: .text%__1cRhsDescriptor_Copy6FpknShsDescriptorHeader_p0_3_;
-text: .text%__1cThsDescriptor_Find326FpknShsDescriptorHeader_L_L_;
-text: .text%__1cRhsDescriptor_Find6FpknShsDescriptorHeader_LpLpv_pkv_;
-text: .text%__1cNhsGFontScalerEFind6FL_p0_;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__DGet6kMl_rkn0A__;
-text: .text%__1cMnrFontScalerNCreateContext6MpknShsDescriptorHeader__pnQhsGScalerContext__;
-text: .text%__1cSX11nrScalerContext2t6MpnKfontObject_pkfcci_v_;
-text: .text%__1cQt2kScalerContext2t6MpnKfontObject_pkfcci_v_;
-text: .text%__1cLhsGT2KCacheIRefEntry6FpnKfontObject_ll_pnIT2KEntry__;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__HForEach6MpFr1pv4_c44_p1_;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__GAppend6Mrk1_l_;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__2F6Ml_r1_;
-text: .text%__1cIT2KEntryGGetT2K6M_pnDT2K__;
-text: .text%tsi_NewMemhandler;
-text: .text%t2k_malloc;
-text: .text%__1cIHSMemoryHSoftNew6FL_pv_;
-text: .text%__1cJhsSoftNew4CL_6FrpTAI_1_;
-text: .text%FOGetDataLength;
-text: .text%__1cOfileFontObjectNGetDataLength6M_L_;
-text: .text%New_NonRamInputStream;
-text: .text%tsi_AllocMem;
-text: .text%New_sfntClassLogical;
-text: .text%SetStyling: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%CacheKeyTables_sfntClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_ttcfClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_sfnt_OffsetTable: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_headClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_hheaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_hmtxClass;
-text: .text%Delete_maxpClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_locaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_fpgmClass;
-text: .text%Delete_prepClass;
-text: .text%Delete_cvtClass;
-text: .text%Delete_blocClass;
-text: .text%Delete_ebscClass;
-text: .text%New_ttcfClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%ReadInt32;
-text: .text%ReadFileDataFunc: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2kScalerContext.o;
-text: .text%Rewind_InputStream;
-text: .text%New_sfnt_OffsetTable: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%ReadInt16;
-text: .text%New_sfnt_DirectoryEntry: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%GetTableDirEntry_sfntClass;
-text: .text%New_InputStream2;
-text: .text%PreLoadT2KInputStream;
-text: .text%New_headClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_InputStream;
-text: .text%tsi_DeAllocMem;
-text: .text%t2k_free;
-text: .text%__1cIHSMemoryGDelete6Fpv_v_;
-text: .text%New_hheaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%New_maxpClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%New_locaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%GetNumGlyphs_sfntClass;
-text: .text%New_hmtxClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%New_hmtxEmptyClass;
-text: .text%PrimeT2KInputStream;
-text: .text%New_cvtClass;
-text: .text%New_cvtEmptyClass;
-text: .text%Read_cvtClass;
-text: .text%New_fpgmClass;
-text: .text%New_fpgmEmptyClass;
-text: .text%Read_fpgmClass;
-text: .text%ReadSegment;
-text: .text%New_prepClass;
-text: .text%New_prepEmptyClass;
-text: .text%Read_prepClass;
-text: .text%NewT2K;
-text: .text%NewTTHintFontForT2K;
-text: .text%NewTTSHintcalerFont;
-text: .text%OnceOnlyTTFDefInit: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/TTHintFont.o;
-text: .text%fnt_DefaultJumpTable;
-text: .text%ComputeElementSizes;
-text: .text%LargestElementCounts: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/TTHintFont.o;
-text: .text%FixedMultiply;
-text: .text%util_FixMul;
-text: .text%TTScalerNewVariationDefault;
-text: .text%TTScalerNewVariation1Dot1;
-text: .text%InitTTHintTranForT2K;
-text: .text%TTHintTransformAllocation: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintTran.o;
-text: .text%InitTheKeyByVary;
-text: .text%InitTheKeyByFont;
-text: .text%InitTheKeyByScaler;
-text: .text%SetupDebugPointers: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/TTHintFont.o;
-text: .text%GetPerFontMemory;
-text: .text%GetPerFontMemoryAllocator;
-text: .text%TTScalerTTHintTranDefault;
-text: .text%SetupScalerDefaultTTD: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintTran.o;
-text: .text%TTScalerTTHintTranDeep: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintTran.o;
-text: .text%SetupScalerTransform: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintTran.o;
-text: .text%SetupGXMatrixFromT2K: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintTran.o;
-text: .text%ResetMapping;
-text: .text%TTScalerTTHintTran;
-text: .text%FillBytes;
-text: .text%Magnitude;
-text: .text%MultiplyDivide;
-text: .text%WideMul: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/FixMulDiv.o;
-text: .text%WideDiv: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/FixMulDiv.o;
-text: .text%MapMapping;
-text: .text%convertFixedMatrixToTGraf;
-text: .text%FixedToGCoordinate: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/PinkGlue.o;
-text: .text%FractToGCoordinate: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/PinkGlue.o;
-text: .text%concatTGrafMatrices;
-text: .text%convertTGrafMatrixToFixed;
-text: .text%GCoordinateToFixed: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/PinkGlue.o;
-text: .text%GCoordinateToFract: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/PinkGlue.o;
-text: .text%FixedDivide;
-text: .text%SetGlobalGSDefaults;
-text: .text%InitContourData;
-text: .text%NeededAllocationContourBytes: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/OrientDB.o;
-text: .text%NeededContourWords: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/OrientDB.o;
-text: .text%SetupAllocatedContourData: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/OrientDB.o;
-text: .text%uname: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/nrScalerContext.o;
-text: .text%__1cSX11nrScalerContextLCountGlyphs6M_L_;
-text: .text%__1cQt2kScalerContextLCountGlyphs6M_L_;
-text: .text%__1cOhsGGlyphStrikeLinitEntries6MpnThsGGlyphStrikeEntry_i_v_;
-text: .text%__1cSX11nrScalerContextNGetLineHeight6MpnNhsFixedPoint2_2222_v_;
-text: .text%__1cNhsGGlyphCacheJAddStrike6MpnOhsGGlyphStrike__v_;
-text: .text%__1cOhsDynamicArray4CpnOhsGGlyphStrike__GAppend6Mrk1_l_;
-text: .text%__1cThsDescriptor_Delete6FpnShsDescriptorHeader__v_;
-text: .text%__1cGStrikeMGetNumGlyphs6M_i_;
-text: .text%__1cKfontObjectJsetStrike6MpnGStrike_rnNFontTransform_CC_v_;
-text: .text%__1cShsDescriptor_Equal6FpknShsDescriptorHeader_2_c_;
-text: .text%__1cOhsGGlyphStrikeNGetLineHeight6MpnNhsFixedPoint2_2222_v_;
-text: .text%__1cGuseMin6FrnNhsFixedPoint2_1_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cGuseMax6FrnNhsFixedPoint2_1_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cNX11FontObjectJMatchName6MipkHi_c_;
-text: .text%__1cNX11FontObjectLgetScalerID6MrnNFontTransform_CC_nLFontFormats__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject_md.o;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getCharMetrics;
-text: .text%getMetrics;
-text: .text%__1cCTXGconcat6Mrk0_v_;
-text: .text%__1cGStrikeLCharToGlyph6ML_L_;
-text: .text%__1cGStrikeJgetMapper6kM_pnRCharToGlyphMapper__;
-text: .text%__1cUCompositeGlyphMapperNCharsToGlyphs6kMipkLpL_v_;
-text: .text%__1cUCompositeGlyphMapperTgetMissingGlyphCode6kM_i_;
-text: .text%__1cOhsGGlyphStrikeJgetMapper6M_pnRCharToGlyphMapper__;
-text: .text%__1cSX11nrScalerContextJgetMapper6M_pnRCharToGlyphMapper__;
-text: .text%__1cOhsDynamicArray4nKMapperPair__DGet6kMl_rkn0A__;
-text: .text%__1cQt2kScalerContextJgetMapper6M_pnRCharToGlyphMapper__;
-text: .text%__1cTnrCharToGlyphMapper2t6MpnUX11CharToGlyphMapper_pnRCharToGlyphMapper_ii_v_;
-text: .text%__1cRCharToGlyphMapperTgetMissingGlyphCode6kM_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2kScalerContext.o;
-text: .text%__1cUCompositeGlyphMapperSgetCachedGlyphCode6kMkL_L_;
-text: .text%__1cNCompositeFontOisExcludedChar6MiL_i_;
-text: .text%__1cTnrCharToGlyphMapperNCharsToGlyphs6kMipkLpL_v_;
-text: .text%__1cKCMAPMapperNCharsToGlyphs6kMipkLpL_v_;
-text: .text%__1cWConvertUnicodeToGlyphs6FrnSsfntFileFontObject_rpCipkLpL_v_;
-text: .text%__1cIgetGlyph6FpCL_H_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%__1cJgetGlyph46FpCL_H_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%__1cUX11CharToGlyphMapperNCharsToGlyphs6kMipkLpL_v_;
-text: .text%__1cUCompositeGlyphMapperSsetCachedGlyphCode6kMkL1ki_v_;
-text: .text%__1cGStrikeKgetMetrics6MirnIhsGGlyph_rnNhsFixedPoint2__c_;
-text: .text%__1cGStrikeXcompositeStrikeForGlyph6Mri_pnOhsGGlyphStrike__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cOhsGGlyphStrikeKGetMetrics6MHpnIhsGGlyph_pnNhsFixedPoint2__v_;
-text: .text%__1cOhsGGlyphStrikeIgetEntry6Mi_pnThsGGlyphStrikeEntry__;
-text: .text%__1cSX11nrScalerContextPGenerateMetrics6MHpnIhsGGlyph_pnNhsFixedPoint2__v_;
-text: .text%__1cTnrCharToGlyphMapperMgetXCharCode6Mi_i_;
-text: .text%Java_sun_awt_font_NativeFontWrapper_populateAndLayoutGlyphVector;
-text: .text%__1cLGlyphLayout2t6MpnHJNIEnv__pnL_jcharArray_iiipnN_jdoubleArray_6CCpnKfontObject__v_;
-text: .text%__1cJScriptRunEnext6M_c_;
-text: .text%__1cJScriptRunNgetScriptCode6FL_l_;
-text: .text%__1cJScriptRunKsameScript6Fll_c_;
-text: .text%__1cNgetScriptFont6FpnKfontObject_lrlpc_1_;
-text: .text%__1cNCompositeFontNgetScriptSlot6Mi_i_;
-text: .text%__1cKfontObjectJgetStrike6M_rnGStrike__;
-text: .text%__1cGStrikeTgetMissingGlyphCode6kM_i_;
-text: .text%__1cJScriptRunVgetScriptRangeOffsets6Fl_pkh_;
-text: .text%__1cTFontInstanceAdapter2t6MpnKfontObject_pnGStrike_pnNFontTransform_ll_v_;
-text: .text%__1cNCompositeFontNGetUnitsPerEM6M_kH_;
-text: .text%__1cTFontInstanceAdapterReuclidianDistance6Mff_f_;
-text: .text%__1cVCompositeLayoutEngine2t6MpknTFontInstanceAdapter_ll_v_;
-text: .text%__1cMLayoutEngine2t6MpknOLEFontInstance_ll_v_;
-text: .text%__1cVCompositeLayoutEngineLlayoutChars6MpkHlllcffrnLLEErrorCode__l_;
-text: .text%__1cVCompositeLayoutEngineNcomputeGlyphs6MpkHlllcrpLrplrnLLEErrorCode__l_;
-text: .text%__1cVCompositeLayoutEngineQmapCharsToGlyphs6MpkHllccrpLrplrnLLEErrorCode__v_;
-text: .text%__1cTFontInstanceAdapterUmapCharsToWideGlyphs6kMpkHllcpknMLECharMapper_pL_v_;
-text: .text%__1cTFontInstanceAdapterSmapCharToWideGlyph6kMLpknMLECharMapper__L_;
-text: .text%__1cRDefaultCharMapperHmapChar6kML_L_;
-text: .text%__1cROpenTypeUtilitiesGsearch6FLpkLl_l_;
-text: .text%__1cROpenTypeUtilitiesHhighBit6Fl_W_;
-text: .text%__1cVCompositeLayoutEngineOpositionGlyphs6MpkLlffrpfrnLLEErrorCode__v_;
-text: .text%__1cTFontInstanceAdapterTgetWideGlyphAdvance6kMLrnHLEPoint__v_;
-text: .text%__1cLGlyphLayoutRupdateGlyphVector6MpnHJNIEnv__pnI_jobject_i_v_;
-text: .text%__1cJinitGVIDs6FpnHJNIEnv__pnI_jobject__c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/GlyphLayout.o;
-text: .text%__1cVCompositeLayoutEngineJgetGlyphs6kMpLLrnLLEErrorCode__v_;
-text: .text%__1cMLayoutEngineOgetCharIndices6kMpllrnLLEErrorCode__v_;
-text: .text%__1cLGlyphLayout2T6M_v_;
-text: .text%__SLIP.DELETER__A: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/PDhWU_tMnE1cNFw5jkN-.o;
-text: .text%__1cVCompositeLayoutEngine2T6M_v_;
-text: .text%__1cVCompositeLayoutEngineFreset6M_v_;
-text: .text%__1cMLayoutEngineFreset6M_v_;
-text: .text%__1cMLayoutEngine2T5B6M_v_;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getGlyphVectorOutline;
-text: .text%__1cLGlyphVector2t6MpnHJNIEnv__pnN_jdoubleArray_4CCpnKfontObject__v_;
-text: .text%__1cLGlyphVectorOgetGlyphVector6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorNgetGlyphCodes6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorNsetGlyphCodes6MpnK_jintArray__v_;
-text: .text%__1cLGlyphVectorOallocateGlyphs6Mi_v_;
-text: .text%__1cLGlyphVectorMsetNumGlyphs6Mi_v_;
-text: .text%__1cLGlyphVectorMgetPositions6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorMsetPositions6MpnM_jfloatArray__v_;
-text: .text%__1cLGlyphVectorRallocatePositions6M_v_;
-text: .text%__1cLGlyphVectorNgetTransforms6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorNsetTransforms6MpnN_jdoubleArray_pnK_jintArray__v_;
-text: .text%__1cLGlyphVectorKgetOutline6Mff_pnI_jobject__;
-text: .text%__1cLGlyphVectorQgetGlyphsOutline6Miiff_pnI_jobject__;
-text: .text%__1cLStrikeTable2t6MrknLGlyphVector_pnCTX__v_;
-text: .text%__1cLGlyphVectorOgetGlyphStrike6kMpnCTX__rnGStrike__;
-text: .text%__1cLGeneralPath2t6Mi_v_;
-text: .text%__1cLGlyphVectorJscanGlyph6FrnLGeneralPath_rnGStrike_rnMhsPathSpline_rnLCurveWalker_ffi_v_;
-text: .text%__1cGStrikePGetGlyphOutline6MirnMhsPathSpline__v_;
-text: .text%__1cOhsGGlyphStrikeHGetPath6MHpnMhsPathSpline_pnNhsFixedPoint2__v_;
-text: .text%__1cSX11nrScalerContextMGeneratePath6MHpnMhsPathSpline_pnNhsFixedPoint2__v_;
-text: .text%__1cQt2kScalerContextMGeneratePath6MHpnMhsPathSpline_pnNhsFixedPoint2__v_;
-text: .text%__1cQt2kScalerContextKSetupTrans6M_pnDT2K__;
-text: .text%T2K_NewTransformation;
-text: .text%GetUPEM;
-text: .text%util_EuclidianDistance;
-text: .text%util_FixDiv;
-text: .text%NewTTHintTranForT2K;
-text: .text%ExtractUnitVectors;
-text: .text%SetOneUnitAxis: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%T2K_NewTransformationInternal: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%T2KDoGriddingSetUp: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%GetMaxPoints;
-text: .text%ag_HintInit;
-text: .text%GetStreamForTable;
-text: .text%ComputeGlobalHints;
-text: .text%MedianHeight: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/ghints.o;
-text: .text%GetGlyphByCharCode;
-text: .text%LoadCMAP: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%New_cmapClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%SizeInStream;
-text: .text%Compute_cmapClass_GlyphIndex: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Compute_cmapClass_Index0: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%GetGlyphByIndex;
-text: .text%New_GlyphClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%GetYMax: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/ghints.o;
-text: .text%Delete_GlyphClass;
-text: .text%util_SortShortArray;
-text: .text%GetYMin: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/ghints.o;
-text: .text%ag_AutoFindStems;
-text: .text%ag_IsHinthandle: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_ProcessOutline: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_AnalyzeChar: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_ComputeTangents: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_DoubleNorm: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_MarkPoints: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_FindXandYExtrema: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_PrevDifferentXValue: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_PrevDifferentYValue: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_YDist: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_XDist: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_FindInflections: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_FDist: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_FindPointPairs: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_BlackAndParallell: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_Height;
-text: .text%ag_FindLinks: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_GetStems: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%Purge_cmapMemory;
-text: .text%Delete_cmapClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%ag_SetHintInfo;
-text: .text%ag_SetScale;
-text: .text%ag_SetUpCvt: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%GetFontWideOutlineMetrics;
-text: .text%T2K_TransformYFunits;
-text: .text%T2K_TransformXFunits;
-text: .text%T2K_RenderGlyph;
-text: .text%T2K_RenderGlyphInternal: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%T2K_PurgeMemoryInternal: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%IsFigure;
-text: .text%IsFigure_cmapClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%AccumulateGlyphContours;
-text: .text%ApplyPostStyle;
-text: .text%__1cSConvertGlyphToPath6FpknKGlyphClass_pnMhsPathSpline__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2kScalerContext.o;
-text: .text%__1cIHSMemoryFClear6FpvL_v_;
-text: .text%T2K_PurgeMemory;
-text: .text%__1cGStrikeLGetPathType6Mi_nMhsPathSplineEType__;
-text: .text%__1cOhsGGlyphStrikeLGetPathType6kM_nMhsPathSplineEType__;
-text: .text%__1cLCurveWalkerEInit6MpknNhsPathContour_c_v_;
-text: .text%__1cLCurveWalkerINextQdDuad6M_c_;
-text: .text%__1cLGeneralPathIneedRoom6Mii_C_;
-text: .text%__1cMhsPathSplineGDelete6Fp0_v_;
-text: .text%__1cLGeneralPathIgetShape6MpnHJNIEnv___pnI_jobject__;
-text: .text%__1cLGeneralPath2T6M_v_;
-text: .text%__1cLStrikeTable2T6M_v_;
-text: .text%__1cLGlyphVector2T6M_v_;
-# SwingSet
-text: .text%__1cGStrikeVneedsAlgorithmicStyle6FrknNCompositeFont_ipc_v_;
-text: .text%__1cSsfntFileFontObjectLGetFontName6Mri_pkH_;
-text: .text%__1cSsfntFileFontObjectJReadNames6M_v_;
-text: .text%__1cJmakeNameU6FpCih_pH_;
-text: .text%__1cTEqualUnicodeStrings6FpkHip0i_c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cNX11FontObjectLGetFontName6Mri_pkH_;
-text: .text%__1cUstrDupASCIItoUNICODE6Fpkcrii_pH_;
-text: .text%__1cQCompAsciiUnicode6FpkcpkHi_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cTtype1FileFontObjectLGetFontInfo6M_pnKt1FontInfo__;
-text: .text%__1cOfileFontObjectYGetFontLocalPlatformName6kM_pkc_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cTtype1FileFontObjectIOpenFont6MpkcpnLsDataRecord__i_;
-text: .text%__1cTtype1FileFontObjectINextChar6MpnLsDataRecord__i_;
-text: .text%__1cTtype1FileFontObjectJNextToken6MpnLsDataRecord_pci_i_;
-text: .text%__1cTtype1FileFontObjectKSkipSpaces6MpnLsDataRecord__i_;
-text: .text%__1cTtype1FileFontObjectJCloseFont6MpnLsDataRecord__v_;
-text: .text%__1cTtype1FileFontObjectODeleteFontInfo6MpnKt1FontInfo__v_;
-text: .text%__1cTtype1FileFontObjectHGetName6MrH111pH_i_;
-text: .text%__1cJustr_copy6FpH0_i_;
-text: .text%GetConverter: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%makeNativeToUnicodeArray;
-text: .text%__1cKCreateCMAP6FpCpH_0_;
-text: .text%__1cJgetGlyph26FpCL_H_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%__1cUX11CharToGlyphMapperNAddAsciiChars6M_v_;
-text: .text%__1cMj_strcasestr6Fpkc1_pc_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%__1cJupcasestr6Fpc_0_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%__1cQCreateSymbolCMAP6FpCpH_0_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getNumFonts;
-text: .text%CountFontObjects;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getFamilyNameByIndex;
-text: .text%__1cNGetFontObject6FI_pnKfontObject__;
-text: .text%__1cPgetNodeByNumber6Fi_pnMfontListNode__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cKfindByFont6FrpnIT2KEntry_pv3_c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2kScalerContext.o;
-text: .text%__1cGStrike2T6M_v_;
-text: .text%__SLIP.DELETER__B: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/ArabicLayoutEngine.o;
-text: .text%__1cUCompositeGlyphMapper2T6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cIhsRefCntFUnRef6M_v_;
-text: .text%__1cNt2kFontScalerNCreateContext6MpknShsDescriptorHeader__pnQhsGScalerContext__;
-text: .text%__1cQt2kScalerContextNGetLineHeight6MpnNhsFixedPoint2_2222_v_;
-text: .text%__1cLhsMagnitude6Fll_l_;
-text: .text%__1cGhsWideDMul6Mll_p0_;
-text: .text%__1cGhsWideESqrt6kM_l_;
-text: .text%__1cJhsFracDiv6Fll_l_;
-text: .text%__1cGhsWideDDiv6Ml_p0_;
-text: .text%__1cGhsWideGAsLong6kM_l_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/hsFixMath.o;
-text: .text%__1cRProjectUnitVector6FllllllpnNhsFixedPoint2__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2kScalerContext.o;
-text: .text%__1cJhsFracMul6Fll_l_;
-text: .text%__1cLgetGlyph1046FpCL_H_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%Java_sun_awt_font_GlyphList_initIDs;
-text: .text%Java_sun_awt_font_GlyphList_setupCharData;
-text: .text%__1cLGlyphVectorHsetText6MpnL_jcharArray_ii_v_;
-text: .text%__1cLGlyphVectorKinitGlyphs6MpkHi_v_;
-text: .text%__1cLGlyphVectorNcharsToGlyphs6FrnGStrike_pkHpLi_C_;
-text: .text%__1cLGlyphVectorUpositionAndGetImages6Mff_v_;
-text: .text%__1cLGlyphVectorRallocateImageRefs6M_v_;
-text: .text%__1cGStrikeMprepareCache6Mipc_v_;
-text: .text%__1cOhsGGlyphStrikeMPrepareCache6MLpc_v_;
-text: .text%__1cNGlyphMemCacheNreserveGlyphs6MHLpc_v_;
-text: .text%__1cIMemCacheMreserveSpace6MHLpc_v_;
-text: .text%__1cGStrikeTgetMetricsWithImage6MirnIhsGGlyph_rnNhsFixedPoint2_pc_c_;
-text: .text%__1cOhsGGlyphStrikeTGetMetricsWithImage6MHpnIhsGGlyph_pnNhsFixedPoint2_pc_v_;
-text: .text%__1cOhsGGlyphStrikeNgetEntryImage6MpnThsGGlyphStrikeEntry_Hpc_v_;
-text: .text%__1cNGlyphMemCacheNgetGlyphImage6MLrHpc_pkv_;
-text: .text%__1cIMemCacheJgetMemory6MLrHpc_pkv_;
-text: .text%__1cSX11nrScalerContextYGenerateMetricsWithImage6MHpnIhsGGlyph_pnNhsFixedPoint2__v_;
-text: .text%__1cSX11nrScalerContextNGenerateImage6MHpknIhsGGlyph_pv_v_;
-text: .text%__1cOhsGGlyphStrikeQassignEntryImage6MpnThsGGlyphStrikeEntry_Hpc_v_;
-text: .text%__1cNGlyphMemCacheQassignGlyphImage6MLrnIhsGGlyph_pc_H_;
-text: .text%__1cIMemCacheMassignMemory6MLLpvpc_H_;
-text: .text%__1cIMemCacheIsetEntry6MrnIMemEntry_LpvLpc_v_;
-text: .text%__1cIMemCacheMreleaseEntry6MrnIMemEntry_pc_v_;
-text: .text%Java_sun_java2d_loops_DrawGlyphList_DrawGlyphList;
-text: .text%drawGlyphList: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/DrawGlyphList.o;
-text: .text%Java_sun_awt_font_GlyphList_discardData;
-text: .text%Java_sun_awt_font_GlyphList_setupStringData;
-text: .text%__1cLGlyphVectorJsetString6MpnI_jstring__v_;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getFamilyName;
-text: .text%lookupName: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/FontWrapper.o;
diff --git a/jdk/make/sun/font/reorder-sparc b/jdk/make/sun/font/reorder-sparc
deleted file mode 100644
index 80ff5c7..0000000
--- a/jdk/make/sun/font/reorder-sparc
+++ /dev/null
@@ -1,601 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2kScalerContext.o;
-text: .text%__SLIP.INIT_A: t2kScalerContext.o;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__2t6Ml_v_;
-text: .text%JNI_OnLoad;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getType1FontVar;
-text: .text%Java_sun_awt_font_NativeFontWrapper_registerFonts;
-text: .text%__1cNhsGFontScalerIRegister6FLp0_v_;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__2t6Ml_v_;
-text: .text%__1cIhsRefCntDRef6M_v_;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__GAppend6Mrkn0A__l_;
-text: .text%__1cOFontScalerPair2t6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/eZruSM_9Z810_tvrzJEE.o;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__EFind6kMrkn0A__l_;
-text: .text%__1cHJNIEnv_QCallObjectMethod6MpnI_jobject_pnK_jmethodID_E_2_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cSsfntFileFontObjectEInit6MpkHipkc4nLFontFormats_i_c_;
-text: .text%__1cOfileFontObjectJReadChunk6MLLpv_pkv_;
-text: .text%__1cSfontfilecachecheck6FpnOfileFontObject__v_;
-text: .text%__1cOfileFontObjectMReleaseChunk6Mpkv_v_;
-text: .text%__1cNReadNameTable6FpnSsfntFileFontObject__c_;
-text: .text%__1cKfontObjectJReadTable6MLpL_pkv_;
-text: .text%__1cSsfntFileFontObjectNFindTableSize6MLpL_L_;
-text: .text%__1cSVerifyTrueTypeFile6FpnSsfntFileFontObject__c_;
-text: .text%__1cOInitializeCMAP6FrnSsfntFileFontObject_rpC_v_;
-text: .text%__1cOfileFontObjectJreadBlock6MIIpc_v_;
-text: .text%__1cQaddToTheListTail6FipnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cMsetRealStyle6FpnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cSsfntFileFontObjectHGetName6MrH111pH_i_;
-text: .text%__1cMAssignStyles6FipH_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cOUnicodeToLower6FpHi_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cUstrDupASCIItoUNICODE6Fpkcrii_pH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cScopyAsciiToUnicode6FpkcpHi_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cVUnicodeStringContains6FpHh0h_c_;
-text: .text%__1cHJNIEnv_NCallIntMethod6MpnI_jobject_pnK_jmethodID_E_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cOfileFontObjectJFileClose6M_v_;
-text: .text%__1cOfileFontObjectNAddNativeName6Mpkc_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cOfileFontObjectEInit6MpkHipkc4nLFontFormats_i_c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cTtype1FileFontObjectLGetFontInfo6M_pnKt1FontInfo__;
-text: .text%__1cOfileFontObjectYGetFontLocalPlatformName6kM_pkc_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cTtype1FileFontObjectIOpenFont6MpkcpnLsDataRecord__i_;
-text: .text%__1cTtype1FileFontObjectINextChar6MpnLsDataRecord__i_;
-text: .text%__1cTtype1FileFontObjectJNextToken6MpnLsDataRecord_pci_i_;
-text: .text%__1cTtype1FileFontObjectKSkipSpaces6MpnLsDataRecord__i_;
-text: .text%__1cTtype1FileFontObjectJCloseFont6MpnLsDataRecord__v_;
-text: .text%__1cTtype1FileFontObjectODeleteFontInfo6MpnKt1FontInfo__v_;
-text: .text%__1cTtype1FileFontObjectHGetName6MrH111pH_i_;
-text: .text%__1cJustr_copy6FpH0_i_;
-text: .text%__1cMj_strcasestr6Fpkc1_pc_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%__1cJupcasestr6Fpc_0_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%__1cQCreateSymbolCMAP6FpCpH_0_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%__1cIgetGlyph6FpCL_H_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%__1cJgetGlyph46FpCL_H_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/cmaps.o;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getFullNameByFileName;
-text: .text%__1cNGetFontObject6FpkHi_pnKfontObject__;
-text: .text%__1cOfileFontObjectLGetFileName6kMri_pkH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%Java_sun_awt_font_NativeFontWrapper_registerCompositeFont;
-text: .text%__1cNCompositeFont2t6MpnHJNIEnv__pnI_jstring__v_;
-text: .text%__1cNCompositeFontJaddRanges6MpnHJNIEnv__pnK_jintArray__v_;
-text: .text%__1cNCompositeFontNaddMaxIndices6MpnHJNIEnv__pnK_jintArray__v_;
-text: .text%__1cNCompositeFontVregisterComponentName6MirnNJStringBuffer__v_;
-text: .text%__1cNCompositeFontHisValid6M_i_;
-text: .text%__1cMregisterFont6FnLFontFormats_pnKfontObject__v_;
-text: .text%__1cQaddToTheListHead6FipnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cNCompositeFontHGetName6MrH111pH_i_;
-text: .text%__1cKfontObjectLGetFileName6kMri_pkH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/CompositeFont.o;
-text: .text%__SLIP.FINAL__A: t2kScalerContext.o;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__2T6M_v_;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__FReset6M_v_;
-# Test LoadFrame
-text: .text%Java_sun_awt_font_NativeFontWrapper_initializeFont;
-text: .text%FindFontObject;
-text: .text%__1cVequalUnicodeToAsciiNC6FpkHipkci_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cGfindFO6FpkHii_pnKfontObject__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cNCompositeFontJMatchName6MipkHi_c_;
-text: .text%__1cKfontObjectMGetRealStyle6M_kH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/CompositeFont.o;
-text: .text%__1cKsetFontPtr6FpnHJNIEnv__pnI_jobject_pnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/FontWrapper.o;
-# Test LoadJFrame
-# Test JHello
-text: .text%Java_sun_awt_font_NativeFontWrapper_getFontMetrics;
-text: .text%__1cKgetFontPtr6FpnHJNIEnv__pnI_jobject__pnKfontObject__;
-text: .text%__1cKfontObjectJgetStrike6MrnNFontTransform_CC_rnGStrike__;
-text: .text%__1cKfontObjectLgetScalerID6MrnNFontTransform_CC_nLFontFormats__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/CompositeFont.o;
-text: .text%__1cGStrike2t6MrnKfontObject_rnNFontTransform_CC_v_;
-text: .text%__1cGStrikeNGetLineHeight6MrnNhsFixedPoint2_2222_v_;
-text: .text%__1cNCompositeFontKcountSlots6M_i_;
-text: .text%__1cGStrikeWcompositeStrikeForSlot6Mi_pnOhsGGlyphStrike__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cGStrikeZcompositeStrikeForSlotInt6Miri_pnOhsGGlyphStrike__;
-text: .text%__1cGStrikePallocateStrikes6M_v_;
-text: .text%__1cGStrikeNallocateDescs6M_v_;
-text: .text%__1cNCompositeFontLgetSlotFont6Mi_pnKfontObject__;
-text: .text%__1cSsfntFileFontObjectJMatchName6MipkHi_c_;
-text: .text%__1cGStrikeQalgorithmicStyle6FrknNCompositeFont_rknKfontObject_i_i_;
-text: .text%__1cNCompositeFontLGetFontName6Mri_pkH_;
-text: .text%__1cOisUniformScale6FrnNFontTransform__i_;
-text: .text%__1cPuseNativeScaler6F_i_;
-text: .text%__1cOfileFontObjectWGetNumberOfNativeNames6kM_ki_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cHCStrike2t6MrnKfontObject_rnNFontTransform_CC_v_;
-text: .text%__1cQhsDescriptor_New6FLpkL_pnShsDescriptorHeader__;
-text: .text%__1cYhsDescriptor_ComputeSize6FLpkL_L_;
-text: .text%__1cQhsDescriptor_New6FL_pnShsDescriptorHeader__;
-text: .text%__1cIHSMemoryDNew6FL_pv_;
-text: .text%__1cShsDescriptor_Reset6FpnShsDescriptorHeader__v_;
-text: .text%__1cQhsDescriptor_Add6FpnShsDescriptorHeader_LL_pv_;
-text: .text%__1cKVALID_DESC6FpknShsDescriptorHeader__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/hsDescriptor.o;
-text: .text%__1cbBhsDescriptor_UpdateCheckSum6FpnShsDescriptorHeader__v_;
-text: .text%__1cOhsGGlyphStrikeJRefStrike6FpknShsDescriptorHeader__p0_;
-text: .text%__1cOhsDynamicArray4CpnOhsGGlyphStrike__2t6Ml_v_;
-text: .text%__1cIMemCache2t6MHHLc_v_;
-text: .text%__1cIMemEntry2t6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/MemCache.o;
-text: .text%__1cNhsGGlyphCacheKFindStrike6MpknShsDescriptorHeader__pnOhsGGlyphStrike__;
-text: .text%__1cOhsGGlyphStrike2t6MpknShsDescriptorHeader__v_;
-text: .text%__1cRhsDescriptor_Copy6FpknShsDescriptorHeader_p0_3_;
-text: .text%__1cThsDescriptor_Find326FpknShsDescriptorHeader_L_L_;
-text: .text%__1cRhsDescriptor_Find6FpknShsDescriptorHeader_LpLpv_pkv_;
-text: .text%__1cNhsGFontScalerEFind6FL_p0_;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__DGet6kMl_rkn0A__;
-text: .text%__1cNt2kFontScalerNCreateContext6MpknShsDescriptorHeader__pnQhsGScalerContext__;
-text: .text%__1cQt2kScalerContext2t6MpnKfontObject_pkfcci_v_;
-text: .text%__1cLhsGT2KCacheIRefEntry6FpnKfontObject_ll_pnIT2KEntry__;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__HForEach6MpFr1pv4_c44_p1_;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__GAppend6Mrk1_l_;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__2F6Ml_r1_;
-text: .text%__1cIT2KEntryGGetT2K6M_pnDT2K__;
-text: .text%tsi_NewMemhandler;
-text: .text%t2k_malloc;
-text: .text%__1cIHSMemoryHSoftNew6FL_pv_;
-text: .text%__1cJhsSoftNew4CL_6FrpTAI_1_;
-text: .text%FOGetDataLength;
-text: .text%__1cOfileFontObjectNGetDataLength6M_L_;
-text: .text%New_NonRamInputStream;
-text: .text%tsi_AllocMem;
-text: .text%New_sfntClassLogical;
-text: .text%SetStyling: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%CacheKeyTables_sfntClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_ttcfClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_sfnt_OffsetTable: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_headClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_hheaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_hmtxClass;
-text: .text%Delete_maxpClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_locaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_fpgmClass;
-text: .text%Delete_prepClass;
-text: .text%Delete_cvtClass;
-text: .text%Delete_blocClass;
-text: .text%Delete_ebscClass;
-text: .text%New_ttcfClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%ReadInt32;
-text: .text%ReadFileDataFunc: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2kScalerContext.o;
-text: .text%Rewind_InputStream;
-text: .text%New_sfnt_OffsetTable: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%ReadInt16;
-text: .text%New_sfnt_DirectoryEntry: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%GetTableDirEntry_sfntClass;
-text: .text%New_InputStream2;
-text: .text%PreLoadT2KInputStream;
-text: .text%New_headClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Delete_InputStream;
-text: .text%tsi_DeAllocMem;
-text: .text%t2k_free;
-text: .text%__1cIHSMemoryGDelete6Fpv_v_;
-text: .text%New_hheaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%New_maxpClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%New_locaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%PrimeT2KInputStream;
-text: .text%GetNumGlyphs_sfntClass;
-text: .text%New_hmtxClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%New_hmtxEmptyClass;
-text: .text%New_cvtClass;
-text: .text%New_cvtEmptyClass;
-text: .text%Read_cvtClass;
-text: .text%New_fpgmClass;
-text: .text%New_fpgmEmptyClass;
-text: .text%Read_fpgmClass;
-text: .text%ReadSegment;
-text: .text%New_prepClass;
-text: .text%New_prepEmptyClass;
-text: .text%Read_prepClass;
-text: .text%Seek_InputStream;
-text: .text%New_blocClass;
-text: .text%Tell_InputStream;
-text: .text%New_bitmapSizeTable: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2ksbit.o;
-text: .text%NewT2K;
-text: .text%NewTTHintFontForT2K;
-text: .text%NewTTSHintcalerFont;
-text: .text%OnceOnlyTTFDefInit: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/TTHintFont.o;
-text: .text%fnt_DefaultJumpTable;
-text: .text%ComputeElementSizes;
-text: .text%LargestElementCounts: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/TTHintFont.o;
-text: .text%FixedMultiply;
-text: .text%util_FixMul;
-text: .text%TTScalerNewVariationDefault;
-text: .text%TTScalerNewVariation1Dot1;
-text: .text%InitTTHintTranForT2K;
-text: .text%TTHintTransformAllocation: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintTran.o;
-text: .text%InitTheKeyByVary;
-text: .text%InitTheKeyByFont;
-text: .text%InitTheKeyByScaler;
-text: .text%SetupDebugPointers: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/TTHintFont.o;
-text: .text%GetPerFontMemory;
-text: .text%GetPerFontMemoryAllocator;
-text: .text%TTScalerTTHintTranDefault;
-text: .text%SetupScalerDefaultTTD: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintTran.o;
-text: .text%TTScalerTTHintTranDeep: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintTran.o;
-text: .text%SetupScalerTransform: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintTran.o;
-text: .text%SetupGXMatrixFromT2K: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintTran.o;
-text: .text%ResetMapping;
-text: .text%TTScalerTTHintTran;
-text: .text%FillBytes;
-text: .text%Magnitude;
-text: .text%MultiplyDivide;
-text: .text%WideMul: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/FixMulDiv.o;
-text: .text%WideDiv: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/FixMulDiv.o;
-text: .text%MapMapping;
-text: .text%convertFixedMatrixToTGraf;
-text: .text%FixedToGCoordinate: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/PinkGlue.o;
-text: .text%FractToGCoordinate: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/PinkGlue.o;
-text: .text%concatTGrafMatrices;
-text: .text%convertTGrafMatrixToFixed;
-text: .text%GCoordinateToFixed: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/PinkGlue.o;
-text: .text%GCoordinateToFract: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/PinkGlue.o;
-text: .text%FixedDivide;
-text: .text%SetGlobalGSDefaults;
-text: .text%InitContourData;
-text: .text%NeededAllocationContourBytes: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/OrientDB.o;
-text: .text%NeededContourWords: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/OrientDB.o;
-text: .text%SetupAllocatedContourData: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/OrientDB.o;
-text: .text%__1cQt2kScalerContextLCountGlyphs6M_L_;
-text: .text%__1cOhsGGlyphStrikeLinitEntries6MpnThsGGlyphStrikeEntry_i_v_;
-text: .text%__1cQt2kScalerContextNGetLineHeight6MpnNhsFixedPoint2_2222_v_;
-text: .text%__1cQt2kScalerContextKSetupTrans6M_pnDT2K__;
-text: .text%T2K_NewTransformation;
-text: .text%GetUPEM;
-text: .text%util_EuclidianDistance;
-text: .text%util_FixDiv;
-text: .text%NewTTHintTranForT2K;
-text: .text%ExtractUnitVectors;
-text: .text%SetOneUnitAxis: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%T2K_NewTransformationInternal: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%T2KDoGriddingSetUp: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%GetMaxPoints;
-text: .text%ag_HintInit;
-text: .text%GetStreamForTable;
-text: .text%ComputeGlobalHints;
-text: .text%MedianHeight: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/ghints.o;
-text: .text%GetGlyphByCharCode;
-text: .text%LoadCMAP: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%New_cmapClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%SizeInStream;
-text: .text%Compute_cmapClass_GlyphIndex: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%Compute_cmapClass_Index0: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%GetGlyphByIndex;
-text: .text%New_GlyphClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%GetYMax: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/ghints.o;
-text: .text%Delete_GlyphClass;
-text: .text%util_SortShortArray;
-text: .text%GetYMin: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/ghints.o;
-text: .text%ag_AutoFindStems;
-text: .text%ag_IsHinthandle: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_ProcessOutline: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_AnalyzeChar: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_ComputeTangents: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_DoubleNorm: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_MarkPoints: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_FindXandYExtrema: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_PrevDifferentXValue: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_PrevDifferentYValue: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_YDist: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_XDist: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_FindInflections: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_FDist: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_FindPointPairs: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_BlackAndParallell: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_Height;
-text: .text%ag_FindLinks: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%ag_GetStems: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%Purge_cmapMemory;
-text: .text%Delete_cmapClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%ag_SetHintInfo;
-text: .text%ag_SetScale;
-text: .text%ag_SetUpCvt: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/autogrid.o;
-text: .text%GetFontWideOutlineMetrics;
-text: .text%T2K_TransformYFunits;
-text: .text%T2K_TransformXFunits;
-text: .text%__1cLhsMagnitude6Fll_l_;
-text: .text%__1cGhsWideDMul6Mll_p0_;
-text: .text%__1cGhsWideESqrt6kM_l_;
-text: .text%__1cJhsFracDiv6Fll_l_;
-text: .text%__1cGhsWideDDiv6Ml_p0_;
-text: .text%__1cRProjectUnitVector6FllllllpnNhsFixedPoint2__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2kScalerContext.o;
-text: .text%__1cJhsFracMul6Fll_l_;
-text: .text%__1cNhsGGlyphCacheJAddStrike6MpnOhsGGlyphStrike__v_;
-text: .text%__1cOhsDynamicArray4CpnOhsGGlyphStrike__GAppend6Mrk1_l_;
-text: .text%__1cThsDescriptor_Delete6FpnShsDescriptorHeader__v_;
-text: .text%__1cOhsGGlyphStrikeNGetLineHeight6MpnNhsFixedPoint2_2222_v_;
-text: .text%__1cGuseMin6FrnNhsFixedPoint2_1_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cGuseMax6FrnNhsFixedPoint2_1_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%DefaultFontObject;
-text: .text%__1cJdefaultFO6F_pnKfontObject__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cNCompositeFontJReadChunk6MLLpv_pkv_;
-text: .text%__1cTtype1FileFontObjectJMatchName6MipkHi_c_;
-text: .text%__1cKu_strncmpi6FpkHp0i_i_;
-text: .text%__1cSsfntFileFontObjectLgetScalerID6MrnNFontTransform_CC_nLFontFormats__;
-text: .text%__1cShsDescriptor_Equal6FpknShsDescriptorHeader_2_c_;
-text: .text%__1cKfindByFont6FrpnIT2KEntry_pv3_c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2kScalerContext.o;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getCharMetrics;
-text: .text%getMetrics;
-text: .text%__1cCTXGconcat6Mrk0_v_;
-text: .text%__1cRDefaultCharMapperHmapChar6kML_L_;
-text: .text%__1cGStrikeLCharToGlyph6ML_L_;
-text: .text%__1cGStrikeJgetMapper6kM_pnRCharToGlyphMapper__;
-text: .text%__1cUCompositeGlyphMapperNCharsToGlyphs6kMipkLpL_v_;
-text: .text%__1cUCompositeGlyphMapperTgetMissingGlyphCode6kM_i_;
-text: .text%__1cOhsGGlyphStrikeJgetMapper6M_pnRCharToGlyphMapper__;
-text: .text%__1cQt2kScalerContextJgetMapper6M_pnRCharToGlyphMapper__;
-text: .text%__1cRCharToGlyphMapperTgetMissingGlyphCode6kM_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cUCompositeGlyphMapperSgetCachedGlyphCode6kMkL_L_;
-text: .text%__1cNCompositeFontOisExcludedChar6MiL_i_;
-text: .text%__1cKCMAPMapperNCharsToGlyphs6kMipkLpL_v_;
-text: .text%__1cWConvertUnicodeToGlyphs6FrnSsfntFileFontObject_rpCipkLpL_v_;
-text: .text%__1cUCompositeGlyphMapperSsetCachedGlyphCode6kMkL1ki_v_;
-text: .text%__1cGStrikeKgetMetrics6MirnIhsGGlyph_rnNhsFixedPoint2__c_;
-text: .text%__1cGStrikebCcompositeStrikeForGlyphImage6Mri_pnOhsGGlyphStrike__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cHCStrikeRgetStrikeForGlyph6Mri_pnOhsGGlyphStrike__;
-text: .text%__1cGStrike2t6MrnKfontObject_nLFontFormats_rnNFontTransform_CCi_v_;
-text: .text%__1cMnrFontScalerNCreateContext6MpknShsDescriptorHeader__pnQhsGScalerContext__;
-text: .text%__1cSX11nrScalerContext2t6MpnKfontObject_pkfccii_v_;
-text: .text%__1cSX11nrScalerContextLCountGlyphs6M_L_;
-text: .text%__1cOfileFontObjectRGetFontNativeName6kMi_pkc_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cSX11nrScalerContextNGetLineHeight6MpnNhsFixedPoint2_2222_v_;
-text: .text%__1cGStrikeMGetNumGlyphs6M_i_;
-text: .text%__1cSX11nrScalerContextJgetMapper6M_pnRCharToGlyphMapper__;
-text: .text%__1cOhsDynamicArray4nKMapperPair__2t6Ml_v_;
-text: .text%__1cQMakeNativeMapper6Fpkc_v_;
-text: .text%__1cOhsDynamicArray4nKMapperPair__EFind6kMrkn0A__l_;
-text: .text%__1cUX11CharToGlyphMapper2t6MpkchpcHH_v_;
-text: .text%__1cOhsDynamicArray4nKMapperPair__GAppend6Mrkn0A__l_;
-text: .text%__1cKMapperPair2t6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/s8_6EXsXdaPU71oqAxuU.o;
-text: .text%__1cOhsDynamicArray4nKMapperPair__DGet6kMl_rkn0A__;
-text: .text%__1cTnrCharToGlyphMapper2t6MpnUX11CharToGlyphMapper_pnRCharToGlyphMapper_ii_v_;
-text: .text%__1cTnrCharToGlyphMapperNCharsToGlyphs6kMipkLpL_v_;
-text: .text%__1cUX11CharToGlyphMapperNCharsToGlyphs6kMipkLpL_v_;
-text: .text%__1cGStrikeTgetMissingGlyphCode6kM_i_;
-text: .text%__1cOhsGGlyphStrikeKGetMetrics6MHpnIhsGGlyph_pnNhsFixedPoint2__v_;
-text: .text%__1cOhsGGlyphStrikeIgetEntry6Mi_pnThsGGlyphStrikeEntry__;
-text: .text%__1cSX11nrScalerContextPGenerateMetrics6MHpnIhsGGlyph_pnNhsFixedPoint2__v_;
-text: .text%__1cTnrCharToGlyphMapperMgetXCharCode6Mi_i_;
-text: .text%Java_sun_awt_font_NativeFontWrapper_populateAndLayoutGlyphVector;
-text: .text%__1cLGlyphLayout2t6MpnHJNIEnv__pnL_jcharArray_iiipnN_jdoubleArray_6CCpnKfontObject__v_;
-text: .text%__1cNcharsToGlyphs6FpkHlpnGStrike_pL_v_;
-text: .text%__1cJScriptRunEnext6M_c_;
-text: .text%__1cJScriptRunNgetScriptCode6FL_l_;
-text: .text%__1cJScriptRunKsameScript6Fll_c_;
-text: .text%__1cNgetScriptFont6FpnKfontObject_l_1_;
-text: .text%__1cKfontObjectJsetStrike6MpnGStrike_rnNFontTransform_CC_v_;
-text: .text%__1cTFontInstanceAdapter2t6MpnKfontObject_pnGStrike_pnNFontTransform_ll_v_;
-text: .text%__1cOfileFontObjectNGetUnitsPerEM6M_kH_;
-text: .text%__1cTFontInstanceAdapterReuclidianDistance6Mff_f_;
-text: .text%__1cMLayoutEngineTlayoutEngineFactory6FpknOLEFontInstance_llrnLLEErrorCode__p0_;
-text: .text%__1cTFontInstanceAdapterMgetFontTable6kML_pkv_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/FontInstanceAdapter.o;
-text: .text%__1cSsfntFileFontObjectIGetTable6ML_pkv_;
-text: .text%__1cMLayoutEngine2t6MpknOLEFontInstance_ll_v_;
-text: .text%__1cMLayoutEngineLlayoutChars6MpkHlllcffrnLLEErrorCode__l_;
-text: .text%__1cMLayoutEngineNcomputeGlyphs6MpkHlllcrpHrplrnLLEErrorCode__l_;
-text: .text%__1cMLayoutEngineQmapCharsToGlyphs6MpkHllccrpHrplrnLLEErrorCode__v_;
-text: .text%__1cTFontInstanceAdapterQmapCharsToGlyphs6kMpkHllcpknMLECharMapper_pH_v_;
-text: .text%__1cTFontInstanceAdapterOmapCharToGlyph6kMLpknMLECharMapper__H_;
-text: .text%__1cROpenTypeUtilitiesGsearch6FLpkLl_l_;
-text: .text%__1cROpenTypeUtilitiesHhighBit6Fl_W_;
-text: .text%__1cMLayoutEngineOpositionGlyphs6MpkHlffrpfrnLLEErrorCode__v_;
-text: .text%__1cTFontInstanceAdapterPgetGlyphAdvance6kMHrnHLEPoint__v_;
-text: .text%__1cQt2kScalerContextPGenerateMetrics6MHpnIhsGGlyph_pnNhsFixedPoint2__v_;
-text: .text%T2K_RenderGlyph;
-text: .text%T2K_GetSbits: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%FindGlyph_blocClass;
-text: .text%FindBitmapSizeTable: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2ksbit.o;
-text: .text%T2K_RenderGlyphInternal: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%T2K_PurgeMemoryInternal: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%IsFigure;
-text: .text%IsFigure_cmapClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/truetype.o;
-text: .text%AccumulateGlyphContours;
-text: .text%MatrixTimesVector: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2k.o;
-text: .text%TTScalerHintGlyph;
-text: .text%InitTheKeyByTrans;
-text: .text%SetElementPointers;
-text: .text%CopyBytes;
-text: .text%AdjustPhantoms: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintGlyph.o;
-text: .text%AdjustPhantomAxis: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintGlyph.o;
-text: .text%OffsetAxis: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintGlyph.o;
-text: .text%CreateGlyphElement: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/HintGlyph.o;
-text: .text%RunFontProgram;
-text: .text%SetUpProgramPtrs: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/InterpreterGlue.o;
-text: .text%SetGlobalGSStackData: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/InterpreterGlue.o;
-text: .text%fnt_Execute;
-text: .text%fnt_InnerExecute;
-text: .text%fnt_NPUSHB;
-text: .text%fnt_PushSomeBytes: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Fnt.o;
-text: .text%fnt_FDEF;
-text: .text%fnt_SkipPushCrap;
-text: .text%PrepareTheCVT;
-text: .text%ScaleCVT: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/InterpreterGlue.o;
-text: .text%FixedMultiplyRound;
-text: .text%util_FixMulRoundPositive: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/PinkGlue.o;
-text: .text%RunPreProgram;
-text: .text%SetGlobalGSMapping;
-text: .text%fnt_NPUSHW;
-text: .text%fnt_PushSomeWords: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Fnt.o;
-text: .text%fnt_PUSHB;
-text: .text%fnt_PUSHW0;
-text: .text%fnt_PUSHW;
-text: .text%fnt_PUSHB0;
-text: .text%fnt_SPVTCA;
-text: .text%fnt_Check_PF_Proj;
-text: .text%fnt_MPPEM;
-text: .text%fnt_ProjectIntegerPPEM: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Fnt.o;
-text: .text%GrowStackForPush;
-text: .text%fnt_BinaryOperand;
-text: .text%fnt_WS;
-text: .text%fnt_SVTCA_1;
-text: .text%Mul26Dot6;
-text: .text%fnt_SVTCA_0;
-text: .text%Div26Dot6;
-text: .text%fnt_DUP;
-text: .text%fnt_SWAP;
-text: .text%fnt_SetRoundState;
-text: .text%fnt_CALL;
-text: .text%fnt_RS;
-text: .text%fnt_IF;
-text: .text%fnt_ELSE;
-text: .text%fnt_GETINFO;
-text: .text%fnt_SCANCTRL;
-text: .text%fnt_SCANTYPE;
-text: .text%fnt_EIF;
-text: .text%fnt_SetElementPtr;
-text: .text%fnt_SROUND;
-text: .text%fnt_SetRoundValues: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/FntRare.o;
-text: .text%fnt_MIAP;
-text: .text%fnt_GetCVTEntryFast;
-text: .text%ShortFracMul;
-text: .text%fnt_YProject;
-text: .text%fnt_SuperRound;
-text: .text%fnt_YMovePoint;
-text: .text%fnt_RoundToGrid;
-text: .text%fnt_SRP2;
-text: .text%fnt_SRP1;
-text: .text%fnt_IP;
-text: .text%fnt_GC;
-text: .text%fnt_WCVTP;
-text: .text%fnt_RCVT;
-text: .text%fnt_ROUND;
-text: .text%fnt_ROLL;
-text: .text%fnt_POP;
-text: .text%fnt_SCVTCI;
-text: .text%fnt_UnaryOperand;
-text: .text%fnt_CINDEX;
-text: .text%fnt_MINDEX;
-text: .text%fnt_SRP0;
-text: .text%fnt_WCVTF;
-text: .text%fnt_XProject;
-text: .text%fnt_XMovePoint;
-text: .text%fnt_DELTAC1;
-text: .text%fnt_DeltaEngine: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Fnt.o;
-text: .text%fnt_DELTAC2;
-text: .text%fnt_SDB;
-text: .text%fnt_DELTAC3;
-text: .text%RunGlyphProgram;
-text: .text%fnt_JROF;
-text: .text%fnt_MIRP;
-text: .text%fnt_DELTAP1;
-text: .text%fnt_DELTAP2;
-text: .text%fnt_ALIGNRP;
-text: .text%fnt_MDAP;
-text: .text%fnt_RoundToDoubleGrid;
-text: .text%fnt_MDRP;
-text: .text%fnt_IUP;
-text: .text%CorrectUnscaledOutline;
-text: .text%fs_CalculateBounds;
-text: .text%fs_FindBitMapSize4;
-text: .text%fs_dropOutVal;
-text: .text%sc_FindExtrema4;
-text: .text%ReleasePerFontMemory;
-text: .text%fs_ContourScan3;
-text: .text%sc_ScanChar2;
-text: .text%sc_lineInit: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/sc.o;
-text: .text%sc_DrawParabola: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/sc.o;
-text: .text%sc_lineGenRows: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/sc.o;
-text: .text%sc_markRows: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/sc.o;
-text: .text%sortRows: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/sc.o;
-text: .text%sc_wnNrowFill: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/sc.o;
-text: .text%tsi_DeleteScanConv;
-text: .text%T2K_PurgeMemory;
-text: .text%fnt_FLIPOFF;
-text: .text%fnt_FLIPON;
-text: .text%fnt_JMPR;
-text: .text%fnt_GPV;
-text: .text%fnt_SPVFS;
-text: .text%fnt_ComputeAndCheck_PF_Proj;
-text: .text%ShortFracDot;
-text: .text%fnt_Project;
-text: .text%fnt_MovePoint;
-text: .text%__1cMLayoutEngineUadjustGlyphPositions6MpkHllcpHlpfrnLLEErrorCode__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/LayoutEngine.o;
-text: .text%__1cLGlyphLayoutRupdateGlyphVector6MpnHJNIEnv__pnI_jobject_i_v_;
-text: .text%__1cJinitGVIDs6FpnHJNIEnv__pnI_jobject__c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/GlyphLayout.o;
-text: .text%__1cMLayoutEngineJgetGlyphs6kMpLLrnLLEErrorCode__v_;
-text: .text%__1cMLayoutEngineOgetCharIndices6kMpllrnLLEErrorCode__v_;
-text: .text%__1cLGlyphLayout2T6M_v_;
-text: .text%__SLIP.DELETER__A: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/BOyhlP1XkHISKWzbx4EZ.o;
-text: .text%__1cMLayoutEngine2T6M_v_;
-text: .text%__1cMLayoutEngineFreset6M_v_;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getGlyphVectorOutline;
-text: .text%__1cLGlyphVector2t6MpnHJNIEnv__pnN_jdoubleArray_4CCpnKfontObject__v_;
-text: .text%__1cLGlyphVectorOgetGlyphVector6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorNgetGlyphCodes6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorNsetGlyphCodes6MpnK_jintArray__v_;
-text: .text%__1cLGlyphVectorOallocateGlyphs6Mi_v_;
-text: .text%__1cLGlyphVectorMsetNumGlyphs6Mi_v_;
-text: .text%__1cLGlyphVectorMgetPositions6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorMsetPositions6MpnM_jfloatArray__v_;
-text: .text%__1cLGlyphVectorRallocatePositions6M_v_;
-text: .text%__1cLGlyphVectorNgetTransforms6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorNsetTransforms6MpnN_jdoubleArray_pnK_jintArray__v_;
-text: .text%__1cLGlyphVectorKgetOutline6Mff_pnI_jobject__;
-text: .text%__1cLGlyphVectorQgetGlyphsOutline6Miiff_pnI_jobject__;
-text: .text%__1cLStrikeTable2t6MrknLGlyphVector_pnCTX__v_;
-text: .text%__1cLGlyphVectorOgetGlyphStrike6kMpnCTX__rnGStrike__;
-text: .text%__1cLGeneralPath2t6Mi_v_;
-text: .text%__1cLGlyphVectorJscanGlyph6FrnLGeneralPath_rnGStrike_rnMhsPathSpline_rnLCurveWalker_ffi_v_;
-text: .text%__1cGStrikePGetGlyphOutline6MirnMhsPathSpline__v_;
-text: .text%__1cGStrikeXcompositeStrikeForGlyph6Mri_pnOhsGGlyphStrike__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cOhsGGlyphStrikeHGetPath6MHpnMhsPathSpline_pnNhsFixedPoint2__v_;
-text: .text%__1cQt2kScalerContextMGeneratePath6MHpnMhsPathSpline_pnNhsFixedPoint2__v_;
-text: .text%ApplyPostStyle;
-text: .text%__1cSConvertGlyphToPath6FpknKGlyphClass_pnMhsPathSpline__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/t2kScalerContext.o;
-text: .text%__1cIHSMemoryFClear6FpvL_v_;
-text: .text%__1cGStrikeLGetPathType6Mi_nMhsPathSplineEType__;
-text: .text%__1cOhsGGlyphStrikeLGetPathType6kM_nMhsPathSplineEType__;
-text: .text%__1cLCurveWalkerEInit6MpknNhsPathContour_c_v_;
-text: .text%__1cLCurveWalkerINextQdDuad6M_c_;
-text: .text%__1cLGeneralPathIneedRoom6Mii_C_;
-text: .text%__1cMhsPathSplineGDelete6Fp0_v_;
-text: .text%__1cLGeneralPathIgetShape6MpnHJNIEnv___pnI_jobject__;
-text: .text%__1cHJNIEnv_JNewObject6MpnH_jclass_pnK_jmethodID_E_pnI_jobject__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/FontWrapper.o;
-text: .text%__1cLGeneralPath2T6M_v_;
-text: .text%__1cLStrikeTable2T6M_v_;
-text: .text%__1cLGlyphVector2T6M_v_;
-# SwingSet
-text: .text%Java_sun_awt_font_NativeFontWrapper_getNumFonts;
-text: .text%CountFontObjects;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getFamilyNameByIndex;
-text: .text%__1cNGetFontObject6FI_pnKfontObject__;
-text: .text%__1cPgetNodeByNumber6Fi_pnMfontListNode__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/fontObject.o;
-text: .text%__1cGStrikeVneedsAlgorithmicStyle6FrknNCompositeFont_ipc_v_;
-text: .text%__1cSsfntFileFontObjectLGetFontName6Mri_pkH_;
-text: .text%__1cSsfntFileFontObjectJReadNames6M_v_;
-text: .text%__1cJmakeNameU6FpCih_pH_;
-text: .text%__1cTEqualUnicodeStrings6FpkHip0i_c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cQCompAsciiUnicode6FpkcpkHi_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%tsi_SHAPET_BOLD_METRICS;
-text: .text%GetDoubleDeltaMetric: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/shapet.o;
-text: .text%ApplyDeltaToHMTX: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/shapet.o;
-text: .text%__1cGStrike2T6M_v_;
-text: .text%__SLIP.DELETER__C: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__1cUCompositeGlyphMapper2T6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/Strike.o;
-text: .text%__SLIP.DELETER__B: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/ArabicShaping.o;
-text: .text%__1cHCStrike2T6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj/CStrike.o;
-text: .text%__1cIhsRefCntFUnRef6M_v_;
-text: .text%__1cGStrike2T5B6M_v_;
-text: .text%Java_sun_awt_font_GlyphList_initIDs;
-text: .text%Java_sun_awt_font_GlyphList_setupCharData;
-text: .text%__1cLGlyphVectorHsetText6MpnL_jcharArray_ii_v_;
-text: .text%__1cLGlyphVectorKinitGlyphs6MpkHi_v_;
-text: .text%__1cLGlyphVectorNcharsToGlyphs6FrnGStrike_pkHpLi_C_;
-text: .text%__1cLGlyphVectorUpositionAndGetImages6Mff_v_;
-text: .text%__1cLGlyphVectorRallocateImageRefs6M_v_;
-text: .text%__1cGStrikeMprepareCache6Mipc_v_;
-text: .text%__1cOhsGGlyphStrikeMPrepareCache6MLpc_v_;
-text: .text%__1cNGlyphMemCacheNreserveGlyphs6MHLpc_v_;
-text: .text%__1cIMemCacheMreserveSpace6MHLpc_v_;
-text: .text%__1cGStrikeTgetMetricsWithImage6MirnIhsGGlyph_rnNhsFixedPoint2_pc_c_;
-text: .text%__1cOhsGGlyphStrikeTGetMetricsWithImage6MHpnIhsGGlyph_pnNhsFixedPoint2_pc_v_;
-text: .text%__1cOhsGGlyphStrikeNgetEntryImage6MpnThsGGlyphStrikeEntry_Hpc_v_;
-text: .text%__1cNGlyphMemCacheNgetGlyphImage6MLrHpc_pkv_;
-text: .text%__1cIMemCacheJgetMemory6MLrHpc_pkv_;
-text: .text%__1cSX11nrScalerContextYGenerateMetricsWithImage6MHpnIhsGGlyph_pnNhsFixedPoint2__v_;
-text: .text%__1cSX11nrScalerContextNGenerateImage6MHpknIhsGGlyph_pv_v_;
-text: .text%__1cOhsGGlyphStrikeQassignEntryImage6MpnThsGGlyphStrikeEntry_Hpc_v_;
-text: .text%__1cNGlyphMemCacheQassignGlyphImage6MLrnIhsGGlyph_pc_H_;
-text: .text%__1cIMemCacheMassignMemory6MLLpvpc_H_;
-text: .text%__1cIMemCacheIsetEntry6MrnIMemEntry_LpvLpc_v_;
-text: .text%__1cIMemCacheMreleaseEntry6MrnIMemEntry_pc_v_;
-text: .text%Java_sun_awt_font_X11TextRenderer_doDrawGlyphList;
-text: .text%RefineBounds;
-text: .text%Java_sun_awt_font_GlyphList_discardData;
-text: .text%Java_sun_awt_font_GlyphList_setupStringData;
-text: .text%__1cLGlyphVectorJsetString6MpnI_jstring__v_;
diff --git a/jdk/make/sun/font/reorder-sparcv9 b/jdk/make/sun/font/reorder-sparcv9
deleted file mode 100644
index 0786bdb..0000000
--- a/jdk/make/sun/font/reorder-sparcv9
+++ /dev/null
@@ -1,478 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-text: .text%__1cU__STATIC_CONSTRUCTOR6F_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/t2kScalerContext.o;
-text: .text%__SLIP.INIT_A: t2kScalerContext.o;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__2t6Mi_v_;
-text: .text%JNI_OnLoad;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getType1FontVar;
-text: .text%Java_sun_awt_font_NativeFontWrapper_registerFonts;
-text: .text%__1cHJNIEnv_QCallObjectMethod6MpnI_jobject_pnK_jmethodID_E_2_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cSsfntFileFontObjectEInit6MpkHipkc4nLFontFormats_i_c_;
-text: .text%__1cOfileFontObjectJReadChunk6MIIpv_pkv_;
-text: .text%__1cSfontfilecachecheck6FpnKfontObject__v_;
-text: .text%__1cOfileFontObjectMReleaseChunk6Mpkv_v_;
-text: .text%__1cNReadNameTable6FpnSsfntFileFontObject__c_;
-text: .text%__1cKfontObjectJReadTable6MIpI_pkv_;
-text: .text%__1cSsfntFileFontObjectNFindTableSize6MIpI_I_;
-text: .text%__1cSVerifyTrueTypeFile6FpnSsfntFileFontObject__c_;
-text: .text%__1cOInitializeCMAP6FrnSsfntFileFontObject_rpC_v_;
-text: .text%__1cOfileFontObjectJreadBlock6MLLpc_v_;
-text: .text%__1cQaddToTheListTail6FipnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cMsetRealStyle6FpnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cSsfntFileFontObjectHGetName6MrH111pH_i_;
-text: .text%__1cMAssignStyles6FipH_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cOUnicodeToLower6FpHi_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cUstrDupASCIItoUNICODE6Fpkcrii_pH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cScopyAsciiToUnicode6FpkcpHi_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cVUnicodeStringContains6FpHh0h_c_;
-text: .text%__1cQMakeNativeMapper6Fpkc_v_;
-text: .text%__1cOhsDynamicArray4nKMapperPair__2t6Mi_v_;
-text: .text%__1cUX11CharToGlyphMapper2t6MpkchpcHH_v_;
-text: .text%__1cOhsDynamicArray4nKMapperPair__GAppend6Mrkn0A__i_;
-text: .text%__1cKMapperPair2t6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/oBLL8MjgwxxRvfmec0-h.o;
-text: .text%__1cNhsGFontScalerIRegister6FIp0_v_;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__2t6Mi_v_;
-text: .text%__1cIhsRefCntDRef6M_v_;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__GAppend6Mrkn0A__i_;
-text: .text%__1cOFontScalerPair2t6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/JSaw_24qJCs_1iN_isFx.o;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__EFind6kMrkn0A__i_;
-text: .text%__1cTGetNativeFontObject6F_pnOfileFontObject__;
-text: .text%__1cOfileFontObjectEInit6MpkHipkc4nLFontFormats_i_c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cNX11FontObjectHGetName6MrH111pH_i_;
-text: .text%__1cNX11FontObjectMMakeFontName6M_i_;
-text: .text%__1cOfileFontObjectRGetFontNativeName6kM_pkc_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cOhsDynamicArray4nKMapperPair__EFind6kMrkn0A__i_;
-text: .text%__1cHJNIEnv_JNewObject6MpnH_jclass_pnK_jmethodID_E_pnI_jobject__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/FontWrapper.o;
-text: .text%__1cHJNIEnv_OCallVoidMethod6MpnI_jobject_pnK_jmethodID_E_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/cmaps.o;
-text: .text%__1cHJNIEnv_NCallIntMethod6MpnI_jobject_pnK_jmethodID_E_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cKMapperPair2T6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/oBLL8MjgwxxRvfmec0-h.o;
-text: .text%__1cOfileFontObjectJFileClose6M_v_;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getFullNameByFileName;
-text: .text%__1cNGetFontObject6FpkHi_pnKfontObject__;
-text: .text%__1cOfileFontObjectLGetFileName6kMri_pkH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%Java_sun_awt_font_NativeFontWrapper_registerCompositeFont;
-text: .text%__1cNCompositeFont2t6MpnHJNIEnv__pnI_jstring__v_;
-text: .text%__1cNCompositeFontJaddRanges6MpnHJNIEnv__pnK_jintArray__v_;
-text: .text%__1cNCompositeFontNaddMaxIndices6MpnHJNIEnv__pnK_jintArray__v_;
-text: .text%__1cNCompositeFontVregisterComponentName6MirnNJStringBuffer__v_;
-text: .text%__1cNCompositeFontHisValid6M_i_;
-text: .text%__1cMregisterFont6FnLFontFormats_pnKfontObject__v_;
-text: .text%__1cQaddToTheListHead6FipnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cNCompositeFontHGetName6MrH111pH_i_;
-text: .text%__1cKfontObjectLGetFileName6kMri_pkH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/CompositeFont.o;
-text: .text%__SLIP.FINAL__A: t2kScalerContext.o;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__2T6M_v_;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__FReset6M_v_;
-# Test LoadFrame
-text: .text%Java_sun_awt_font_NativeFontWrapper_initializeFont;
-text: .text%FindFontObject;
-text: .text%__1cVequalUnicodeToAsciiNC6FpkHipkci_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cGfindFO6FpkHii_pnKfontObject__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cNCompositeFontJMatchName6MipkHi_c_;
-text: .text%__1cKfontObjectMGetRealStyle6M_kH_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/CompositeFont.o;
-text: .text%__1cKsetFontPtr6FpnHJNIEnv__pnI_jobject_pnKfontObject__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/FontWrapper.o;
-# Test LoadJFrame
-# Test JHello
-text: .text%Java_sun_awt_font_NativeFontWrapper_getFontMetrics;
-text: .text%__1cKgetFontPtr6FpnHJNIEnv__pnI_jobject__pnKfontObject__;
-text: .text%__1cKfontObjectJgetStrike6MrnNFontTransform_CC_rnGStrike__;
-text: .text%__1cKfontObjectLgetScalerID6MrnNFontTransform_CC_nLFontFormats__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/CompositeFont.o;
-text: .text%__1cGStrike2t6MrnKfontObject_rnNFontTransform_CC_v_;
-text: .text%__1cGStrikeNGetLineHeight6MrnNhsFixedPoint2_2222_v_;
-text: .text%__1cNCompositeFontKcountSlots6M_i_;
-text: .text%__1cGStrikeWcompositeStrikeForSlot6Mi_pnOhsGGlyphStrike__;
-text: .text%__1cGStrikePallocateStrikes6M_v_;
-text: .text%__1cGStrikeNallocateDescs6M_v_;
-text: .text%__1cNCompositeFontLgetSlotFont6Mi_pnKfontObject__;
-text: .text%__1cSsfntFileFontObjectJMatchName6MipkHi_c_;
-text: .text%__1cGStrikeQalgorithmicStyle6FrknNCompositeFont_rknKfontObject_i_i_;
-text: .text%__1cNCompositeFontLGetFontName6Mri_pkH_;
-text: .text%__1cSsfntFileFontObjectLgetScalerID6MrnNFontTransform_CC_nLFontFormats__;
-text: .text%__1cPuseNativeScaler6F_i_;
-text: .text%__1cUttContainsHintsTable6FpnSsfntFileFontObject__C_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cGStrike2t6MrnKfontObject_nLFontFormats_rnNFontTransform_CC_v_;
-text: .text%__1cQhsDescriptor_New6FIpkI_pnShsDescriptorHeader__;
-text: .text%__1cYhsDescriptor_ComputeSize6FIpkI_I_;
-text: .text%__1cQhsDescriptor_New6FI_pnShsDescriptorHeader__;
-text: .text%__1cIHSMemoryDNew6FI_pv_;
-text: .text%__1cShsDescriptor_Reset6FpnShsDescriptorHeader__v_;
-text: .text%__1cQhsDescriptor_Add6FpnShsDescriptorHeader_II_pv_;
-text: .text%__1cKVALID_DESC6FpknShsDescriptorHeader__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/hsDescriptor.o;
-text: .text%__1cbBhsDescriptor_UpdateCheckSum6FpnShsDescriptorHeader__v_;
-text: .text%__1cOhsGGlyphStrikeJRefStrike6FpknShsDescriptorHeader__p0_;
-text: .text%__1cOhsDynamicArray4CpnOhsGGlyphStrike__2t6Mi_v_;
-text: .text%__1cIMemCache2t6MHHIc_v_;
-text: .text%__1cIMemEntry2t6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/MemCache.o;
-text: .text%__1cNhsGGlyphCacheKFindStrike6MpknShsDescriptorHeader__pnOhsGGlyphStrike__;
-text: .text%__1cOhsGGlyphStrike2t6MpknShsDescriptorHeader__v_;
-text: .text%__1cRhsDescriptor_Copy6FpknShsDescriptorHeader_p0_3_;
-text: .text%__1cThsDescriptor_Find326FpknShsDescriptorHeader_I_I_;
-text: .text%__1cRhsDescriptor_Find6FpknShsDescriptorHeader_IpIpv_pkv_;
-text: .text%__1cNhsGFontScalerEFind6FI_p0_;
-text: .text%__1cOhsDynamicArray4nOFontScalerPair__DGet6kMi_rkn0A__;
-text: .text%__1cMnrFontScalerNCreateContext6MpknShsDescriptorHeader__pnQhsGScalerContext__;
-text: .text%__1cSX11nrScalerContext2t6MpnKfontObject_pkfcci_v_;
-text: .text%__1cQt2kScalerContext2t6MpnKfontObject_pkfcci_v_;
-text: .text%__1cLhsGT2KCacheIRefEntry6FpnKfontObject_ii_pnIT2KEntry__;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__HForEach6MpFr1pv4_c44_p1_;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__GAppend6Mrk1_i_;
-text: .text%__1cOhsDynamicArray4CpnIT2KEntry__2F6Mi_r1_;
-text: .text%__1cIT2KEntryGGetT2K6M_pnDT2K__;
-text: .text%tsi_NewMemhandler;
-text: .text%t2k_malloc;
-text: .text%__1cIHSMemoryHSoftNew6FI_pv_;
-text: .text%__1cJhsSoftNew4CI_6FrpTAI_1_;
-text: .text%FOGetDataLength;
-text: .text%__1cOfileFontObjectNGetDataLength6M_I_;
-text: .text%New_NonRamInputStream;
-text: .text%tsi_AllocMem;
-text: .text%New_sfntClassLogical;
-text: .text%SetStyling: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%CacheKeyTables_sfntClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%Delete_ttcfClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%Delete_sfnt_OffsetTable: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%Delete_headClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%Delete_hheaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%Delete_hmtxClass;
-text: .text%Delete_maxpClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%Delete_locaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%Delete_fpgmClass;
-text: .text%Delete_prepClass;
-text: .text%Delete_cvtClass;
-text: .text%Delete_blocClass;
-text: .text%Delete_ebscClass;
-text: .text%New_ttcfClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%ReadInt32;
-text: .text%ReadFileDataFunc: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/t2kScalerContext.o;
-text: .text%Rewind_InputStream;
-text: .text%New_sfnt_OffsetTable: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%ReadInt16;
-text: .text%New_sfnt_DirectoryEntry: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%GetTableDirEntry_sfntClass;
-text: .text%New_InputStream2;
-text: .text%PreLoadT2KInputStream;
-text: .text%New_headClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%Delete_InputStream;
-text: .text%tsi_DeAllocMem;
-text: .text%t2k_free;
-text: .text%__1cIHSMemoryGDelete6Fpv_v_;
-text: .text%New_hheaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%New_maxpClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%New_locaClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%GetNumGlyphs_sfntClass;
-text: .text%New_hmtxClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%New_hmtxEmptyClass;
-text: .text%PrimeT2KInputStream;
-text: .text%New_cvtClass;
-text: .text%New_cvtEmptyClass;
-text: .text%Read_cvtClass;
-text: .text%New_fpgmClass;
-text: .text%New_fpgmEmptyClass;
-text: .text%Read_fpgmClass;
-text: .text%ReadSegment;
-text: .text%New_prepClass;
-text: .text%New_prepEmptyClass;
-text: .text%Read_prepClass;
-text: .text%NewT2K;
-text: .text%NewTTHintFontForT2K;
-text: .text%NewTTSHintcalerFont;
-text: .text%OnceOnlyTTFDefInit: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/TTHintFont.o;
-text: .text%fnt_DefaultJumpTable;
-text: .text%ComputeElementSizes;
-text: .text%LargestElementCounts: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/TTHintFont.o;
-text: .text%FixedMultiply;
-text: .text%util_FixMul;
-text: .text%TTScalerNewVariationDefault;
-text: .text%TTScalerNewVariation1Dot1;
-text: .text%InitTTHintTranForT2K;
-text: .text%TTHintTransformAllocation: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/HintTran.o;
-text: .text%InitTheKeyByVary;
-text: .text%InitTheKeyByFont;
-text: .text%InitTheKeyByScaler;
-text: .text%SetupDebugPointers: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/TTHintFont.o;
-text: .text%GetPerFontMemory;
-text: .text%GetPerFontMemoryAllocator;
-text: .text%TTScalerTTHintTranDefault;
-text: .text%SetupScalerDefaultTTD: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/HintTran.o;
-text: .text%TTScalerTTHintTranDeep: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/HintTran.o;
-text: .text%SetupScalerTransform: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/HintTran.o;
-text: .text%SetupGXMatrixFromT2K: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/HintTran.o;
-text: .text%ResetMapping;
-text: .text%TTScalerTTHintTran;
-text: .text%FillBytes;
-text: .text%Magnitude;
-text: .text%MultiplyDivide;
-text: .text%WideMul: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/FixMulDiv.o;
-text: .text%WideDiv: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/FixMulDiv.o;
-text: .text%MapMapping;
-text: .text%convertFixedMatrixToTGraf;
-text: .text%FixedToGCoordinate: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/PinkGlue.o;
-text: .text%FractToGCoordinate: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/PinkGlue.o;
-text: .text%concatTGrafMatrices;
-text: .text%convertTGrafMatrixToFixed;
-text: .text%GCoordinateToFixed: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/PinkGlue.o;
-text: .text%GCoordinateToFract: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/PinkGlue.o;
-text: .text%FixedDivide;
-text: .text%SetGlobalGSDefaults;
-text: .text%InitContourData;
-text: .text%NeededAllocationContourBytes: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/OrientDB.o;
-text: .text%NeededContourWords: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/OrientDB.o;
-text: .text%SetupAllocatedContourData: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/OrientDB.o;
-text: .text%__1cSX11nrScalerContextLCountGlyphs6M_I_;
-text: .text%__1cQt2kScalerContextLCountGlyphs6M_I_;
-text: .text%__1cOhsGGlyphStrikeLinitEntries6MpnThsGGlyphStrikeEntry_i_v_;
-text: .text%__1cSX11nrScalerContextNGetLineHeight6MpnNhsFixedPoint2_2222_v_;
-text: .text%__1cNhsGGlyphCacheJAddStrike6MpnOhsGGlyphStrike__v_;
-text: .text%__1cOhsDynamicArray4CpnOhsGGlyphStrike__GAppend6Mrk1_i_;
-text: .text%__1cThsDescriptor_Delete6FpnShsDescriptorHeader__v_;
-text: .text%__1cGStrikeMGetNumGlyphs6M_i_;
-text: .text%__1cKfontObjectJsetStrike6MpnGStrike_rnNFontTransform_CC_v_;
-text: .text%__1cShsDescriptor_Equal6FpknShsDescriptorHeader_2_c_;
-text: .text%__1cOhsGGlyphStrikeNGetLineHeight6MpnNhsFixedPoint2_2222_v_;
-text: .text%__1cGuseMin6FrnNhsFixedPoint2_1_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/Strike.o;
-text: .text%__1cGuseMax6FrnNhsFixedPoint2_1_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/Strike.o;
-text: .text%__1cNX11FontObjectJMatchName6MipkHi_c_;
-text: .text%__1cNX11FontObjectLgetScalerID6MrnNFontTransform_CC_nLFontFormats__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject_md.o;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getCharMetrics;
-text: .text%getMetrics;
-text: .text%__1cCTXGconcat6Mrk0_v_;
-text: .text%__1cGStrikeLCharToGlyph6MI_I_;
-text: .text%__1cGStrikeJgetMapper6kM_pnRCharToGlyphMapper__;
-text: .text%__1cUCompositeGlyphMapperNCharsToGlyphs6kMipkIpI_v_;
-text: .text%__1cUCompositeGlyphMapperTgetMissingGlyphCode6kM_i_;
-text: .text%__1cOhsGGlyphStrikeJgetMapper6M_pnRCharToGlyphMapper__;
-text: .text%__1cSX11nrScalerContextJgetMapper6M_pnRCharToGlyphMapper__;
-text: .text%__1cOhsDynamicArray4nKMapperPair__DGet6kMi_rkn0A__;
-text: .text%__1cQt2kScalerContextJgetMapper6M_pnRCharToGlyphMapper__;
-text: .text%__1cTnrCharToGlyphMapper2t6MpnUX11CharToGlyphMapper_pnRCharToGlyphMapper_ii_v_;
-text: .text%__1cRCharToGlyphMapperTgetMissingGlyphCode6kM_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/t2kScalerContext.o;
-text: .text%__1cUCompositeGlyphMapperSgetCachedGlyphCode6kMkI_I_;
-text: .text%__1cNCompositeFontOisExcludedChar6MiI_i_;
-text: .text%__1cTnrCharToGlyphMapperNCharsToGlyphs6kMipkIpI_v_;
-text: .text%__1cKCMAPMapperNCharsToGlyphs6kMipkIpI_v_;
-text: .text%__1cWConvertUnicodeToGlyphs6FrnSsfntFileFontObject_rpCipkIpI_v_;
-text: .text%__1cIgetGlyph6FpCI_H_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/cmaps.o;
-text: .text%__1cJgetGlyph46FpCI_H_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/cmaps.o;
-text: .text%__1cUX11CharToGlyphMapperNCharsToGlyphs6kMipkIpI_v_;
-text: .text%__1cUCompositeGlyphMapperSsetCachedGlyphCode6kMkI1ki_v_;
-text: .text%__1cGStrikeKgetMetrics6MirnIhsGGlyph_rnNhsFixedPoint2__c_;
-text: .text%__1cGStrikeXcompositeStrikeForGlyph6Mri_pnOhsGGlyphStrike__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/Strike.o;
-text: .text%__1cOhsGGlyphStrikeKGetMetrics6MHpnIhsGGlyph_pnNhsFixedPoint2__v_;
-text: .text%__1cOhsGGlyphStrikeIgetEntry6Mi_pnThsGGlyphStrikeEntry__;
-text: .text%__1cSX11nrScalerContextPGenerateMetrics6MHpnIhsGGlyph_pnNhsFixedPoint2__v_;
-text: .text%__1cTnrCharToGlyphMapperMgetXCharCode6Mi_i_;
-text: .text%Java_sun_awt_font_NativeFontWrapper_populateAndLayoutGlyphVector;
-text: .text%__1cLGlyphLayout2t6MpnHJNIEnv__pnL_jcharArray_iiipnN_jdoubleArray_6CCpnKfontObject__v_;
-text: .text%__1cJScriptRunEnext6M_c_;
-text: .text%__1cJScriptRunNgetScriptCode6FI_i_;
-text: .text%__1cJScriptRunKsameScript6Fii_c_;
-text: .text%__1cNgetScriptFont6FpnKfontObject_iripc_1_;
-text: .text%__1cNCompositeFontNgetScriptSlot6Mi_i_;
-text: .text%__1cKfontObjectJgetStrike6M_rnGStrike__;
-text: .text%__1cGStrikeTgetMissingGlyphCode6kM_i_;
-text: .text%__1cJScriptRunVgetScriptRangeOffsets6Fi_pkh_;
-text: .text%__1cTFontInstanceAdapter2t6MpnKfontObject_pnGStrike_pnNFontTransform_ii_v_;
-text: .text%__1cNCompositeFontNGetUnitsPerEM6M_kH_;
-text: .text%__1cTFontInstanceAdapterReuclidianDistance6Mff_f_;
-text: .text%__1cVCompositeLayoutEngine2t6MpknTFontInstanceAdapter_ii_v_;
-text: .text%__1cMLayoutEngine2t6MpknOLEFontInstance_ii_v_;
-text: .text%__1cVCompositeLayoutEngineLlayoutChars6MpkHiiicffrnLLEErrorCode__i_;
-text: .text%__1cVCompositeLayoutEngineNcomputeGlyphs6MpkHiiicrpIrpirnLLEErrorCode__i_;
-text: .text%__1cVCompositeLayoutEngineQmapCharsToGlyphs6MpkHiiccrpIrpirnLLEErrorCode__v_;
-text: .text%__1cTFontInstanceAdapterUmapCharsToWideGlyphs6kMpkHiicpknMLECharMapper_pI_v_;
-text: .text%__1cTFontInstanceAdapterSmapCharToWideGlyph6kMIpknMLECharMapper__I_;
-text: .text%__1cRDefaultCharMapperHmapChar6kMI_I_;
-text: .text%__1cROpenTypeUtilitiesGsearch6FIpkIi_i_;
-text: .text%__1cROpenTypeUtilitiesHhighBit6Fi_W_;
-text: .text%__1cVCompositeLayoutEngineOpositionGlyphs6MpkIiffrpfrnLLEErrorCode__v_;
-text: .text%__1cTFontInstanceAdapterTgetWideGlyphAdvance6kMIrnHLEPoint__v_;
-text: .text%__1cLGlyphLayoutRupdateGlyphVector6MpnHJNIEnv__pnI_jobject_i_v_;
-text: .text%__1cJinitGVIDs6FpnHJNIEnv__pnI_jobject__c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/GlyphLayout.o;
-text: .text%__1cVCompositeLayoutEngineJgetGlyphs6kMpIIrnLLEErrorCode__v_;
-text: .text%__1cMLayoutEngineOgetCharIndices6kMpiirnLLEErrorCode__v_;
-text: .text%__1cLGlyphLayout2T6M_v_;
-text: .text%__SLIP.DELETER__A: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/BOyhlP1XkHISKWzbx4EZ.o;
-text: .text%__1cVCompositeLayoutEngine2T6M_v_;
-text: .text%__1cVCompositeLayoutEngineFreset6M_v_;
-text: .text%__1cMLayoutEngineFreset6M_v_;
-text: .text%__1cMLayoutEngine2T5B6M_v_;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getGlyphVectorOutline;
-text: .text%__1cLGlyphVector2t6MpnHJNIEnv__pnN_jdoubleArray_4CCpnKfontObject__v_;
-text: .text%__1cLGlyphVectorOgetGlyphVector6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorNgetGlyphCodes6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorNsetGlyphCodes6MpnK_jintArray__v_;
-text: .text%__1cLGlyphVectorOallocateGlyphs6Mi_v_;
-text: .text%__1cLGlyphVectorMsetNumGlyphs6Mi_v_;
-text: .text%__1cLGlyphVectorMgetPositions6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorMsetPositions6MpnM_jfloatArray__v_;
-text: .text%__1cLGlyphVectorRallocatePositions6M_v_;
-text: .text%__1cLGlyphVectorNgetTransforms6MpnI_jobject__v_;
-text: .text%__1cLGlyphVectorNsetTransforms6MpnN_jdoubleArray_pnK_jintArray__v_;
-text: .text%__1cLGlyphVectorKgetOutline6Mff_pnI_jobject__;
-text: .text%__1cLGlyphVectorQgetGlyphsOutline6Miiff_pnI_jobject__;
-text: .text%__1cLStrikeTable2t6MrknLGlyphVector_pnCTX__v_;
-text: .text%__1cLGlyphVectorOgetGlyphStrike6kMpnCTX__rnGStrike__;
-text: .text%__1cLGeneralPath2t6Mi_v_;
-text: .text%__1cLGlyphVectorJscanGlyph6FrnLGeneralPath_rnGStrike_rnMhsPathSpline_rnLCurveWalker_ffi_v_;
-text: .text%__1cGStrikePGetGlyphOutline6MirnMhsPathSpline__v_;
-text: .text%__1cOhsGGlyphStrikeHGetPath6MHpnMhsPathSpline_pnNhsFixedPoint2__v_;
-text: .text%__1cSX11nrScalerContextMGeneratePath6MHpnMhsPathSpline_pnNhsFixedPoint2__v_;
-text: .text%__1cQt2kScalerContextMGeneratePath6MHpnMhsPathSpline_pnNhsFixedPoint2__v_;
-text: .text%__1cQt2kScalerContextKSetupTrans6M_pnDT2K__;
-text: .text%T2K_NewTransformation;
-text: .text%GetUPEM;
-text: .text%util_EuclidianDistance;
-text: .text%util_FixDiv;
-text: .text%NewTTHintTranForT2K;
-text: .text%ExtractUnitVectors;
-text: .text%SetOneUnitAxis: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/t2k.o;
-text: .text%T2K_NewTransformationInternal: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/t2k.o;
-text: .text%T2KDoGriddingSetUp: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/t2k.o;
-text: .text%GetMaxPoints;
-text: .text%ag_HintInit;
-text: .text%GetStreamForTable;
-text: .text%ComputeGlobalHints;
-text: .text%MedianHeight: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/ghints.o;
-text: .text%GetGlyphByCharCode;
-text: .text%LoadCMAP: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%New_cmapClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%SizeInStream;
-text: .text%Compute_cmapClass_GlyphIndex: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%Compute_cmapClass_Index0: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%GetGlyphByIndex;
-text: .text%New_GlyphClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%GetYMax: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/ghints.o;
-text: .text%Delete_GlyphClass;
-text: .text%util_SortShortArray;
-text: .text%GetYMin: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/ghints.o;
-text: .text%ag_AutoFindStems;
-text: .text%ag_IsHinthandle: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_ProcessOutline: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_AnalyzeChar: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_ComputeTangents: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_DoubleNorm: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_MarkPoints: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_FindXandYExtrema: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_PrevDifferentXValue: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_PrevDifferentYValue: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_YDist: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_XDist: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_FindInflections: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_FDist: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_FindPointPairs: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_BlackAndParallell: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_Height;
-text: .text%ag_FindLinks: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%ag_GetStems: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%Purge_cmapMemory;
-text: .text%Delete_cmapClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%ag_SetHintInfo;
-text: .text%ag_SetScale;
-text: .text%ag_SetUpCvt: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/autogrid.o;
-text: .text%GetFontWideOutlineMetrics;
-text: .text%T2K_TransformYFunits;
-text: .text%T2K_TransformXFunits;
-text: .text%T2K_RenderGlyph;
-text: .text%T2K_RenderGlyphInternal: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/t2k.o;
-text: .text%T2K_PurgeMemoryInternal: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/t2k.o;
-text: .text%IsFigure;
-text: .text%IsFigure_cmapClass: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/truetype.o;
-text: .text%AccumulateGlyphContours;
-text: .text%ApplyPostStyle;
-text: .text%__1cSConvertGlyphToPath6FpknKGlyphClass_pnMhsPathSpline__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/t2kScalerContext.o;
-text: .text%__1cIHSMemoryFClear6FpvI_v_;
-text: .text%T2K_PurgeMemory;
-text: .text%__1cGStrikeLGetPathType6Mi_nMhsPathSplineEType__;
-text: .text%__1cOhsGGlyphStrikeLGetPathType6kM_nMhsPathSplineEType__;
-text: .text%__1cLCurveWalkerEInit6MpknNhsPathContour_c_v_;
-text: .text%__1cLCurveWalkerINextQdDuad6M_c_;
-text: .text%__1cLGeneralPathIneedRoom6Mii_C_;
-text: .text%__1cMhsPathSplineGDelete6Fp0_v_;
-text: .text%__1cLGeneralPathIgetShape6MpnHJNIEnv___pnI_jobject__;
-text: .text%__1cLGeneralPath2T6M_v_;
-text: .text%__1cLStrikeTable2T6M_v_;
-text: .text%__1cLGlyphVector2T6M_v_;
-# SwingSet
-text: .text%__1cGStrikeVneedsAlgorithmicStyle6FrknNCompositeFont_ipc_v_;
-text: .text%__1cSsfntFileFontObjectLGetFontName6Mri_pkH_;
-text: .text%__1cSsfntFileFontObjectJReadNames6M_v_;
-text: .text%__1cJmakeNameU6FpCih_pH_;
-text: .text%__1cTEqualUnicodeStrings6FpkHip0i_c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/Strike.o;
-text: .text%__1cNX11FontObjectLGetFontName6Mri_pkH_;
-text: .text%__1cUstrDupASCIItoUNICODE6Fpkcrii_pH_;
-text: .text%__1cQCompAsciiUnicode6FpkcpkHi_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/Strike.o;
-text: .text%__1cTtype1FileFontObjectLGetFontInfo6M_pnKt1FontInfo__;
-text: .text%__1cOfileFontObjectYGetFontLocalPlatformName6kM_pkc_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cTtype1FileFontObjectIOpenFont6MpkcpnLsDataRecord__i_;
-text: .text%__1cTtype1FileFontObjectINextChar6MpnLsDataRecord__i_;
-text: .text%__1cTtype1FileFontObjectJNextToken6MpnLsDataRecord_pci_i_;
-text: .text%__1cTtype1FileFontObjectKSkipSpaces6MpnLsDataRecord__i_;
-text: .text%__1cTtype1FileFontObjectJCloseFont6MpnLsDataRecord__v_;
-text: .text%__1cTtype1FileFontObjectODeleteFontInfo6MpnKt1FontInfo__v_;
-text: .text%__1cTtype1FileFontObjectHGetName6MrH111pH_i_;
-text: .text%__1cJustr_copy6FpH0_i_;
-text: .text%GetConverter: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/cmaps.o;
-text: .text%makeNativeToUnicodeArray;
-text: .text%__1cKCreateCMAP6FpCpH_0_;
-text: .text%__1cJgetGlyph26FpCI_H_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/cmaps.o;
-text: .text%__1cUX11CharToGlyphMapperNAddAsciiChars6M_v_;
-text: .text%__1cMj_strcasestr6Fpkc1_pc_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/cmaps.o;
-text: .text%__1cJupcasestr6Fpc_0_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/cmaps.o;
-text: .text%__1cQCreateSymbolCMAP6FpCpH_0_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/cmaps.o;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getNumFonts;
-text: .text%CountFontObjects;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getFamilyNameByIndex;
-text: .text%__1cNGetFontObject6FI_pnKfontObject__;
-text: .text%__1cPgetNodeByNumber6Fi_pnMfontListNode__: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/fontObject.o;
-text: .text%__1cKfindByFont6FrpnIT2KEntry_pv3_c_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/t2kScalerContext.o;
-text: .text%__1cGStrike2T6M_v_;
-text: .text%__SLIP.DELETER__B: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/ArabicLayoutEngine.o;
-text: .text%__1cUCompositeGlyphMapper2T6M_v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/Strike.o;
-text: .text%__1cIhsRefCntFUnRef6M_v_;
-text: .text%__1cNt2kFontScalerNCreateContext6MpknShsDescriptorHeader__pnQhsGScalerContext__;
-text: .text%__1cQt2kScalerContextNGetLineHeight6MpnNhsFixedPoint2_2222_v_;
-text: .text%__1cLhsMagnitude6Fii_i_;
-text: .text%__1cGhsWideDMul6Mii_p0_;
-text: .text%__1cGhsWideESqrt6kM_i_;
-text: .text%__1cJhsFracDiv6Fii_i_;
-text: .text%__1cGhsWideDDiv6Mi_p0_;
-text: .text%__1cGhsWideGAsLong6kM_i_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/hsFixMath.o;
-text: .text%__1cRProjectUnitVector6FiiiiiipnNhsFixedPoint2__v_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/t2kScalerContext.o;
-text: .text%__1cJhsFracMul6Fii_i_;
-text: .text%__1cLgetGlyph1046FpCI_H_: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/cmaps.o;
-text: .text%Java_sun_awt_font_GlyphList_initIDs;
-text: .text%Java_sun_awt_font_GlyphList_setupCharData;
-text: .text%__1cLGlyphVectorHsetText6MpnL_jcharArray_ii_v_;
-text: .text%__1cLGlyphVectorKinitGlyphs6MpkHi_v_;
-text: .text%__1cLGlyphVectorNcharsToGlyphs6FrnGStrike_pkHpIi_C_;
-text: .text%__1cLGlyphVectorUpositionAndGetImages6Mff_v_;
-text: .text%__1cLGlyphVectorRallocateImageRefs6M_v_;
-text: .text%__1cGStrikeMprepareCache6Mipc_v_;
-text: .text%__1cOhsGGlyphStrikeMPrepareCache6MIpc_v_;
-text: .text%__1cNGlyphMemCacheNreserveGlyphs6MHIpc_v_;
-text: .text%__1cIMemCacheMreserveSpace6MHIpc_v_;
-text: .text%__1cGStrikeTgetMetricsWithImage6MirnIhsGGlyph_rnNhsFixedPoint2_pc_c_;
-text: .text%__1cOhsGGlyphStrikeTGetMetricsWithImage6MHpnIhsGGlyph_pnNhsFixedPoint2_pc_v_;
-text: .text%__1cOhsGGlyphStrikeNgetEntryImage6MpnThsGGlyphStrikeEntry_Hpc_v_;
-text: .text%__1cNGlyphMemCacheNgetGlyphImage6MIrHpc_pkv_;
-text: .text%__1cIMemCacheJgetMemory6MIrHpc_pkv_;
-text: .text%__1cSX11nrScalerContextYGenerateMetricsWithImage6MHpnIhsGGlyph_pnNhsFixedPoint2__v_;
-text: .text%__1cSX11nrScalerContextNGenerateImage6MHpknIhsGGlyph_pv_v_;
-text: .text%__1cOhsGGlyphStrikeQassignEntryImage6MpnThsGGlyphStrikeEntry_Hpc_v_;
-text: .text%__1cNGlyphMemCacheQassignGlyphImage6MIrnIhsGGlyph_pc_H_;
-text: .text%__1cIMemCacheMassignMemory6MIIpvpc_H_;
-text: .text%__1cIMemCacheIsetEntry6MrnIMemEntry_IpvIpc_v_;
-text: .text%__1cIMemCacheMreleaseEntry6MrnIMemEntry_pc_v_;
-text: .text%Java_sun_java2d_loops_DrawGlyphList_DrawGlyphList;
-text: .text%drawGlyphList: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/DrawGlyphList.o;
-text: .text%Java_sun_awt_font_GlyphList_discardData;
-text: .text%Java_sun_awt_font_GlyphList_setupStringData;
-text: .text%__1cLGlyphVectorJsetString6MpnI_jstring__v_;
-text: .text%Java_sun_awt_font_NativeFontWrapper_getFamilyName;
-text: .text%lookupName: OUTPUTDIR/tmp/sun/sun.awt.font/fontmanager/obj64/FontWrapper.o;
diff --git a/jdk/make/sun/font/t2k/FILES_c.gmk b/jdk/make/sun/font/t2k/FILES_c.gmk
deleted file mode 100644
index cb2bb73..0000000
--- a/jdk/make/sun/font/t2k/FILES_c.gmk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c_shared = \
- autogrid.c \
- ghints.c \
- glyph.c \
- hstrat97.c \
- t2ksc.c \
- scoder.c \
- shapet.c \
- t1.c \
- t1hint.c \
- t2k.c \
- t2kstrm.c \
- truetype.c \
- tsimem.c \
- util.c \
- t2ksbit.c \
- FixMulDiv.c \
- Fnt.c \
- FntDebug.c \
- FntInit.c \
- FntRare.c \
- FntUtilities.c \
- FontMath.c \
- GlyphOutline.c \
- HintGlyph.c \
- HintIO.c \
- HintTran.c \
- InterpreterGlue.c \
- PinkGlue.c \
- TTHintFont.c \
- HintScan.c \
- sc.c \
- Orient.c \
- OrientDB.c \
- scalerMethods.c
-
-FILES_cpp_shared = \
- GeneralPath.cpp \
- t2kScalerMethods.cpp
-
-FILES_c = $(FILES_c_shared) $(FILES_c_platform)
-FILES_cpp = $(FILES_cpp_shared) $(FILES_cpp_platform)
diff --git a/jdk/make/sun/font/t2k/Makefile b/jdk/make/sun/font/t2k/Makefile
deleted file mode 100644
index 2b155b3..0000000
--- a/jdk/make/sun/font/t2k/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building t2k rasteriser.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.font
-LIBRARY = t2k
-PRODUCT = sun
-
-# Indicate we want the C++ compiler to do the linking.
-CPLUSPLUSLIBRARY=true
-
-# Part of the sun.font package, but doesn't rebuild classes (except
-# for a few ones with native methods) so shouldn't clobber them.
-DONT_CLOBBER_CLASSES=true
-
-# Use higher optimization level
-OPTIMIZATION_LEVEL = HIGHER
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_c.gmk
-
-FILES_export = \
- java/awt/Font.java \
- sun/font/FileFont.java \
- sun/font/GlyphList.java \
- sun/font/NativeFont.java \
- sun/font/StrikeCache.java \
- sun/font/T2KFontScaler.java
-
-ifeq ($(PLATFORM), windows)
-
- # t2k imports several shared methods from fontmanager.dll
- LDLIBS += user32.lib $(OBJDIR)/../../../sun.font/fontmanager/$(OBJDIRNAME)/fontmanager.lib
-
- OTHER_CFLAGS += -DCC_NOEX
- OTHER_CXXFLAGS += -DCC_NOEX
-
-endif # PLATFORM
-
-#
-# In the OpenJDK mode we are not building anything
-#
-ifndef OPENJDK
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-endif
-
-#
-# Add to the ambient vpath to pick up files in subdirectories
-#
-vpath %.c $(SHARE_SRC)/share/native/$(PKGDIR)
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)
-vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)
-vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)/t2k
-vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)/t2k/ttHints
-
-vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
-vpath %.cpp $(CLOSED_SRC)/share/native/$(PKGDIR)
-
-# Libraries to link, and other C flags.
-#
-# setup the list of libraries to link in...
-ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS += $(LIBM) $(LIBCXX) -lfontmanager
- ifeq ($(PLATFORM), linux)
- ifeq ("$(CC_VER_MAJOR)", "3")
- OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
- endif
- else
- ifeq ($(PLATFORM), solaris)
- OTHER_LDLIBS += -lawt -lawt_xawt
- endif
- endif
-endif
-
-
-# set up compile flags..
-
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR) \
- -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k \
- -I$(CLOSED_SRC)/share/native/$(PKGDIR) \
- -I$(SHARE_SRC)/share/native/$(PKGDIR) \
- -I$(PLATFORM_SRC)/native/$(PKGDIR) \
- -I$(SHARE_SRC)/native/sun/java2d/loops \
- -I$(SHARE_SRC)/native/sun/java2d/pipe \
- -I$(PLATFORM_SRC)/native/sun/java2d \
- -I$(SHARE_SRC)/native/sun/java2d \
- -I$(TEMPDIR)/../fontmanager/CClassHeaders
diff --git a/jdk/make/sun/font/t2k/mapfile-vers b/jdk/make/sun/font/t2k/mapfile-vers
deleted file mode 100644
index 4f60a42..0000000
--- a/jdk/make/sun/font/t2k/mapfile-vers
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Java_sun_font_T2KFontScaler_createScalerContextNative;
- Java_sun_font_T2KFontScaler_disposeNativeScaler;
- Java_sun_font_T2KFontScaler_getFontMetricsNative;
- Java_sun_font_T2KFontScaler_getGlyphAdvanceNative;
- Java_sun_font_T2KFontScaler_getGlyphCodeNative;
- Java_sun_font_T2KFontScaler_getGlyphImageNative;
- Java_sun_font_T2KFontScaler_getGlyphMetricsNative;
- Java_sun_font_T2KFontScaler_getGlyphOutlineBoundsNative;
- Java_sun_font_T2KFontScaler_getGlyphOutlineNative;
- Java_sun_font_T2KFontScaler_getGlyphVectorOutlineNative;
- Java_sun_font_T2KFontScaler_getLayoutTableCacheNative;
- Java_sun_font_T2KFontScaler_getMissingGlyphCodeNative;
- Java_sun_font_T2KFontScaler_getNumGlyphsNative;
- Java_sun_font_T2KFontScaler_getUnitsPerEMNative;
- Java_sun_font_T2KFontScaler_initIDs;
- Java_sun_font_T2KFontScaler_initNativeScaler;
- Java_sun_font_T2KFontScaler_getGlyphPointNative;
- local:
- *;
-};
diff --git a/jdk/make/sun/headless/Makefile b/jdk/make/sun/headless/Makefile
deleted file mode 100644
index 704f757..0000000
--- a/jdk/make/sun/headless/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-HEADLESS = true
-NO_ROBOT = true
-MOTIF_VERSION = none
-MOTIF_VERSION_STRING=none
-
-PACKAGE = sun.awt
-LIBRARY = awt_headless
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-ifdef BUILD_HEADLESS
- include $(BUILDDIR)/sun/awt/mawt.gmk
-else
- all build clean clobber ::
- # do nothing case
-endif
-
diff --git a/jdk/make/sun/headless/mapfile-vers b/jdk/make/sun/headless/mapfile-vers
deleted file mode 100644
index 0d0de5a..0000000
--- a/jdk/make/sun/headless/mapfile-vers
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
-
- Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
- Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
- Java_sun_java2d_x11_X11Renderer_XFillSpans;
- Java_sun_java2d_x11_X11Renderer_XDrawArc;
- Java_sun_java2d_x11_X11Renderer_XDrawLine;
- Java_sun_java2d_x11_X11Renderer_XDrawOval;
- Java_sun_java2d_x11_X11Renderer_XDrawPoly;
- Java_sun_java2d_x11_X11Renderer_XDrawRect;
- Java_sun_java2d_x11_X11Renderer_XDrawRoundRect;
- Java_sun_java2d_x11_X11Renderer_XDoPath;
- Java_sun_java2d_x11_X11Renderer_XFillArc;
- Java_sun_java2d_x11_X11Renderer_XFillOval;
- Java_sun_java2d_x11_X11Renderer_XFillPoly;
- Java_sun_java2d_x11_X11Renderer_XFillRect;
- Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
- Java_sun_java2d_x11_X11Renderer_devCopyArea;
- Java_sun_java2d_x11_X11SurfaceData_initIDs;
- Java_sun_java2d_x11_X11SurfaceData_initSurface;
- Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode;
- Java_sun_java2d_x11_X11SurfaceData_XSetXorMode;
- Java_sun_java2d_x11_X11SurfaceData_XSetForeground;
-
- Java_sun_java2d_x11_XSurfaceData_initOps;
- Java_sun_java2d_x11_XSurfaceData_XCreateGC;
- Java_sun_java2d_x11_XSurfaceData_XResetClip;
- Java_sun_java2d_x11_XSurfaceData_XSetClip;
- Java_sun_java2d_x11_XSurfaceData_flushNativeSurface;
- Java_sun_java2d_x11_XSurfaceData_isDrawableValid;
- Java_sun_java2d_x11_XSurfaceData_setInvalid;
- Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures;
-
- X11SurfaceData_GetOps;
- Java_java_awt_Font_initIDs;
- Java_sun_font_FontConfigManager_getFontConfig;
- Java_sun_font_FontConfigManager_getFontConfigAASettings;
- Java_sun_font_FontConfigManager_getFontConfigVersion;
- Java_sun_awt_X11FontManager_getFontPathNative;
-
- Java_sun_awt_FontDescriptor_initIDs;
- Java_sun_awt_PlatformFont_initIDs;
-
- Java_sun_print_CUPSPrinter_initIDs;
- Java_sun_print_CUPSPrinter_getCupsServer;
- Java_sun_print_CUPSPrinter_getCupsPort;
- Java_sun_print_CUPSPrinter_canConnect;
- Java_sun_print_CUPSPrinter_getMedia;
- Java_sun_print_CUPSPrinter_getPageSizes;
-
- # libfontmanager entry points
- AWTIsHeadless;
- AWTCountFonts;
- AWTLoadFont;
- AWTFreeFont;
- AWTFontAscent;
- AWTFontDescent;
- AWTFontMinByte1;
- AWTFontMaxByte1;
- AWTFontMinCharOrByte2;
- AWTFontMaxCharOrByte2;
- AWTFontDefaultChar;
- AWTFontPerChar;
- AWTFontMaxBounds;
- AWTFontTextExtents16;
- AWTFreeChar;
- AWTFontGenerateImage;
- AWTCharAdvance;
- AWTCharLBearing;
- AWTCharRBearing;
- AWTCharAscent;
- AWTCharDescent;
- AWTDrawGlyphList;
- AccelGlyphCache_RemoveAllCellInfos;
-
-
- local:
- *;
-};
-
diff --git a/jdk/make/sun/headless/reorder-i586 b/jdk/make/sun/headless/reorder-i586
deleted file mode 100644
index 84e923b..0000000
--- a/jdk/make/sun/headless/reorder-i586
+++ /dev/null
@@ -1 +0,0 @@
-# Temporary file for headless
diff --git a/jdk/make/sun/headless/reorder-sparc b/jdk/make/sun/headless/reorder-sparc
deleted file mode 100644
index 84e923b..0000000
--- a/jdk/make/sun/headless/reorder-sparc
+++ /dev/null
@@ -1 +0,0 @@
-# Temporary file for headless
diff --git a/jdk/make/sun/headless/reorder-sparcv9 b/jdk/make/sun/headless/reorder-sparcv9
deleted file mode 100644
index 84e923b..0000000
--- a/jdk/make/sun/headless/reorder-sparcv9
+++ /dev/null
@@ -1 +0,0 @@
-# Temporary file for headless
diff --git a/jdk/make/sun/image/Makefile b/jdk/make/sun/image/Makefile
deleted file mode 100644
index 7056ed9..0000000
--- a/jdk/make/sun/image/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the generic and vis versions of medialib
-#
-
-BUILDDIR = ../..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = generic
-
-# solaris-sparc and solaris-sparcv9 both build 'vis'
-ifeq ($(PLATFORM),solaris)
- ifeq ($(ARCH),sparc)
- SUBDIRS += vis
- endif
- ifeq ($(ARCH),sparcv9)
- SUBDIRS += vis
- endif
-endif
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/sun/image/generic/FILES_c.gmk b/jdk/make/sun/image/generic/FILES_c.gmk
deleted file mode 100644
index dda8c40..0000000
--- a/jdk/make/sun/image/generic/FILES_c.gmk
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-IMAGE_AFFINE_FILES = \
- mlib_ImageAffine_NN.c \
- mlib_ImageAffine_NN_Bit.c \
- mlib_ImageAffine_BC_S32.c \
- mlib_ImageAffine_BC_D64.c \
- mlib_ImageAffine_BC_F32.c \
- mlib_ImageAffine_BL_S32.c \
- mlib_ImageAffine_BL_D64.c \
- mlib_ImageAffine_BL_F32.c \
- mlib_c_ImageAffine_NN.c \
- mlib_c_ImageAffine_BL.c \
- mlib_c_ImageAffine_BL_S16.c \
- mlib_c_ImageAffine_BL_U16.c \
- mlib_c_ImageAffine_BC.c \
- mlib_c_ImageAffine_BC_S16.c \
- mlib_c_ImageAffine_BC_U16.c \
- mlib_c_ImageAffineIndex_BC.c \
- mlib_c_ImageAffineIndex_BL.c \
- mlib_ImageAffineEdge.c \
- mlib_ImageScanPoly.c \
- mlib_ImageColorTrue2Index.c \
- mlib_ImageDivTables.c \
- mlib_c_ImageThresh1_U8.c \
- mlib_ImageFilters.c \
-
-IMAGE_LOOKUP_FILES = \
- mlib_c_ImageLookUp_f.c \
- mlib_ImageLookUp_64.c \
- mlib_ImageLookUp_Bit.c \
- mlib_c_ImageCopy.c \
-
-IMAGE_CONV_FILES = \
- mlib_ImageConv_16ext.c \
- mlib_ImageConv_u16ext.c \
- mlib_ImageConvMxN_ext.c \
- mlib_ImageConvMxN_Fp.c \
- mlib_ImageConv_8ext.c \
- mlib_c_ImageConv_f.c \
- mlib_ImageClipping.c \
- mlib_c_ImageConvCopyEdge.c \
- mlib_c_ImageConvClearEdge.c \
- mlib_ImageConv_8nw.c \
- mlib_ImageConv_16nw.c \
- mlib_ImageConv_u16nw.c \
- mlib_ImageConv_32nw.c \
- mlib_ImageConv_F32nw.c \
- mlib_ImageConv_D64nw.c \
- mlib_ImageConv2x2_f.c \
- mlib_ImageConvClearEdge_Fp.c \
- mlib_ImageConvCopyEdge_Bit.c \
- mlib_ImageConvClearEdge_Bit.c \
- mlib_ImageCopy_Bit.c \
- mlib_c_ImageConvVersion.c \
-
-
-SHARE_SYS_FILES = \
- mlib_sys.c \
- mlib_ImageUtils.c \
-
-
-FILES_c = \
- mlib_ImageAffine.c \
- mlib_ImageCreate.c \
- mlib_c_ImageLookUp.c \
- mlib_ImageConvMxN.c \
- mlib_ImageConvKernelConvert.c \
- $(IMAGE_AFFINE_FILES) \
- $(IMAGE_LOOKUP_FILES) \
- $(IMAGE_CONV_FILES) \
- $(SHARE_SYS_FILES) \
-
diff --git a/jdk/make/sun/image/generic/Makefile b/jdk/make/sun/image/generic/Makefile
deleted file mode 100644
index 85ce954..0000000
--- a/jdk/make/sun/image/generic/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the generic version of medialib
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.awt.medialib
-LIBRARY = mlib_image
-PRODUCT = sun
-
-# Use highest level of optimization on this library
-OPTIMIZATION_LEVEL = HIGHEST
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Use mapfile
-#
-FILES_m = mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-#
-# Files
-#
-include FILES_c.gmk
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# set compile options for solaris 32- or 64-bit build
-#
-ifeq ($(ARCH_DATA_MODEL), 64)
- CFLAGS += -DMLIB_OS64BIT
-endif # ARCH_DATA_MODEL
-
-ifneq ($(PLATFORM), sparc)
- OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
-endif
-
-CPPFLAGS += \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib
-
-OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
-
-ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS = $(LIBM) $(LIBDL)
-endif
-
diff --git a/jdk/make/sun/image/generic/mapfile-vers b/jdk/make/sun/image/generic/mapfile-vers
deleted file mode 100644
index 0bb0d74..0000000
--- a/jdk/make/sun/image/generic/mapfile-vers
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- j2d_mlib_ImageDelete;
- j2d_mlib_ImageCreateStruct;
- j2d_mlib_ImageLookUp;
- j2d_mlib_ImageCreate;
- j2d_mlib_ImageConvMxN;
- j2d_mlib_ImageAffine;
- j2d_mlib_ImageConvKernelConvert;
- local:
- *;
-};
diff --git a/jdk/make/sun/image/vis/FILES_c.gmk b/jdk/make/sun/image/vis/FILES_c.gmk
deleted file mode 100644
index 8f61ba6..0000000
--- a/jdk/make/sun/image/vis/FILES_c.gmk
+++ /dev/null
@@ -1,162 +0,0 @@
-#
-# Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-REQUIRED_NATIVE_FILES = \
- mlib_v_ImageLookUp.c \
-
-REQUIRED_SHARE_FILES = \
- mlib_ImageCreate.c \
- mlib_ImageAffine.c \
- mlib_ImageConvMxN.c \
- mlib_ImageConvKernelConvert.c \
-
-SYS_SHARE_FILES = \
- mlib_sys.c \
-
-RADIO_SHARE_FILES = \
- mlib_ImageLookUp_64.c \
- mlib_ImageLookUp_Bit.c \
- mlib_ImageColorTrue2Index.c \
- mlib_c_ImageThresh1_U8.c \
-
-
-RADIO_NATIVE_FILES = \
- mlib_v_ImageLookUpS16S16Func.c \
- mlib_v_ImageLookUpS16S32Func.c \
- mlib_v_ImageLookUpS16U16Func.c \
- mlib_v_ImageLookUpS16U8Func.c \
- mlib_v_ImageLookUpS32S16Func.c \
- mlib_v_ImageLookUpS32S32Func.c \
- mlib_v_ImageLookUpS32U16Func.c \
- mlib_v_ImageLookUpS32U8Func.c \
- mlib_v_ImageLookUpSIS16S16Func.c \
- mlib_v_ImageLookUpSIS16S32Func.c \
- mlib_v_ImageLookUpSIS16U16Func.c \
- mlib_v_ImageLookUpSIS16U8Func.c \
- mlib_v_ImageLookUpSIS32S16Func.c \
- mlib_v_ImageLookUpSIS32S32Func.c \
- mlib_v_ImageLookUpSIS32U16Func.c \
- mlib_v_ImageLookUpSIS32U8Func.c \
- mlib_v_ImageLookUpSIU16S16Func.c \
- mlib_v_ImageLookUpSIU16S32Func.c \
- mlib_v_ImageLookUpSIU16U16Func.c \
- mlib_v_ImageLookUpSIU16U8Func.c \
- mlib_v_ImageLookUpSIU8S16Func.c \
- mlib_v_ImageLookUpSIU8S32Func.c \
- mlib_v_ImageLookUpSIU8U16Func.c \
- mlib_v_ImageLookUpSIU8U8Func.c \
- mlib_v_ImageLookUpU16S16Func.c \
- mlib_v_ImageLookUpU16S32Func.c \
- mlib_v_ImageLookUpU16U16Func.c \
- mlib_v_ImageLookUpU16U8Func.c \
- mlib_v_ImageLookUpU8S16Func.c \
- mlib_v_ImageLookUpU8S32Func.c \
- mlib_v_ImageLookUpU8U16Func.c \
- mlib_v_ImageLookUpU8U8Func.c \
-
-GEOM_NATIVE_FILES = \
- mlib_v_ImageAffineIndex_BC.c \
- mlib_v_ImageAffine_BC.c \
- mlib_v_ImageAffine_BC_S16.c \
- mlib_v_ImageAffine_BC_U16.c \
- mlib_v_ImageAffine_BL.c \
- mlib_v_ImageAffine_BL_S16.c \
- mlib_v_ImageAffine_BL_U16.c \
- mlib_v_ImageAffine_NN.c \
- mlib_v_ImageFilters.c \
-
-GEOM_SHARE_FILES = \
- mlib_ImageAffineEdge.c \
- mlib_ImageAffine_BC_D64.c \
- mlib_ImageAffine_BC_F32.c \
- mlib_ImageAffine_BC_S32.c \
- mlib_ImageAffine_BL_D64.c \
- mlib_ImageAffine_BL_F32.c \
- mlib_ImageAffine_BL_S32.c \
- mlib_ImageAffine_NN.c \
- mlib_ImageAffine_NN_Bit.c \
- mlib_ImageFilters.c \
- mlib_ImageScanPoly.c \
-
-SPATIAL_SHARED_FILES = \
- mlib_ImageConv_8nw.c \
- mlib_ImageConv_8ext.c \
- mlib_ImageConv_16nw.c \
- mlib_ImageConv_16ext.c \
- mlib_ImageConv_u16nw.c \
- mlib_ImageConv_u16ext.c \
- mlib_ImageConv_32nw.c \
- mlib_ImageConv_F32nw.c \
- mlib_ImageConvMxN_Fp.c \
- mlib_ImageConvMxN_ext.c \
- mlib_ImageConv_D64nw.c \
- mlib_ImageClipping.c \
- mlib_ImageConvCopyEdge_Bit.c \
- mlib_ImageConvClearEdge_Bit.c \
- mlib_ImageConv2x2_f.c \
- mlib_ImageConvClearEdge_Fp.c \
-
-SPATIAL_NATIVE_FILES = \
- mlib_v_ImageConvMxN_8.c \
- mlib_v_ImageConvClearEdge.c \
- mlib_v_ImageConvCopyEdge.c \
- mlib_v_ImageConvMxN_8ext.c \
- mlib_v_ImageConvVersion.c \
- mlib_v_ImageConv_8nw.c \
- mlib_ImageConvCopyEdge_Fp.c \
-
-FORMAT_NATIVE_FILES = \
- mlib_v_ImageChannelInsert_1.c \
- mlib_v_ImageChannelExtract_43.c \
- mlib_v_ImageChannelExtract_1.c \
-
-COPY_SHARED_FILES = \
- mlib_ImageCopy_Bit.c \
-
-COPY_NATIVE_FILES = \
- mlib_v_ImageCopy_f.c \
-
-COMMON_SHARED_FILES = \
- mlib_ImageUtils.c \
- mlib_ImageDivTables.c \
-
-NATIVE_FILES = \
- $(REQUIRED_NATIVE_FILES) \
-
-FILES_c = \
- $(REQUIRED_NATIVE_FILES) \
- $(REQUIRED_SHARE_FILES) \
- $(RADIO_SHARE_FILES) \
- $(RADIO_NATIVE_FILES) \
- $(GEOM_NATIVE_FILES) \
- $(GEOM_SHARE_FILES) \
- $(SPATIAL_SHARED_FILES) \
- $(SPATIAL_NATIVE_FILES) \
- $(FORMAT_NATIVE_FILES) \
- $(SYS_SHARE_FILES) \
- $(COPY_SHARED_FILES) \
- $(COPY_NATIVE_FILES) \
- $(COMMON_SHARED_FILES) \
-
diff --git a/jdk/make/sun/image/vis/Makefile b/jdk/make/sun/image/vis/Makefile
deleted file mode 100644
index daa7722d8..0000000
--- a/jdk/make/sun/image/vis/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the VIS (solaris-only) version of medialib
-#
-BUILDDIR = ../../..
-PACKAGE = sun.awt.medialib
-LIBRARY = mlib_image_v
-PRODUCT = sun
-
-# Tell Defs.gmk we need VIS instructions
-VIS_NEEDED=true
-
-# Select highest level of optimization for this library
-OPTIMIZATION_LEVEL = HIGHEST
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Use generic mapfile
-#
-FILES_m = ../generic/mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-#
-# Files
-#
-include FILES_c.gmk
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Library.gmk
-
-vpath %.s $(PLATFORM_SRC)/native/sun/awt/medialib
-vpath %.c $(SHARE_SRC)/native/sun/awt/medialib
-
-#
-# set compile options for solaris 32- or 64-bit build
-#
-ASFLAGS += -P
-CFLAGS_sparcv9 = -DMLIB_OS64BIT
-INLINE = $(PLATFORM_SRC)/native/sun/awt/medialib/vis_$(ARCH_DATA_MODEL).il
-
-CFLAGS += $(CFLAGS_$(ARCH)) $(INLINE) -I$(PLATFORM_SRC)/native/sun/awt/medialib -I$(SHARE_SRC)/native/sun/awt/medialib
-
-OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
-OTHER_LDLIBS = $(LIBM) $(LIBDL)
-
diff --git a/jdk/make/sun/jar/Makefile b/jdk/make/sun/jar/Makefile
deleted file mode 100644
index e0f3a3d..0000000
--- a/jdk/make/sun/jar/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building jar utility.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.tools
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-# This program must contain a manifest that defines the execution level
-# needed to follow standard Vista User Access Control Guidelines
-# This must be set before Program.gmk is included
-#
-BUILD_MANIFEST=true
-
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = sun/tools/jar
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_COMPILED_PROPERTIES = sun/tools/jar/resources/jar.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/sun/javazic/Makefile b/jdk/make/sun/javazic/Makefile
deleted file mode 100644
index 9ae3c00..0000000
--- a/jdk/make/sun/javazic/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Makefile for building javazic utility & TimeZone resource files
-
-
-BUILDDIR = ../..
-PACKAGE = sun.javazic
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-# Time zone data file creation
-TZDATA = ./tzdata/
-TZDATA_VER := $(shell $(GREP) '^tzdata' $(TZDATA)VERSION)
-TZFILE = \
- africa antarctica asia australasia europe northamerica \
- pacificnew southamerica backward \
- etcetera systemv
-JDKTZDATA = ./tzdata_jdk/
-JDKTZFILES = gmt jdk11_backward
-TZFILES = \
- $(addprefix $(TZDATA),$(TZFILE)) \
- $(addprefix $(JDKTZDATA),$(JDKTZFILES))
-
-WORKDIR = $(TEMPDIR)/zi
-INSTALLDIR = $(LIBDIR)/zi
-MAPFILE = ZoneInfoMappings
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-# Add to the build rule
-build: $(INSTALLDIR)/$(MAPFILE)
-
-$(BUILDTOOLJARDIR)/javazic.jar:
- ($(CD) $(BUILDDIR)/tools/javazic && $(MAKE))
-
-$(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
- $(RM) -r $(@D)
- $(prep-target)
- $(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
- @$(java-vm-cleanup)
-
-$(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
- $(RM) -r $(@D)
- $(prep-target)
- $(CP) -r $(WORKDIR)/* $(@D)
-
-clean clobber::
- $(RM) -r $(TEMPDIR) $(INSTALLDIR)
diff --git a/jdk/make/sun/javazic/javatz/fullset.txt b/jdk/make/sun/javazic/javatz/fullset.txt
deleted file mode 100644
index ee9374d..0000000
--- a/jdk/make/sun/javazic/javatz/fullset.txt
+++ /dev/null
@@ -1,427 +0,0 @@
-#
-# Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-Africa/Abidjan
-Africa/Accra
-Africa/Addis_Ababa
-Africa/Algiers
-Africa/Asmera
-Africa/Bamako
-Africa/Bangui
-Africa/Banjul
-Africa/Bissau
-Africa/Blantyre
-Africa/Brazzaville
-Africa/Bujumbura
-Africa/Cairo
-Africa/Casablanca
-Africa/Ceuta
-Africa/Conakry
-Africa/Dakar
-Africa/Dar_es_Salaam
-Africa/Djibouti
-Africa/Douala
-Africa/El_Aaiun
-Africa/Freetown
-Africa/Gaborone
-Africa/Harare
-Africa/Johannesburg
-Africa/Kampala
-Africa/Khartoum
-Africa/Kigali
-Africa/Kinshasa
-Africa/Lagos
-Africa/Libreville
-Africa/Lome
-Africa/Luanda
-Africa/Lubumbashi
-Africa/Lusaka
-Africa/Malabo
-Africa/Maputo
-Africa/Maseru
-Africa/Mbabane
-Africa/Mogadishu
-Africa/Monrovia
-Africa/Nairobi
-Africa/Ndjamena
-Africa/Niamey
-Africa/Nouakchott
-Africa/Ouagadougou
-Africa/Porto-Novo
-Africa/Sao_Tome
-Africa/Timbuktu
-Africa/Tripoli
-Africa/Tunis
-Africa/Windhoek
-America/Adak
-America/Anchorage
-America/Anguilla
-America/Antigua
-America/Araguaina
-America/Aruba
-America/Asuncion
-America/Barbados
-America/Belem
-America/Belize
-America/Boa_Vista
-America/Bogota
-America/Boise
-America/Buenos_Aires
-America/Cambridge_Bay
-America/Cancun
-America/Caracas
-America/Catamarca
-America/Cayenne
-America/Cayman
-America/Chicago
-America/Chihuahua
-America/Cordoba
-America/Costa_Rica
-America/Cuiaba
-America/Curacao
-America/Dawson
-America/Dawson_Creek
-America/Denver
-America/Detroit
-America/Dominica
-America/Edmonton
-America/El_Salvador
-America/Fortaleza
-America/Glace_Bay
-America/Godthab
-America/Goose_Bay
-America/Grand_Turk
-America/Grenada
-America/Guadeloupe
-America/Guatemala
-America/Guayaquil
-America/Guyana
-America/Halifax
-America/Havana
-America/Hermosillo
-America/Indiana/Knox
-America/Indiana/Marengo
-America/Indiana/Vevay
-America/Indianapolis
-America/Inuvik
-America/Iqaluit
-America/Jamaica
-America/Jujuy
-America/Juneau
-America/La_Paz
-America/Lima
-America/Los_Angeles
-America/Louisville
-America/Maceio
-America/Managua
-America/Manaus
-America/Martinique
-America/Mazatlan
-America/Mendoza
-America/Menominee
-America/Mexico_City
-America/Miquelon
-America/Montevideo
-America/Montreal
-America/Montserrat
-America/Nassau
-America/New_York
-America/Nipigon
-America/Nome
-America/Noronha
-America/Panama
-America/Pangnirtung
-America/Paramaribo
-America/Phoenix
-America/Port-au-Prince
-America/Port_of_Spain
-America/Porto_Acre
-America/Porto_Velho
-America/Puerto_Rico
-America/Rainy_River
-America/Rankin_Inlet
-America/Regina
-America/Rosario
-America/Santiago
-America/Santo_Domingo
-America/Sao_Paulo
-America/Scoresbysund
-America/St_Johns
-America/St_Kitts
-America/St_Lucia
-America/St_Thomas
-America/St_Vincent
-America/Swift_Current
-America/Tegucigalpa
-America/Thule
-America/Thunder_Bay
-America/Tijuana
-America/Tortola
-America/Vancouver
-America/Whitehorse
-America/Winnipeg
-America/Yakutat
-America/Yellowknife
-Antarctica/Casey
-Antarctica/Davis
-Antarctica/DumontDUrville
-Antarctica/Mawson
-Antarctica/McMurdo
-Antarctica/Palmer
-Antarctica/Syowa
-Asia/Aden
-Asia/Almaty
-Asia/Amman
-Asia/Anadyr
-Asia/Aqtau
-Asia/Aqtobe
-Asia/Ashkhabad
-Asia/Baghdad
-Asia/Bahrain
-Asia/Baku
-Asia/Bangkok
-Asia/Beirut
-Asia/Bishkek
-Asia/Brunei
-Asia/Calcutta
-Asia/Chungking
-Asia/Colombo
-Asia/Dacca
-Asia/Damascus
-Asia/Dili
-Asia/Dubai
-Asia/Dushanbe
-Asia/Gaza
-Asia/Harbin
-Asia/Hong_Kong
-Asia/Hovd
-Asia/Irkutsk
-Asia/Jakarta
-Asia/Jayapura
-Asia/Jerusalem
-Asia/Kabul
-Asia/Kamchatka
-Asia/Karachi
-Asia/Kashgar
-Asia/Katmandu
-Asia/Krasnoyarsk
-Asia/Kuala_Lumpur
-Asia/Kuching
-Asia/Kuwait
-Asia/Macao
-Asia/Magadan
-Asia/Manila
-Asia/Muscat
-Asia/Nicosia
-Asia/Novosibirsk
-Asia/Omsk
-Asia/Phnom_Penh
-Asia/Pyongyang
-Asia/Qatar
-Asia/Rangoon
-Asia/Riyadh
-Asia/Riyadh87
-Asia/Riyadh88
-Asia/Riyadh89
-Asia/Saigon
-Asia/Samarkand
-Asia/Seoul
-Asia/Shanghai
-Asia/Singapore
-Asia/Taipei
-Asia/Tashkent
-Asia/Tbilisi
-Asia/Tehran
-Asia/Thimbu
-Asia/Tokyo
-Asia/Ujung_Pandang
-Asia/Ulaanbaatar
-Asia/Urumqi
-Asia/Vientiane
-Asia/Vladivostok
-Asia/Yakutsk
-Asia/Yekaterinburg
-Asia/Yerevan
-Atlantic/Azores
-Atlantic/Bermuda
-Atlantic/Canary
-Atlantic/Cape_Verde
-Atlantic/Faeroe
-Atlantic/Jan_Mayen
-Atlantic/Madeira
-Atlantic/Reykjavik
-Atlantic/South_Georgia
-Atlantic/St_Helena
-Atlantic/Stanley
-Australia/Adelaide
-Australia/Brisbane
-Australia/Broken_Hill
-Australia/Darwin
-Australia/Hobart
-Australia/Lindeman
-Australia/Lord_Howe
-Australia/Melbourne
-Australia/Perth
-Australia/Sydney
-CET
-EET
-Etc/GMT
-#Etc/GMT+1
-#Etc/GMT+10
-#Etc/GMT+11
-#Etc/GMT+12
-#Etc/GMT+2
-#Etc/GMT+3
-#Etc/GMT+4
-#Etc/GMT+5
-#Etc/GMT+6
-#Etc/GMT+7
-#Etc/GMT+8
-#Etc/GMT+9
-#Etc/GMT-1
-#Etc/GMT-10
-#Etc/GMT-11
-#Etc/GMT-12
-#Etc/GMT-13
-#Etc/GMT-14
-#Etc/GMT-2
-#Etc/GMT-3
-#Etc/GMT-4
-#Etc/GMT-5
-#Etc/GMT-6
-#Etc/GMT-7
-#Etc/GMT-8
-#Etc/GMT-9
-Etc/UCT
-Etc/UTC
-Europe/Amsterdam
-Europe/Andorra
-Europe/Athens
-Europe/Belfast
-Europe/Belgrade
-Europe/Berlin
-Europe/Brussels
-Europe/Bucharest
-Europe/Budapest
-Europe/Chisinau
-Europe/Copenhagen
-Europe/Dublin
-Europe/Gibraltar
-Europe/Helsinki
-Europe/Istanbul
-Europe/Kaliningrad
-Europe/Kiev
-Europe/Lisbon
-Europe/London
-Europe/Luxembourg
-Europe/Madrid
-Europe/Malta
-Europe/Minsk
-Europe/Monaco
-Europe/Moscow
-Europe/Oslo
-Europe/Paris
-Europe/Prague
-Europe/Riga
-Europe/Rome
-Europe/Samara
-Europe/Simferopol
-Europe/Sofia
-Europe/Stockholm
-Europe/Tallinn
-Europe/Tirane
-Europe/Tiraspol
-Europe/Uzhgorod
-Europe/Vaduz
-Europe/Vienna
-Europe/Vilnius
-Europe/Warsaw
-Europe/Zaporozhye
-Europe/Zurich
-GMT
-Indian/Antananarivo
-Indian/Chagos
-Indian/Christmas
-Indian/Cocos
-Indian/Comoro
-Indian/Kerguelen
-Indian/Mahe
-Indian/Maldives
-Indian/Mauritius
-Indian/Mayotte
-Indian/Reunion
-#MET
-Pacific/Apia
-Pacific/Auckland
-Pacific/Chatham
-Pacific/Easter
-Pacific/Efate
-Pacific/Enderbury
-Pacific/Fakaofo
-Pacific/Fiji
-Pacific/Funafuti
-Pacific/Galapagos
-Pacific/Gambier
-Pacific/Guadalcanal
-Pacific/Guam
-Pacific/Honolulu
-Pacific/Johnston
-Pacific/Kiritimati
-Pacific/Kosrae
-Pacific/Kwajalein
-Pacific/Majuro
-Pacific/Marquesas
-Pacific/Midway
-Pacific/Nauru
-Pacific/Niue
-Pacific/Norfolk
-Pacific/Noumea
-Pacific/Pago_Pago
-Pacific/Palau
-Pacific/Pitcairn
-Pacific/Ponape
-Pacific/Port_Moresby
-Pacific/Rarotonga
-Pacific/Saipan
-Pacific/Tahiti
-Pacific/Tarawa
-Pacific/Tongatapu
-Pacific/Truk
-Pacific/Wake
-Pacific/Wallis
-Pacific/Yap
-SystemV/AST4
-SystemV/AST4ADT
-SystemV/CST6
-SystemV/CST6CDT
-SystemV/EST5
-SystemV/EST5EDT
-SystemV/HST10
-SystemV/MST7
-SystemV/MST7MDT
-SystemV/PST8
-SystemV/PST8PDT
-SystemV/YST9
-SystemV/YST9YDT
-WET
diff --git a/jdk/make/sun/javazic/javatz/java_11_ids.txt b/jdk/make/sun/javazic/javatz/java_11_ids.txt
deleted file mode 100644
index cbc16a3..0000000
--- a/jdk/make/sun/javazic/javatz/java_11_ids.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-# Time zone IDs of JDK1.1.x
-#
-Australia/Darwin
-ACT
-Australia/Sydney
-AET
-America/Buenos_Aires
-AGT
-Africa/Cairo
-ART
-America/Anchorage
-AST
-America/Sao_Paulo
-BET
-Asia/Dacca
-BST
-Africa/Harare
-CAT
-America/St_Johns
-CNT
-America/Chicago
-CST
-Asia/Shanghai
-CTT
-Africa/Addis_Ababa
-EAT
-Europe/Paris
-ECT
-America/New_York
-EST
-Pacific/Honolulu
-HST
-America/Indianapolis
-IET
-Asia/Calcutta
-IST
-Asia/Tokyo
-JST
-Pacific/Apia
-MIT
-America/Denver
-MST
-Asia/Yerevan
-NET
-Pacific/Auckland
-NST
-Asia/Karachi
-PLT
-America/Phoenix
-PNT
-America/Puerto_Rico
-PRT
-America/Los_Angeles
-PST
-Pacific/Guadalcanal
-SST
-Asia/Saigon
-VST
-GMT
-UTC
-Asia/Tehran
-MET
diff --git a/jdk/make/sun/javazic/javatz/java_us_ids.txt b/jdk/make/sun/javazic/javatz/java_us_ids.txt
deleted file mode 100644
index 991bdd4..0000000
--- a/jdk/make/sun/javazic/javatz/java_us_ids.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-# U.S. and Canada zone IDs
-#
-# United States
-America/New_York
-EST
-America/Chicago
-CST
-America/Denver
-MST
-America/Los_Angeles
-PST
-America/Anchorage
-AST
-America/Adak
-Pacific/Honolulu
-HST
-America/Phoenix
-PNT
-America/Indianapolis
-IET
-#"Atlantic time zone - Puerto Rico & Virgin Islands, no Daylight Saving"
-America/Caracas
-America/Puerto_Rico
-PRT
-America/St_Thomas
-#"Samoa time zone - American Samoa, no Daylight Saving"
-Pacific/Pago_Pago
-# Pacific Territories
-Pacific/Kosrae
-Pacific/Ponape
-Pacific/Palau
-Pacific/Guam
-Pacific/Kwajalein
-# Canada
-America/St_Johns
-CNT
-America/Halifax
-America/Montreal
-America/Winnipeg
-America/Regina
-
-GMT
-UTC
diff --git a/jdk/make/sun/javazic/javatz/java_win_ids.txt b/jdk/make/sun/javazic/javatz/java_win_ids.txt
deleted file mode 100644
index bdacce4..0000000
--- a/jdk/make/sun/javazic/javatz/java_win_ids.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-Africa/Cairo
-Africa/Harare
-Africa/Nairobi
-America/Anchorage
-America/Bogota
-America/Buenos_Aires
-America/Caracas
-America/Chicago
-America/Denver
-America/Halifax
-America/Indianapolis
-America/Los_Angeles
-America/Mexico_City
-America/New_York
-America/Phoenix
-America/Regina
-America/Sao_Paulo
-America/St_Johns
-Asia/Bangkok
-Asia/Calcutta
-Asia/Colombo
-Asia/Dacca
-Asia/Jerusalem
-Asia/Kabul
-Asia/Karachi
-Asia/Muscat
-Asia/Riyadh
-Asia/Seoul
-Asia/Shanghai
-Asia/Singapore
-Asia/Taipei
-Asia/Tbilisi
-Asia/Tehran
-Asia/Tokyo
-Asia/Vladivostok
-Asia/Yakutsk
-Asia/Yekaterinburg
-Atlantic/Azores
-Atlantic/South_Georgia
-Australia/Adelaide
-Australia/Brisbane
-Australia/Darwin
-Australia/Hobart
-Australia/Perth
-Australia/Sydney
-Europe/Athens
-Europe/Belgrade
-Europe/Berlin
-Europe/Bucharest
-Europe/Helsinki
-Europe/London
-Europe/Moscow
-Europe/Paris
-Europe/Prague
-Europe/Warsaw
-GMT
-Pacific/Apia
-Pacific/Auckland
-Pacific/Fiji
-Pacific/Guadalcanal
-Pacific/Guam
-Pacific/Honolulu
-Pacific/Majuro
-ACT
-AET
-AGT
-ART
-AST
-BET
-BST
-CAT
-CNT
-CST
-CTT
-EAT
-ECT
-EST
-HST
-IET
-IST
-JST
-MIT
-MST
-NET
-NST
-PLT
-PNT
-PRT
-PST
-SST
-VST
-UTC
-MET
diff --git a/jdk/make/sun/javazic/javatz/java_zone_ids.txt b/jdk/make/sun/javazic/javatz/java_zone_ids.txt
deleted file mode 100644
index 0e6995d..0000000
--- a/jdk/make/sun/javazic/javatz/java_zone_ids.txt
+++ /dev/null
@@ -1,356 +0,0 @@
-#
-# Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-ACT
-AET
-AGT
-ART
-AST
-Africa/Abidjan
-Africa/Accra
-Africa/Addis_Ababa
-Africa/Algiers
-Africa/Asmera
-Africa/Bamako
-Africa/Bangui
-Africa/Banjul
-Africa/Bissau
-Africa/Blantyre
-Africa/Bujumbura
-Africa/Cairo
-Africa/Casablanca
-Africa/Conakry
-Africa/Dakar
-Africa/Dar_es_Salaam
-Africa/Djibouti
-Africa/Douala
-Africa/Freetown
-Africa/Gaborone
-Africa/Harare
-Africa/Johannesburg
-Africa/Kampala
-Africa/Khartoum
-Africa/Kigali
-Africa/Kinshasa
-Africa/Lagos
-Africa/Libreville
-Africa/Lome
-Africa/Luanda
-Africa/Lubumbashi
-Africa/Lusaka
-Africa/Malabo
-Africa/Maputo
-Africa/Maseru
-Africa/Mbabane
-Africa/Mogadishu
-Africa/Monrovia
-Africa/Nairobi
-Africa/Ndjamena
-Africa/Niamey
-Africa/Nouakchott
-Africa/Ouagadougou
-Africa/Porto-Novo
-Africa/Sao_Tome
-Africa/Timbuktu
-Africa/Tripoli
-Africa/Tunis
-Africa/Windhoek
-America/Adak
-America/Anchorage
-America/Anguilla
-America/Antigua
-America/Argentina/Buenos_Aires
-America/Aruba
-America/Asuncion
-America/Barbados
-America/Belize
-America/Bogota
-America/Buenos_Aires
-America/Caracas
-America/Cayenne
-America/Cayman
-America/Chicago
-America/Costa_Rica
-America/Cuiaba
-America/Curacao
-America/Dawson_Creek
-America/Denver
-America/Dominica
-America/Edmonton
-America/El_Salvador
-America/Fortaleza
-America/Godthab
-America/Grand_Turk
-America/Grenada
-America/Guadeloupe
-America/Guatemala
-America/Guayaquil
-America/Guyana
-America/Halifax
-America/Havana
-America/Indiana/Indianapolis
-America/Indianapolis
-America/Jamaica
-America/La_Paz
-America/Lima
-America/Los_Angeles
-America/Managua
-America/Manaus
-America/Martinique
-America/Mazatlan
-America/Mexico_City
-America/Miquelon
-America/Montevideo
-America/Montreal
-America/Montserrat
-America/Nassau
-America/New_York
-America/Noronha
-America/Panama
-America/Paramaribo
-America/Phoenix
-America/Port-au-Prince
-America/Port_of_Spain
-America/Porto_Acre
-America/Rio_Branco
-America/Puerto_Rico
-America/Regina
-America/Santiago
-America/Santo_Domingo
-America/Sao_Paulo
-America/Scoresbysund
-America/St_Johns
-America/St_Kitts
-America/St_Lucia
-America/St_Thomas
-America/St_Vincent
-America/Tegucigalpa
-America/Thule
-America/Tijuana
-America/Tortola
-America/Vancouver
-America/Winnipeg
-Antarctica/Casey
-Antarctica/DumontDUrville
-Antarctica/Mawson
-Antarctica/McMurdo
-Antarctica/Palmer
-Asia/Aden
-Asia/Almaty
-Asia/Amman
-Asia/Anadyr
-Asia/Aqtau
-Asia/Aqtobe
-Asia/Ashgabat
-Asia/Ashkhabad
-Asia/Baghdad
-Asia/Bahrain
-Asia/Baku
-Asia/Bangkok
-Asia/Beirut
-Asia/Bishkek
-Asia/Brunei
-Asia/Calcutta
-Asia/Colombo
-Asia/Dacca
-Asia/Dhaka
-Asia/Damascus
-Asia/Dubai
-Asia/Dushanbe
-Asia/Hong_Kong
-Asia/Irkutsk
-Asia/Jakarta
-Asia/Jayapura
-Asia/Jerusalem
-Asia/Kabul
-Asia/Kamchatka
-Asia/Karachi
-Asia/Katmandu
-Asia/Krasnoyarsk
-Asia/Kuala_Lumpur
-Asia/Kuwait
-Asia/Macao
-Asia/Macau
-Asia/Magadan
-Asia/Makassar
-Asia/Manila
-Asia/Muscat
-Asia/Nicosia
-Asia/Novosibirsk
-Asia/Phnom_Penh
-Asia/Pyongyang
-Asia/Qatar
-Asia/Rangoon
-Asia/Riyadh
-Asia/Saigon
-Asia/Seoul
-Asia/Shanghai
-Asia/Singapore
-Asia/Taipei
-Asia/Tashkent
-Asia/Tbilisi
-Asia/Tehran
-Asia/Thimbu
-Asia/Thimphu
-Asia/Tokyo
-Asia/Ujung_Pandang
-Asia/Ulan_Bator
-Asia/Ulaanbaatar
-Asia/Vientiane
-Asia/Vladivostok
-Asia/Yakutsk
-Asia/Yekaterinburg
-Asia/Yerevan
-Atlantic/Azores
-Atlantic/Bermuda
-Atlantic/Canary
-Atlantic/Cape_Verde
-Atlantic/Faeroe
-Atlantic/Jan_Mayen
-Atlantic/Reykjavik
-Atlantic/South_Georgia
-Atlantic/St_Helena
-Atlantic/Stanley
-Australia/Adelaide
-Australia/Brisbane
-Australia/Broken_Hill
-Australia/Darwin
-Australia/Hobart
-Australia/Lord_Howe
-Australia/Perth
-Australia/Sydney
-BET
-BST
-CAT
-CNT
-CST
-CTT
-EAT
-ECT
-EET
-EST
-Europe/Amsterdam
-Europe/Andorra
-Europe/Athens
-Europe/Belgrade
-Europe/Berlin
-Europe/Brussels
-Europe/Bucharest
-Europe/Budapest
-Europe/Chisinau
-Europe/Copenhagen
-Europe/Dublin
-Europe/Gibraltar
-Europe/Helsinki
-Europe/Istanbul
-Europe/Kaliningrad
-Europe/Kiev
-Europe/Lisbon
-Europe/London
-Europe/Luxembourg
-Europe/Madrid
-Europe/Malta
-Europe/Minsk
-Europe/Monaco
-Europe/Moscow
-Europe/Oslo
-Europe/Paris
-Europe/Prague
-Europe/Riga
-Europe/Rome
-Europe/Samara
-Europe/Simferopol
-Europe/Sofia
-Europe/Stockholm
-Europe/Tallinn
-Europe/Tirane
-Europe/Vaduz
-Europe/Vienna
-Europe/Vilnius
-Europe/Warsaw
-Europe/Zurich
-GMT
-HST
-IET
-IST
-Indian/Antananarivo
-Indian/Chagos
-Indian/Christmas
-Indian/Cocos
-Indian/Comoro
-Indian/Kerguelen
-Indian/Mahe
-Indian/Maldives
-Indian/Mauritius
-Indian/Mayotte
-Indian/Reunion
-JST
-#MET
-MIT
-MST
-NET
-NST
-PLT
-PNT
-PRT
-PST
-Pacific/Apia
-Pacific/Auckland
-Pacific/Chatham
-Pacific/Easter
-Pacific/Efate
-Pacific/Enderbury
-Pacific/Fakaofo
-Pacific/Fiji
-Pacific/Funafuti
-Pacific/Galapagos
-Pacific/Gambier
-Pacific/Guadalcanal
-Pacific/Guam
-Pacific/Honolulu
-Pacific/Kiritimati
-Pacific/Kosrae
-Pacific/Majuro
-Pacific/Marquesas
-Pacific/Nauru
-Pacific/Niue
-Pacific/Norfolk
-Pacific/Noumea
-Pacific/Pago_Pago
-Pacific/Palau
-Pacific/Pitcairn
-Pacific/Ponape
-Pacific/Port_Moresby
-Pacific/Rarotonga
-Pacific/Saipan
-Pacific/Tahiti
-Pacific/Tarawa
-Pacific/Tongatapu
-Pacific/Truk
-Pacific/Wake
-Pacific/Wallis
-SST
-UTC
-VST
-WET
diff --git a/jdk/make/sun/javazic/javatz/jdk1.1.x_zone_ids.txt b/jdk/make/sun/javazic/javatz/jdk1.1.x_zone_ids.txt
deleted file mode 100644
index d3ee13a..0000000
--- a/jdk/make/sun/javazic/javatz/jdk1.1.x_zone_ids.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-# Olson time zone IDs used as of JDK1.1.8
-#
-Pacific/Apia
-Pacific/Honolulu
-America/Anchorage
-America/Los_Angeles
-America/Phoenix
-America/Denver
-America/Chicago
-America/Indianapolis
-America/New_York
-America/Caracas
-America/Halifax
-America/St_Johns
-America/Buenos_Aires
-America/Sao_Paulo
-Atlantic/Cape_Verde
-Atlantic/Azores
-Africa/Casablanca
-Europe/Paris
-Europe/Istanbul
-Africa/Cairo
-Asia/Riyadh
-Asia/Tehran
-Asia/Yerevan
-Asia/Karachi
-Asia/Calcutta
-Asia/Dacca
-Asia/Bangkok
-Asia/Shanghai
-Asia/Tokyo
-Australia/Darwin
-Australia/Adelaide
-Australia/Sydney
-Pacific/Guadalcanal
-Pacific/Fiji
-Pacific/Auckland
diff --git a/jdk/make/sun/javazic/tzdata/VERSION b/jdk/make/sun/javazic/tzdata/VERSION
deleted file mode 100644
index ea1c49a..0000000
--- a/jdk/make/sun/javazic/tzdata/VERSION
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-tzdata2013g
diff --git a/jdk/make/sun/javazic/tzdata/africa b/jdk/make/sun/javazic/tzdata/africa
deleted file mode 100644
index 19bc98a..0000000
--- a/jdk/make/sun/javazic/tzdata/africa
+++ /dev/null
@@ -1,1298 +0,0 @@
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-# <pre>
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# This data is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).
-
-# From Paul Eggert (2013-02-21):
-#
-# A good source for time zone historical data outside the U.S. is
-# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
-# San Diego: ACS Publications, Inc. (2003).
-#
-# Gwillim Law writes that a good source
-# for recent time zone data is the International Air Transport
-# Association's Standard Schedules Information Manual (IATA SSIM),
-# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
-#
-# Another source occasionally used is Edward W. Whitman, World Time Differences,
-# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
-# I found in the UCLA library.
-#
-# For data circa 1899, a common source is:
-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
-# <http://www.jstor.org/stable/1774359>.
-#
-# A reliable and entertaining source about time zones is
-# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
-#
-# Previous editions of this database used WAT, CAT, SAT, and EAT
-# for +0:00 through +3:00, respectively,
-# but Mark R V Murray reports that
-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
-# `WAT' is probably the best name for +1:00, as the common phrase for
-# the area that includes Nigeria is ``West Africa''.
-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
-#
-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
-# I'd guess that this was because people needed _some_ name for -1:00,
-# and at the time, far west Africa was the only major land area in -1:00.
-# This usage is now obsolete, as the last use of -1:00 on the African
-# mainland seems to have been 1976 in Western Sahara.
-#
-# To summarize, the following abbreviations seem to have some currency:
-# -1:00 WAT West Africa Time (no longer used)
-# 0:00 GMT Greenwich Mean Time
-# 2:00 CAT Central Africa Time
-# 2:00 SAST South Africa Standard Time
-# and Murray suggests the following abbreviation:
-# 1:00 WAT West Africa Time
-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
-# for times before 1976, but this is the best I can think of
-# until we get more information.
-#
-# I invented the following abbreviations; corrections are welcome!
-# 2:00 WAST West Africa Summer Time
-# 2:30 BEAT British East Africa Time (no longer used)
-# 2:45 BEAUT British East Africa Unified Time (no longer used)
-# 3:00 CAST Central Africa Summer Time (no longer used)
-# 3:00 SAST South Africa Summer Time (no longer used)
-# 3:00 EAT East Africa Time
-# 4:00 EAST East Africa Summer Time (no longer used)
-
-# Algeria
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Algeria 1916 only - Jun 14 23:00s 1:00 S
-Rule Algeria 1916 1919 - Oct Sun>=1 23:00s 0 -
-Rule Algeria 1917 only - Mar 24 23:00s 1:00 S
-Rule Algeria 1918 only - Mar 9 23:00s 1:00 S
-Rule Algeria 1919 only - Mar 1 23:00s 1:00 S
-Rule Algeria 1920 only - Feb 14 23:00s 1:00 S
-Rule Algeria 1920 only - Oct 23 23:00s 0 -
-Rule Algeria 1921 only - Mar 14 23:00s 1:00 S
-Rule Algeria 1921 only - Jun 21 23:00s 0 -
-Rule Algeria 1939 only - Sep 11 23:00s 1:00 S
-Rule Algeria 1939 only - Nov 19 1:00 0 -
-Rule Algeria 1944 1945 - Apr Mon>=1 2:00 1:00 S
-Rule Algeria 1944 only - Oct 8 2:00 0 -
-Rule Algeria 1945 only - Sep 16 1:00 0 -
-Rule Algeria 1971 only - Apr 25 23:00s 1:00 S
-Rule Algeria 1971 only - Sep 26 23:00s 0 -
-Rule Algeria 1977 only - May 6 0:00 1:00 S
-Rule Algeria 1977 only - Oct 21 0:00 0 -
-Rule Algeria 1978 only - Mar 24 1:00 1:00 S
-Rule Algeria 1978 only - Sep 22 3:00 0 -
-Rule Algeria 1980 only - Apr 25 0:00 1:00 S
-Rule Algeria 1980 only - Oct 31 2:00 0 -
-# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
-# more precise 0:09:21.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- 0:00 Algeria WE%sT 1940 Feb 25 2:00
- 1:00 Algeria CE%sT 1946 Oct 7
- 0:00 - WET 1956 Jan 29
- 1:00 - CET 1963 Apr 14
- 0:00 Algeria WE%sT 1977 Oct 21
- 1:00 Algeria CE%sT 1979 Oct 26
- 0:00 Algeria WE%sT 1981 May
- 1:00 - CET
-
-# Angola
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Luanda 0:52:56 - LMT 1892
- 0:52:04 - AOT 1911 May 26 # Angola Time
- 1:00 - WAT
-
-# Benin
-# Whitman says they switched to 1:00 in 1946, not 1934;
-# go with Shanks & Pottenger.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Porto-Novo 0:10:28 - LMT 1912
- 0:00 - GMT 1934 Feb 26
- 1:00 - WAT
-
-# Botswana
-# From Paul Eggert (2013-02-21):
-# Milne says they were regulated by the Cape Town Signal in 1899;
-# assume they switched to 2:00 when Cape Town did.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Gaborone 1:43:40 - LMT 1885
- 1:30 - SAST 1903 Mar
- 2:00 - CAT 1943 Sep 19 2:00
- 2:00 1:00 CAST 1944 Mar 19 2:00
- 2:00 - CAT
-
-# Burkina Faso
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Ouagadougou -0:06:04 - LMT 1912
- 0:00 - GMT
-
-# Burundi
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Bujumbura 1:57:28 - LMT 1890
- 2:00 - CAT
-
-# Cameroon
-# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Douala 0:38:48 - LMT 1912
- 1:00 - WAT
-
-# Cape Verde
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Atlantic/Cape_Verde -1:34:04 - LMT 1907 # Praia
- -2:00 - CVT 1942 Sep
- -2:00 1:00 CVST 1945 Oct 15
- -2:00 - CVT 1975 Nov 25 2:00
- -1:00 - CVT
-
-# Central African Republic
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Bangui 1:14:20 - LMT 1912
- 1:00 - WAT
-
-# Chad
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Ndjamena 1:00:12 - LMT 1912
- 1:00 - WAT 1979 Oct 14
- 1:00 1:00 WAST 1980 Mar 8
- 1:00 - WAT
-
-# Comoros
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro
- 3:00 - EAT
-
-# Democratic Republic of Congo
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Kinshasa 1:01:12 - LMT 1897 Nov 9
- 1:00 - WAT
-Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9
- 2:00 - CAT
-
-# Republic of the Congo
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Brazzaville 1:01:08 - LMT 1912
- 1:00 - WAT
-
-# Cote D'Ivoire
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Abidjan -0:16:08 - LMT 1912
- 0:00 - GMT
-
-# Djibouti
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul
- 3:00 - EAT
-
-###############################################################################
-
-# Egypt
-
-# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh
-# observatory; round to nearest. Milne also says that the official time for
-# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
-# did not apply to Cairo, Alexandria, or Port Said.
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Egypt 1940 only - Jul 15 0:00 1:00 S
-Rule Egypt 1940 only - Oct 1 0:00 0 -
-Rule Egypt 1941 only - Apr 15 0:00 1:00 S
-Rule Egypt 1941 only - Sep 16 0:00 0 -
-Rule Egypt 1942 1944 - Apr 1 0:00 1:00 S
-Rule Egypt 1942 only - Oct 27 0:00 0 -
-Rule Egypt 1943 1945 - Nov 1 0:00 0 -
-Rule Egypt 1945 only - Apr 16 0:00 1:00 S
-Rule Egypt 1957 only - May 10 0:00 1:00 S
-Rule Egypt 1957 1958 - Oct 1 0:00 0 -
-Rule Egypt 1958 only - May 1 0:00 1:00 S
-Rule Egypt 1959 1981 - May 1 1:00 1:00 S
-Rule Egypt 1959 1965 - Sep 30 3:00 0 -
-Rule Egypt 1966 1994 - Oct 1 3:00 0 -
-Rule Egypt 1982 only - Jul 25 1:00 1:00 S
-Rule Egypt 1983 only - Jul 12 1:00 1:00 S
-Rule Egypt 1984 1988 - May 1 1:00 1:00 S
-Rule Egypt 1989 only - May 6 1:00 1:00 S
-Rule Egypt 1990 1994 - May 1 1:00 1:00 S
-# IATA (after 1990) says transitions are at 0:00.
-# Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29.
-
-# From Alexander Krivenyshev (2011-04-20):
-# "...Egypt's interim cabinet decided on Wednesday to cancel daylight
-# saving time after a poll posted on its website showed the majority of
-# Egyptians would approve the cancellation."
-#
-# Egypt to cancel daylight saving time
-# <a href="http://www.almasryalyoum.com/en/node/407168">
-# http://www.almasryalyoum.com/en/node/407168
-# </a>
-# or
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt04.html">
-# http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
-# </a>
-Rule Egypt 1995 2010 - Apr lastFri 0:00s 1:00 S
-Rule Egypt 1995 2005 - Sep lastThu 23:00s 0 -
-# From Steffen Thorsen (2006-09-19):
-# The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
-# Egypt will turn back clocks by one hour at the midnight of Thursday
-# after observing the daylight saving time since May.
-# http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule Egypt 2006 only - Sep 21 23:00s 0 -
-# From Dirk Losch (2007-08-14):
-# I received a mail from an airline which says that the daylight
-# saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
-# http://www.nentjes.info/Bill/bill5.htm
-# http://www.timeanddate.com/worldclock/city.html?n=53
-# From Steffen Thorsen (2007-09-04): The official information...:
-# http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
-Rule Egypt 2007 only - Sep Thu>=1 23:00s 0 -
-# From Abdelrahman Hassan (2007-09-06):
-# Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
-# than the year of the Gregorian calendar, Ramadan shifts earlier each
-# year. This year it will be observed September 13 (September is quite
-# hot in Egypt), and the idea is to make fasting easier for workers by
-# shifting business hours one hour out of daytime heat. Consequently,
-# unless discontinued, next DST may end Thursday 28 August 2008.
-# From Paul Eggert (2007-08-17):
-# For lack of better info, assume the new rule is last Thursday in August.
-
-# From Petr Machata (2009-04-06):
-# The following appeared in Red Hat bugzilla[1] (edited):
-#
-# > $ zdump -v /usr/share/zoneinfo/Africa/Cairo | grep 2009
-# > /usr/share/zoneinfo/Africa/Cairo Thu Apr 23 21:59:59 2009 UTC = Thu =
-# Apr 23
-# > 23:59:59 2009 EET isdst=0 gmtoff=7200
-# > /usr/share/zoneinfo/Africa/Cairo Thu Apr 23 22:00:00 2009 UTC = Fri =
-# Apr 24
-# > 01:00:00 2009 EEST isdst=1 gmtoff=10800
-# > /usr/share/zoneinfo/Africa/Cairo Thu Aug 27 20:59:59 2009 UTC = Thu =
-# Aug 27
-# > 23:59:59 2009 EEST isdst=1 gmtoff=10800
-# > /usr/share/zoneinfo/Africa/Cairo Thu Aug 27 21:00:00 2009 UTC = Thu =
-# Aug 27
-# > 23:00:00 2009 EET isdst=0 gmtoff=7200
-#
-# > end date should be Thu Sep 24 2009 (Last Thursday in September at 23:59=
-# :59)
-# > http://support.microsoft.com/kb/958729/
-#
-# timeanddate[2] and another site I've found[3] also support that.
-#
-# [1] <a href="https://bugzilla.redhat.com/show_bug.cgi?id=492263">
-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# </a>
-# [2] <a href="http://www.timeanddate.com/worldclock/clockchange.html?n=53">
-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# </a>
-# [3] <a href="http://wwp.greenwichmeantime.com/time-zone/africa/egypt/">
-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-# </a>
-
-# From Arthur David Olson (2009-04-20):
-# In 2009 (and for the next several years), Ramadan ends before the fourth
-# Thursday in September; Egypt is expected to revert to the last Thursday
-# in September.
-
-# From Steffen Thorsen (2009-08-11):
-# We have been able to confirm the August change with the Egyptian Cabinet
-# Information and Decision Support Center:
-# <a href="http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html">
-# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-# </a>
-#
-# The Middle East News Agency
-# <a href="http://www.mena.org.eg/index.aspx">
-# http://www.mena.org.eg/index.aspx
-# </a>
-# also reports "Egypt starts winter time on August 21"
-# today in article numbered "71, 11/08/2009 12:25 GMT."
-# Only the title above is available without a subscription to their service,
-# and can be found by searching for "winter" in their search engine
-# (at least today).
-
-# From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
-# decided that Daylight Saving Time will not be used in Egypt during
-# Ramadan.
-#
-# Arabic translation:
-# "Clocks to go back during Ramadan--and then forward again"
-# <a href="http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again">
-# http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# </a>
-# or
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt02.html">
-# http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
-# </a>
-
-Rule Egypt 2008 only - Aug lastThu 23:00s 0 -
-Rule Egypt 2009 only - Aug 20 23:00s 0 -
-Rule Egypt 2010 only - Aug 11 0:00 0 -
-Rule Egypt 2010 only - Sep 10 0:00 1:00 S
-Rule Egypt 2010 only - Sep lastThu 23:00s 0 -
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
- 2:00 Egypt EE%sT
-
-# Equatorial Guinea
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Malabo 0:35:08 - LMT 1912
- 0:00 - GMT 1963 Dec 15
- 1:00 - WAT
-
-# Eritrea
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Asmara 2:35:32 - LMT 1870
- 2:35:32 - AMT 1890 # Asmara Mean Time
- 2:35:20 - ADMT 1936 May 5 # Adis Dera MT
- 3:00 - EAT
-
-# Ethiopia
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
-# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
-# We'll guess that 38E50 is for Adis Dera.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Addis_Ababa 2:34:48 - LMT 1870
- 2:35:20 - ADMT 1936 May 5 # Adis Dera MT
- 3:00 - EAT
-
-# Gabon
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Libreville 0:37:48 - LMT 1912
- 1:00 - WAT
-
-# Gambia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Banjul -1:06:36 - LMT 1912
- -1:06:36 - BMT 1935 # Banjul Mean Time
- -1:00 - WAT 1964
- 0:00 - GMT
-
-# Ghana
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-# Whitman says DST was observed from 1931 to ``the present'';
-# go with Shanks & Pottenger.
-Rule Ghana 1936 1942 - Sep 1 0:00 0:20 GHST
-Rule Ghana 1936 1942 - Dec 31 0:00 0 GMT
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Accra -0:00:52 - LMT 1918
- 0:00 Ghana %s
-
-# Guinea
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Conakry -0:54:52 - LMT 1912
- 0:00 - GMT 1934 Feb 26
- -1:00 - WAT 1960
- 0:00 - GMT
-
-# Guinea-Bissau
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Bissau -1:02:20 - LMT 1911 May 26
- -1:00 - WAT 1975
- 0:00 - GMT
-
-# Kenya
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Nairobi 2:27:16 - LMT 1928 Jul
- 3:00 - EAT 1930
- 2:30 - BEAT 1940
- 2:45 - BEAUT 1960
- 3:00 - EAT
-
-# Lesotho
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Maseru 1:50:00 - LMT 1903 Mar
- 2:00 - SAST 1943 Sep 19 2:00
- 2:00 1:00 SAST 1944 Mar 19 2:00
- 2:00 - SAST
-
-# Liberia
-# From Paul Eggert (2006-03-22):
-# In 1972 Liberia was the last country to switch
-# from a UTC offset that was not a multiple of 15 or 20 minutes.
-# Howse reports that it was in honor of their president's birthday.
-# Shank & Pottenger report the date as May 1, whereas Howse reports Jan;
-# go with Shanks & Pottenger.
-# For Liberia before 1972, Shanks & Pottenger report -0:44, whereas Howse and
-# Whitman each report -0:44:30; go with the more precise figure.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Monrovia -0:43:08 - LMT 1882
- -0:43:08 - MMT 1919 Mar # Monrovia Mean Time
- -0:44:30 - LRT 1972 May # Liberia Time
- 0:00 - GMT
-
-###############################################################################
-
-# Libya
-
-# From Even Scharning (2012-11-10):
-# Libya set their time one hour back at 02:00 on Saturday November 10.
-# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
-# Here is an official source [in Arabic]: http://ls.ly/fb6Yc
-#
-# Steffen Thorsen forwarded a translation (2012-11-10) in
-# http://mm.icann.org/pipermail/tz/2012-November/018451.html
-#
-# From Tim Parenti (2012-11-11):
-# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1.
-# The DST rules planned for 2013 and onward roughly mirror those of Europe
-# (either two days before them or five days after them, so as to fall on
-# lastFri instead of lastSun).
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Libya 1951 only - Oct 14 2:00 1:00 S
-Rule Libya 1952 only - Jan 1 0:00 0 -
-Rule Libya 1953 only - Oct 9 2:00 1:00 S
-Rule Libya 1954 only - Jan 1 0:00 0 -
-Rule Libya 1955 only - Sep 30 0:00 1:00 S
-Rule Libya 1956 only - Jan 1 0:00 0 -
-Rule Libya 1982 1984 - Apr 1 0:00 1:00 S
-Rule Libya 1982 1985 - Oct 1 0:00 0 -
-Rule Libya 1985 only - Apr 6 0:00 1:00 S
-Rule Libya 1986 only - Apr 4 0:00 1:00 S
-Rule Libya 1986 only - Oct 3 0:00 0 -
-Rule Libya 1987 1989 - Apr 1 0:00 1:00 S
-Rule Libya 1987 1989 - Oct 1 0:00 0 -
-Rule Libya 1997 only - Apr 4 0:00 1:00 S
-Rule Libya 1997 only - Oct 4 0:00 0 -
-Rule Libya 2013 max - Mar lastFri 1:00 1:00 S
-Rule Libya 2013 max - Oct lastFri 2:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Tripoli 0:52:44 - LMT 1920
- 1:00 Libya CE%sT 1959
- 2:00 - EET 1982
- 1:00 Libya CE%sT 1990 May 4
-# The 1996 and 1997 entries are from Shanks & Pottenger;
-# the IATA SSIM data contain some obvious errors.
- 2:00 - EET 1996 Sep 30
- 1:00 Libya CE%sT 1997 Oct 4
- 2:00 - EET 2012 Nov 10 2:00
- 1:00 Libya CE%sT
-
-# Madagascar
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Antananarivo 3:10:04 - LMT 1911 Jul
- 3:00 - EAT 1954 Feb 27 23:00s
- 3:00 1:00 EAST 1954 May 29 23:00s
- 3:00 - EAT
-
-# Malawi
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar
- 2:00 - CAT
-
-# Mali
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Bamako -0:32:00 - LMT 1912
- 0:00 - GMT 1934 Feb 26
- -1:00 - WAT 1960 Jun 20
- 0:00 - GMT
-
-# Mauritania
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Nouakchott -1:03:48 - LMT 1912
- 0:00 - GMT 1934 Feb 26
- -1:00 - WAT 1960 Nov 28
- 0:00 - GMT
-
-# Mauritius
-
-# From Steffen Thorsen (2008-06-25):
-# Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial
-# basis....
-# It seems that Mauritius observed daylight saving time from 1982-10-10 to
-# 1983-03-20 as well, but that was not successful....
-# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
-
-# From Alex Krivenyshev (2008-06-25):
-# http://economicdevelopment.gov.mu/portal/site/Mainhomepage/menuitem.a42b24128104d9845dabddd154508a0c/?content_id=0a7cee8b5d69a110VgnVCM1000000a04a8c0RCRD
-
-# From Arthur David Olson (2008-06-30):
-# The www.timeanddate.com article cited by Steffen Thorsen notes that "A
-# final decision has yet to be made on the times that daylight saving
-# would begin and end on these dates." As a place holder, use midnight.
-
-# From Paul Eggert (2008-06-30):
-# Follow Thorsen on DST in 1982/1983, instead of Shanks & Pottenger.
-
-# From Steffen Thorsen (2008-07-10):
-# According to
-# <a href="http://www.lexpress.mu/display_article.php?news_id=111216">
-# http://www.lexpress.mu/display_article.php?news_id=111216
-# </a>
-# (in French), Mauritius will start and end their DST a few days earlier
-# than previously announced (2008-11-01 to 2009-03-31). The new start
-# date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
-# given, but it is probably at either 2 or 3 wall clock time).
-#
-# A little strange though, since the article says that they moved the date
-# to align itself with Europe and USA which also change time on that date,
-# but that means they have not paid attention to what happened in
-# USA/Canada last year (DST ends first Sunday in November). I also wonder
-# why that they end on a Friday, instead of aligning with Europe which
-# changes two days later.
-
-# From Alex Krivenyshev (2008-07-11):
-# Seems that English language article "The revival of daylight saving
-# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally
-# published on Monday, June 30, 2008...
-#
-# I guess that article in French "Le gouvernement avance l'introduction
-# de l'heure d'ete" stating that DST in Mauritius starting on October 26
-# and ending on March 27, 2009 is the most recent one.
-# ...
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html">
-# http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
-# </a>
-
-# From Riad M. Hossen Ally (2008-08-03):
-# The Government of Mauritius weblink
-# <a href="http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD">
-# http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
-# </a>
-# Cabinet Decision of July 18th, 2008 states as follows:
-#
-# 4. ...Cabinet has agreed to the introduction into the National Assembly
-# of the Time Bill which provides for the introduction of summer time in
-# Mauritius. The summer time period which will be of one hour ahead of
-# the standard time, will be aligned with that in Europe and the United
-# States of America. It will start at two o'clock in the morning on the
-# last Sunday of October and will end at two o'clock in the morning on
-# the last Sunday of March the following year. The summer time for the
-# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
-# and end on 29 March 2009.
-
-# From Ed Maste (2008-10-07):
-# THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
-# beginning / ending of summer time is 2 o'clock standard time in the
-# morning of the last Sunday of October / last Sunday of March.
-# <a href="http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf">
-# http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
-# </a>
-
-# From Steffen Thorsen (2009-06-05):
-# According to several sources, Mauritius will not continue to observe
-# DST the coming summer...
-#
-# Some sources, in French:
-# <a href="http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB">
-# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
-# </a>
-# <a href="http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-">
-# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
-# </a>
-#
-# Our wrap-up:
-# <a href="http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html">
-# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
-# </a>
-
-# From Arthur David Olson (2009-07-11):
-# The "mauritius-dst-will-not-repeat" wrapup includes this:
-# "The trial ended on March 29, 2009, when the clocks moved back by one hour
-# at 2am (or 02:00) local time..."
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Mauritius 1982 only - Oct 10 0:00 1:00 S
-Rule Mauritius 1983 only - Mar 21 0:00 0 -
-Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 S
-Rule Mauritius 2009 only - Mar lastSun 2:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
- 4:00 Mauritius MU%sT # Mauritius Time
-# Agalega Is, Rodriguez
-# no information; probably like Indian/Mauritius
-
-# Mayotte
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
- 3:00 - EAT
-
-# Morocco
-# See the `europe' file for Spanish Morocco (Africa/Ceuta).
-
-# From Alex Krivenyshev (2008-05-09):
-# Here is an article that Morocco plan to introduce Daylight Saving Time between
-# 1 June, 2008 and 27 September, 2008.
-#
-# "... Morocco is to save energy by adjusting its clock during summer so it will
-# be one hour ahead of GMT between 1 June and 27 September, according to
-# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
-#
-# <a href="http://www.worldtimezone.net/dst_news/dst_news_morocco01.html">
-# http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
-# </a>
-# OR
-# <a href="http://en.afrik.com/news11892.html">
-# http://en.afrik.com/news11892.html
-# </a>
-
-# From Alex Krivenyshev (2008-05-09):
-# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
-# <a href="http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view">
-# http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
-# </a>
-#
-# Morocco shifts to daylight time on June 1st through September 27, Govt.
-# spokesman.
-
-# From Patrice Scattolin (2008-05-09):
-# According to this article:
-# <a href="http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html">
-# http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
-# </a>
-# (and republished here:
-# <a href="http://www.actu.ma/heure-dete-comment_i127896_0.html">
-# http://www.actu.ma/heure-dete-comment_i127896_0.html
-# </a>
-# )
-# the changes occurs at midnight:
-#
-# saturday night may 31st at midnight (which in french is to be
-# intrepreted as the night between saturday and sunday)
-# sunday night the 28th at midnight
-#
-# Seeing that the 28th is monday, I am guessing that she intends to say
-# the midnight of the 28th which is the midnight between sunday and
-# monday, which jives with other sources that say that it's inclusive
-# june1st to sept 27th.
-#
-# The decision was taken by decree *2-08-224 *but I can't find the decree
-# published on the web.
-#
-# It's also confirmed here:
-# <a href="http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm">
-# http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
-# </a>
-# on a government portal as being between june 1st and sept 27th (not yet
-# posted in english).
-#
-# The following google query will generate many relevant hits:
-# <a href="http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search">
-# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
-# </a>
-
-# From Alex Krivenyshev (2008-05-09):
-# Is Western Sahara (part which administrated by Morocco) going to follow
-# Morocco DST changes? Any information? What about other part of
-# Western Sahara - under administration of POLISARIO Front (also named
-# SADR Saharawi Arab Democratic Republic)?
-
-# From Arthur David Olson (2008-05-09):
-# XXX--guess that it is only Morocco for now; guess only 2008 for now.
-
-# From Steffen Thorsen (2008-08-27):
-# Morocco will change the clocks back on the midnight between August 31
-# and September 1. They originally planned to observe DST to near the end
-# of September:
-#
-# One article about it (in French):
-# <a href="http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default">
-# http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
-# </a>
-#
-# We have some further details posted here:
-# <a href="http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html">
-# http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
-# </a>
-
-# From Steffen Thorsen (2009-03-17):
-# Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
-# to many sources, such as
-# <a href="http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html">
-# http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
-# </a>
-# <a href="http://www.medi1sat.ma/fr/depeche.aspx?idp=2312">
-# http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
-# </a>
-# (French)
-#
-# Our summary:
-# <a href="http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html">
-# http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
-# </a>
-
-# From Alexander Krivenyshev (2009-03-17):
-# Here is a link to official document from Royaume du Maroc Premier Ministre,
-# Ministere de la Modernisation des Secteurs Publics
-#
-# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
-# concerning the amendment of the legal time, the Ministry of Modernization of
-# Public Sectors announced that the official time in the Kingdom will be
-# advanced 60 minutes from Sunday 31 May 2009 at midnight.
-#
-# <a href="http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf">
-# http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
-# </a>
-#
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_morocco03.html">
-# http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
-# </a>
-
-# From Steffen Thorsen (2010-04-13):
-# Several news media in Morocco report that the Ministry of Modernization
-# of Public Sectors has announced that Morocco will have DST from
-# 2010-05-02 to 2010-08-08.
-#
-# Example:
-# <a href="http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html">
-# http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
-# </a>
-# (French)
-# Our page:
-# <a href="http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html">
-# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
-# </a>
-
-# From Dan Abitol (2011-03-30):
-# ...Rules for Africa/Casablanca are the following (24h format)
-# The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00
-# The 31th july 2011 at 00:59:59, [it] will be 31th July 00:00:00
-# ...Official links of change in morocco
-# The change was broadcast on the FM Radio
-# I ve called ANRT (telecom regulations in Morocco) at
-# +212.537.71.84.00
-# <a href="http://www.anrt.net.ma/fr/">
-# http://www.anrt.net.ma/fr/
-# </a>
-# They said that
-# <a href="http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view">
-# http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
-# </a>
-# is the official publication to look at.
-# They said that the decision was already taken.
-#
-# More articles in the press
-# <a href="http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev">
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
-# </a>
-# e.html
-# <a href="http://www.lematin.ma/Actualite/Express/Article.asp?id=148923">
-# http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
-# </a>
-# <a href="http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim">
-# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
-# anche-prochain-5538.html
-# </a>
-
-# From Petr Machata (2011-03-30):
-# They have it written in English here:
-# <a href="http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view">
-# http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
-# </a>
-#
-# It says there that "Morocco will resume its standard time on July 31,
-# 2011 at midnight." Now they don't say whether they mean midnight of
-# wall clock time (i.e. 11pm UTC), but that's what I would assume. It has
-# also been like that in the past.
-
-# From Alexander Krivenyshev (2012-03-09):
-# According to Infomédiaire web site from Morocco (infomediaire.ma),
-# on March 9, 2012, (in French) Heure légale:
-# Le Maroc adopte officiellement l'heure d'été
-# <a href="http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9">
-# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
-# </a>
-# Governing Council adopted draft decree, that Morocco DST starts on
-# the last Sunday of March (March 25, 2012) and ends on
-# last Sunday of September (September 30, 2012)
-# except the month of Ramadan.
-# or (brief)
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_morocco06.html">
-# http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
-# </a>
-
-# From Arthur David Olson (2012-03-10):
-# The infomediaire.ma source indicates that the system is to be in
-# effect every year. It gives 03H00 as the "fall back" time of day;
-# it lacks a "spring forward" time of day; assume 2:00 XXX.
-# Wait on specifying the Ramadan exception for details about
-# start date, start time of day, end date, and end time of day XXX.
-
-# From Christophe Tropamer (2012-03-16):
-# Seen Morocco change again:
-# <a href="http://www.le2uminutes.com/actualite.php">
-# http://www.le2uminutes.com/actualite.php
-# </a>
-# "...à partir du dernier dimance d'avril et non fins mars,
-# comme annoncé précédemment."
-
-# From Milamber Space Network (2012-07-17):
-# The official return to GMT is announced by the Moroccan government:
-# <a href="http://www.mmsp.gov.ma/fr/actualites.aspx?id=288">
-# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
-# </a>
-#
-# Google translation, lightly edited:
-# Back to the standard time of the Kingdom (GMT)
-# Pursuant to Decree No. 2-12-126 issued on 26 Jumada (I) 1433 (April 18,
-# 2012) and in accordance with the order of Mr. President of the
-# Government No. 3-47-12 issued on 24 Sha'ban (11 July 2012), the Ministry
-# of Public Service and Administration Modernization announces the return
-# of the legal time of the Kingdom (GMT) from Friday, July 20, 2012 until
-# Monday, August 20, 2012. So the time will be delayed by 60 minutes from
-# 3:00 am Friday, July 20, 2012 and will again be advanced by 60 minutes
-# August 20, 2012 from 2:00 am.
-
-# From Paul Eggert (2013-03-06):
-# Morocco's daylight-saving transitions due to Ramadan seem to be
-# announced a bit in advance. On 2012-07-11 the Moroccan government
-# announced that year's Ramadan daylight-saving transitions would be
-# 2012-07-20 and 2012-08-20; see
-# <http://www.mmsp.gov.ma/fr/actualites.aspx?id=288>.
-
-# From Andrew Paprocki (2013-07-02):
-# Morocco announced that the year's Ramadan daylight-savings
-# transitions would be 2013-07-07 and 2013-08-10; see:
-# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10
-
-# From Steffen Thorsen (2013-09-28):
-# Morocco extends DST by one month, on very short notice, just 1 day
-# before it was going to end. There is a new decree (2.13.781) for
-# this, where DST from now on goes from last Sunday of March at 02:00
-# to last Sunday of October at 03:00, similar to EU rules. Official
-# source (French):
-# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013
-# Another source (specifying the time for start and end in the decree):
-# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
-
-# From Paul Eggert (2013-09-30):
-# To estimate what the Moroccan government will do in future years,
-# transition dates for 2014 through 2037 were determined by running
-# the following program under GNU Emacs 24.3:
-#
-# (let ((islamic-year 1435))
-# (while (< islamic-year 1460)
-# (let ((a
-# (calendar-gregorian-from-absolute
-# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
-# (b
-# (calendar-gregorian-from-absolute
-# (calendar-islamic-to-absolute (list 10 1 islamic-year)))))
-# (insert
-# (format
-# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n"
-# "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n")
-# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
-# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
-# (setq islamic-year (+ 1 islamic-year))))
-#
-# with spring-forward transitions removed for 2023-2025, when the
-# normal spring-forward date falls during the estimated Ramadan; with
-# all transitions removed for 2026-2035, where the estimated Ramadan
-# falls entirely outside daylight-saving time; and with fall-back
-# transitions removed for 2036-2037, where the normal fall-back
-# date falls during the estimated Ramadan. Problems continue after that,
-# but 32-bit time_t values roll around in 2038 so for now do not worry
-# about dates after 2037.
-
-# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-
-Rule Morocco 1939 only - Sep 12 0:00 1:00 S
-Rule Morocco 1939 only - Nov 19 0:00 0 -
-Rule Morocco 1940 only - Feb 25 0:00 1:00 S
-Rule Morocco 1945 only - Nov 18 0:00 0 -
-Rule Morocco 1950 only - Jun 11 0:00 1:00 S
-Rule Morocco 1950 only - Oct 29 0:00 0 -
-Rule Morocco 1967 only - Jun 3 12:00 1:00 S
-Rule Morocco 1967 only - Oct 1 0:00 0 -
-Rule Morocco 1974 only - Jun 24 0:00 1:00 S
-Rule Morocco 1974 only - Sep 1 0:00 0 -
-Rule Morocco 1976 1977 - May 1 0:00 1:00 S
-Rule Morocco 1976 only - Aug 1 0:00 0 -
-Rule Morocco 1977 only - Sep 28 0:00 0 -
-Rule Morocco 1978 only - Jun 1 0:00 1:00 S
-Rule Morocco 1978 only - Aug 4 0:00 0 -
-Rule Morocco 2008 only - Jun 1 0:00 1:00 S
-Rule Morocco 2008 only - Sep 1 0:00 0 -
-Rule Morocco 2009 only - Jun 1 0:00 1:00 S
-Rule Morocco 2009 only - Aug 21 0:00 0 -
-Rule Morocco 2010 only - May 2 0:00 1:00 S
-Rule Morocco 2010 only - Aug 8 0:00 0 -
-Rule Morocco 2011 only - Apr 3 0:00 1:00 S
-Rule Morocco 2011 only - Jul 31 0 0 -
-Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S
-Rule Morocco 2012 only - Sep 30 3:00 0 -
-Rule Morocco 2012 only - Jul 20 3:00 0 -
-Rule Morocco 2012 only - Aug 20 2:00 1:00 S
-Rule Morocco 2013 only - Jul 7 3:00 0 -
-Rule Morocco 2013 only - Aug 10 2:00 1:00 S
-Rule Morocco 2013 2035 - Oct lastSun 3:00 0 -
-Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
-Rule Morocco 2014 only - Jun 29 3:00 0 -
-Rule Morocco 2014 only - Jul 29 2:00 1:00 S
-Rule Morocco 2015 only - Jun 18 3:00 0 -
-Rule Morocco 2015 only - Jul 18 2:00 1:00 S
-Rule Morocco 2016 only - Jun 7 3:00 0 -
-Rule Morocco 2016 only - Jul 7 2:00 1:00 S
-Rule Morocco 2017 only - May 27 3:00 0 -
-Rule Morocco 2017 only - Jun 26 2:00 1:00 S
-Rule Morocco 2018 only - May 16 3:00 0 -
-Rule Morocco 2018 only - Jun 15 2:00 1:00 S
-Rule Morocco 2019 only - May 6 3:00 0 -
-Rule Morocco 2019 only - Jun 5 2:00 1:00 S
-Rule Morocco 2020 only - Apr 24 3:00 0 -
-Rule Morocco 2020 only - May 24 2:00 1:00 S
-Rule Morocco 2021 only - Apr 13 3:00 0 -
-Rule Morocco 2021 only - May 13 2:00 1:00 S
-Rule Morocco 2022 only - Apr 3 3:00 0 -
-Rule Morocco 2022 only - May 3 2:00 1:00 S
-Rule Morocco 2023 only - Apr 22 2:00 1:00 S
-Rule Morocco 2024 only - Apr 10 2:00 1:00 S
-Rule Morocco 2025 only - Mar 31 2:00 1:00 S
-Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
-Rule Morocco 2036 only - Oct 21 3:00 0 -
-Rule Morocco 2037 only - Oct 11 3:00 0 -
-Rule Morocco 2038 only - Sep 30 3:00 0 -
-Rule Morocco 2038 only - Oct 30 2:00 1:00 S
-Rule Morocco 2038 max - Oct lastSun 3:00 0 -
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
- 0:00 Morocco WE%sT 1984 Mar 16
- 1:00 - CET 1986
- 0:00 Morocco WE%sT
-# Western Sahara
-Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
- -1:00 - WAT 1976 Apr 14
- 0:00 - WET
-
-# Mozambique
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Maputo 2:10:20 - LMT 1903 Mar
- 2:00 - CAT
-
-# Namibia
-# The 1994-04-03 transition is from Shanks & Pottenger.
-# Shanks & Pottenger report no DST after 1998-04; go with IATA.
-
-# From Petronella Sibeene (2007-03-30) in
-# <http://allafrica.com/stories/200703300178.html>:
-# While the entire country changes its time, Katima Mulilo and other
-# settlements in Caprivi unofficially will not because the sun there
-# rises and sets earlier compared to other regions. Chief of
-# Forecasting Riaan van Zyl explained that the far eastern parts of
-# the country are close to 40 minutes earlier in sunrise than the rest
-# of the country.
-#
-# From Paul Eggert (2007-03-31):
-# Apparently the Caprivi Strip informally observes Botswana time, but
-# we have no details. In the meantime people there can use Africa/Gaborone.
-
-# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Namibia 1994 max - Sep Sun>=1 2:00 1:00 S
-Rule Namibia 1995 max - Apr Sun>=1 2:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
- 1:30 - SWAT 1903 Mar # SW Africa Time
- 2:00 - SAST 1942 Sep 20 2:00
- 2:00 1:00 SAST 1943 Mar 21 2:00
- 2:00 - SAST 1990 Mar 21 # independence
- 2:00 - CAT 1994 Apr 3
- 1:00 Namibia WA%sT
-
-# Niger
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Niamey 0:08:28 - LMT 1912
- -1:00 - WAT 1934 Feb 26
- 0:00 - GMT 1960
- 1:00 - WAT
-
-# Nigeria
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Lagos 0:13:36 - LMT 1919 Sep
- 1:00 - WAT
-
-# Reunion
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis
- 4:00 - RET # Reunion Time
-#
-# Scattered Islands (Iles Eparses) administered from Reunion are as follows.
-# The following information about them is taken from
-# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
-# no longer available as of 1999-08-17).
-# We have no info about their time zone histories.
-#
-# Bassas da India - uninhabited
-# Europa Island - inhabited from 1905 to 1910 by two families
-# Glorioso Is - inhabited until at least 1958
-# Juan de Nova - uninhabited
-# Tromelin - inhabited until at least 1958
-
-# Rwanda
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Kigali 2:00:16 - LMT 1935 Jun
- 2:00 - CAT
-
-# St Helena
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Atlantic/St_Helena -0:22:48 - LMT 1890 # Jamestown
- -0:22:48 - JMT 1951 # Jamestown Mean Time
- 0:00 - GMT
-# The other parts of the St Helena territory are similar:
-# Tristan da Cunha: on GMT, say Whitman and the CIA
-# Ascension: on GMT, says usno1995 and the CIA
-# Gough (scientific station since 1955; sealers wintered previously):
-# on GMT, says the CIA
-# Inaccessible, Nightingale: no information, but probably GMT
-
-# Sao Tome and Principe
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Sao_Tome 0:26:56 - LMT 1884
- -0:36:32 - LMT 1912 # Lisbon Mean Time
- 0:00 - GMT
-
-# Senegal
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Dakar -1:09:44 - LMT 1912
- -1:00 - WAT 1941 Jun
- 0:00 - GMT
-
-# Seychelles
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria
- 4:00 - SCT # Seychelles Time
-# From Paul Eggert (2001-05-30):
-# Aldabra, Farquhar, and Desroches, originally dependencies of the
-# Seychelles, were transferred to the British Indian Ocean Territory
-# in 1965 and returned to Seychelles control in 1976. We don't know
-# whether this affected their time zone, so omit this for now.
-# Possibly the islands were uninhabited.
-
-# Sierra Leone
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
-Rule SL 1935 1942 - Jun 1 0:00 0:40 SLST
-Rule SL 1935 1942 - Oct 1 0:00 0 WAT
-Rule SL 1957 1962 - Jun 1 0:00 1:00 SLST
-Rule SL 1957 1962 - Sep 1 0:00 0 GMT
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Freetown -0:53:00 - LMT 1882
- -0:53:00 - FMT 1913 Jun # Freetown Mean Time
- -1:00 SL %s 1957
- 0:00 SL %s
-
-# Somalia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Mogadishu 3:01:28 - LMT 1893 Nov
- 3:00 - EAT 1931
- 2:30 - BEAT 1957
- 3:00 - EAT
-
-# South Africa
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 -
-Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
- 1:30 - SAST 1903 Mar
- 2:00 SA SAST
-# Marion and Prince Edward Is
-# scientific station since 1947
-# no information
-
-# Sudan
-#
-# From <a href="http://www.sunanews.net/sn13jane.html">
-# Sudan News Agency (2000-01-13)
-# </a>, also reported by Michael De Beukelaer-Dossche via Steffen Thorsen:
-# Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
-# Saturday.... This was announced Thursday by Caretaker State Minister for
-# Manpower Abdul-Rahman Nur-Eddin.
-#
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Sudan 1970 only - May 1 0:00 1:00 S
-Rule Sudan 1970 1985 - Oct 15 0:00 0 -
-Rule Sudan 1971 only - Apr 30 0:00 1:00 S
-Rule Sudan 1972 1985 - Apr lastSun 0:00 1:00 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Khartoum 2:10:08 - LMT 1931
- 2:00 Sudan CA%sT 2000 Jan 15 12:00
- 3:00 - EAT
-
-# South Sudan
-Link Africa/Khartoum Africa/Juba
-
-# Swaziland
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar
- 2:00 - SAST
-
-# Tanzania
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Dar_es_Salaam 2:37:08 - LMT 1931
- 3:00 - EAT 1948
- 2:45 - BEAUT 1961
- 3:00 - EAT
-
-# Togo
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Lome 0:04:52 - LMT 1893
- 0:00 - GMT
-
-# Tunisia
-
-# From Gwillim Law (2005-04-30):
-# My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
-# this time in Tunisia. According to Yahoo France News
-# <http://fr.news.yahoo.com/050426/5/4dumk.html>, in a story attributed to AP
-# and dated 2005-04-26, "Tunisia has decided to advance its official time by
-# one hour, starting on Sunday, May 1. Henceforth, Tunisian time will be
-# UTC+2 instead of UTC+1. The change will take place at 23:00 UTC next
-# Saturday." (My translation)
-#
-# From Oscar van Vlijmen (2005-05-02):
-# LaPresse, the first national daily newspaper ...
-# <http://www.lapresse.tn/archives/archives280405/actualites/lheure.html>
-# ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
-# 1h standard time.
-#
-# From Atef Loukil (2006-03-28):
-# The daylight saving time will be the same each year:
-# Beginning : the last Sunday of March at 02:00
-# Ending : the last Sunday of October at 03:00 ...
-# http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=1188&Itemid=50
-
-# From Steffen Thorsen (2009-03-16):
-# According to several news sources, Tunisia will not observe DST this year.
-# (Arabic)
-# <a href="http://www.elbashayer.com/?page=viewn&nid=42546">
-# http://www.elbashayer.com/?page=viewn&nid=42546
-# </a>
-# <a href="http://www.babnet.net/kiwidetail-15295.asp">
-# http://www.babnet.net/kiwidetail-15295.asp
-# </a>
-#
-# We have also confirmed this with the US embassy in Tunisia.
-# We have a wrap-up about this on the following page:
-# <a href="http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html">
-# http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
-# </a>
-
-# From Alexander Krivenyshev (2009-03-17):
-# Here is a link to Tunis Afrique Presse News Agency
-#
-# Standard time to be kept the whole year long (tap.info.tn):
-#
-# (in English)
-# <a href="http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157">
-# http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
-# </a>
-#
-# (in Arabic)
-# <a href="http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1">
-# http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
-# </a>
-
-# From Arthur David Olson (2009--3-18):
-# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
-# that the fasting month of ramadan coincides with the period concerned by summer time.
-# Therefore, the standard time will be kept unchanged the whole year long."
-# So foregoing DST seems to be an exception (albeit one that may be repeated in the future).
-
-# From Alexander Krivenyshev (2010-03-27):
-# According to some news reports Tunis confirmed not to use DST in 2010
-#
-# (translation):
-# "The Tunisian government has decided to abandon DST, which was scheduled on
-# Sunday...
-# Tunisian authorities had suspended the DST for the first time last year also
-# coincided with the month of Ramadan..."
-#
-# (in Arabic)
-# <a href="http://www.moheet.com/show_news.aspx?nid=358861&pg=1">
-# http://www.moheet.com/show_news.aspx?nid=358861&pg=1
-# <a href="http://www.almadenahnews.com/newss/news.php?c=118&id=38036">
-# http://www.almadenahnews.com/newss/news.php?c=118&id=38036
-# or
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_tunis02.html">
-# http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Tunisia 1939 only - Apr 15 23:00s 1:00 S
-Rule Tunisia 1939 only - Nov 18 23:00s 0 -
-Rule Tunisia 1940 only - Feb 25 23:00s 1:00 S
-Rule Tunisia 1941 only - Oct 6 0:00 0 -
-Rule Tunisia 1942 only - Mar 9 0:00 1:00 S
-Rule Tunisia 1942 only - Nov 2 3:00 0 -
-Rule Tunisia 1943 only - Mar 29 2:00 1:00 S
-Rule Tunisia 1943 only - Apr 17 2:00 0 -
-Rule Tunisia 1943 only - Apr 25 2:00 1:00 S
-Rule Tunisia 1943 only - Oct 4 2:00 0 -
-Rule Tunisia 1944 1945 - Apr Mon>=1 2:00 1:00 S
-Rule Tunisia 1944 only - Oct 8 0:00 0 -
-Rule Tunisia 1945 only - Sep 16 0:00 0 -
-Rule Tunisia 1977 only - Apr 30 0:00s 1:00 S
-Rule Tunisia 1977 only - Sep 24 0:00s 0 -
-Rule Tunisia 1978 only - May 1 0:00s 1:00 S
-Rule Tunisia 1978 only - Oct 1 0:00s 0 -
-Rule Tunisia 1988 only - Jun 1 0:00s 1:00 S
-Rule Tunisia 1988 1990 - Sep lastSun 0:00s 0 -
-Rule Tunisia 1989 only - Mar 26 0:00s 1:00 S
-Rule Tunisia 1990 only - May 1 0:00s 1:00 S
-Rule Tunisia 2005 only - May 1 0:00s 1:00 S
-Rule Tunisia 2005 only - Sep 30 1:00s 0 -
-Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S
-Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 -
-
-# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
-# more precise 0:09:21.
-# Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- 1:00 Tunisia CE%sT
-
-# Uganda
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Kampala 2:09:40 - LMT 1928 Jul
- 3:00 - EAT 1930
- 2:30 - BEAT 1948
- 2:45 - BEAUT 1957
- 3:00 - EAT
-
-# Zambia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Lusaka 1:53:08 - LMT 1903 Mar
- 2:00 - CAT
-
-# Zimbabwe
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Harare 2:04:12 - LMT 1903 Mar
- 2:00 - CAT
diff --git a/jdk/make/sun/javazic/tzdata/southamerica b/jdk/make/sun/javazic/tzdata/southamerica
deleted file mode 100644
index 2230d06..0000000
--- a/jdk/make/sun/javazic/tzdata/southamerica
+++ /dev/null
@@ -1,1785 +0,0 @@
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-# <pre>
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# This data is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).
-
-# From Paul Eggert (2006-03-22):
-# A good source for time zone historical data outside the U.S. is
-# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
-# San Diego: ACS Publications, Inc. (2003).
-#
-# For data circa 1899, a common source is:
-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
-# <http://www.jstor.org/stable/1774359>.
-#
-# Gwillim Law writes that a good source
-# for recent time zone data is the International Air Transport
-# Association's Standard Schedules Information Manual (IATA SSIM),
-# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
-#
-# Earlier editions of these tables used the North American style (e.g. ARST and
-# ARDT for Argentine Standard and Daylight Time), but the following quote
-# suggests that it's better to use European style (e.g. ART and ARST).
-# I suggest the use of _Summer time_ instead of the more cumbersome
-# _daylight-saving time_. _Summer time_ seems to be in general use
-# in Europe and South America.
-# -- E O Cutler, _New York Times_ (1937-02-14), quoted in
-# H L Mencken, _The American Language: Supplement I_ (1960), p 466
-#
-# Earlier editions of these tables also used the North American style
-# for time zones in Brazil, but this was incorrect, as Brazilians say
-# "summer time". Reinaldo Goulart, a Sao Paulo businessman active in
-# the railroad sector, writes (1999-07-06):
-# The subject of time zones is currently a matter of discussion/debate in
-# Brazil. Let's say that "the Brasilia time" is considered the
-# "official time" because Brasilia is the capital city.
-# The other three time zones are called "Brasilia time "minus one" or
-# "plus one" or "plus two". As far as I know there is no such
-# name/designation as "Eastern Time" or "Central Time".
-# So I invented the following (English-language) abbreviations for now.
-# Corrections are welcome!
-# std dst
-# -2:00 FNT FNST Fernando de Noronha
-# -3:00 BRT BRST Brasilia
-# -4:00 AMT AMST Amazon
-# -5:00 ACT ACST Acre
-
-###############################################################################
-
-###############################################################################
-
-# Argentina
-
-# From Bob Devine (1988-01-28):
-# Argentina: first Sunday in October to first Sunday in April since 1976.
-# Double Summer time from 1969 to 1974. Switches at midnight.
-
-# From U. S. Naval Observatory (1988-01-199):
-# ARGENTINA 3 H BEHIND UTC
-
-# From Hernan G. Otero (1995-06-26):
-# I am sending modifications to the Argentine time zone table...
-# AR was chosen because they are the ISO letters that represent Argentina.
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Arg 1930 only - Dec 1 0:00 1:00 S
-Rule Arg 1931 only - Apr 1 0:00 0 -
-Rule Arg 1931 only - Oct 15 0:00 1:00 S
-Rule Arg 1932 1940 - Mar 1 0:00 0 -
-Rule Arg 1932 1939 - Nov 1 0:00 1:00 S
-Rule Arg 1940 only - Jul 1 0:00 1:00 S
-Rule Arg 1941 only - Jun 15 0:00 0 -
-Rule Arg 1941 only - Oct 15 0:00 1:00 S
-Rule Arg 1943 only - Aug 1 0:00 0 -
-Rule Arg 1943 only - Oct 15 0:00 1:00 S
-Rule Arg 1946 only - Mar 1 0:00 0 -
-Rule Arg 1946 only - Oct 1 0:00 1:00 S
-Rule Arg 1963 only - Oct 1 0:00 0 -
-Rule Arg 1963 only - Dec 15 0:00 1:00 S
-Rule Arg 1964 1966 - Mar 1 0:00 0 -
-Rule Arg 1964 1966 - Oct 15 0:00 1:00 S
-Rule Arg 1967 only - Apr 2 0:00 0 -
-Rule Arg 1967 1968 - Oct Sun>=1 0:00 1:00 S
-Rule Arg 1968 1969 - Apr Sun>=1 0:00 0 -
-Rule Arg 1974 only - Jan 23 0:00 1:00 S
-Rule Arg 1974 only - May 1 0:00 0 -
-Rule Arg 1988 only - Dec 1 0:00 1:00 S
-#
-# From Hernan G. Otero (1995-06-26):
-# These corrections were contributed by InterSoft Argentina S.A.,
-# obtaining the data from the:
-# Talleres de Hidrografia Naval Argentina
-# (Argentine Naval Hydrography Institute)
-Rule Arg 1989 1993 - Mar Sun>=1 0:00 0 -
-Rule Arg 1989 1992 - Oct Sun>=15 0:00 1:00 S
-#
-# From Hernan G. Otero (1995-06-26):
-# From this moment on, the law that mandated the daylight saving
-# time corrections was derogated and no more modifications
-# to the time zones (for daylight saving) are now made.
-#
-# From Rives McDow (2000-01-10):
-# On October 3, 1999, 0:00 local, Argentina implemented daylight savings time,
-# which did not result in the switch of a time zone, as they stayed 9 hours
-# from the International Date Line.
-Rule Arg 1999 only - Oct Sun>=1 0:00 1:00 S
-# From Paul Eggert (2007-12-28):
-# DST was set to expire on March 5, not March 3, but since it was converted
-# to standard time on March 3 it's more convenient for us to pretend that
-# it ended on March 3.
-Rule Arg 2000 only - Mar 3 0:00 0 -
-#
-# From Peter Gradelski via Steffen Thorsen (2000-03-01):
-# We just checked with our Sao Paulo office and they say the government of
-# Argentina decided not to become one of the countries that go on or off DST.
-# So Buenos Aires should be -3 hours from GMT at all times.
-#
-# From Fabian L. Arce Jofre (2000-04-04):
-# The law that claimed DST for Argentina was derogated by President Fernando
-# de la Rua on March 2, 2000, because it would make people spend more energy
-# in the winter time, rather than less. The change took effect on March 3.
-#
-# From Mariano Absatz (2001-06-06):
-# one of the major newspapers here in Argentina said that the 1999
-# Timezone Law (which never was effectively applied) will (would?) be
-# in effect.... The article is at
-# http://ar.clarin.com/diario/2001-06-06/e-01701.htm
-# ... The Law itself is "Ley No 25155", sanctioned on 1999-08-25, enacted
-# 1999-09-17, and published 1999-09-21. The official publication is at:
-# http://www.boletin.jus.gov.ar/BON/Primera/1999/09-Septiembre/21/PDF/BO21-09-99LEG.PDF
-# Regretfully, you have to subscribe (and pay) for the on-line version....
-#
-# (2001-06-12):
-# the timezone for Argentina will not change next Sunday.
-# Apparently it will do so on Sunday 24th....
-# http://ar.clarin.com/diario/2001-06-12/s-03501.htm
-#
-# (2001-06-25):
-# Last Friday (yes, the last working day before the date of the change), the
-# Senate annulled the 1999 law that introduced the changes later postponed.
-# http://www.clarin.com.ar/diario/2001-06-22/s-03601.htm
-# It remains the vote of the Deputies..., but it will be the same....
-# This kind of things had always been done this way in Argentina.
-# We are still -03:00 all year round in all of the country.
-#
-# From Steffen Thorsen (2007-12-21):
-# A user (Leonardo Chaim) reported that Argentina will adopt DST....
-# all of the country (all Zone-entries) are affected. News reports like
-# http://www.lanacion.com.ar/opinion/nota.asp?nota_id=973037 indicate
-# that Argentina will use DST next year as well, from October to
-# March, although exact rules are not given.
-#
-# From Jesper Norgaard Welen (2007-12-26)
-# The last hurdle of Argentina DST is over, the proposal was approved in
-# the lower chamber too (Deputados) with a vote 192 for and 2 against.
-# By the way thanks to Mariano Absatz and Daniel Mario Vega for the link to
-# the original scanned proposal, where the dates and the zero hours are
-# clear and unambiguous...This is the article about final approval:
-# <a href="http://www.lanacion.com.ar/politica/nota.asp?nota_id=973996">
-# http://www.lanacion.com.ar/politica/nota.asp?nota_id=973996
-# </a>
-#
-# From Paul Eggert (2007-12-22):
-# For dates after mid-2008, the following rules are my guesses and
-# are quite possibly wrong, but are more likely than no DST at all.
-
-# From Alexander Krivenyshev (2008-09-05):
-# As per message from Carlos Alberto Fonseca Arauz (Nicaragua),
-# Argentina will start DST on Sunday October 19, 2008.
-#
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_argentina03.html">
-# http://www.worldtimezone.com/dst_news/dst_news_argentina03.html
-# </a>
-# OR
-# <a href="http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)">
-# http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
-# </a>
-
-# From Rodrigo Severo (2008-10-06):
-# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
-# ...
-# ------- Comment #1 from [jmdocile] 2008-10-06 16:28 0000 -------
-# Hi, there is a problem with timezone-data-2008e and maybe with
-# timezone-data-2008f
-# Argentinian law [Number] 25.155 is no longer valid.
-# <a href="http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm">
-# http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
-# </a>
-# The new one is law [Number] 26.350
-# <a href="http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm">
-# http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
-# </a>
-# So there is no summer time in Argentina for now.
-
-# From Mariano Absatz (2008-10-20):
-# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
-# From 2008-10-19 until 2009-03-15
-# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01">
-# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
-# </a>
-#
-# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer 2008/2009:
-# Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La Pampa, Neuquen, Rio Negro, Chubut, Santa Cruz
-# and Tierra del Fuego
-# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01">
-# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
-# </a>
-#
-# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
-# it will not apply DST either (even when it was not included in Decree 1705/2008)
-# <a href="http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc">
-# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
-# </a>
-
-# From fullinet (2009-10-18):
-# As announced in
-# <a hef="http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356">
-# http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356
-# </a>
-# (an official .gob.ar) under title: "Sin Cambio de Hora" (english: "No hour change")
-#
-# "Por el momento, el Gobierno Nacional resolvio no modificar la hora
-# oficial, decision que estaba en estudio para su implementacion el
-# domingo 18 de octubre. Desde el Ministerio de Planificacion se anuncio
-# que la Argentina hoy, en estas condiciones meteorologicas, no necesita
-# la modificacion del huso horario, ya que 2009 nos encuentra con
-# crecimiento en la produccion y distribucion energetica."
-
-Rule Arg 2007 only - Dec 30 0:00 1:00 S
-Rule Arg 2008 2009 - Mar Sun>=15 0:00 0 -
-Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
-
-# From Mariano Absatz (2004-05-21):
-# Today it was officially published that the Province of Mendoza is changing
-# its timezone this winter... starting tomorrow night....
-# http://www.gobernac.mendoza.gov.ar/boletin/pdf/20040521-27158-normas.pdf
-# From Paul Eggert (2004-05-24):
-# It's Law No. 7,210. This change is due to a public power emergency, so for
-# now we'll assume it's for this year only.
-#
-# From Paul Eggert (2006-03-22):
-# <a href="http://www.spicasc.net/horvera.html">
-# Hora de verano para la Republica Argentina (2003-06-08)
-# </a> says that standard time in Argentina from 1894-10-31
-# to 1920-05-01 was -4:16:48.25. Go with this more-precise value
-# over Shanks & Pottenger.
-#
-# From Mariano Absatz (2004-06-05):
-# These media articles from a major newspaper mostly cover the current state:
-# http://www.lanacion.com.ar/04/05/27/de_604825.asp
-# http://www.lanacion.com.ar/04/05/28/de_605203.asp
-#
-# The following eight (8) provinces pulled clocks back to UTC-04:00 at
-# midnight Monday May 31st. (that is, the night between 05/31 and 06/01).
-# Apparently, all nine provinces would go back to UTC-03:00 at the same
-# time in October 17th.
-#
-# Catamarca, Chubut, La Rioja, San Juan, San Luis, Santa Cruz,
-# Tierra del Fuego, Tucuman.
-#
-# From Mariano Absatz (2004-06-14):
-# ... this weekend, the Province of Tucuman decided it'd go back to UTC-03:00
-# yesterday midnight (that is, at 24:00 Saturday 12th), since the people's
-# annoyance with the change is much higher than the power savings obtained....
-#
-# From Gwillim Law (2004-06-14):
-# http://www.lanacion.com.ar/04/06/10/de_609078.asp ...
-# "The time change in Tierra del Fuego was a conflicted decision from
-# the start. The government had decreed that the measure would take
-# effect on June 1, but a normative error forced the new time to begin
-# three days earlier, from a Saturday to a Sunday....
-# Our understanding was that the change was originally scheduled to take place
-# on June 1 at 00:00 in Chubut, Santa Cruz, Tierra del Fuego (and some other
-# provinces). Sunday was May 30, only two days earlier. So the article
-# contains a contradiction. I would give more credence to the Saturday/Sunday
-# date than the "three days earlier" phrase, and conclude that Tierra del
-# Fuego set its clocks back at 2004-05-30 00:00.
-#
-# From Steffen Thorsen (2004-10-05):
-# The previous law 7210 which changed the province of Mendoza's time zone
-# back in May have been modified slightly in a new law 7277, which set the
-# new end date to 2004-09-26 (original date was 2004-10-17).
-# http://www.gobernac.mendoza.gov.ar/boletin/pdf/20040924-27244-normas.pdf
-#
-# From Mariano Absatz (2004-10-05):
-# San Juan changed from UTC-03:00 to UTC-04:00 at midnight between
-# Sunday, May 30th and Monday, May 31st. It changed back to UTC-03:00
-# at midnight between Saturday, July 24th and Sunday, July 25th....
-# http://www.sanjuan.gov.ar/prensa/archivo/000329.html
-# http://www.sanjuan.gov.ar/prensa/archivo/000426.html
-# http://www.sanjuan.gov.ar/prensa/archivo/000441.html
-
-# From Alex Krivenyshev (2008-01-17):
-# Here are articles that Argentina Province San Luis is planning to end DST
-# as earlier as upcoming Monday January 21, 2008 or February 2008:
-#
-# Provincia argentina retrasa reloj y marca diferencia con resto del pais
-# (Argentine Province delayed clock and mark difference with the rest of the
-# country)
-# <a href="http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel">
-# http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel
-# </a>
-#
-# Es inminente que en San Luis atrasen una hora los relojes
-# (It is imminent in San Luis clocks one hour delay)
-# <a href="http://www.lagaceta.com.ar/vernotae.asp?id_nota=253414">
-# http://www.lagaceta.com.ar/vernotae.asp?id_nota=253414
-# </a>
-#
-# <a href="http://www.worldtimezone.net/dst_news/dst_news_argentina02.html">
-# http://www.worldtimezone.net/dst_news/dst_news_argentina02.html
-# </a>
-
-# From Jesper Norgaard Welen (2008-01-18):
-# The page of the San Luis provincial government
-# <a href="http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812">
-# http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812
-# </a>
-# confirms what Alex Krivenyshev has earlier sent to the tz
-# emailing list about that San Luis plans to return to standard
-# time much earlier than the rest of the country. It also
-# confirms that upon request the provinces San Juan and Mendoza
-# refused to follow San Luis in this change.
-#
-# The change is supposed to take place Monday the 21.st at 0:00
-# hours. As far as I understand it if this goes ahead, we need
-# a new timezone for San Luis (although there are also documented
-# independent changes in the southamerica file of San Luis in
-# 1990 and 1991 which has not been confirmed).
-
-# From Jesper Norgaard Welen (2008-01-25):
-# Unfortunately the below page has become defunct, about the San Luis
-# time change. Perhaps because it now is part of a group of pages "Most
-# important pages of 2008."
-#
-# You can use
-# <a href="http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834">
-# http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834
-# </a>
-# instead it seems. Or use "Buscador" from the main page of the San Luis
-# government, and fill in "huso" and click OK, and you will get 3 pages
-# from which the first one is identical to the above.
-
-# From Mariano Absatz (2008-01-28):
-# I can confirm that the Province of San Luis (and so far only that
-# province) decided to go back to UTC-3 effective midnight Jan 20th 2008
-# (that is, Monday 21st at 0:00 is the time the clocks were delayed back
-# 1 hour), and they intend to keep UTC-3 as their timezone all year round
-# (that is, unless they change their mind any minute now).
-#
-# So we'll have to add yet another city to 'southamerica' (I think San
-# Luis city is the mos populated city in the Province, so it'd be
-# America/Argentina/San_Luis... of course I can't remember if San Luis's
-# history of particular changes goes along with Mendoza or San Juan :-(
-# (I only remember not being able to collect hard facts about San Luis
-# back in 2004, when these provinces changed to UTC-4 for a few days, I
-# mailed them personally and never got an answer).
-
-# From Paul Eggert (2008-06-30):
-# Unless otherwise specified, data are from Shanks & Pottenger through 1992,
-# from the IATA otherwise. As noted below, Shanks & Pottenger say that
-# America/Cordoba split into 6 subregions during 1991/1992, one of which
-# was America/San_Luis, but we haven't verified this yet so for now we'll
-# keep America/Cordoba a single region rather than splitting it into the
-# other 5 subregions.
-
-# From Mariano Absatz (2009-03-13):
-# Yesterday (with our usual 2-day notice) the Province of San Luis
-# decided that next Sunday instead of "staying" @utc-03:00 they will go
-# to utc-04:00 until the second Saturday in October...
-#
-# The press release is at
-# <a href="http://www.sanluis.gov.ar/SL/Paginas/NoticiaDetalle.asp?TemaId=1&InfoPrensaId=3102">
-# http://www.sanluis.gov.ar/SL/Paginas/NoticiaDetalle.asp?TemaId=1&InfoPrensaId=3102
-# </a>
-# (I couldn't find the decree, but
-# <a href="http://www.sanluis.gov.ar">
-# www.sanluis.gov.ar
-# <a/>
-# is the official page for the Province Government).
-#
-# There's also a note in only one of the major national papers ...
-# http://www.lanacion.com.ar/nota.asp?nota_id=1107912
-#
-# The press release says [quick and dirty translation]:
-# ... announced that next Sunday, at 00:00, Puntanos (the San Luis
-# inhabitants) will have to turn back one hour their clocks
-#
-# Since then, San Luis will establish its own Province timezone. Thus,
-# during 2009, this timezone change will run from 00:00 the third Sunday
-# in March until 24:00 of the second Saturday in October.
-
-# From Mariano Absatz (2009-10-16):
-# ...the Province of San Luis is a case in itself.
-#
-# The Law at
-# <a href="http://www.diputadossanluis.gov.ar/diputadosasp/paginas/verNorma.asp?NormaID=276>"
-# http://www.diputadossanluis.gov.ar/diputadosasp/paginas/verNorma.asp?NormaID=276
-# </a>
-# is ambiguous because establishes a calendar from the 2nd Sunday in
-# October at 0:00 thru the 2nd Saturday in March at 24:00 and the
-# complement of that starting on the 2nd Sunday of March at 0:00 and
-# ending on the 2nd Saturday of March at 24:00.
-#
-# This clearly breaks every time the 1st of March or October is a Sunday.
-#
-# IMHO, the "spirit of the Law" is to make the changes at 0:00 on the 2nd
-# Sunday of October and March.
-#
-# The problem is that the changes in the rest of the Provinces that did
-# change in 2007/2008, were made according to the Federal Law and Decrees
-# that did so on the 3rd Sunday of October and March.
-#
-# In fact, San Luis actually switched from UTC-4 to UTC-3 last Sunday
-# (October 11th) at 0:00.
-#
-# So I guess a new set of rules, besides "Arg", must be made and the last
-# America/Argentina/San_Luis entries should change to use these...
-#
-# I'm enclosing a patch that does what I say... regretfully, the San Luis
-# timezone must be called "WART/WARST" even when most of the time (like,
-# right now) WARST == ART... that is, since last Sunday, all the country
-# is using UTC-3, but in my patch, San Luis calls it "WARST" and the rest
-# of the country calls it "ART".
-# ...
-
-# From Alexander Krivenyshev (2010-04-09):
-# According to news reports from El Diario de la Republica Province San
-# Luis, Argentina (standard time UTC-04) will keep Daylight Saving Time
-# after April 11, 2010--will continue to have same time as rest of
-# Argentina (UTC-3) (no DST).
-#
-# Confirmaron la prórroga del huso horario de verano (Spanish)
-# <a href="http://www.eldiariodelarepublica.com/index.php?option=com_content&task=view&id=29383&Itemid=9">
-# http://www.eldiariodelarepublica.com/index.php?option=com_content&task=view&id=29383&Itemid=9
-# </a>
-# or (some English translation):
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_argentina08.html">
-# http://www.worldtimezone.com/dst_news/dst_news_argentina08.html
-# </a>
-
-# From Mariano Absatz (2010-04-12):
-# yes...I can confirm this...and given that San Luis keeps calling
-# UTC-03:00 "summer time", we should't just let San Luis go back to "Arg"
-# rules...San Luis is still using "Western ARgentina Time" and it got
-# stuck on Summer daylight savings time even though the summer is over.
-
-# From Paul Eggert (2013-09-05):
-# Perhaps San Luis operates on the legal fiction that it is at UTC-4
-# with perpetual summer time, but ordinary usage typically seems to
-# just say it's at UTC-3; see, for example,
-# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>.
-# We've documented similar situations as being plain changes to
-# standard time, so let's do that here too. This does not change UTC
-# offsets, only tm_isdst and the time zone abbreviations. One minor
-# plus is that this silences a zic complaint that there's no POSIX TZ
-# setting for time stamps past 2038.
-
-# From Paul Eggert (2013-02-21):
-# Milne says Cordoba time was -4:16:48.2. Round to the nearest second.
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-#
-# Buenos Aires (BA), Capital Federal (CF),
-Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May # Cordoba Mean Time
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1999 Oct 3
- -4:00 Arg AR%sT 2000 Mar 3
- -3:00 Arg AR%sT
-#
-# Cordoba (CB), Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN),
-# Chaco (CC), Formosa (FM), Santiago del Estero (SE)
-#
-# Shanks & Pottenger also make the following claims, which we haven't verified:
-# - Formosa switched to -3:00 on 1991-01-07.
-# - Misiones switched to -3:00 on 1990-12-29.
-# - Chaco switched to -3:00 on 1991-01-04.
-# - Santiago del Estero switched to -4:00 on 1991-04-01,
-# then to -3:00 on 1991-04-26.
-#
-Zone America/Argentina/Cordoba -4:16:48 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1991 Mar 3
- -4:00 - WART 1991 Oct 20
- -3:00 Arg AR%sT 1999 Oct 3
- -4:00 Arg AR%sT 2000 Mar 3
- -3:00 Arg AR%sT
-#
-# Salta (SA), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
-Zone America/Argentina/Salta -4:21:40 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1991 Mar 3
- -4:00 - WART 1991 Oct 20
- -3:00 Arg AR%sT 1999 Oct 3
- -4:00 Arg AR%sT 2000 Mar 3
- -3:00 Arg AR%sT 2008 Oct 18
- -3:00 - ART
-#
-# Tucuman (TM)
-Zone America/Argentina/Tucuman -4:20:52 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1991 Mar 3
- -4:00 - WART 1991 Oct 20
- -3:00 Arg AR%sT 1999 Oct 3
- -4:00 Arg AR%sT 2000 Mar 3
- -3:00 - ART 2004 Jun 1
- -4:00 - WART 2004 Jun 13
- -3:00 Arg AR%sT
-#
-# La Rioja (LR)
-Zone America/Argentina/La_Rioja -4:27:24 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1991 Mar 1
- -4:00 - WART 1991 May 7
- -3:00 Arg AR%sT 1999 Oct 3
- -4:00 Arg AR%sT 2000 Mar 3
- -3:00 - ART 2004 Jun 1
- -4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT 2008 Oct 18
- -3:00 - ART
-#
-# San Juan (SJ)
-Zone America/Argentina/San_Juan -4:34:04 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1991 Mar 1
- -4:00 - WART 1991 May 7
- -3:00 Arg AR%sT 1999 Oct 3
- -4:00 Arg AR%sT 2000 Mar 3
- -3:00 - ART 2004 May 31
- -4:00 - WART 2004 Jul 25
- -3:00 Arg AR%sT 2008 Oct 18
- -3:00 - ART
-#
-# Jujuy (JY)
-Zone America/Argentina/Jujuy -4:21:12 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1990 Mar 4
- -4:00 - WART 1990 Oct 28
- -4:00 1:00 WARST 1991 Mar 17
- -4:00 - WART 1991 Oct 6
- -3:00 1:00 ARST 1992
- -3:00 Arg AR%sT 1999 Oct 3
- -4:00 Arg AR%sT 2000 Mar 3
- -3:00 Arg AR%sT 2008 Oct 18
- -3:00 - ART
-#
-# Catamarca (CT), Chubut (CH)
-Zone America/Argentina/Catamarca -4:23:08 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1991 Mar 3
- -4:00 - WART 1991 Oct 20
- -3:00 Arg AR%sT 1999 Oct 3
- -4:00 Arg AR%sT 2000 Mar 3
- -3:00 - ART 2004 Jun 1
- -4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT 2008 Oct 18
- -3:00 - ART
-#
-# Mendoza (MZ)
-Zone America/Argentina/Mendoza -4:35:16 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1990 Mar 4
- -4:00 - WART 1990 Oct 15
- -4:00 1:00 WARST 1991 Mar 1
- -4:00 - WART 1991 Oct 15
- -4:00 1:00 WARST 1992 Mar 1
- -4:00 - WART 1992 Oct 18
- -3:00 Arg AR%sT 1999 Oct 3
- -4:00 Arg AR%sT 2000 Mar 3
- -3:00 - ART 2004 May 23
- -4:00 - WART 2004 Sep 26
- -3:00 Arg AR%sT 2008 Oct 18
- -3:00 - ART
-#
-# San Luis (SL)
-
-Rule SanLuis 2008 2009 - Mar Sun>=8 0:00 0 -
-Rule SanLuis 2007 2008 - Oct Sun>=8 0:00 1:00 S
-
-Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1990
- -3:00 1:00 ARST 1990 Mar 14
- -4:00 - WART 1990 Oct 15
- -4:00 1:00 WARST 1991 Mar 1
- -4:00 - WART 1991 Jun 1
- -3:00 - ART 1999 Oct 3
- -4:00 1:00 WARST 2000 Mar 3
- -3:00 - ART 2004 May 31
- -4:00 - WART 2004 Jul 25
- -3:00 Arg AR%sT 2008 Jan 21
- -4:00 SanLuis WAR%sT 2009 Oct 11
- -3:00 - ART
-#
-# Santa Cruz (SC)
-Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May # Cordoba Mean Time
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1999 Oct 3
- -4:00 Arg AR%sT 2000 Mar 3
- -3:00 - ART 2004 Jun 1
- -4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT 2008 Oct 18
- -3:00 - ART
-#
-# Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
-Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May # Cordoba Mean Time
- -4:00 - ART 1930 Dec
- -4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT 1999 Oct 3
- -4:00 Arg AR%sT 2000 Mar 3
- -3:00 - ART 2004 May 30
- -4:00 - WART 2004 Jun 20
- -3:00 Arg AR%sT 2008 Oct 18
- -3:00 - ART
-
-# Aruba
-Link America/Curacao America/Aruba
-
-# Bolivia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/La_Paz -4:32:36 - LMT 1890
- -4:32:36 - CMT 1931 Oct 15 # Calamarca MT
- -4:32:36 1:00 BOST 1932 Mar 21 # Bolivia ST
- -4:00 - BOT # Bolivia Time
-
-# Brazil
-
-# From Paul Eggert (1993-11-18):
-# The mayor of Rio recently attempted to change the time zone rules
-# just in his city, in order to leave more summer time for the tourist trade.
-# The rule change lasted only part of the day;
-# the federal government refused to follow the city's rules, and business
-# was in a chaos, so the mayor backed down that afternoon.
-
-# From IATA SSIM (1996-02):
-# _Only_ the following states in BR1 observe DST: Rio Grande do Sul (RS),
-# Santa Catarina (SC), Parana (PR), Sao Paulo (SP), Rio de Janeiro (RJ),
-# Espirito Santo (ES), Minas Gerais (MG), Bahia (BA), Goias (GO),
-# Distrito Federal (DF), Tocantins (TO), Sergipe [SE] and Alagoas [AL].
-# [The last three states are new to this issue of the IATA SSIM.]
-
-# From Gwillim Law (1996-10-07):
-# Geography, history (Tocantins was part of Goias until 1989), and other
-# sources of time zone information lead me to believe that AL, SE, and TO were
-# always in BR1, and so the only change was whether or not they observed DST....
-# The earliest issue of the SSIM I have is 2/91. Each issue from then until
-# 9/95 says that DST is observed only in the ten states I quoted from 9/95,
-# along with Mato Grosso (MT) and Mato Grosso do Sul (MS), which are in BR2
-# (UTC-4).... The other two time zones given for Brazil are BR3, which is
-# UTC-5, no DST, and applies only in the state of Acre (AC); and BR4, which is
-# UTC-2, and applies to Fernando de Noronha (formerly FN, but I believe it's
-# become part of the state of Pernambuco). The boundary between BR1 and BR2
-# has never been clearly stated. They've simply been called East and West.
-# However, some conclusions can be drawn from another IATA manual: the Airline
-# Coding Directory, which lists close to 400 airports in Brazil. For each
-# airport it gives a time zone which is coded to the SSIM. From that
-# information, I'm led to conclude that the states of Amapa (AP), Ceara (CE),
-# Maranhao (MA), Paraiba (PR), Pernambuco (PE), Piaui (PI), and Rio Grande do
-# Norte (RN), and the eastern part of Para (PA) are all in BR1 without DST.
-
-# From Marcos Tadeu (1998-09-27):
-# <a href="http://pcdsh01.on.br/verao1.html">
-# Brazilian official page
-# </a>
-
-# From Jesper Norgaard (2000-11-03):
-# [For an official list of which regions in Brazil use which time zones, see:]
-# http://pcdsh01.on.br/Fusbr.htm
-# http://pcdsh01.on.br/Fusbrhv.htm
-
-# From Celso Doria via David Madeo (2002-10-09):
-# The reason for the delay this year has to do with elections in Brazil.
-#
-# Unlike in the United States, elections in Brazil are 100% computerized and
-# the results are known almost immediately. Yesterday, it was the first
-# round of the elections when 115 million Brazilians voted for President,
-# Governor, Senators, Federal Deputies, and State Deputies. Nobody is
-# counting (or re-counting) votes anymore and we know there will be a second
-# round for the Presidency and also for some Governors. The 2nd round will
-# take place on October 27th.
-#
-# The reason why the DST will only begin November 3rd is that the thousands
-# of electoral machines used cannot have their time changed, and since the
-# Constitution says the elections must begin at 8:00 AM and end at 5:00 PM,
-# the Government decided to postpone DST, instead of changing the Constitution
-# (maybe, for the next elections, it will be possible to change the clock)...
-
-# From Rodrigo Severo (2004-10-04):
-# It's just the biannual change made necessary by the much hyped, supposedly
-# modern Brazilian eletronic voting machines which, apparently, can't deal
-# with a time change between the first and the second rounds of the elections.
-
-# From Steffen Thorsen (2007-09-20):
-# Brazil will start DST on 2007-10-14 00:00 and end on 2008-02-17 00:00:
-# http://www.mme.gov.br/site/news/detail.do;jsessionid=BBA06811AFCAAC28F0285210913513DA?newsId=13975
-
-# From Paul Schulze (2008-06-24):
-# ...by law number 11.662 of April 24, 2008 (published in the "Diario
-# Oficial da Uniao"...) in Brazil there are changes in the timezones,
-# effective today (00:00am at June 24, 2008) as follows:
-#
-# a) The timezone UTC+5 is e[x]tinguished, with all the Acre state and the
-# part of the Amazonas state that had this timezone now being put to the
-# timezone UTC+4
-# b) The whole Para state now is put at timezone UTC+3, instead of just
-# part of it, as was before.
-#
-# This change follows a proposal of senator Tiao Viana of Acre state, that
-# proposed it due to concerns about open television channels displaying
-# programs inappropriate to youths in the states that had the timezone
-# UTC+5 too early in the night. In the occasion, some more corrections
-# were proposed, trying to unify the timezones of any given state. This
-# change modifies timezone rules defined in decree 2.784 of 18 June,
-# 1913.
-
-# From Rodrigo Severo (2008-06-24):
-# Just correcting the URL:
-# <a href="https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=do&secao=1&pagina=1&data=25/04/2008">
-# https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=do&secao=1&pagina=1&data=25/04/2008
-# </a>
-#
-# As a result of the above Decree I believe the America/Rio_Branco
-# timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall
-# be created to represent the...west side of the Para State. I
-# suggest this new timezone be called Santarem as the most
-# important/populated city in the affected area.
-#
-# This new timezone would be the same as the Rio_Branco timezone up to
-# the 2008/06/24 change which would be to UTC-3 instead of UTC-4.
-
-# From Alex Krivenyshev (2008-06-24):
-# This is a quick reference page for New and Old Brazil Time Zones map.
-# <a href="http://www.worldtimezone.com/brazil-time-new-old.php">
-# http://www.worldtimezone.com/brazil-time-new-old.php
-# </a>
-#
-# - 4 time zones replaced by 3 time zones-eliminating time zone UTC- 05
-# (state Acre and the part of the Amazonas will be UTC/GMT- 04) - western
-# part of Par state is moving to one timezone UTC- 03 (from UTC -04).
-
-# From Paul Eggert (2002-10-10):
-# The official decrees referenced below are mostly taken from
-# <a href="http://pcdsh01.on.br/DecHV.html">
-# Decretos sobre o Horario de Verao no Brasil
-# </a>.
-
-# From Steffen Thorsen (2008-08-29):
-# As announced by the government and many newspapers in Brazil late
-# yesterday, Brazil will start DST on 2008-10-19 (need to change rule) and
-# it will end on 2009-02-15 (current rule for Brazil is fine). Based on
-# past years experience with the elections, there was a good chance that
-# the start was postponed to November, but it did not happen this year.
-#
-# It has not yet been posted to http://pcdsh01.on.br/DecHV.html
-#
-# An official page about it:
-# <a href="http://www.mme.gov.br/site/news/detail.do?newsId=16722">
-# http://www.mme.gov.br/site/news/detail.do?newsId=16722
-# </a>
-# Note that this link does not always work directly, but must be accessed
-# by going to
-# <a href="http://www.mme.gov.br/first">
-# http://www.mme.gov.br/first
-# </a>
-#
-# One example link that works directly:
-# <a href="http://jornale.com.br/index.php?option=com_content&task=view&id=13530&Itemid=54">
-# http://jornale.com.br/index.php?option=com_content&task=view&id=13530&Itemid=54
-# (Portuguese)
-# </a>
-#
-# We have a written a short article about it as well:
-# <a href="http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html">
-# http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
-# </a>
-#
-# From Alexander Krivenyshev (2011-10-04):
-# State Bahia will return to Daylight savings time this year after 8 years off.
-# The announcement was made by Governor Jaques Wagner in an interview to a
-# television station in Salvador.
-
-# In Portuguese:
-# <a href="http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html">
-# http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html
-# </a> and
-# <a href="http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html">
-# http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html
-# </a>
-
-# From Guilherme Bernardes Rodrigues (2011-10-07):
-# There is news in the media, however there is still no decree about it.
-# I just send a e-mail to Zulmira Brandao at
-# <a href="http://pcdsh01.on.br/">http://pcdsh01.on.br/</a> the
-# official agency about time in Brazil, and she confirmed that the old rule is
-# still in force.
-
-# From Guilherme Bernardes Rodrigues (2011-10-14)
-# It's official, the President signed a decree that includes Bahia in summer
-# time.
-# [ and in a second message (same day): ]
-# I found the decree.
-#
-# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
-# Link :
-# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6">
-# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
-# </a>
-
-# From Kelley Cook (2012-10-16):
-# The governor of state of Bahia in Brazil announced on Thursday that
-# due to public pressure, he is reversing the DST policy they implemented
-# last year and will not be going to Summer Time on October 21st....
-# http://www.correio24horas.com.br/r/artigo/apos-pressoes-wagner-suspende-horario-de-verao-na-bahia
-
-# From Rodrigo Severo (2012-10-16):
-# Tocantins state will have DST.
-# http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
-
-# From Steffen Thorsen (2013-09-20):
-# Tocantins in Brazil is very likely not to observe DST from October....
-# http://conexaoto.com.br/2013/09/18/ministerio-confirma-que-tocantins-esta-fora-do-horario-de-verao-em-2013-mas-falta-publicacao-de-decreto
-# We will keep this article updated when this is confirmed:
-# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
-# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
-Rule Brazil 1931 only - Oct 3 11:00 1:00 S
-Rule Brazil 1932 1933 - Apr 1 0:00 0 -
-Rule Brazil 1932 only - Oct 3 0:00 1:00 S
-# Decree <a href="http://pcdsh01.on.br/HV23195.htm">23,195</a> (1933-10-10)
-# revoked DST.
-# Decree <a href="http://pcdsh01.on.br/HV27496.htm">27,496</a> (1949-11-24)
-# Decree <a href="http://pcdsh01.on.br/HV27998.htm">27,998</a> (1950-04-13)
-Rule Brazil 1949 1952 - Dec 1 0:00 1:00 S
-Rule Brazil 1950 only - Apr 16 1:00 0 -
-Rule Brazil 1951 1952 - Apr 1 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/HV32308.htm">32,308</a> (1953-02-24)
-Rule Brazil 1953 only - Mar 1 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/HV34724.htm">34,724</a> (1953-11-30)
-# revoked DST.
-# Decree <a href="http://pcdsh01.on.br/HV52700.htm">52,700</a> (1963-10-18)
-# established DST from 1963-10-23 00:00 to 1964-02-29 00:00
-# in SP, RJ, GB, MG, ES, due to the prolongation of the drought.
-# Decree <a href="http://pcdsh01.on.br/HV53071.htm">53,071</a> (1963-12-03)
-# extended the above decree to all of the national territory on 12-09.
-Rule Brazil 1963 only - Dec 9 0:00 1:00 S
-# Decree <a href="http://pcdsh01.on.br/HV53604.htm">53,604</a> (1964-02-25)
-# extended summer time by one day to 1964-03-01 00:00 (start of school).
-Rule Brazil 1964 only - Mar 1 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/HV55639.htm">55,639</a> (1965-01-27)
-Rule Brazil 1965 only - Jan 31 0:00 1:00 S
-Rule Brazil 1965 only - Mar 31 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/HV57303.htm">57,303</a> (1965-11-22)
-Rule Brazil 1965 only - Dec 1 0:00 1:00 S
-# Decree <a href="http://pcdsh01.on.br/HV57843.htm">57,843</a> (1966-02-18)
-Rule Brazil 1966 1968 - Mar 1 0:00 0 -
-Rule Brazil 1966 1967 - Nov 1 0:00 1:00 S
-# Decree <a href="http://pcdsh01.on.br/HV63429.htm">63,429</a> (1968-10-15)
-# revoked DST.
-# Decree <a href="http://pcdsh01.on.br/HV91698.htm">91,698</a> (1985-09-27)
-Rule Brazil 1985 only - Nov 2 0:00 1:00 S
-# Decree 92,310 (1986-01-21)
-# Decree 92,463 (1986-03-13)
-Rule Brazil 1986 only - Mar 15 0:00 0 -
-# Decree 93,316 (1986-10-01)
-Rule Brazil 1986 only - Oct 25 0:00 1:00 S
-Rule Brazil 1987 only - Feb 14 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/HV94922.htm">94,922</a> (1987-09-22)
-Rule Brazil 1987 only - Oct 25 0:00 1:00 S
-Rule Brazil 1988 only - Feb 7 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/HV96676.htm">96,676</a> (1988-09-12)
-# except for the states of AC, AM, PA, RR, RO, and AP (then a territory)
-Rule Brazil 1988 only - Oct 16 0:00 1:00 S
-Rule Brazil 1989 only - Jan 29 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/HV98077.htm">98,077</a> (1989-08-21)
-# with the same exceptions
-Rule Brazil 1989 only - Oct 15 0:00 1:00 S
-Rule Brazil 1990 only - Feb 11 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/HV99530.htm">99,530</a> (1990-09-17)
-# adopted by RS, SC, PR, SP, RJ, ES, MG, GO, MS, DF.
-# Decree 99,629 (1990-10-19) adds BA, MT.
-Rule Brazil 1990 only - Oct 21 0:00 1:00 S
-Rule Brazil 1991 only - Feb 17 0:00 0 -
-# <a href="http://pcdsh01.on.br/HV1991.htm">Unnumbered decree</a> (1991-09-25)
-# adopted by RS, SC, PR, SP, RJ, ES, MG, BA, GO, MT, MS, DF.
-Rule Brazil 1991 only - Oct 20 0:00 1:00 S
-Rule Brazil 1992 only - Feb 9 0:00 0 -
-# <a href="http://pcdsh01.on.br/HV1992.htm">Unnumbered decree</a> (1992-10-16)
-# adopted by same states.
-Rule Brazil 1992 only - Oct 25 0:00 1:00 S
-Rule Brazil 1993 only - Jan 31 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/HV942.htm">942</a> (1993-09-28)
-# adopted by same states, plus AM.
-# Decree <a href="http://pcdsh01.on.br/HV1252.htm">1,252</a> (1994-09-22;
-# web page corrected 2004-01-07) adopted by same states, minus AM.
-# Decree <a href="http://pcdsh01.on.br/HV1636.htm">1,636</a> (1995-09-14)
-# adopted by same states, plus MT and TO.
-# Decree <a href="http://pcdsh01.on.br/HV1674.htm">1,674</a> (1995-10-13)
-# adds AL, SE.
-Rule Brazil 1993 1995 - Oct Sun>=11 0:00 1:00 S
-Rule Brazil 1994 1995 - Feb Sun>=15 0:00 0 -
-Rule Brazil 1996 only - Feb 11 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/HV2000.htm">2,000</a> (1996-09-04)
-# adopted by same states, minus AL, SE.
-Rule Brazil 1996 only - Oct 6 0:00 1:00 S
-Rule Brazil 1997 only - Feb 16 0:00 0 -
-# From Daniel C. Sobral (1998-02-12):
-# In 1997, the DS began on October 6. The stated reason was that
-# because international television networks ignored Brazil's policy on DS,
-# they bought the wrong times on satellite for coverage of Pope's visit.
-# This year, the ending date of DS was postponed to March 1
-# to help dealing with the shortages of electric power.
-#
-# Decree 2,317 (1997-09-04), adopted by same states.
-Rule Brazil 1997 only - Oct 6 0:00 1:00 S
-# Decree <a href="http://pcdsh01.on.br/figuras/HV2495.JPG">2,495</a>
-# (1998-02-10)
-Rule Brazil 1998 only - Mar 1 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/figuras/Hv98.jpg">2,780</a> (1998-09-11)
-# adopted by the same states as before.
-Rule Brazil 1998 only - Oct 11 0:00 1:00 S
-Rule Brazil 1999 only - Feb 21 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/figuras/HV3150.gif">3,150</a>
-# (1999-08-23) adopted by same states.
-# Decree <a href="http://pcdsh01.on.br/DecHV99.gif">3,188</a> (1999-09-30)
-# adds SE, AL, PB, PE, RN, CE, PI, MA and RR.
-Rule Brazil 1999 only - Oct 3 0:00 1:00 S
-Rule Brazil 2000 only - Feb 27 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/DEC3592.htm">3,592</a> (2000-09-06)
-# adopted by the same states as before.
-# Decree <a href="http://pcdsh01.on.br/Dec3630.jpg">3,630</a> (2000-10-13)
-# repeals DST in PE and RR, effective 2000-10-15 00:00.
-# Decree <a href="http://pcdsh01.on.br/Dec3632.jpg">3,632</a> (2000-10-17)
-# repeals DST in SE, AL, PB, RN, CE, PI and MA, effective 2000-10-22 00:00.
-# Decree <a href="http://pcdsh01.on.br/figuras/HV3916.gif">3,916</a>
-# (2001-09-13) reestablishes DST in AL, CE, MA, PB, PE, PI, RN, SE.
-Rule Brazil 2000 2001 - Oct Sun>=8 0:00 1:00 S
-Rule Brazil 2001 2006 - Feb Sun>=15 0:00 0 -
-# Decree 4,399 (2002-10-01) repeals DST in AL, CE, MA, PB, PE, PI, RN, SE.
-# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2002/D4399.htm">4,399</a>
-Rule Brazil 2002 only - Nov 3 0:00 1:00 S
-# Decree 4,844 (2003-09-24; corrected 2003-09-26) repeals DST in BA, MT, TO.
-# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2003/D4844.htm">4,844</a>
-Rule Brazil 2003 only - Oct 19 0:00 1:00 S
-# Decree 5,223 (2004-10-01) reestablishes DST in MT.
-# <a href="http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2004/Decreto/D5223.htm">5,223</a>
-Rule Brazil 2004 only - Nov 2 0:00 1:00 S
-# Decree <a href="http://pcdsh01.on.br/DecHV5539.gif">5,539</a> (2005-09-19),
-# adopted by the same states as before.
-Rule Brazil 2005 only - Oct 16 0:00 1:00 S
-# Decree <a href="http://pcdsh01.on.br/DecHV5920.gif">5,920</a> (2006-10-03),
-# adopted by the same states as before.
-Rule Brazil 2006 only - Nov 5 0:00 1:00 S
-Rule Brazil 2007 only - Feb 25 0:00 0 -
-# Decree <a href="http://pcdsh01.on.br/DecHV6212.gif">6,212</a> (2007-09-26),
-# adopted by the same states as before.
-Rule Brazil 2007 only - Oct Sun>=8 0:00 1:00 S
-# From Frederico A. C. Neves (2008-09-10):
-# According to this decree
-# <a href="http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm">
-# http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm
-# </a>
-# [t]he DST period in Brazil now on will be from the 3rd Oct Sunday to the
-# 3rd Feb Sunday. There is an exception on the return date when this is
-# the Carnival Sunday then the return date will be the next Sunday...
-Rule Brazil 2008 max - Oct Sun>=15 0:00 1:00 S
-Rule Brazil 2008 2011 - Feb Sun>=15 0:00 0 -
-Rule Brazil 2012 only - Feb Sun>=22 0:00 0 -
-Rule Brazil 2013 2014 - Feb Sun>=15 0:00 0 -
-Rule Brazil 2015 only - Feb Sun>=22 0:00 0 -
-Rule Brazil 2016 2022 - Feb Sun>=15 0:00 0 -
-Rule Brazil 2023 only - Feb Sun>=22 0:00 0 -
-Rule Brazil 2024 2025 - Feb Sun>=15 0:00 0 -
-Rule Brazil 2026 only - Feb Sun>=22 0:00 0 -
-Rule Brazil 2027 2033 - Feb Sun>=15 0:00 0 -
-Rule Brazil 2034 only - Feb Sun>=22 0:00 0 -
-Rule Brazil 2035 2036 - Feb Sun>=15 0:00 0 -
-Rule Brazil 2037 only - Feb Sun>=22 0:00 0 -
-# From Arthur David Olson (2008-09-29):
-# The next is wrong in some years but is better than nothing.
-Rule Brazil 2038 max - Feb Sun>=15 0:00 0 -
-
-# The latest ruleset listed above says that the following states observe DST:
-# DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP.
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-#
-# Fernando de Noronha (administratively part of PE)
-Zone America/Noronha -2:09:40 - LMT 1914
- -2:00 Brazil FN%sT 1990 Sep 17
- -2:00 - FNT 1999 Sep 30
- -2:00 Brazil FN%sT 2000 Oct 15
- -2:00 - FNT 2001 Sep 13
- -2:00 Brazil FN%sT 2002 Oct 1
- -2:00 - FNT
-# Other Atlantic islands have no permanent settlement.
-# These include Trindade and Martin Vaz (administratively part of ES),
-# Atol das Rocas (RN), and Penedos de Sao Pedro e Sao Paulo (PE).
-# Fernando de Noronha was a separate territory from 1942-09-02 to 1989-01-01;
-# it also included the Penedos.
-#
-# Amapa (AP), east Para (PA)
-# East Para includes Belem, Maraba, Serra Norte, and Sao Felix do Xingu.
-# The division between east and west Para is the river Xingu.
-# In the north a very small part from the river Javary (now Jari I guess,
-# the border with Amapa) to the Amazon, then to the Xingu.
-Zone America/Belem -3:13:56 - LMT 1914
- -3:00 Brazil BR%sT 1988 Sep 12
- -3:00 - BRT
-#
-# west Para (PA)
-# West Para includes Altamira, Oribidos, Prainha, Oriximina, and Santarem.
-Zone America/Santarem -3:38:48 - LMT 1914
- -4:00 Brazil AM%sT 1988 Sep 12
- -4:00 - AMT 2008 Jun 24 00:00
- -3:00 - BRT
-#
-# Maranhao (MA), Piaui (PI), Ceara (CE), Rio Grande do Norte (RN),
-# Paraiba (PB)
-Zone America/Fortaleza -2:34:00 - LMT 1914
- -3:00 Brazil BR%sT 1990 Sep 17
- -3:00 - BRT 1999 Sep 30
- -3:00 Brazil BR%sT 2000 Oct 22
- -3:00 - BRT 2001 Sep 13
- -3:00 Brazil BR%sT 2002 Oct 1
- -3:00 - BRT
-#
-# Pernambuco (PE) (except Atlantic islands)
-Zone America/Recife -2:19:36 - LMT 1914
- -3:00 Brazil BR%sT 1990 Sep 17
- -3:00 - BRT 1999 Sep 30
- -3:00 Brazil BR%sT 2000 Oct 15
- -3:00 - BRT 2001 Sep 13
- -3:00 Brazil BR%sT 2002 Oct 1
- -3:00 - BRT
-#
-# Tocantins (TO)
-Zone America/Araguaina -3:12:48 - LMT 1914
- -3:00 Brazil BR%sT 1990 Sep 17
- -3:00 - BRT 1995 Sep 14
- -3:00 Brazil BR%sT 2003 Sep 24
- -3:00 - BRT 2012 Oct 21
- -3:00 Brazil BR%sT 2013 Sep
- -3:00 - BRT
-#
-# Alagoas (AL), Sergipe (SE)
-Zone America/Maceio -2:22:52 - LMT 1914
- -3:00 Brazil BR%sT 1990 Sep 17
- -3:00 - BRT 1995 Oct 13
- -3:00 Brazil BR%sT 1996 Sep 4
- -3:00 - BRT 1999 Sep 30
- -3:00 Brazil BR%sT 2000 Oct 22
- -3:00 - BRT 2001 Sep 13
- -3:00 Brazil BR%sT 2002 Oct 1
- -3:00 - BRT
-#
-# Bahia (BA)
-# There are too many Salvadors elsewhere, so use America/Bahia instead
-# of America/Salvador.
-Zone America/Bahia -2:34:04 - LMT 1914
- -3:00 Brazil BR%sT 2003 Sep 24
- -3:00 - BRT 2011 Oct 16
- -3:00 Brazil BR%sT 2012 Oct 21
- -3:00 - BRT
-#
-# Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
-# Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),
-# Santa Catarina (SC), Rio Grande do Sul (RS)
-Zone America/Sao_Paulo -3:06:28 - LMT 1914
- -3:00 Brazil BR%sT 1963 Oct 23 00:00
- -3:00 1:00 BRST 1964
- -3:00 Brazil BR%sT
-#
-# Mato Grosso do Sul (MS)
-Zone America/Campo_Grande -3:38:28 - LMT 1914
- -4:00 Brazil AM%sT
-#
-# Mato Grosso (MT)
-Zone America/Cuiaba -3:44:20 - LMT 1914
- -4:00 Brazil AM%sT 2003 Sep 24
- -4:00 - AMT 2004 Oct 1
- -4:00 Brazil AM%sT
-#
-# Rondonia (RO)
-Zone America/Porto_Velho -4:15:36 - LMT 1914
- -4:00 Brazil AM%sT 1988 Sep 12
- -4:00 - AMT
-#
-# Roraima (RR)
-Zone America/Boa_Vista -4:02:40 - LMT 1914
- -4:00 Brazil AM%sT 1988 Sep 12
- -4:00 - AMT 1999 Sep 30
- -4:00 Brazil AM%sT 2000 Oct 15
- -4:00 - AMT
-#
-# east Amazonas (AM): Boca do Acre, Jutai, Manaus, Floriano Peixoto
-# The great circle line from Tabatinga to Porto Acre divides
-# east from west Amazonas.
-Zone America/Manaus -4:00:04 - LMT 1914
- -4:00 Brazil AM%sT 1988 Sep 12
- -4:00 - AMT 1993 Sep 28
- -4:00 Brazil AM%sT 1994 Sep 22
- -4:00 - AMT
-#
-# west Amazonas (AM): Atalaia do Norte, Boca do Maoco, Benjamin Constant,
-# Eirunepe, Envira, Ipixuna
-Zone America/Eirunepe -4:39:28 - LMT 1914
- -5:00 Brazil AC%sT 1988 Sep 12
- -5:00 - ACT 1993 Sep 28
- -5:00 Brazil AC%sT 1994 Sep 22
- -5:00 - ACT 2008 Jun 24 00:00
- -4:00 - AMT
-#
-# Acre (AC)
-Zone America/Rio_Branco -4:31:12 - LMT 1914
- -5:00 Brazil AC%sT 1988 Sep 12
- -5:00 - ACT 2008 Jun 24 00:00
- -4:00 - AMT
-
-# Chile
-
-# From Eduardo Krell (1995-10-19):
-# The law says to switch to DST at midnight [24:00] on the second SATURDAY
-# of October.... The law is the same for March and October.
-# (1998-09-29):
-# Because of the drought this year, the government decided to go into
-# DST earlier (saturday 9/26 at 24:00). This is a one-time change only ...
-# (unless there's another dry season next year, I guess).
-
-# From Julio I. Pacheco Troncoso (1999-03-18):
-# Because of the same drought, the government decided to end DST later,
-# on April 3, (one-time change).
-
-# From Oscar van Vlijmen (2006-10-08):
-# http://www.horaoficial.cl/cambio.htm
-
-# From Jesper Norgaard Welen (2006-10-08):
-# I think that there are some obvious mistakes in the suggested link
-# from Oscar van Vlijmen,... for instance entry 66 says that GMT-4
-# ended 1990-09-12 while entry 67 only begins GMT-3 at 1990-09-15
-# (they should have been 1990-09-15 and 1990-09-16 respectively), but
-# anyhow it clears up some doubts too.
-
-# From Paul Eggert (2006-12-27):
-# The following data for Chile and America/Santiago are from
-# <http://www.horaoficial.cl/horaof.htm> (2006-09-20), transcribed by
-# Jesper Norgaard Welen. The data for Pacific/Easter are from Shanks
-# & Pottenger, except with DST transitions after 1932 cloned from
-# America/Santiago. The pre-1980 Pacific/Easter data are dubious,
-# but we have no other source.
-
-# From German Poo-Caaman~o (2008-03-03):
-# Due to drought, Chile extends Daylight Time in three weeks. This
-# is one-time change (Saturday 3/29 at 24:00 for America/Santiago
-# and Saturday 3/29 at 22:00 for Pacific/Easter)
-# The Supreme Decree is located at
-# <a href="http://www.shoa.cl/servicios/supremo316.pdf">
-# http://www.shoa.cl/servicios/supremo316.pdf
-# </a>
-# and the instructions for 2008 are located in:
-# <a href="http://www.horaoficial.cl/cambio.htm">
-# http://www.horaoficial.cl/cambio.htm
-# </a>.
-
-# From Jose Miguel Garrido (2008-03-05):
-# ...
-# You could see the announces of the change on
-# <a href="http://www.shoa.cl/noticias/2008/04hora/hora.htm">
-# http://www.shoa.cl/noticias/2008/04hora/hora.htm
-# </a>.
-
-# From Angel Chiang (2010-03-04):
-# Subject: DST in Chile exceptionally extended to 3 April due to earthquake
-# <a href="http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098">
-# http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098
-# </a>
-# (in Spanish, last paragraph).
-#
-# This is breaking news. There should be more information available later.
-
-# From Arthur Daivd Olson (2010-03-06):
-# Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
-
-# From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
-# It appears that the Chilean government has decided to postpone the
-# change from summer time to winter time again, by three weeks to April
-# 2nd:
-# <a href="http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651">
-# http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
-# </a>
-#
-# This is not yet reflected in the official "cambio de hora" site, but
-# probably will be soon:
-# <a href="http://www.horaoficial.cl/cambio.htm">
-# http://www.horaoficial.cl/cambio.htm
-# </a>
-
-# From Arthur David Olson (2011-03-02):
-# The emol.com article mentions a water shortage as the cause of the
-# postponement, which may mean that it's not a permanent change.
-
-# From Glenn Eychaner (2011-03-28):
-# The article:
-# <a href="http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}">
-# http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}
-# </a>
-#
-# In English:
-# Chile's clocks will go back an hour this year on the 7th of May instead
-# of this Saturday. They will go forward again the 3rd Saturday in
-# August, not in October as they have since 1968. This is a pilot plan
-# which will be reevaluated in 2012.
-
-# From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23):
-# As stated in the website of the Chilean Energy Ministry
-# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html
-# The Chilean Government has decided to postpone the entrance into winter time
-# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not
-# been yet formalized but it will within the next days.
-# Quote from the website communication:
-#
-# 6. For the year 2012, the dates of entry into winter time will be as follows:
-# a. Saturday April 28, 2012, clocks should go back 60 minutes; that is, at
-# 23:59:59, instead of passing to 0:00, the time should be adjusted to be 23:00
-# of the same day.
-# b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is,
-# at 23:59:59, instead of passing to 0:00, the time should be adjusted to be
-# 01:00 on September 2.
-
-# From Steffen Thorsen (2013-02-15):
-# According to several news sources, Chile has extended DST this year,
-# they will end DST later and start DST earlier than planned. They
-# hope to save energy. The new end date is 2013-04-28 00:00 and new
-# start date is 2013-09-08 00:00....
-# http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm
-
-# NOTE: ChileAQ rules for Antarctic bases are stored separately in the
-# 'antarctica' file.
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Chile 1927 1932 - Sep 1 0:00 1:00 S
-Rule Chile 1928 1932 - Apr 1 0:00 0 -
-Rule Chile 1942 only - Jun 1 4:00u 0 -
-Rule Chile 1942 only - Aug 1 5:00u 1:00 S
-Rule Chile 1946 only - Jul 15 4:00u 1:00 S
-Rule Chile 1946 only - Sep 1 3:00u 0:00 -
-Rule Chile 1947 only - Apr 1 4:00u 0 -
-Rule Chile 1968 only - Nov 3 4:00u 1:00 S
-Rule Chile 1969 only - Mar 30 3:00u 0 -
-Rule Chile 1969 only - Nov 23 4:00u 1:00 S
-Rule Chile 1970 only - Mar 29 3:00u 0 -
-Rule Chile 1971 only - Mar 14 3:00u 0 -
-Rule Chile 1970 1972 - Oct Sun>=9 4:00u 1:00 S
-Rule Chile 1972 1986 - Mar Sun>=9 3:00u 0 -
-Rule Chile 1973 only - Sep 30 4:00u 1:00 S
-Rule Chile 1974 1987 - Oct Sun>=9 4:00u 1:00 S
-Rule Chile 1987 only - Apr 12 3:00u 0 -
-Rule Chile 1988 1989 - Mar Sun>=9 3:00u 0 -
-Rule Chile 1988 only - Oct Sun>=1 4:00u 1:00 S
-Rule Chile 1989 only - Oct Sun>=9 4:00u 1:00 S
-Rule Chile 1990 only - Mar 18 3:00u 0 -
-Rule Chile 1990 only - Sep 16 4:00u 1:00 S
-Rule Chile 1991 1996 - Mar Sun>=9 3:00u 0 -
-Rule Chile 1991 1997 - Oct Sun>=9 4:00u 1:00 S
-Rule Chile 1997 only - Mar 30 3:00u 0 -
-Rule Chile 1998 only - Mar Sun>=9 3:00u 0 -
-Rule Chile 1998 only - Sep 27 4:00u 1:00 S
-Rule Chile 1999 only - Apr 4 3:00u 0 -
-Rule Chile 1999 2010 - Oct Sun>=9 4:00u 1:00 S
-Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 -
-# N.B.: the end of March 29 in Chile is March 30 in Universal time,
-# which is used below in specifying the transition.
-Rule Chile 2008 only - Mar 30 3:00u 0 -
-Rule Chile 2009 only - Mar Sun>=9 3:00u 0 -
-Rule Chile 2010 only - Apr Sun>=1 3:00u 0 -
-Rule Chile 2011 only - May Sun>=2 3:00u 0 -
-Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S
-Rule Chile 2012 max - Apr Sun>=23 3:00u 0 -
-Rule Chile 2012 max - Sep Sun>=2 4:00u 1:00 S
-# IATA SSIM anomalies: (1992-02) says 1992-03-14;
-# (1996-09) says 1998-03-08. Ignore these.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Santiago -4:42:46 - LMT 1890
- -4:42:46 - SMT 1910 # Santiago Mean Time
- -5:00 - CLT 1916 Jul 1 # Chile Time
- -4:42:46 - SMT 1918 Sep 1 # Santiago Mean Time
- -4:00 - CLT 1919 Jul 1 # Chile Time
- -4:42:46 - SMT 1927 Sep 1 # Santiago Mean Time
- -5:00 Chile CL%sT 1947 May 22 # Chile Time
- -4:00 Chile CL%sT
-Zone Pacific/Easter -7:17:44 - LMT 1890
- -7:17:28 - EMT 1932 Sep # Easter Mean Time
- -7:00 Chile EAS%sT 1982 Mar 13 21:00 # Easter I Time
- -6:00 Chile EAS%sT
-#
-# Sala y Gomez Island is like Pacific/Easter.
-# Other Chilean locations, including Juan Fernandez Is, San Ambrosio,
-# San Felix, and Antarctic bases, are like America/Santiago.
-
-# Colombia
-
-# Milne gives 4:56:16.4 for Bogota time in 1899; round to nearest. He writes,
-# "A variation of fifteen minutes in the public clocks of Bogota is not rare."
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule CO 1992 only - May 3 0:00 1:00 S
-Rule CO 1993 only - Apr 4 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Bogota -4:56:16 - LMT 1884 Mar 13
- -4:56:16 - BMT 1914 Nov 23 # Bogota Mean Time
- -5:00 CO CO%sT # Colombia Time
-# Malpelo, Providencia, San Andres
-# no information; probably like America/Bogota
-
-# Curacao
-
-# Milne gives 4:35:46.9 for Curacao mean time; round to nearest.
-#
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger say that The Bottom and Philipsburg have been at
-# -4:00 since standard time was introduced on 1912-03-02; and that
-# Kralendijk and Rincon used Kralendijk Mean Time (-4:33:08) from
-# 1912-02-02 to 1965-01-01. The former is dubious, since S&P also say
-# Saba Island has been like Curacao.
-# This all predates our 1970 cutoff, though.
-#
-# By July 2007 Curacao and St Maarten are planned to become
-# associated states within the Netherlands, much like Aruba;
-# Bonaire, Saba and St Eustatius would become directly part of the
-# Netherlands as Kingdom Islands. This won't affect their time zones
-# though, as far as we know.
-#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Curacao -4:35:47 - LMT 1912 Feb 12 # Willemstad
- -4:30 - ANT 1965 # Netherlands Antilles Time
- -4:00 - AST
-
-# From Arthur David Olson (2011-06-15):
-# use links for places with new iso3166 codes.
-# The name "Lower Prince's Quarter" is both longer than fourteen charaters
-# and contains an apostrophe; use "Lower_Princes" below.
-
-Link America/Curacao America/Lower_Princes # Sint Maarten
-Link America/Curacao America/Kralendijk # Caribbean Netherlands
-
-# Ecuador
-#
-# Milne says the Sentral and South American Telegraph Company used -5:24:15.
-#
-# From Paul Eggert (2007-03-04):
-# Apparently Ecuador had a failed experiment with DST in 1992.
-# <http://midena.gov.ec/content/view/1261/208/> (2007-02-27) and
-# <http://www.hoy.com.ec/NoticiaNue.asp?row_id=249856> (2006-11-06) both
-# talk about "hora Sixto". Leave this alone for now, as we have no data.
-#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Guayaquil -5:19:20 - LMT 1890
- -5:14:00 - QMT 1931 # Quito Mean Time
- -5:00 - ECT # Ecuador Time
-Zone Pacific/Galapagos -5:58:24 - LMT 1931 # Puerto Baquerizo Moreno
- -5:00 - ECT 1986
- -6:00 - GALT # Galapagos Time
-
-# Falklands
-
-# From Paul Eggert (2006-03-22):
-# Between 1990 and 2000 inclusive, Shanks & Pottenger and the IATA agree except
-# the IATA gives 1996-09-08. Go with Shanks & Pottenger.
-
-# From Falkland Islands Government Office, London (2001-01-22)
-# via Jesper Norgaard:
-# ... the clocks revert back to Local Mean Time at 2 am on Sunday 15
-# April 2001 and advance one hour to summer time at 2 am on Sunday 2
-# September. It is anticipated that the clocks will revert back at 2
-# am on Sunday 21 April 2002 and advance to summer time at 2 am on
-# Sunday 1 September.
-
-# From Rives McDow (2001-02-13):
-#
-# I have communicated several times with people there, and the last
-# time I had communications that was helpful was in 1998. Here is
-# what was said then:
-#
-# "The general rule was that Stanley used daylight saving and the Camp
-# did not. However for various reasons many people in the Camp have
-# started to use daylight saving (known locally as 'Stanley Time')
-# There is no rule as to who uses daylight saving - it is a matter of
-# personal choice and so it is impossible to draw a map showing who
-# uses it and who does not. Any list would be out of date as soon as
-# it was produced. This year daylight saving ended on April 18/19th
-# and started again on September 12/13th. I do not know what the rule
-# is, but can find out if you like. We do not change at the same time
-# as UK or Chile."
-#
-# I did have in my notes that the rule was "Second Saturday in Sep at
-# 0:00 until third Saturday in Apr at 0:00". I think that this does
-# not agree in some cases with Shanks; is this true?
-#
-# Also, there is no mention in the list that some areas in the
-# Falklands do not use DST. I have found in my communications there
-# that these areas are on the western half of East Falkland and all of
-# West Falkland. Stanley is the only place that consistently observes
-# DST. Again, as in other places in the world, the farmers don't like
-# it. West Falkland is almost entirely sheep farmers.
-#
-# I know one lady there that keeps a list of which farm keeps DST and
-# which doesn't each year. She runs a shop in Stanley, and says that
-# the list changes each year. She uses it to communicate to her
-# customers, catching them when they are home for lunch or dinner.
-
-# From Paul Eggert (2001-03-05):
-# For now, we'll just record the time in Stanley, since we have no
-# better info.
-
-# From Steffen Thorsen (2011-04-01):
-# The Falkland Islands will not turn back clocks this winter, but stay on
-# daylight saving time.
-#
-# One source:
-# <a href="http://www.falklandnews.com/public/story.cfm?get=5914&source=3">
-# http://www.falklandnews.com/public/story.cfm?get=5914&source=3
-# </a>
-#
-# We have gotten this confirmed by a clerk of the legislative assembly:
-# Normally the clocks revert to Local Mean Time (UTC/GMT -4 hours) on the
-# third Sunday of April at 0200hrs and advance to Summer Time (UTC/GMT -3
-# hours) on the first Sunday of September at 0200hrs.
-#
-# IMPORTANT NOTE: During 2011, on a trial basis, the Falkland Islands
-# will not revert to local mean time, but clocks will remain on Summer
-# time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term
-# change to local time following the trial period will be notified.
-#
-# From Andrew Newman (2012-02-24)
-# A letter from Justin McPhee, Chief Executive,
-# Cable & Wireless Falkland Islands (dated 2012-02-22)
-# states...
-# The current Atlantic/Stanley entry under South America expects the
-# clocks to go back to standard Falklands Time (FKT) on the 15th April.
-# The database entry states that in 2011 Stanley was staying on fixed
-# summer time on a trial basis only. FIG need to contact IANA and/or
-# the maintainers of the database to inform them we're adopting
-# the same policy this year and suggest recommendations for future years.
-#
-# For now we will assume permanent summer time for the Falklands
-# until advised differently (to apply for 2012 and beyond, after the 2011
-# experiment was apparently successful.)
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 S
-Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 -
-Rule Falk 1939 only - Oct 1 0:00 1:00 S
-Rule Falk 1940 1942 - Sep lastSun 0:00 1:00 S
-Rule Falk 1943 only - Jan 1 0:00 0 -
-Rule Falk 1983 only - Sep lastSun 0:00 1:00 S
-Rule Falk 1984 1985 - Apr lastSun 0:00 0 -
-Rule Falk 1984 only - Sep 16 0:00 1:00 S
-Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 S
-Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 -
-Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 -
-Rule Falk 2001 2010 - Sep Sun>=1 2:00 1:00 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Atlantic/Stanley -3:51:24 - LMT 1890
- -3:51:24 - SMT 1912 Mar 12 # Stanley Mean Time
- -4:00 Falk FK%sT 1983 May # Falkland Is Time
- -3:00 Falk FK%sT 1985 Sep 15
- -4:00 Falk FK%sT 2010 Sep 5 02:00
- -3:00 - FKST
-
-# French Guiana
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Cayenne -3:29:20 - LMT 1911 Jul
- -4:00 - GFT 1967 Oct # French Guiana Time
- -3:00 - GFT
-
-# Guyana
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Guyana -3:52:40 - LMT 1915 Mar # Georgetown
- -3:45 - GBGT 1966 May 26 # Br Guiana Time
- -3:45 - GYT 1975 Jul 31 # Guyana Time
- -3:00 - GYT 1991
-# IATA SSIM (1996-06) says -4:00. Assume a 1991 switch.
- -4:00 - GYT
-
-# Paraguay
-#
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger say that spring transitions are from 01:00 -> 02:00,
-# and autumn transitions are from 00:00 -> 23:00. Go with pre-1999
-# editions of Shanks, and with the IATA, who say transitions occur at 00:00.
-#
-# From Waldemar Villamayor-Venialbo (2013-09-20):
-# No time of the day is established for the adjustment, so people normally
-# adjust their clocks at 0 hour of the given dates.
-#
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Para 1975 1988 - Oct 1 0:00 1:00 S
-Rule Para 1975 1978 - Mar 1 0:00 0 -
-Rule Para 1979 1991 - Apr 1 0:00 0 -
-Rule Para 1989 only - Oct 22 0:00 1:00 S
-Rule Para 1990 only - Oct 1 0:00 1:00 S
-Rule Para 1991 only - Oct 6 0:00 1:00 S
-Rule Para 1992 only - Mar 1 0:00 0 -
-Rule Para 1992 only - Oct 5 0:00 1:00 S
-Rule Para 1993 only - Mar 31 0:00 0 -
-Rule Para 1993 1995 - Oct 1 0:00 1:00 S
-Rule Para 1994 1995 - Feb lastSun 0:00 0 -
-Rule Para 1996 only - Mar 1 0:00 0 -
-# IATA SSIM (2000-02) says 1999-10-10; ignore this for now.
-# From Steffen Thorsen (2000-10-02):
-# I have three independent reports that Paraguay changed to DST this Sunday
-# (10-01).
-#
-# Translated by Gwillim Law (2001-02-27) from
-# <a href="http://www.diarionoticias.com.py/011000/nacional/naciona1.htm">
-# Noticias, a daily paper in Asuncion, Paraguay (2000-10-01)
-# </a>:
-# Starting at 0:00 today, the clock will be set forward 60 minutes, in
-# fulfillment of Decree No. 7,273 of the Executive Power.... The time change
-# system has been operating for several years. Formerly there was a separate
-# decree each year; the new law has the same effect, but permanently. Every
-# year, the time will change on the first Sunday of October; likewise, the
-# clock will be set back on the first Sunday of March.
-#
-Rule Para 1996 2001 - Oct Sun>=1 0:00 1:00 S
-# IATA SSIM (1997-09) says Mar 1; go with Shanks & Pottenger.
-Rule Para 1997 only - Feb lastSun 0:00 0 -
-# Shanks & Pottenger say 1999-02-28; IATA SSIM (1999-02) says 1999-02-27, but
-# (1999-09) reports no date; go with above sources and Gerd Knops (2001-02-27).
-Rule Para 1998 2001 - Mar Sun>=1 0:00 0 -
-# From Rives McDow (2002-02-28):
-# A decree was issued in Paraguay (no. 16350) on 2002-02-26 that changed the
-# dst method to be from the first Sunday in September to the first Sunday in
-# April.
-Rule Para 2002 2004 - Apr Sun>=1 0:00 0 -
-Rule Para 2002 2003 - Sep Sun>=1 0:00 1:00 S
-#
-# From Jesper Norgaard Welen (2005-01-02):
-# There are several sources that claim that Paraguay made
-# a timezone rule change in autumn 2004.
-# From Steffen Thorsen (2005-01-05):
-# Decree 1,867 (2004-03-05)
-# From Carlos Raul Perasso via Jesper Norgaard Welen (2006-10-13)
-# <http://www.presidencia.gov.py/decretos/D1867.pdf>
-Rule Para 2004 2009 - Oct Sun>=15 0:00 1:00 S
-Rule Para 2005 2009 - Mar Sun>=8 0:00 0 -
-# From Carlos Raul Perasso (2010-02-18):
-# By decree number 3958 issued yesterday (
-# <a href="http://www.presidencia.gov.py/v1/wp-content/uploads/2010/02/decreto3958.pdf">
-# http://www.presidencia.gov.py/v1/wp-content/uploads/2010/02/decreto3958.pdf
-# </a>
-# )
-# Paraguay changes its DST schedule, postponing the March rule to April and
-# modifying the October date. The decree reads:
-# ...
-# Art. 1. It is hereby established that from the second Sunday of the month of
-# April of this year (2010), the official time is to be set back 60 minutes,
-# and that on the first Sunday of the month of October, it is to be set
-# forward 60 minutes, in all the territory of the Paraguayan Republic.
-# ...
-Rule Para 2010 max - Oct Sun>=1 0:00 1:00 S
-Rule Para 2010 2012 - Apr Sun>=8 0:00 0 -
-#
-# From Steffen Thorsen (2013-03-07):
-# Paraguay will end DST on 2013-03-24 00:00....
-# http://www.ande.gov.py/interna.php?id=1075
-#
-# From Carlos Raul Perasso (2013-03-15):
-# The change in Paraguay is now final. Decree number 10780
-# http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf
-Rule Para 2013 max - Mar Sun>=22 0:00 0 -
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Asuncion -3:50:40 - LMT 1890
- -3:50:40 - AMT 1931 Oct 10 # Asuncion Mean Time
- -4:00 - PYT 1972 Oct # Paraguay Time
- -3:00 - PYT 1974 Apr
- -4:00 Para PY%sT
-
-# Peru
-#
-# <a href="news:xrGmb.39935$gA1.13896113@news4.srv.hcvlny.cv.net">
-# From Evelyn C. Leeper via Mark Brader (2003-10-26):</a>
-# When we were in Peru in 1985-1986, they apparently switched over
-# sometime between December 29 and January 3 while we were on the Amazon.
-#
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger don't have this transition. Assume 1986 was like 1987.
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Peru 1938 only - Jan 1 0:00 1:00 S
-Rule Peru 1938 only - Apr 1 0:00 0 -
-Rule Peru 1938 1939 - Sep lastSun 0:00 1:00 S
-Rule Peru 1939 1940 - Mar Sun>=24 0:00 0 -
-Rule Peru 1986 1987 - Jan 1 0:00 1:00 S
-Rule Peru 1986 1987 - Apr 1 0:00 0 -
-Rule Peru 1990 only - Jan 1 0:00 1:00 S
-Rule Peru 1990 only - Apr 1 0:00 0 -
-# IATA is ambiguous for 1993/1995; go with Shanks & Pottenger.
-Rule Peru 1994 only - Jan 1 0:00 1:00 S
-Rule Peru 1994 only - Apr 1 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Lima -5:08:12 - LMT 1890
- -5:08:36 - LMT 1908 Jul 28 # Lima Mean Time?
- -5:00 Peru PE%sT # Peru Time
-
-# South Georgia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Atlantic/South_Georgia -2:26:08 - LMT 1890 # Grytviken
- -2:00 - GST # South Georgia Time
-
-# South Sandwich Is
-# uninhabited; scientific personnel have wintered
-
-# Suriname
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Paramaribo -3:40:40 - LMT 1911
- -3:40:52 - PMT 1935 # Paramaribo Mean Time
- -3:40:36 - PMT 1945 Oct # The capital moved?
- -3:30 - NEGT 1975 Nov 20 # Dutch Guiana Time
- -3:30 - SRT 1984 Oct # Suriname Time
- -3:00 - SRT
-
-# Trinidad and Tobago
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2
- -4:00 - AST
-
-Link America/Port_of_Spain America/Anguilla
-Link America/Port_of_Spain America/Dominica
-Link America/Port_of_Spain America/Grenada
-Link America/Port_of_Spain America/Guadeloupe
-Link America/Port_of_Spain America/Marigot
-Link America/Port_of_Spain America/Montserrat
-Link America/Port_of_Spain America/St_Barthelemy
-Link America/Port_of_Spain America/St_Kitts
-Link America/Port_of_Spain America/St_Lucia
-Link America/Port_of_Spain America/St_Thomas
-Link America/Port_of_Spain America/St_Vincent
-Link America/Port_of_Spain America/Tortola
-
-# Uruguay
-# From Paul Eggert (1993-11-18):
-# Uruguay wins the prize for the strangest peacetime manipulation of the rules.
-# From Shanks & Pottenger:
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-# Whitman gives 1923 Oct 1; go with Shanks & Pottenger.
-Rule Uruguay 1923 only - Oct 2 0:00 0:30 HS
-Rule Uruguay 1924 1926 - Apr 1 0:00 0 -
-Rule Uruguay 1924 1925 - Oct 1 0:00 0:30 HS
-Rule Uruguay 1933 1935 - Oct lastSun 0:00 0:30 HS
-# Shanks & Pottenger give 1935 Apr 1 0:00 & 1936 Mar 30 0:00; go with Whitman.
-Rule Uruguay 1934 1936 - Mar Sat>=25 23:30s 0 -
-Rule Uruguay 1936 only - Nov 1 0:00 0:30 HS
-Rule Uruguay 1937 1941 - Mar lastSun 0:00 0 -
-# Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
-Rule Uruguay 1937 1940 - Oct lastSun 0:00 0:30 HS
-# Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
-# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
-Rule Uruguay 1941 only - Aug 1 0:00 0:30 HS
-Rule Uruguay 1942 only - Jan 1 0:00 0 -
-Rule Uruguay 1942 only - Dec 14 0:00 1:00 S
-Rule Uruguay 1943 only - Mar 14 0:00 0 -
-Rule Uruguay 1959 only - May 24 0:00 1:00 S
-Rule Uruguay 1959 only - Nov 15 0:00 0 -
-Rule Uruguay 1960 only - Jan 17 0:00 1:00 S
-Rule Uruguay 1960 only - Mar 6 0:00 0 -
-Rule Uruguay 1965 1967 - Apr Sun>=1 0:00 1:00 S
-Rule Uruguay 1965 only - Sep 26 0:00 0 -
-Rule Uruguay 1966 1967 - Oct 31 0:00 0 -
-Rule Uruguay 1968 1970 - May 27 0:00 0:30 HS
-Rule Uruguay 1968 1970 - Dec 2 0:00 0 -
-Rule Uruguay 1972 only - Apr 24 0:00 1:00 S
-Rule Uruguay 1972 only - Aug 15 0:00 0 -
-Rule Uruguay 1974 only - Mar 10 0:00 0:30 HS
-Rule Uruguay 1974 only - Dec 22 0:00 1:00 S
-Rule Uruguay 1976 only - Oct 1 0:00 0 -
-Rule Uruguay 1977 only - Dec 4 0:00 1:00 S
-Rule Uruguay 1978 only - Apr 1 0:00 0 -
-Rule Uruguay 1979 only - Oct 1 0:00 1:00 S
-Rule Uruguay 1980 only - May 1 0:00 0 -
-Rule Uruguay 1987 only - Dec 14 0:00 1:00 S
-Rule Uruguay 1988 only - Mar 14 0:00 0 -
-Rule Uruguay 1988 only - Dec 11 0:00 1:00 S
-Rule Uruguay 1989 only - Mar 12 0:00 0 -
-Rule Uruguay 1989 only - Oct 29 0:00 1:00 S
-# Shanks & Pottenger say no DST was observed in 1990/1 and 1991/2,
-# and that 1992/3's DST was from 10-25 to 03-01. Go with IATA.
-Rule Uruguay 1990 1992 - Mar Sun>=1 0:00 0 -
-Rule Uruguay 1990 1991 - Oct Sun>=21 0:00 1:00 S
-Rule Uruguay 1992 only - Oct 18 0:00 1:00 S
-Rule Uruguay 1993 only - Feb 28 0:00 0 -
-# From Eduardo Cota (2004-09-20):
-# The uruguayan government has decreed a change in the local time....
-# http://www.presidencia.gub.uy/decretos/2004091502.htm
-Rule Uruguay 2004 only - Sep 19 0:00 1:00 S
-# From Steffen Thorsen (2005-03-11):
-# Uruguay's DST was scheduled to end on Sunday, 2005-03-13, but in order to
-# save energy ... it was postponed two weeks....
-# http://www.presidencia.gub.uy/_Web/noticias/2005/03/2005031005.htm
-Rule Uruguay 2005 only - Mar 27 2:00 0 -
-# From Eduardo Cota (2005-09-27):
-# http://www.presidencia.gub.uy/_Web/decretos/2005/09/CM%20119_09%2009%202005_00001.PDF
-# This means that from 2005-10-09 at 02:00 local time, until 2006-03-12 at
-# 02:00 local time, official time in Uruguay will be at GMT -2.
-Rule Uruguay 2005 only - Oct 9 2:00 1:00 S
-Rule Uruguay 2006 only - Mar 12 2:00 0 -
-# From Jesper Norgaard Welen (2006-09-06):
-# http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
-Rule Uruguay 2006 max - Oct Sun>=1 2:00 1:00 S
-Rule Uruguay 2007 max - Mar Sun>=8 2:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Montevideo -3:44:44 - LMT 1898 Jun 28
- -3:44:44 - MMT 1920 May 1 # Montevideo MT
- -3:30 Uruguay UY%sT 1942 Dec 14 # Uruguay Time
- -3:00 Uruguay UY%sT
-
-# Venezuela
-#
-# From John Stainforth (2007-11-28):
-# ... the change for Venezuela originally expected for 2007-12-31 has
-# been brought forward to 2007-12-09. The official announcement was
-# published today in the "Gaceta Oficial de la Republica Bolivariana
-# de Venezuela, numero 38.819" (official document for all laws or
-# resolution publication)
-# http://www.globovision.com/news.php?nid=72208
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Caracas -4:27:44 - LMT 1890
- -4:27:40 - CMT 1912 Feb 12 # Caracas Mean Time?
- -4:30 - VET 1965 # Venezuela Time
- -4:00 - VET 2007 Dec 9 03:00
- -4:30 - VET
diff --git a/jdk/make/sun/javazic/tzdata_jdk/gmt b/jdk/make/sun/javazic/tzdata_jdk/gmt
deleted file mode 100644
index 0be3179..0000000
--- a/jdk/make/sun/javazic/tzdata_jdk/gmt
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone GMT 0:00 - GMT
diff --git a/jdk/make/sun/javazic/tzdata_jdk/jdk11_backward b/jdk/make/sun/javazic/tzdata_jdk/jdk11_backward
deleted file mode 100644
index 4869516..0000000
--- a/jdk/make/sun/javazic/tzdata_jdk/jdk11_backward
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-# JDK 1.1.x compatible time zone IDs
-#
-
-Link Australia/Darwin ACT
-Link Australia/Sydney AET
-Link America/Argentina/Buenos_Aires AGT
-Link Africa/Cairo ART
-Link America/Anchorage AST
-Link America/Sao_Paulo BET
-Link Asia/Dhaka BST
-Link Africa/Harare CAT
-Link America/St_Johns CNT
-Link America/Chicago CST
-Link Asia/Shanghai CTT
-Link Africa/Addis_Ababa EAT
-Link Europe/Paris ECT
-Link America/New_York EST
-Link Pacific/Honolulu HST
-Link America/Indianapolis IET
-Link Asia/Calcutta IST
-Link Asia/Tokyo JST
-Link Pacific/Apia MIT
-Link America/Denver MST
-Link Asia/Yerevan NET
-Link Pacific/Auckland NST
-Link Asia/Karachi PLT
-Link America/Phoenix PNT
-Link America/Puerto_Rico PRT
-Link America/Los_Angeles PST
-Link Pacific/Guadalcanal SST
-Link Asia/Saigon VST
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
-Rule SystemV min 1973 - Oct lastSun 2:00 0 S
-Rule SystemV 1974 only - Jan 6 2:00 1:00 D
-Rule SystemV 1974 only - Nov lastSun 2:00 0 S
-Rule SystemV 1975 only - Feb 23 2:00 1:00 D
-Rule SystemV 1975 only - Oct lastSun 2:00 0 S
-Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
-Rule SystemV 1976 max - Oct lastSun 2:00 0 S
-
-# Zone NAME GMTOFF RULES/SAVE FORMAT [UNTIL]
-Zone SystemV/AST4ADT -4:00 SystemV A%sT
-Zone SystemV/EST5EDT -5:00 SystemV E%sT
-Zone SystemV/CST6CDT -6:00 SystemV C%sT
-Zone SystemV/MST7MDT -7:00 SystemV M%sT
-Zone SystemV/PST8PDT -8:00 SystemV P%sT
-Zone SystemV/YST9YDT -9:00 SystemV Y%sT
-Zone SystemV/AST4 -4:00 - AST
-Zone SystemV/EST5 -5:00 - EST
-Zone SystemV/CST6 -6:00 - CST
-Zone SystemV/MST7 -7:00 - MST
-Zone SystemV/PST8 -8:00 - PST
-Zone SystemV/YST9 -9:00 - YST
-Zone SystemV/HST10 -10:00 - HST
diff --git a/jdk/make/sun/javazic/tzdata_jdk/jdk11_full_backward b/jdk/make/sun/javazic/tzdata_jdk/jdk11_full_backward
deleted file mode 100644
index 321180a..0000000
--- a/jdk/make/sun/javazic/tzdata_jdk/jdk11_full_backward
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-# JDK 1.1.x compatible time zone IDs
-#
-
-Link Australia/Darwin ACT
-Link Australia/Sydney AET
-Link America/Argentina/Buenos_Aires AGT
-Link Africa/Cairo ART
-Link America/Anchorage AST
-Link America/Sao_Paulo BET
-Link Asia/Dhaka BST
-Link Africa/Harare CAT
-Link America/St_Johns CNT
-Link America/Chicago CST
-Link Asia/Shanghai CTT
-Link Africa/Addis_Ababa EAT
-Link Europe/Paris ECT
-Link America/New_York EST
-Link Pacific/Honolulu HST
-Link America/Indiana/Indianapolis IET
-Link Asia/Calcutta IST
-Link Asia/Tokyo JST
-Link Pacific/Apia MIT
-Link America/Denver MST
-Link Asia/Yerevan NET
-Link Pacific/Auckland NST
-Link Asia/Karachi PLT
-Link America/Phoenix PNT
-Link America/Puerto_Rico PRT
-Link America/Los_Angeles PST
-Link Pacific/Guadalcanal SST
-Link Asia/Saigon VST
-
-# The follwong link is required to generate JDK 1.2.x and 1.3.x
-# compatible zones. In the Olson public source, MET is defined as
-# GMT+1:00 with the C-Eur rules. In JDK, MET is defined as an alias
-# of Asia/Tehran. This line must be removed if a full set of Olson
-# zones is generated. Otherwise, MET appears twice in the
-# ZoneInfoMappings.IDs table.
-Link Asia/Tehran MET
-
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
-Rule SystemV min 1973 - Oct lastSun 2:00 0 S
-Rule SystemV 1974 only - Jan 6 2:00 1:00 D
-Rule SystemV 1974 only - Nov lastSun 2:00 0 S
-Rule SystemV 1975 only - Feb 23 2:00 1:00 D
-Rule SystemV 1975 only - Oct lastSun 2:00 0 S
-Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
-Rule SystemV 1976 max - Oct lastSun 2:00 0 S
-
-# Zone NAME GMTOFF RULES/SAVE FORMAT [UNTIL]
-Zone SystemV/AST4ADT -4:00 SystemV A%sT
-Zone SystemV/EST5EDT -5:00 SystemV E%sT
-Zone SystemV/CST6CDT -6:00 SystemV C%sT
-Zone SystemV/MST7MDT -7:00 SystemV M%sT
-Zone SystemV/PST8PDT -8:00 SystemV P%sT
-Zone SystemV/YST9YDT -9:00 SystemV Y%sT
-Zone SystemV/AST4 -4:00 - AST
-Zone SystemV/EST5 -5:00 - EST
-Zone SystemV/CST6 -6:00 - CST
-Zone SystemV/MST7 -7:00 - MST
-Zone SystemV/PST8 -8:00 - PST
-Zone SystemV/YST9 -9:00 - YST
-Zone SystemV/HST10 -10:00 - HST
-
-#
-# For the UTC change in Mustang
-#
-Link GMT UTC
diff --git a/jdk/make/sun/jawt/Depend.mak b/jdk/make/sun/jawt/Depend.mak
deleted file mode 100644
index baff40b..0000000
--- a/jdk/make/sun/jawt/Depend.mak
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# This makefile must be executed on a system with makedepend, such as Solaris.
-# In my copious amount of spare time, I hope to write a Java-based makedepend
-# to eliminate this dependency (no pun intended). TB
-
-BUILD_DIR = ../..
-TOPDIR = ../../..
-
-STUBDIR = WindowsSystemHeaderStubs
-BUILDSTUBDIR = BuildStubs
-
-SHARE_SRC = $(TOPDIR)/src/share
-SUN_SRC = $(SHARE_SRC)/native/sun
-COMP_SRC = $(SUN_SRC)/awt/alphacomposite
-DEBUG_SRC = $(SUN_SRC)/awt/debug
-IMG_SRC = $(SUN_SRC)/awt/image
-MEDIA_SRC = $(SUN_SRC)/awt/medialib
-J2D_SRC = $(SUN_SRC)/java2d
-J2D_WINDOWS_SRC = $(WINDOWS_SRC)/native/sun/java2d
-J2D_FONT_SRC = $(SUN_SRC)/font
-LOOP_SRC = $(SUN_SRC)/java2d/loops
-PIPE_SRC = $(SUN_SRC)/java2d/pipe
-WINDOWS_SRC = $(TOPDIR)/src/windows
-SRC = $(WINDOWS_SRC)/native/sun/windows
-
-SRCDIRS = \
- $(COMP_SRC) \
- $(DEBUG_SRC) \
- $(IMG_SRC) \
- $(IMG_SRC)/cvutils \
- $(IMG_SRC)/gif \
- $(MEDIA_SRC) \
- $(J2D_SRC) \
- $(J2D_FONT_SRC) \
- $(J2D_WINDOWS_SRC)/windows \
- $(J2D_WINDOWS_SRC)/d3d \
- $(J2D_WINDOWS_SRC)/opengl \
- $(LOOP_SRC) \
- $(PIPE_SRC) \
- $(SRC)
-
-INCLUDES = \
- -I$(STUBDIR) \
- -I$(BUILDSTUBDIR) \
- -I$(SHARE_SRC)/javavm/export \
- -I$(WINDOWS_SRC)/javavm/export \
- -I$(SHARE_SRC)/native/common \
- -I$(WINDOWS_SRC)/native/common \
- -I$(SUN_SRC)/dc/doe \
- -I$(SUN_SRC)/dc/path \
- -I$(COMP_SRC) \
- -I$(DEBUG_SRC) \
- -I$(IMG_SRC) \
- -I$(IMG_SRC)/cvutils \
- -I$(MEDIA_SRC) \
- -I$(J2D_SRC) \
- -I$(J2D_FONT_SRC) \
- -I$(J2D_WINDOWS_SRC) \
- -I$(J2D_WINDOWS_SRC)/windows \
- -I$(J2D_WINDOWS_SRC)/d3d \
- -I$(J2D_WINDOWS_SRC)/opengl \
- -I$(LOOP_SRC) \
- -I$(PIPE_SRC) \
- -I$(SRC)
-
-STUBFILES = \
- $(STUBDIR)/ddraw.h \
- $(STUBDIR)/Ole2.h \
- $(STUBDIR)/d3d.h \
- $(STUBDIR)/d3dx.h \
- $(STUBDIR)/cderr.h \
- $(STUBDIR)/commdlg.h \
- $(STUBDIR)/direct.h \
- $(STUBDIR)/imm.h \
- $(STUBDIR)/ime.h \
- $(STUBDIR)/io.h \
- $(STUBDIR)/mmsystem.h \
- $(STUBDIR)/new.h \
- $(STUBDIR)/new \
- $(STUBDIR)/shellapi.h \
- $(STUBDIR)/shlobj.h \
- $(STUBDIR)/tchar.h \
- $(STUBDIR)/winbase.h \
- $(STUBDIR)/windef.h \
- $(STUBDIR)/windows.h \
- $(STUBDIR)/winspool.h \
- $(STUBDIR)/winuser.h \
- $(STUBDIR)/wtypes.h
-
-default: dependencies
-
-FILES_cpp = jawt.cpp
-
-dependencies:
- rm -rf make.depend
- rm -rf make.tmp make.tmp2 make.tmp.bak
- rm -rf $(STUBDIR) $(BUILDSTUBDIR) depend.filelist
- for file in $(FILES_c) $(FILES_cpp) $(EXTRAFILES_c); do \
- for dir in $(SRCDIRS); do \
- if [ -f $$dir/$$file ]; then \
- echo $$dir/$$file >>depend.filelist; \
- fi; \
- if [ -f $$dir/$${file}pp ]; then \
- echo $$dir/$${file}pp >>depend.filelist; \
- fi; \
- done; \
- done
- touch make.tmp
- mkdir $(STUBDIR)
- touch $(STUBFILES)
- mkdir $(BUILDSTUBDIR)
- gnumake -f Depend.mak classhdrstubs
- cat depend.filelist | xargs -n 100 makedepend \
- -DWIN32 -D_X86X -Dx86 -DDEBUG -D_MSC_VER -DMLIB_NO_LIBSUNMATH \
- -a -f make.tmp -o.obj $(INCLUDES)
- fgrep .obj make.tmp | sed -f Depend.sed | sort -u | nawk -f ../awt/CondenseRules.awk > make.depend
- rm -rf make.tmp make.tmp2 make.tmp.bak
- rm -rf $(STUBDIR) $(BUILDSTUBDIR) depend.filelist
-
-
-include ../awt/FILES_export_windows.gmk
-
-FILES_java = $(FILES_export) $(FILES_export2) $(FILES_export3)
-
-classhdrstubs:
- for file in `echo $(FILES_java) | \
- tr ' ' '\n' | \
- sed -e 'y/\//_/' -e 's/\.java/.h/'`; do \
- echo "#include <jni.h>" > $(BUILDSTUBDIR)/$$file; \
- done
diff --git a/jdk/make/sun/jawt/Depend.sed b/jdk/make/sun/jawt/Depend.sed
deleted file mode 100644
index 72e529f..0000000
--- a/jdk/make/sun/jawt/Depend.sed
+++ /dev/null
@@ -1,32 +0,0 @@
-# Unqualify std headers
-# remove headers with no extension as well (e.g. C++ 94 STL headers) - robi
-# s/ \/usr\/include[^ ]*\.h//g
-s/ \/usr\/include[^ ]*//g
-
-# Unqualify std Windows headers
-# remove headers with no extension as well (e.g. C++ 94 STL headers) - robi
-# s/ WindowsSystemHeaderStubs[^ ]*\.h//g
-s/ WindowsSystemHeaderStubs[^ ]*//g
-
-# ####################################
-# Rules to allow for generation of dependencies on an unbuilt tree...
-#
-# BuildStubs is populated with stubs for include files that are
-# generated by the build and then dependencies are adjusted here
-#
-# Adjust awt_colors.h
-# Change BuildStubs to .
-s/ BuildStubs\/awt_colors.h/ $(OBJDIR)\/awt_colors.h/g
-#
-# Adjust CClassHeaders
-# Change BuildStubs to CClassHeaders
-s/ BuildStubs/ $(CLASSHDRDIR)\/..\/..\/awt\/CClassHeaders/g
-#
-# End of unbuilt tree adjustments
-# ####################################
-
-# Remove any empty rules
-/:[ ]*$/d
-
-# Change .obj path from src to proper awt/obj or awt/obj_g directory
-s/^.*\/\(.*:\)/$(OBJDIR)\/\1:/
diff --git a/jdk/make/sun/jawt/Makefile b/jdk/make/sun/jawt/Makefile
deleted file mode 100644
index 0520fc1..0000000
--- a/jdk/make/sun/jawt/Makefile
+++ /dev/null
@@ -1,178 +0,0 @@
-#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.awt
-LIBRARY = jawt
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# libjawt links to other programs, but nothing links to it directly. An RPATH
-# entry has been added to the launcher so third-party programs linked against
-# it will be able to find it no matter where the JDK or the third-party program
-# is located.
-#
-
-#
-# Files
-#
-ifeq ($(PLATFORM), windows)
-FILES_cpp = jawt.cpp
-else ifeq ($(PLATFORM), macosx) # PLATFORM
-FILES_objc = jawt.m
-else # PLATFORM
-FILES_c = jawt.c
-endif # PLATFORM
-
-FILES_h = $(INCLUDEDIR)/jawt.h \
- $(PLATFORM_INCLUDE)/jawt_md.h
-
-#
-# Use mapfile
-#
-FILES_m = mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-
-ifeq ($(PLATFORM), windows)
-#
-# Extra C flags.
-#
-
-OTHER_CXXFLAGS += $(GX_OPTION) -DUNICODE -D_UNICODE
-
-#
-# Other extra flags needed for compiling.
-#
-CPPFLAGS += -I$(SHARE_SRC)/native/common \
- -I$(PLATFORM_SRC)/native/sun/windows \
- -I$(CLASSHDRDIR)/../../awt/CClassHeaders \
- -I$(SHARE_SRC)/native/sun/awt/debug \
- -I$(SHARE_SRC)/native/sun/font \
- -I$(SHARE_SRC)/native/sun/java2d \
- -I$(SHARE_SRC)/native/sun/java2d/loops \
- -I$(SHARE_SRC)/native/sun/java2d/pipe \
- -I$(PLATFORM_SRC)/native/sun/java2d \
- -I$(PLATFORM_SRC)/native/sun/java2d/windows \
- -I$(PLATFORM_SRC)/native/sun/java2d/d3d \
- -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
- -I$(SHARE_SRC)/javavm/export \
- -I$(PLATFORM_SRC)/javavm/export
-INSTALL_DOT_LIB = true
-
-vpath %.cpp $(PLATFORM_SRC)/native/sun/windows
-
-#
-# Libraries to link in.
-#
-ifeq ($(ARCH_DATA_MODEL), 64)
-OTHER_LDLIBS = $(OBJDIR)/../../awt/$(OBJDIRNAME)/awt.lib
-else
-OTHER_LDLIBS = kernel32.lib \
- $(OBJDIR)/../../awt/$(OBJDIRNAME)/awt.lib
-endif
-else # PLATFORM
-
-#
-# Other extra flags needed for compiling.
-#
-CPPFLAGS += -I$(OPENWIN_HOME)/include \
- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(SHARE_SRC)/native/$(PKGDIR)/image \
- -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
- -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
- -I$(SHARE_SRC)/native/$(PKGDIR)/medialib \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11 \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
- $(EVENT_MODEL)
-
-#
-# Libraries to link in.
-#
-ifeq ($(PLATFORM), solaris)
- ifndef BUILD_HEADLESS_ONLY
- OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -lawt_xawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender
- else
- OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -lawt_headless -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender
- endif
-endif # PLATFORM
-
-ifeq ($(PLATFORM), linux)
- ifndef BUILD_HEADLESS_ONLY
- OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -lawt_xawt
- else
- OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -lawt_headless
- CFLAGS += -DHEADLESS
- endif
-endif # PLATFORM
-
-ifeq ($(PLATFORM), macosx)
-vpath %.m $(call NativeSrcDirList,,native/sun/awt)
-OTHER_LDLIBS = -lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \
- -framework Cocoa
-endif # PLATFORM
-
-endif # PLATFORM
-
-#
-# Lets not remove any class files.
-#
-DONT_CLOBBER_CLASSES = true
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Library.gmk
-
-build: $(FILES_h)
-
-ifeq ($(PLATFORM), windows)
-include make.depend
-endif
-
-#
-# Install header files.
-#
-$(INCLUDEDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
- $(install-file)
-$(PLATFORM_INCLUDE)/%.h: $(PLATFORM_SRC)/javavm/export/%.h
- $(install-file)
-
-
-#
-# Extra clean rule.
-#
-clean clobber::
- $(RM) $(FILES_h)
-
diff --git a/jdk/make/sun/jawt/make.depend b/jdk/make/sun/jawt/make.depend
deleted file mode 100644
index 2eefe09..0000000
--- a/jdk/make/sun/jawt/make.depend
+++ /dev/null
@@ -1 +0,0 @@
-$(OBJDIR)/jawt.obj:: $(CLASSHDRDIR)/../../awt/CClassHeaders/java_awt_AWTEvent.h $(CLASSHDRDIR)/../../awt/CClassHeaders/java_awt_Component.h $(CLASSHDRDIR)/../../awt/CClassHeaders/java_awt_Dimension.h $(CLASSHDRDIR)/../../awt/CClassHeaders/java_awt_Event.h $(CLASSHDRDIR)/../../awt/CClassHeaders/java_awt_Font.h $(CLASSHDRDIR)/../../awt/CClassHeaders/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/../../awt/CClassHeaders/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/../../awt/CClassHeaders/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/../../awt/CClassHeaders/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/../../awt/CClassHeaders/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/../../awt/CClassHeaders/sun_awt_PlatformFont.h $(CLASSHDRDIR)/../../awt/CClassHeaders/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/../../awt/CClassHeaders/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/../../awt/CClassHeaders/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/../../awt/CClassHeaders/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/jawt.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jawt_md.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DrawingSurface.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/stdhdrs.h
diff --git a/jdk/make/sun/jawt/mapfile-vers b/jdk/make/sun/jawt/mapfile-vers
deleted file mode 100644
index a7c216c4..0000000
--- a/jdk/make/sun/jawt/mapfile-vers
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- global:
- JAWT_GetAWT;
- local:
- *;
-};
diff --git a/jdk/make/sun/jconsole/FILES.gmk b/jdk/make/sun/jconsole/FILES.gmk
deleted file mode 100644
index 88a5c1f..0000000
--- a/jdk/make/sun/jconsole/FILES.gmk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Files that just need cp.
-#
-
-MANIFEST = sun/tools/jconsole/manifest
-
-PNG_FILES = \
- sun/tools/jconsole/resources/brandlogo.png \
- sun/tools/jconsole/resources/collapse-winlf.png \
- sun/tools/jconsole/resources/connected16.png \
- sun/tools/jconsole/resources/connected24.png \
- sun/tools/jconsole/resources/disconnected16.png \
- sun/tools/jconsole/resources/disconnected24.png \
- sun/tools/jconsole/resources/expand-winlf.png \
- sun/tools/jconsole/resources/masthead-left.png \
- sun/tools/jconsole/resources/masthead-right.png
-
-GIF_FILES = \
- sun/tools/jconsole/resources/mbean.gif \
- sun/tools/jconsole/resources/mbeanserverdelegate.gif \
- sun/tools/jconsole/resources/xobject.gif
-
-PROP_FILES = \
- sun/tools/jconsole/resources/messages.properties \
- sun/tools/jconsole/resources/messages_ja.properties \
- sun/tools/jconsole/resources/messages_zh_CN.properties
diff --git a/jdk/make/sun/jconsole/Makefile b/jdk/make/sun/jconsole/Makefile
deleted file mode 100644
index b859848..0000000
--- a/jdk/make/sun/jconsole/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building jconsole
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.tools.jconsole
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-# This program must contain a manifest that defines the execution level
-# needed to follow standard Vista User Access Control Guidelines
-# This must be set before Program.gmk is included
-#
-BUILD_MANIFEST=true
-
-
-JARFILE = $(LIBDIR)/jconsole.jar
-
-OTHER_JAVACFLAGS += -encoding iso8859-1
-
-#
-# Files
-#
-include FILES.gmk
-
-AUTO_FILES_JAVA_DIRS = sun/tools/jconsole \
- com/sun/tools/jconsole
-
-FILES_png = $(PNG_FILES:%.png=$(CLASSBINDIR)/%.png)
-FILES_gif = $(GIF_FILES:%.gif=$(CLASSBINDIR)/%.gif)
-FILES_prop = $(PROP_FILES:%.properties=$(CLASSBINDIR)/%.properties)
-build: $(GENSRCDIR)/sun/tools/jconsole/Version.java
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/resources/messages.properties
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-build: $(FILES_png) $(FILES_gif) $(FILES_prop) $(TEMPDIR)/manifest $(JARFILE)
-
-$(GENSRCDIR)/sun/tools/jconsole/Version.java: \
- $(SHARE_SRC)/classes/sun/tools/jconsole/Version.java.template
- $(MKDIR) -p $(@D)
- $(SED) -e 's/@@jconsole_version@@/$(FULL_VERSION)/g' $< > $@
-
-$(CLASSBINDIR)/$(PKGDIR)/resources/%: $(SHARE_SRC)/classes/$(PKGDIR)/resources/%
- @$(MKDIR) -p $(@D)
- $(install-file)
-
-$(TEMPDIR)/manifest: $(SHARE_SRC)/classes/$(PKGDIR)/manifest
- $(install-manifest-file)
-
-#
-# Extra rule to build jconsole.jar
-#
-
-$(JARFILE): $(LIBDIR) $(FILES_class) $(FILES_png) $(FILES_gif) $(FILES_prop) $(TEMPDIR)/manifest
- $(BOOT_JAR_CMD) -cfm $(JARFILE) $(TEMPDIR)/manifest \
- -C $(CLASSBINDIR) sun/tools/jconsole \
- -C $(CLASSBINDIR) com/sun/tools/jconsole \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-clean clobber::
- $(RM) $(TEMPDIR)/manifest $(JARFILE)
- $(RM) $(GENSRCDIR)/sun/tools/jconsole/Version.java
-
diff --git a/jdk/make/sun/jdga/Makefile b/jdk/make/sun/jdga/Makefile
deleted file mode 100644
index a11b589..0000000
--- a/jdk/make/sun/jdga/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-
-BUILDDIR = ../..
-PACKAGE = sun.jdga
-LIBRARY = sunwjdga
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-FILES_c = \
- dgalock.c
-
-#
-# Add use of mapfile
-#
-ifeq ($(ARCH_FAMILY), sparc)
-FILES_m = mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-endif
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Add to the ambient vpath to pick up files in subdirectories
-#
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)
-
-ifneq ($(PLATFORM), windows)
- LDLIBS = -ldga -lX11 $(LIBDL) -lc
-
- CPPFLAGS += \
- -I$(SHARE_SRC)/javavm/export \
- -I$(PLATFORM_SRC)/javavm/export \
- -I$(OPENWIN_HOME)/include
-endif
-
-LDFLAGS += -L$(OPENWIN_LIB) -R$(OPENWIN_RUNTIME_LIB)
diff --git a/jdk/make/sun/jdga/mapfile-vers b/jdk/make/sun/jdga/mapfile-vers
deleted file mode 100644
index d895b20..0000000
--- a/jdk/make/sun/jdga/mapfile-vers
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- global:
- JDgaLibInit;
- local:
- *;
-};
diff --git a/jdk/make/sun/jpeg/FILES_c.gmk b/jdk/make/sun/jpeg/FILES_c.gmk
deleted file mode 100644
index 5e656f6..0000000
--- a/jdk/make/sun/jpeg/FILES_c.gmk
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- imageioJPEG.c \
- jpegdecoder.c \
- jcomapi.c \
- jdapimin.c \
- jdapistd.c \
- jdcoefct.c \
- jdcolor.c \
- jddctmgr.c \
- jdhuff.c \
- jdinput.c \
- jdmainct.c \
- jdmarker.c \
- jdmaster.c \
- jdmerge.c \
- jdphuff.c \
- jdpostct.c \
- jdsample.c \
- jerror.c \
- jidctflt.c \
- jidctfst.c \
- jidctint.c \
- jidctred.c \
- jmemmgr.c \
- jmemnobs.c \
- jquant1.c \
- jquant2.c \
- jutils.c \
- jcapimin.c \
- jcapistd.c \
- jccoefct.c \
- jccolor.c \
- jcdctmgr.c \
- jchuff.c \
- jcinit.c \
- jcmainct.c \
- jcmarker.c \
- jcmaster.c \
- jcparam.c \
- jcphuff.c \
- jcprepct.c \
- jcsample.c \
- jctrans.c \
- jdtrans.c \
- jfdctflt.c \
- jfdctfst.c \
- jfdctint.c
-
-ifndef OPENJDK
-FILES_c += \
- jpegimagedecoderimpl.c \
- jpegimageencoderimpl.c \
- jpegparam.c
-endif
diff --git a/jdk/make/sun/jpeg/Makefile b/jdk/make/sun/jpeg/Makefile
deleted file mode 100644
index f73acf3..0000000
--- a/jdk/make/sun/jpeg/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.awt
-LIBRARY = jpeg
-PRODUCT = sun
-
-# Use highest optimization level
-OPTIMIZATION_LEVEL = HIGHEST
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_c.gmk
-
-AUTO_FILES_JAVA_DIRS = sun/awt/image com/sun/imageio/plugins/jpeg
-
-FILES_export = \
- sun/awt/image/JPEGImageDecoder.java \
- com/sun/imageio/plugins/jpeg/JPEGImageReader.java \
- com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
-
-# OpenJDK doesn't use the non-standard jpeg classes which we hope to remove.
-ifndef OPENJDK
-FILES_m = mapfile-vers-closed
-FILES_export += \
- sun/awt/image/codec/JPEGImageDecoderImpl.java \
- sun/awt/image/codec/JPEGImageEncoderImpl.java
-vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)/image/jpeg
-OTHER_INCLUDES += -I$(CLOSED_SRC)/share/native/$(PKGDIR)/image/jpeg
-endif
-
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
-
-# Rules
-#
-ifeq ($(PLATFORM), solaris)
- ifneq ($(ARCH), amd64)
- FILES_reorder += reorder-$(ARCH)
- endif
-endif
-
-ifeq ($(PLATFORM), linux)
-
- # Suppress gcc warnings like "variable might be clobbered by 'longjmp'
- # or 'vfork'": this warning indicates that some variable is placed to
- # a register by optimized compiler and it's value might be lost on longjmp().
- # Recommended way to avoid such warning is to declare the variable as
- # volatile to prevent the optimization. However, this approach does not
- # work because we have to declare all variables as volatile in result.
- ifndef CROSS_COMPILE_ARCH
- CC_43_OR_NEWER := \
- $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
- \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
- ifeq ($(CC_43_OR_NEWER),1)
- OTHER_CFLAGS += -Wno-clobbered
- endif
- endif
-endif
-
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Add to ambient vpath to get files in a subdirectory
-#
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
-
-CLASSES.export += java.io.InputStream
-
diff --git a/jdk/make/sun/jpeg/mapfile-vers b/jdk/make/sun/jpeg/mapfile-vers
deleted file mode 100644
index 2333d3d..0000000
--- a/jdk/make/sun/jpeg/mapfile-vers
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
-
- Java_sun_awt_image_JPEGImageDecoder_initIDs;
- Java_sun_awt_image_JPEGImageDecoder_readImage;
-
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initReaderIDs;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initJPEGImageReader;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_setSource;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImageHeader;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_setOutColorSpace;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImage;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_abortRead;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_resetReader;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_disposeReader;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_resetLibraryState;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_initWriterIDs;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_initJPEGImageWriter;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_setDest;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeTables;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_abortWrite;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_resetWriter;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_disposeWriter;
- local:
- *;
-};
diff --git a/jdk/make/sun/jpeg/mapfile-vers-closed b/jdk/make/sun/jpeg/mapfile-vers-closed
deleted file mode 100644
index bcdc426..0000000
--- a/jdk/make/sun/jpeg/mapfile-vers-closed
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
-
- Java_sun_awt_image_JPEGImageDecoder_initIDs;
- Java_sun_awt_image_JPEGImageDecoder_readImage;
- Java_sun_awt_image_codec_JPEGImageDecoderImpl_initDecoder;
- Java_sun_awt_image_codec_JPEGImageDecoderImpl_readJPEGStream;
- Java_sun_awt_image_codec_JPEGImageEncoderImpl_initEncoder;
- Java_sun_awt_image_codec_JPEGImageEncoderImpl_writeJPEGStream;
-
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initReaderIDs;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initJPEGImageReader;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_setSource;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImageHeader;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_setOutColorSpace;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImage;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_abortRead;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_resetReader;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_disposeReader;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_resetLibraryState;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_initWriterIDs;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_initJPEGImageWriter;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_setDest;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeTables;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_abortWrite;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_resetWriter;
- Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_disposeWriter;
- local:
- *;
-};
diff --git a/jdk/make/sun/jpeg/reorder-i586 b/jdk/make/sun/jpeg/reorder-i586
deleted file mode 100644
index 47e18ca..0000000
--- a/jdk/make/sun/jpeg/reorder-i586
+++ /dev/null
@@ -1,119 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
-text: .text%JNI_OnLoad;
-text: .text%Java_sun_awt_image_JPEGImageDecoder_initIDs;
-text: .text%Java_sun_awt_image_JPEGImageDecoder_readImage;
-text: .text%jStdError;
-text: .text%jCreaDecompress;
-text: .text%jIMemMgr;
-text: .text%jMemInit;
-text: .text%jGetSmall;
-text: .text%jIMReader;
-text: .text%alloc_small: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%reset_marker_reader: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%jIInCtlr;
-# text: .text%GET_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jpegdecoder.o;
-text: .text%jReadHeader;
-text: .text%jConsumeInput;
-text: .text%reset_input_controller: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-text: .text%reset_error_mgr: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jerror.o;
-text: .text%sun_jpeg_init_source;
-text: .text%consume_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-text: .text%read_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-# text: .text%first_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%sun_jpeg_fill_input_buffer;
-# text: .text%RELEASE_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jpegdecoder.o;
-# text: .text%get_soi: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%emit_message: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jerror.o;
-# text: .text%next_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%get_interesting_appn: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-# text: .text%examine_app0: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%skip_variable: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%sun_jpeg_skip_input_data;
-# text: .text%examine_app14: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%get_dqt: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%jAlcQTable;
-text: .text%get_sof: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-# text: .text%get_dri: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%get_dht: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%jAlcHTable;
-text: .text%get_sos: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-# text: .text%initial_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-text: .text%jDivRound;
-# text: .text%default_decompress_parms: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdapimin.o;
-text: .text%jHasMultScn;
-text: .text%jStrtDecompress;
-text: .text%jIDMaster;
-# text: .text%master_selection: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o;
-text: .text%jCalcDimensions;
-# text: .text%use_merged_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o;
-# text: .text%prepare_range_limit_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o;
-text: .text%jIDColor;
-# text: .text%build_ycc_rgb_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o;
-text: .text%jIUpsampler;
-text: .text%jRound;
-text: .text%alloc_sarray: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%alloc_large: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%jGetLarge;
-text: .text%jIDPostC;
-text: .text%jIIDCT;
-text: .text%jIHDecoder;
-text: .text%jIDCoefC;
-text: .text%jIDMainC;
-# text: .text%alloc_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-text: .text%realize_virt_arrays: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-# text: .text%per_scan_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-# text: .text%latch_quant_tables: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-text: .text%start_pass_huff_decoder: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o;
-text: .text%jMkDDerived;
-text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o;
-# text: .text%start_iMCU_row: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o;
-# text: .text%output_pass_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdapistd.o;
-text: .text%prepare_for_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o;
-text: .text%start_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jddctmgr.o;
-text: .text%start_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o;
-text: .text%start_pass_dcolor: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o;
-text: .text%start_pass_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o;
-text: .text%start_pass_dpost: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdpostct.o;
-text: .text%start_pass_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-# text: .text%make_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-text: .text%jReadScanlines;
-text: .text%process_data_context_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-text: .text%decompress_onepass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o;
-text: .text%jZeroFar;
-text: .text%decode_mcu: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o;
-text: .text%jFilBitBuf;
-text: .text%jHufDecode;
-text: .text%jRDislow;
-text: .text%sep_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o;
-text: .text%fullsize_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o;
-text: .text%h2v2_fancy_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o;
-text: .text%ycc_rgb_convert: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o;
-# text: .text%set_wraparound_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-# text: .text%process_restart: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o;
-text: .text%read_restart_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%finish_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-# text: .text%set_bottom_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-text: .text%jFinDecompress;
-text: .text%finish_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o;
-text: .text%sun_jpeg_term_source;
-text: .text%jAbort;
-text: .text%free_pool: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%jFreeLarge;
-text: .text%jFreeSmall;
-text: .text%jDestDecompress;
-text: .text%jDestroy;
-text: .text%self_destruct: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%jMemTerm;
-text: .text%process_data_simple_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
diff --git a/jdk/make/sun/jpeg/reorder-sparc b/jdk/make/sun/jpeg/reorder-sparc
deleted file mode 100644
index a7b21ed..0000000
--- a/jdk/make/sun/jpeg/reorder-sparc
+++ /dev/null
@@ -1,119 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
-text: .text%JNI_OnLoad;
-text: .text%Java_sun_awt_image_JPEGImageDecoder_initIDs;
-text: .text%Java_sun_awt_image_JPEGImageDecoder_readImage;
-text: .text%jStdError;
-text: .text%jCreaDecompress;
-text: .text%jIMemMgr;
-text: .text%jMemInit;
-text: .text%jGetSmall;
-text: .text%jIMReader;
-text: .text%alloc_small: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%reset_marker_reader: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%jIInCtlr;
-text: .text%GET_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jpegdecoder.o;
-text: .text%jReadHeader;
-text: .text%jConsumeInput;
-text: .text%reset_input_controller: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-text: .text%reset_error_mgr: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jerror.o;
-text: .text%sun_jpeg_init_source;
-text: .text%consume_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-text: .text%read_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-# text: .text%first_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%sun_jpeg_fill_input_buffer;
-text: .text%RELEASE_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jpegdecoder.o;
-# text: .text%get_soi: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%emit_message: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jerror.o;
-text: .text%next_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%get_interesting_appn: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%examine_app0: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%skip_variable: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%sun_jpeg_skip_input_data;
-text: .text%examine_app14: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%get_dqt: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%jAlcQTable;
-text: .text%get_sof: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-# text: .text%get_dri: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%get_dht: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%jAlcHTable;
-text: .text%get_sos: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%initial_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-text: .text%jDivRound;
-text: .text%default_decompress_parms: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdapimin.o;
-text: .text%jHasMultScn;
-text: .text%jStrtDecompress;
-text: .text%jIDMaster;
-text: .text%master_selection: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o;
-text: .text%jCalcDimensions;
-# text: .text%use_merged_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o;
-# text: .text%prepare_range_limit_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o;
-text: .text%jIDColor;
-# text: .text%build_ycc_rgb_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o;
-text: .text%jIUpsampler;
-text: .text%jRound;
-text: .text%alloc_sarray: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%alloc_large: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%jGetLarge;
-text: .text%jIDPostC;
-text: .text%jIIDCT;
-text: .text%jIHDecoder;
-text: .text%jIDCoefC;
-text: .text%jIDMainC;
-text: .text%alloc_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-text: .text%realize_virt_arrays: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-text: .text%per_scan_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-text: .text%latch_quant_tables: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-text: .text%start_pass_huff_decoder: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o;
-text: .text%jMkDDerived;
-text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o;
-# text: .text%start_iMCU_row: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o;
-text: .text%output_pass_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdapistd.o;
-text: .text%prepare_for_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o;
-text: .text%start_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jddctmgr.o;
-text: .text%start_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o;
-text: .text%start_pass_dcolor: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o;
-text: .text%start_pass_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o;
-text: .text%start_pass_dpost: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdpostct.o;
-text: .text%start_pass_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-text: .text%make_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-text: .text%jReadScanlines;
-text: .text%process_data_context_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-text: .text%decompress_onepass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o;
-text: .text%jZeroFar;
-text: .text%decode_mcu: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o;
-text: .text%jFilBitBuf;
-text: .text%jHufDecode;
-text: .text%jRDislow;
-text: .text%sep_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o;
-text: .text%fullsize_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o;
-text: .text%h2v2_fancy_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o;
-text: .text%ycc_rgb_convert: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o;
-# text: .text%set_wraparound_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-#text: .text%process_restart: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o;
-text: .text%read_restart_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o;
-text: .text%finish_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o;
-# text: .text%set_bottom_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
-text: .text%jFinDecompress;
-text: .text%finish_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o;
-text: .text%sun_jpeg_term_source;
-text: .text%jAbort;
-text: .text%free_pool: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%jFreeLarge;
-text: .text%jFreeSmall;
-text: .text%jDestDecompress;
-text: .text%jDestroy;
-text: .text%self_destruct: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o;
-text: .text%jMemTerm;
-text: .text%process_data_simple_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o;
diff --git a/jdk/make/sun/jpeg/reorder-sparcv9 b/jdk/make/sun/jpeg/reorder-sparcv9
deleted file mode 100644
index 3af1a21..0000000
--- a/jdk/make/sun/jpeg/reorder-sparcv9
+++ /dev/null
@@ -1,119 +0,0 @@
-data = R0x2000;
-text = LOAD ?RXO;
-# Test Null
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
-text: .text%JNI_OnLoad;
-text: .text%Java_sun_awt_image_JPEGImageDecoder_initIDs;
-text: .text%Java_sun_awt_image_JPEGImageDecoder_readImage;
-text: .text%jStdError;
-text: .text%jCreaDecompress;
-text: .text%jIMemMgr;
-text: .text%jMemInit;
-text: .text%jGetSmall;
-text: .text%jIMReader;
-text: .text%alloc_small: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o;
-text: .text%reset_marker_reader: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%jIInCtlr;
-text: .text%GET_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jpegdecoder.o;
-text: .text%jReadHeader;
-text: .text%jConsumeInput;
-text: .text%reset_input_controller: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o;
-text: .text%reset_error_mgr: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jerror.o;
-text: .text%sun_jpeg_init_source;
-text: .text%consume_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o;
-text: .text%read_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-# text: .text%first_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%sun_jpeg_fill_input_buffer;
-text: .text%RELEASE_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jpegdecoder.o;
-# text: .text%get_soi: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%emit_message: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jerror.o;
-text: .text%next_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%get_interesting_appn: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%examine_app0: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%skip_variable: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%sun_jpeg_skip_input_data;
-text: .text%examine_app14: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%get_dqt: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%jAlcQTable;
-text: .text%get_sof: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-# text: .text%get_dri: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%get_dht: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%jAlcHTable;
-text: .text%get_sos: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%initial_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o;
-text: .text%jDivRound;
-text: .text%default_decompress_parms: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdapimin.o;
-text: .text%jHasMultScn;
-text: .text%jStrtDecompress;
-text: .text%jIDMaster;
-text: .text%master_selection: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmaster.o;
-text: .text%jCalcDimensions;
-# text: .text%use_merged_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmaster.o;
-# text: .text%prepare_range_limit_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmaster.o;
-text: .text%jIDColor;
-# text: .text%build_ycc_rgb_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcolor.o;
-text: .text%jIUpsampler;
-text: .text%jRound;
-text: .text%alloc_sarray: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o;
-text: .text%alloc_large: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o;
-text: .text%jGetLarge;
-text: .text%jIDPostC;
-text: .text%jIIDCT;
-text: .text%jIHDecoder;
-text: .text%jIDCoefC;
-text: .text%jIDMainC;
-text: .text%alloc_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o;
-text: .text%realize_virt_arrays: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o;
-text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o;
-text: .text%per_scan_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o;
-text: .text%latch_quant_tables: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o;
-text: .text%start_pass_huff_decoder: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdhuff.o;
-text: .text%jMkDDerived;
-text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcoefct.o;
-# text: .text%start_iMCU_row: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcoefct.o;
-text: .text%output_pass_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdapistd.o;
-text: .text%prepare_for_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmaster.o;
-text: .text%start_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jddctmgr.o;
-text: .text%start_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcoefct.o;
-text: .text%start_pass_dcolor: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcolor.o;
-text: .text%start_pass_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdsample.o;
-text: .text%start_pass_dpost: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdpostct.o;
-text: .text%start_pass_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o;
-text: .text%make_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o;
-text: .text%jReadScanlines;
-text: .text%process_data_context_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o;
-text: .text%decompress_onepass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcoefct.o;
-text: .text%jZeroFar;
-text: .text%decode_mcu: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdhuff.o;
-text: .text%jFilBitBuf;
-text: .text%jHufDecode;
-text: .text%jRDislow;
-text: .text%sep_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdsample.o;
-text: .text%fullsize_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdsample.o;
-text: .text%h2v2_fancy_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdsample.o;
-text: .text%ycc_rgb_convert: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcolor.o;
-# text: .text%set_wraparound_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o;
-text: .text%process_restart: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdhuff.o;
-text: .text%read_restart_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o;
-text: .text%finish_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o;
-# text: .text%set_bottom_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o;
-text: .text%jFinDecompress;
-text: .text%finish_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmaster.o;
-text: .text%sun_jpeg_term_source;
-text: .text%jAbort;
-text: .text%free_pool: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o;
-text: .text%jFreeLarge;
-text: .text%jFreeSmall;
-text: .text%jDestDecompress;
-text: .text%jDestroy;
-text: .text%self_destruct: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o;
-text: .text%jMemTerm;
-text: .text%process_data_simple_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o;
diff --git a/jdk/make/sun/launcher/Makefile b/jdk/make/sun/launcher/Makefile
deleted file mode 100644
index 0a1d7ef..0000000
--- a/jdk/make/sun/launcher/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.launcher
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Java source files
-#
-AUTO_FILES_JAVA_DIRS = sun/launcher
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_COMPILED_PROPERTIES = $(PKGDIR)/resources/launcher.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/sun/lwawt/FILES_c_macosx.gmk b/jdk/make/sun/lwawt/FILES_c_macosx.gmk
deleted file mode 100644
index 2807b04..0000000
--- a/jdk/make/sun/lwawt/FILES_c_macosx.gmk
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_objc = \
- awt.m \
- ApplicationDelegate.m \
- CFRetainedResource.m \
- CGLGraphicsConfig.m \
- CGLSurfaceData.m \
- CGLLayer.m \
- CGraphicsConfig.m \
- CGraphicsDevice.m \
- CGraphicsEnv.m \
- CCharToGlyphMapper.m \
- CSystemColors.m \
- AWTFont.m \
- CGGlyphOutlines.m \
- CGGlyphImages.m \
- CoreTextSupport.m \
- AWTStrike.m \
- InitIDs.m \
- AWTEvent.m \
- AWTView.m \
- AWTWindow.m \
- AWTSurfaceLayers.m \
- CCursorManager.m \
- CClipboard.m \
- CDataTransferer.m \
- CDragSource.m \
- CDragSourceContextPeer.m \
- CDropTarget.m \
- CDropTargetContextPeer.m \
- CInputMethod.m \
- CDesktopPeer.m \
- OSVersion.m \
- DnDUtilities.m \
- CFileDialog.m \
- CImage.m \
- CMenu.m \
- CMenuBar.m \
- CMenuComponent.m \
- CMenuItem.m \
- CPopupMenu.m \
- CRobot.m \
- CTrayIcon.m \
- CWrapper.m \
- JavaAccessibilityAction.m \
- JavaAccessibilityUtilities.m \
- JavaComponentAccessibility.m \
- JavaTextAccessibility.m \
- LWCToolkit.m \
- GeomUtilities.m \
- CPrinterJob.m \
- PrintModel.m \
- PrinterSurfaceData.m \
- PrinterView.m \
- QuartzSurfaceData.m \
- QuartzRenderer.m \
- CTextPipe.m \
- ImageSurfaceData.m \
- awt_DrawingSurface.m
-
-FILES_c = \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- AccelGlyphCache.c \
- CUPSfuncs.c
-
diff --git a/jdk/make/sun/lwawt/FILES_export_macosx.gmk b/jdk/make/sun/lwawt/FILES_export_macosx.gmk
deleted file mode 100644
index 7b32f91..0000000
--- a/jdk/make/sun/lwawt/FILES_export_macosx.gmk
+++ /dev/null
@@ -1,278 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# FILES_export definitions for Mac OS X
-
-FILES_export = \
- com/apple/eawt/Application.java \
- com/apple/eawt/_AppDockIconHandler.java \
- com/apple/eawt/_AppEventHandler.java \
- com/apple/eawt/_AppEventLegacyHandler.java \
- com/apple/eawt/_AppMenuBarHandler.java \
- com/apple/eawt/_AppMiscHandlers.java \
- com/apple/eawt/event/GestureHandler.java \
- com/apple/eawt/FullScreenAdapter.java \
- com/apple/eawt/FullScreenHandler.java \
- com/apple/eawt/FullScreenListener.java \
- com/apple/eawt/FullScreenUtilities.java \
- sun/font/FontManager.java \
- sun/awt/image/ImageRepresentation.java \
- sun/awt/image/GifImageDecoder.java \
- sun/awt/image/NativeLibLoader.java \
- sun/java2d/CRenderer.java \
- sun/java2d/CompositeCRenderer.java \
- sun/java2d/DataBufferNIOInt.java \
- sun/java2d/IntegerNIORaster.java \
- sun/java2d/OSXSurfaceData.java \
- sun/java2d/OSXOffScreenSurfaceData.java \
- sun/java2d/loops/Blit.java \
- sun/java2d/loops/BlitBg.java \
- sun/java2d/loops/ScaledBlit.java \
- sun/java2d/loops/TransformBlit.java \
- sun/java2d/loops/FillRect.java \
- sun/java2d/loops/FillSpans.java \
- sun/java2d/loops/FillParallelogram.java \
- sun/java2d/loops/DrawParallelogram.java \
- sun/java2d/loops/DrawGlyphList.java \
- sun/java2d/loops/DrawGlyphListAA.java \
- sun/java2d/loops/DrawGlyphListLCD.java \
- sun/java2d/loops/DrawLine.java \
- sun/java2d/loops/DrawRect.java \
- sun/java2d/loops/DrawPolygons.java \
- sun/java2d/loops/DrawPath.java \
- sun/java2d/loops/FillPath.java \
- sun/java2d/loops/MaskBlit.java \
- sun/java2d/loops/MaskFill.java \
- sun/java2d/loops/TransformHelper.java \
- sun/java2d/loops/GraphicsPrimitiveMgr.java \
- sun/java2d/loops/GraphicsPrimitive.java \
- sun/java2d/pipe/hw/AccelSurface.java \
- sun/java2d/pipe/hw/AccelDeviceEventNotifier.java \
- sun/java2d/pipe/hw/ContextCapabilities.java \
- sun/awt/image/ImagingLib.java \
- sun/java2d/SurfaceData.java \
- sun/java2d/SunGraphics2D.java \
- sun/awt/KeyboardFocusManagerPeerImpl.java \
- sun/awt/image/BufImgSurfaceData.java \
- sun/awt/image/DataBufferNative.java \
- \
- sun/awt/CGraphicsConfig.java \
- sun/awt/CGraphicsDevice.java \
- sun/awt/CGraphicsEnvironment.java \
- sun/font/CCharToGlyphMapper.java \
- sun/font/CFont.java \
- sun/font/CFontConfiguration.java \
- sun/font/CFontManager.java \
- sun/font/CStrike.java \
- sun/font/CStrikeDisposer.java \
- sun/java2d/BackBufferCapsProvider.java \
- sun/java2d/MacosxSurfaceManagerFactory.java \
- sun/lwawt/LWButtonPeer.java \
- sun/lwawt/LWCanvasPeer.java \
- sun/lwawt/LWCheckboxPeer.java \
- sun/lwawt/LWChoicePeer.java \
- sun/lwawt/LWComponentPeer.java \
- sun/lwawt/LWContainerPeer.java \
- sun/lwawt/LWCursorManager.java \
- sun/lwawt/LWKeyboardFocusManagerPeer.java \
- sun/lwawt/LWLabelPeer.java \
- sun/lwawt/LWListPeer.java \
- sun/lwawt/LWMouseInfoPeer.java \
- sun/lwawt/LWPanelPeer.java \
- sun/lwawt/LWRepaintArea.java \
- sun/lwawt/LWScrollBarPeer.java \
- sun/lwawt/LWScrollPanePeer.java \
- sun/lwawt/LWTextComponentPeer.java \
- sun/lwawt/LWTextFieldPeer.java \
- sun/lwawt/LWToolkit.java \
- sun/lwawt/LWWindowPeer.java \
- sun/lwawt/PlatformWindow.java \
- sun/lwawt/SecurityWarningWindow.java \
- sun/lwawt/macosx/CPrinterDevice.java \
- sun/lwawt/macosx/CPrinterDialog.java \
- sun/lwawt/macosx/CPrinterDialogPeer.java \
- sun/lwawt/macosx/CPrinterGraphics.java \
- sun/lwawt/macosx/CPrinterGraphicsConfig.java \
- sun/lwawt/macosx/CPrinterJob.java \
- sun/lwawt/macosx/CPrinterJobDialog.java \
- sun/lwawt/macosx/CPrinterPageDialog.java \
- sun/lwawt/macosx/CPrinterSurfaceData.java \
- sun/lwawt/macosx/CTextPipe.java \
- sun/lwawt/macosx/CDesktopPeer.java \
- sun/java2d/CRenderer.java \
- sun/lwawt/macosx/NSPrintInfo.java \
- sun/lwawt/macosx/CAccessibility.java \
- sun/lwawt/macosx/CAccessible.java \
- sun/lwawt/macosx/CFRetainedResource.java \
- sun/lwawt/macosx/CCheckboxMenuItem.java \
- sun/lwawt/macosx/CClipboard.java \
- sun/lwawt/macosx/CDataTransferer.java \
- sun/lwawt/macosx/CDragSourceContextPeer.java \
- sun/lwawt/macosx/CMouseDragGestureRecognizer.java \
- sun/lwawt/macosx/CDropTarget.java \
- sun/lwawt/macosx/CDropTargetContextPeer.java \
- sun/lwawt/macosx/CCursorManager.java \
- sun/lwawt/macosx/CFileDialog.java \
- sun/lwawt/macosx/CImage.java \
- sun/lwawt/macosx/CMenu.java \
- sun/lwawt/macosx/CMenuBar.java \
- sun/lwawt/macosx/CMenuComponent.java \
- sun/lwawt/macosx/CMenuItem.java \
- sun/lwawt/macosx/CPlatformView.java \
- sun/lwawt/macosx/CPlatformWindow.java \
- sun/lwawt/macosx/CWarningWindow.java \
- sun/lwawt/macosx/CPlatformComponent.java \
- sun/lwawt/macosx/CEmbeddedFrame.java \
- sun/lwawt/macosx/CPlatformEmbeddedFrame.java \
- sun/lwawt/macosx/CPlatformResponder.java \
- sun/lwawt/macosx/CPopupMenu.java \
- sun/lwawt/macosx/CRobot.java \
- sun/lwawt/macosx/CSystemTray.java \
- sun/lwawt/macosx/CTrayIcon.java \
- sun/lwawt/macosx/CWrapper.java \
- sun/lwawt/macosx/CocoaConstants.java \
- sun/lwawt/macosx/LWCToolkit.java \
- sun/lwawt/macosx/CInputMethod.java \
- sun/lwawt/macosx/CInputMethodDescriptor.java \
- sun/lwawt/macosx/event/NSEvent.java \
- \
- sun/awt/DebugSettings.java \
- sun/awt/EmbeddedFrame.java \
- sun/awt/PlatformFont.java \
- sun/awt/FontDescriptor.java \
- sun/awt/NativeLibLoader.java \
- sun/awt/CharsetString.java \
- sun/awt/SunHints.java \
- sun/java2d/pipe/BufferedContext.java \
- sun/java2d/pipe/BufferedMaskBlit.java \
- sun/java2d/pipe/BufferedOpCodes.java \
- sun/java2d/pipe/BufferedMaskBlit.java \
- sun/java2d/pipe/BufferedPaints.java \
- sun/java2d/pipe/BufferedRenderPipe.java \
- sun/java2d/pipe/BufferedTextPipe.java \
- sun/java2d/pipe/RenderBuffer.java \
- sun/java2d/pipe/ShapeSpanIterator.java \
- sun/java2d/pipe/SpanClipRenderer.java \
- sun/java2d/pipe/RegionIterator.java \
- sun/awt/image/IntegerComponentRaster.java \
- sun/java2d/cmm/CMSManager.java \
- sun/java2d/cmm/PCMM.java \
- sun/java2d/cmm/ColorTransform.java \
- sun/awt/datatransfer/DataTransferer.java \
- sun/awt/dnd/SunDragSourceContextPeer.java \
- sun/java2d/opengl/OGLBlitLoops.java \
- sun/java2d/opengl/OGLContext.java \
- sun/java2d/opengl/OGLMaskFill.java \
- sun/java2d/opengl/OGLPaints.java \
- sun/java2d/opengl/OGLRenderer.java \
- sun/java2d/opengl/OGLRenderQueue.java \
- sun/java2d/opengl/OGLSurfaceData.java \
- sun/java2d/opengl/OGLTextRenderer.java \
- sun/java2d/opengl/CGLGraphicsConfig.java \
- sun/java2d/opengl/CGLSurfaceData.java \
- sun/java2d/opengl/CGLLayer.java \
- sun/awt/ExtendedKeyCodes.java
-
-FILES_export2 = \
- java/awt/AlphaComposite.java \
- java/awt/MouseInfo.java \
- java/awt/Cursor.java \
- java/awt/Graphics.java \
- java/awt/Color.java \
- java/awt/Image.java \
- java/awt/Rectangle.java \
- java/awt/Event.java \
- java/awt/Font.java \
- java/awt/Insets.java \
- java/awt/Point.java \
- java/awt/FontMetrics.java \
- java/awt/Toolkit.java \
- java/awt/Component.java \
- java/awt/Container.java \
- java/awt/Canvas.java \
- java/awt/Button.java \
- java/awt/List.java \
- java/awt/Adjustable.java \
- java/awt/Scrollbar.java \
- java/awt/ScrollPane.java \
- java/awt/ScrollPaneAdjustable.java \
- java/awt/Window.java \
- java/awt/TextField.java \
- java/awt/Label.java \
- java/awt/Choice.java \
- java/awt/TextArea.java \
- java/awt/MenuBar.java \
- java/awt/Menu.java \
- java/awt/MenuComponent.java \
- java/awt/PopupMenu.java \
- java/awt/Dialog.java \
- java/awt/FileDialog.java \
- java/awt/MenuItem.java \
- java/awt/Checkbox.java \
- java/awt/CheckboxMenuItem.java \
- java/awt/CheckboxGroup.java \
- java/awt/Frame.java \
- java/awt/Transparency.java \
- java/awt/AWTException.java \
- java/awt/AWTEvent.java \
- java/awt/AWTKeyStroke.java \
- java/awt/KeyboardFocusManager.java \
- java/awt/Dimension.java \
- java/awt/SystemColor.java \
- java/awt/TrayIcon.java \
- java/awt/DisplayMode.java \
- java/awt/color/ColorSpace.java \
- java/awt/color/ICC_Profile.java \
- java/awt/geom/PathIterator.java \
- java/awt/image/AffineTransformOp.java \
- java/awt/image/ImageConsumer.java \
- java/awt/image/ImageObserver.java \
- java/awt/image/BufferedImage.java \
- java/awt/image/ColorModel.java \
- java/awt/image/ConvolveOp.java \
- java/awt/image/DirectColorModel.java \
- java/awt/image/IndexColorModel.java \
- java/awt/image/DataBuffer.java \
- java/awt/datatransfer/Transferable.java \
- java/awt/datatransfer/DataFlavor.java \
- java/awt/datatransfer/UnsupportedFlavorException.java \
- java/awt/datatransfer/Clipboard.java \
- java/awt/datatransfer/ClipboardOwner.java \
- java/awt/datatransfer/StringSelection.java \
- java/awt/event/AdjustmentEvent.java \
- java/awt/event/KeyEvent.java \
- java/awt/event/MouseEvent.java \
- java/awt/event/MouseWheelEvent.java \
- java/awt/event/FocusEvent.java \
- java/awt/event/InputEvent.java \
- java/awt/event/WindowEvent.java \
- java/awt/event/NativeLibLoader.java \
- java/awt/peer/ComponentPeer.java \
- java/awt/dnd/DnDConstants.java \
- sun/awt/CausedFocusEvent.java \
- java/awt/print/PageFormat.java \
- java/awt/print/Pageable.java \
- java/awt/print/Printable.java \
- java/awt/BasicStroke.java
diff --git a/jdk/make/sun/lwawt/Makefile b/jdk/make/sun/lwawt/Makefile
deleted file mode 100644
index 5d05101..0000000
--- a/jdk/make/sun/lwawt/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-MODULE = awt
-PACKAGE = sun.lwawt
-LIBRARY = awt_lwawt
-PRODUCT = sun
-
-LIB_LOCATION = $(LIBDIR)
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_c_macosx.gmk
-include FILES_export_macosx.gmk
-AUTO_FILES_JAVA_DIRS = sun/awt sun/font sun/lwawt sun/lwawt/macosx sun/java2d sun/java2d/opengl com/apple/eawt
-
-#
-# Rules.
-#
-# include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Add to the ambient vpath to pick up files in subdirectories
-#
-vpath %.c $(SHARE_SRC)/native/sun/awt/debug
-vpath %.c $(SHARE_SRC)/native/sun/awt/image
-vpath %.c $(SHARE_SRC)/native/sun/awt/image/gif
-vpath %.c $(SHARE_SRC)/native/sun/awt/image/cvutils
-vpath %.c $(SHARE_SRC)/native/sun/awt/shell
-vpath %.c $(SHARE_SRC)/native/sun/java2d
-vpath %.c $(SHARE_SRC)/native/sun/java2d/loops
-vpath %.c $(SHARE_SRC)/native/sun/java2d/pipe
-vpath %.c $(SHARE_SRC)/native/sun/java2d/opengl
-vpath %.c $(SHARE_SRC)/native/sun/awt/medialib
-vpath %.c $(SHARE_SRC)/native/sun/awt/utility
-vpath %.c $(SHARE_SRC)/native/sun/font
-vpath %.c $(call NativeSrcDirList,,native/sun/awt)
-
-vpath %.cpp $(SHARE_SRC)/native/sun/image
-
-vpath %.m $(call NativeSrcDirList,,native/sun/awt)
-vpath %.m $(call NativeSrcDirList,,native/sun/font)
-vpath %.m $(call NativeSrcDirList,,native/sun/java2d)
-vpath %.m $(call NativeSrcDirList,,native/sun/java2d/opengl)
-
-OTHER_LDLIBS += \
- -lawt -lmlib_image -losxapp $(JVMLIB) $(LIBM) \
- -framework Accelerate \
- -framework ApplicationServices \
- -framework AudioToolbox \
- -framework Carbon \
- -framework Cocoa \
- -framework Security \
- -framework ExceptionHandling \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -framework OpenGL \
- -framework QuartzCore
-CPPFLAGS += \
- -I$(CLASSHDRDIR) \
- -I$(SHARE_SRC)/native/sun/awt/debug \
- -I$(SHARE_SRC)/native/sun/awt/image/cvutils \
- -I$(SHARE_SRC)/native/sun/java2d \
- -I$(SHARE_SRC)/native/sun/java2d/loops \
- -I$(SHARE_SRC)/native/sun/awt/image/cvutils \
- -I$(SHARE_SRC)/native/sun/awt/image \
- -I$(SHARE_SRC)/native/sun/font \
- -I$(SHARE_SRC)/native/sun/java2d/pipe \
- -I$(SHARE_SRC)/native/sun/java2d/opengl \
- -I$(SHARE_SRC)/native/sun/dc/path \
- -I$(SHARE_SRC)/native/sun/dc/doe \
- -I$(SHARE_SRC)/native/sun/awt/alphacomposite \
- -I$(SHARE_SRC)/native/sun/awt/medialib \
- -I$(SHARE_SRC)/native/sun/awt \
- $(call NativeSrcDirList,-I,/native/sun/awt) \
- $(call NativeSrcDirList,-I,/native/sun/osxapp) \
- $(call NativeSrcDirList,-I,/native/sun/font) \
- $(call NativeSrcDirList,-I,/native/sun/java2d) \
- $(call NativeSrcDirList,-I,/native/sun/java2d/opengl)
-
-ifeq ($(MILESTONE), internal)
- CPPFLAGS += -DINTERNAL_BUILD
-endif
-
-clean clobber::
-
-.PHONY:
diff --git a/jdk/make/sun/management/Makefile b/jdk/make/sun/management/Makefile
deleted file mode 100644
index a560771..0000000
--- a/jdk/make/sun/management/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JDK out of the box management support
-#
-
-BUILDDIR = ../..
-
-include $(BUILDDIR)/common/Defs.gmk
-
-MGMT_LIBDIR = $(LIBDIR)/management
-MGMT_LIB_SRC = $(SHARE_SRC)/lib/management
-
-all build:: properties aclfile jmxremotefiles
-
-# When building the openjdk, no snmp
-ifndef OPENJDK
- SUBDIRS = snmp
-endif
-SUBDIRS += jmxremote
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-properties: $(MGMT_LIBDIR)/management.properties
-
-aclfile: $(MGMT_LIBDIR)/snmp.acl.template
-
-jmxremotefiles: $(MGMT_LIBDIR)/jmxremote.password.template $(MGMT_LIBDIR)/jmxremote.access
-
-$(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties
- $(install-file)
- $(call chmod-file, 644)
-
-$(MGMT_LIBDIR)/snmp.acl.template: $(MGMT_LIB_SRC)/snmp.acl.template
- $(install-file)
- $(call chmod-file, 444)
-
-$(MGMT_LIBDIR)/jmxremote.password.template: $(MGMT_LIB_SRC)/jmxremote.password.template
- $(install-file)
- $(call chmod-file, 444)
-
-$(MGMT_LIBDIR)/jmxremote.access: $(MGMT_LIB_SRC)/jmxremote.access
- $(install-file)
- $(call chmod-file, 644)
-
diff --git a/jdk/make/sun/management/jmxremote/Makefile b/jdk/make/sun/management/jmxremote/Makefile
deleted file mode 100644
index 699b6f0..0000000
--- a/jdk/make/sun/management/jmxremote/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JMX agent (RMI connector bootstrap)
-# for JDK out of the box management.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.management.jmxremote
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = sun/management/jmxremote
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Clean up internal-use-only package.
-#
-clean::
- $(RM) -r $(CLASSDESTDIR)/sun/management/jmxremote
diff --git a/jdk/make/sun/management/snmp/Makefile b/jdk/make/sun/management/snmp/Makefile
deleted file mode 100644
index 15035c8..0000000
--- a/jdk/make/sun/management/snmp/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building SNMP MIB instrumentation
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.management.snmp
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile
-#
-AUTO_FILES_JAVA_DIRS = sun/management/snmp
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/sun/misc/Makefile b/jdk/make/sun/misc/Makefile
deleted file mode 100644
index 86b6b91..0000000
--- a/jdk/make/sun/misc/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.misc
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = sun/misc
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_JAVA= sun/misc/resources/Messages.java
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/sun/native2ascii/Makefile b/jdk/make/sun/native2ascii/Makefile
deleted file mode 100644
index be00953..0000000
--- a/jdk/make/sun/native2ascii/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building native2ascii
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.tools.native2ascii
-PRODUCT = sun
-OTHER_JAVACFLAGS += -Xlint:serial -Werror
-include $(BUILDDIR)/common/Defs.gmk
-
-# This program must contain a manifest that defines the execution level
-# needed to follow standard Vista User Access Control Guidelines
-# This must be set before Program.gmk is included
-#
-BUILD_MANIFEST=true
-
-
-#
-# Files
-#
-FILES_java = \
- sun/tools/native2ascii/Main.java \
- sun/tools/native2ascii/A2NFilter.java \
- sun/tools/native2ascii/N2AFilter.java
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_JAVA = sun/tools/native2ascii/resources/MsgNative2ascii.java
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/sun/net/FILES_java.gmk b/jdk/make/sun/net/FILES_java.gmk
deleted file mode 100644
index 7eaf9bc..0000000
--- a/jdk/make/sun/net/FILES_java.gmk
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_java = \
- sun/net/InetAddressCachePolicy.java \
- sun/net/URLCanonicalizer.java \
- sun/net/NetworkClient.java \
- sun/net/NetworkServer.java \
- sun/net/ProgressMonitor.java \
- sun/net/ProgressSource.java \
- sun/net/ProgressEvent.java \
- sun/net/ProgressListener.java \
- sun/net/ProgressMeteringPolicy.java \
- sun/net/SocksProxy.java \
- sun/net/ResourceManager.java \
- sun/net/TelnetInputStream.java \
- sun/net/TelnetOutputStream.java \
- sun/net/TelnetProtocolException.java \
- sun/net/TransferProtocolClient.java \
- sun/net/ConnectionResetException.java \
- sun/net/NetProperties.java \
- sun/net/NetHooks.java \
- sun/net/util/IPAddressUtil.java \
- sun/net/util/URLUtil.java \
- sun/net/dns/ResolverConfiguration.java \
- sun/net/dns/ResolverConfigurationImpl.java \
- sun/net/ftp/FtpClient.java \
- sun/net/ftp/FtpClientProvider.java \
- sun/net/ftp/FtpDirEntry.java \
- sun/net/ftp/FtpReplyCode.java \
- sun/net/ftp/FtpDirParser.java \
- sun/net/ftp/FtpLoginException.java \
- sun/net/ftp/FtpProtocolException.java \
- sun/net/ftp/impl/FtpClient.java \
- sun/net/ftp/impl/DefaultFtpClientProvider.java \
- sun/net/sdp/SdpSupport.java \
- sun/net/spi/DefaultProxySelector.java \
- sun/net/spi/nameservice/NameServiceDescriptor.java \
- sun/net/spi/nameservice/NameService.java \
- sun/net/smtp/SmtpClient.java \
- sun/net/smtp/SmtpProtocolException.java \
- sun/net/www/content/text/Generic.java \
- sun/net/www/content/text/plain.java \
- sun/net/www/content/text/PlainTextInputStream.java \
- sun/net/www/MessageHeader.java \
- sun/net/www/HeaderParser.java \
- sun/net/www/MeteredStream.java \
- sun/net/www/MimeEntry.java \
- sun/net/www/MimeLauncher.java \
- sun/net/www/ApplicationLaunchException.java \
- sun/net/www/MimeTable.java \
- sun/net/www/URLConnection.java \
- sun/net/www/ParseUtil.java \
- sun/net/www/protocol/file/Handler.java \
- sun/net/www/protocol/file/FileURLConnection.java \
- sun/net/www/http/HttpClient.java \
- sun/net/www/http/HttpCapture.java \
- sun/net/www/http/HttpCaptureInputStream.java \
- sun/net/www/http/HttpCaptureOutputStream.java \
- sun/net/www/http/PosterOutputStream.java \
- sun/net/www/http/ChunkedInputStream.java \
- sun/net/www/http/ChunkedOutputStream.java \
- sun/net/www/http/KeepAliveCache.java \
- sun/net/www/http/KeepAliveStream.java \
- sun/net/www/http/KeepAliveStreamCleaner.java \
- sun/net/www/http/Hurryable.java \
- sun/net/www/protocol/http/Handler.java \
- sun/net/www/protocol/http/HttpURLConnection.java \
- sun/net/www/protocol/http/HttpAuthenticator.java \
- sun/net/www/protocol/http/AuthenticationHeader.java \
- sun/net/www/protocol/http/AuthenticationInfo.java \
- sun/net/www/protocol/http/AuthCache.java \
- sun/net/www/protocol/http/AuthCacheImpl.java \
- sun/net/www/protocol/http/AuthCacheValue.java \
- sun/net/www/protocol/http/AuthScheme.java \
- sun/net/www/protocol/http/BasicAuthentication.java \
- sun/net/www/protocol/http/DigestAuthentication.java \
- sun/net/www/protocol/http/NTLMAuthenticationProxy.java \
- sun/net/www/protocol/http/NegotiateAuthentication.java \
- sun/net/www/protocol/http/Negotiator.java \
- sun/net/www/protocol/http/ntlm/NTLMAuthentication.java \
- sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java \
- sun/net/www/protocol/http/spnego/NegotiatorImpl.java \
- sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java \
- sun/net/www/protocol/http/logging/HttpLogFormatter.java \
- sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java \
- sun/net/www/protocol/https/HttpsClient.java \
- sun/net/www/protocol/https/DefaultHostnameVerifier.java \
- sun/net/www/protocol/https/HttpsURLConnectionImpl.java \
- sun/net/www/protocol/https/DelegateHttpsURLConnection.java \
- sun/net/www/protocol/https/Handler.java \
- sun/net/www/protocol/jar/Handler.java \
- sun/net/www/protocol/jar/URLJarFile.java \
- sun/net/www/protocol/jar/JarFileFactory.java \
- sun/net/www/protocol/jar/JarURLConnection.java \
- sun/net/www/protocol/netdoc/Handler.java \
- sun/net/www/content/image/gif.java \
- sun/net/www/content/image/jpeg.java \
- sun/net/www/content/image/x_xbitmap.java \
- sun/net/www/content/image/x_xpixmap.java \
- sun/net/www/content/image/png.java \
- sun/net/www/content/audio/aiff.java \
- sun/net/www/content/audio/basic.java \
- sun/net/www/content/audio/wav.java \
- sun/net/www/content/audio/x_aiff.java \
- sun/net/www/content/audio/x_wav.java \
- sun/net/www/protocol/ftp/Handler.java \
- sun/net/www/protocol/ftp/FtpURLConnection.java \
- sun/net/www/protocol/mailto/Handler.java \
- sun/net/www/protocol/mailto/MailToURLConnection.java \
- sun/net/idn/Punycode.java \
- sun/net/idn/UCharacterEnums.java \
- sun/net/idn/UCharacterDirection.java \
- sun/net/idn/StringPrepDataReader.java \
- sun/net/idn/StringPrep.java
-
-ifeq ($(PLATFORM), windows)
- FILES_java += sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
-else
- FILES_java += sun/net/sdp/SdpProvider.java
-endif
diff --git a/jdk/make/sun/net/Makefile b/jdk/make/sun/net/Makefile
deleted file mode 100644
index b36fa66..0000000
--- a/jdk/make/sun/net/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.net
-PRODUCT = sun
-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
-SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = others spi
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/sun/net/others/Makefile b/jdk/make/sun/net/others/Makefile
deleted file mode 100644
index 61f114d..0000000
--- a/jdk/make/sun/net/others/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.net
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include $(BUILDDIR)/sun/net/FILES_java.gmk
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-build: properties nameprep-profile
-
-clean clobber:: properties.clean nameprep-profile.clean
-
-#
-# Install/nuke properties.
-#
-PROPS = $(PLATFORM_SRC)/lib/content-types.properties
-
-$(LIBDIR)/content-types.properties: $(PROPS)
- $(install-file)
-
-properties: $(LIBDIR)/content-types.properties
-
-properties.clean:
- $(RM) -r $(LIBDIR)/content-types.properties
-
-#
-# Install/nuke nameprep profile.
-#
-NAMEPREP_PROFILE_SRC = $(TOPDIR)/src/share/classes/sun/net/idn/uidna.spp
-NAMEPREP_PROFILE_BUILD = $(CLASSBINDIR)/sun/net/idn/uidna.spp
-
-nameprep-profile: $(NAMEPREP_PROFILE_BUILD)
-
-nameprep-profile.clean:
- $(RM) -r $(NAMEPREP_PROFILE_BUILD)
-
-$(NAMEPREP_PROFILE_BUILD): $(NAMEPREP_PROFILE_SRC)
- $(install-file)
-
-$(NAMEPREP_PROFILE_SRC):
-
-.PHONY: properties properties.clean nameprep-profile nameprep-profile.clean
-
diff --git a/jdk/make/sun/net/spi/Makefile b/jdk/make/sun/net/spi/Makefile
deleted file mode 100644
index e27b420..0000000
--- a/jdk/make/sun/net/spi/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS_misc = nameservice
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/sun/net/spi/nameservice/Makefile b/jdk/make/sun/net/spi/nameservice/Makefile
deleted file mode 100644
index e7a192f..0000000
--- a/jdk/make/sun/net/spi/nameservice/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../..
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = dns
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/sun/net/spi/nameservice/dns/Makefile b/jdk/make/sun/net/spi/nameservice/dns/Makefile
deleted file mode 100644
index 4c4ef34..0000000
--- a/jdk/make/sun/net/spi/nameservice/dns/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building JNDI DNS name service provider
-#
-
-BUILDDIR = ../../../../..
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-# dns should probably be its own module
-PACKAGE = sun.net.spi.nameservice.dns
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-JARFILE = $(EXTDIR)/dnsns.jar
-
-#
-# Files to compile
-#
-FILES_java = \
- sun/net/spi/nameservice/dns/DNSNameServiceDescriptor.java \
- sun/net/spi/nameservice/dns/DNSNameService.java
-
-#
-# Rules
-#
-CLASSDESTDIR = $(TEMPDIR)/classes
-
-FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
-
-
-all : build $(JARFILE)
-
-#
-# META-INF/services
-#
-SERVICE_DESCRIPTION = sun.net.spi.nameservice.NameServiceDescriptor
-
-$(CLASSDESTDIR)/META-INF/services/$(SERVICE_DESCRIPTION): \
- $(SHARE_SRC)/classes/$(PKGDIR)/META-INF/services/$(SERVICE_DESCRIPTION)
- $(install-file)
-
-#
-# JAR file
-#
-$(JARFILE): $(CLASSDESTDIR)/META-INF/services/$(SERVICE_DESCRIPTION) \
- $(FILES_class)
- $(BOOT_JAR_CMD) -cf $(JARFILE) \
- -C $(CLASSDESTDIR) sun \
- -C $(CLASSDESTDIR) META-INF \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-include $(BUILDDIR)/common/Classes.gmk
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR) \
- $(EXTDIR)/$(JARFILE)
diff --git a/jdk/make/sun/nio/Makefile b/jdk/make/sun/nio/Makefile
deleted file mode 100644
index 10b8c83..0000000
--- a/jdk/make/sun/nio/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.nio
-PRODUCT = sun
-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
-SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = cs
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
diff --git a/jdk/make/sun/nio/cs/FILES_java.gmk b/jdk/make/sun/nio/cs/FILES_java.gmk
deleted file mode 100644
index 3f38155..0000000
--- a/jdk/make/sun/nio/cs/FILES_java.gmk
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Character converters for lib/charsets.jar
-#
-# Core character converters are built from make/java/java.
-#
-
-FILES_gen_extcs = \
- sun/nio/cs/ext/IBM037.java \
- sun/nio/cs/ext/IBM1006.java \
- sun/nio/cs/ext/IBM1025.java \
- sun/nio/cs/ext/IBM1026.java \
- sun/nio/cs/ext/IBM1046.java \
- sun/nio/cs/ext/IBM1047.java \
- sun/nio/cs/ext/IBM1097.java \
- sun/nio/cs/ext/IBM1098.java \
- sun/nio/cs/ext/IBM1112.java \
- sun/nio/cs/ext/IBM1122.java \
- sun/nio/cs/ext/IBM1123.java \
- sun/nio/cs/ext/IBM1124.java \
- sun/nio/cs/ext/IBM1140.java \
- sun/nio/cs/ext/IBM1141.java \
- sun/nio/cs/ext/IBM1142.java \
- sun/nio/cs/ext/IBM1143.java \
- sun/nio/cs/ext/IBM1144.java \
- sun/nio/cs/ext/IBM1145.java \
- sun/nio/cs/ext/IBM1146.java \
- sun/nio/cs/ext/IBM1147.java \
- sun/nio/cs/ext/IBM1148.java \
- sun/nio/cs/ext/IBM1149.java \
- sun/nio/cs/ext/IBM273.java \
- sun/nio/cs/ext/IBM277.java \
- sun/nio/cs/ext/IBM278.java \
- sun/nio/cs/ext/IBM280.java \
- sun/nio/cs/ext/IBM284.java \
- sun/nio/cs/ext/IBM285.java \
- sun/nio/cs/ext/IBM297.java \
- sun/nio/cs/ext/IBM420.java \
- sun/nio/cs/ext/IBM424.java \
- sun/nio/cs/ext/IBM500.java \
- sun/nio/cs/ext/IBM833.java \
- sun/nio/cs/ext/IBM838.java \
- sun/nio/cs/ext/IBM856.java \
- sun/nio/cs/ext/IBM860.java \
- sun/nio/cs/ext/IBM861.java \
- sun/nio/cs/ext/IBM863.java \
- sun/nio/cs/ext/IBM864.java \
- sun/nio/cs/ext/IBM865.java \
- sun/nio/cs/ext/IBM868.java \
- sun/nio/cs/ext/IBM869.java \
- sun/nio/cs/ext/IBM870.java \
- sun/nio/cs/ext/IBM871.java \
- sun/nio/cs/ext/IBM875.java \
- sun/nio/cs/ext/IBM918.java \
- sun/nio/cs/ext/IBM921.java \
- sun/nio/cs/ext/IBM922.java \
- sun/nio/cs/ext/ISO_8859_11.java \
- sun/nio/cs/ext/ISO_8859_3.java \
- sun/nio/cs/ext/ISO_8859_6.java \
- sun/nio/cs/ext/ISO_8859_8.java \
- sun/nio/cs/ext/MS1255.java \
- sun/nio/cs/ext/MS1256.java \
- sun/nio/cs/ext/MS1258.java \
- sun/nio/cs/ext/MS874.java \
- sun/nio/cs/ext/MacArabic.java \
- sun/nio/cs/ext/MacCentralEurope.java \
- sun/nio/cs/ext/MacCroatian.java \
- sun/nio/cs/ext/MacCyrillic.java \
- sun/nio/cs/ext/MacDingbat.java \
- sun/nio/cs/ext/MacGreek.java \
- sun/nio/cs/ext/MacHebrew.java \
- sun/nio/cs/ext/MacIceland.java \
- sun/nio/cs/ext/MacRoman.java \
- sun/nio/cs/ext/MacRomania.java \
- sun/nio/cs/ext/MacSymbol.java \
- sun/nio/cs/ext/MacThai.java \
- sun/nio/cs/ext/MacTurkish.java \
- sun/nio/cs/ext/MacUkraine.java \
- sun/nio/cs/ext/TIS_620.java \
- sun/nio/cs/ext/EUC_TWMapping.java \
- sun/nio/cs/ext/HKSCSMapping.java \
- sun/nio/cs/ext/HKSCS2001Mapping.java \
- sun/nio/cs/ext/HKSCS_XPMapping.java \
- sun/nio/cs/ext/IBM1364.java \
- sun/nio/cs/ext/IBM1381.java \
- sun/nio/cs/ext/IBM1383.java \
- sun/nio/cs/ext/IBM930.java \
- sun/nio/cs/ext/IBM933.java \
- sun/nio/cs/ext/IBM935.java \
- sun/nio/cs/ext/IBM937.java \
- sun/nio/cs/ext/IBM939.java \
- sun/nio/cs/ext/IBM942.java \
- sun/nio/cs/ext/IBM943.java \
- sun/nio/cs/ext/IBM948.java \
- sun/nio/cs/ext/IBM949.java \
- sun/nio/cs/ext/IBM950.java \
- sun/nio/cs/ext/IBM970.java \
- sun/nio/cs/ext/EUC_CN.java \
- sun/nio/cs/ext/EUC_KR.java \
- sun/nio/cs/ext/Johab.java \
- sun/nio/cs/ext/MS932.java \
- sun/nio/cs/ext/MS936.java \
- sun/nio/cs/ext/MS949.java \
- sun/nio/cs/ext/MS950.java \
- sun/nio/cs/ext/GBK.java \
- sun/nio/cs/ext/Big5.java \
- sun/nio/cs/ext/SJIS.java \
- sun/nio/cs/ext/PCK.java \
- sun/nio/cs/ext/JIS_X_0201.java \
- sun/nio/cs/ext/JIS_X_0208.java \
- sun/nio/cs/ext/JIS_X_0208_MS5022X.java \
- sun/nio/cs/ext/JIS_X_0208_MS932.java \
- sun/nio/cs/ext/JIS_X_0208_Solaris.java \
- sun/nio/cs/ext/JIS_X_0212.java \
- sun/nio/cs/ext/JIS_X_0212_MS5022X.java \
- sun/nio/cs/ext/JIS_X_0212_Solaris.java
-
-FILES_java = $(FILES_src) $(FILES_gen_extcs)
-
diff --git a/jdk/make/sun/nio/cs/Makefile b/jdk/make/sun/nio/cs/Makefile
deleted file mode 100644
index 3b45c77..0000000
--- a/jdk/make/sun/nio/cs/Makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for character converters.
-#
-
-BUILDDIR = ../../..
-
-# charsets should be separated from nio module
-PACKAGE = sun.nio
-PRODUCT = sun
-
-# This re-directs all the class files to a separate location
-CLASSDESTDIR = $(TEMPDIR)/classes
-
-JAVAC_MAX_WARNINGS = false
-JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation
-JAVAC_WARNINGS_FATAL = true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_java.gmk
-AUTO_FILES_JAVA_DIRS = sun/nio/cs/ext
-
-# For Cygwin, command line arguments that are paths must be converted to
-# windows style paths. These paths cannot be used as targets, however, because
-# the ":" in them will interfere with GNU Make rules, generating "multiple
-# target pattern" errors.
-
-# this define is for the rule:
-CHARSETS_JAR = $(LIBDIR)/charsets.jar
-
-# extcs
-FILES_genout_extcs = $(FILES_gen_extcs:%.java=$(GENSRCDIR)/%.java)
-
-#
-# These sun.awt charsets use sun/nio/cs/ext charsets that only exist
-# in JDK7 charsets.jar, which causes problem when build the symbol
-# table for rt.jar in Release.gmk. They are now removed from the
-# rt.jar when building jdk/jre image (in Release.gmk), so add them
-# into charsets.jar here
-#
-ifeq ($(PLATFORM), windows)
-FILES_src += \
- sun/awt/HKSCS.java
-else
-# Solaris/Linux
-FILES_src += \
- sun/awt/HKSCS.java \
- sun/awt/motif/X11GB2312.java \
- sun/awt/motif/X11GBK.java \
- sun/awt/motif/X11KSC5601.java
-endif # PLATFORM
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-build: $(FILES_genout_extcs) $(CHARSETS_JAR)
-
-#
-# Extra rules to build character converters.
-
-GENCSDATASRC = $(BUILDDIR)/tools/CharsetMapping
-GENCSSRCDIR = $(BUILDDIR)/tools/src/build/tools/charsetmapping
-GENCSEXT = $(GENSRCDIR)/sun/nio/cs/ext
-
-FILES_MAP = $(GENCSDATASRC)/sjis0213.map
-FILES_DAT = $(CLASSDESTDIR)/sun/nio/cs/ext/sjis0213.dat
-CHARSETMAPPING_JARFILE = $(BUILDTOOLJARDIR)/charsetmapping.jar
-
-$(FILES_DAT): $(FILES_MAP)
- @$(prep-target)
- $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) \
- $(FILES_MAP) $(FILES_DAT) sjis0213
-
-
-$(FILES_genout_extcs): \
- $(GENCSDATASRC)/SingleByte-X.java.template \
- $(GENCSDATASRC)/DoubleByte-X.java.template \
- $(GENCSDATASRC)/extsbcs $(GENCSDATASRC)/dbcs
- @$(prep-target)
- $(RM) -r $(GENCSEXT)
- $(MKDIR) -p $(GENCSEXT)
- $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) extsbcs
- $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) euctw \
- $(GENCSSRCDIR)/EUC_TW.java
- $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) hkscs \
- $(GENCSSRCDIR)/HKSCS.java
- $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) dbcs
-
-# no compression unless requested
-ifndef COMPRESS_JARS
- CREATE_JAR_OPTS_NOMANIFEST = cf0
-else
- CREATE_JAR_OPTS_NOMANIFEST = cf
-endif
-
-$(CHARSETS_JAR): $(FILES_class) $(FILES_DAT)
- $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS_NOMANIFEST) $(CHARSETS_JAR) \
- -C $(CLASSDESTDIR) sun \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-clean::
- $(RM) -r $(CLASSDESTDIR)
- $(RM) $(CHARSETS_JAR)
diff --git a/jdk/make/sun/osxapp/Makefile b/jdk/make/sun/osxapp/Makefile
deleted file mode 100644
index d7277ef..0000000
--- a/jdk/make/sun/osxapp/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-LIBRARY = osxapp
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-GEN_DIR=$(GENSRCDIR)/sun/osxapp
-ICON_DATA = $(GEN_DIR)/AWTIconData.h
-
-CLASSES_INIT += $(ICON_DATA)
-
-#
-# Files
-#
-FILES_objc = \
- NSApplicationAWT.m \
- QueuingApplicationDelegate.m \
- PropertiesUtilities.m \
- ThreadUtilities.m
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Add to the ambient vpath to pick up files in subdirectories
-#
-vpath %.m $(call NativeSrcDirList,,native/sun/osxapp)
-
-# TODO: perhaps not all of the below frameworks are required
-OTHER_LDLIBS += \
- -framework Accelerate \
- -framework ApplicationServices \
- -framework AudioToolbox \
- -framework Carbon \
- -framework Cocoa \
- -framework Security \
- -framework ExceptionHandling \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -framework OpenGL \
- -framework IOSurface \
- -framework QuartzCore
-
-CPPFLAGS += \
- -I$(GEN_DIR) \
- $(call NativeSrcDirList,-I,/native/sun/osxapp)
-
-
-ifeq ($(MILESTONE), internal)
- CPPFLAGS += -DINTERNAL_BUILD
-endif
-
-TEMPDIR_CLASSES = $(TEMPDIR)/classes
-
-$(TEMPDIR_CLASSES)/sun/osxapp/ToBin.class: ToBin.java
- @$(prep-target)
- $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
-
-ifdef OPENJDK
- ICONS_PATH_PREFIX=$(PLATFORM_SRC_MACOS)
-else
- ICONS_PATH_PREFIX=$(CLOSED_SRC)/macosx
-endif
-
-generated.clean:
- $(RM) -r $(GEN_DIR)/*.h
-
-ICONPATH=$(ICONS_PATH_PREFIX)/native/sun/osxapp/resource/icons
-ICON = $(ICONPATH)/JavaApp.icns
-
-$(GEN_DIR)/AWTIconData.h: $(TEMPDIR_CLASSES)/sun/osxapp/ToBin.class $(ICON)
- $(prep-target)
- $(RM) $(ICON_DATA)
- $(ECHO) "static unsigned char sAWTIconData[] = { " >> $(ICON_DATA); \
- $(CAT) $(ICON) | \
- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) -Djava.awt.headless=true \
- sun.osxapp.ToBin >> $(ICON_DATA); \
- $(ECHO) "};" >> $(ICON_DATA);
-
-
-clean clobber:: generated.clean
-
-.PHONY: generated.clean
diff --git a/jdk/make/sun/osxapp/ToBin.java b/jdk/make/sun/osxapp/ToBin.java
deleted file mode 100644
index 9fdcba3..0000000
--- a/jdk/make/sun/osxapp/ToBin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.osxapp;
-
-import java.io.*;
-
-public class ToBin {
- public static void main(String[] args) throws Exception {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- int nRead;
- byte[] data = new byte[4096];
-
- while ((nRead = System.in.read(data, 0, data.length)) != -1) {
- baos.write(data, 0, nRead);
- }
-
- baos.flush();
-
- byte[] buf = baos.toByteArray();
- for (int i = 0; i < buf.length; i++) {
- System.out.print(String.format("0x%1$02X", buf[i]) + ", ");
- if (i % 20 == 0) {
- System.out.println();
- }
- }
- }
-}
diff --git a/jdk/make/sun/pisces/Makefile b/jdk/make/sun/pisces/Makefile
deleted file mode 100644
index 724bf24..0000000
--- a/jdk/make/sun/pisces/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.pisces
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-
-#
-# Include all Java source files in sun/java2d/pisces
-#
-AUTO_FILES_JAVA_DIRS = sun/java2d/pisces
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-SERVICEDIR = $(CLASSBINDIR)/META-INF/services
-
-FILES_copy = \
- $(SERVICEDIR)/sun.java2d.pipe.RenderingEngine
-
-build: copy-files
-
-copy-files: $(FILES_copy)
-
-ifneq ($(PLATFORM), windows)
- SERVICE_SRC = $(PLATFORM_SRC)
-else
- SERVICE_SRC = $(SHARE_SRC)
-endif
-
-$(SERVICEDIR)/%: $(SERVICE_SRC)/classes/sun/java2d/pisces/META-INF/services/%
- $(install-file)
diff --git a/jdk/make/sun/rmi/Makefile b/jdk/make/sun/rmi/Makefile
deleted file mode 100644
index cbf7d67..0000000
--- a/jdk/make/sun/rmi/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build rmi tools, and sun.rmi.* implementation classes
-#
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Order is important -- you can't build stubs without building rmic first.
-# We need corbalogsources to be built first, since it builds LogWrappers to
-# log the exceptions and generate the right minorcodes. These classes are
-# references in com/sun/corba/se/impl/io and util classes which in turn will
-# be built from rmic Makefile.
-#
-SUBDIRS = oldtools rmic
-
-SUBDIRS += rmi registry rmid
-ifeq ($(PLATFORM), windows)
- SUBDIRS += cgi
-endif # PLATFORM
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-# Then do the rest
-all build clean clobber ::
- $(SUBDIRS-loop)
-
-clean::
- $(RM) -r $(CLASSBINDIR)/sun/rmi $(CLASSBINDIR)/com/sun/rmi
diff --git a/jdk/make/sun/rmi/cgi/Makefile b/jdk/make/sun/rmi/cgi/Makefile
deleted file mode 100644
index cbe2881..0000000
--- a/jdk/make/sun/rmi/cgi/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building rmiregistry program
-#
-
-BUILDDIR = ../../..
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-# java-rmi.cgi is a JDK tool
-PACKAGE = sun.rmi
-PRODUCT = sun
-PROGRAM = java-rmi
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-FILES_c = java-rmi.c
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Program.gmk
-
-build: $(BINDIR)/$(PROGRAM).cgi
-
-#
-# Rename .exe to .cgi.
-#
-
-$(BINDIR)/$(PROGRAM).cgi: $(BINDIR)/$(PROGRAM).exe
- $(install-file)
-
-clean clobber::
- $(RM) $(BINDIR)/$(PROGRAM).cgi
-
diff --git a/jdk/make/sun/rmi/oldtools/FILES_java.gmk b/jdk/make/sun/rmi/oldtools/FILES_java.gmk
deleted file mode 100644
index 7ac923b..0000000
--- a/jdk/make/sun/rmi/oldtools/FILES_java.gmk
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-# Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_java = \
- sun/tools/java/RuntimeConstants.java \
- sun/tools/javac/Main.java \
- sun/tools/javac/BatchEnvironment.java \
- sun/tools/javac/ErrorConsumer.java \
- sun/tools/javac/ErrorMessage.java \
- sun/tools/javac/BatchParser.java \
- sun/tools/javac/SourceClass.java \
- sun/tools/javac/SourceMember.java \
- sun/tools/javac/CompilerMember.java \
- sun/tools/tree/LocalMember.java \
- sun/tools/tree/Node.java \
- sun/tools/tree/Expression.java \
- sun/tools/tree/Statement.java \
- sun/tools/tree/TypeExpression.java \
- sun/tools/tree/IdentifierExpression.java \
- sun/tools/tree/UnaryExpression.java \
- sun/tools/tree/FieldExpression.java \
- sun/tools/tree/NaryExpression.java \
- sun/tools/tree/MethodExpression.java \
- sun/tools/tree/InlineMethodExpression.java \
- sun/tools/tree/ConstantExpression.java \
- sun/tools/tree/IntegerExpression.java \
- sun/tools/tree/CharExpression.java \
- sun/tools/tree/IntExpression.java \
- sun/tools/tree/LongExpression.java \
- sun/tools/tree/FloatExpression.java \
- sun/tools/tree/DoubleExpression.java \
- sun/tools/tree/StringExpression.java \
- sun/tools/tree/BooleanExpression.java \
- sun/tools/tree/NullExpression.java \
- sun/tools/tree/ThisExpression.java \
- sun/tools/tree/SuperExpression.java \
- sun/tools/tree/NotExpression.java \
- sun/tools/tree/PositiveExpression.java \
- sun/tools/tree/NegativeExpression.java \
- sun/tools/tree/BitNotExpression.java \
- sun/tools/tree/IncDecExpression.java \
- sun/tools/tree/PreIncExpression.java \
- sun/tools/tree/PreDecExpression.java \
- sun/tools/tree/BinaryExpression.java \
- sun/tools/tree/CastExpression.java \
- sun/tools/tree/ExprExpression.java \
- sun/tools/tree/ArrayExpression.java \
- sun/tools/tree/NewArrayExpression.java \
- sun/tools/tree/NewInstanceExpression.java \
- sun/tools/tree/ArrayAccessExpression.java \
- sun/tools/tree/PostIncExpression.java \
- sun/tools/tree/PostDecExpression.java \
- sun/tools/tree/CommaExpression.java \
- sun/tools/tree/InstanceOfExpression.java \
- sun/tools/tree/BinaryArithmeticExpression.java \
- sun/tools/tree/AddExpression.java \
- sun/tools/tree/SubtractExpression.java \
- sun/tools/tree/MultiplyExpression.java \
- sun/tools/tree/DivRemExpression.java \
- sun/tools/tree/DivideExpression.java \
- sun/tools/tree/RemainderExpression.java \
- sun/tools/tree/BinaryShiftExpression.java \
- sun/tools/tree/ShiftLeftExpression.java \
- sun/tools/tree/ShiftRightExpression.java \
- sun/tools/tree/BinaryCompareExpression.java \
- sun/tools/tree/LessExpression.java \
- sun/tools/tree/LessOrEqualExpression.java \
- sun/tools/tree/GreaterExpression.java \
- sun/tools/tree/GreaterOrEqualExpression.java \
- sun/tools/tree/BinaryEqualityExpression.java \
- sun/tools/tree/EqualExpression.java \
- sun/tools/tree/NotEqualExpression.java \
- sun/tools/tree/BinaryBitExpression.java \
- sun/tools/tree/BitAndExpression.java \
- sun/tools/tree/BitXorExpression.java \
- sun/tools/tree/BitOrExpression.java \
- sun/tools/tree/BinaryLogicalExpression.java \
- sun/tools/tree/AndExpression.java \
- sun/tools/tree/OrExpression.java \
- sun/tools/tree/BinaryAssignExpression.java \
- sun/tools/tree/IfStatement.java \
- sun/tools/tree/AssignExpression.java \
- sun/tools/tree/AssignOpExpression.java \
- sun/tools/tree/AssignAddExpression.java \
- sun/tools/tree/AssignSubtractExpression.java \
- sun/tools/tree/AssignMultiplyExpression.java \
- sun/tools/tree/AssignDivideExpression.java \
- sun/tools/tree/AssignRemainderExpression.java \
- sun/tools/tree/AssignBitAndExpression.java \
- sun/tools/tree/AssignBitOrExpression.java \
- sun/tools/tree/AssignBitXorExpression.java \
- sun/tools/tree/AssignShiftLeftExpression.java \
- sun/tools/tree/AssignShiftRightExpression.java \
- sun/tools/tree/ConditionalExpression.java \
- sun/tools/tree/ConditionVars.java \
- sun/tools/tree/CompoundStatement.java \
- sun/tools/tree/DeclarationStatement.java \
- sun/tools/tree/ExpressionStatement.java \
- sun/tools/tree/ForStatement.java \
- sun/tools/tree/WhileStatement.java \
- sun/tools/tree/DoStatement.java \
- sun/tools/tree/BreakStatement.java \
- sun/tools/tree/ContinueStatement.java \
- sun/tools/tree/ReturnStatement.java \
- sun/tools/tree/InlineReturnStatement.java \
- sun/tools/tree/CaseStatement.java \
- sun/tools/tree/SwitchStatement.java \
- sun/tools/tree/CatchStatement.java \
- sun/tools/tree/TryStatement.java \
- sun/tools/tree/FinallyStatement.java \
- sun/tools/tree/ThrowStatement.java \
- sun/tools/tree/SynchronizedStatement.java \
- sun/tools/tree/ConvertExpression.java \
- sun/tools/tree/LengthExpression.java \
- sun/tools/tree/ByteExpression.java \
- sun/tools/tree/ShortExpression.java \
- sun/tools/tree/Context.java \
- sun/tools/tree/CheckContext.java \
- sun/tools/tree/CodeContext.java \
- sun/tools/tree/VarDeclarationStatement.java \
- sun/tools/asm/Assembler.java \
- sun/tools/asm/Instruction.java \
- sun/tools/asm/Label.java \
- sun/tools/asm/SwitchData.java \
- sun/tools/asm/Cover.java \
- sun/tools/asm/ArrayData.java \
- sun/tools/asm/TryData.java \
- sun/tools/asm/CatchData.java \
- sun/tools/asm/ConstantPool.java \
- sun/tools/asm/ConstantPoolData.java \
- sun/tools/asm/StringConstantData.java \
- sun/tools/asm/ClassConstantData.java \
- sun/tools/asm/FieldConstantData.java \
- sun/tools/asm/NameAndTypeData.java \
- sun/tools/asm/NameAndTypeConstantData.java \
- sun/tools/asm/NumberConstantData.java \
- sun/tools/asm/LocalVariableTable.java \
- sun/tools/asm/LocalVariable.java \
- sun/tools/java/Environment.java \
- sun/tools/java/Scanner.java \
- sun/tools/java/ScannerInputReader.java \
- sun/tools/java/Parser.java \
- sun/tools/java/Imports.java \
- sun/tools/java/ClassDefinition.java \
- sun/tools/java/MemberDefinition.java \
- sun/tools/java/ClassDeclaration.java \
- sun/tools/java/Identifier.java \
- sun/tools/java/Package.java \
- sun/tools/java/ClassPath.java \
- sun/tools/java/ClassFile.java \
- sun/tools/java/ClassNotFound.java \
- sun/tools/java/Constants.java \
- sun/tools/java/SyntaxError.java \
- sun/tools/java/Type.java \
- sun/tools/java/MethodType.java \
- sun/tools/java/ArrayType.java \
- sun/tools/java/ClassType.java \
- sun/tools/java/AmbiguousClass.java \
- sun/tools/java/CompilerError.java \
- sun/tools/java/AmbiguousMember.java \
- sun/tools/java/BinaryClass.java \
- sun/tools/java/BinaryConstantPool.java \
- sun/tools/java/BinaryAttribute.java \
- sun/tools/java/BinaryCode.java \
- sun/tools/java/BinaryExceptionHandler.java \
- sun/tools/java/BinaryMember.java \
- sun/tools/tree/UnsignedShiftRightExpression.java \
- sun/tools/tree/AssignUnsignedShiftRightExpression.java \
- sun/tools/asm/StringExpressionConstantData.java \
- sun/tools/tree/InlineNewInstanceExpression.java \
- sun/tools/java/IdentifierToken.java \
- sun/tools/java/ParserActions.java \
- sun/tools/tree/UplevelReference.java \
- sun/tools/tree/FieldUpdater.java \
- sun/tools/tree/Vset.java \
- sun/tools/java/MethodSet.java \
- sun/tools/util/ModifierFilter.java \
- sun/tools/util/CommandLine.java
diff --git a/jdk/make/sun/rmi/oldtools/Makefile b/jdk/make/sun/rmi/oldtools/Makefile
deleted file mode 100644
index f3eb897..0000000
--- a/jdk/make/sun/rmi/oldtools/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the old java compiler.
-#
-
-BUILDDIR = ../../..
-PRODUCT = oldjavac
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-include FILES_java.gmk
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = j2sdk
-RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = sun/tools/javac/resources/javac.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-clean clobber::
- $(RM) -r $(CLASSBINDIR)/sun/tools/asm
- $(RM) -r $(CLASSBINDIR)/sun/tools/java
- $(RM) -r $(CLASSBINDIR)/sun/tools/javac
- $(RM) -r $(CLASSBINDIR)/sun/tools/tree
- $(RM) -r $(CLASSBINDIR)/sun/tools/util
-
diff --git a/jdk/make/sun/rmi/registry/Makefile b/jdk/make/sun/rmi/registry/Makefile
deleted file mode 100644
index b1a2739..0000000
--- a/jdk/make/sun/rmi/registry/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building sun.rmi.registry.* and the "rmiregistry" command
-#
-
-BUILDDIR = ../../..
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation
-PACKAGE = sun.rmi.registry
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = sun/rmi/registry
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/resources/rmiregistry.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-build: rmiregistry
-
-rmiregistry:
- $(call make-launcher, rmiregistry, sun.rmi.registry.RegistryImpl, , )
diff --git a/jdk/make/sun/rmi/rmi/Makefile b/jdk/make/sun/rmi/rmi/Makefile
deleted file mode 100644
index 31af2ab..0000000
--- a/jdk/make/sun/rmi/rmi/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building sun.rmi.*
-#
-
-BUILDDIR = ../../..
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation
-PACKAGE = sun.rmi
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Java files to compile.
-#
-AUTO_FILES_JAVA_DIRS = \
- java/rmi \
- sun/rmi/log \
- sun/rmi/registry \
- sun/rmi/runtime \
- sun/rmi/server \
- sun/rmi/transport \
- com/sun/rmi
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Rules.gmk
-
-#
-# Full package names of implementations requiring stubs
-#
-REMOTE_impls = \
- sun.rmi.registry.RegistryImpl \
- sun.rmi.transport.DGCImpl
-
-#
-# The java-rmi.cgi script in bin/ only gets delivered in certain situations
-#
-BUILD_TARGETS = stubs
-ifeq ($(PLATFORM), linux)
- BUILD_TARGETS += bin
-endif
-ifeq ($(PLATFORM), solaris)
- ifeq ($(ARCH_DATA_MODEL), 32)
- BUILD_TARGETS += bin
- endif
-endif
-
-build: $(BUILD_TARGETS)
-
-clean clobber:: bin.clean
-
-
-#
-# Compile stubs and skeletons for remote implementations
-# (use -v1.1 for backward interoperability)
-#
-# gnumake 3.78.1 on windows attempts to build the target even
-# though it exists. Not sure why, but a check for file existence
-# has been added...
-#
-$(CLASSBINDIR)/%_Skel.class $(CLASSBINDIR)/%_Stub.class: $(CLASSBINDIR)/%.class
- if [ ! -s $@ ] ; \
- then $(RMIC) -v1.1 -classpath \
- "$(CLASSBINDIR)" \
- -d $(CLASSBINDIR) '$(subst /,.,$(<:$(CLASSBINDIR)/%.class=%))' ; \
- fi
- @$(java-vm-cleanup)
-
-REMOTE_files = $(subst .,/,$(REMOTE_impls))
-FILES_stubs = $(REMOTE_files:%=$(CLASSBINDIR)/%_Stub.class)
-FILES_skels = $(REMOTE_files:%=$(CLASSBINDIR)/%_Skel.class)
-
-stubs: $(FILES_stubs) $(FILES_skels)
-
-bin: $(BINDIR)/java-rmi.cgi
-
-$(BINDIR)/java-rmi.cgi: $(PLATFORM_SRC)/bin/java-rmi.cgi.sh
- $(install-file)
- $(call chmod-file, a+x)
-
-bin.clean:
- $(RM) $(BINDIR)/java-rmi.cgi
-
-.PHONY: stubs bin bin.clean
-
diff --git a/jdk/make/sun/rmi/rmi/mapfile-vers b/jdk/make/sun/rmi/rmi/mapfile-vers
deleted file mode 100644
index 31eddb2..0000000
--- a/jdk/make/sun/rmi/rmi/mapfile-vers
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- global:
- Java_sun_rmi_server_MarshalInputStream_latestUserDefinedLoader;
- local:
- *;
-};
diff --git a/jdk/make/sun/rmi/rmic/FILES.gmk b/jdk/make/sun/rmi/rmic/FILES.gmk
deleted file mode 100644
index 77f509d..0000000
--- a/jdk/make/sun/rmi/rmic/FILES.gmk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-
-RMIC_java = \
- sun/rmi/rmic/BatchEnvironment.java \
- sun/rmi/rmic/Util.java \
- sun/rmi/rmic/Constants.java \
- sun/rmi/rmic/Generator.java \
- sun/rmi/rmic/IndentingWriter.java \
- sun/rmi/rmic/Main.java \
- sun/rmi/rmic/Names.java \
- sun/rmi/rmic/RMIConstants.java \
- sun/rmi/rmic/RMIGenerator.java \
- sun/rmi/rmic/RemoteClass.java \
- sun/rmi/rmic/newrmic/BatchEnvironment.java \
- sun/rmi/rmic/newrmic/Constants.java \
- sun/rmi/rmic/newrmic/Generator.java \
- sun/rmi/rmic/newrmic/IndentingWriter.java \
- sun/rmi/rmic/newrmic/Main.java \
- sun/rmi/rmic/newrmic/Resources.java \
- sun/rmi/rmic/newrmic/jrmp/Constants.java \
- sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java \
- sun/rmi/rmic/newrmic/jrmp/RemoteClass.java \
- sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java \
- sun/rmi/rmic/newrmic/jrmp/Util.java
diff --git a/jdk/make/sun/rmi/rmic/Makefile b/jdk/make/sun/rmi/rmic/Makefile
deleted file mode 100644
index 3f4e560..0000000
--- a/jdk/make/sun/rmi/rmic/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building sun.rmi.rmic.* and the "rmic" command
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.rmi.rmic
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# This program must contain a manifest that defines the execution level
-# needed to follow standard Vista User Access Control Guidelines
-# This must be set before Program.gmk is included
-#
-BUILD_MANIFEST=true
-
-#
-# Files
-#
-include FILES.gmk
-
-FILES_java = $(RMIC_java)
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/resources/rmic.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/sun/rmi/rmid/Makefile b/jdk/make/sun/rmi/rmid/Makefile
deleted file mode 100644
index ce1b936..0000000
--- a/jdk/make/sun/rmi/rmid/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Install a wrapper for the "rmid" command. The associated classfiles
-# are built at a higher level.
-#
-
-BUILDDIR = ../../..
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-PACKAGE = sun.rmi.activation
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-build: stubs rmid
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = sun/rmi/server/resources/rmid.properties
-
-#
-# Extra dependencies.
-#
-classes: stubs
-
-#
-# Rules to build activation-system stubs
-#
-
-# Full package names of implementations requiring stubs
-REMOTE_impls = \
- sun.rmi.server.Activation$$ActivationSystemImpl \
- java.rmi.activation.ActivationGroup
-
-REMOTE_files = $(subst .,/,$(REMOTE_impls))
-FILES_stubs = $(REMOTE_files:%=$(CLASSBINDIR)/%_Stub.class)
-
-#
-# Compile stubs for remote implementations
-# (use -v1.2 stubs for activation system)
-#
-
-$(CLASSBINDIR)/%_Stub.class: $(CLASSBINDIR)/%.class
- $(RMIC) -v1.2 -classpath $(CLASSBINDIR) \
- -d $(CLASSBINDIR) '$(subst /,.,$(<:$(CLASSBINDIR)/%.class=%))'
- @$(java-vm-cleanup)
-
-stubs: $(FILES_stubs)
-
-#
-# Rules to
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-rmid:
- $(call make-launcher, rmid, sun.rmi.server.Activation, , )
diff --git a/jdk/make/sun/security/Makefile b/jdk/make/sun/security/Makefile
deleted file mode 100644
index 0a1a7aa..0000000
--- a/jdk/make/sun/security/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Build classes for security tools:
-#
-# * keytool
-# * jarsigner
-# * policytool
-#
-# Also install wrappers for all of these.
-#
-
-BUILDDIR = ../..
-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
-SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
-include $(BUILDDIR)/common/Defs.gmk
-
-# build sun/security/jgss/wrapper on non-windows platforms
-JGSS_WRAPPER =
-ifneq ($(PLATFORM), windows)
- JGSS_WRAPPER = jgss/wrapper
-endif
-
-# Build PKCS#11 on all platforms
-PKCS11 = pkcs11
-
-# Build Microsoft CryptoAPI provider only on Windows platform.
-MSCAPI =
-ifeq ($(PLATFORM), windows)
- MSCAPI = mscapi
-endif
-
-# Build in-tree elliptic curve crypto provider only when
-# DISABLE_INTREE_EC is not set
-INTREE_EC = ec
-ifdef DISABLE_INTREE_EC
- INTREE_EC =
-endif
-
-SUBDIRS = $(INTREE_EC) other action util krb5
-SUBDIRS_misc = jgss $(PKCS11) $(JGSS_WRAPPER) $(MSCAPI) smartcardio
-SUBDIRS_tools = tools
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clean::
- $(RM) -r $(CLASSBINDIR)/sun/security
diff --git a/jdk/make/sun/security/action/Makefile b/jdk/make/sun/security/action/Makefile
deleted file mode 100644
index 1d4e13a..0000000
--- a/jdk/make/sun/security/action/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.security.action
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = sun/security/action
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/sun/security/ec/FILES_c.gmk b/jdk/make/sun/security/ec/FILES_c.gmk
deleted file mode 100644
index 278cb21..0000000
--- a/jdk/make/sun/security/ec/FILES_c.gmk
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- ec.c \
- ec2_163.c \
- ec2_193.c \
- ec2_233.c \
- ec2_aff.c \
- ec2_mont.c \
- ecdecode.c \
- ecl.c \
- ecl_curve.c \
- ecl_gf.c \
- ecl_mult.c \
- ec_naf.c \
- ecp_192.c \
- ecp_224.c \
- ecp_256.c \
- ecp_384.c \
- ecp_521.c \
- ecp_aff.c \
- ecp_jac.c \
- ecp_jm.c \
- ecp_mont.c \
- mp_gf2m.c \
- mpi.c \
- mplogic.c \
- mpmontg.c \
- oid.c \
- secitem.c
-
diff --git a/jdk/make/sun/security/ec/Makefile b/jdk/make/sun/security/ec/Makefile
deleted file mode 100644
index bceb031..0000000
--- a/jdk/make/sun/security/ec/Makefile
+++ /dev/null
@@ -1,324 +0,0 @@
-#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building sunec.jar and sunec native library.
-#
-# This file was derived from make/com/sun/crypto/provider/Makefile.
-#
-
-#
-# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Sun JDK builds
-# respectively.)
-#
-# JCE builds are very different between OpenJDK and JDK. The OpenJDK JCE
-# jar files do not require signing, but those for JDK do. If an unsigned
-# jar file is installed into JDK, things will break when the crypto
-# routines are called.
-#
-# This Makefile does the "real" build of the JCE files. For OpenJDK,
-# the jar files built here are installed directly into the OpenJDK.
-#
-# For JDK, the binaries use pre-built/pre-signed binary files stored in
-# the closed workspace that are not shipped in the OpenJDK workspaces.
-# We still build the JDK files here to verify the files compile, and in
-# preparation for possible signing. Developers working on JCE in JDK
-# must sign the JCE files before testing. The JCE signing key is kept
-# separate from the JDK workspace to prevent its disclosure.
-#
-# SPECIAL NOTE TO JCE/JDK developers: The source files must eventually
-# be built, signed, and then the resulting jar files MUST BE CHECKED
-# INTO THE CLOSED PART OF THE WORKSPACE*. This separate step *MUST NOT
-# BE FORGOTTEN*, otherwise a bug fixed in the source code will not be
-# reflected in the shipped binaries. The "release" target should be
-# used to generate the required files.
-#
-# There are a number of targets to help both JDK/OpenJDK developers.
-#
-# Main Targets (JDK/OPENJDK):
-#
-# all/clobber/clean The usual, plus the native libraries.
-# If OpenJDK, installs sunec.jar.
-# If JDK, installs prebuilt
-# sunec.jar.
-#
-# jar Builds/installs sunec.jar
-# If OpenJDK, does not sign.
-# If JDK, tries to sign.
-#
-# Other lesser-used Targets (JDK/OPENJDK):
-#
-# build-jar Builds sunec.jar
-# (does not sign/install)
-#
-# install-jar Alias for "jar" above.
-#
-# Other targets (JDK only):
-#
-# sign Alias for sign-jar
-# sign-jar Builds/signs sunec.jar (no install)
-#
-# release Builds all targets in preparation
-# for workspace integration.
-#
-# install-prebuilt Installs the pre-built jar files
-#
-# This makefile was written to support parallel target execution.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.security.ec
-PRODUCT = sun
-
-#
-# The following is for when we need to do postprocessing
-# (signing) against a read-only build. If the OUTPUTDIR
-# isn't writable, the build currently crashes out.
-#
-ifndef OPENJDK
- ifdef ALT_JCE_BUILD_DIR
- # =====================================================
- # Where to place the output, in case we're building from a read-only
- # build area. (e.g. a release engineering build.)
- JCE_BUILD_DIR=${ALT_JCE_BUILD_DIR}
- IGNORE_WRITABLE_OUTPUTDIR_TEST=true
- else
- JCE_BUILD_DIR=${TEMPDIR}
- endif
-endif
-
-JAVAC_MAX_WARNINGS=false
-JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation
-JAVAC_WARNINGS_FATAL=true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Location for the newly built classfiles.
-#
-CLASSDESTDIR = $(TEMPDIR)/classes
-
-#
-# Java files
-#
-AUTO_FILES_JAVA_DIRS = $(PKGDIR)
-
-#
-# Some licensees do not get the native ECC sources, but we still need to
-# be able to build "all" for them. Check here to see if the sources are
-# available. If not, then skip them.
-#
-
-NATIVE_ECC_AVAILABLE := $(shell \
- if [ -d $(SHARE_SRC)/native/$(PKGDIR)/impl ] ; then \
- $(ECHO) true; \
- else \
- $(ECHO) false; \
- fi)
-
-ifeq ($(NATIVE_ECC_AVAILABLE), true)
-
- LIBRARY = sunec
-
- #
- # Java files that define native methods
- #
- FILES_export = \
- $(PKGDIR)/ECDHKeyAgreement.java \
- $(PKGDIR)/ECDSASignature.java \
- $(PKGDIR)/ECKeyPairGenerator.java
-
- JAVAHFLAGS = -bootclasspath \
- "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)"
-
-
- #
- # C and C++ files
- #
- include FILES_c.gmk
-
- FILES_cpp = ECC_JNI.cpp
-
- CPLUSPLUSLIBRARY=true
-
- FILES_m = mapfile-vers
-
- #
- # Find native code
- #
- vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
-
- vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/impl
-
- #
- # Find include files
- #
- OTHER_INCLUDES += -I$(SHARE_SRC)/native/$(PKGDIR)/impl
-
- #
- # Compiler flags
- #
- OTHER_CFLAGS += -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B
-
- #
- # Libraries to link
- #
- ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS = $(LIBCXX)
- endif
-
- include $(BUILDDIR)/common/Mapfile-vers.gmk
-
- include $(BUILDDIR)/common/Library.gmk
-
-else # NATIVE_ECC_AVAILABLE
-
- include $(BUILDDIR)/common/Classes.gmk
-
-endif # NATIVE_ECC_AVAILABLE
-
-#
-# We use a variety of subdirectories in the $(TEMPDIR) depending on what
-# part of the build we're doing. Both OPENJDK/JDK builds are initially
-# done in the unsigned area. When files are signed in JDK,
-# they will be placed in the appropriate area.
-#
-UNSIGNED_DIR = $(TEMPDIR)/unsigned
-
-include $(BUILDDIR)/javax/crypto/Defs-jce.gmk
-
-#
-# Rules
-#
-
-ifdef OPENJDK
-all: build-jar install-jar
-else
-all: build-jar install-prebuilt
- $(build-warning)
-endif
-
-
-# =====================================================
-# Build the unsigned sunec.jar file.
-#
-
-JAR_DESTFILE = $(EXTDIR)/sunec.jar
-
-#
-# Since the -C option to jar is used below, each directory entry must be
-# preceded with the appropriate directory to "cd" into.
-#
-JAR_DIRS = $(patsubst %, -C $(CLASSDESTDIR) %, $(AUTO_FILES_JAVA_DIRS))
-
-build-jar: $(UNSIGNED_DIR)/sunec.jar
-
-#
-# Build sunec.jar.
-#
-$(UNSIGNED_DIR)/sunec.jar: build $(JCE_MANIFEST_FILE)
- $(prep-target)
- $(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ $(JAR_DIRS) \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-
-ifndef OPENJDK
-# =====================================================
-# Sign the provider jar file. Not needed for OpenJDK.
-#
-
-SIGNED_DIR = $(JCE_BUILD_DIR)/signed
-
-sign: sign-jar
-
-sign-jar: $(SIGNED_DIR)/sunec.jar
-
-ifndef ALT_JCE_BUILD_DIR
-$(SIGNED_DIR)/sunec.jar: $(UNSIGNED_DIR)/sunec.jar
-else
-#
-# We have to remove the build dependency, otherwise, we'll try to rebuild it
-# which we can't do on a read-only filesystem.
-#
-$(SIGNED_DIR)/sunec.jar:
- @if [ ! -r $(UNSIGNED_DIR)/sunec.jar ] ; then \
- $(ECHO) "Couldn't find $(UNSIGNED_DIR)/sunec.jar"; \
- exit 1; \
- fi
-endif
- $(call sign-file, $(UNSIGNED_DIR)/sunec.jar)
-
-
-# =====================================================
-# Create the Release Engineering files. Signed builds, etc.
-#
-
-release: $(SIGNED_DIR)/sunec.jar
- $(RM) $(JCE_BUILD_DIR)/release/sunec.jar
- $(MKDIR) -p $(JCE_BUILD_DIR)/release
- $(CP) $(SIGNED_DIR)/sunec.jar $(JCE_BUILD_DIR)/release
- $(release-warning)
-
-endif # OPENJDK
-
-
-# =====================================================
-# Install routines.
-#
-
-#
-# Install sunec.jar, depending on which type is requested.
-#
-install-jar jar: $(JAR_DESTFILE)
-ifndef OPENJDK
- $(release-warning)
-endif
-
-ifdef OPENJDK
-$(JAR_DESTFILE): $(UNSIGNED_DIR)/sunec.jar
-else
-$(JAR_DESTFILE): $(SIGNED_DIR)/sunec.jar
-endif
- $(install-file)
-
-ifndef OPENJDK
-install-prebuilt:
- @$(ECHO) "\n>>>Installing prebuilt SunEC provider..."
- $(RM) $(JAR_DESTFILE)
- $(CP) $(PREBUILT_DIR)/ec/sunec.jar $(JAR_DESTFILE)
-endif
-
-
-# =====================================================
-# Support routines.
-#
-
-clobber clean::
- $(RM) -r $(JAR_DESTFILE) $(TEMPDIR) $(JCE_BUILD_DIR)
-
-.PHONY: build-jar jar install-jar
-ifndef OPENJDK
-.PHONY: sign sign-jar release install-prebuilt
-endif
diff --git a/jdk/make/sun/security/ec/mapfile-vers b/jdk/make/sun/security/ec/mapfile-vers
deleted file mode 100644
index c7c6c6c..0000000
--- a/jdk/make/sun/security/ec/mapfile-vers
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair;
- Java_sun_security_ec_ECKeyPairGenerator_getEncodedBytes;
- Java_sun_security_ec_ECDSASignature_signDigest;
- Java_sun_security_ec_ECDSASignature_verifySignedDigest;
- Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
- local:
- *;
-};
diff --git a/jdk/make/sun/security/jgss/Makefile b/jdk/make/sun/security/jgss/Makefile
deleted file mode 100644
index e8dbb6c..0000000
--- a/jdk/make/sun/security/jgss/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.security.jgss
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = sun/security/jgss
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/sun/security/jgss/wrapper/FILES_c.gmk b/jdk/make/sun/security/jgss/wrapper/FILES_c.gmk
deleted file mode 100644
index 438168c..0000000
--- a/jdk/make/sun/security/jgss/wrapper/FILES_c.gmk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- NativeUtil.c \
- NativeFunc.c \
- GSSLibStub.c
diff --git a/jdk/make/sun/security/jgss/wrapper/Makefile b/jdk/make/sun/security/jgss/wrapper/Makefile
deleted file mode 100644
index 1f7ffc2..0000000
--- a/jdk/make/sun/security/jgss/wrapper/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../../..
-PACKAGE = sun.security.jgss.wrapper
-PRODUCT = sun
-
-LIBRARY = j2gss
-# Force name of temp directory (needed due to LIBRARY change below)
-LIBRARY_OUTPUT = j2gss
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# C and Java Files
-#
-include FILES_c.gmk
-
-AUTO_FILES_JAVA_DIRS = sun/security/jgss/wrapper
-
-#
-# Java files that define native methods
-#
-FILES_export = \
- sun/security/jgss/wrapper/GSSLibStub.java
-
-#
-# Find native code
-#
-vpath %.c \
- $(SHARE_SRC)/native/sun/security/jgss/wrapper \
- $(PLATFORM_SRC)/native/sun/security/jgss/wrapper
-
-#
-# Find include files
-#
-OTHER_INCLUDES += \
- -I$(SHARE_SRC)/native/sun/security/jgss/wrapper \
- -I$(PLATFORM_SRC)/native/sun/security/jgss/wrapper
-
-#
-# Rules
-#
-#FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
-
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Libraries to link
-#
-ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS = $(LIBDL)
-endif
-
diff --git a/jdk/make/sun/security/jgss/wrapper/mapfile-vers b/jdk/make/sun/security/jgss/wrapper/mapfile-vers
deleted file mode 100644
index fe5c538..0000000
--- a/jdk/make/sun/security/jgss/wrapper/mapfile-vers
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
- JNI_OnUnload;
- Java_sun_security_jgss_wrapper_GSSLibStub_releaseName;
- Java_sun_security_jgss_wrapper_GSSLibStub_importName;
- Java_sun_security_jgss_wrapper_GSSLibStub_compareName;
- Java_sun_security_jgss_wrapper_GSSLibStub_canonicalizeName;
- Java_sun_security_jgss_wrapper_GSSLibStub_exportName;
- Java_sun_security_jgss_wrapper_GSSLibStub_displayName;
- Java_sun_security_jgss_wrapper_GSSLibStub_acquireCred;
- Java_sun_security_jgss_wrapper_GSSLibStub_releaseCred;
- Java_sun_security_jgss_wrapper_GSSLibStub_getCredName;
- Java_sun_security_jgss_wrapper_GSSLibStub_getCredTime;
- Java_sun_security_jgss_wrapper_GSSLibStub_getCredUsage;
- Java_sun_security_jgss_wrapper_GSSLibStub_importContext;
- Java_sun_security_jgss_wrapper_GSSLibStub_initContext;
- Java_sun_security_jgss_wrapper_GSSLibStub_acceptContext;
- Java_sun_security_jgss_wrapper_GSSLibStub_getContextName;
- Java_sun_security_jgss_wrapper_GSSLibStub_getContextMech;
- Java_sun_security_jgss_wrapper_GSSLibStub_inquireContext;
- Java_sun_security_jgss_wrapper_GSSLibStub_deleteContext;
- Java_sun_security_jgss_wrapper_GSSLibStub_getContextTime;
- Java_sun_security_jgss_wrapper_GSSLibStub_wrapSizeLimit;
- Java_sun_security_jgss_wrapper_GSSLibStub_exportContext;
- Java_sun_security_jgss_wrapper_GSSLibStub_getMic;
- Java_sun_security_jgss_wrapper_GSSLibStub_verifyMic;
- Java_sun_security_jgss_wrapper_GSSLibStub_wrap;
- Java_sun_security_jgss_wrapper_GSSLibStub_unwrap;
- Java_sun_security_jgss_wrapper_GSSLibStub_indicateMechs;
- Java_sun_security_jgss_wrapper_GSSLibStub_inquireNamesForMech;
- Java_sun_security_jgss_wrapper_GSSLibStub_init;
- Java_sun_security_jgss_wrapper_GSSLibStub_getMechPtr;
- local:
- *;
-};
diff --git a/jdk/make/sun/security/krb5/FILES_c_windows.gmk b/jdk/make/sun/security/krb5/FILES_c_windows.gmk
deleted file mode 100644
index 82d5b6b..0000000
--- a/jdk/make/sun/security/krb5/FILES_c_windows.gmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- NativeCreds.c \
- WindowsDirectory.c
diff --git a/jdk/make/sun/security/krb5/Makefile b/jdk/make/sun/security/krb5/Makefile
deleted file mode 100644
index 5997af4..0000000
--- a/jdk/make/sun/security/krb5/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.security.krb5
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Java Files
-#
-AUTO_FILES_JAVA_DIRS = sun/security/krb5
-
-ifeq ($(PLATFORM), macosx)
-FILES_export = sun/security/krb5/Credentials.java
-FILES_c = nativeccache.c
-LIBRARY = osxkrb5
-endif # PLATFORM
-
-ifeq ($(PLATFORM), windows)
-#
-# Java files that define native methods
-#
-FILES_export = \
- sun/security/krb5/Credentials.java \
- sun/security/krb5/Config.java
-include FILES_c_windows.gmk
-# We need some extra libs for win32
-LIBRARY = w2k_lsa_auth
-EXTRA_LIBS += Secur32.lib netapi32.lib\
- kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib wsock32.lib
-endif # PLATFORM
-
-#
-# Find native code
-#
-ifeq ($PLATFORM), macosx)
- vpath %.c $(call NativeSrcDirList,,native/sun/security/krb5)
-else
- vpath %.c \
- $(PLATFORM_SRC)/native/sun/security/krb5
-endif
-
-JGSS_NATIVE_SRC=$(PLATFORM_SRC)/native/sun/security/krb5
-JGSS_NATIVE_DIR_EXISTS := $(shell if [ -d $(JGSS_NATIVE_SRC) ] ; then echo true; else echo false; fi)
-
-#
-# Rules
-#
-ifeq ($(PLATFORM), windows)
- ifeq ($(JGSS_NATIVE_DIR_EXISTS), true)
- include $(BUILDDIR)/common/Library.gmk
- endif
-else ifeq ($(PLATFORM), macosx)
- include $(BUILDDIR)/common/Library.gmk
-else
-include $(BUILDDIR)/common/Classes.gmk
-endif # PLATFORM
-
-ifneq ($(PLATFORM), windows)
- ifeq ($(PLATFORM), macosx)
- OTHER_LDLIBS = $(LIBDL) -framework Kerberos
- else
- OTHER_LDLIBS = $(LIBDL)
- endif
-endif
-
-build:
-ifeq ($(PLATFORM),windows)
- $(call make-launcher, kinit, sun.security.krb5.internal.tools.Kinit, , )
- $(call make-launcher, klist, sun.security.krb5.internal.tools.Klist, , )
- $(call make-launcher, ktab, sun.security.krb5.internal.tools.Ktab, , )
-endif
diff --git a/jdk/make/sun/security/mscapi/FILES_cpp.gmk b/jdk/make/sun/security/mscapi/FILES_cpp.gmk
deleted file mode 100644
index 20ee872..0000000
--- a/jdk/make/sun/security/mscapi/FILES_cpp.gmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_cpp = \
- security.cpp
-
diff --git a/jdk/make/sun/security/mscapi/Makefile b/jdk/make/sun/security/mscapi/Makefile
deleted file mode 100644
index d48a181..0000000
--- a/jdk/make/sun/security/mscapi/Makefile
+++ /dev/null
@@ -1,296 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building sunmscapi.jar and native libraries.
-#
-# This file was derived from make/com/sun/crypto/provider/Makefile.
-#
-
-#
-# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Sun JDK builds
-# respectively.)
-#
-# JCE builds are very different between OpenJDK and JDK. The OpenJDK JCE
-# jar files do not require signing, but those for JDK do. If an unsigned
-# jar file is installed into JDK, things will break when the crypto
-# routines are called.
-#
-# This Makefile does the "real" build of the JCE files. For OpenJDK,
-# the jar files built here are installed directly into the OpenJDK.
-#
-# For JDK, the binaries use pre-built/pre-signed binary files stored in
-# the closed workspace that are not shipped in the OpenJDK workspaces.
-# We still build the JDK files here to verify the files compile, and in
-# preparation for possible signing. Developers working on JCE in JDK
-# must sign the JCE files before testing. The JCE signing key is kept
-# separate from the JDK workspace to prevent its disclosure.
-#
-# SPECIAL NOTE TO JCE/JDK developers: The source files must eventually
-# be built, signed, and then the resulting jar files MUST BE CHECKED
-# INTO THE CLOSED PART OF THE WORKSPACE*. This separate step *MUST NOT
-# BE FORGOTTEN*, otherwise a bug fixed in the source code will not be
-# reflected in the shipped binaries. The "release" target should be
-# used to generate the required files.
-#
-# There are a number of targets to help both JDK/OpenJDK developers.
-#
-# Main Targets (JDK/OPENJDK):
-#
-# all/clobber/clean The usual, plus the native libraries.
-# If OpenJDK, installs sunmscapi.jar.
-# If JDK, installs prebuilt
-# sunmscapi.jar.
-#
-# jar Builds/installs sunmscapi.jar
-# If OpenJDK, does not sign.
-# If JDK, tries to sign.
-#
-# Other lesser-used Targets (JDK/OPENJDK):
-#
-# build-jar Builds sunmscapi.jar
-# (does not sign/install)
-#
-# install-jar Alias for "jar" above.
-#
-# Other targets (JDK only):
-#
-# sign Alias for sign-jar
-# sign-jar Builds/signs sunmscapi.jar (no install)
-#
-# release Builds all targets in preparation
-# for workspace integration.
-#
-# install-prebuilt Installs the pre-built jar files
-#
-# This makefile was written to support parallel target execution.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.security.mscapi
-LIBRARY = sunmscapi
-PRODUCT = sun
-
-#
-# The following is for when we need to do postprocessing
-# (signing/obfuscation) against a read-only build. If the OUTPUTDIR
-# isn't writable, the build currently crashes out.
-#
-ifndef OPENJDK
- ifdef ALT_JCE_BUILD_DIR
- # =====================================================
- # Where to place the output, in case we're building from a read-only
- # build area. (e.g. a release engineering build.)
- JCE_BUILD_DIR=${ALT_JCE_BUILD_DIR}
- IGNORE_WRITABLE_OUTPUTDIR_TEST=true
- else
- JCE_BUILD_DIR=${TEMPDIR}
- endif
-endif
-
-include $(BUILDDIR)/common/Defs.gmk
-
-CPLUSPLUSLIBRARY=true
-
-#
-# C++ and Java Files
-#
-include FILES_cpp.gmk
-
-AUTO_FILES_JAVA_DIRS = sun/security/mscapi
-
-#
-# Java files that define native methods
-#
-FILES_export = \
- sun/security/mscapi/KeyStore.java \
- sun/security/mscapi/Key.java \
- sun/security/mscapi/PRNG.java \
- sun/security/mscapi/RSACipher.java \
- sun/security/mscapi/RSAPublicKey.java \
- sun/security/mscapi/RSASignature.java \
- sun/security/mscapi/RSAKeyPairGenerator.java
-
-#
-# Find native code
-#
-vpath %.cpp \
- $(PLATFORM_SRC)/native/sun/security/mscapi
-
-#
-# Find include files
-#
-OTHER_INCLUDES += \
- -I$(PLATFORM_SRC)/native/sun/security/mscapi
-
-#
-# Rules
-#
-CLASSDESTDIR = $(TEMPDIR)/classes
-JAVAHFLAGS = -bootclasspath \
- "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)"
-
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Libraries to link
-#
-ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS += Crypt32.Lib
-endif
-
-#
-# We use a variety of subdirectories in the $(TEMPDIR) depending on what
-# part of the build we're doing. Both OPENJDK/JDK builds are initially
-# done in the unsigned area. When files are signed in JDK,
-# they will be placed in the appropriate area.
-#
-UNSIGNED_DIR = $(TEMPDIR)/unsigned
-
-#
-# Rules
-#
-
-ifdef OPENJDK
-all: build-jar install-jar
-else
-all: build-jar install-prebuilt
- $(build-warning)
-endif
-
-include $(BUILDDIR)/javax/crypto/Defs-jce.gmk
-
-
-# =====================================================
-# Build the unsigned sunmscapi.jar file.
-#
-
-JAR_DESTFILE = $(EXTDIR)/sunmscapi.jar
-
-#
-# The sunmscapi.jar needs to be in the extension class directory,
-# therefore none of its classes can appear in $(CLASSBINDIR).
-# Currently no one is using any of the MSCAPI internals, so these files
-# should not have been built.
-#
-
-#
-# Since the -C option to jar is used below, each directory entry must be
-# preceded with the appropriate directory to "cd" into.
-#
-JAR_DIRS = $(patsubst %, -C $(CLASSDESTDIR) %, $(AUTO_FILES_JAVA_DIRS))
-
-build-jar: $(UNSIGNED_DIR)/sunmscapi.jar
-
-#
-# Build sunmscapi.jar.
-#
-$(UNSIGNED_DIR)/sunmscapi.jar: build $(JCE_MANIFEST_FILE)
- $(prep-target)
- $(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ $(JAR_DIRS) \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-
-ifndef OPENJDK
-# =====================================================
-# Sign the provider jar file. Not needed for OpenJDK.
-#
-
-SIGNED_DIR = $(JCE_BUILD_DIR)/signed
-
-sign: sign-jar
-
-sign-jar: $(SIGNED_DIR)/sunmscapi.jar
-
-ifndef ALT_JCE_BUILD_DIR
-$(SIGNED_DIR)/sunmscapi.jar: $(UNSIGNED_DIR)/sunmscapi.jar
-else
-#
-# We have to remove the build dependency, otherwise, we'll try to rebuild it
-# which we can't do on a read-only filesystem.
-#
-$(SIGNED_DIR)/sunmscapi.jar:
- @if [ ! -r $(UNSIGNED_DIR)/sunmscapi.jar ] ; then \
- $(ECHO) "Couldn't find $(UNSIGNED_DIR)/sunmscapi.jar"; \
- exit 1; \
- fi
-endif
- $(call sign-file, $(UNSIGNED_DIR)/sunmscapi.jar)
-
-
-# =====================================================
-# Create the Release Engineering files. Signed builds, etc.
-#
-
-release: $(SIGNED_DIR)/sunmscapi.jar
- $(RM) $(JCE_BUILD_DIR)/release/sunmscapi.jar
- $(MKDIR) -p $(JCE_BUILD_DIR)/release
- $(CP) $(SIGNED_DIR)/sunmscapi.jar $(JCE_BUILD_DIR)/release
- $(release-warning)
-
-endif # OPENJDK
-
-
-# =====================================================
-# Install routines.
-#
-
-#
-# Install sunmscapi.jar, depending on which type is requested.
-#
-install-jar jar: $(JAR_DESTFILE)
-ifndef OPENJDK
- $(release-warning)
-endif
-
-ifdef OPENJDK
-$(JAR_DESTFILE): $(UNSIGNED_DIR)/sunmscapi.jar
-else
-$(JAR_DESTFILE): $(SIGNED_DIR)/sunmscapi.jar
-endif
- $(install-file)
-
-ifndef OPENJDK
-install-prebuilt:
- @$(ECHO) "\n>>>Installing prebuilt SunMSCAPI provider..."
- $(RM) $(JAR_DESTFILE)
- $(CP) $(PREBUILT_DIR)/mscapi/sunmscapi.jar $(JAR_DESTFILE)
-endif
-
-
-# =====================================================
-# Support routines.
-#
-
-clobber clean::
- $(RM) -r $(JAR_DESTFILE) $(TEMPDIR) $(JCE_BUILD_DIR)
-
-.PHONY: build-jar jar install-jar
-ifndef OPENJDK
-.PHONY: sign sign-jar release install-prebuilt
-endif
diff --git a/jdk/make/sun/security/other/Makefile b/jdk/make/sun/security/other/Makefile
deleted file mode 100644
index cb62c98..0000000
--- a/jdk/make/sun/security/other/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.security.other
-PRODUCT = sun
-JAVAC_MAX_WARNINGS=true
-JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation
-JAVAC_WARNINGS_FATAL=true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = \
- sun/security/acl \
- sun/security/jca \
- sun/security/pkcs \
- sun/security/pkcs10 \
- sun/security/pkcs12 \
- sun/security/provider \
- sun/security/rsa \
- sun/security/ssl \
- sun/security/ssl/krb5 \
- sun/security/timestamp \
- sun/security/validator \
- sun/security/x509 \
- com/sun/net/ssl/internal/ssl
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/sun/security/pkcs11/FILES_c.gmk b/jdk/make/sun/security/pkcs11/FILES_c.gmk
deleted file mode 100644
index 328547a..0000000
--- a/jdk/make/sun/security/pkcs11/FILES_c.gmk
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- j2secmod.c \
- j2secmod_md.c \
- p11_convert.c \
- p11_crypt.c \
- p11_digest.c \
- p11_dual.c \
- p11_general.c \
- p11_keymgmt.c \
- p11_mutex.c \
- p11_objmgmt.c \
- p11_sessmgmt.c \
- p11_sign.c \
- p11_util.c \
- p11_md.c
-
diff --git a/jdk/make/sun/security/pkcs11/Makefile b/jdk/make/sun/security/pkcs11/Makefile
deleted file mode 100644
index cdf5b12..0000000
--- a/jdk/make/sun/security/pkcs11/Makefile
+++ /dev/null
@@ -1,313 +0,0 @@
-#
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building sunpkcs11.jar and native libraries.
-#
-# This file was derived from make/com/sun/crypto/provider/Makefile.
-#
-
-#
-# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Sun JDK builds
-# respectively.)
-#
-# JCE builds are very different between OpenJDK and JDK. The OpenJDK JCE
-# jar files do not require signing, but those for JDK do. If an unsigned
-# jar file is installed into JDK, things will break when the crypto
-# routines are called.
-#
-# This Makefile does the "real" build of the JCE files. For OpenJDK,
-# the jar files built here are installed directly into the OpenJDK.
-#
-# For JDK, the binaries use pre-built/pre-signed binary files stored in
-# the closed workspace that are not shipped in the OpenJDK workspaces.
-# We still build the JDK files here to verify the files compile, and in
-# preparation for possible signing. Developers working on JCE in JDK
-# must sign the JCE files before testing. The JCE signing key is kept
-# separate from the JDK workspace to prevent its disclosure.
-#
-# SPECIAL NOTE TO JCE/JDK developers: The source files must eventually
-# be built, signed, and then the resulting jar files MUST BE CHECKED
-# INTO THE CLOSED PART OF THE WORKSPACE*. This separate step *MUST NOT
-# BE FORGOTTEN*, otherwise a bug fixed in the source code will not be
-# reflected in the shipped binaries. The "release" target should be
-# used to generate the required files.
-#
-# There are a number of targets to help both JDK/OpenJDK developers.
-#
-# Main Targets (JDK/OPENJDK):
-#
-# all/clobber/clean The usual, plus the native libraries.
-# If OpenJDK, installs sunpkcs11.jar.
-# If JDK, installs prebuilt
-# sunpkcs11.jar.
-#
-# jar Builds/installs sunpkcs11.jar
-# If OpenJDK, does not sign.
-# If JDK, tries to sign.
-#
-# Other lesser-used Targets (JDK/OPENJDK):
-#
-# build-jar Builds sunpkcs11.jar
-# (does not sign/install)
-#
-# install-jar Alias for "jar" above.
-#
-# Other targets (JDK only):
-#
-# sign Alias for sign-jar
-# sign-jar Builds/signs sunpkcs11.jar (no install)
-#
-# release Builds all targets in preparation
-# for workspace integration.
-#
-# install-prebuilt Installs the pre-built jar files
-#
-# This makefile was written to support parallel target execution.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.security.pkcs11
-LIBRARY = j2pkcs11
-PRODUCT = sun
-
-#
-# The following is for when we need to do postprocessing
-# (signing/obfuscation) against a read-only build. If the OUTPUTDIR
-# isn't writable, the build currently crashes out.
-#
-ifndef OPENJDK
- ifdef ALT_JCE_BUILD_DIR
- # =====================================================
- # Where to place the output, in case we're building from a read-only
- # build area. (e.g. a release engineering build.)
- JCE_BUILD_DIR=${ALT_JCE_BUILD_DIR}
- IGNORE_WRITABLE_OUTPUTDIR_TEST=true
- else
- JCE_BUILD_DIR=${TEMPDIR}
- endif
-endif
-
-JAVAC_MAX_WARNINGS=false
-JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation
-JAVAC_WARNINGS_FATAL=true
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# C and Java Files
-#
-include FILES_c.gmk
-
-#
-# Subdirectories of these are automatically included.
-#
-AUTO_FILES_JAVA_DIRS = sun/security/pkcs11
-
-#
-# Java files that define native methods
-#
-FILES_export = \
- sun/security/pkcs11/wrapper/PKCS11.java \
- sun/security/pkcs11/Secmod.java
-
-#
-# Find native code
-#
-vpath %.c \
- $(SHARE_SRC)/native/sun/security/pkcs11/wrapper \
- $(PLATFORM_SRC)/native/sun/security/pkcs11/wrapper \
-
-#
-# Find include files
-#
-OTHER_INCLUDES += \
- -I$(SHARE_SRC)/native/sun/security/pkcs11/wrapper \
- -I$(PLATFORM_SRC)/native/sun/security/pkcs11/wrapper
-
-#
-# Rules
-#
-CLASSDESTDIR = $(TEMPDIR)/classes
-JAVAHFLAGS = -bootclasspath \
- "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)"
-
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Libraries to link
-#
-ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS = $(LIBDL)
-endif
-
-# Other config files
-SUNPKCS11_CFG =
-
-ifeq ($(PLATFORM), solaris)
-SUNPKCS11_CFG = sunpkcs11-cfg
-endif # PLATFORM
-
-SUNPKCS11_CFG_SRC = $(TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg
-SUNPKCS11_CFG_BUILD = $(LIBDIR)/security/sunpkcs11-solaris.cfg
-
-#
-# We use a variety of subdirectories in the $(TEMPDIR) depending on what
-# part of the build we're doing. Both OPENJDK/JDK builds are initially
-# done in the unsigned area. When files are signed in JDK,
-# they will be placed in the appropriate area.
-#
-UNSIGNED_DIR = $(TEMPDIR)/unsigned
-
-#
-# Rules
-#
-
-ifdef OPENJDK
-all: $(SUNPKCS11_CFG) build-jar install-jar
-else
-all: $(SUNPKCS11_CFG) build-jar install-prebuilt
- $(build-warning)
-endif
-
-sunpkcs11-cfg: $(SUNPKCS11_CFG_BUILD)
-
-$(SUNPKCS11_CFG_BUILD): $(SUNPKCS11_CFG_SRC)
- $(install-file)
-
-include $(BUILDDIR)/javax/crypto/Defs-jce.gmk
-
-
-# =====================================================
-# Build the unsigned sunpkcs11.jar file.
-#
-
-JAR_DESTFILE = $(EXTDIR)/sunpkcs11.jar
-
-#
-# The sunpkcs11.jar needs to be in the extension class directory,
-# therefore none of its classes can appear in $(CLASSBINDIR).
-# Currently no one is using any of the PKCS11 internals, so these files
-# should not have been built.
-#
-
-#
-# Since the -C option to jar is used below, each directory entry must be
-# preceded with the appropriate directory to "cd" into.
-#
-JAR_DIRS = $(patsubst %, -C $(CLASSDESTDIR) %, $(AUTO_FILES_JAVA_DIRS))
-
-build-jar: $(UNSIGNED_DIR)/sunpkcs11.jar
-
-#
-# Build sunpkcs11.jar.
-#
-$(UNSIGNED_DIR)/sunpkcs11.jar: build $(JCE_MANIFEST_FILE)
- $(prep-target)
- $(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ $(JAR_DIRS) \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-
-ifndef OPENJDK
-# =====================================================
-# Sign the provider jar file. Not needed for OpenJDK.
-#
-
-SIGNED_DIR = $(JCE_BUILD_DIR)/signed
-
-sign: sign-jar
-
-sign-jar: $(SIGNED_DIR)/sunpkcs11.jar
-
-ifndef ALT_JCE_BUILD_DIR
-$(SIGNED_DIR)/sunpkcs11.jar: $(UNSIGNED_DIR)/sunpkcs11.jar
-else
-#
-# We have to remove the build dependency, otherwise, we'll try to rebuild it
-# which we can't do on a read-only filesystem.
-#
-$(SIGNED_DIR)/sunpkcs11.jar:
- @if [ ! -r $(UNSIGNED_DIR)/sunpkcs11.jar ] ; then \
- $(ECHO) "Couldn't find $(UNSIGNED_DIR)/sunpkcs11.jar"; \
- exit 1; \
- fi
-endif
- $(call sign-file, $(UNSIGNED_DIR)/sunpkcs11.jar)
-
-
-# =====================================================
-# Create the Release Engineering files. Signed builds, etc.
-#
-
-release: $(SIGNED_DIR)/sunpkcs11.jar
- $(RM) $(JCE_BUILD_DIR)/release/sunpkcs11.jar
- $(MKDIR) -p $(JCE_BUILD_DIR)/release
- $(CP) $(SIGNED_DIR)/sunpkcs11.jar $(JCE_BUILD_DIR)/release
- $(release-warning)
-
-endif # OPENJDK
-
-
-# =====================================================
-# Install routines.
-#
-
-#
-# Install sunpkcs11.jar, depending on which type is requested.
-#
-install-jar jar: $(JAR_DESTFILE)
-ifndef OPENJDK
- $(release-warning)
-endif
-
-ifdef OPENJDK
-$(JAR_DESTFILE): $(UNSIGNED_DIR)/sunpkcs11.jar
-else
-$(JAR_DESTFILE): $(SIGNED_DIR)/sunpkcs11.jar
-endif
- $(install-file)
-
-ifndef OPENJDK
-install-prebuilt:
- @$(ECHO) "\n>>>Installing prebuilt SunPKCS11 provider..."
- $(RM) $(JAR_DESTFILE)
- $(CP) $(PREBUILT_DIR)/pkcs11/sunpkcs11.jar $(JAR_DESTFILE)
-endif
-
-
-# =====================================================
-# Support routines.
-#
-
-clobber clean::
- $(RM) -r $(JAR_DESTFILE) $(TEMPDIR) $(JCE_BUILD_DIR)
- $(RM) $(SUNPKCS11_CFG_BUILD)
-
-.PHONY: build-jar jar install-jar
-ifndef OPENJDK
-.PHONY: sign sign-jar release install-prebuilt
-endif
diff --git a/jdk/make/sun/security/pkcs11/mapfile-vers b/jdk/make/sun/security/pkcs11/mapfile-vers
deleted file mode 100644
index dfd2e34..0000000
--- a/jdk/make/sun/security/pkcs11/mapfile-vers
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
- Java_sun_security_pkcs11_wrapper_PKCS11_initializeLibrary;
- Java_sun_security_pkcs11_wrapper_PKCS11_finalizeLibrary;
- Java_sun_security_pkcs11_wrapper_PKCS11_connect;
- Java_sun_security_pkcs11_wrapper_PKCS11_disconnect;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1Initialize;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1Finalize;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetInfo;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetSlotList;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetSlotInfo;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetTokenInfo;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetMechanismList;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetMechanismInfo;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1InitToken;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1InitPIN;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1SetPIN;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1OpenSession;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1CloseSession;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1CloseAllSessions;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetSessionInfo;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetOperationState;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1SetOperationState;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1Login;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1Logout;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1CreateObject;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1CopyObject;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1DestroyObject;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetObjectSize;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetAttributeValue;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1SetAttributeValue;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1FindObjectsInit;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1FindObjects;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1FindObjectsFinal;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptInit;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1Encrypt;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptUpdate;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptFinal;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptInit;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1Decrypt;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptUpdate;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptFinal;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestInit;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestSingle;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestUpdate;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestKey;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestFinal;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignInit;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1Sign;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignUpdate;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignFinal;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignRecoverInit;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignRecover;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyInit;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1Verify;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyUpdate;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyFinal;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyRecoverInit;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyRecover;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestEncryptUpdate;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptDigestUpdate;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignEncryptUpdate;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptVerifyUpdate;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GenerateKey;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GenerateKeyPair;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1WrapKey;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1UnwrapKey;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1DeriveKey;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1SeedRandom;
- Java_sun_security_pkcs11_wrapper_PKCS11_C_1GenerateRandom;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetFunctionStatus;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1CancelFunction;
-# Java_sun_security_pkcs11_wrapper_PKCS11_C_1WaitForSlotEvent;
- Java_sun_security_pkcs11_Secmod_nssGetLibraryHandle;
- Java_sun_security_pkcs11_Secmod_nssLoadLibrary;
- Java_sun_security_pkcs11_Secmod_nssVersionCheck;
- Java_sun_security_pkcs11_Secmod_nssInitialize;
- Java_sun_security_pkcs11_Secmod_nssGetModuleList;
-
- local:
- *;
-};
diff --git a/jdk/make/sun/security/smartcardio/FILES_c.gmk b/jdk/make/sun/security/smartcardio/FILES_c.gmk
deleted file mode 100644
index 67b760e..0000000
--- a/jdk/make/sun/security/smartcardio/FILES_c.gmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- pcsc.c \
- pcsc_md.c
diff --git a/jdk/make/sun/security/smartcardio/Makefile b/jdk/make/sun/security/smartcardio/Makefile
deleted file mode 100644
index 8d8ccf9..0000000
--- a/jdk/make/sun/security/smartcardio/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.security.smartcardio
-LIBRARY = j2pcsc
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# C and Java Files
-#
-include FILES_c.gmk
-
-AUTO_FILES_JAVA_DIRS = sun/security/smartcardio
-
-#
-# Java files that define native methods
-#
-FILES_export = \
- sun/security/smartcardio/PCSC.java \
- sun/security/smartcardio/PlatformPCSC.java
-
-#
-# Find native code
-#
-vpath %.c \
- $(SHARE_SRC)/native/sun/security/smartcardio \
- $(PLATFORM_SRC)/native/sun/security/smartcardio
-
-#
-# Find include files
-#
-OTHER_INCLUDES += \
- -I$(SHARE_SRC)/native/sun/security/smartcardio \
- -I$(PLATFORM_SRC)/native/sun/security/smartcardio \
- -I$(PLATFORM_SRC)/native/sun/security/smartcardio/MUSCLE
-
-#
-# Rules
-#
-#CLASSDESTDIR = $(TMPDIR)/classes
-
-#FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
-
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Libraries to link
-#
-ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS = winscard.lib
-else
- OTHER_LDLIBS = $(LIBDL)
- OTHER_CFLAGS = -D__sun_jdk
-endif
diff --git a/jdk/make/sun/security/smartcardio/mapfile-vers b/jdk/make/sun/security/smartcardio/mapfile-vers
deleted file mode 100644
index a565f41..0000000
--- a/jdk/make/sun/security/smartcardio/mapfile-vers
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
- Java_sun_security_smartcardio_PlatformPCSC_initialize;
- Java_sun_security_smartcardio_PCSC_SCardEstablishContext;
- Java_sun_security_smartcardio_PCSC_SCardListReaders;
- Java_sun_security_smartcardio_PCSC_SCardConnect;
- Java_sun_security_smartcardio_PCSC_SCardTransmit;
- Java_sun_security_smartcardio_PCSC_SCardStatus;
- Java_sun_security_smartcardio_PCSC_SCardDisconnect;
- Java_sun_security_smartcardio_PCSC_SCardGetStatusChange;
- Java_sun_security_smartcardio_PCSC_SCardBeginTransaction;
- Java_sun_security_smartcardio_PCSC_SCardEndTransaction;
- Java_sun_security_smartcardio_PCSC_SCardControl;
-
- local:
- *;
-};
diff --git a/jdk/make/sun/security/tools/Makefile b/jdk/make/sun/security/tools/Makefile
deleted file mode 100644
index a03f85d..0000000
--- a/jdk/make/sun/security/tools/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.security.tools
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = sun/security/tools
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_JAVA = sun/security/tools/jarsigner/Resources.java
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-build:
- $(call make-launcher, keytool, sun.security.tools.keytool.Main, , )
-ifndef BUILD_HEADLESS_ONLY
- $(call make-launcher, policytool, sun.security.tools.policytool.PolicyTool, , )
-endif
-
diff --git a/jdk/make/sun/security/util/Makefile b/jdk/make/sun/security/util/Makefile
deleted file mode 100644
index be7c7f8..0000000
--- a/jdk/make/sun/security/util/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../../..
-PACKAGE = sun.security.util
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = sun/security/util
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jre
-RESOURCE_BUNDLES_JAVA = sun/security/util/Resources.java
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/sun/serialver/Makefile b/jdk/make/sun/serialver/Makefile
deleted file mode 100644
index b47b18f..0000000
--- a/jdk/make/sun/serialver/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building sun.tools.serialver.*
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.tools.serialver
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# This program must contain a manifest that defines the execution level
-# needed to follow standard Vista User Access Control Guidelines
-# This must be set before Program.gmk is included
-#
-BUILD_MANIFEST=true
-
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = sun/tools/serialver
-
-#
-# Resources
-#
-LOCALE_SET_DEFINITION = jdk
-RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/resources/serialver.properties
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/sun/splashscreen/FILES_c.gmk b/jdk/make/sun/splashscreen/FILES_c.gmk
deleted file mode 100644
index 07713d7..0000000
--- a/jdk/make/sun/splashscreen/FILES_c.gmk
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_c = \
- java_awt_SplashScreen.c \
- splashscreen_gfx_impl.c \
- splashscreen_gif.c \
- splashscreen_impl.c \
- splashscreen_jpeg.c \
- splashscreen_png.c \
- splashscreen_sys.c \
- png.c \
- pngerror.c \
- pngget.c \
- pngmem.c \
- pngpread.c \
- pngread.c \
- pngrio.c \
- pngrtran.c \
- pngrutil.c \
- pngset.c \
- pngtrans.c \
- pngwio.c \
- pngwrite.c \
- pngwtran.c \
- pngwutil.c \
- dgif_lib.c \
- gif_err.c \
- gifalloc.c \
- jcomapi.c \
- jdapimin.c \
- jdapistd.c \
- jdcoefct.c \
- jdcolor.c \
- jddctmgr.c \
- jdhuff.c \
- jdinput.c \
- jdmainct.c \
- jdmarker.c \
- jdmaster.c \
- jdmerge.c \
- jdphuff.c \
- jdpostct.c \
- jdsample.c \
- jerror.c \
- jidctflt.c \
- jidctfst.c \
- jidctint.c \
- jidctred.c \
- jmemmgr.c \
- jmemnobs.c \
- jquant1.c \
- jquant2.c \
- jutils.c \
- jcapimin.c \
- jcapistd.c \
- jccoefct.c \
- jccolor.c \
- jcdctmgr.c \
- jchuff.c \
- jcinit.c \
- jcmainct.c \
- jcmarker.c \
- jcmaster.c \
- jcparam.c \
- jcphuff.c \
- jcprepct.c \
- jcsample.c \
- jctrans.c \
- jdtrans.c \
- jfdctflt.c \
- jfdctfst.c \
- jfdctint.c
-
-ifneq ($(SYSTEM_ZLIB),true)
- FILES_c += \
- compress.c \
- deflate.c \
- gzclose.c \
- gzlib.c \
- gzread.c \
- gzwrite.c \
- infback.c \
- inffast.c \
- inflate.c \
- inftrees.c \
- trees.c \
- uncompr.c \
- zadler32.c \
- zcrc32.c \
- zutil.c
-endif
diff --git a/jdk/make/sun/splashscreen/Makefile b/jdk/make/sun/splashscreen/Makefile
deleted file mode 100644
index 207ffb2..0000000
--- a/jdk/make/sun/splashscreen/Makefile
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.awt
-LIBRARY = splashscreen
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_c.gmk
-
-FILES_java = \
- java/awt/SplashScreen.java
-
-FILES_export = \
- java/awt/SplashScreen.java
-
-
-#
-# Rules
-#
-# FIXME!!!!
-#ifeq ($(PLATFORM), solaris)
-# ifneq ($(ARCH), amd64)
-# FILES_reorder += reorder-$(ARCH)
-# endif
-#endif
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-JAVALIB=
-
-#
-# C Flags
-#
-
-CFLAGS += -DSPLASHSCREEN
-
-ifeq ($(PLATFORM), macosx)
- CFLAGS += -DWITH_MACOSX
-
- # CFLAGS and CPPFLAGS are added when linking as well, so we use VARIANT
- # instead to specify that we're actually compiling objective-c code here
- CFLAGS_$(VARIANT)/java_awt_SplashScreen.o = -x objective-c
- CFLAGS_$(VARIANT)/splashscreen_gfx_impl.o = -x objective-c
- CFLAGS_$(VARIANT)/splashscreen_gif.o = -x objective-c
- CFLAGS_$(VARIANT)/splashscreen_impl.o = -x objective-c
- CFLAGS_$(VARIANT)/splashscreen_jpeg.o = -x objective-c
- CFLAGS_$(VARIANT)/splashscreen_png.o = -x objective-c
- CFLAGS_$(VARIANT)/splashscreen_sys.o = -x objective-c
-
- OTHER_CFLAGS += -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
- CPPFLAGS += -I/System/Library/Frameworks/AppKit.framework/Versions/C/Headers
- OTHER_LDLIBS += $(LIBM) -lpthread -liconv -losxapp \
- -framework ApplicationServices \
- -framework Foundation \
- -framework Cocoa \
- -framework JavaNativeFoundation
-else ifneq ($(PLATFORM), windows)
- CFLAGS += -DWITH_X11
- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
-else # PLATFORM
- CFLAGS += -DWITH_WIN32
- OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll
-#$(JVMLIB) $(OBJDIR)/../../jpeg/$(OBJDIRNAME)/jpeg$(SUFFIX).lib
-endif # PLATFORM
-
-# Add giflib include path for all platforms
-CPPFLAGS += -I$(SHARE_SRC)/native/sun/awt/giflib
-
-#
-# Add to ambient vpath to get files in a subdirectory
-#
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/giflib
-ifneq ($(SYSTEM_ZLIB),true)
- vpath %.c $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
-endif
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/libpng
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
-ifneq ($(PLATFORM), macosx)
- vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
-else
- vpath %.m $(call NativeSrcDirList,,native/$(PKGDIR)/splashscreen)
-endif
-
-ifneq ($(PLATFORM), macosx)
- CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
-else
- CPPFLAGS += $(call NativeSrcDirList,-I,native/$(PKGDIR)/splashscreen)
- CPPFLAGS += $(call NativeSrcDirList,-I,/native/sun/osxapp)
-endif
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
-ifneq ($(SYSTEM_ZLIB),true)
- CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
-else
- OTHER_CFLAGS += $(ZLIB_CFLAGS)
- OTHER_LDLIBS += $(ZLIB_LIBS)
-endif
-
-# Shun the less than portable MMX assembly code in pnggccrd.c,
-# and use alternative implementations in C.
-CPPFLAGS += -DPNG_NO_MMX_CODE
diff --git a/jdk/make/sun/splashscreen/mapfile-vers b/jdk/make/sun/splashscreen/mapfile-vers
deleted file mode 100644
index c7e29bd..0000000
--- a/jdk/make/sun/splashscreen/mapfile-vers
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- Java_java_awt_SplashScreen__1update;
- Java_java_awt_SplashScreen__1isVisible;
- Java_java_awt_SplashScreen__1getBounds;
- Java_java_awt_SplashScreen__1getInstance;
- Java_java_awt_SplashScreen__1close;
- Java_java_awt_SplashScreen__1getImageFileName;
- Java_java_awt_SplashScreen__1getImageJarName;
- Java_java_awt_SplashScreen__1setImageData;
-
- SplashLoadMemory;
- SplashLoadFile;
- SplashInit;
- SplashClose;
- SplashSetFileJarName;
- local:
- *;
-};
diff --git a/jdk/make/sun/text/FILES_java.gmk b/jdk/make/sun/text/FILES_java.gmk
deleted file mode 100644
index dbb4856..0000000
--- a/jdk/make/sun/text/FILES_java.gmk
+++ /dev/null
@@ -1,265 +0,0 @@
-#
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Locale data files for lib/ext/localedata.jar.
-# This includes resource bundles and data for non-US
-# languages in sun.text.resources as well as sun.util.resources.
-#
-# Locale data for US languages is built from
-# - make/java/text for classes in sun.text.resources
-# - make/java/util for classes in sun.util.resources
-#
-
-FILES_java = \
- sun/text/resources/th/BreakIteratorInfo_th.java \
- \
- sun/text/resources/ar/CollationData_ar.java \
- sun/text/resources/be/CollationData_be.java \
- sun/text/resources/bg/CollationData_bg.java \
- sun/text/resources/ca/CollationData_ca.java \
- sun/text/resources/cs/CollationData_cs.java \
- sun/text/resources/da/CollationData_da.java \
- sun/text/resources/el/CollationData_el.java \
- sun/text/resources/es/CollationData_es.java \
- sun/text/resources/et/CollationData_et.java \
- sun/text/resources/fi/CollationData_fi.java \
- sun/text/resources/fr/CollationData_fr.java \
- sun/text/resources/hi/CollationData_hi.java \
- sun/text/resources/hr/CollationData_hr.java \
- sun/text/resources/hu/CollationData_hu.java \
- sun/text/resources/is/CollationData_is.java \
- sun/text/resources/iw/CollationData_iw.java \
- sun/text/resources/ja/CollationData_ja.java \
- sun/text/resources/ko/CollationData_ko.java \
- sun/text/resources/lt/CollationData_lt.java \
- sun/text/resources/lv/CollationData_lv.java \
- sun/text/resources/mk/CollationData_mk.java \
- sun/text/resources/no/CollationData_no.java \
- sun/text/resources/pl/CollationData_pl.java \
- sun/text/resources/ro/CollationData_ro.java \
- sun/text/resources/ru/CollationData_ru.java \
- sun/text/resources/sk/CollationData_sk.java \
- sun/text/resources/sl/CollationData_sl.java \
- sun/text/resources/sq/CollationData_sq.java \
- sun/text/resources/sr/CollationData_sr.java \
- sun/text/resources/sr/CollationData_sr_Latn.java \
- sun/text/resources/sv/CollationData_sv.java \
- sun/text/resources/th/CollationData_th.java \
- sun/text/resources/tr/CollationData_tr.java \
- sun/text/resources/uk/CollationData_uk.java \
- sun/text/resources/vi/CollationData_vi.java \
- sun/text/resources/zh/CollationData_zh.java \
- sun/text/resources/zh/CollationData_zh_HK.java \
- sun/text/resources/zh/CollationData_zh_TW.java \
- \
- sun/text/resources/ar/FormatData_ar.java \
- sun/text/resources/ar/FormatData_ar_JO.java \
- sun/text/resources/ar/FormatData_ar_LB.java \
- sun/text/resources/ar/FormatData_ar_SY.java \
- sun/text/resources/be/FormatData_be.java \
- sun/text/resources/be/FormatData_be_BY.java \
- sun/text/resources/bg/FormatData_bg.java \
- sun/text/resources/bg/FormatData_bg_BG.java \
- sun/text/resources/ca/FormatData_ca.java \
- sun/text/resources/ca/FormatData_ca_ES.java \
- sun/text/resources/cs/FormatData_cs.java \
- sun/text/resources/cs/FormatData_cs_CZ.java \
- sun/text/resources/da/FormatData_da.java \
- sun/text/resources/da/FormatData_da_DK.java \
- sun/text/resources/de/FormatData_de.java \
- sun/text/resources/de/FormatData_de_AT.java \
- sun/text/resources/de/FormatData_de_CH.java \
- sun/text/resources/de/FormatData_de_DE.java \
- sun/text/resources/de/FormatData_de_LU.java \
- sun/text/resources/el/FormatData_el.java \
- sun/text/resources/el/FormatData_el_CY.java \
- sun/text/resources/el/FormatData_el_GR.java \
- sun/text/resources/es/FormatData_es.java \
- sun/text/resources/es/FormatData_es_BO.java \
- sun/text/resources/es/FormatData_es_AR.java \
- sun/text/resources/es/FormatData_es_CL.java \
- sun/text/resources/es/FormatData_es_CO.java \
- sun/text/resources/es/FormatData_es_CR.java \
- sun/text/resources/es/FormatData_es_DO.java \
- sun/text/resources/es/FormatData_es_EC.java \
- sun/text/resources/es/FormatData_es_ES.java \
- sun/text/resources/es/FormatData_es_GT.java \
- sun/text/resources/es/FormatData_es_HN.java \
- sun/text/resources/es/FormatData_es_MX.java \
- sun/text/resources/es/FormatData_es_NI.java \
- sun/text/resources/es/FormatData_es_PA.java \
- sun/text/resources/es/FormatData_es_PE.java \
- sun/text/resources/es/FormatData_es_PR.java \
- sun/text/resources/es/FormatData_es_PY.java \
- sun/text/resources/es/FormatData_es_SV.java \
- sun/text/resources/es/FormatData_es_US.java \
- sun/text/resources/es/FormatData_es_UY.java \
- sun/text/resources/es/FormatData_es_VE.java \
- sun/text/resources/et/FormatData_et.java \
- sun/text/resources/et/FormatData_et_EE.java \
- sun/text/resources/fi/FormatData_fi.java \
- sun/text/resources/fi/FormatData_fi_FI.java \
- sun/text/resources/fr/FormatData_fr.java \
- sun/text/resources/fr/FormatData_fr_BE.java \
- sun/text/resources/fr/FormatData_fr_CA.java \
- sun/text/resources/fr/FormatData_fr_CH.java \
- sun/text/resources/fr/FormatData_fr_FR.java \
- sun/text/resources/ga/FormatData_ga.java \
- sun/text/resources/ga/FormatData_ga_IE.java \
- sun/text/resources/hi/FormatData_hi_IN.java \
- sun/text/resources/hr/FormatData_hr.java \
- sun/text/resources/hr/FormatData_hr_HR.java \
- sun/text/resources/hu/FormatData_hu.java \
- sun/text/resources/hu/FormatData_hu_HU.java \
- sun/text/resources/in/FormatData_in.java \
- sun/text/resources/in/FormatData_in_ID.java \
- sun/text/resources/is/FormatData_is.java \
- sun/text/resources/is/FormatData_is_IS.java \
- sun/text/resources/it/FormatData_it.java \
- sun/text/resources/it/FormatData_it_CH.java \
- sun/text/resources/it/FormatData_it_IT.java \
- sun/text/resources/iw/FormatData_iw.java \
- sun/text/resources/iw/FormatData_iw_IL.java \
- sun/text/resources/ja/FormatData_ja.java \
- sun/text/resources/ja/FormatData_ja_JP.java \
- sun/text/resources/ko/FormatData_ko.java \
- sun/text/resources/ko/FormatData_ko_KR.java \
- sun/text/resources/lt/FormatData_lt.java \
- sun/text/resources/lt/FormatData_lt_LT.java \
- sun/text/resources/lv/FormatData_lv.java \
- sun/text/resources/lv/FormatData_lv_LV.java \
- sun/text/resources/mk/FormatData_mk.java \
- sun/text/resources/mk/FormatData_mk_MK.java \
- sun/text/resources/ms/FormatData_ms.java \
- sun/text/resources/ms/FormatData_ms_MY.java \
- sun/text/resources/mt/FormatData_mt.java \
- sun/text/resources/mt/FormatData_mt_MT.java \
- sun/text/resources/nl/FormatData_nl.java \
- sun/text/resources/nl/FormatData_nl_BE.java \
- sun/text/resources/nl/FormatData_nl_NL.java \
- sun/text/resources/no/FormatData_no.java \
- sun/text/resources/no/FormatData_no_NO.java \
- sun/text/resources/no/FormatData_no_NO_NY.java \
- sun/text/resources/pl/FormatData_pl.java \
- sun/text/resources/pl/FormatData_pl_PL.java \
- sun/text/resources/pt/FormatData_pt.java \
- sun/text/resources/pt/FormatData_pt_BR.java \
- sun/text/resources/pt/FormatData_pt_PT.java \
- sun/text/resources/ro/FormatData_ro.java \
- sun/text/resources/ro/FormatData_ro_RO.java \
- sun/text/resources/ru/FormatData_ru.java \
- sun/text/resources/ru/FormatData_ru_RU.java \
- sun/text/resources/sk/FormatData_sk.java \
- sun/text/resources/sk/FormatData_sk_SK.java \
- sun/text/resources/sl/FormatData_sl.java \
- sun/text/resources/sl/FormatData_sl_SI.java \
- sun/text/resources/sq/FormatData_sq.java \
- sun/text/resources/sq/FormatData_sq_AL.java \
- sun/text/resources/sr/FormatData_sr.java \
- sun/text/resources/sr/FormatData_sr_BA.java \
- sun/text/resources/sr/FormatData_sr_CS.java \
- sun/text/resources/sr/FormatData_sr_ME.java \
- sun/text/resources/sr/FormatData_sr_RS.java \
- sun/text/resources/sr/FormatData_sr_Latn.java \
- sun/text/resources/sr/FormatData_sr_Latn_ME.java \
- sun/text/resources/sv/FormatData_sv.java \
- sun/text/resources/sv/FormatData_sv_SE.java \
- sun/text/resources/th/FormatData_th.java \
- sun/text/resources/th/FormatData_th_TH.java \
- sun/text/resources/tr/FormatData_tr.java \
- sun/text/resources/tr/FormatData_tr_TR.java \
- sun/text/resources/uk/FormatData_uk.java \
- sun/text/resources/uk/FormatData_uk_UA.java \
- sun/text/resources/vi/FormatData_vi.java \
- sun/text/resources/vi/FormatData_vi_VN.java \
- sun/text/resources/zh/FormatData_zh.java \
- sun/text/resources/zh/FormatData_zh_CN.java \
- sun/text/resources/zh/FormatData_zh_HK.java \
- sun/text/resources/zh/FormatData_zh_SG.java \
- sun/text/resources/zh/FormatData_zh_TW.java \
- \
- sun/util/resources/zh/CurrencyNames_zh_HK.java \
- sun/util/resources/zh/CurrencyNames_zh_SG.java \
- sun/util/resources/zh/LocaleNames_zh_HK.java \
- sun/util/resources/de/TimeZoneNames_de.java \
- sun/util/resources/es/TimeZoneNames_es.java \
- sun/util/resources/fr/TimeZoneNames_fr.java \
- sun/util/resources/hi/TimeZoneNames_hi.java \
- sun/util/resources/it/TimeZoneNames_it.java \
- sun/util/resources/ja/TimeZoneNames_ja.java \
- sun/util/resources/ko/TimeZoneNames_ko.java \
- sun/util/resources/pt/TimeZoneNames_pt_BR.java \
- sun/util/resources/sv/TimeZoneNames_sv.java \
- sun/util/resources/zh/TimeZoneNames_zh_CN.java \
- sun/util/resources/zh/TimeZoneNames_zh_TW.java \
- sun/util/resources/zh/TimeZoneNames_zh_HK.java \
- \
- sun/text/resources/ar/JavaTimeSupplementary_ar.java \
- sun/text/resources/be/JavaTimeSupplementary_be.java \
- sun/text/resources/bg/JavaTimeSupplementary_bg.java \
- sun/text/resources/ca/JavaTimeSupplementary_ca.java \
- sun/text/resources/cs/JavaTimeSupplementary_cs.java \
- sun/text/resources/da/JavaTimeSupplementary_da.java \
- sun/text/resources/de/JavaTimeSupplementary_de.java \
- sun/text/resources/el/JavaTimeSupplementary_el.java \
- sun/text/resources/es/JavaTimeSupplementary_es.java \
- sun/text/resources/et/JavaTimeSupplementary_et.java \
- sun/text/resources/fi/JavaTimeSupplementary_fi.java \
- sun/text/resources/fr/JavaTimeSupplementary_fr.java \
- sun/text/resources/ga/JavaTimeSupplementary_ga.java \
- sun/text/resources/hi/JavaTimeSupplementary_hi_IN.java \
- sun/text/resources/hr/JavaTimeSupplementary_hr.java \
- sun/text/resources/hu/JavaTimeSupplementary_hu.java \
- sun/text/resources/is/JavaTimeSupplementary_is.java \
- sun/text/resources/it/JavaTimeSupplementary_it.java \
- sun/text/resources/iw/JavaTimeSupplementary_iw.java \
- sun/text/resources/iw/JavaTimeSupplementary_iw_IL.java \
- sun/text/resources/ja/JavaTimeSupplementary_ja.java \
- sun/text/resources/ko/JavaTimeSupplementary_ko.java \
- sun/text/resources/lt/JavaTimeSupplementary_lt.java \
- sun/text/resources/lv/JavaTimeSupplementary_lv.java \
- sun/text/resources/mk/JavaTimeSupplementary_mk.java \
- sun/text/resources/ms/JavaTimeSupplementary_ms.java \
- sun/text/resources/mt/JavaTimeSupplementary_mt.java \
- sun/text/resources/nl/JavaTimeSupplementary_nl.java \
- sun/text/resources/no/JavaTimeSupplementary_no.java \
- sun/text/resources/pl/JavaTimeSupplementary_pl.java \
- sun/text/resources/pt/JavaTimeSupplementary_pt.java \
- sun/text/resources/pt/JavaTimeSupplementary_pt_PT.java \
- sun/text/resources/ro/JavaTimeSupplementary_ro.java \
- sun/text/resources/ru/JavaTimeSupplementary_ru.java \
- sun/text/resources/sk/JavaTimeSupplementary_sk.java \
- sun/text/resources/sl/JavaTimeSupplementary_sl.java \
- sun/text/resources/sq/JavaTimeSupplementary_sq.java \
- sun/text/resources/sr/JavaTimeSupplementary_sr.java \
- sun/text/resources/sr/JavaTimeSupplementary_sr_Latn.java \
- sun/text/resources/sv/JavaTimeSupplementary_sv.java \
- sun/text/resources/th/JavaTimeSupplementary_th.java \
- sun/text/resources/tr/JavaTimeSupplementary_tr.java \
- sun/text/resources/uk/JavaTimeSupplementary_uk.java \
- sun/text/resources/vi/JavaTimeSupplementary_vi.java \
- sun/text/resources/zh/JavaTimeSupplementary_zh.java \
- sun/text/resources/zh/JavaTimeSupplementary_zh_TW.java
-
diff --git a/jdk/make/sun/text/FILES_properties.gmk b/jdk/make/sun/text/FILES_properties.gmk
deleted file mode 100644
index 494d6cc..0000000
--- a/jdk/make/sun/text/FILES_properties.gmk
+++ /dev/null
@@ -1,236 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-FILES_compiled_properties = \
- sun/util/resources/ar/LocaleNames_ar.properties \
- sun/util/resources/be/LocaleNames_be.properties \
- sun/util/resources/bg/LocaleNames_bg.properties \
- sun/util/resources/ca/LocaleNames_ca.properties \
- sun/util/resources/cs/LocaleNames_cs.properties \
- sun/util/resources/da/LocaleNames_da.properties \
- sun/util/resources/de/LocaleNames_de.properties \
- sun/util/resources/el/LocaleNames_el.properties \
- sun/util/resources/el/LocaleNames_el_CY.properties \
- sun/util/resources/es/LocaleNames_es.properties \
- sun/util/resources/es/LocaleNames_es_US.properties \
- sun/util/resources/et/LocaleNames_et.properties \
- sun/util/resources/fi/LocaleNames_fi.properties \
- sun/util/resources/fr/LocaleNames_fr.properties \
- sun/util/resources/ga/LocaleNames_ga.properties \
- sun/util/resources/hi/LocaleNames_hi.properties \
- sun/util/resources/hr/LocaleNames_hr.properties \
- sun/util/resources/hu/LocaleNames_hu.properties \
- sun/util/resources/in/LocaleNames_in.properties \
- sun/util/resources/is/LocaleNames_is.properties \
- sun/util/resources/it/LocaleNames_it.properties \
- sun/util/resources/iw/LocaleNames_iw.properties \
- sun/util/resources/ja/LocaleNames_ja.properties \
- sun/util/resources/ko/LocaleNames_ko.properties \
- sun/util/resources/lt/LocaleNames_lt.properties \
- sun/util/resources/lv/LocaleNames_lv.properties \
- sun/util/resources/mk/LocaleNames_mk.properties \
- sun/util/resources/ms/LocaleNames_ms.properties \
- sun/util/resources/mt/LocaleNames_mt.properties \
- sun/util/resources/nl/LocaleNames_nl.properties \
- sun/util/resources/no/LocaleNames_no.properties \
- sun/util/resources/no/LocaleNames_no_NO_NY.properties \
- sun/util/resources/pl/LocaleNames_pl.properties \
- sun/util/resources/pt/LocaleNames_pt.properties \
- sun/util/resources/pt/LocaleNames_pt_BR.properties \
- sun/util/resources/pt/LocaleNames_pt_PT.properties \
- sun/util/resources/ro/LocaleNames_ro.properties \
- sun/util/resources/ru/LocaleNames_ru.properties \
- sun/util/resources/sk/LocaleNames_sk.properties \
- sun/util/resources/sl/LocaleNames_sl.properties \
- sun/util/resources/sq/LocaleNames_sq.properties \
- sun/util/resources/sr/LocaleNames_sr.properties \
- sun/util/resources/sr/LocaleNames_sr_Latn.properties \
- sun/util/resources/sv/LocaleNames_sv.properties \
- sun/util/resources/th/LocaleNames_th.properties \
- sun/util/resources/tr/LocaleNames_tr.properties \
- sun/util/resources/uk/LocaleNames_uk.properties \
- sun/util/resources/vi/LocaleNames_vi.properties \
- sun/util/resources/zh/LocaleNames_zh.properties \
- sun/util/resources/zh/LocaleNames_zh_SG.properties \
- sun/util/resources/zh/LocaleNames_zh_TW.properties \
- \
- sun/util/resources/ar/CalendarData_ar.properties \
- sun/util/resources/be/CalendarData_be.properties \
- sun/util/resources/bg/CalendarData_bg.properties \
- sun/util/resources/ca/CalendarData_ca.properties \
- sun/util/resources/cs/CalendarData_cs.properties \
- sun/util/resources/da/CalendarData_da.properties \
- sun/util/resources/de/CalendarData_de.properties \
- sun/util/resources/el/CalendarData_el.properties \
- sun/util/resources/el/CalendarData_el_CY.properties \
- sun/util/resources/es/CalendarData_es.properties \
- sun/util/resources/es/CalendarData_es_ES.properties \
- sun/util/resources/es/CalendarData_es_US.properties \
- sun/util/resources/et/CalendarData_et.properties \
- sun/util/resources/fi/CalendarData_fi.properties \
- sun/util/resources/fr/CalendarData_fr.properties \
- sun/util/resources/fr/CalendarData_fr_CA.properties \
- sun/util/resources/hi/CalendarData_hi.properties \
- sun/util/resources/hr/CalendarData_hr.properties \
- sun/util/resources/hu/CalendarData_hu.properties \
- sun/util/resources/in/CalendarData_in_ID.properties \
- sun/util/resources/is/CalendarData_is.properties \
- sun/util/resources/it/CalendarData_it.properties \
- sun/util/resources/iw/CalendarData_iw.properties \
- sun/util/resources/ja/CalendarData_ja.properties \
- sun/util/resources/ko/CalendarData_ko.properties \
- sun/util/resources/lt/CalendarData_lt.properties \
- sun/util/resources/lv/CalendarData_lv.properties \
- sun/util/resources/mk/CalendarData_mk.properties \
- sun/util/resources/ms/CalendarData_ms_MY.properties \
- sun/util/resources/mt/CalendarData_mt.properties \
- sun/util/resources/mt/CalendarData_mt_MT.properties \
- sun/util/resources/nl/CalendarData_nl.properties \
- sun/util/resources/no/CalendarData_no.properties \
- sun/util/resources/pl/CalendarData_pl.properties \
- sun/util/resources/pt/CalendarData_pt.properties \
- sun/util/resources/pt/CalendarData_pt_PT.properties \
- sun/util/resources/ro/CalendarData_ro.properties \
- sun/util/resources/ru/CalendarData_ru.properties \
- sun/util/resources/sk/CalendarData_sk.properties \
- sun/util/resources/sl/CalendarData_sl.properties \
- sun/util/resources/sq/CalendarData_sq.properties \
- sun/util/resources/sr/CalendarData_sr.properties \
- sun/util/resources/sr/CalendarData_sr_Latn_BA.properties \
- sun/util/resources/sr/CalendarData_sr_Latn_ME.properties \
- sun/util/resources/sr/CalendarData_sr_Latn_RS.properties \
- sun/util/resources/sv/CalendarData_sv.properties \
- sun/util/resources/th/CalendarData_th.properties \
- sun/util/resources/tr/CalendarData_tr.properties \
- sun/util/resources/uk/CalendarData_uk.properties \
- sun/util/resources/vi/CalendarData_vi.properties \
- sun/util/resources/zh/CalendarData_zh.properties \
- \
- sun/util/resources/ar/CurrencyNames_ar_AE.properties \
- sun/util/resources/ar/CurrencyNames_ar_BH.properties \
- sun/util/resources/ar/CurrencyNames_ar_DZ.properties \
- sun/util/resources/ar/CurrencyNames_ar_EG.properties \
- sun/util/resources/ar/CurrencyNames_ar_IQ.properties \
- sun/util/resources/ar/CurrencyNames_ar_JO.properties \
- sun/util/resources/ar/CurrencyNames_ar_KW.properties \
- sun/util/resources/ar/CurrencyNames_ar_LB.properties \
- sun/util/resources/ar/CurrencyNames_ar_LY.properties \
- sun/util/resources/ar/CurrencyNames_ar_MA.properties \
- sun/util/resources/ar/CurrencyNames_ar_OM.properties \
- sun/util/resources/ar/CurrencyNames_ar_QA.properties \
- sun/util/resources/ar/CurrencyNames_ar_SA.properties \
- sun/util/resources/ar/CurrencyNames_ar_SD.properties \
- sun/util/resources/ar/CurrencyNames_ar_SY.properties \
- sun/util/resources/ar/CurrencyNames_ar_TN.properties \
- sun/util/resources/ar/CurrencyNames_ar_YE.properties \
- sun/util/resources/be/CurrencyNames_be_BY.properties \
- sun/util/resources/bg/CurrencyNames_bg_BG.properties \
- sun/util/resources/ca/CurrencyNames_ca_ES.properties \
- sun/util/resources/cs/CurrencyNames_cs_CZ.properties \
- sun/util/resources/da/CurrencyNames_da_DK.properties \
- sun/util/resources/de/CurrencyNames_de.properties \
- sun/util/resources/de/CurrencyNames_de_AT.properties \
- sun/util/resources/de/CurrencyNames_de_CH.properties \
- sun/util/resources/de/CurrencyNames_de_DE.properties \
- sun/util/resources/de/CurrencyNames_de_GR.properties \
- sun/util/resources/de/CurrencyNames_de_LU.properties \
- sun/util/resources/el/CurrencyNames_el_CY.properties \
- sun/util/resources/el/CurrencyNames_el_GR.properties \
- sun/util/resources/es/CurrencyNames_es.properties \
- sun/util/resources/es/CurrencyNames_es_AR.properties \
- sun/util/resources/es/CurrencyNames_es_BO.properties \
- sun/util/resources/es/CurrencyNames_es_CL.properties \
- sun/util/resources/es/CurrencyNames_es_CO.properties \
- sun/util/resources/es/CurrencyNames_es_CR.properties \
- sun/util/resources/es/CurrencyNames_es_CU.properties \
- sun/util/resources/es/CurrencyNames_es_DO.properties \
- sun/util/resources/es/CurrencyNames_es_EC.properties \
- sun/util/resources/es/CurrencyNames_es_ES.properties \
- sun/util/resources/es/CurrencyNames_es_GT.properties \
- sun/util/resources/es/CurrencyNames_es_HN.properties \
- sun/util/resources/es/CurrencyNames_es_MX.properties \
- sun/util/resources/es/CurrencyNames_es_NI.properties \
- sun/util/resources/es/CurrencyNames_es_PA.properties \
- sun/util/resources/es/CurrencyNames_es_PE.properties \
- sun/util/resources/es/CurrencyNames_es_PR.properties \
- sun/util/resources/es/CurrencyNames_es_PY.properties \
- sun/util/resources/es/CurrencyNames_es_SV.properties \
- sun/util/resources/es/CurrencyNames_es_US.properties \
- sun/util/resources/es/CurrencyNames_es_UY.properties \
- sun/util/resources/es/CurrencyNames_es_VE.properties \
- sun/util/resources/et/CurrencyNames_et_EE.properties \
- sun/util/resources/fi/CurrencyNames_fi_FI.properties \
- sun/util/resources/fr/CurrencyNames_fr.properties \
- sun/util/resources/fr/CurrencyNames_fr_BE.properties \
- sun/util/resources/fr/CurrencyNames_fr_CA.properties \
- sun/util/resources/fr/CurrencyNames_fr_CH.properties \
- sun/util/resources/fr/CurrencyNames_fr_FR.properties \
- sun/util/resources/fr/CurrencyNames_fr_LU.properties \
- sun/util/resources/ga/CurrencyNames_ga_IE.properties \
- sun/util/resources/hi/CurrencyNames_hi_IN.properties \
- sun/util/resources/hr/CurrencyNames_hr_HR.properties \
- sun/util/resources/hu/CurrencyNames_hu_HU.properties \
- sun/util/resources/in/CurrencyNames_in_ID.properties \
- sun/util/resources/is/CurrencyNames_is_IS.properties \
- sun/util/resources/it/CurrencyNames_it.properties \
- sun/util/resources/it/CurrencyNames_it_CH.properties \
- sun/util/resources/it/CurrencyNames_it_IT.properties \
- sun/util/resources/iw/CurrencyNames_iw_IL.properties \
- sun/util/resources/ja/CurrencyNames_ja.properties \
- sun/util/resources/ja/CurrencyNames_ja_JP.properties \
- sun/util/resources/ko/CurrencyNames_ko.properties \
- sun/util/resources/ko/CurrencyNames_ko_KR.properties \
- sun/util/resources/lt/CurrencyNames_lt_LT.properties \
- sun/util/resources/lv/CurrencyNames_lv_LV.properties \
- sun/util/resources/mk/CurrencyNames_mk_MK.properties \
- sun/util/resources/ms/CurrencyNames_ms_MY.properties \
- sun/util/resources/mt/CurrencyNames_mt_MT.properties \
- sun/util/resources/nl/CurrencyNames_nl_BE.properties \
- sun/util/resources/nl/CurrencyNames_nl_NL.properties \
- sun/util/resources/no/CurrencyNames_no_NO.properties \
- sun/util/resources/pl/CurrencyNames_pl_PL.properties \
- sun/util/resources/pt/CurrencyNames_pt.properties \
- sun/util/resources/pt/CurrencyNames_pt_BR.properties \
- sun/util/resources/pt/CurrencyNames_pt_PT.properties \
- sun/util/resources/ro/CurrencyNames_ro_RO.properties \
- sun/util/resources/ru/CurrencyNames_ru_RU.properties \
- sun/util/resources/sk/CurrencyNames_sk_SK.properties \
- sun/util/resources/sl/CurrencyNames_sl_SI.properties \
- sun/util/resources/sq/CurrencyNames_sq_AL.properties \
- sun/util/resources/sr/CurrencyNames_sr_BA.properties \
- sun/util/resources/sr/CurrencyNames_sr_CS.properties \
- sun/util/resources/sr/CurrencyNames_sr_ME.properties \
- sun/util/resources/sr/CurrencyNames_sr_RS.properties \
- sun/util/resources/sr/CurrencyNames_sr_Latn_BA.properties \
- sun/util/resources/sr/CurrencyNames_sr_Latn_ME.properties \
- sun/util/resources/sr/CurrencyNames_sr_Latn_RS.properties \
- sun/util/resources/sv/CurrencyNames_sv.properties \
- sun/util/resources/sv/CurrencyNames_sv_SE.properties \
- sun/util/resources/th/CurrencyNames_th_TH.properties \
- sun/util/resources/tr/CurrencyNames_tr_TR.properties \
- sun/util/resources/uk/CurrencyNames_uk_UA.properties \
- sun/util/resources/vi/CurrencyNames_vi_VN.properties \
- sun/util/resources/zh/CurrencyNames_zh_CN.properties \
- sun/util/resources/zh/CurrencyNames_zh_TW.properties
diff --git a/jdk/make/sun/text/Makefile b/jdk/make/sun/text/Makefile
deleted file mode 100644
index 94b0fd6..0000000
--- a/jdk/make/sun/text/Makefile
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for locale data.
-#
-
-BUILDDIR = ../..
-
-PACKAGE = sun.text
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# Re-direct classes to another location (we are building localedata.jar)
-CLASSDESTDIR = $(TEMPDIR)/classes
-
-#
-# Files
-#
-include FILES_java.gmk
-include FILES_properties.gmk
-
-#
-# Compile the properties files
-#
-COMPILED_PROPERTIES_SUPERCLASS=sun.util.resources.LocaleNamesBundle
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Rules to add data files BreakIterator (for th locale)
-#
-TEXT_CLASSES = $(BUILDTOOLCLASSDIR)/sun.text/classes
-
-# input
-#
-# Notes: sun.text.resources.BreakIteratorRules_th 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 = $(SHARE_SRC)/classes/sun/text/resources
-BIRULES = $(TEXT_SRCDIR)/BreakIteratorRules.java \
- $(TEXT_SRCDIR)/th/BreakIteratorRules_th.java
-BIINFO = $(TEXT_SRCDIR)/th/BreakIteratorInfo_th.java
-UNICODEDATA = $(BUILDDIR)/tools/UnicodeData
-
-# output
-BIFILES = $(CLASSDESTDIR)/sun/text/resources/th/WordBreakIteratorData_th \
- $(CLASSDESTDIR)/sun/text/resources/th/LineBreakIteratorData_th
-
-# builder
-GENERATEBREAKITERATORDATA_JARFILE = \
- $(BUILDTOOLJARDIR)/generatebreakiteratordata.jar
-
-$(BIFILES): $(GENERATEBREAKITERATORDATA_JARFILE) $(BIRULES) $(BIINFO) \
- $(UNICODEDATA)/UnicodeData.txt
- $(prep-target)
- $(MKDIR) -p $(TEXT_CLASSES)
- $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
- -sourcepath $(TEXT_SRCDIR) \
- $(BIRULES) $(BIINFO)
- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
- -o $(CLASSDESTDIR)/sun/text/resources \
- -spec $(UNICODEDATA)/UnicodeData.txt \
- -language th
- @$(java-vm-cleanup)
-
-clean::
- $(RM) -r $(TEXT_CLASSES)
- $(RM) -r $(BIFILES)
-#
-# End of rules to add data files for BreakIterator
-#
-
-#
-# Extra rules to build locale data.
-#
-LOCALEDATA_JAR = $(EXTDIR)/localedata.jar
-
-SPECIALFILES = $(CLASSDESTDIR)/sun/text/resources/th/thai_dict
-
-$(CLASSDESTDIR)/sun/text/resources/% : $(TEXT_SRCDIR)/%
- $(install-file)
-
-$(LOCALEDATA_JAR): $(EXTDIR) $(FILES_class) $(BIFILES) $(SPECIALFILES)
- $(prep-target)
- $(BOOT_JAR_CMD) -cf $@ -C $(CLASSDESTDIR) sun \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-build: $(LOCALEDATA_JAR)
-
-clean clobber::
- $(RM) -r $(CLASSDESTDIR)
- $(RM) $(LOCALEDATA_JAR)
-
diff --git a/jdk/make/sun/tools/Makefile b/jdk/make/sun/tools/Makefile
deleted file mode 100644
index 4c9c19b..0000000
--- a/jdk/make/sun/tools/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building tools
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.tools
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = \
- sun/tools/jinfo \
- sun/tools/jmap \
- sun/tools/jps \
- sun/tools/jstack \
- sun/tools/jstat \
- sun/tools/jstatd \
- sun/tools/jcmd \
- com/sun/tools/hat \
- com/sun/tools/script/shell \
- sun/jvmstat
-
-# Extra jstat files
-FILES_copy += \
- $(CLASSDESTDIR)/sun/tools/jstat/resources/jstat_options \
- $(CLASSDESTDIR)/sun/tools/jstat/resources/jstat_unsupported_options
-
-# Extra jhat files
-JHAT_RESOURCEDIR = $(CLASSDESTDIR)/com/sun/tools/hat/resources
-FILES_copy += \
- $(JHAT_RESOURCEDIR)/hat.js \
- $(JHAT_RESOURCEDIR)/oqlhelp.html \
- $(JHAT_RESOURCEDIR)/platform_names.txt
-
-# Extra jrunscript files
-JRUNSCRIPT_RESOURCEDIR = $(CLASSDESTDIR)/com/sun/tools/script/shell
-FILES_copy += \
- $(JRUNSCRIPT_RESOURCEDIR)/init.js \
- $(JRUNSCRIPT_RESOURCEDIR)/messages.properties
-
-# Extra jvmstat files
-FILES_copy += \
- $(CLASSDESTDIR)/sun/jvmstat/perfdata/resources/aliasmap
-
-# Build should include the file copies
-build: copy-files
-
-copy-files: $(FILES_copy)
-
-$(CLASSDESTDIR)/%: $(SHARE_SRC)/classes/%
- $(install-file)
-
-clean clobber::
- $(RM) $(FILES_copy)
-
-.PHONY: copy-files
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/sun/tracing/Makefile b/jdk/make/sun/tracing/Makefile
deleted file mode 100644
index 179f2e2..0000000
--- a/jdk/make/sun/tracing/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building tracing package implementation classes
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.tracing
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = dtrace
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build:
- $(SUBDIRS-loop)
-clean clobber::
- $(SUBDIRS-loop)
-
-AUTO_FILES_JAVA_DIRS = sun/tracing
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/sun/tracing/dtrace/Makefile b/jdk/make/sun/tracing/dtrace/Makefile
deleted file mode 100644
index c0d3c97..0000000
--- a/jdk/make/sun/tracing/dtrace/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building dtrace extension
-#
-
-LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
-
-BUILDDIR = ../../..
-PACKAGE = sun.tracing.dtrace
-LIBRARY = jsdt
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Use mapfile
-#
-FILES_m = mapfile-vers
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-
-NATIVE_DTRACE_DIR=native/sun/tracing/dtrace
-
-SRCDIR=$(SHARE_SRC)/$(NATIVE_DTRACE_DIR)
-PSRCDIR=$(PLATFORM_SRC)/$(NATIVE_DTRACE_DIR)
-
-FILES_c = JVM.c jvm_symbols_md.c
-
-FILES_java = \
- sun/tracing/dtrace/Activation.java \
- sun/tracing/dtrace/DTraceProvider.java \
- sun/tracing/dtrace/DTraceProbe.java \
- sun/tracing/dtrace/DTraceProviderFactory.java \
- sun/tracing/dtrace/JVM.java
-
-FILES_export = $(FILES_java)
-
-ifeq ($(PLATFORM), linux)
-OTHER_LDLIBS += $(LIBDL)
-endif
-
-#
-# Use JNI for generating header files
-#
-JAVAHFLAGS += -jni
-
-#
-# Don't need to link against -ljava
-#
-JAVALIB=
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Add to ambient vpath so we pick up the library files
-#
-vpath %.c $(SRCDIR):$(PSRCDIR)
diff --git a/jdk/make/sun/tracing/dtrace/mapfile-vers b/jdk/make/sun/tracing/dtrace/mapfile-vers
deleted file mode 100644
index aea100b..0000000
--- a/jdk/make/sun/tracing/dtrace/mapfile-vers
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
- global:
- Java_sun_tracing_dtrace_JVM_isSupported0;
- Java_sun_tracing_dtrace_JVM_activate0;
- Java_sun_tracing_dtrace_JVM_dispose0;
- Java_sun_tracing_dtrace_JVM_isEnabled0;
- Java_sun_tracing_dtrace_JVM_defineClass0;
- local:
- *;
-};
diff --git a/jdk/make/sun/tzdb/Makefile b/jdk/make/sun/tzdb/Makefile
deleted file mode 100644
index 03e9048..0000000
--- a/jdk/make/sun/tzdb/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building tzdb compiler utility.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.tzdb
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-# This program must contain a manifest that defines the execution level
-# needed to follow standard Vista User Access Control Guidelines
-# This must be set before Program.gmk is included
-#
-BUILD_MANIFEST=true
-
-#
-# Time zone data file creation
-#
-TZDATA_DIR := ../javazic/tzdata
-TZFILE := \
- africa antarctica asia australasia europe northamerica \
- pacificnew southamerica backward etcetera \
- gmt jdk11_backward
-
-TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZFILE))
-
-TZDB_DAT = $(LIBDIR)/tzdb.dat
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Add to the build rule
-#
-build: $(TZDB_DAT)
-
-$(TZDB_DAT): $(TZFILES)
- $(prep-target)
- $(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/tzdb.jar \
- -srcdir $(TZDATA_DIR) -dstfile $(TZDB_DAT) $(TZFILE)
-
-clean clobber::
- $(RM) $(TZDB_DAT)
diff --git a/jdk/make/sun/usagetracker/Makefile b/jdk/make/sun/usagetracker/Makefile
deleted file mode 100644
index ccb6618..0000000
--- a/jdk/make/sun/usagetracker/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.usagetracker
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = sun/usagetracker
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
diff --git a/jdk/make/sun/util/Makefile b/jdk/make/sun/util/Makefile
deleted file mode 100644
index 7749369..0000000
--- a/jdk/make/sun/util/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.util
-PRODUCT = sun
-JAVAC_MAX_WARNINGS = true
-JAVAC_WARNINGS_FATAL = true
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-AUTO_FILES_JAVA_DIRS = sun/util/xml
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Rules for XML properties provider configuration file
-#
-SERVICEDIR = $(CLASSBINDIR)/META-INF/services
-FILES_copy = $(SERVICEDIR)/sun.util.spi.XmlPropertiesProvider
-
-copy-files: $(FILES_copy)
-
-$(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/util/xml/META-INF/services/%
- $(install-file)
-
-build: copy-files
-
-clean::
- $(RM) $(FILES_copy)
-
-
diff --git a/jdk/make/sun/xawt/FILES_c_unix.gmk b/jdk/make/sun/xawt/FILES_c_unix.gmk
deleted file mode 100644
index 74ea1cd..0000000
--- a/jdk/make/sun/xawt/FILES_c_unix.gmk
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# include rules
-#
-
-FILES_c = \
- XlibWrapper.c \
- XWindow.c \
- XToolkit.c \
- X11Color.c \
- X11SurfaceData.c \
- awt_GraphicsEnv.c \
- awt_InputMethod.c \
- robot_common.c \
- awt_Robot.c \
- list.c \
- multiVis.c \
- initIDs.c \
- awt_util.c \
- awt_Desktop.c \
- awt_UNIXToolkit.c \
- X11FontScaler_md.c \
- X11TextRenderer_md.c \
- fontpath.c \
- awt_Insets.c \
- awt_Event.c \
- X11Renderer.c \
- X11PMBlitLoops.c \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- GLXGraphicsConfig.c \
- GLXSurfaceData.c \
- AccelGlyphCache.c \
- awt_Font.c \
- multi_font.c \
- awt_AWTEvent.c \
- awt_DrawingSurface.c \
- jawt.c \
- CUPSfuncs.c \
- debug_assert.c \
- debug_mem.c \
- debug_trace.c \
- debug_util.c \
- awt_Plugin.c \
- gnome_interface.c \
- gtk2_interface.c \
- swing_GTKEngine.c \
- swing_GTKStyle.c \
- rect.c \
- sun_awt_X11_GtkFileDialogPeer.c \
- XRSurfaceData.c \
- XRBackendNative.c
diff --git a/jdk/make/sun/xawt/FILES_export_unix.gmk b/jdk/make/sun/xawt/FILES_export_unix.gmk
deleted file mode 100644
index 5d8d624..0000000
--- a/jdk/make/sun/xawt/FILES_export_unix.gmk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# include rules
-#
-
-FILES_export = \
- sun/awt/X11/XlibWrapper.java \
- sun/awt/X11/XWindow.java \
- sun/awt/X11/XDesktopPeer.java \
- sun/awt/X11/XToolkit.java \
- sun/awt/X11/XComponentPeer.java \
- sun/awt/X11/XInputMethod.java \
- sun/awt/X11/GtkFileDialogPeer.java
diff --git a/jdk/make/sun/xawt/Makefile b/jdk/make/sun/xawt/Makefile
deleted file mode 100644
index 95f2a6f..0000000
--- a/jdk/make/sun/xawt/Makefile
+++ /dev/null
@@ -1,325 +0,0 @@
-#
-# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILDDIR = ../..
-PACKAGE = sun.awt.X11
-LIBRARY = awt_xawt
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-GEN_DIR=$(GENSRCDIR)/sun/awt/X11
-
-CLASSES_INIT += $(TEMPDIR)/.gen.wrappers touch.wrappers
-
-.PHONY: generated.clean
-
-#
-# Files
-#
-include FILES_c_unix.gmk
-include FILES_export_unix.gmk
-AUTO_FILES_JAVA_DIRS = sun/awt/X11
-AUTO_JAVA_PRUNE = WrapperGenerator.java
-
-LDFLAGS += -L$(OPENWIN_LIB)
-
-# For Xrender extension.
-ifeq ($(PLATFORM), solaris)
-LDFLAGS += -L/usr/openwin/sfw/lib$(ISA_DIR) -R/usr/openwin/sfw/lib$(ISA_DIR)
-endif
-
-ifeq ($(PLATFORM), linux)
-LDFLAGS += -lpthread
-dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
-endif
-
-ifeq ($(PLATFORM), macosx)
-LDFLAGS += -pthread
-dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
-endif
-
-# Since this library will be living in a subdirectory below the other libraries
-# we need to add an extra runpath so that libraries in the upper directory
-# are found at runtime.
-LD_RUNPATH_EXTRAS = ..
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Mapfile-vers.gmk
-include $(BUILDDIR)/common/Library.gmk
-
-#
-# Add to the ambient vpath to pick up files in subdirectories
-#
-vpath %.c $(SHARE_SRC)/native/sunawt/alphacomposite
-vpath %.c $(PLATFORM_SRC)/native/sun/xawt
-vpath %.c $(PLATFORM_SRC)/native/sun/awt
-vpath %.c $(SHARE_SRC)/native/sun/awt/debug
-vpath %.c $(SHARE_SRC)/native/sun/awt/image
-vpath %.c $(SHARE_SRC)/native/sun/awt/image/gif
-vpath %.c $(SHARE_SRC)/native/sun/awt/image/cvutils
-vpath %.c $(SHARE_SRC)/native/sun/awt/shell
-vpath %.c $(SHARE_SRC)/native/sun/java2d
-vpath %.c $(SHARE_SRC)/native/sun/java2d/loops
-vpath %.c $(SHARE_SRC)/native/sun/java2d/pipe
-vpath %.c $(SHARE_SRC)/native/sun/awt/medialib
-vpath %.c $(SHARE_SRC)/native/sun/awt/utility
-vpath %.cpp $(SHARE_SRC)/native/sun/image
-vpath %.c $(SHARE_SRC)/native/sun/font
-vpath %.c $(PLATFORM_SRC)/native/sun/awt/robot_child
-vpath %.c $(SHARE_SRC)/native/sun/java2d/opengl
-vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl
-vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11
-
-OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) \
- $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi
-
-ifeq ($(PLATFORM), solaris)
-CPPFLAGS += -DFUNCPROTO=15
-dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
-endif
-
-CPPFLAGS += -I$(CUPS_HEADERS_PATH)
-
-CPPFLAGS += -DXAWT -DXAWT_HACK \
- -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \
- -I$(PLATFORM_SRC)/native/sun/awt \
- -I$(PLATFORM_SRC)/native/sun/xawt \
- -I$(PLATFORM_SRC)/native/sun/jdga \
- -I$(SHARE_SRC)/native/sun/awt/debug \
- -I$(SHARE_SRC)/native/sun/awt/image/cvutils \
- -I$(SHARE_SRC)/native/sun/java2d \
- -I$(SHARE_SRC)/native/sun/java2d/loops \
- -I$(SHARE_SRC)/native/sun/awt/image/cvutils \
- -I$(SHARE_SRC)/native/sun/awt/image \
- -I$(SHARE_SRC)/native/sun/font \
- -I$(PLATFORM_SRC)/native/sun/java2d \
- -I$(SHARE_SRC)/native/sun/java2d/pipe \
- -I$(SHARE_SRC)/native/sun/java2d/opengl \
- -I$(PLATFORM_SRC)/native/sun/java2d/opengl \
- -I$(PLATFORM_SRC)/native/sun/java2d/x11 \
- -I$(SHARE_SRC)/native/sun/dc/path \
- -I$(SHARE_SRC)/native/sun/dc/doe \
- -I$(SHARE_SRC)/native/sun/awt/alphacomposite \
- -I$(SHARE_SRC)/native/sun/awt/medialib \
- -I$(PLATFORM_SRC)/native/sun/awt/medialib \
- -I$(PLATFORM_SRC)/native/sun/font \
- -I$(SHARE_SRC)/native/sun/awt \
- -I$(PLATFORM_SRC)/native/sun/awt
-
-ifeq ($(PLATFORM), linux)
- ifndef CROSS_COMPILE_ARCH
- # Allows for builds on Debian GNU Linux, X11 is in a different place
- # This should really be handled at a higher-level so we don't have to
- # work-around this when cross-compiling
- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
- -I/usr/include/X11/extensions \
- -I$(OPENWIN_HOME)/include
- else
- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
- -I$(OPENWIN_HOME)/include
- endif
-endif
-
-# We have some odd logic here because some Solaris 10 updates
-# have a render.h file that suggests gradients are supported, but
-# the Xrender.h doesn't have the corresponding type definitions.
-# Earlier updates have neither. We'd like to know if there's a mismatch.
-# Whilst in the C preprocessor we can tell if the render.h define's are set
-# we can't tell anything about C declarations.
-# A grep of Xrender.h is the only way to know this. If they are absent
-# we will set a flag indicating this mismatch and the JDK source file
-# will interpret it to resolve the problem.
-ifeq ($(PLATFORM), solaris)
- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
- OS_VERSION := $(shell uname -r)
- XRENDER_H := $(OPENWIN_HOME)/share/include/X11/extensions/Xrender.h
- ifeq ($(OS_VERSION),5.10)
- LINEARGRADIENT_CNT := $(shell $(EGREP) -c XLinearGradient $(XRENDER_H))
- ifeq ($(LINEARGRADIENT_CNT),0)
- CFLAGS+= -DSOLARIS10_NO_XRENDER_STRUCTS
- endif
- endif
-endif
-
-ifeq ($(PLATFORM), macosx)
- CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
-endif
-
-ifeq ($(MILESTONE), internal)
- CPPFLAGS += -DINTERNAL_BUILD
-endif
-
-#
-# Generation of wrappers
-#
-SIZER_DIR=$(GEN_DIR)/generator
-SIZER = $(SIZER_DIR)/sizer
-SIZER_32_C = $(SIZER).32.c
-SIZER_64_C = $(SIZER).64.c
-CFLAGS_32=$(CFLAGS)
-CFLAGS_64=$(CFLAGS)
-
-ifeq ($(PLATFORM), solaris)
-
-isalist:=$(shell $(ISAINFO))
-
-ifneq (,$(findstring sparcv9, $(isalist)))
-# On sparcv9 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
-# On sparcv9 CFLAGS already contain $(XARCH_OPTION/64), so to generate 32-bit sizer we need to change this option.
-CFLAGS_32=$(subst $(XARCH_OPTION/64),$(XARCH_OPTION/32),$(CFLAGS))
-SIZERS = $(SIZER).32 $(SIZER).64
-SIZERS_C = $(SIZER_32_C) $(SIZER_64_C)
-SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64
-CFLAGS_64=$(CFLAGS) $(XARCH_OPTION/64)
-else
-ifneq (,$(findstring amd64, $(isalist)))
-# On amd64 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
-# On amd64 CFLAGS already contain $(XARCH_OPTION/64), so to generate 32-bit sizer we need to change this option.
-CFLAGS_32=$(subst $(XARCH_OPTION/64),$(XARCH_OPTION/32),$(CFLAGS))
-SIZERS = $(SIZER).32 $(SIZER).64
-SIZERS_C = $(SIZER_32_C) $(SIZER_64_C)
-SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64
-CFLAGS_64=$(CFLAGS) $(XARCH_OPTION/64)
-else # !sparcv9 : includes (32-bit) sparc, i586
-SIZERS = $(SIZER).32
-SIZERS_C = $(SIZER_32_C)
-SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
-endif # amd64
-endif # sparcv9
-
-else # !solaris
-
-ifeq ($(PLATFORM), macosx)
-CFLAGS_32=-arch i386
-SIZERS = $(SIZER).32 $(SIZER).64
-SIZERS_C = $(SIZER_32_C) $(SIZER_64_C)
-SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64
-CFLAGS_64=-arch x86_64
-else # !macosx
-ifeq ($(ARCH_DATA_MODEL), 32)
-SIZERS = $(SIZER).32
-SIZERS_C = $(SIZER_32_C)
-SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
-ifdef CROSS_COMPILE_ARCH
-CFLAGS_32 = -m32
-endif
-else # !32
-SIZERS = $(SIZER).64
-SIZERS_C = $(SIZER_64_C)
-SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
-ifdef CROSS_COMPILE_ARCH
-CFLAGS_64 = -m64
-endif
-endif # 32
-endif # !macosx
-endif # solaris
-
-# XXX Hack for 6185483 - use hard-coded sizes.
-# Add the 64-bit platforms that need to be included into 32-bit build
-# and have sizes.64-$(PLATFORM)-$(LIBARCH) hardcoded in the workspace
-ifeq ($(PLATFORM)-$(LIBARCH), solaris-i386)
-# If you define DOHACK=true for some combination of $(PLATFORM)-$(LIBARCH),
-# make sure you have sizes.64-$(PLATFORM)-$(LIBARCH) pre-generated in
-# $(PLATFORM_SRC)/classes/sun/awt/X11/generator/
-DOHACK=true
-endif # Hack
-
-ifeq ($(DOHACK), true)
-PREDEFINED_SIZES_TMPL=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/sizes.64-$(PLATFORM)-$(LIBARCH)
-PREDEFINED_SIZES=$(WRAPPER_GENERATOR_DIR)/sizes.64
-SIZES += $(WRAPPER_GENERATOR_DIR)/sizes.64
-endif
-
-ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
-DOCOMPARE=true
-endif
-# 64 bit sizers are generated on platform-libarch (left) for use
-# on platform-libarch (right) and stored under the latter name.
-# Do compare manually stored and automatically generated pair(s)
-# if DOCOMPARE=true, just after the generation.
-STORED_SIZES_TMPL_solaris_amd64=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/sizes.64-solaris-i386
-
-WRAPPER_GENERATOR_JAVA=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/WrapperGenerator.java
-WRAPPER_GENERATOR_DIR=$(GENSRCDIR)/sun/awt/X11/generator
-WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator
-WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class
-XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
-
-ifndef CROSS_COMPILE_ARCH
-SIZERS_CC = $(CC)
-else
-SIZERS_CC = $(HOST_CC)
-endif
-
-$(SIZERS): $(SIZERS_C)
- $(prep-target)
- $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c
- $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o
-
-$(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
- $(prep-target)
- $(BOOT_JAVAC_CMD) -d $(WRAPPER_GENERATOR_TEMPDIR) $(WRAPPER_GENERATOR_JAVA)
-
-$(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
- $(prep-target)
- $(MKDIR) -p $(WRAPPER_GENERATOR_TEMPDIR)
- $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
- $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
-
-$(SIZES): $(SIZERS)
- @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
- $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
- $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
- $(CHMOD) +w $@;\
- else \
- $(ECHO) GENERATING $@; \
- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
- fi
- @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
- $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
- $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
- fi
-
-$(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
- $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
- $(GEN_DIR) $(XLIBTYPES) "gen" $(WRAPPER_GENERATOR_DIR)/sizes
-
-touch.wrappers: $(TEMPDIR)/.gen.wrappers
- $(MKDIR) -p $(TEMPDIR)
- $(TOUCH) $(TEMPDIR)/.gen.wrappers
-
-generated.clean:
- $(RM) -r $(WRAPPER_GENERATOR_TEMPDIR)
- $(RM) -r $(WRAPPER_GENERATOR_DIR)
- $(RM) -r $(GEN_DIR)/*.java
-
-
-clean clobber:: generated.clean
-
-.PHONY: generated.clean robot_child
-
diff --git a/jdk/make/sun/xawt/mapfile-vers b/jdk/make/sun/xawt/mapfile-vers
deleted file mode 100644
index e75f0c1..0000000
--- a/jdk/make/sun/xawt/mapfile-vers
+++ /dev/null
@@ -1,464 +0,0 @@
-#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- JNI_OnLoad;
- Java_sun_awt_X11_XlibWrapper_copyIntArray;
- Java_sun_awt_X11_XlibWrapper_copyLongArray;
- Java_sun_awt_X11_XlibWrapper_getAddress;
- Java_sun_awt_X11_XlibWrapper_XConvertSelection;
- Java_sun_awt_X11_XlibWrapper_XSetSelectionOwner;
- Java_sun_awt_X11_XlibWrapper_XGetSelectionOwner;
- Java_sun_awt_X11_XlibWrapper_XGetAtomName;
- Java_sun_awt_X11_XlibWrapper_XMaxRequestSize;
- Java_sun_awt_X11_XlibWrapper_XReparentWindow;
- Java_sun_awt_X11_XlibWrapper_XAllocSizeHints;
- Java_sun_awt_X11_XlibWrapper_XAllocWMHints;
- Java_sun_awt_X11_XlibWrapper_XSetMinMaxHints;
- Java_sun_awt_X11_XlibWrapper_XGetVisualInfo;
- Java_sun_awt_X11_XlibWrapper_XOpenDisplay;
- Java_sun_awt_X11_XlibWrapper_XCloseDisplay;
- Java_sun_awt_X11_XlibWrapper_XDisplayString;
- Java_sun_awt_X11_XlibWrapper_XSetCloseDownMode;
- Java_sun_awt_X11_XlibWrapper_XCreateWindow;
- Java_sun_awt_X11_XlibWrapper_XMapWindow;
- Java_sun_awt_X11_XlibWrapper_XMapRaised;
- Java_sun_awt_X11_XlibWrapper_XUnmapWindow;
- Java_sun_awt_X11_XlibWrapper_XSelectInput;
- Java_sun_awt_X11_XlibWrapper_XNextEvent;
- Java_sun_awt_X11_XlibWrapper_XMaskEvent;
- Java_sun_awt_X11_XlibWrapper_XWindowEvent;
- Java_sun_awt_X11_XlibWrapper_XFilterEvent;
- Java_sun_awt_X11_XlibWrapper_XSupportsLocale;
- Java_sun_awt_X11_XlibWrapper_XSetLocaleModifiers;
- Java_sun_awt_X11_XlibWrapper_XPeekEvent;
- Java_sun_awt_X11_XlibWrapper_DefaultScreen;
- Java_sun_awt_X11_XlibWrapper_ScreenOfDisplay;
- Java_sun_awt_X11_XlibWrapper_DoesBackingStore;
- Java_sun_awt_X11_XlibWrapper_RootWindow;
- Java_sun_awt_X11_XlibWrapper_DisplayHeight;
- Java_sun_awt_X11_XlibWrapper_DisplayWidthMM;
- Java_sun_awt_X11_XlibWrapper_DisplayWidth;
- Java_sun_awt_X11_XlibWrapper_DisplayHeightMM;
- Java_sun_awt_X11_XlibWrapper_ScreenCount;
- Java_sun_awt_X11_XlibWrapper_XMoveResizeWindow;
- Java_sun_awt_X11_XlibWrapper_XResizeWindow;
- Java_sun_awt_X11_XlibWrapper_XMoveWindow;
- Java_sun_awt_X11_XlibWrapper_XGetWindowAttributes;
- Java_sun_awt_X11_XlibWrapper_XGetGeometry;
- Java_sun_awt_X11_XlibWrapper_XGrabPointer;
- Java_sun_awt_X11_XlibWrapper_XUngrabPointer;
- Java_sun_awt_X11_XlibWrapper_XGrabKeyboard;
- Java_sun_awt_X11_XlibWrapper_XUngrabKeyboard;
- Java_sun_awt_X11_XlibWrapper_XSetWindowBackground;
- Java_sun_awt_X11_XlibWrapper_XFlush;
- Java_sun_awt_X11_XlibWrapper_XSync;
- Java_sun_awt_X11_XlibWrapper_XEventsQueued;
- Java_sun_awt_X11_XlibWrapper_XRaiseWindow;
- Java_sun_awt_X11_XlibWrapper_XLowerWindow;
- Java_sun_awt_X11_XlibWrapper_XRestackWindows;
- Java_sun_awt_X11_XlibWrapper_XSetInputFocus;
- Java_sun_awt_X11_XlibWrapper_XSetInputFocus2;
- Java_sun_awt_X11_XlibWrapper_XGetInputFocus;
- Java_sun_awt_X11_XlibWrapper_XDestroyWindow;
- Java_sun_awt_X11_XlibWrapper_XTranslateCoordinates;
- Java_sun_awt_X11_XlibWrapper_XCreateFontCursor;
- Java_sun_awt_X11_XlibWrapper_XSetTransientFor;
- Java_sun_awt_X11_XlibWrapper_XSetWMHints;
- Java_sun_awt_X11_XlibWrapper_XGetWMHints;
- Java_sun_awt_X11_XlibWrapper_XShapeQueryExtension;
- Java_sun_awt_X11_XlibWrapper_SetRectangularShape;
- Java_sun_awt_X11_XlibWrapper_SetBitmapShape;
- Java_sun_awt_X11_XlibWrapper_XConfigureWindow;
- Java_sun_awt_X11_XlibWrapper_SetZOrder;
- Java_sun_awt_X11_XToolkit_initIDs;
- Java_sun_awt_X11_XWindow_getNativeColor;
- Java_sun_awt_X11_XWindow_getWMInsets;
- Java_sun_awt_X11_XWindow_getTopWindow;
- Java_sun_awt_X11_XWindow_getWindowBounds;
- Java_sun_awt_X11_XWindow_setSizeHints;
- Java_sun_awt_X11_XWindow_getAWTKeyCodeForKeySym;
- Java_sun_awt_X11_XWindow_getKeySymForAWTKeyCode;
- Java_sun_awt_X11_XToolkit_nativeLoadSystemColors;
- Java_sun_awt_X11_XToolkit_awt_1toolkit_1init;
- Java_sun_awt_X11_XToolkit_awt_1output_1flush;
- Java_sun_awt_X11_XToolkit_wakeup_1poll;
- Java_java_awt_Cursor_finalizeImpl;
- Java_sun_awt_X11_XlibWrapper_InternAtom;
- Java_sun_awt_X11_XlibWrapper_GetProperty;
- Java_sun_awt_X11_XlibWrapper_SetProperty;
- Java_sun_awt_X11_XlibWrapper_XGetDefault;
- Java_sun_awt_X11_XlibWrapper_XGetPointerMapping;
- Java_sun_awt_X11_XlibWrapper_XScreenNumberOfScreen;
- Java_sun_awt_X11_XlibWrapper_getScreenOfWindow;
- Java_sun_awt_X11_XlibWrapper_XIconifyWindow;
- Java_sun_awt_X11_XlibWrapper_XBell;
- Java_sun_awt_X11_XlibWrapper_XChangePropertyImpl;
- Java_sun_awt_X11_XlibWrapper_XChangePropertyS;
- Java_sun_awt_X11_XlibWrapper_XGetWindowProperty;
- Java_sun_awt_X11_XlibWrapper_getStringBytes;
- Java_sun_awt_X11_XlibWrapper_XFree;
- Java_sun_awt_X11_XlibWrapper_ServerVendor;
- Java_sun_awt_X11_XlibWrapper_VendorRelease;
- Java_sun_awt_X11_XlibWrapper_IsXsunKPBehavior;
- Java_sun_awt_X11_XlibWrapper_IsSunKeyboard;
- Java_sun_awt_X11_XlibWrapper_IsKanaKeyboard;
- Java_sun_awt_X11_XlibWrapper_SetToolkitErrorHandler;
- Java_sun_awt_X11_XlibWrapper_XSetErrorHandler;
- Java_sun_awt_X11_XlibWrapper_CallErrorHandler;
- Java_sun_awt_X11_XlibWrapper_PrintXErrorEvent;
- Java_sun_awt_X11_XlibWrapper_XInternAtoms;
- Java_sun_awt_X11_XlibWrapper_XChangeWindowAttributes;
- Java_sun_awt_X11_XlibWrapper_XDeleteProperty;
- Java_sun_awt_X11_XlibWrapper_XSetWMNormalHints;
- Java_sun_awt_X11_XlibWrapper_XGetWMNormalHints;
- Java_sun_awt_X11_XlibWrapper_XSendEvent;
- Java_sun_awt_X11_XlibWrapper_XQueryTree;
- Java_sun_awt_X11_XlibWrapper_memcpy;
- Java_sun_awt_X11_XlibWrapper_XdbeQueryExtension;
- Java_sun_awt_X11_XlibWrapper_XQueryExtension;
- Java_sun_awt_X11_XlibWrapper_IsKeypadKey;
- Java_sun_awt_X11_XlibWrapper_XdbeAllocateBackBufferName;
- Java_sun_awt_X11_XlibWrapper_XdbeDeallocateBackBufferName;
- Java_sun_awt_X11_XlibWrapper_XdbeSwapBuffers;
- Java_sun_awt_X11_XlibWrapper_XdbeBeginIdiom;
- Java_sun_awt_X11_XlibWrapper_XdbeEndIdiom;
- Java_sun_awt_X11_XDesktopPeer_init;
- Java_sun_awt_X11_XDesktopPeer_gnome_1url_1show;
- Java_sun_awt_X11_XRobotPeer_getRGBPixelsImpl;
- Java_sun_awt_X11_XRobotPeer_keyPressImpl;
- Java_sun_awt_X11_XRobotPeer_keyReleaseImpl;
- Java_sun_awt_X11_XRobotPeer_mouseMoveImpl;
- Java_sun_awt_X11_XRobotPeer_mousePressImpl;
- Java_sun_awt_X11_XRobotPeer_mouseReleaseImpl;
- Java_sun_awt_X11_XRobotPeer_mouseWheelImpl;
- Java_sun_awt_X11_XRobotPeer_setup;
- Java_sun_awt_X11_XToolkit_getNumberOfButtonsImpl;
- Java_java_awt_Component_initIDs;
- Java_java_awt_Container_initIDs;
- Java_java_awt_Button_initIDs;
- Java_java_awt_Scrollbar_initIDs;
- Java_java_awt_Window_initIDs;
- Java_java_awt_Frame_initIDs;
- Java_sun_awt_SunToolkit_closeSplashScreen;
- Java_sun_awt_UNIXToolkit_check_1gtk;
- Java_sun_awt_UNIXToolkit_load_1gtk;
- Java_sun_awt_UNIXToolkit_unload_1gtk;
- Java_sun_awt_UNIXToolkit_load_1stock_1icon;
- Java_sun_awt_UNIXToolkit_load_1gtk_1icon;
- Java_sun_awt_UNIXToolkit_nativeSync;
- Java_sun_awt_UNIXToolkit_gtkCheckVersionImpl;
- Java_java_awt_AWTEvent_initIDs;
- Java_java_awt_event_InputEvent_initIDs;
- Java_java_awt_event_KeyEvent_initIDs;
- Java_java_awt_MenuComponent_initIDs;
- Java_java_awt_Cursor_initIDs;
- Java_java_awt_MenuItem_initIDs;
- Java_java_awt_Menu_initIDs;
- Java_java_awt_TextArea_initIDs;
- Java_java_awt_Checkbox_initIDs;
- Java_java_awt_ScrollPane_initIDs;
- Java_java_awt_TextField_initIDs;
- Java_java_awt_TrayIcon_initIDs;
- Java_sun_font_FontConfigManager_getFontConfig;
- Java_sun_font_FontConfigManager_getFontConfigAASettings;
- Java_sun_font_FontConfigManager_getFontConfigVersion;
- Java_sun_awt_X11FontManager_getFontPathNative;
- Java_sun_awt_X11GraphicsEnvironment_initDisplay;
- Java_sun_awt_X11GraphicsEnvironment_initGLX;
- Java_sun_awt_X11GraphicsEnvironment_initXRender;
- Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
- Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
- Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
- Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
- Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
- Java_sun_awt_X11GraphicsEnvironment_getDisplayString;
-# Java_sun_awt_X11GraphicsEnvironment_getNativeFonts;
- Java_sun_awt_X11GraphicsDevice_initIDs;
- Java_sun_awt_X11GraphicsDevice_getConfigVisualId;
- Java_sun_awt_X11GraphicsDevice_getConfigDepth;
- Java_sun_awt_X11GraphicsDevice_getNumConfigs;
- Java_sun_awt_X11GraphicsDevice_getConfigColormap;
- Java_sun_awt_X11GraphicsDevice_isDBESupported;
- Java_sun_awt_X11GraphicsDevice_getDisplay;
- Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
- Java_sun_awt_X11GraphicsDevice_initXrandrExtension;
- Java_sun_awt_X11GraphicsDevice_enterFullScreenExclusive;
- Java_sun_awt_X11GraphicsDevice_exitFullScreenExclusive;
- Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode;
- Java_sun_awt_X11GraphicsDevice_enumDisplayModes;
- Java_sun_awt_X11GraphicsDevice_configDisplayMode;
- Java_sun_awt_X11GraphicsDevice_resetNativeData;
- Java_sun_awt_X11GraphicsConfig_initIDs;
- Java_sun_awt_X11GraphicsConfig_getXResolution;
- Java_sun_awt_X11GraphicsConfig_getYResolution;
- Java_sun_awt_X11GraphicsConfig_init;
- Java_sun_awt_X11GraphicsConfig_dispose;
- Java_sun_awt_X11GraphicsConfig_makeColorModel;
- Java_sun_awt_X11GraphicsConfig_pGetBounds;
- Java_sun_awt_X11GraphicsConfig_createBackBuffer;
- Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
- Java_sun_awt_X11GraphicsConfig_swapBuffers;
- Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
- Java_sun_awt_X11_XToolkit_getTrayIconDisplayTimeout;
- Java_java_awt_Insets_initIDs;
- Java_java_awt_KeyboardFocusManager_initIDs;
- Java_java_awt_Font_initIDs;
- # libfontmanager entry points
- AWTIsHeadless;
- AWTCountFonts;
- AWTLoadFont;
- AWTFreeFont;
- AWTFontAscent;
- AWTFontDescent;
- AWTFontMinByte1;
- AWTFontMaxByte1;
- AWTFontMinCharOrByte2;
- AWTFontMaxCharOrByte2;
- AWTFontDefaultChar;
- AWTFontPerChar;
- AWTFontMaxBounds;
- AWTFontTextExtents16;
- AWTFreeChar;
- AWTFontGenerateImage;
- AWTCharAdvance;
- AWTCharLBearing;
- AWTCharRBearing;
- AWTCharAscent;
- AWTCharDescent;
- AWTDrawGlyphList;
- AccelGlyphCache_RemoveAllCellInfos;
-
- Java_sun_awt_X11_XToolkit_waitForEvents;
- Java_java_awt_Event_initIDs;
- Java_sun_awt_X11_XWindow_x11inputMethodLookupString;
- Java_sun_awt_X11_XWindow_haveCurrentX11InputMethodInstance;
- Java_java_awt_AWTEvent_nativeSetSource;
- Java_java_awt_Dialog_initIDs;
- Java_sun_awt_PlatformFont_initIDs;
- Java_sun_awt_FontDescriptor_initIDs;
- Java_sun_awt_X11_XFontPeer_initIDs;
- Java_sun_awt_X11InputMethod_initIDs;
- Java_sun_awt_X11InputMethod_resetXIC;
- Java_sun_awt_X11InputMethod_disposeXIC;
- Java_sun_awt_X11InputMethod_setCompositionEnabledNative;
- Java_sun_awt_X11InputMethod_isCompositionEnabledNative;
- Java_sun_awt_X11InputMethod_turnoffStatusWindow;
- Java_sun_awt_X11_XInputMethod_openXIMNative;
- Java_sun_awt_X11_XInputMethod_createXICNative;
- Java_sun_awt_X11_XInputMethod_setXICFocusNative;
- Java_sun_awt_X11_XInputMethod_adjustStatusWindow;
- Java_sun_awt_X11_XlibWrapper_XQueryPointer;
- Java_sun_awt_X11_XlibWrapper_XFreeCursor;
- Java_sun_awt_X11_XToolkit_getDefaultXColormap;
- Java_sun_awt_X11_XToolkit_getDefaultScreenData;
- Java_sun_awt_X11_XToolkit_getEnv;
- Java_sun_awt_X11_XlibWrapper_XCreateBitmapFromData;
- Java_sun_awt_X11_XlibWrapper_XFreePixmap;
- Java_sun_awt_X11_XlibWrapper_XAllocColor;
- Java_sun_awt_X11_XlibWrapper_XCreatePixmapCursor;
- Java_sun_awt_X11_XlibWrapper_XQueryBestCursor;
- Java_sun_awt_X11_XlibWrapper_XCreatePixmap;
- Java_sun_awt_X11_XlibWrapper_XCreateImage;
- Java_sun_awt_X11_XlibWrapper_XCreateGC;
- Java_sun_awt_X11_XlibWrapper_XDestroyImage;
- Java_sun_awt_X11_XlibWrapper_XPutImage;
- Java_sun_awt_X11_XlibWrapper_XFreeGC;
- Java_sun_awt_X11_XlibWrapper_XSetWindowBackgroundPixmap;
- Java_sun_awt_X11_XlibWrapper_XClearWindow;
- Java_sun_awt_X11_XlibWrapper_XGetIconSizes;
- Java_sun_awt_X11_XlibWrapper_XKeycodeToKeysym;
- Java_sun_awt_X11_XlibWrapper_XKeysymToKeycode;
- Java_sun_awt_X11_XlibWrapper_XQueryKeymap;
- Java_sun_awt_X11_XlibWrapper_XkbGetEffectiveGroup;
- Java_sun_awt_X11_XlibWrapper_XkbSelectEvents;
- Java_sun_awt_X11_XlibWrapper_XkbSelectEventDetails;
- Java_sun_awt_X11_XlibWrapper_XkbKeycodeToKeysym;
- Java_sun_awt_X11_XlibWrapper_XkbLibraryVersion;
- Java_sun_awt_X11_XlibWrapper_XkbQueryExtension;
- Java_sun_awt_X11_XlibWrapper_XkbGetMap;
- Java_sun_awt_X11_XlibWrapper_XkbGetUpdatedMap;
- Java_sun_awt_X11_XlibWrapper_XkbFreeKeyboard;
- Java_sun_awt_X11_XlibWrapper_XkbTranslateKeyCode;
- Java_sun_awt_X11_XlibWrapper_XkbSetDetectableAutoRepeat;
- Java_sun_awt_X11_XlibWrapper_XGetModifierMapping;
- Java_sun_awt_X11_XlibWrapper_XFreeModifiermap;
- Java_sun_awt_X11_XlibWrapper_XRefreshKeyboardMapping;
- Java_sun_awt_X11_XlibWrapper_XChangeActivePointerGrab;
- Java_sun_awt_X11_XlibWrapper_XNextSecondaryLoopEvent;
- Java_sun_awt_X11_XlibWrapper_ExitSecondaryLoop;
- Java_sun_awt_X11_XlibWrapper_XTextPropertyToStringList;
- Java_sun_awt_X11_XlibWrapper_XGrabServer;
- Java_sun_awt_X11_XlibWrapper_XUngrabServer;
- Java_sun_awt_X11_XlibWrapper_XPutBackEvent;
- Java_sun_awt_X11_XlibWrapper_XConvertCase;
- Java_sun_awt_X11_XlibWrapper_XSynchronize;
- Java_java_awt_FileDialog_initIDs;
- Java_sun_awt_X11_XWindow_initIDs;
- Java_sun_awt_X11_XWindowPeer_getLocalHostname;
- Java_sun_awt_X11_XWindowPeer_getJvmPID;
-
- Java_sun_java2d_opengl_OGLContext_getOGLIdString;
- Java_sun_java2d_opengl_OGLMaskFill_maskFill;
- Java_sun_java2d_opengl_OGLRenderer_drawPoly;
- Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer;
- Java_sun_java2d_opengl_OGLSurfaceData_initTexture;
- Java_sun_java2d_opengl_OGLSurfaceData_initFBObject;
- Java_sun_java2d_opengl_OGLSurfaceData_initFlipBackbuffer;
- Java_sun_java2d_opengl_OGLSurfaceData_getTextureID;
- Java_sun_java2d_opengl_OGLSurfaceData_getTextureTarget;
- Java_sun_java2d_opengl_OGLTextRenderer_drawGlyphList;
- Java_sun_java2d_opengl_GLXGraphicsConfig_getGLXConfigInfo;
- Java_sun_java2d_opengl_GLXGraphicsConfig_initConfig;
- Java_sun_java2d_opengl_GLXGraphicsConfig_getOGLCapabilities;
- Java_sun_java2d_opengl_GLXSurfaceData_initOps;
- Java_sun_java2d_opengl_GLXSurfaceData_initPbuffer;
-
- Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
- Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
- Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask;
- Java_sun_java2d_x11_X11Renderer_XFillSpans;
- Java_sun_java2d_x11_X11Renderer_XDrawArc;
- Java_sun_java2d_x11_X11Renderer_XDrawLine;
- Java_sun_java2d_x11_X11Renderer_XDrawOval;
- Java_sun_java2d_x11_X11Renderer_XDrawPoly;
- Java_sun_java2d_x11_X11Renderer_XDrawRect;
- Java_sun_java2d_x11_X11Renderer_XDrawRoundRect;
- Java_sun_java2d_x11_X11Renderer_XDoPath;
- Java_sun_java2d_x11_X11Renderer_XFillArc;
- Java_sun_java2d_x11_X11Renderer_XFillOval;
- Java_sun_java2d_x11_X11Renderer_XFillPoly;
- Java_sun_java2d_x11_X11Renderer_XFillRect;
- Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
- Java_sun_java2d_x11_X11Renderer_devCopyArea;
- Java_sun_java2d_x11_X11SurfaceData_initIDs;
- Java_sun_java2d_x11_X11SurfaceData_isDgaAvailable;
- Java_sun_java2d_x11_X11SurfaceData_isShmPMAvailable;
- Java_sun_java2d_x11_X11SurfaceData_initSurface;
- Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode;
- Java_sun_java2d_x11_X11SurfaceData_XSetXorMode;
- Java_sun_java2d_x11_X11SurfaceData_XSetForeground;
-
- Java_sun_java2d_x11_XSurfaceData_initOps;
- Java_sun_java2d_x11_XSurfaceData_XCreateGC;
- Java_sun_java2d_x11_XSurfaceData_XResetClip;
- Java_sun_java2d_x11_XSurfaceData_XSetClip;
- Java_sun_java2d_x11_XSurfaceData_flushNativeSurface;
- Java_sun_java2d_x11_XSurfaceData_isDrawableValid;
- Java_sun_java2d_x11_XSurfaceData_setInvalid;
- Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures;
- Java_sun_java2d_xr_XRSurfaceData_initXRPicture;
- Java_sun_java2d_xr_XRSurfaceData_initIDs;
- Java_sun_java2d_xr_XRSurfaceData_XRInitSurface;
- Java_sun_java2d_xr_XRSurfaceData_freeXSDOPicture;
- Java_sun_java2d_xr_XRBackendNative_initIDs;
- Java_sun_java2d_xr_XRBackendNative_freeGC;
- Java_sun_java2d_xr_XRBackendNative_createGC;
- Java_sun_java2d_xr_XRBackendNative_createPixmap;
- Java_sun_java2d_xr_XRBackendNative_createPictureNative;
- Java_sun_java2d_xr_XRBackendNative_freePicture;
- Java_sun_java2d_xr_XRBackendNative_freePixmap;
- Java_sun_java2d_xr_XRBackendNative_setPictureRepeat;
- Java_sun_java2d_xr_XRBackendNative_setGCExposures;
- Java_sun_java2d_xr_XRBackendNative_setGCForeground;
- Java_sun_java2d_xr_XRBackendNative_copyArea;
- Java_sun_java2d_xr_XRBackendNative_renderComposite;
- Java_sun_java2d_xr_XRBackendNative_renderRectangle;
- Java_sun_java2d_xr_XRBackendNative_XRenderRectanglesNative;
- Java_sun_java2d_xr_XRBackendNative_XRSetTransformNative;
- Java_sun_java2d_xr_XRBackendNative_XRCreateLinearGradientPaintNative;
- Java_sun_java2d_xr_XRBackendNative_XRCreateRadialGradientPaintNative;
- Java_sun_java2d_xr_XRBackendNative_setFilter;
- Java_sun_java2d_xr_XRBackendNative_XRSetClipNative;
- Java_sun_java2d_xr_XRBackendNative_putMaskNative;
- Java_sun_java2d_xr_XRBackendNative_XRAddGlyphsNative;
- Java_sun_java2d_xr_XRBackendNative_XRFreeGlyphsNative;
- Java_sun_java2d_xr_XRBackendNative_XRenderCreateGlyphSetNative;
- Java_sun_java2d_xr_XRBackendNative_XRenderCompositeTextNative;
- Java_sun_java2d_xr_XRBackendNative_setGCMode;
- Java_sun_java2d_xr_XRBackendNative_GCRectanglesNative;
- Java_sun_java2d_xr_XRBackendNative_renderCompositeTrapezoidsNative;
-
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1arrow;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box_1gap;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1check;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1expander;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1extension;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1flat_1box;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1focus;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1handle;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1hline;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1option;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1shadow;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1slider;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1vline;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1background;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeStartPainting;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeFinishPainting;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1switch_1theme;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1get_1gtk_1setting;
- Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeSetRangeValue;
- Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetXThickness;
- Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetYThickness;
- 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;
-
- Java_sun_awt_X11_GtkFileDialogPeer_initIDs;
- Java_sun_awt_X11_GtkFileDialogPeer_run;
- Java_sun_awt_X11_GtkFileDialogPeer_quit;
- Java_sun_awt_X11_GtkFileDialogPeer_toFront;
- Java_sun_awt_X11_GtkFileDialogPeer_setBounds;
-
- Java_sun_print_CUPSPrinter_initIDs;
- Java_sun_print_CUPSPrinter_getCupsServer;
- Java_sun_print_CUPSPrinter_getCupsPort;
- Java_sun_print_CUPSPrinter_canConnect;
- Java_sun_print_CUPSPrinter_getMedia;
- Java_sun_print_CUPSPrinter_getPageSizes;
-
- awt_GetDrawingSurface;
- awt_FreeDrawingSurface;
- awt_Unlock;
- awt_Lock;
- awt_GetComponent;
-
- # Java Plugin
- # This is in awt_LoadLibrary.c and falls through to libmawt.
- # Evidently plugin needs this for backward compatability.
- getAwtLockFunctions;
- getAwtData;
- getAwtDisplay;
- #XAWT entry point for CDE
- Java_sun_awt_motif_XsessionWMcommand;
- Java_sun_awt_motif_XsessionWMcommand_New;
-
- local:
- *;
-};
diff --git a/jdk/make/templates/bsd-header b/jdk/make/templates/bsd-header
deleted file mode 100644
index cce4fa7..0000000
--- a/jdk/make/templates/bsd-header
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) %YEARS% Oracle and/or its affiliates. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- - Neither the name of Oracle nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/jdk/make/templates/gpl-cp-header b/jdk/make/templates/gpl-cp-header
deleted file mode 100644
index 8c03edf..0000000
--- a/jdk/make/templates/gpl-cp-header
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) %YEARS% Oracle and/or its affiliates. All rights reserved.
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-This code is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 2 only, as
-published by the Free Software Foundation. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the LICENSE file that accompanied this code.
-
-This code is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-version 2 for more details (a copy is included in the LICENSE file that
-accompanied this code).
-
-You should have received a copy of the GNU General Public License version
-2 along with this work; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-or visit www.oracle.com if you need additional information or have any
-questions.
-
diff --git a/jdk/make/templates/gpl-header b/jdk/make/templates/gpl-header
deleted file mode 100644
index dffde47..0000000
--- a/jdk/make/templates/gpl-header
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) %YEARS% Oracle and/or its affiliates. All rights reserved.
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-This code is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 2 only, as
-published by the Free Software Foundation.
-
-This code is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-version 2 for more details (a copy is included in the LICENSE file that
-accompanied this code).
-
-You should have received a copy of the GNU General Public License version
-2 along with this work; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-or visit www.oracle.com if you need additional information or have any
-questions.
-
diff --git a/jdk/make/tools/CharsetMapping/Makefile b/jdk/make/tools/CharsetMapping/Makefile
deleted file mode 100644
index d4c9ec2..0000000
--- a/jdk/make/tools/CharsetMapping/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the charsetmapping tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.charsetmapping
-PRODUCT = tools
-PROGRAM = charsetmapping
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/Main.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/GenerateCharacter/Character.c.template b/jdk/make/tools/GenerateCharacter/Character.c.template
deleted file mode 100644
index 662741f..0000000
--- a/jdk/make/tools/GenerateCharacter/Character.c.template
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <ctype.h>
-
-#include "bool.h"
-#include "utf.h"
-
- $$Tables
-
-/* Take pointer to a string. Skip over the longest part of the string that
- * could be taken as a fieldname. Allow '/' if slash_okay is TRUE.
- *
- * Return a pointer to just past the fieldname. Return NULL if no fieldname
- * at all was found, or in the case of slash_okay being true, we saw
- * consecutive slashes (meaning we were looking for a qualified path but
- * found something that was badly-formed).
- */
-
-#define bool_t int
-
-char *
-skip_over_fieldname(char *name, bool_t slash_okay)
-{
- char *p = name;
- char *last_p;
- unicode ch;
- unicode last_ch = 0;
-
- ch = *p;
- if (ch == (ch & 0x7F))
- ++p;
- else
- ch = next_utf2unicode(&p);
- if (($$Lookup(ch) & $$bitJavaStart) == 0)
- return 0;
- for (;;) {
- last_p = p;
- last_ch = ch;
- ch = *p;
- if (ch == (ch & 0x7F))
- ++p;
- else
- ch = next_utf2unicode(&p);
- if (($$Lookup(ch) & $$bitJavaPart) == 0) {
- if (ch == '/' && slash_okay) {
- if (last_ch == '/')
- return 0;
- }
- else {
- return last_p;
- }
- }
- }
-}
-
-void main() {
- int j;
- for (j = 0; j < (1 << 16); j++) {
- int q = $$Lookup(j);
- printf("%04x%s%s\n", j,
- (q & $$bitJavaStart ? " Start" : ""),
- (q & $$bitJavaPart ? " Part" : ""));
- }
-}
diff --git a/jdk/make/tools/GenerateCharacter/Makefile b/jdk/make/tools/GenerateCharacter/Makefile
deleted file mode 100644
index dd22995..0000000
--- a/jdk/make/tools/GenerateCharacter/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the generatecharacter tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.generatecharacter
-PRODUCT = tools
-PROGRAM = generatecharacter
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/GenerateCharacter.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/GenerateCharacter/check_class.c.template b/jdk/make/tools/GenerateCharacter/check_class.c.template
deleted file mode 100644
index 445fc09..0000000
--- a/jdk/make/tools/GenerateCharacter/check_class.c.template
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* This file was generated AUTOMATICALLY from a template file Wed Jun 17 10:43:47 PDT 1998 */
-
-/*-
- * code for verifying the date in a ClassClass structure for internal
- * consistency.
- */
-
-#include <ctype.h>
-
-#include "oobj.h"
-#include "interpreter.h"
-#include "bool.h"
-#include "utf.h"
-#include "tree.h"
-
-extern bool_t verify_class_codes(ClassClass *cb);
-
-static bool_t verify_constant_pool(ClassClass *cb);
-
-static bool_t is_legal_fieldname(ClassClass *cb, char *name, int type);
-static bool_t is_legal_method_signature(ClassClass *cb, char *name, char *signature);
-static bool_t is_legal_field_signature(ClassClass *cb, char *name, char *signature);
-
-static char *skip_over_fieldname(char *name, bool_t slash_okay);
-static char *skip_over_field_signature(char *name, bool_t void_okay);
-
-static void CCerror (ClassClass *cb, char *format, ...);
-
-
-/* Argument for is_legal_fieldname */
-enum { LegalClass, LegalField, LegalMethod };
-
-
-
-
-bool_t
-VerifyClass(ClassClass *cb)
-{
- bool_t result = TRUE;
- struct methodblock *mb;
- struct fieldblock *fb;
- int i;
- if (CCIs(cb, Verified))
- return TRUE;
- if (!verify_constant_pool(cb))
- return FALSE;
- /* Make sure all the method names and signatures are okay */
- for (i = cbMethodsCount(cb), mb = cbMethods(cb); --i >= 0; mb++) {
- char *name = mb->fb.name;
- char *signature = mb->fb.signature;
- if (! (is_legal_fieldname(cb, name, LegalMethod) &&
- is_legal_method_signature(cb, name, signature)))
- result = FALSE;
- }
- /* Make sure all the field names and signatures are okay */
- for (i = cbFieldsCount(cb), fb = cbFields(cb); --i >= 0; fb++) {
- if (! (is_legal_fieldname(cb, fb->name, LegalField) &&
- is_legal_field_signature(cb, fb->name, fb->signature)))
- result = FALSE;
- }
- /* Make sure we are not overriding any final methods or classes*/
- if (cbIsInterface(cb)) {
- struct methodblock *mb;
- if ((cbSuperclass(cb) == NULL) ||
- (cbSuperclass(cb) != classJavaLangObject)) {
- CCerror(cb, "Interface %s has bad superclass", cbName(cb));
- result = FALSE;
- }
- for (i = cbMethodsCount(cb), mb = cbMethods(cb); --i >= 0; mb++) {
- if (mb->fb.access & ACC_STATIC) {
- if (mb->fb.name[0] != '<') {
- /* Only internal methods can be static */
- CCerror(cb, "Illegal static method %s in interface %s",
- mb->fb.name, cbName(cb));
- result = FALSE;
- }
- }
- }
- } else if (cbSuperclass(cb)) {
- ClassClass *super_cb;
- unsigned bitvector_size = (unsigned)(cbMethodTableSize(cb) + 31) >> 5;
- long *bitvector = sysCalloc(bitvector_size, sizeof(long));
- for (super_cb = cbSuperclass(cb); ; super_cb = cbSuperclass(super_cb)) {
- if (cbAccess(super_cb) & ACC_FINAL) {
- CCerror(cb, "Class %s is subclass of final class %s",
- cbName(cb), cbName(super_cb));
- result = FALSE;
- }
- mb = cbMethods(super_cb);
- for (i = cbMethodsCount(super_cb); --i >= 0; mb++) {
- if (mb->fb.access & ACC_FINAL) {
- unsigned offset = mb->fb.u.offset;
- bitvector[offset >> 5] |= (1 << (offset & 0x1F));
- }
- }
- if (cbSuperclass(super_cb) == NULL) break;
- }
- for (i = cbMethodsCount(cb), mb = cbMethods(cb); --i >= 0; mb++) {
- unsigned offset = mb->fb.u.offset;
- if ((offset > 0)
- && bitvector[offset >> 5] & (1 << (offset & 0x1F))) {
- CCerror(cb, "Class %s overrides final method %s.%s",
- cbName(cb), mb->fb.name, mb->fb.signature);
- result = FALSE;
- }
- }
- sysFree(bitvector);
- } else if (cb != classJavaLangObject) {
- CCerror(cb, "Class %s does not have superclass", cbName(cb));
- result = FALSE;
- }
-
- if (result)
- result = verify_class_codes(cb);
- if (result)
- CCSet(cb, Verified);
- return result;
-}
-
-
-static bool_t
-verify_constant_pool(ClassClass *cb)
-{
- union cp_item_type *cp = cbConstantPool(cb);
- long cp_count = cbConstantPoolCount(cb);
- unsigned char *type_table;
- int i, type;
-
- const int utf8_resolved = (CONSTANT_Utf8 | CONSTANT_POOL_ENTRY_RESOLVED);
-
- if (cp_count == 0) /* Primitive classes */
- return TRUE;
- type_table = cp[CONSTANT_POOL_TYPE_TABLE_INDEX].type;
- /* Let's make two quick passes over the constant pool. The first one
- * checks that everything is of the right type. */
- for (i = 1; i < cp_count; i++) {
- switch(type = type_table[i]) {
- case CONSTANT_String:
- case CONSTANT_Class: {
- int index = cp[i].i;
- if ( (index < 1)
- || (index >= cp_count)
- || (type_table[index] != utf8_resolved)) {
- CCerror(cb, "Bad index in constant pool #%d", i);
- return FALSE;
- }
- break;
- }
-
- case CONSTANT_String | CONSTANT_POOL_ENTRY_RESOLVED:
- /* This can only happen if a string is the "initial" value of
- * some final static String. We assume that the checking has
- * already been done.
- */
- break;
-
- case CONSTANT_Fieldref:
- case CONSTANT_Methodref:
- case CONSTANT_InterfaceMethodref:
- case CONSTANT_NameAndType: {
- unsigned index = (unsigned)(cp[i].i);
- int key1 = index >> 16;
- int key2 = index & 0xFFFF;
- if (key1 < 1 || key1 >= cp_count
- || key2 < 1 || key2 >= cp_count) {
- CCerror(cb, "Bad index in constant pool #%d", i);
- return FALSE;
- }
- if (type == CONSTANT_NameAndType) {
- if ( (type_table[key1] != utf8_resolved)
- || (type_table[key2] != utf8_resolved)) {
- CCerror(cb, "Bad index in constant pool.");
- return FALSE;
- }
- } else {
- if ( ((type_table[key1] & CONSTANT_POOL_ENTRY_TYPEMASK)
- != CONSTANT_Class)
- || ((type_table[key2] != CONSTANT_NameAndType))) {
- CCerror(cb, "Bad index in constant pool #%d", i);
- return FALSE;
- }
- }
- break;
- }
-
- case CONSTANT_Fieldref | CONSTANT_POOL_ENTRY_RESOLVED:
- case CONSTANT_Methodref | CONSTANT_POOL_ENTRY_RESOLVED:
- case CONSTANT_InterfaceMethodref | CONSTANT_POOL_ENTRY_RESOLVED:
- case CONSTANT_NameAndType | CONSTANT_POOL_ENTRY_RESOLVED:
- CCerror(cb, "Improperly resolved constant pool #%d", i);
- return FALSE;
-
-
- case CONSTANT_Class | CONSTANT_POOL_ENTRY_RESOLVED:
- case CONSTANT_Utf8 | CONSTANT_POOL_ENTRY_RESOLVED:
- case CONSTANT_Integer | CONSTANT_POOL_ENTRY_RESOLVED:
- case CONSTANT_Float | CONSTANT_POOL_ENTRY_RESOLVED:
- break;
-
- case CONSTANT_Long | CONSTANT_POOL_ENTRY_RESOLVED:
- case CONSTANT_Double | CONSTANT_POOL_ENTRY_RESOLVED:
- if ((i + 1 >= cp_count) ||
- (type_table[i + 1] != CONSTANT_POOL_ENTRY_RESOLVED)) {
- CCerror(cb, "Improper constant pool long/double #%d", i);
- return FALSE;
- } else {
- i++;
- break;
- }
-
- case CONSTANT_Integer:
- case CONSTANT_Float:
- case CONSTANT_Long:
- case CONSTANT_Double:
- case CONSTANT_Utf8:
- CCerror(cb, "Improperly unresolved constant pool #%d", i);
- return FALSE;
-
-
- default:
- CCerror(cb, "Illegal constant pool type at #%d", i);
- return FALSE;
-
-
- }
- }
- for (i = 1; i < cp_count; i++) {
- switch(type = type_table[i]) {
- case CONSTANT_Class: {
- int index = cp[i].i;
- if (!is_legal_fieldname(cb, cp[index].cp, LegalClass))
- return FALSE;
- break;
- }
-
- case CONSTANT_Fieldref:
- case CONSTANT_Methodref:
- case CONSTANT_InterfaceMethodref: {
- unsigned index = (unsigned)(cp[i].i);
- int name_type_index = index & 0xFFFF;
- int name_type_key = cp[name_type_index].i;
- int name_index = name_type_key >> 16;
- int signature_index = name_type_key & 0xFFFF;
- char *name = cp[name_index].cp;
- char *signature = cp[signature_index].cp;
-
- if (type == CONSTANT_Fieldref) {
- if (! (is_legal_fieldname(cb, name, LegalField) &&
- is_legal_field_signature(cb, name, signature)))
- return FALSE;
- } else {
- if (! (is_legal_fieldname(cb, name, LegalMethod) &&
- is_legal_method_signature(cb, name, signature)))
- return FALSE;
- }
- break;
- }
- }
- }
- return TRUE;
-}
-
-
-/* Return true if the entire second argument consists of a legal fieldname
- * (or classname, if the third argument is LegalClass).
- */
-
-static bool_t
-is_legal_fieldname(ClassClass *cb, char *name, int type)
-{
- bool_t result;
- if (name[0] == '<') {
- result = (type == LegalMethod) &&
- ((strcmp(name, "<init>") == 0) ||
- (strcmp(name, "<clinit>") == 0));
- } else {
- char *p;
- if (type == LegalClass && name[0] == SIGNATURE_ARRAY) {
- p = skip_over_field_signature(name, FALSE);
- } else {
- p = skip_over_fieldname(name, type == LegalClass);
- }
- result = (p != 0 && p[0] == '\0');
- }
- if (!result) {
- char *thing = (type == LegalField) ? "Field"
- : (type == LegalMethod) ? "Method" : "Class";
-
- CCerror(cb, "Illegal %s name \"%s\"", thing, name);
- return FALSE;
- } else {
- return TRUE;
-
- }
-}
-
-/* Return true if the entire string consists of a legal field signature */
-static bool_t
-is_legal_field_signature(ClassClass *cb, char *fieldname, char *signature)
-{
- char *p = skip_over_field_signature(signature, FALSE);
- if (p != 0 && p[0] == '\0') {
- return TRUE;
- } else {
- CCerror(cb, "Field \"%s\" has illegal signature \"%s\"",
- fieldname, signature);
- return FALSE;
- }
-}
-
-
-static bool_t
-is_legal_method_signature(ClassClass *cb, char *methodname, char *signature)
-{
- char *p = signature;
- char *next_p;
- /* The first character must be a '(' */
- if (*p++ == SIGNATURE_FUNC) {
- /* Skip over however many legal field signatures there are */
- while ((next_p = skip_over_field_signature(p, FALSE)) != 0)
- p = next_p;
- /* The first non-signature thing better be a ')' */
- if (*p++ == SIGNATURE_ENDFUNC) {
- if (methodname[0] == '<') {
- /* All internal methods must return void */
- if ((p[0] == SIGNATURE_VOID) && (p[1] == '\0'))
- return TRUE;
- } else {
- /* Now, we better just have a return value. */
- next_p = skip_over_field_signature(p, TRUE);
- if (next_p && next_p[0] == '\0')
- return TRUE;
- }
- }
- }
- CCerror(cb, "Method \"%s\" has illegal signature \"%s\"",
- methodname, signature);
- return FALSE;
-}
-
- $$Tables
-
-/*
- * This code mirrors Character.isJavaIdentifierStart. It determines whether
- * the specified character is a legal start of a Java identifier as per JLS.
- *
- * The parameter ch is the character to be tested; return 1 if the
- * character is a letter, 0 otherwise.
- */
-#define isJavaIdentifierStart(ch) ($$Lookup(ch) & $$maskIsJavaIdentifierStart)
-
-/*
- * This code mirrors Character.isJavaIdentifierPart. It determines whether
- * the specified character is a legal part of a Java identifier as per JLS.
- *
- * The parameter ch is the character to be tested; return 1 if the
- * character is a digit, 0 otherwise.
- */
-#define isJavaIdentifierPart(ch) ($$Lookup(ch) & $$maskIsJavaIdentifierPart)
-
-/* Take pointer to a string. Skip over the longest part of the string that
- * could be taken as a fieldname. Allow '/' if slash_okay is TRUE.
- *
- * Return a pointer to just past the fieldname. Return NULL if no fieldname
- * at all was found, or in the case of slash_okay being true, we saw
- * consecutive slashes (meaning we were looking for a qualified path but
- * found something that was badly-formed).
- */
-static char *
-skip_over_fieldname(char *name, bool_t slash_okay)
-{
- bool_t first;
- char *p;
- unicode last_ch = 0;
- for (p = name, first = TRUE; ; first = FALSE) {
- char *old_p = p;
- unicode ch = next_utf2unicode(&p);
- if (isJavaIdentifierStart(ch) || (!first && isJavaIdentifierPart(ch))
- || (slash_okay && ch == '/' && !first)
- || ch == '_' || ch == '$') {
- if (ch == '/' && last_ch == '/') {
- return 0; /* Don't permit consecutive slashes */
- } else {
- last_ch = ch;
- }
- } else {
- return first ? 0 : old_p;
- }
- }
-}
-
-/* Take pointer to a string. Skip over the longest part of the string that
- * could be taken as a field signature. Allow "void" if void_okay.
- *
- * Return a pointer to just past the signature. Return NULL if no legal
- * signature is found.
- */
-
-static char *
-skip_over_field_signature(char *name, bool_t void_okay)
-{
- for (;;) {
- switch (name[0]) {
- case SIGNATURE_VOID:
- if (!void_okay) return 0;
- /* FALL THROUGH */
- case SIGNATURE_BOOLEAN:
- case SIGNATURE_BYTE:
- case SIGNATURE_CHAR:
- case SIGNATURE_SHORT:
- case SIGNATURE_INT:
- case SIGNATURE_FLOAT:
- case SIGNATURE_LONG:
- case SIGNATURE_DOUBLE:
- return name + 1;
-
- case SIGNATURE_CLASS: {
- /* Skip over the classname, if one is there. */
- char *p = skip_over_fieldname(name + 1, TRUE);
- /* The next character better be a semicolon. */
- if (p && p[0] == ';')
- return p + 1;
- return 0;
- }
-
- case SIGNATURE_ARRAY:
- /* The rest of what's there better be a legal signature. */
- name++;
- void_okay = FALSE;
- break;
-
- default:
- return 0;
- }
- }
-}
-
-
-static void
-CCerror (ClassClass *cb, char *format, ...)
-{
- if (verbose) {
- va_list args;
- jio_fprintf(stderr, "VERIFIER CLASS ERROR %s:\n", cbName(cb));
- va_start(args, format);
- jio_vfprintf(stderr, format, args);
- va_end(args);
- jio_fprintf(stderr, "\n");
- }
-}
-
-/* For use from outside the file. Determine if the specified name is legal
- * UTF name for a classname.
- *
- * Note that this routine expects the internal form of qualified classes:
- * the dots should have been replaced by slashes.
- */
-bool_t IsLegalClassname(char *name, bool_t allowArrayClass)
-{
- char *p;
- if (name[0] == SIGNATURE_ARRAY) {
- if (!allowArrayClass) {
- return FALSE;
- } else {
- /* Everything that's left better be a field signature */
- p = skip_over_field_signature(name, FALSE);
- }
- } else {
- /* skip over the fieldname. Slashes are okay */
- p = skip_over_fieldname(name, TRUE);
- }
- return (p != 0 && p[0] == '\0');
-}
diff --git a/jdk/make/tools/Makefile b/jdk/make/tools/Makefile
deleted file mode 100644
index d6724f7..0000000
--- a/jdk/make/tools/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Create all the build tools
-#
-
-BUILDDIR = ..
-
-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true JAVAC_WARNINGS_FATAL=true
-include $(BUILDDIR)/common/Defs.gmk
-
-# Note: freetypecheck is built by Sanity.gmk if needed
-SUBDIRS = \
- addjsum \
- addtorestrictedpkgs \
- buildmetaindex \
- cldrconverter \
- commentchecker \
- compile_font_config \
- compile_properties \
- dir_diff \
- dtdbuilder \
- generate_break_iterator \
- GenerateCharacter \
- generatecurrencydata \
- hasher_classes \
- jarreorder \
- jarsplit \
- jdwpgen \
- makeclasslist \
- strip_properties \
- spp \
- tzdb \
- CharsetMapping
-
-ifndef DISABLE_NIMBUS
- SUBDIRS += generate_nimbus
-endif
-
-ifeq ($(PLATFORM), solaris)
- # temporary tools to work around gobjcopy bugs
- SUBDIRS += add_gnu_debuglink fix_empty_sec_hdr_flags
-endif
-
-include $(BUILDDIR)/common/Subdirs.gmk
-
-all build clean clobber::
- $(SUBDIRS-loop)
-
-clean clobber::
- $(RM) -r $(BUILDTOOLCLASSDIR)
- $(RM) -r $(BUILDTOOLJARDIR)
- $(RM) -r $(BUILDTOOLBINDIR)
-
diff --git a/jdk/make/tools/README.txt b/jdk/make/tools/README.txt
deleted file mode 100644
index 6377e5d..0000000
--- a/jdk/make/tools/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-The build tools are generally tools written in java that are used to build
-the jdk or provide help in working with the jdk.
-
-They are all built with the BOOTDIR javac and run with the BOOTDIR java.
-
-They need only be built once.
-
diff --git a/jdk/make/tools/add_gnu_debuglink/Makefile b/jdk/make/tools/add_gnu_debuglink/Makefile
deleted file mode 100644
index 37b53cf..0000000
--- a/jdk/make/tools/add_gnu_debuglink/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-
-# Rules to build add_gnu_debuglink, used by various Makefiles on Solaris
-
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-
-# Default name
-PROGRAM = add_gnu_debuglink
-ADD_GNU_DEBUGLINK_PROG = $(ABS_BUILDTOOLBINDIR)/$(PROGRAM)
-
-ADD_GNU_DEBUGLINK_SRC = add_gnu_debuglink.c
-ADD_GNU_DEBUGLINK_FLAGS =
-LIBS_ADD_GNU_DEBUGLINK += -lelf
-
-all: $(ADD_GNU_DEBUGLINK)
-
-$(ADD_GNU_DEBUGLINK_PROG): $(ADD_GNU_DEBUGLINK_SRC)
- $(MKDIR) -p $(BUILDTOOLBINDIR)
- $(CC) -g -o $@ $< $(ADD_GNU_DEBUGLINK_FLAGS) $(LIBS_ADD_GNU_DEBUGLINK)
-
-clean::
- $(RM) $(ADD_GNU_DEBUGLINK_PROG)
-
diff --git a/jdk/make/tools/addjsum/Makefile b/jdk/make/tools/addjsum/Makefile
deleted file mode 100644
index 7d760d4..0000000
--- a/jdk/make/tools/addjsum/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the addjsum tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.addjsum
-PRODUCT = tools
-PROGRAM = addjsum
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/AddJsum.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/addtorestrictedpkgs/Makefile b/jdk/make/tools/addtorestrictedpkgs/Makefile
deleted file mode 100644
index 53922d5..0000000
--- a/jdk/make/tools/addtorestrictedpkgs/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the addtorestrictedpkgs tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.addtorestrictedpkgs
-PRODUCT = tools
-PROGRAM = addtorestrictedpkgs
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/AddToRestrictedPkgs.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/buildmetaindex/Makefile b/jdk/make/tools/buildmetaindex/Makefile
deleted file mode 100644
index 5ff59db..0000000
--- a/jdk/make/tools/buildmetaindex/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the buildmetaindex tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.buildmetaindex
-PRODUCT = tools
-PROGRAM = buildmetaindex
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/BuildMetaIndex.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/cldrconverter/Makefile b/jdk/make/tools/cldrconverter/Makefile
deleted file mode 100644
index 178096e..0000000
--- a/jdk/make/tools/cldrconverter/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the CLDRConverter tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.cldrconverter
-PRODUCT = cldrconverter
-PROGRAM = cldrconverter
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/CLDRConverter.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/commentchecker/Makefile b/jdk/make/tools/commentchecker/Makefile
deleted file mode 100644
index c32189c..0000000
--- a/jdk/make/tools/commentchecker/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the commentchecker tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.commentchecker
-PRODUCT = tools
-PROGRAM = commentchecker
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/CommentChecker.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/compile_font_config/Makefile b/jdk/make/tools/compile_font_config/Makefile
deleted file mode 100644
index 92a7773..0000000
--- a/jdk/make/tools/compile_font_config/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the compilefontconfig tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.compilefontconfig
-PRODUCT = tools
-PROGRAM = compilefontconfig
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/CompileFontConfig.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/compile_properties/Makefile b/jdk/make/tools/compile_properties/Makefile
deleted file mode 100644
index 14b2fe9..0000000
--- a/jdk/make/tools/compile_properties/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the compileproperties tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.compileproperties
-PRODUCT = tools
-PROGRAM = compileproperties
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/CompileProperties.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/dir_diff/Makefile b/jdk/make/tools/dir_diff/Makefile
deleted file mode 100644
index f49d116..0000000
--- a/jdk/make/tools/dir_diff/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the dirdiff tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.dirdiff
-PRODUCT = tools
-PROGRAM = dirdiff
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/DirDiff.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/dtdbuilder/Makefile b/jdk/make/tools/dtdbuilder/Makefile
deleted file mode 100644
index 28d2335..0000000
--- a/jdk/make/tools/dtdbuilder/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the dtdbuilder tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.dtdbuilder
-PRODUCT = tools
-PROGRAM = dtdbuilder
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/DTDBuilder.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/fix_empty_sec_hdr_flags/Makefile b/jdk/make/tools/fix_empty_sec_hdr_flags/Makefile
deleted file mode 100644
index 0ed6b43..0000000
--- a/jdk/make/tools/fix_empty_sec_hdr_flags/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-
-# Rules to build fix_empty_sec_hdr_flags, used by various Makefiles on Solaris
-
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-
-# Default name
-PROGRAM = fix_empty_sec_hdr_flags
-FIX_EMPTY_SEC_HDR_FLAGS_PROG = $(ABS_BUILDTOOLBINDIR)/$(PROGRAM)
-
-FIX_EMPTY_SEC_HDR_FLAGS_SRC = fix_empty_sec_hdr_flags.c
-FIX_EMPTY_SEC_HDR_FLAGS_FLAGS =
-LIBS_FIX_EMPTY_SEC_HDR_FLAGS += -lelf
-
-all: $(FIX_EMPTY_SEC_HDR_FLAGS)
-
-$(FIX_EMPTY_SEC_HDR_FLAGS_PROG): $(FIX_EMPTY_SEC_HDR_FLAGS_SRC)
- $(MKDIR) -p $(BUILDTOOLBINDIR)
- $(CC) -g -o $@ $< $(FIX_EMPTY_SEC_HDR_FLAGS_FLAGS) $(LIBS_FIX_EMPTY_SEC_HDR_FLAGS)
-
-clean::
- $(RM) $(FIX_EMPTY_SEC_HDR_FLAGS_PROG)
-
diff --git a/jdk/make/tools/freetypecheck/Makefile b/jdk/make/tools/freetypecheck/Makefile
deleted file mode 100644
index bbf0ae8..0000000
--- a/jdk/make/tools/freetypecheck/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-
-# Builds and runs test program for freetype sanity check.
-
-BUILDDIR = ../..
-include $(BUILDDIR)/common/Defs.gmk
-
-# Default name
-PROGRAM = freetype_versioncheck
-FT_OBJ = $(BUILDTOOLBINDIR)/$(PROGRAM).$(OBJECT_SUFFIX)
-FT_TEST = $(BUILDTOOLBINDIR)/$(PROGRAM)$(EXE_SUFFIX)
-
-# Used on openjdk only
-ifeq ($(OPENJDK),true)
-
-# Start with CFLAGS (which gets us the required -xarch setting on solaris)
-ifeq ($(PLATFORM), windows)
- FT_OPTIONS = -nologo -c
- FREETYPE_DLL = $(FREETYPE_LIB_PATH)/freetype.dll
- FT_LD_OPTIONS = $(FREETYPE_LIB_PATH)/freetype.lib
- ifdef MT
- FT_LD_OPTIONS += -manifest
- endif
-else
- FT_OPTIONS = $(CFLAGS)
- FT_LD_OPTIONS = -L$(FREETYPE_LIB_PATH)
- # Add runtime lib search path to ensure test will be runnable
- ifeq ($(PLATFORM), solaris)
- FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) -lfreetype
- else
- ifeq ($(PLATFORM), macosx)
- FT_LD_OPTIONS += -lfreetype -lz
- else # linux
- FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype
- endif
- endif
-endif
-FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
-FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)/freetype2
-FT_OPTIONS += -DREQUIRED_FREETYPE_VERSION=$(REQUIRED_FREETYPE_VERSION)
-FT_LD_OPTIONS += $(LFLAGS_$(COMPILER_VERSION))
-
-# Create test program
-all: $(FT_TEST)
- $(FT_TEST)
-
-# On windows we need to copy dll to test dir to ensure it will be found
-# at runtime
-$(FT_TEST): freetypecheck.c
- $(prep-target)
-ifeq ($(PLATFORM), windows)
- $(CC) $(FT_OPTIONS) $(CC_OBJECT_OUTPUT_FLAG)$(FT_OBJ) $<
- $(LINK) $(FT_LD_OPTIONS) -OUT:$(FT_TEST) $(FT_OBJ)
- $(CP) $(FREETYPE_DLL) $(@D)/
- ifdef MT
- $(CP) $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL) $(@D)/
- $(MT) -manifest $(FT_TEST).manifest -outputresource:$(FT_TEST);#1
- endif
-else
- @$(CC) $(FT_OPTIONS) -o $@ $< $(FT_LD_OPTIONS)
-endif
-
-else
-
-# Inform user this is openjdk only
-all:
- @$(ECHO) "The freetype files are only used with OpenJDK"
-
-endif
-
-clean::
- $(RM) $(FT_TEST)
-
diff --git a/jdk/make/tools/freetypecheck/freetypecheck.c b/jdk/make/tools/freetypecheck/freetypecheck.c
deleted file mode 100644
index d91a0ad..0000000
--- a/jdk/make/tools/freetypecheck/freetypecheck.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* Test program for freetype sanity check.
- Prints "Failed" messages to STDOUT if check fails. */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "ft2build.h"
-#include FT_FREETYPE_H
-
-#ifdef _MSC_VER
-#if _MSC_VER > 1400 && _MSC_VER < 1600
-
-/*
- * When building for Microsoft Windows, your program has a dependency
- * on msvcr??.dll.
- *
- * When using Visual Studio 2005 or later, that must be recorded in
- * the <program>.exe.manifest file.
- *
- * Reference:
- * C:/Program Files/Microsoft SDKs/Windows/v6.1/include/crtdefs.h
- */
-#include <crtassem.h>
-#ifdef _M_IX86
-
-#pragma comment(linker,"/manifestdependency:\"type='win32' " \
- "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".CRT' " \
- "version='" _CRT_ASSEMBLY_VERSION "' " \
- "processorArchitecture='x86' " \
- "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
-
-#endif /* _M_IX86 */
-
-//This may not be necessary yet for the Windows 64-bit build, but it
-//will be when that build environment is updated. Need to test to see
-//if it is harmless:
-#ifdef _M_AMD64
-
-#pragma comment(linker,"/manifestdependency:\"type='win32' " \
- "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".CRT' " \
- "version='" _CRT_ASSEMBLY_VERSION "' " \
- "processorArchitecture='amd64' " \
- "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
-
-#endif /* _M_AMD64 */
-#endif /* _MSC_VER > 1400 && _MSC_VER < 1600 */
-#endif /* _MSC_VER */
-
-#define QUOTEMACRO(x) QUOTEME(x)
-#define QUOTEME(x) #x
-
-int main(int argc, char** argv) {
- char v[50];
- FT_Int major, minor, patch;
- FT_Library library;
- sprintf(v, "%d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
-
- printf("Required version of freetype: %s\n",
- QUOTEMACRO(REQUIRED_FREETYPE_VERSION));
-
- printf("Detected freetype headers: %s\n", v);
- if (strcmp(v, QUOTEMACRO(REQUIRED_FREETYPE_VERSION)) < 0) {
- printf("Failed: headers are too old.\n");
- }
-
- FT_Init_FreeType(&library);
- FT_Library_Version(library, &major, &minor, &patch);
- sprintf(v, "%d.%d.%d", major, minor, patch);
-
- printf("Detected freetype library: %s\n", v);
- if (strcmp(v, QUOTEMACRO(REQUIRED_FREETYPE_VERSION)) < 0) {
- printf("Failed: too old library.\n");
- }
-
- return 0;
-}
diff --git a/jdk/make/tools/generate_break_iterator/Makefile b/jdk/make/tools/generate_break_iterator/Makefile
deleted file mode 100644
index 1b3f277..0000000
--- a/jdk/make/tools/generate_break_iterator/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the generatebreakiteratordata tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.generatebreakiteratordata
-PRODUCT = tools
-PROGRAM = generatebreakiteratordata
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/GenerateBreakIteratorData.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/generate_nimbus/Makefile b/jdk/make/tools/generate_nimbus/Makefile
deleted file mode 100644
index c53b807..0000000
--- a/jdk/make/tools/generate_nimbus/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the Nimbus generator
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.generatenimbus
-PRODUCT = tools
-PROGRAM = generatenimbus
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/Generator.java
-
-
-#
-# Files
-#
-
-SOURCE_FILES = Generator.java \
- ObjectFactory.java \
- Paint.java \
- SynthModel.java \
- UIDefault.java \
- UIStyle.java
-TEMPLATE_FILES = Defaults.template \
- PainterImpl.template \
- StateImpl.template
-TEMPLATE_DEST = $(BUILDTOOLCLASSDIR)/$(PKGDIR)/resources
-
-
-#
-# Rules
-#
-
-all: $(TEMPLATE_DEST) $(BUILDTOOL_JAR_FILE)
-
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
-$(TEMPLATE_DEST): $(TEMPLATE_FILES:%=$(SHARE_SRC)/classes/javax/swing/plaf/nimbus/%)
- $(MKDIR) -p $@
- $(RM) $(TEMPLATE_FILES:%=$@/%)
- $(CP) $^ $@
-
-BUILDTOOL_MAIN_SOURCE_FILE = $(SOURCE_FILES:%=$(BUILDTOOL_SOURCE_ROOT)/$(PKGDIR)/%)
-
-clean clobber::
- $(RM) -r $(TEMPLATE_DEST)
diff --git a/jdk/make/tools/generatecurrencydata/Makefile b/jdk/make/tools/generatecurrencydata/Makefile
deleted file mode 100644
index 502aa80..0000000
--- a/jdk/make/tools/generatecurrencydata/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the generatecurrencydata tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.generatecurrencydata
-PRODUCT = tools
-PROGRAM = generatecurrencydata
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/GenerateCurrencyData.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/hasher_classes/Makefile b/jdk/make/tools/hasher_classes/Makefile
deleted file mode 100644
index 374e4ad..0000000
--- a/jdk/make/tools/hasher_classes/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the hasher tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.hasher
-PRODUCT = tools
-PROGRAM = hasher
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/Hasher.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/jarreorder/Makefile b/jdk/make/tools/jarreorder/Makefile
deleted file mode 100644
index a0504e2..0000000
--- a/jdk/make/tools/jarreorder/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the jarreorder tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.jarreorder
-PRODUCT = tools
-PROGRAM = jarreorder
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/JarReorder.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/jarsplit/Makefile b/jdk/make/tools/jarsplit/Makefile
deleted file mode 100644
index 7bcff75..0000000
--- a/jdk/make/tools/jarsplit/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the jarsplit tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.jarsplit
-PRODUCT = tools
-PROGRAM = jarsplit
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/JarSplit.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/jdwpgen/Makefile b/jdk/make/tools/jdwpgen/Makefile
deleted file mode 100644
index 59cf303..0000000
--- a/jdk/make/tools/jdwpgen/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the jdwpgen tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.jdwpgen
-PRODUCT = jpda
-PROGRAM = jdwpgen
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/Main.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/makeclasslist/Makefile b/jdk/make/tools/makeclasslist/Makefile
deleted file mode 100644
index 5c8d101..0000000
--- a/jdk/make/tools/makeclasslist/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the makeclasslist tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.makeclasslist
-PRODUCT = tools
-PROGRAM = makeclasslist
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/MakeClasslist.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/msys_build_scripts/dospath.sh b/jdk/make/tools/msys_build_scripts/dospath.sh
deleted file mode 100644
index d674aba..0000000
--- a/jdk/make/tools/msys_build_scripts/dospath.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# A shell script which converts its first argument, which must be an existing
-# path name, into a DOS (aka 8.3) path name. If the path is a file, only the
-# directory part of the whole path will be converted.
-# This shell script executes the Visual Basic helper script 'dospath.vbs'
-# which must be located in the same directory as this script itself.
-# The Visual Basic script will be invoked trough the "Windows Script Host"
-# which is available by default on Windows since Windows 98.
-
-pushd `dirname "$0"` > /dev/null
-ABS_PATH=`pwd`
-popd > /dev/null
-if [ -d "$1" ]; then
- echo `cd "$1" && cscript.exe -nologo $ABS_PATH/dospath.vbs`;
-elif [ -f "$1" ]; then
- DIR=`dirname "$1"`;
- echo `cd "$DIR" && cscript.exe -nologo $ABS_PATH/dospath.vbs`\\`basename "$1"`;
-fi
diff --git a/jdk/make/tools/msys_build_scripts/dospath.vbs b/jdk/make/tools/msys_build_scripts/dospath.vbs
deleted file mode 100644
index 55ff34b..0000000
--- a/jdk/make/tools/msys_build_scripts/dospath.vbs
+++ /dev/null
@@ -1,34 +0,0 @@
-'
-' Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'
-' This code is free software; you can redistribute it and/or modify it
-' under the terms of the GNU General Public License version 2 only, as
-' published by the Free Software Foundation. Oracle designates this
-' particular file as subject to the "Classpath" exception as provided
-' by Oracle in the LICENSE file that accompanied this code.
-'
-' This code is distributed in the hope that it will be useful, but WITHOUT
-' ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-' FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-' version 2 for more details (a copy is included in the LICENSE file that
-' accompanied this code).
-'
-' You should have received a copy of the GNU General Public License version
-' 2 along with this work; if not, write to the Free Software Foundation,
-' Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-'
-' Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-' or visit www.oracle.com if you need additional information or have any
-' questions.
-'
-
-'
-' Visual Basic Script which returns the DOS (aka 8.3) filename of the current
-' directory.
-' Only called from 'dospath.sh' during a Windows build under MinGW/MSYS.
-'
-
-Set fso=CreateObject("Scripting.FileSystemObject")
-Set path = fso.GetFolder(".")
-WScript.Echo path.ShortPath
diff --git a/jdk/make/tools/spp/Makefile b/jdk/make/tools/spp/Makefile
deleted file mode 100644
index 3129f31..0000000
--- a/jdk/make/tools/spp/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for build spp tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.spp
-PRODUCT = tools
-PROGRAM = spp
-include $(BUILDDIR)/common/Defs.gmk
-
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/Spp.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
-
diff --git a/jdk/make/tools/src/build/tools/jarsplit/JarSplit.java b/jdk/make/tools/src/build/tools/jarsplit/JarSplit.java
deleted file mode 100644
index 4b3ece7..0000000
--- a/jdk/make/tools/src/build/tools/jarsplit/JarSplit.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.jarsplit;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.FileOutputStream;
-import java.util.Vector;
-import java.lang.reflect.Array;
-
-/*
- * This class is a utility class to take a file list and split them into
- * class file list and non-class file (such as image, audio file) list.
- */
-public class JarSplit {
- /* classlist[0] contains class file list
- * classlist[1] contains non-class file list
- */
- @SuppressWarnings({ "unchecked", "rawtypes" })
- private static Vector<String>[] classlist = new Vector[2];
-
- /* The 2 class list name passed as arguments. */
- private static String[] fileNamelist = new String[2];
-
- private static void printUsage() {
- String help =
- "Usage: java JarSplit classlist -o <class file list> <non-class file list> \n"
- + " This class takes a class list generated by JarReorder or some other tools \n"
- + " and outputs two files which contain class file list and non-class file list.\n"
- + " Example: java JarSplit classlist -o classlist nonClasslist \n";
-
- System.err.println(help);
- System.exit(1);
- }
-
- public static void main(String[] args) {
-
- int arglen = args.length;
-
- if (arglen < 4 || !args[1].equals("-o")) {
- /* Print out the usage of this class. */
- printUsage();
- }
-
- for (int i = 0; i < 2; i++) {
- fileNamelist[i] = args[i + 2];
- classlist[i] = new Vector<String>();
- }
-
- if (generateClassLists(args[0]) == true) {
- writeClassListToOutput();
- }
- }
-
- /* This method takes the classlist and generate two lists.
- @param inFileName the name of the file containing a list
- of the class files and non-class files.
- @exception FileNotFoundException if the passed in file is not found
- IOException if there is any IO error
- */
- private static boolean generateClassLists(String inFileName) {
- BufferedReader br = null;
-
- try {
- br = new BufferedReader(new FileReader(inFileName));
- boolean match = false;
-
- while (true) {
- String line = null;
- line = br.readLine();
-
- if (line == null) {
- break;
- }
-
- /* Skip empty or comment lines. */
- if (line.length() == 0 ||
- line.charAt(0) == '#') {
- continue;
- }
-
- line = line.trim();
-
- if (!line.endsWith(".class")) {
- classlist[1].add(line); /* Add to class list. */
- } else {
- classlist[0].add(line); /* Add to non-class list. */
- }
- }
- br.close();
- } catch (FileNotFoundException e) {
- System.err.println("Can't find file \"" + inFileName + "\".");
- return false;
- } catch (IOException e) {
- e.printStackTrace();
- System.exit(2);
- }
-
- return true;
- }
-
- /* Helper method to write class list to the output file specified in the
- command.
- */
- private static void writeClassListToOutput() {
-
- try {
- for (int i = 0; i < fileNamelist.length; i++) {
- PrintStream out = new PrintStream(new FileOutputStream(fileNamelist[i]));
-
- for (int j = 0; j < classlist[i].size(); j++) {
- out.println(classlist[i].elementAt(j));
- }
-
- out.flush();
- out.close();
- }
- } catch ( FileNotFoundException e ) {
- System.err.println("Error: " + e.getMessage());
- e.printStackTrace(System.err);
- System.exit(3);
- }
- }
-}
diff --git a/jdk/make/tools/strip_properties/Makefile b/jdk/make/tools/strip_properties/Makefile
deleted file mode 100644
index 7c3a829..0000000
--- a/jdk/make/tools/strip_properties/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the stripproperties tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.stripproperties
-PRODUCT = tools
-PROGRAM = stripproperties
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/StripProperties.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/swing-beans/DocBeanInfo.java b/jdk/make/tools/swing-beans/DocBeanInfo.java
deleted file mode 100644
index 4c1669b..0000000
--- a/jdk/make/tools/swing-beans/DocBeanInfo.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.util.HashMap;
-
-/**
- * Class that holds information for populating a FeatureDescriptor. For the class,
- * This information represents the BeanDescriptor, for a property, it represents
- * a PropertyDescriptor.
- */
-public class DocBeanInfo {
-
- // Values of the BeanFlags
- public static final int BOUND = 1;
- public static final int EXPERT = 2;
- public static final int CONSTRAINED = 4;
- public static final int HIDDEN = 8;
- public static final int PREFERRED = 16 ;
-
- public String name;
- public int beanflags;
- public String desc;
- public String displayname;
- public String propertyeditorclass;
- public String customizerclass;
-
- public HashMap attribs;
- public HashMap enums;
-
- public DocBeanInfo(){}
-
- public DocBeanInfo(String p, int flags, String d,
- String displayname, String pec, String cc,
- HashMap attribs, HashMap enums) {
- this.name = p;
- this.beanflags = flags;
- this.desc = d;
- this.displayname = displayname;
- this.propertyeditorclass = pec;
- this.customizerclass = cc;
-
- this.attribs = attribs;
- this.enums = enums;
- }
-
- public String toString() {
- StringBuffer buffer = new StringBuffer("*****");
- buffer.append("\nProperty: " + name);
- buffer.append("\tDescription: " + desc);
- buffer.append("\nDisplayname: " + displayname);
- buffer.append("\nPropertyEditorClass: " + propertyeditorclass);
- buffer.append("\nCustomizerClass: " + customizerclass);
-
- if ((beanflags & BOUND) != 0)
- buffer.append("\nBound: true");
-
- if ((beanflags & EXPERT) != 0)
- buffer.append("\nExpert: true");
-
- if ((beanflags & CONSTRAINED) != 0)
- buffer.append("\nConstrained: true");
-
- if ((beanflags & HIDDEN) !=0)
- buffer.append("\nHidden: true");
-
- if ((beanflags & PREFERRED) !=0)
-
- if (attribs != null)
- buffer.append(attribs.toString());
-
- if (enums != null)
- buffer.append(enums.toString());
-
- return buffer.toString();
- }
-
-}
diff --git a/jdk/make/tools/swing-beans/GenDocletBeanInfo.java b/jdk/make/tools/swing-beans/GenDocletBeanInfo.java
deleted file mode 100644
index c498ee7..0000000
--- a/jdk/make/tools/swing-beans/GenDocletBeanInfo.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import com.sun.javadoc.ClassDoc;
-import com.sun.javadoc.MethodDoc;
-import com.sun.javadoc.RootDoc;
-import com.sun.javadoc.Tag;
-
-import java.beans.Introspector;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.HashMap;
-import java.util.StringTokenizer;
-
-/**
- * Properties supported and tag syntax:
- *
- * @beaninfo
- * bound: flag
- * constrained: flag
- * expert: flag
- * hidden: flag
- * preferred: flag
- * description: string
- * displayname: string
- * propertyeditorclass: string (with dots: foo.bar.MyPropertyEditor
- * customizerclass: string (w/dots: foo.bar.MyCustomizer)
- * attribute: key1 value1
- * attribute: key2 value2
- *
- * TODO: getValue and genDocletInfo needs some cleaning.
- *
- * @author Hans Muller
- * @author Rich Schiavi
- * @author Mark Davidson
- */
-public class GenDocletBeanInfo {
-
- static String[] ATTRIBUTE_NAMES = { "bound",
- "constrained",
- "expert",
- "hidden",
- "preferred",
- "displayname",
- "propertyeditorclass",
- "customizerclass",
- "displayname",
- "description",
- "enum",
- "attribute" };
- private static boolean DEBUG = false;
-
- private static String fileDir = "";
- private static String templateDir = "";
-
- public static final String TRUE = "true";
- public static final String FALSE = "false";
-
- /**
- * Method called from the javadoc environment to determint the options length.
- * Doclet options:
- * -t template location
- * -d outputdir
- * -x true Enable debug output.
- */
- public static int optionLength(String option) {
- // remind: this needs to be cleaned up
- if (option.equals("-t"))
- return 2;
- if (option.equals("-d"))
- return 2;
- if (option.equals("-x"))
- return 2;
- return 0;
- }
-
- /** @beaninfo
- * bound:true
- * constrained:false
- * expert:true
- * hidden:true
- * preferred:false
- * description: the description of this method can
- * do all sorts of funky things. if it \n
- * is indented like this, we have to remove
- * all char spaces greater than 2 and also any hard-coded \n
- * newline characters and all newlines
- * displayname: theString
- * propertyeditorclass: foo.bar.MyPropertyEditorClass
- * customizerclass: foo.bar.MyCustomizerClass
- * attribute:key1 value1
- * attribute: key2 value2
- *
- */
- public static boolean start(RootDoc doc) {
- readOptions(doc.options());
-
- if (templateDir.length() == 0) {
- System.err.println("-t option not specified");
- return false;
- }
- if (fileDir.length() == 0) {
- System.err.println("-d option not specified");
- return false;
- }
-
- GenSwingBeanInfo generator = new GenSwingBeanInfo(fileDir, templateDir, DEBUG);
- Hashtable dochash = new Hashtable();
- DocBeanInfo dbi;
-
- /* "javadoc Foo.java Bar.java" will return:
- * "Foo Foo.I1 Foo.I2 Bar Bar.I1 Bar.I2"
- * i.e., with all the innerclasses of classes specified in the command
- * line. We don't want to generate BeanInfo for any of these inner
- * classes, so we ignore these by remembering what the last outer
- * class was. A hack, I admit, but makes the build faster.
- */
- String previousClass = null;
-
- ClassDoc[] classes = doc.classes();
-
- for (int cnt = 0; cnt < classes.length; cnt++) {
- String className = classes[cnt].qualifiedName();
- if (previousClass != null &&
- className.startsWith(previousClass) &&
- className.charAt(previousClass.length()) == '.') {
- continue;
- }
- previousClass = className;
-
- // XXX - debug
- System.out.println("\n>>> Generating beaninfo for " + className + "...");
-
- // Examine the javadoc tags and look for the the @beaninfo tag
- // This first block looks at the javadoc for the class
- Tag[] tags = classes[cnt].tags();
- for (int i = 0; i < tags.length; i++) {
- if (tags[i].kind().equalsIgnoreCase("@beaninfo")) {
- if (DEBUG)
- System.out.println("GenDocletBeanInfo: found @beaninfo tagged Class: " + tags[i].text());
- dbi = genDocletInfo(tags[i].text(), classes[cnt].name());
- dochash.put(dbi.name, dbi);
- break;
- }
- }
-
- // This block looks at the javadoc for the class methods.
- int startPos = -1;
- MethodDoc[] methods = classes[cnt].methods();
- for (int j = 0; j < methods.length; j++) {
- // actually don't "introspect" - look for all
- // methods with a @beaninfo tag
- tags = methods[j].tags();
- for (int x = 0; x < tags.length; x++){
- if (tags[x].kind().equalsIgnoreCase("@beaninfo")){
- if ((methods[j].name().startsWith("get")) ||
- (methods[j].name().startsWith("set")))
- startPos = 3;
- else if (methods[j].name().startsWith("is"))
- startPos = 2;
- else
- startPos = 0;
- String propDesc =
- Introspector.decapitalize((methods[j].name()).substring(startPos));
- if (DEBUG)
- System.out.println("GenDocletBeanInfo: found @beaninfo tagged Method: " + tags[x].text());
- dbi = genDocletInfo(tags[x].text(), propDesc);
- dochash.put(dbi.name, dbi);
- break;
- }
- }
- }
- if (DEBUG) {
- // dump our classes doc beaninfo
- System.out.println(">>>>DocletBeanInfo for class: " + classes[cnt].name());
- Enumeration e = dochash.elements();
- while (e.hasMoreElements()) {
- DocBeanInfo db = (DocBeanInfo)e.nextElement();
- System.out.println(db.toString());
- }
- }
-
- // Use the generator to create the beaninfo code for the class.
- generator.genBeanInfo(classes[cnt].containingPackage().name(),
- classes[cnt].name(), dochash);
- // reset the values!
- dochash.clear();
- } // end for loop
- return true;
- }
-
- /**
- * Reads the command line options.
- * Side Effect, sets class variables templateDir, fileDir and DEBUG
- */
- private static void readOptions(String[][] options) {
- // Parse the command line args
- for (int i = 0; i < options.length; i++){
- if (options[i][0].equals("-t")) {
- templateDir = options[i][1];
- } else if (options[i][0].equals("-d")) {
- fileDir = options[i][1];
- } else if (options[i][0].equals("-x")){
- if (options[i][1].equals("true"))
- DEBUG=true;
- else
- DEBUG=false;
- }
- }
- }
-
- /**
- * Create a "BeanInfo" data structure from the tag. This is a data structure
- * which contains all beaninfo data for a method or a class.
- *
- * @param text All the text after the @beaninfo tag.
- * @param name Name of the property i.e., mnemonic for setMnemonic
- */
- private static DocBeanInfo genDocletInfo(String text, String name) {
- int beanflags = 0;
- String desc = "null";
- String displayname = "null";
- String propertyeditorclass = "null";
- String customizerclass = "null";
- String value = "null";
- HashMap attribs = null;
- HashMap enums = null;
-
- int index;
-
- for (int j = 0; j < ATTRIBUTE_NAMES.length; j++){
- index = 0;
- if ((index = text.indexOf(ATTRIBUTE_NAMES[j])) != -1){
- value = getValue((text).substring(index),ATTRIBUTE_NAMES[j]);
-
- if (ATTRIBUTE_NAMES[j].equalsIgnoreCase("attribute")) {
- attribs = getAttributeMap(value, " ");
- }
- if (ATTRIBUTE_NAMES[j].equalsIgnoreCase("enum")) {
- enums = getAttributeMap(value, " \n");
- }
- else if (ATTRIBUTE_NAMES[j].equals("displayname")){
- displayname = value;
- }
- else if (ATTRIBUTE_NAMES[j].equalsIgnoreCase("propertyeditorclass")) {
- propertyeditorclass = value;
- }
- else if (ATTRIBUTE_NAMES[j].equalsIgnoreCase("customizerclass")){
- customizerclass = value;
- }
- else if ((ATTRIBUTE_NAMES[j].equalsIgnoreCase("bound"))
- && (value.equalsIgnoreCase(TRUE)))
- beanflags = beanflags | DocBeanInfo.BOUND;
- else if ((ATTRIBUTE_NAMES[j].equalsIgnoreCase("expert"))
- && (value.equalsIgnoreCase(TRUE)))
- beanflags = beanflags | DocBeanInfo.EXPERT;
- else if ((ATTRIBUTE_NAMES[j].equalsIgnoreCase("constrained"))
- && (value.equalsIgnoreCase(TRUE)))
- beanflags = beanflags | DocBeanInfo.CONSTRAINED;
- else if ((ATTRIBUTE_NAMES[j].equalsIgnoreCase("hidden"))
- && (value.equalsIgnoreCase(TRUE)))
- beanflags = beanflags | DocBeanInfo.HIDDEN;
- else if ((ATTRIBUTE_NAMES[j].equalsIgnoreCase("preferred"))
- && (value.equalsIgnoreCase(TRUE)))
- beanflags = beanflags | DocBeanInfo.PREFERRED;
- else if (ATTRIBUTE_NAMES[j].equalsIgnoreCase("description")){
- desc = value;
- }
- }
- }
- /** here we create our doclet-beaninfo data structure, which we read in
- * later if it has anything worthwhile
- */
-
- // Construct a new Descriptor class
- return new DocBeanInfo(name, beanflags, desc,displayname,
- propertyeditorclass, customizerclass,
- attribs, enums);
- }
-
- /**
- * Parses the substring and returns the cleaned up value for the attribute.
- * @param substring Full String of the attrib tag.
- * i.e., "attribute: visualUpdate true" will return "visualUpdate true";
- */
- private static String getValue(String substring, String prop) {
- StringTokenizer t;
- String value = "null";
-
- try {
- /** if the ATTRIBUTE_NAMES is NOT the description, then we
- * parse until newline
- * if it is the description we read until the next token
- * and then look for a match in the last MAXMATCH index
- * and truncate the description
- * if it is the attribute we wead until no more
- */
- if (prop.equalsIgnoreCase("attribute")){
- StringBuffer tmp = new StringBuffer();
- try {
- t = new StringTokenizer(substring, " :\n");
- t.nextToken().trim();//the prop
- // we want to return : key1 value1 key2 value2
- while (t.hasMoreTokens()){
- tmp.append(t.nextToken().trim()).append(" ");
- tmp.append(t.nextToken().trim()).append(" ");
- String test = t.nextToken().trim();
- if (!(test.equalsIgnoreCase("attribute")))
- break;
- }
- } catch (Exception e){
- }
- value = tmp.toString();
- }
- else if (prop.equalsIgnoreCase("enum")){
- t = new StringTokenizer(substring, ":");
- t.nextToken().trim(); // the prop we already know
- StringBuffer tmp = new StringBuffer(t.nextToken().trim());
- for (int i = 0; i < ATTRIBUTE_NAMES.length; i++){
- if (tmp.toString().endsWith(ATTRIBUTE_NAMES[i])){
- int len = ATTRIBUTE_NAMES[i].length();
- // trim off that
- tmp.setLength(tmp.length() - len);
- break;
- }
- }
- value = tmp.toString();
- }
- else if (prop.equalsIgnoreCase("description")){
- t = new StringTokenizer(substring, ":");
- t.nextToken().trim(); // the prop we already know
- StringBuffer tmp = new StringBuffer(t.nextToken().trim());
- for (int i = 0; i < ATTRIBUTE_NAMES.length; i++){
- if (tmp.toString().endsWith(ATTRIBUTE_NAMES[i])){
- int len = ATTRIBUTE_NAMES[i].length();
- // trim off that
- tmp.setLength(tmp.length() - len);
- break;
- }
- }
- value = hansalizeIt(tmp.toString());
- }
- else {
- // Single value properties like bound: true
- t = new StringTokenizer(substring, ":\n");
- t.nextToken().trim(); // the prop we already know
- value = t.nextToken().trim();
- }
-
- // now we need to look for a match of any of the
- // property
-
- return value;
- }
- catch (Exception e){
- return "invalidValue";
- }
- }
-
- /**
- * Creates a HashMap containing the key value pair for the parsed values
- * of the "attributes" and "enum" tags.
- * ie. For attribute value: visualUpdate true
- * The HashMap will have key: visualUpdate, value: true
- */
- private static HashMap getAttributeMap(String str, String delim) {
- StringTokenizer t = new StringTokenizer(str, delim);
- HashMap map = null;
- String key;
- String value;
-
- int num = t.countTokens()/2;
- if (num > 0) {
- map = new HashMap();
- for (int i = 0; i < num; i++) {
- key = t.nextToken().trim();
- value = t.nextToken().trim();
- map.put(key, value);
- }
- }
- return map;
- }
-
- // looks for extra spaces, \n hard-coded and invisible,etc
- private static String hansalizeIt(String from){
- char [] chars = from.toCharArray();
- int len = chars.length;
- int toss = 0;
-
- // remove double spaces
- for (int i = 0; i < len; i++){
- if ((chars[i] == ' ')) {
- if (i+1 < len) {
- if ((chars[i+1] == ' ' ) || (chars[i+1] == '\n'))
- {
- --len;
- System.arraycopy(chars,i+1,chars,i,len-i);
- --i;
- }
- }
- }
-
- if (chars[i] == '\n'){
- chars[i] = ' ';
- i -= 2;
- }
-
- if (chars[i] == '\\') {
- if (i+1 < len) {
- if (chars[i+1] == 'n'){
- chars[i+1] = ' ';
- --len;
- System.arraycopy(chars,i+1, chars,i, len-i);
- --i;
- }
- }
- }
- }
- return new String(chars,0,len);
- }
-
-}
diff --git a/jdk/make/tools/swing-beans/GenSwingBeanInfo.java b/jdk/make/tools/swing-beans/GenSwingBeanInfo.java
deleted file mode 100644
index dd51f4b..0000000
--- a/jdk/make/tools/swing-beans/GenSwingBeanInfo.java
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.beans.BeanInfo;
-import java.beans.BeanDescriptor;
-import java.beans.Introspector;
-import java.beans.IntrospectionException;
-import java.beans.PropertyDescriptor;
-
-import java.io.*;
-
-import java.util.Hashtable;
-import java.util.HashMap;
-import java.util.Iterator;
-
-/**
- * A utlity for generating a BeanInfo source file from a template and a
- * Hashtable with hints that were generated from a doclet.
- * it's neccessary to write things like the per property descriptions
- * by hand. To run the application:
- * <pre>
- * java GenSwingBeanInfo <class name>
- * </pre>
- * Code for a bean info class is written to out. If the class is
- * swing package, you don't need to fully specify its name.
- *
- * @author Hans Muller
- * @author Rich Schiavi
- * @author Mark Davidson
- */
-public class GenSwingBeanInfo {
- private final static String BEANINFO_SUFFIX = "BeanInfo.java";
-
- // Tokens in @(...)
- private final static String TOK_BEANPACKAGE = "BeanPackageName";
- private final static String TOK_BEANCLASS = "BeanClassName";
- private final static String TOK_BEANOBJECT = "BeanClassObject";
- private final static String TOK_CLASSDESC = "ClassDescriptors";
- private final static String TOK_BEANDESC = "BeanDescription";
- private final static String TOK_PROPDESC = "BeanPropertyDescriptors";
- private final static String TOK_ENUMVARS = "EnumVariables";
-
- private String enumcode; // Generated code for enumerated properties.
-
- private boolean DEBUG = false;
-
- private String fileDir;
- private String templateFilename;
-
- /**
- * Public constructor
- * @param fileDir Location to put the generated source files.
- * @param templateFilename Location of the BeanInfo template
- * @param debug Flag to turn on debugging
- */
- public GenSwingBeanInfo(String fileDir, String templateFilename, boolean debug) {
- this.fileDir = fileDir;
- this.templateFilename = templateFilename;
- this.DEBUG = debug;
- }
-
- /**
- * Opens a BeanInfo PrintStream for the class.
- */
- private PrintStream initOutputFile(String classname) {
- try {
- OutputStream out = new FileOutputStream(fileDir + File.separator + classname + BEANINFO_SUFFIX);
- BufferedOutputStream bout = new BufferedOutputStream(out);
- return new PrintStream(out);
- } catch (IOException e){
- // System.err.println("GenSwingBeanInfo: " + e.toString());
- }
- return null;
- }
-
- private static void messageAndExit(String msg) {
- System.err.println("\n" + msg);
- System.exit(1);
- }
-
-
- /**
- * Load the contents of the BeanInfo template into a string and
- * return the string.
- */
- private String loadTemplate() {
- String template = "<no template>";
-
- try {
- File file = new File(templateFilename);
- DataInputStream stream = new DataInputStream(new FileInputStream(file));
- BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
- StringBuffer buffer = new StringBuffer();
-
- int c;
- while((c = reader.read()) != -1) {
- buffer.append((char)c);
- }
-
- template = buffer.toString();
- reader.close();
- } catch (IOException e) {
- System.out.println(e.getMessage());
- messageAndExit("GenSwingBeanInfo: Couldn't load template: " + templateFilename + e);
- }
- return template;
- }
-
-
- /**
- * Generates a string for the BeanDescriptor
- */
- private String genBeanDescriptor(DocBeanInfo dbi) {
- String code = "";
- int beanflags = dbi.beanflags;
-
- // we support export, hidden, preferred
- if ((beanflags & DocBeanInfo.EXPERT) != 0)
- code += " sun.swing.BeanInfoUtils.EXPERT, Boolean.TRUE,\n";
- if ((beanflags & DocBeanInfo.HIDDEN) !=0)
- code += " sun.swing.BeanInfoUtils.HIDDEN, Boolean.TRUE,\n";
- /* 1.2 only - make sure build flag build using 1.2 */
- if ((beanflags & DocBeanInfo.PREFERRED) !=0)
- code += " sun.swing.BeanInfoUtils.PREFERRED, Boolean.TRUE,\n";
- if (!(dbi.customizerclass.equals("null")))
- code += " sun.swing.BeanInfoUtils.CUSTOMIZERCLASS, " + dbi.customizerclass + ".class,\n";
-
- if (dbi.attribs != null) {
- code += genAttributes(dbi.attribs);
- }
-
- return code;
- }
-
- /**
- * Generates the code for the attributes table.
- */
- private String genAttributes(HashMap attribs) {
- StringBuffer code = new StringBuffer();
- String key;
- String value;
-
- Iterator iterator = attribs.keySet().iterator();
- while(iterator.hasNext()) {
- key = (String)iterator.next();
- value = (String)attribs.get(key);
-
- if (value.equals("true") || value.equals("false")) {
- // Substitute the "true" and "false" for codegen Boolean values.
- if(value.equals("true"))
- value = "Boolean.TRUE";
- else
- value = "Boolean.FALSE";
-
- code.append(" \"").append(key).append("\", ").append(value).append(",\n");
- } else {
- code.append(" \"").append(key).append("\", \"").append(value).append("\",\n");
- }
- }
- return code.toString();
- }
-
- /**
- * Generates the code for the enumeration.
- * XXX - side effect: Modifies the enumcode field variable.
- */
- private String genEnumeration(String propName, HashMap enums) {
- String objectName = propName + "Enumeration";
- String key;
- String value;
-
- StringBuffer code = new StringBuffer("\n\t\tObject[] ");
- code.append(objectName).append(" = new Object[] { \n");
-
- Iterator iterator = enums.keySet().iterator();
- while(iterator.hasNext()) {
- key = (String)iterator.next();
- value = (String)enums.get(key);
-
- code.append("\t\t\t\"").append(key).append("\" , new Integer(");
- code.append(value).append("), \"").append(value).append("\",\n");
- }
- // Close the statically initialized Object[]
- code.replace(code.length() - 2, code.length(), "\n\t\t};\n");
-
- // Add this string to the enumeration code.
- enumcode += code.toString();
-
- // Return the PropertyDescriptor init string;
- return " \"enumerationValues\", " + objectName + ",\n";
- }
-
- /**
- * Generate the createPropertyDescriptor() calls, one per property.
- * A fully specified createPropertyDescriptor() call looks like this:
- * <pre>
- * createPropertyDescriptor("contentPane", new Object[] {
- * BOUND, Boolean.TRUE,
- * CONSTRAINED, Boolean.TRUE,
- * PROPERTYEDITORCLASS, package.MyEditor.cl
- * WRITEMETHOD, "setContentPane",
- * DISPLAYNAME, "contentPane",
- * EXPERT, Boolean.FALSE,
- * HIDDEN, Boolean.FALSE,
- * PREFERRED, Boolean.TRUE,
- * SHORTDESCRIPTION, "A top level window with a window manager border",
- * "random attribute","random value"
- * }
- * );
- * </pre>
- *
- * @param info The actual BeanInfo class generated from from the Intospector.
- * @param dochash Set of DocBeanInfo pairs for each property. This information
- * is used to suplement the instrospected properties.
- * @return A snippet of source code which would construct all the PropertyDescriptors.
- */
- private String genPropertyDescriptors(BeanInfo info, Hashtable dochash) {
- String code = "";
- enumcode = " "; // code for enumerated properties.
- PropertyDescriptor[] pds = info.getPropertyDescriptors();
- boolean hash_match = false;
- DocBeanInfo dbi = null;
-
- for(int i = 0; i < pds.length; i++) {
- if (pds[i].getReadMethod() != null) {
- code += "\ncreatePropertyDescriptor(\"" + pds[i].getName() + "\", new Object[] {\n";
-
- if (DEBUG)
- System.out.println("Introspected propertyDescriptor: " + pds[i].getName());
-
- if (dochash.size() > 0 && dochash.containsKey(pds[i].getName())) {
- dbi = (DocBeanInfo)dochash.remove(pds[i].getName());
- // override/set properties on this *introspected*
- // BeanInfo pds using our DocBeanInfo class values
- setDocInfoProps(dbi, pds[i]);
- hash_match = true;
- if (DEBUG)
- System.out.println("DocBeanInfo class exists for propertyDescriptor: " + pds[i].getName() + "\n");
- } else {
- hash_match = false;
- }
-
- // Do I need to do anything with this property descriptor
- if (hash_match) {
- if ((dbi.beanflags & DocBeanInfo.BOUND) != 0) {
- code += " sun.swing.BeanInfoUtils.BOUND, Boolean.TRUE,\n";
- } else {
- code += " sun.swing.BeanInfoUtils.BOUND, Boolean.FALSE,\n";
- }
- }
-
- if (pds[i].isConstrained()) {
- code += " sun.swing.BeanInfoUtils.CONSTRAINED, Boolean.TRUE,\n";
- }
-
- if (pds[i].getPropertyEditorClass() != null) {
- String className = pds[i].getPropertyEditorClass().getName();
- code += " sun.swing.BeanInfoUtils.PROPERTYEDITORCLASS, " + className + ".class,\n";
- } else if ((hash_match) && (!(dbi.propertyeditorclass.equals("null")))) {
- code += " sun.swing.BeanInfoUtils.PROPERTYEDITORCLASS, " + dbi.propertyeditorclass + ".class,\n";
- }
-
- if ((hash_match) && (!(dbi.customizerclass.equals("null")))) {
- code += " sun.swing.BeanInfoUtils.CUSTOMIZERCLASS, " + dbi.customizerclass + ".class,\n";
- }
-
- if ((hash_match) && (dbi.enums != null)) {
- code += genEnumeration(pds[i].getName(), dbi.enums);
- }
-
- if (!pds[i].getDisplayName().equals(pds[i].getName())) {
- code += " sun.swing.BeanInfoUtils.DISPLAYNAME, \"" + pds[i].getDisplayName() + "\",\n";
- }
-
- if (pds[i].isExpert()) {
- code += " sun.swing.BeanInfoUtils.EXPERT, Boolean.TRUE,\n";
- }
-
- if (pds[i].isHidden()) {
- code += " sun.swing.BeanInfoUtils.HIDDEN, Boolean.TRUE,\n";
- }
-
- if (pds[i].isPreferred()) {
- code += " sun.swing.BeanInfoUtils.PREFERRED, Boolean.TRUE,\n";
- }
-
- // user attributes
- if (hash_match) {
- if (dbi.attribs != null) {
- code += genAttributes(dbi.attribs);
- }
- }
- code += " sun.swing.BeanInfoUtils.SHORTDESCRIPTION, \"" + pds[i].getShortDescription() + "\",\n";
-
- // Print the closing brackets. If this is the last array initializer,
- // don't print the trailing comma.
- if (i == (pds.length - 1)) {
- code += " }\n)\n";
- } else {
- code += " }\n),\n";
- }
-
- } // end if ( readMethod != null )
- } // end for
- return code;
- }
-
- /**
- * Sets properties from the BeanInfo supplement on the
- * introspected PropertyDescriptor
- */
- private void setDocInfoProps(DocBeanInfo dbi, PropertyDescriptor pds) {
- int beanflags = dbi.beanflags;
-
- if ((beanflags & DocBeanInfo.BOUND) != 0)
- pds.setBound(true);
- if ((beanflags & DocBeanInfo.EXPERT) != 0)
- pds.setExpert(true);
- if ((beanflags & DocBeanInfo.CONSTRAINED) != 0)
- pds.setConstrained(true);
- if ((beanflags & DocBeanInfo.HIDDEN) !=0)
- pds.setHidden(true);
- if ((beanflags & DocBeanInfo.PREFERRED) !=0)
- pds.setPreferred(true);
-
- if (!(dbi.desc.equals("null"))){
- pds.setShortDescription(dbi.desc);
- }
- if (!(dbi.displayname.equals("null"))){
- pds.setDisplayName(dbi.displayname);
- }
- }
-
- /**
- * Generates the BeanInfo source file using instrospection and a
- * Hashtable full of hints. This the only public method in this class.
- *
- * @param classname Root name of the class. i.e., JButton
- * @param dochash A hashtable containing the DocBeanInfo.
- */
- public void genBeanInfo(String packageName, String classname, Hashtable dochash) {
- // The following initial values are just examples. All of these
- // fields are initialized below.
- String beanClassName = "JInternalFrame";
- String beanClassObject = "javax.swing.JInternalFrame.class";
- String beanDescription = "<A description of this component>.";
- String beanPropertyDescriptors = "<createSwingPropertyDescriptor code>";
- String classPropertyDescriptors = "<createSwingClassPropertyDescriptor code>";
-
- Class cls = getClass(packageName, classname);
- if (cls == null){
- messageAndExit("Can't find class: " + classname);
- }
-
- // Get the output stream.
- PrintStream out = initOutputFile(classname);
-
- // Run the Introspector and initialize the variables
-
- BeanInfo beanInfo = null;
- BeanDescriptor beanDescriptor = null;
-
- try {
- if (cls == javax.swing.JComponent.class) {
- // Go all the way up the heirarchy for JComponent
- beanInfo = Introspector.getBeanInfo(cls);
- } else {
- beanInfo = Introspector.getBeanInfo(cls, cls.getSuperclass());
- }
- beanDescriptor = beanInfo.getBeanDescriptor();
- beanDescription = beanDescriptor.getShortDescription();
- } catch (IntrospectionException e) {
- messageAndExit("Introspection failed for " + cls.getName() + " " + e);
- }
-
- beanClassName = beanDescriptor.getName();
- beanClassObject = cls.getName() + ".class";
-
- if (DEBUG){
- System.out.println(">>>>GenSwingBeanInfo class: " + beanClassName);
- }
- // Generate the Class BeanDescriptor information first
- if (dochash.size() > 0) {
- if (dochash.containsKey(beanClassName)) {
- DocBeanInfo dbi = (DocBeanInfo)dochash.remove(beanClassName);
- classPropertyDescriptors = genBeanDescriptor(dbi);
- if (DEBUG)
- System.out.println("ClassPropertyDescriptors: " + classPropertyDescriptors);
- if (!(dbi.desc.equals("null")))
- beanDescription = dbi.desc;
- } else
- beanDescription = beanDescriptor.getShortDescription();
- } else
- beanDescription = beanDescriptor.getShortDescription();
-
- // Generate the Property descriptors
- beanPropertyDescriptors = genPropertyDescriptors(beanInfo,dochash);
-
- // Dump the template to out, substituting values for
- // @(token) tokens as they're encountered.
-
- int currentIndex = 0;
- // not loading this to get around build issue for now
- String template = loadTemplate();
-
- // This loop substitutes the "@(...)" tags in the template with the ones for the
- // current class.
- while (currentIndex < template.length()) {
- // Find the Token
- int tokenStart = template.indexOf("@(", currentIndex);
- if (tokenStart != -1) {
- out.print(template.substring(currentIndex, tokenStart));
-
- int tokenEnd = template.indexOf(")", tokenStart);
- if (tokenEnd == -1) {
- messageAndExit("Bad @(<token>) beginning at " + tokenStart);
- }
- String token = template.substring(tokenStart+2, tokenEnd);
-
- if (token.equals(TOK_BEANCLASS)) {
- out.print(beanClassName);
- } else if (token.equals(TOK_CLASSDESC)) {
- if (!(classPropertyDescriptors.equals("<createSwingClassPropertyDescriptor code>"))) {
- printDescriptors(out, classPropertyDescriptors, template, tokenStart);
- }
- } else if (token.equals(TOK_BEANPACKAGE)){
- out.print(packageName);
- } else if (token.equals(TOK_BEANOBJECT)) {
- out.print(beanClassObject);
- } else if (token.equals(TOK_BEANDESC)) {
- out.print(beanDescription);
- } else if (token.equals(TOK_ENUMVARS)){
- out.print(enumcode);
- } else if (token.equals(TOK_PROPDESC)) {
- printDescriptors(out, beanPropertyDescriptors, template, tokenStart);
- } else if (token.equals("#")) {
- // Ignore the @(#) Version Control tag if it exists.
- } else {
- messageAndExit("Unrecognized token @(" + token + ")");
- }
- currentIndex = tokenEnd + 1;
- } else {
- // tokenStart == -1 - We are finsihed.
- out.print(template.substring(currentIndex, template.length()));
- break;
- }
- }
- out.close();
- }
-
- /**
- * Returns the class from the package name and the class root name.
- *
- * @param packageName The name of the package of the containing class.
- * @param rootname The root name of the class. i.e, JButton
- * @return The class instance or null.
- */
- private Class getClass(String packageName, String rootname) {
- Class cls = null;
- String classname = rootname;
-
- if (packageName != null || !packageName.equals("")) {
- classname = packageName + "." + rootname;
- }
-
- try {
- cls = Class.forName(classname);
- } catch (ClassNotFoundException e) {
- // Fail silently.
- }
- return cls;
- }
-
- /**
- * Prints the formated descriptors to the PrintStream
- * @param out Open PrintStream
- * @param s String descriptor
- * @param template Template
- * @param tokenStart Index into the template
- */
- private void printDescriptors(PrintStream out, String s,
- String template, int tokenStart) {
- String indent = "";
-
- // Find the newline that preceeds @(BeanPropertyDescriptors) to
- // calculate the indent.
- for (int i = tokenStart; i >= 0; i--) {
- if (template.charAt(i) == '\n') {
- char[] chars = new char[tokenStart - i];
- for (int j = 0; j < chars.length; j++) {
- chars[j] = ' ';
- }
- indent = new String(chars);
- break;
- }
- }
-
- int i = 0;
- while(i < s.length()) {
- int nlIndex = s.indexOf('\n', i);
- out.print(s.substring(i, nlIndex+1));
- out.print(indent);
- i = nlIndex + 1;
- }
- }
-
-
-}
diff --git a/jdk/make/tools/tzdb/Makefile b/jdk/make/tools/tzdb/Makefile
deleted file mode 100644
index 895a0e8..0000000
--- a/jdk/make/tools/tzdb/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the tzdb compiler tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.tzdb
-PRODUCT = tzdb
-PROGRAM = tzdb
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/TzdbZoneRulesCompiler.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/makefiles/CompileDemos.gmk b/jdk/makefiles/CompileDemos.gmk
deleted file mode 100644
index ef7ae5a..0000000
--- a/jdk/makefiles/CompileDemos.gmk
+++ /dev/null
@@ -1,466 +0,0 @@
-
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-include NativeCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include Setup.gmk
-
-# Prepare the find cache. Only used if running on windows.
-$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src))
-
-# Append demo goals to this variable.
-BUILD_DEMOS =
-
-# The demo structure and contents should really be cleaned up.
-# Now every other demo has its own quirks where to put the
-# READMEs and other files.
-
-##################################################################################################
-
-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)
-endef
-
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- $(eval $(call SetupAppletDemo,ArcTest))
- $(eval $(call SetupAppletDemo,BarChart))
- $(eval $(call SetupAppletDemo,Blink))
- $(eval $(call SetupAppletDemo,CardTest))
- $(eval $(call SetupAppletDemo,Clock))
- $(eval $(call SetupAppletDemo,DitherTest))
- $(eval $(call SetupAppletDemo,DrawTest))
- $(eval $(call SetupAppletDemo,Fractal))
- $(eval $(call SetupAppletDemo,GraphicsTest))
- $(eval $(call SetupAppletDemo,NervousText))
- $(eval $(call SetupAppletDemo,SimpleGraph))
- $(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/))
- endif
-endif
-
-##################################################################################################
-
-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
-
- # 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
-
- 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
-
- # 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
-
-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
- (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)
- $(RM) -r $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.tmp
- $(TOUCH) $@
-
-BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services
-
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- $(eval $(call SetupDemo,MoleculeViewer,applets,,XYZChemModel,,,example*.html *.java))
- $(eval $(call SetupDemo,WireFrame,applets,,ThreeD,,,example*.html *.java))
- $(eval $(call SetupDemo,SwingApplet,jfc,,SwingApplet,,,README* *.html))
-endif
-$(eval $(call SetupDemo,FileChooserDemo,jfc,,FileChooserDemo,,,README*))
-$(eval $(call SetupDemo,Font2DTest,jfc,,Font2DTest,,,*.html *.txt))
-$(eval $(call SetupDemo,Metalworks,jfc,,Metalworks,,,README*))
-$(eval $(call SetupDemo,Notepad,jfc,,Notepad,,,README*))
-$(eval $(call SetupDemo,SampleTree,jfc,,SampleTree,,,README*))
-$(eval $(call SetupDemo,TableExample,jfc,,TableExample,,,README*))
-$(eval $(call SetupDemo,TransparentRuler,jfc,,transparentruler.Ruler,,,README*))
-$(eval $(call SetupDemo,jconsole-plugin,scripting,,,,,*.xml *.txt,,,,Main-Class: \n))
-$(eval $(call SetupDemo,FullThreadDump,management,,FullThreadDump,,,README*))
-$(eval $(call SetupDemo,JTop,management,,JTop,,,README*))
-$(eval $(call SetupDemo,MemoryMonitor,management,,MemoryMonitor,,,README*))
-$(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,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 $@
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- $(RM) -r $(JDK_OUTPUTDIR)/demo/nbproject/jfc/SwingApplet
- endif
-endif
-
-##################################################################################################
-
-# 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.
-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
-
- $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
-
- # 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))
-
- $(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))
-
- 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
-
- 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 $$@
-
- 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,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)
-# 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))
-
-$(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)
- $(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
- $(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/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
- $(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/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
- $(call install-file)
- $(CHMOD) -f ug+w $@
-
-BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/management/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))
-
-$(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/share/demo/nbproject/%
- $(call install-file)
- $(CHMOD) -f ug+w $@
-
-##################################################################################################
-
-$(JDK_OUTPUTDIR)/demo/README: $(JDK_TOPDIR)/src/share/demo/README
- $(call install-file)
-
-BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/README
-
-##################################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-
- $(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
- $(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
-
- $(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
-
- $(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
-
- $(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)
-
-endif
-
-##################################################################################################
-
-ifndef OPENJDK
- DB_DEMO_ZIPFILE := $(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip)
-
- $(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 $<
- $(MV) $(JDK_OUTPUTDIR)/demo/db-derby-*-bin/demo $(JDK_OUTPUTDIR)/demo/db
- $(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
- $(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
-endif
-
-##################################################################################################
-
-all: $(BUILD_DEMOS)
-
-.PHONY: all
diff --git a/jdk/makefiles/CompileJavaClasses.gmk b/jdk/makefiles/CompileJavaClasses.gmk
deleted file mode 100644
index 7402226..0000000
--- a/jdk/makefiles/CompileJavaClasses.gmk
+++ /dev/null
@@ -1,438 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include Setup.gmk
-
-JARS :=
-EXFILES :=
-EXCLUDES :=
-
-##########################################################################################
-
-EXCLUDES += com/sun/pept \
- com/sun/tools/example/trace \
- com/sun/tools/example/debug/bdi \
- com/sun/tools/example/debug/event \
- com/sun/tools/example/debug/gui
-
-ifdef OPENJDK
- 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
-
- 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
-
-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
-
- EXCLUDES += com/oracle/security
-endif
-
-EXFILES += WrapperGenerator.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
-endif
-
-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
-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
-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
-
-# TODO: Add BUILD_HEADLESS_ONLY to configure?
-ifdef BUILD_HEADLESS_ONLY
- EXCLUDES += sun/applet
-endif
-
-ifdef OPENJDK
- EXCLUDES += sun/java2d/cmm/kcms
-endif
-
-# Used on windows and macosx
-ifeq (, $(filter $(OPENJDK_TARGET_OS), windows macosx))
- EXFILES += sun/awt/AWTCharset.java
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- # exclude all X11 on Mac, we can't exclude some like below or we'll have compilation errors
- EXCLUDES += sun/awt/X11
-else
- # TBD: figure out how to eliminate this long list
- 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
-
-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
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- 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
-# 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
-# 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
-
-# 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
-endif
-
-MACOSX_SRC_DIRS :=
-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 \
- $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
- $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
- $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.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
-
- EXCLUDES += com/apple/jobjc
-endif
-
-# The security classes should not end up in the classes directory as that will prevent them
-# from working when running the exploded jdk image. Compile them separately to a different
-# directory from where the jars can be created.
-SECURITY_PKGS := \
- com/oracle/security/ucrypto \
- com/sun/crypto/provider \
- javax/crypto \
- sun/security/ec \
- sun/security/internal \
- sun/security/mscapi \
- sun/security/pkcs11 \
- #
-
-# The exception handling of swing beaninfo
-# These resources violates the convention of having code and resources together under
-# $(JDK_TOPDIR)/src/.../classes directories
-$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/tools/swing-beans/beaninfo/images/%.gif
- $(call install-file)
-
-# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
-# 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)))
-
-ifeq ($(ENABLE_SJAVAC),yes)
- # With sjavac enabled, excluded sources are not even considered for linking.
- # Explicitly add the security sources to sourcepath for linking.
- BUILD_JDK_SOURCEPATH:=$(patsubst %,-i$(SPACE)%.*,$(subst /,.,$(SECURITY_PKGS))) \
- -sourcepath $(JDK_TOPDIR)/src/share/classes
-endif
-
-$(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) $(SECURITY_PKGS),\
- EXCLUDE_FILES:=$(EXFILES),\
- BIN:=$(JDK_OUTPUTDIR)/classes,\
- COPY:=$(COPY_PATTERNS),\
- COPY_FILES:=$(COPY_FILES),\
- HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers,\
- ADD_JAVAC_FLAGS:=$(BUILD_JDK_SOURCEPATH)))
-
-##########################################################################################
-
-$(eval $(call SetupJavaCompilation,BUILD_SECURITY, \
- SETUP := GENERATE_JDKBYTECODE, \
- SRC := $(JDK_TOPDIR)/src/share/classes \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
- $(MACOSX_SRC_DIRS) \
- $(CLOSED_SRC_DIRS), \
- INCLUDES := $(SECURITY_PKGS), \
- EXCLUDES := $(EXCLUDES), \
- EXCLUDE_FILES := $(EXFILES), \
- BIN := $(JDK_OUTPUTDIR)/classes_security, \
- HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers))
-
-$(BUILD_SECURITY): $(BUILD_JDK)
-
-##########################################################################################
-
-$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin:
- $(MKDIR) -p $(@D)
- $(TOUCH) $@
-
-##########################################################################################
-
-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))
-
- $(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))
-
-$(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))
-
- $(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))
-
- $(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK)
-
- 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))
-
- $(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK)
-
- endif
- endif
-endif
-
-##########################################################################################
-
-all: $(BUILD_JDK) $(BUILD_SECURITY) $(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)
-
-.PHONY: all
diff --git a/jdk/makefiles/CompileLaunchers.gmk b/jdk/makefiles/CompileLaunchers.gmk
deleted file mode 100644
index af5b358..0000000
--- a/jdk/makefiles/CompileLaunchers.gmk
+++ /dev/null
@@ -1,668 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include NativeCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include Setup.gmk
-
-# Prepare the find cache. Only used on windows.
-$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/share/bin))
-
-# Build tools
-include Tools.gmk
-
-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)
-else
- ORIGIN_ROOT := /..
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
-else
- ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
-endif
-
-#
-# Applications expect to be able to link against libjawt without invoking
-# 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))
-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.
-
- $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 += -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
-
- 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
-
- # 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
-
- 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))
-
- BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
-
- 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
-endef
-
-##########################################################################################
-
-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"
-else
- 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))
-
-$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
- $(MKDIR) -p $(@D)
- $(RM) $@
- $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) $@
-
-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))
-endif
-
-
-ifndef BUILD_HEADLESS_ONLY
- $(eval $(call SetupLauncher,appletviewer, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',, \
- $(XLIBS)))
-endif
-
-$(eval $(call SetupLauncher,extcheck, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.extcheck.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,idlj, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.corba.se.idl.toJavaPortable.Compile"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,jar, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,jarsigner, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }'))
-
-$(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) }'))
-endif
-
-$(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, \
- -DEXPAND_CLASSPATH_WILDCARDS \
- -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javah.Main"$(COMMA) }'))
-
-$(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, \
- -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
-
-$(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, \
- -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, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.hat.Main"$(COMMA) }'))
-
-$(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) }' \
- -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
- ,,,,,,,,,Info-privileged.plist))
-
-$(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) }' \
- -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
- ,,,,,,,,,Info-privileged.plist))
-
-$(eval $(call SetupLauncher,jps, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jps.Jps"$(COMMA) }'))
-
-$(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,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, \
- -DJAVA_ARGS='{ "-J-ms8m"$(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, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstat.Jstat"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,jstatd, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstatd.Jstatd"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,keytool, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.keytool.Main"$(COMMA) }'))
-
-$(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)))
-endif
-
-$(eval $(call SetupLauncher,rmic, \
- -DEXPAND_CLASSPATH_WILDCARDS \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.rmic.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,schemagen, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.jxc.SchemaGenerator"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,serialver, \
- -DEXPAND_CLASSPATH_WILDCARDS \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.serialver.SerialVer"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,xjc, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.xjc.Driver"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,wsgen, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsGen"$(COMMA) }'))
-
-$(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,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,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,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) }'))
-
-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,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
-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)
-
-endif
-
-ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
- UNPACKEXE_CFLAGS += -xregs=no%appl
- UNPACKEXE_LDFLAGS_solaris += -xmemalign=4s
-endif
-
-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
-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))
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- EXE_OUT_OPTION := $(EXE_OUT_OPTION_save)
-endif
-
-ifneq ($(USE_EXTERNAL_LIBZ), true)
-
- $(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS)
-
-endif
-
-# Build into object dir and copy executable afterwards to avoid .ilk file in
-# image. The real fix would be clean up linking of unpack200 using
-# -link -incremental:no
-# like all other launchers.
-$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE)
- $(call install-file)
-
-BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX)
-
-##########################################################################################
-
-
-BUILD_JEXEC :=
-BUILD_JEXEC_SRC :=
-BUILD_JEXEC_INC :=
-BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
-
-#
-# UNHANDLED:
-# - COMPILE_APPROACH = normal
-#
-
-#
-# jdk/make/java/Makefile
-#
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
- BUILD_JEXEC := 1
- endif
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), linux)
- BUILD_JEXEC := 1
-endif # OPENJDK_TARGET_OS
-
-#
-# jdk/make/java/jexec/Makefile
-#
-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), 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
-#
-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)
-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
-ifeq ($(OPENJDK_TARGET_OS), linux)
- BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
-endif
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
-endif
-
-# TODO:
-# On windows java-rmi.cgi shouldn't be bundled since Java 1.2, but has been built all
-# this time anyway. Since jdk6, it has been built from the wrong source and resulted
-# in a (almost) copy of the standard java launcher named "java-rmi.exe" ending up in
-# 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))))
-else
- $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh
- $(call install-file)
- $(CHMOD) a+x $@
-endif
-
-##########################################################################################
-
-BUILD_JSPAWNHELPER :=
-BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/solaris/native/java/lang
-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
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib
-endif
-
-ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
- 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))
-
- $(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS)
-
- BUILD_LAUNCHERS += $(BUILD_JSPAWNHELPER)
-endif
-
-##########################################################################################
-# jabswitch
-
-ifndef OPENJDK
- 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))
-
- BUILD_LAUNCHERS += $(BUILD_JABSWITCH)
-
- endif
-endif
-
-##########################################################################################
-
-$(BUILD_LAUNCHERS): $(JDK_TOPDIR)/makefiles/CompileLaunchers.gmk
-
-all: $(BUILD_LAUNCHERS)
-
-.PHONY: all
diff --git a/jdk/makefiles/CopyIntoClasses.gmk b/jdk/makefiles/CopyIntoClasses.gmk
deleted file mode 100644
index ddf5ae8..0000000
--- a/jdk/makefiles/CopyIntoClasses.gmk
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Copy icu and _dict files used by the text break iterator
-
-COPY_PATTERNS = .icu _dict
-
-# Copy config files for com.sun.org.apache.xml.internal.security
-
-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
-
-# 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
-
-# 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
-
-# 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
-
-# Extra jvmstat files
-COPY_FILES += \
- $(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)
-
-# Print resources
-PRINT_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/print/resources
-COPY_FILES += \
- $(wildcard $(PRINT_RESOURCES_DIR)/*.png)
-
-# IDN resources
-COPY_FILES += \
- $(JDK_TOPDIR)/src/share/classes/sun/net/idn/uidna.spp
-
-#
-# Swing plaf resources
-#
-SWING_PLAF_WINDOWS_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows
-COPY_FILES += \
- $(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.gif) \
- $(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.png)
-
-ifndef OPENJDK
- SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/windows
- # Filter out JavaCup32.png from OpenJDK
- COPY_FILES := $(filter-out $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/JavaCup32.png, $(COPY_FILES))
- # Alter JavaCup32.png from ClosedJDK
- COPY_FILES += \
- $(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png
-endif
-
-ifeq ($(ENABLE_JFR), true)
- JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
- COPY_FILES += \
- $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
-endif
-
-SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic
-COPY_FILES += \
- $(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png)
-
-ifndef OPENJDK
- SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/javax/swing/plaf/basic
- # Filter out JavaCup16.png from OpenJDK
- COPY_FILES := $(filter-out $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/JavaCup16.png, $(COPY_FILES))
- # Alter JavaCup16.png from ClosedJDK
- COPY_FILES += \
- $(SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED)/icons/JavaCup16.png
-endif
-
-ifdef OPENJDK
- SWING_PLAF_MOTIF_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif
- COPY_FILES += \
- $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \
- $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png)
-else
- SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/motif
- COPY_FILES += \
- $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.gif) \
- $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.png)
-endif
-
-SWING_PLAF_METAL_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/metal
-COPY_FILES += \
- $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.gif) \
- $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.png) \
- $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.gif) \
- $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.png) \
- $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/sounds/*.wav)
-
-ifneq ($(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)
-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))
-
-COPY_EXTRA += $(OUT_BEANINFO_RESOURCES)
-# END: Swing beaninfo resources
-
-# Swing text resources
-SWING_TEXT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/text
-COPY_FILES += \
- $(SWING_TEXT_RESOURCEDIR)/html/default.css \
- $(wildcard $(SWING_TEXT_RESOURCEDIR)/rtf/charsets/*.txt)
-
-##########################################################################################
-#
-# Copy the META-INF/services configuration files that are scattered around the source tree
-# into classes/META-INF/services. Be aware that META-INF directories that are located at a
-# source root (.../classes/META-INF) are automatically copied verbatim by the
-# SetupJavaCompilation macro.
-#
-# Any other META-INF/services configuration file is found here and platform specific comments
-# are uncommented and the configuration file is stored in the output META-INF directory.
-
-# Make sure the output directory is created.
-$(eval $(call MakeDir, $(JDK_OUTPUTDIR)/classes/META-INF/services))
-# Find all META-INF/services/* files
-ALL_META-INF_DIRS_share := $(shell $(FIND) $(JDK_TOPDIR)/src/share/classes -type d -a -name META-INF)
-ALL_META-INF_DIRS_targetapi := $(shell $(FIND) $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes -type d -a -name META-INF)
-# Platform specific overrides shared
-ifneq ($(ALL_META-INF_DIRS_targetapi), )
- ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_targetapi) \
- $(filter-out %$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes%,%,$(ALL_META-INF_DIRS_targetapi)), \
- $(ALL_META-INF_DIRS_share))
-else
- ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share)
-endif
-
-ifndef OPENJDK
- ALL_META-INF_DIRS += $(JDK_TOPDIR)/src/closed/share/classes/sun/java2d/cmm/kcms/META-INF
-endif
-
-SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS)))
-
-ifdef OPENJDK
- SRC_SERVICES_FILES := $(filter-out %sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES))
- SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.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))
-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))
-# Exception handling for print services with no META-INF directory
-SRC_SERVICES_FILES_PRINT = $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/*)
-OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \
- $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/%, %, \
- $(SRC_SERVICES_FILES_PRINT)))
-OUT_SERVICES_FILES_PRINT_COLON = $(addsuffix :, $(OUT_SERVICES_FILES_PRINT))
-RULES_SERVICES_PRINT = $(join $(OUT_SERVICES_FILES_PRINT_COLON), $(SRC_SERVICES_FILES_PRINT))
-
-# Now setup the dependency rules to generate a META-INF/services/... from the correct source.
-META-INF_RULES_SERVICES := $(RULES_SERVICES_PRINT) $(join $(OUT_SERVICES_FILES_COLON), $(SRC_SERVICES_FILES))
-# Eval the newly created rules to incorporate them into the make tree.
-define addto_meta-inf_services
- $1
- echo $(LOG_INFO) Installing META-INF/services/$$(@F)
- $(CAT) $$< | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $$@
-endef
-$(foreach i, $(META-INF_RULES_SERVICES), $(eval $(call addto_meta-inf_services, $i)))
-# Here is the generic rule, whose receipt the above rules will trigger.
-
-COPY_EXTRA += $(OUT_SERVICES_FILES)
-COPY_EXTRA += $(OUT_SERVICES_FILES_PRINT)
-
-###
-
-$(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
-
-###
-
-JAVAX_SOUND_SRC := $(JDK_TOPDIR)/src/share/classes/com/sun/media/sound/services
-
-JAVAX_SOUND_SRC_FILES := \
- javax.sound.midi.spi.MidiDeviceProvider \
- javax.sound.midi.spi.MidiFileReader \
- javax.sound.midi.spi.MidiFileWriter \
- javax.sound.midi.spi.SoundbankReader \
- javax.sound.sampled.spi.AudioFileReader \
- javax.sound.sampled.spi.AudioFileWriter \
- javax.sound.sampled.spi.FormatConversionProvider \
- javax.sound.sampled.spi.MixerProvider
-
-COPY_EXTRA += $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, $(JAVAX_SOUND_SRC_FILES))
-
-JAVAX_SOUND_RULES := $(foreach F, $(JAVAX_SOUND_SRC_FILES), $(JDK_OUTPUTDIR)/classes/META-INF/services/$(notdir $F):$(JAVAX_SOUND_SRC)/$F)
-
-$(foreach R, $(JAVAX_SOUND_RULES), $(eval $(call addto_meta-inf_services, $R)))
diff --git a/jdk/makefiles/CreateJars.gmk b/jdk/makefiles/CreateJars.gmk
deleted file mode 100644
index 8b96546..0000000
--- a/jdk/makefiles/CreateJars.gmk
+++ /dev/null
@@ -1,786 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-include Setup.gmk
-
-default: all
-
-# Prepare the find cache. Only used if running on windows.
-$(eval $(call FillCacheFind, $(JDK_OUTPUTDIR)/classes))
-
-include Tools.gmk
-
-include Profiles.gmk
-
-#
-# This makefile...so that altering will trigger rebuilding include/exclude-lists => jars
-#
-MAKEFILE = $(JDK_TOPDIR)/makefiles/CreateJars.gmk
-#
-# And similarly for the Profiles
-PROFILE_MAKEFILES = $(JDK_TOPDIR)/makefiles/Profiles.gmk $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt
-
-MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf
-BEANMANIFEST := $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest
-
-$(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/lib))
-
-##########################################################################################
-
-$(eval $(call SetupArchive,BUILD_JCONSOLE_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes, \
- SUFFIXES := .class .gif .png .properties, \
- INCLUDES := sun/tools/jconsole com/sun/tools/jconsole, \
- JARMAIN := sun.tools.jconsole.JConsole, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/jconsole.jar, \
- SKIP_METAINF := true))
-
-
-##########################################################################################
-
-$(eval $(call SetupArchive,BUILD_DNS_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes, \
- INCLUDES := sun/net/spi/nameservice/dns, \
- EXTRA_FILES := META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar, \
- SKIP_METAINF := true))
-
-
-##########################################################################################
-
-LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \
- iw ja ko lt lv mk ms mt nl no pl pt ro ru sk sl sq sr sv \
- th tr uk vi zh
-
-LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/, $(LOCALEDATA_INCLUDE_LOCALES)) \
- $(addprefix sun/util/resources/, $(LOCALEDATA_INCLUDE_LOCALES))
-
-$(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes, \
- SUFFIXES := .class _dict _th, \
- INCLUDES := $(LOCALEDATA_INCLUDES), \
- EXCLUDES := sun/text/resources/th/BreakIteratorRules_th.class, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar, \
- SKIP_METAINF := true))
-
-##########################################################################################
-#
-# Different variants of rt.jar are built based on the current profile. The output
-# directory is augmented with the profile name so that the final jar file and all the
-# intermediary list files will be in directory. This has the form lib$PROFILE rather than
-# lib/$PROFILE so that it won't get copied as part of the image generation process.
-# Each profile customizes the RT_JAR_EXCLUDES variable.
-#
-##########################################################################################
-
-# Full JRE exclude list for rt.jar and resources.jar
-# This value should exclude types destined for jars other than rt.jar and resources.jar.
-# When building a Profile this value augments the profile specific exclusions
-RT_JAR_EXCLUDES += \
- com/sun/codemodel \
- com/sun/crypto/provider \
- com/sun/istack/internal/tools \
- com/sun/jarsigner \
- com/sun/java/accessibility \
- com/sun/javadoc \
- com/sun/jdi \
- com/sun/net/ssl/internal/ssl \
- com/sun/source \
- com/sun/tools \
- com/sun/xml/internal/dtdparser \
- com/sun/xml/internal/rngom \
- com/sun/xml/internal/xsom \
- javax/crypto \
- javax/swing/AbstractButtonBeanInfo.class \
- javax/swing/beaninfo \
- javax/swing/BoxBeanInfo.class \
- javax/swing/JAppletBeanInfo.class \
- javax/swing/JButtonBeanInfo.class \
- javax/swing/JCheckBoxBeanInfo.class \
- javax/swing/JCheckBoxMenuItemBeanInfo.class \
- javax/swing/JColorChooserBeanInfo.class \
- javax/swing/JComboBoxBeanInfo.class \
- javax/swing/JComponentBeanInfo.class \
- javax/swing/JDesktopPaneBeanInfo.class \
- javax/swing/JDialogBeanInfo.class \
- javax/swing/JEditorPaneBeanInfo.class \
- javax/swing/JFileChooserBeanInfo.class \
- javax/swing/JFormattedTextFieldBeanInfo.class \
- javax/swing/JFrameBeanInfo.class \
- javax/swing/JInternalFrameBeanInfo.class \
- javax/swing/JLabelBeanInfo.class \
- javax/swing/JLayeredPaneBeanInfo.class \
- javax/swing/JListBeanInfo.class \
- javax/swing/JMenuBarBeanInfo.class \
- javax/swing/JMenuBeanInfo.class \
- javax/swing/JMenuItemBeanInfo.class \
- javax/swing/JOptionPaneBeanInfo.class \
- javax/swing/JPanelBeanInfo.class \
- javax/swing/JPasswordFieldBeanInfo.class \
- javax/swing/JPopupMenuBeanInfo.class \
- javax/swing/JProgressBarBeanInfo.class \
- javax/swing/JRadioButtonBeanInfo.class \
- javax/swing/JRadioButtonMenuItemBeanInfo.class \
- javax/swing/JScrollBarBeanInfo.class \
- javax/swing/JScrollPaneBeanInfo.class \
- javax/swing/JSeparatorBeanInfo.class \
- javax/swing/JSliderBeanInfo.class \
- javax/swing/JSpinnerBeanInfo.class \
- javax/swing/JSplitPaneBeanInfo.class \
- javax/swing/JTabbedPaneBeanInfo.class \
- javax/swing/JTableBeanInfo.class \
- javax/swing/JTextAreaBeanInfo.class \
- javax/swing/JTextFieldBeanInfo.class \
- javax/swing/JTextPaneBeanInfo.class \
- javax/swing/JToggleButtonBeanInfo.class \
- javax/swing/JToolBarBeanInfo.class \
- javax/swing/JTreeBeanInfo.class \
- javax/swing/JWindowBeanInfo.class \
- javax/swing/SwingBeanInfoBase.class \
- javax/swing/text/JTextComponentBeanInfo.class \
- META-INF/services/com.sun.jdi.connect.Connector \
- META-INF/services/com.sun.jdi.connect.spi.TransportService \
- META-INF/services/com.sun.tools.attach.spi.AttachProvider \
- META-INF/services/com.sun.tools.xjc.Plugin \
- META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \
- org/relaxng/datatype \
- sun/awt/HKSCS.class \
- sun/awt/motif/X11GB2312.class \
- sun/awt/motif/X11GB2312\$$$$Decoder.class \
- sun/awt/motif/X11GB2312\$$$$Encoder.class \
- sun/awt/motif/X11GBK.class \
- sun/awt/motif/X11GBK\$$$$Encoder.class \
- sun/awt/motif/X11KSC5601.class \
- sun/awt/motif/X11KSC5601\$$$$Decoder.class \
- sun/awt/motif/X11KSC5601\$$$$Encoder.class \
- sun/jvmstat \
- sun/net/spi/nameservice/dns \
- sun/nio/cs/ext \
- sun/rmi/rmic \
- sun/security/ec \
- sun/security/internal \
- sun/security/mscapi \
- sun/security/pkcs11 \
- sun/security/provider/Sun.class \
- sun/security/rsa/SunRsaSign.class \
- sun/security/ssl \
- sun/security/tools/jarsigner \
- sun/swing/BeanInfoUtils.class \
- sun/text/resources/cldr \
- sun/tools/asm \
- sun/tools/attach \
- sun/tools/java \
- sun/tools/javac \
- sun/tools/jcmd \
- sun/tools/jconsole \
- sun/tools/jinfo \
- sun/tools/jmap \
- sun/tools/jps \
- sun/tools/jstack \
- sun/tools/jstat \
- sun/tools/jstatd \
- sun/tools/native2ascii \
- sun/tools/serialver \
- sun/tools/tree \
- sun/tools/util \
- sun/util/cldr/CLDRLocaleDataMetaInfo.class \
- sun/util/resources/cldr \
- $(LOCALEDATA_INCLUDES) \
- com/oracle/jrockit/jfr \
- oracle/jrockit/jfr \
- jdk/jfr
-
-# Find all files in the classes dir to use as dependencies. This could be more fine granular.
-ALL_FILES_IN_CLASSES := $(call not-containing, _the., $(filter-out %javac_state, \
- $(call CacheFind, $(JDK_OUTPUTDIR)/classes)))
-
-RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar_manifest
-RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar_manifest
-
-$(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
- -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
- $(MAINMANIFEST) >> $@.tmp
- $(ECHO) >> $@.tmp
- $(CAT) $(BEANMANIFEST) >> $@.tmp
- $(MV) $@.tmp $@
-
-$(RESOURCE_JAR_MANIFEST_FILE): $(MAINMANIFEST)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
- -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
- $(MAINMANIFEST) >> $@.tmp
- $(MV) $@.tmp $@
-
-$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude: $(MAKEFILE) $(PROFILE_MAKEFILES)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- $(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp)
- $(MV) $@.tmp $@
-
-$(IMAGES_OUTPUTDIR)/lib/classlist: $(JDK_TOPDIR)/make/tools/sharing/classlist.$(OPENJDK_TARGET_OS) \
- $(MAKEFILE)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- $(TOOL_ADDJSUM) $< $@.tmp
- $(MV) $@.tmp $@
-
-$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude \
- $(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- ($(CD) $(JDK_OUTPUTDIR)/classes && \
- $(TOOL_JARREORDER) \
- -o $@.tmp $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude . )
- $(MV) $@.tmp $@
-
-$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- $(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
- ifneq ($(PROFILE), )
- # # Add back classes from excluded packages (fixing the $ substitution in the process)
- for type in $(subst \$$,\, $(RT_JAR_INCLUDE_TYPES)) ; do \
- $(ECHO) $$type >> $@.tmp ; \
- done
- endif
- $(MV) $@.tmp $@
-
-$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- $(GREP) -v -e '\.class$$' \
- -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
- $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
- ifneq ($(PROFILE), )
- # # Strip out all META-INF/services/ entries
- $(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2
- # # Add back the required services
- # # FIXME: On Solaris if PROFILE_INCLUDE_METAINF_SERVICES is not defined
- # # we get a syntax error from sh. That doesn't happen on linux
- for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \
- $(ECHO) $$service >> $@.tmp2; \
- done
- $(MV) $@.tmp2 $@.tmp
- endif
- $(MV) $@.tmp $@
-
-# This is a hack but I don't know how to make this fit into the existing scheme
-$(PROFILE_VERSION_CLASS_TARGETS): $(PROFILE_VERSION_JAVA_TARGETS)
- @$(JAVAC) -d $(@D)/../../ $(@D)/$(VERSION_JAVA_FILE)
-
-
-# Support for removing the addPropertyChangeListener and removePropertyChangeListener
-# methods from classes that only go into the profile builds.
-BEANLESS_CLASSES = $(IMAGES_OUTPUTDIR)/beanless
-
-# When there are $ characters in filenames we have some very subtle interactions between
-# make expansion and shell expansion. In this particular case $< will contain a single $ while
-# $@ will contain \$. So we have to pass $< in single-quotes to avoid shell expansion
-$(BEANLESS_CLASSES)/%: $(JDK_OUTPUTDIR)/classes/%
- $(MKDIR) -p $(@D)
- $(TOOL_REMOVEMETHODS) '$<' $@ addPropertyChangeListener removePropertyChangeListener
-
-CLASSES_TO_DEBEAN = \
- java/util/logging/LogManager.class \
- java/util/jar/Pack200\$$Packer.class \
- java/util/jar/Pack200\$$Unpacker.class \
- com/sun/java/util/jar/pack/PackerImpl.class \
- com/sun/java/util/jar/pack/UnpackerImpl.class
-
-ifneq ($(PROFILE), )
- BEANLESS_CLASSES_TARGETS := $(addprefix $(BEANLESS_CLASSES)/, $(CLASSES_TO_DEBEAN))
-endif
-
-
-RT_JAR_CREATE_OPTIONS := c0fm
-RT_JAR_UPDATE_OPTIONS := u0f
-ifeq ($(COMPRESS_JARS), true)
- RT_JAR_CREATE_OPTIONS := cfm
- RT_JAR_UPDATE_OPTIONS := uf
-endif
-
-# This defines a target-specific variables to make the shell logic easier to see.
-# We need to find the Version.class file for the profile currently being built
-$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: \
- CLASS_FILE = $(if $(PROFILE), $(strip $(foreach class, $(PROFILE_VERSION_CLASS_TARGETS), $(if $(findstring $(PROFILE), $(class)), $(class)))), NO_SUCH_FILE)
-# This is the real target
-$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE) $(PROFILE_VERSION_CLASS_TARGETS) $(BEANLESS_CLASSES_TARGETS)
- $(ECHO) Creating rt.jar $(PROFILE) Compressed=$(COMPRESS_JARS)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- $(CD) $(JDK_OUTPUTDIR)/classes && \
- $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \
- @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents && \
- if [ -f $(CLASS_FILE) ]; then \
- $(ECHO) Updating rt.jar $(PROFILE) && \
- $(CD) $(patsubst %$(VERSION_CLASS_PATH), %, $(CLASS_FILE)) && \
- $(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(VERSION_CLASS_PATH); \
- $(CD) $(BEANLESS_CLASSES) && \
- $(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(CLASSES_TO_DEBEAN); \
- fi
- $(MV) $@.tmp $@
-
-$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents \
- $(RESOURCE_JAR_MANIFEST_FILE)
- $(ECHO) Creating resources.jar
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- $(CD) $(JDK_OUTPUTDIR)/classes && \
- $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \
- @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents
- $(MV) $@.tmp $@
-
-##########################################################################################
-
-ifneq ($(OPENJDK_TARGET_OS), windows)
- CHARSETS_EXTRA_FILES := sun/awt/motif/X11GBK.class \
- sun/awt/motif/X11GB2312\$$$$Decoder.class \
- sun/awt/motif/X11GB2312.class \
- sun/awt/motif/X11KSC5601\$$$$Decoder.class \
- sun/awt/motif/X11KSC5601\$$$$Encoder.class \
- sun/awt/motif/X11GB2312\$$$$Encoder.class \
- sun/awt/motif/X11GBK\$$$$Encoder.class \
- sun/awt/motif/X11KSC5601.class
-endif
-
-$(eval $(call SetupArchive,BUILD_CHARSETS_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes, \
- SUFFIXES := .class .dat, \
- INCLUDES := sun/nio/cs/ext, \
- EXTRA_FILES := sun/awt/HKSCS.class \
- $(CHARSETS_EXTRA_FILES), \
- JAR := $(IMAGES_OUTPUTDIR)/lib/charsets.jar, \
- SKIP_METAINF := true, \
- CHECK_COMPRESS_JAR := true))
-
-##########################################################################################
-
-ifndef OPENJDK
- ifeq ($(ENABLE_JFR), true)
- $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes, \
- SUFFIXES := .class .jfc .xsd, \
- INCLUDES := com/oracle/jrockit/jfr \
- oracle/jrockit/jfr \
- jdk/jfr, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/jfr.jar, \
- SKIP_METAINF := true, \
- MANIFEST := $(MAINMANIFEST), \
- CHECK_COMPRESS_JAR := true))
-
- endif
-endif
-
-##########################################################################################
-
-$(eval $(call SetupArchive,BUILD_JSSE_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes, \
- INCLUDES := sun/security/provider/Sun.class \
- sun/security/rsa/SunRsaSign.class \
- sun/security/ssl \
- com/sun/net/ssl/internal/ssl, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/jsse.jar, \
- SKIP_METAINF := true, \
- MANIFEST := $(MAINMANIFEST), \
- CHECK_COMPRESS_JAR := true))
-
-##########################################################################################
-
-$(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes, \
- SUFFIXES := BeanInfo.class .gif, \
- INCLUDES := javax/swing sun/swing, \
- EXCLUDES := javax/swing/plaf, \
- EXTRA_FILES := javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/dt.jar, \
- SKIP_METAINF := true))
-
-##########################################################################################
-
-# Get the CLDRVERSION
-include gensrc/GensrcCLDR.gmk
-
-CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar
-
-$(eval $(call SetupArchive,BUILD_CLDRDATA_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes, \
- SUFFIXES := .class, \
- INCLUDES := sun/text/resources/cldr \
- sun/util/cldr \
- sun/util/resources/cldr, \
- EXCLUDES := sun/util/cldr/CLDRLocaleProviderAdapter, \
- JAR := $(CLDRDATA_JAR_DST), \
- EXTRA_MANIFEST_ATTR := CLDR-Version: $(CLDRVERSION), \
- SKIP_METAINF := true))
-
-##########################################################################################
-
-TOOLS_JAR_INCLUDES := \
- com/sun/codemodel \
- com/sun/istack/internal/tools \
- com/sun/jarsigner \
- com/sun/javadoc \
- com/sun/jdi \
- com/sun/source \
- com/sun/tools/attach \
- com/sun/tools/classfile \
- com/sun/tools/corba \
- com/sun/tools/doclets \
- com/sun/tools/doclint \
- com/sun/tools/example/debug/expr \
- com/sun/tools/example/debug/tty \
- com/sun/tools/extcheck \
- com/sun/tools/hat \
- com/sun/tools/internal/jxc \
- com/sun/tools/internal/jxc/ap \
- com/sun/tools/internal/ws \
- com/sun/tools/internal/ws/wscompile/plugin/at_generated \
- com/sun/tools/internal/xjc \
- com/sun/tools/javac \
- com/sun/tools/javadoc \
- com/sun/tools/javah \
- com/sun/tools/javap \
- com/sun/tools/jdeps \
- com/sun/tools/jdi \
- com/sun/tools/script/shell \
- com/sun/xml/internal/dtdparser \
- com/sun/xml/internal/rngom \
- com/sun/xml/internal/xsom \
- org/relaxng/datatype \
- sun/applet \
- sun/jvmstat \
- sun/rmi/rmic \
- sun/security/tools/jarsigner \
- sun/tools/asm \
- sun/tools/attach \
- sun/tools/jar \
- sun/tools/java \
- sun/tools/javac \
- sun/tools/jcmd \
- sun/tools/jinfo \
- sun/tools/jmap \
- sun/tools/jps \
- sun/tools/jstack \
- sun/tools/jstat \
- sun/tools/jstatd \
- sun/tools/native2ascii \
- sun/tools/serialver \
- sun/tools/tree \
- sun/tools/util
-
-# The sjavac tools is not ready for public consumption.
-TOOLS_JAR_EXCLUDES = com/sun/tools/sjavac
-
-$(eval $(call SetupArchive,BUILD_TOOLS_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes, \
- SUFFIXES := .class .prp .gif .properties .xml .css .xsd .js .html .txt .java \
- Tool aliasmap options, \
- INCLUDES := $(TOOLS_JAR_INCLUDES), \
- EXCLUDES := $(TOOLS_JAR_EXCLUDES), \
- EXTRA_FILES := META-INF/services/com.sun.jdi.connect.Connector \
- META-INF/services/com.sun.jdi.connect.spi.TransportService \
- META-INF/services/com.sun.tools.attach.spi.AttachProvider \
- META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
- META-INF/services/com.sun.tools.internal.xjc.Plugin, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/tools.jar, \
- SKIP_METAINF := true, \
- CHECK_COMPRESS_JAR := true))
-
-
-##########################################################################################
-
-include javadoc/CORE_PKGS.gmk
-include javadoc/NON_CORE_PKGS.gmk
-
-# The compiler should not issue a "Proprietary" warning when compiling
-# classes in the com.sun.java.swing.plaf packages, since we've always
-# allowed, and even advocated, extending them (see bug 6476749).
-#
-# This approach is NOT to be used as a general purpose way to avoid such
-# compiler warnings for non-core packages. The correct way is to document
-# the packages in NON_CORE_PKGS.gmk, and include them in the NON_CORE_PKGS
-# definition.
-#
-# Swing has taken this approach only as a temporary measure to avoid
-# the compiler warnings until we can properly document these packages.
-# This is covered under 6491853.
-EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \
- com.sun.java.swing.plaf.motif \
- com.sun.java.swing.plaf.gtk
-
-#
-# Include the exported private packages in ct.sym.
-# This is an interim solution until the ct.sym is replaced
-# with a new module system (being discussed for JDK 8).
-#
-EXPORTED_PRIVATE_PKGS = com.oracle.net \
- com.oracle.nio
-
-$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar
- $(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
- $(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
- $(JAVA) $(NEW_JAVAC) \
- -bootclasspath $(JDK_OUTPUTDIR)/classes \
- -XDprocess.packages -proc:only \
- -processor com.sun.tools.javac.sym.CreateSymbols \
- -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \
- -Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
- -Acom.sun.tools.javac.sym.Profiles=profile-rtjar-includes.txt \
- $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
- $(TOUCH) $@
-
-$(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/symbols))
-$(eval $(call SetupArchive,BUILD_CT_SYM, $(IMAGES_OUTPUTDIR)/symbols/_the.symbols, \
- SRCS := $(IMAGES_OUTPUTDIR)/symbols, \
- INCLUDES := META-INF/sym, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/ct.sym, \
- CHECK_COMPRESS_JAR := true))
-
-
-##########################################################################################
-
-SRC_ZIP_INCLUDES = \
- com/sun/corba \
- com/sun/image/codec/jpeg \
- com/sun/imageio \
- com/sun/java_cup \
- com/sun/javadoc \
- com/sun/java/swing \
- com/sun/jmx \
- com/sun/naming \
- com/sun/org/apache \
- com/sun/security/auth \
- com/sun/security/jgss \
- com/sun/source \
- java \
- javax/accessibility \
- javax/annotation \
- javax/imageio \
- javax/lang \
- javax/management \
- javax/naming \
- javax/print \
- javax/rmi \
- javax/script \
- javax/security \
- javax/sound \
- javax/sql \
- javax/swing \
- javax/tools \
- javax/xml \
- org/ietf \
- org/omg \
- org/w3c/dom \
- org/xml/sax \
- #
-
-SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
-SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
-SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/impsrc
-SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gendocsrc_rmic
-ifndef OPENJDK
- SRC_ZIP_SRCS += $(JDK_TOPDIR)/src/closed/share/classes
-endif
-
-# Need to copy launcher src files into desired directory structure
-# before zipping the sources.
-LAUNCHER_SRC_FILES := $(wildcard $(JDK_TOPDIR)/src/share/bin/*) \
- $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/java_md*)
-LAUNCHER_ZIP_SRC := $(patsubst $(JDK_TOPDIR)/src/share/bin/%, $(IMAGES_OUTPUTDIR)/src/launcher/%, \
- $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%, $(IMAGES_OUTPUTDIR)/src/launcher/%, \
- $(LAUNCHER_SRC_FILES)))
-
-$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/share/bin/%
- $(install-file)
-
-$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%
- $(install-file)
-
-$(IMAGES_OUTPUTDIR)/src.zip: $(LAUNCHER_ZIP_SRC)
-
-# This dir needs to exist before macro is evaluated to avoid warning from find.
-$(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/src))
-$(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
- SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
- INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
- EXCLUDES := javax/swing/beaninfo, \
- SUFFIXES := .java .c .h, \
- ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
- EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
-
-##########################################################################################
-
-ifndef OPENJDK
- ifeq ($(OPENJDK_TARGET_OS), windows)
-
- $(eval $(call SetupArchive,BUILD_JACCESS_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes, \
- INCLUDES := com/sun/java/accessibility/util, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar, \
- SKIP_METAINF := true))
-
- JARS += $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar
-
- ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
- $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes_ab/32bit, \
- INCLUDES := com/sun/java/accessibility, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar, \
- SKIP_METAINF := true))
-
- $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_LEGACY_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes_ab/legacy, \
- INCLUDES := com/sun/java/accessibility, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar, \
- SKIP_METAINF := true))
-
- JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar \
- $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar
- else
- $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_64_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes_ab/64bit, \
- INCLUDES := com/sun/java/accessibility, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar, \
- SKIP_METAINF := true))
-
- JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar
- endif
- endif
-endif
-
-##########################################################################################
-
-#
-# This is an empty jar (only contains manifest) and fits poorly into framework...
-# create simple rule instead
-#
-$(IMAGES_OUTPUTDIR)/lib/management-agent.jar: $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
- $(JAR) cfm $@ $<
-
-##########################################################################################
-
-$(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar: $(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar
- $(install-file)
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- $(eval $(call SetupArchive,BUILD_JOBJC_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/jobjc_classes, \
- JAR := $(IMAGES_OUTPUTDIR)/lib/JObjC.jar, \
- JARINDEX := true))
-endif
-
-# This file is imported from hotspot in Import.gmk. Copying it into images/lib so that
-# all jars can be found in one place when creating images in Images.gmk. It needs to be
-# done here so that clean targets can be simple and accurate.
-$(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar
- $(install-file)
-
-##########################################################################################
-#
-# sec-bin.zip is used by builds where the corresponding sources are not available
-#
-$(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \
- SRC := $(JDK_OUTPUTDIR), \
- INCLUDES := classes/javax/net \
- classes/javax/security/cert \
- classes/com/sun/net/ssl \
- classes/com/sun/security/cert \
- classes/sun/net/www/protocol/https \
- classes/sun/security/pkcs12 \
- classes/sun/security/ssl \
- classes/sun/security/krb5 \
- classes/sun/security/krb5/internal \
- classes/sun/security/krb5/internal/ccache \
- classes/sun/security/krb5/internal/crypto \
- classes/sun/security/krb5/internal/ktab \
- classes/sun/security/krb5/internal/rcache \
- classes/sun/security/krb5/internal/util, \
- INCLUDE_FILES := classes/sun/security/jgss/spi/GSSContextSpi.class, \
- EXCLUDES := classes/sun/security/krb5/internal/tools, \
- ZIP := $(IMAGES_OUTPUTDIR)/sec-bin.zip))
-
-JARS += $(IMAGES_OUTPUTDIR)/sec-bin.zip
-
-##########################################################################################
-#
-# Windows specific binary security packages.
-#
-ifeq ($(OPENJDK_TARGET_OS), windows)
- # sec-windows-bin.zip is used by builds where the corresponding sources are not available
- $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP, \
- SRC := $(JDK_OUTPUTDIR), \
- INCLUDES := classes/sun/security/krb5/internal/tools, \
- ZIP := $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip))
-
- JARS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip
-
- # JGSS files contain the native Kerberos library
- ifeq ($(OPENJDK_TARGET_CPU), x86_64)
- JGSS_ZIP_NAME = jgss-windows-x64-bin.zip
- else
- JGSS_ZIP_NAME = jgss-windows-i586-bin.zip
- endif
-
- $(eval $(call SetupZipArchive,BUILD_JGSS_BIN_ZIP, \
- SRC := $(JDK_OUTPUTDIR), \
- INCLUDE_FILES := bin/w2k_lsa_auth.dll \
- bin/w2k_lsa_auth.map \
- bin/w2k_lsa_auth.pdb, \
- ZIP := $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)))
-
- JARS += $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)
-endif
-
-##########################################################################################
-
-# This rule copies all jars from jdk/lib/... to images/lib/... to avoid having to track
-# which jars are where
-$(IMAGES_OUTPUTDIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
- $(install-file)
-
-##########################################################################################
-
-# Import nashorn.jar from nashorn dist dir.
-$(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar: $(NASHORN_DIST)/nashorn.jar
- $(install-file)
-
-##########################################################################################
-
--include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
-
-##########################################################################################
-
-all: $(JARS)
-
-.PHONY: default all
diff --git a/jdk/makefiles/CreateSecurityJars.gmk b/jdk/makefiles/CreateSecurityJars.gmk
deleted file mode 100644
index f7e5416..0000000
--- a/jdk/makefiles/CreateSecurityJars.gmk
+++ /dev/null
@@ -1,329 +0,0 @@
-#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-include Setup.gmk
-
-# The jars created in this file are required for the exploded jdk image to function and
-# cannot wait to be built in the images target.
-
-##########################################################################################
-# Create manifest for security jars
-#
-# Include these extra attributes for now, should probably take out.
-#
-MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf
-JCE_MANIFEST := $(JDK_OUTPUTDIR)/lib/_the.security.manifest.mf
-
-$(JCE_MANIFEST): $(MAINMANIFEST)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- $(SED) -e "s#@@RELEASE@@#$(JDK_VERSION)#" \
- -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
- $(MAINMANIFEST) >> $@.tmp
- $(ECHO) "Extension-Name: javax.crypto" >> $@.tmp
- $(ECHO) "Implementation-Vendor-Id: com.sun" >> $@.tmp
- $(MV) $@.tmp $@
-
-##########################################################################################
-# For security and crypto jars, always build the jar, but for closed, install the prebuilt
-# signed version instead of the newly built jar. Unsigned jars are treated as intermediate
-# targets and explicitly added to the JARS list. For open, signing is not needed. See
-# SignJars.gmk for more information.
-#
-# The source for the crypto jars is not available for all licensees. The BUILD_CRYPTO
-# variable is set to no if these jars can't be built to skip that step of the build.
-# Note that for OPENJDK, the build will fail if BUILD_CRYPTO=no since then there is no
-# other way to get the jars than to build them.
-
-SUNPKCS11_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunpkcs11.jar
-SUNPKCS11_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/sunpkcs11.jar
-
-$(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes_security, \
- SUFFIXES := .class, \
- INCLUDES := sun/security/pkcs11, \
- JAR := $(SUNPKCS11_JAR_UNSIGNED), \
- MANIFEST := $(JCE_MANIFEST), \
- SKIP_METAINF := true))
-
-$(SUNPKCS11_JAR_UNSIGNED): $(JCE_MANIFEST)
-
-ifndef OPENJDK
- SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar
- $(SUNPKCS11_JAR_DST): $(SUNPKCS11_JAR_SRC)
- @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunPKCS11 provider..."
- $(install-file)
-else
- $(SUNPKCS11_JAR_DST): $(SUNPKCS11_JAR_UNSIGNED)
- $(install-file)
-endif
-
-JARS += $(SUNPKCS11_JAR_UNSIGNED) $(SUNPKCS11_JAR_DST)
-
-##########################################################################################
-
-SUNEC_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunec.jar
-SUNEC_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/sunec.jar
-
-$(eval $(call SetupArchive,BUILD_SUNEC_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes_security, \
- SUFFIXES := .class, \
- INCLUDES := sun/security/ec, \
- JAR := $(SUNEC_JAR_UNSIGNED), \
- MANIFEST := $(JCE_MANIFEST), \
- SKIP_METAINF := true))
-
-$(SUNEC_JAR_UNSIGNED): $(JCE_MANIFEST)
-
-ifndef OPENJDK
- SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar
- $(SUNEC_JAR_DST): $(SUNEC_JAR_SRC)
- @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunEC provider..."
- $(install-file)
-else
- $(SUNEC_JAR_DST): $(SUNEC_JAR_UNSIGNED)
- $(install-file)
-endif
-
-JARS += $(SUNEC_JAR_UNSIGNED) $(SUNEC_JAR_DST)
-
-##########################################################################################
-
-SUNJCE_PROVIDER_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunjce_provider.jar
-SUNJCE_PROVIDER_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/sunjce_provider.jar
-
-ifneq ($(BUILD_CRYPTO), no)
- $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes_security, \
- SUFFIXES := .class, \
- INCLUDES := com/sun/crypto/provider, \
- JAR := $(SUNJCE_PROVIDER_JAR_UNSIGNED), \
- MANIFEST := $(JCE_MANIFEST), \
- SKIP_METAINF := true))
-
- $(SUNJCE_PROVIDER_JAR_UNSIGNED): $(JCE_MANIFEST)
-
- JARS += $(SUNJCE_PROVIDER_JAR_UNSIGNED)
-endif
-
-ifndef OPENJDK
- SUNJCE_PROVIDER_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/sunjce_provider.jar
- $(SUNJCE_PROVIDER_JAR_DST): $(SUNJCE_PROVIDER_JAR_SRC)
- @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunJCE provider..."
- $(install-file)
-else
- $(SUNJCE_PROVIDER_JAR_DST): $(SUNJCE_PROVIDER_JAR_UNSIGNED)
- $(install-file)
-endif
-
-JARS += $(SUNJCE_PROVIDER_JAR_DST)
-
-##########################################################################################
-
-JCE_JAR_DST := $(JDK_OUTPUTDIR)/lib/jce.jar
-JCE_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/jce.jar
-
-ifneq ($(BUILD_CRYPTO), no)
- $(eval $(call SetupArchive,BUILD_JCE_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes_security, \
- SUFFIXES := .class, \
- INCLUDES := javax/crypto sun/security/internal, \
- JAR := $(JCE_JAR_UNSIGNED), \
- MANIFEST := $(JCE_MANIFEST), \
- SKIP_METAINF := true))
-
- $(JCE_JAR_UNSIGNED): $(JCE_MANIFEST)
-
- JARS += $(JCE_JAR_UNSIGNED)
-endif
-
-ifndef OPENJDK
- JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar
- $(JCE_JAR_DST): $(JCE_JAR_SRC)
- @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt jce.jar..."
- $(install-file)
-else
- $(JCE_JAR_DST): $(JCE_JAR_UNSIGNED)
- $(install-file)
-endif
-
-JARS += $(JCE_JAR_DST)
-
-##########################################################################################
-
-US_EXPORT_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar
-US_EXPORT_POLICY_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/US_export_policy.jar
-
-ifneq ($(BUILD_CRYPTO), no)
- #
- # TODO fix so that SetupArchive does not write files into SRCS
- # then we don't need this extra copying
- #
- # NOTE: We currently do not place restrictions on our limited export
- # policy. This was not a typo.
- #
- US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
- US_EXPORT_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/US_export_policy_jar.tmp
-
- $(US_EXPORT_POLICY_JAR_TMP)/%: $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
- $(install-file)
-
- US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy
-
- $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR, $(US_EXPORT_POLICY_JAR_DEPS), \
- SRCS := $(US_EXPORT_POLICY_JAR_TMP), \
- SUFFIXES := .policy, \
- JAR := $(US_EXPORT_POLICY_JAR_UNSIGNED), \
- EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \
- SKIP_METAINF := true))
-
- JARS += $(US_EXPORT_POLICY_JAR_UNSIGNED)
-endif
-
-ifndef OPENJDK
- $(US_EXPORT_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar
- $(ECHO) $(LOG_INFO) Copying $(@F)
- $(install-file)
-else
- $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_UNSIGNED)
- $(install-file)
-endif
-
-JARS += $(US_EXPORT_POLICY_JAR_DST)
-
-##########################################################################################
-
-LOCAL_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/local_policy.jar
-LOCAL_POLICY_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/local_policy.jar
-
-ifneq ($(BUILD_CRYPTO), no)
- #
- # TODO fix so that SetupArchive does not write files into SRCS
- # then we don't need this extra copying
- #
- LOCAL_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/local_policy_jar.tmp
-
- ifeq ($(UNLIMITED_CRYPTO), true)
- LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
- LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/default_local.policy
- LOCAL_POLICY_JAR_ATTR := Crypto-Strength: unlimited
- else
- LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited
- LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \
- $(LOCAL_POLICY_JAR_TMP)/default_local.policy
- LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited
- endif
-
- $(LOCAL_POLICY_JAR_TMP)/%: $(LOCAL_POLICY_JAR_SRC_DIR)/%
- $(install-file)
-
- $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR, $(LOCAL_POLICY_JAR_DEPS), \
- SRCS := $(LOCAL_POLICY_JAR_TMP), \
- SUFFIXES := .policy, \
- JAR := $(LOCAL_POLICY_JAR_UNSIGNED), \
- EXTRA_MANIFEST_ATTR := $(LOCAL_POLICY_JAR_ATTR), \
- SKIP_METAINF := true))
-
- JARS += $(LOCAL_POLICY_JAR_UNSIGNED)
-endif
-
-ifndef OPENJDK
- $(LOCAL_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar
- $(ECHO) $(LOG_INFO) Copying $(@F)
- $(install-file)
-else
- $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_UNSIGNED)
- $(install-file)
-endif
-
-JARS += $(LOCAL_POLICY_JAR_DST)
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
-
- SUNMSCAPI_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunmscapi.jar
- SUNMSCAPI_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/sunmscapi.jar
-
- $(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes_security, \
- SUFFIXES := .class, \
- INCLUDES := sun/security/mscapi, \
- JAR := $(SUNMSCAPI_JAR_UNSIGNED), \
- MANIFEST := $(JCE_MANIFEST), \
- SKIP_METAINF := true))
-
- $(SUNMSCAPI_JAR_UNSIGNED): $(JCE_MANIFEST)
-
- ifndef OPENJDK
- SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar
- $(SUNMSCAPI_JAR_DST): $(SUNMSCAPI_JAR_SRC)
- @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunMSCAPI provider..."
- $(install-file)
- else
- $(SUNMSCAPI_JAR_DST): $(SUNMSCAPI_JAR_UNSIGNED)
- $(install-file)
- endif
-
- JARS += $(SUNMSCAPI_JAR_UNSIGNED) $(SUNMSCAPI_JAR_DST)
-
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifndef OPENJDK
-
- UCRYPTO_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/ucrypto.jar
- UCRYPTO_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/unsigned/ucrypto.jar
- UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
-
- $(eval $(call SetupArchive,BUILD_UCRYPTO_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/classes_security, \
- SUFFIXES := .class, \
- INCLUDES := com/oracle/security/ucrypto, \
- JAR := $(UCRYPTO_JAR_UNSIGNED), \
- MANIFEST := $(JCE_MANIFEST), \
- SKIP_METAINF := true))
-
- $(UCRYPTO_JAR_UNSIGNED): $(JCE_MANIFEST)
-
- $(UCRYPTO_JAR_DST): $(UCRYPTO_JAR_SRC)
- @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..."
- $(install-file)
-
- JARS += $(UCRYPTO_JAR_UNSIGNED) $(UCRYPTO_JAR_DST)
-
- endif
-endif
-
-all: $(JARS)
-
-.PHONY: default all
diff --git a/jdk/makefiles/GenerateData.gmk b/jdk/makefiles/GenerateData.gmk
deleted file mode 100644
index f4739ee..0000000
--- a/jdk/makefiles/GenerateData.gmk
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include Setup.gmk
-# We need the tools.
-include Tools.gmk
-
-# Now include all the rules that generate data resources.
-# These are written directly into classes dir.
-GENDATA :=
-
-include gendata/GendataBreakIterator.gmk
-GENDATA += $(BREAK_ITERATOR)
-
-include gendata/GendataFontConfig.gmk
-GENDATA += $(GENDATA_FONT_CONFIG)
-
-include gendata/GendataTZDB.gmk
-GENDATA += $(GENDATA_TZDB)
-
-include gendata/GendataHtml32dtd.gmk
-GENDATA += $(GENDATA_HTML32DTD)
-
-##########################################################################################
-
-GENDATA_UNINAME := $(JDK_OUTPUTDIR)/classes/java/lang/uniName.dat
-
-$(GENDATA_UNINAME): $(JDK_TOPDIR)/make/tools/UnicodeData/UnicodeData.txt $(BUILD_TOOLS)
- $(MKDIR) -p $(@D)
- $(TOOL_CHARACTERNAME) $< $@
-
-GENDATA += $(GENDATA_UNINAME)
-
-##########################################################################################
-
-GENDATA_CURDATA := $(JDK_OUTPUTDIR)/lib/currency.data
-
-$(GENDATA_CURDATA): $(JDK_TOPDIR)/src/share/classes/java/util/CurrencyData.properties $(BUILD_TOOLS)
- $(MKDIR) -p $(@D)
- $(RM) $@
- $(TOOL_GENERATECURRENCYDATA) -o $@.tmp < $<
- $(MV) $@.tmp $@
- $(CHMOD) 444 $@
-
-GENDATA += $(GENDATA_CURDATA)
-
-##########################################################################################
-
-$(GENDATA): $(BUILD_TOOLS)
-
-$(JDK_OUTPUTDIR)/classes/_the.gendata: $(GENDATA)
- $(TOUCH) $@
-
-all: $(JDK_OUTPUTDIR)/classes/_the.gendata
-
-.PHONY: all
diff --git a/jdk/makefiles/Makefile b/jdk/makefiles/Makefile
deleted file mode 100644
index c7d0dd0..0000000
--- a/jdk/makefiles/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Locate this Makefile
-ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
- makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
- makefile_path := $(lastword $(MAKEFILE_LIST))
-endif
-repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path))
-
-# What is the name of this subsystem (langtools, corba, etc)?
-subsystem_name := $(notdir $(repo_dir))
-
-# Try to locate 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 ===================================================)
-else
- $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
- $(error Build from top-level Makefile instead)
-endif
-
-all:
- @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/jdk/makefiles/PatchList.solaris b/jdk/makefiles/PatchList.solaris
deleted file mode 100644
index 8101c53..0000000
--- a/jdk/makefiles/PatchList.solaris
+++ /dev/null
@@ -1,30 +0,0 @@
-BUILD,RUNTIME 5.8 Sparc 109147-24 x86 109148-24 REQ "Linker patch"
-BUILD,RUNTIME 5.8 Sparc 108652-66 x86 108653-55 REQ "Xserver patch"
-BUILD,RUNTIME 5.8 Sparc 108940-52 x86 108941-52 REQ "Motif 2.1 patch"
-BUILD,RUNTIME 5.8 Sparc 108989-02 x86 108990-02 REQ "Accounting patch"
-BUILD,RUNTIME 5.8 Sparc none x86 111307-04 REQ "boot.bin, bootconf.exe, bootenv.rc and nbp patch"
-BUILD,RUNTIME 5.8 Sparc 111310-01 x86 111311-01 REQ "libhcpagent.so.l patch"
-BUILD,RUNTIME 5.8 Sparc 112396-02 x86 112397-02 REQ "fgrep patch"
-BUILD,RUNTIME 5.8 Sparc 108987-13 x86 108988-13 REQ "patchadd, patchrm patch"
-BUILD,RUNTIME 5.8 Sparc 111111-03 x86 111112-03 REQ "nawk patch"
-BUILD,RUNTIME 5.8 Sparc 108528-20 x86 108529-20 REQ "Kernel update"
-BUILD,RUNTIME 5.8 Sparc 108993-18 x86 none REQ "LDAP2 Patch"
-BUILD,RUNTIME 5.8 Sparc none x86 110400-01 REQ "RBAC Feature patch"
-BUILD,RUNTIME 5.8 Sparc none x86 111024-02 REQ "/kernel/fs/mntfs patch"
-BUILD,RUNTIME 5.8 Sparc none x86 108994-18 REQ "LDAP2 patch"
-BUILD,RUNTIME 5.8 Sparc 109147-23 x86 109148-23 REQ "linker patch"
-BUILD,RUNTIME 5.8 Sparc 111308-03 x86 111309-03 REQ "Performance for apps using memory alloc"
-RUNTIME 5.8 Sparc 112003-03 x86 none REQ "Fontset patch for sparcv9"
-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 112438-01 x86 112439-01 REQ "/kernel/drv/random patch"
-
-COMPILER 5.8 Sparc 109505-06 x86 109502-03 REQ "For C 5.0, C++ 5.0"
-COMPILER 5.8 Sparc 109513-05 x86 109514-03 REQ "For Forte Development 6 C compiler"
-COMPILER 5.8 Sparc 109508-03 x86 109509-03 REQ "For Forte Development 6 update 1 C++ compiler"
-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"
diff --git a/jdk/makefiles/SignJars.gmk b/jdk/makefiles/SignJars.gmk
deleted file mode 100644
index 263d266..0000000
--- a/jdk/makefiles/SignJars.gmk
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include $(SPEC)
-include MakeBase.gmk
-
-# (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
-# jar file is installed into JDK, things will break when the crypto
-# routines are called.
-#
-# All jars are created in CreateJars.gmk. This Makefile does the signing
-# of the jars for JDK.
-#
-# 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
-# separate from the JDK workspace to prevent its disclosure.
-#
-# SPECIAL NOTE TO JCE/JDK developers: The source files must eventually
-# be built, signed, and then the resulting jar files MUST BE CHECKED
-# INTO THE CLOSED PART OF THE WORKSPACE*. This separate step *MUST NOT
-# BE FORGOTTEN*, otherwise a bug fixed in the source code will not be
-# reflected in the shipped binaries.
-#
-# Please consult with Release Engineering, which is responsible for
-# creating the final JCE builds suitable for checkin.
-#
-
-# Default target
-all:
-
-ifndef OPENJDK
-
-README-MAKEFILE_WARNING := \
- "\nPlease read jdk/makefiles/SignJars.gmk for further build instructions.\n"
-
-#
-# Location for JCE codesigning key.
-#
-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
-
-#
-# 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; \
- fi
-
-$(JCE_OUTPUTDIR)/%: $(JDK_OUTPUTDIR)/unsigned/%
- $(call install-file)
- $(JARSIGNER) -keystore $(SIGNING_KEYSTORE) \
- $@ $(SIGNING_ALIAS) < $(SIGNING_PASSPHRASE)
- @$(PRINTF) "\nJar codesigning finished.\n"
-
-JAR_LIST := \
- jce.jar \
- local_policy.jar \
- sunec.jar \
- sunjce_provider.jar \
- sunpkcs11.jar \
- US_export_policy.jar \
- sunmscapi.jar \
- ucrypto.jar \
- #
-
-UNSIGNED_JARS := $(wildcard $(addprefix $(JDK_OUTPUTDIR)/unsigned/, $(JAR_LIST)))
-
-ifeq ($(UNSIGNED_JARS), )
- $(error No jars found in $(JDK_OUTPUTDIR)/unsigned/)
-endif
-
-SIGNED_JARS := $(patsubst $(JDK_OUTPUTDIR)/unsigned/%,$(JCE_OUTPUTDIR)/%, $(UNSIGNED_JARS))
-
-$(SIGNED_JARS): check-keystore
-
-all: $(SIGNED_JARS)
- @$(PRINTF) "\n*** The jar files built by the 'sign-jars' target are developer ***"
- @$(PRINTF) "\n*** builds only and *MUST NOT* be checked into the closed workspace. ***"
- @$(PRINTF) "\n*** ***"
- @$(PRINTF) "\n*** Please consult with Release Engineering: they will generate ***"
- @$(PRINTF) "\n*** the proper binaries for the closed workspace. ***"
- @$(PRINTF) "\n"
- @$(PRINTF) $(README-MAKEFILE_WARNING)
-
-endif # !OPENJDK
diff --git a/jdk/makefiles/Tools.gmk b/jdk/makefiles/Tools.gmk
deleted file mode 100644
index d6d994a..0000000
--- a/jdk/makefiles/Tools.gmk
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Cache all finds needed for this file. Only used on windows.
-$(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
-
-ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
- 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))
-endif
-
-$(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))
-
-# Resources used by CheckDeps tool
-$(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
-
-# The buildmetaindex tool creates a meta-index to make core class loaders lazier.
-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_COMPILEFONTCONFIG = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.compilefontconfig.CompileFontConfig
-
-TOOL_COMPILEPROPERTIES = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.compileproperties.CompileProperties
-
-TOOL_STRIPPROPERTIES = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.stripproperties.StripProperties
-
-TOOL_JARREORDER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.jarreorder.JarReorder
-
-TOOL_GENERATECHARACTER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.generatecharacter.GenerateCharacter
-
-TOOL_CHARACTERNAME = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.generatecharacter.CharacterName
-
-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_GENERATEBREAKITERATORDATA = $(JAVA) \
- -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.generatebreakiteratordata.GenerateBreakIteratorData
-
-TOOL_GENERATECURRENCYDATA = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.generatecurrencydata.GenerateCurrencyData
-
-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_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
-# and nbproject/project.properties in the same dir. Needs to be looked at.
-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_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
-
-# Nimbus is used somewhere in the swing build.
-TOOL_GENERATENIMBUS = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.generatenimbus.Generator
-
-TOOL_WRAPPERGENERATOR = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
- WrapperGenerator
-
-TOOL_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_CLDRCONVERTER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.cldrconverter.CLDRConverter
-
-TOOL_REMOVEMETHODS = $(JAVA) -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
- -cp $(JDK_OUTPUTDIR)/btclasses:$(JDK_OUTPUTDIR) \
- build.tools.classfile.RemoveMethods
-
-TOOL_CHECKDEPS = $(JAVA) -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
- -cp $(JDK_OUTPUTDIR)/btclasses:$(JDK_OUTPUTDIR) \
- build.tools.deps.CheckDeps
-
-TOOL_ADDTORESTRICTEDPKGS=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
- build.tools.addtorestrictedpkgs.AddToRestrictedPkgs
-
-##########################################################################################
-
-# Tools needed on solaris because OBJCOPY is broken.
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-$(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))
-endif
diff --git a/jdk/makefiles/gendata/GendataBreakIterator.gmk b/jdk/makefiles/gendata/GendataBreakIterator.gmk
deleted file mode 100644
index 1b9eba3..0000000
--- a/jdk/makefiles/gendata/GendataBreakIterator.gmk
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Make file for generating BreakIterator data files.
-#
-
-# 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.
-#
-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
-
-# Generate BreakIteratorData
-BREAK_ITERATOR_DIR = $(JDK_OUTPUTDIR)/break_iterator
-BREAK_ITERATOR_CLASSES = $(BREAK_ITERATOR_DIR)/classes
-
-# JAVAC_SOURCE_PATH_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 N-1 compatible.
-# Because we are targeting jdk N-1, but the surrounding source code is jdk N.
-# These two files should be moved out to a build tool! We have to disable
-# sjavac here as well.
-$(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR, \
- SETUP := GENERATE_OLDBYTECODE, \
- SRC := $(TEXT_SRCDIR), \
- DISABLE_SJAVAC := true, \
- JAVAC_SOURCE_PATH_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
-
-# 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)/_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)
- $(RM) $(BIFILES)
- $(TOOL_GENERATEBREAKITERATORDATA) \
- -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
- $(RM) $(BIFILES_TH)
- $(TOOL_GENERATEBREAKITERATORDATA) \
- -o $(DATA_PKG_DIR) \
- -spec $(UNICODEDATA) \
- -language th
- $(TOUCH) $@
-
-
-BREAK_ITERATOR += $(BIFILES) $(BIFILES_TH)
diff --git a/jdk/makefiles/gendata/GendataTZDB.gmk b/jdk/makefiles/gendata/GendataTZDB.gmk
deleted file mode 100644
index 46ef698..0000000
--- a/jdk/makefiles/gendata/GendataTZDB.gmk
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-GENDATA_TZDB :=
-
-#
-# Time zone data file creation
-#
-TZDATA_DIR := $(JDK_TOPDIR)/make/sun/javazic/tzdata
-TZDATA_TZFILE := africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera gmt jdk11_backward
-TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))
-
-GENDATA_TZDB_DAT := $(JDK_OUTPUTDIR)/lib/tzdb.dat
-
-$(GENDATA_TZDB_DAT): $(TZDATA_TZFILES)
- $(RM) $(GENDATA_TZDB_DAT)
- $(TOOL_TZDB) -srcdir $(TZDATA_DIR) -dstfile $(GENDATA_TZDB_DAT) $(TZDATA_TZFILE)
-
-GENDATA_TZDB += $(GENDATA_TZDB_DAT)
diff --git a/jdk/makefiles/gendata/GendataTimeZone.gmk b/jdk/makefiles/gendata/GendataTimeZone.gmk
deleted file mode 100644
index f78c14f..0000000
--- a/jdk/makefiles/gendata/GendataTimeZone.gmk
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-GENDATA_TIMEZONE :=
-
-# TODO: read from make/sun/javazic/tzdata/VERSION
-GENDATA_TIMEZONE_VERSION := tzdata2012i
-
-GENDATA_TIMEZONE_DST := $(JDK_OUTPUTDIR)/lib/zi
-GENDATA_TIMEZONE_TMP := $(JDK_OUTPUTDIR)/gendata_timezone
-
-TZFILE0 := \
- africa antarctica asia australasia europe northamerica \
- pacificnew southamerica backward \
- etcetera systemv
-
-TZFILE1 := \
- gmt jdk11_backward
-
-TZFILES := \
- $(addprefix $(JDK_TOPDIR)/make/sun/javazic/tzdata/,$(TZFILE0)) \
- $(addprefix $(JDK_TOPDIR)/make/sun/javazic/tzdata_jdk/,$(TZFILE1))
-
-GENDATA_TIMEZONE_MAPFILE := ZoneInfoMappings
-
-$(GENDATA_TIMEZONE_DST)/$(GENDATA_TIMEZONE_MAPFILE): $(TZFILES)
- $(RM) -r $(GENDATA_TIMEZONE_TMP)
- $(MKDIR) -p $(GENDATA_TIMEZONE_TMP)
- $(RM) -r $(GENDATA_TIMEZONE_DST)
- $(MKDIR) -p $(GENDATA_TIMEZONE_DST)
- $(TOOL_JAVAZIC) -V "$(GENDATA_TIMEZONE_VERSION)" -d $(GENDATA_TIMEZONE_TMP) $(TZFILES)
- $(CP) -r $(GENDATA_TIMEZONE_TMP)/* $(GENDATA_TIMEZONE_DST)/
-
-GENDATA_TIMEZONE += $(GENDATA_TIMEZONE_DST)/$(GENDATA_TIMEZONE_MAPFILE)
diff --git a/jdk/makefiles/gensrc/GensrcCharacterData.gmk b/jdk/makefiles/gensrc/GensrcCharacterData.gmk
deleted file mode 100644
index 2c6cc7a..0000000
--- a/jdk/makefiles/gensrc/GensrcCharacterData.gmk
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Rules to create $(JDK_OUTPUTDIR)/gensrc/sun/lang/CharacterData*.java
-#
-
-GENSRC_CHARACTERDATA :=
-
-CHARACTERDATA = $(JDK_TOPDIR)/make/tools/GenerateCharacter
-UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData
-
-define SetupCharacterData
- $(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
-
- 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))
-
-# Copy two Java files that need no preprocessing.
-$(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
-
-$(GENSRC_CHARACTERDATA): $(BUILD_TOOLS)
diff --git a/jdk/makefiles/gensrc/GensrcCharsetMapping.gmk b/jdk/makefiles/gensrc/GensrcCharsetMapping.gmk
deleted file mode 100644
index 6dfc8d9..0000000
--- a/jdk/makefiles/gensrc/GensrcCharsetMapping.gmk
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-GENSRC_CHARSETMAPPING :=
-
-GENSRC_TMP := $(JDK_OUTPUTDIR)/gensrc
-GENSRC_DST := $(JDK_OUTPUTDIR)/gensrc/sun/nio/cs
-
-GENSRC_SRC := $(JDK_TOPDIR)/make/tools/CharsetMapping
-GENSRC_JAVA_SRC := $(JDK_TOPDIR)/make/tools/src/build/tools/charsetmapping
-
-GENSRC_TEMPLATES := $(GENSRC_SRC)/SingleByte-X.java.template $(GENSRC_SRC)/DoubleByte-X.java.template
-
-###
-
-$(GENSRC_TMP)/_the.charsetmapping.dir:
- $(ECHO) Generating charsetmapping classes
- $(MKDIR) -p $(GENSRC_DST)/ext
- $(TOUCH) $@
-
-###
-
-GENSRC_SB := $(GENSRC_TMP)/_the.charsetmapping.sbcs
-
-$(GENSRC_SB): $(GENSRC_SRC)/sbcs $(GENSRC_TEMPLATES) $(GENSRC_TMP)/_the.charsetmapping.dir
- $(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_SRC) $(GENSRC_DST) sbcs
- $(TOUCH) $@
-
-GENSRC_CHARSETMAPPING += $(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)
- $(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)
- $(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)
- $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(LOG_INFO) $(GENSRC_DST)/ext extsbcs
- $(TOUCH) $@
-
-GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.extsbcs
-
-###
-
-$(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs: $(GENSRC_SRC)/dbcs $(GENSRC_TEMPLATES) $(GENSRC_SB)
- $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(LOG_INFO) $(GENSRC_DST)/ext dbcs
- $(TOUCH) $@
-
-GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs
-
-###
-
-GENSRC_CHARSET_PROVIDER_CMD := $(JDK_TOPDIR)/makefiles/scripts/genCharsetProvider.sh
-
-$(GENSRC_DST)/StandardCharsets.java: $(JDK_TOPDIR)/src/share/classes/sun/nio/cs/standard-charsets \
- $(GENSRC_CHARSET_PROVIDER_CMD) \
- $(GENSRC_TMP)/_the.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)
-
-GENSRC_CHARSETMAPPING += $(GENSRC_DST)/StandardCharsets.java
-
-$(GENSRC_CHARSETMAPPING): $(BUILD_TOOLS)
diff --git a/jdk/makefiles/gensrc/GensrcExceptions.gmk b/jdk/makefiles/gensrc/GensrcExceptions.gmk
deleted file mode 100644
index cf9c6ad..0000000
--- a/jdk/makefiles/gensrc/GensrcExceptions.gmk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-GENSRC_EXCEPTIONS :=
-
-GENSRC_EXCEPTIONS_TMP := $(JDK_OUTPUTDIR)/gensrc
-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_DST)/_the.exceptions.dir:
- $(ECHO) "Generating exceptions classes"
- $(MKDIR) -p $(@D)
- $(TOUCH) $@
-
-
-###
-
-$(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)
- $(TOUCH) $@
-
-GENSRC_EXCEPTIONS += $(foreach D,$(GENSRC_EXCEPTIONS_SRC_DIRS),$(GENSRC_EXCEPTIONS_DST)/_the.$(D))
-
-$(GENSRC_EXCEPTIONS): $(BUILD_TOOLS)
diff --git a/jdk/makefiles/gensrc/GensrcJDWP.gmk b/jdk/makefiles/gensrc/GensrcJDWP.gmk
deleted file mode 100644
index de24575..0000000
--- a/jdk/makefiles/gensrc/GensrcJDWP.gmk
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# 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/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
- $(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
diff --git a/jdk/makefiles/gensrc/GensrcLocaleDataMetaInfo.gmk b/jdk/makefiles/gensrc/GensrcLocaleDataMetaInfo.gmk
deleted file mode 100644
index 360a032..0000000
--- a/jdk/makefiles/gensrc/GensrcLocaleDataMetaInfo.gmk
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Scan for all locale resources and extract for which locales there exists
-# resources. Then put this meta information about exiting (supported?) locales
-# 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")
-
-# 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))
-
-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%
-
-# 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
-
-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))
-
- 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'
-endef
-
-#sun.text.resources.FormatData
-$(eval $(call CaptureLocale,FormatData))
-
-#sun.text.resources.CollationData
-$(eval $(call CaptureLocale,CollationData))
-
-#sun.util.resources.TimeZoneNames
-$(eval $(call CaptureLocale,TimeZoneNames))
-
-#sun.util.resources.LocaleNames
-$(eval $(call CaptureLocale,LocaleNames))
-
-#sun.util.resources.CurrencyNames
-$(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'
-
-$(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java: \
- $(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_CRBC_DST := $(JDK_OUTPUTDIR)/gensrc/sun/util/CoreResourceBundleControl.java
-GENSRC_CRBC_CMD := $(JDK_TOPDIR)/makefiles/scripts/localelist.sh
-
-JRE_NONEXIST_LOCALES := en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh
-
-$(GENSRC_CRBC_DST): $(JDK_TOPDIR)/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template \
- $(GENSRC_CRBC_CMD)
- $(MKDIR) -p $(@D)
- NAWK="$(NAWK)" SED="$(SED)" $(SH) $(GENSRC_CRBC_CMD) "$(JRE_NONEXIST_LOCALES)" $< $@
-
-GENSRC_LOCALEDATAMETAINFO += $(GENSRC_CRBC_DST)
-
-###
diff --git a/jdk/makefiles/gensrc/GensrcMisc.gmk b/jdk/makefiles/gensrc/GensrcMisc.gmk
deleted file mode 100644
index 20d0820..0000000
--- a/jdk/makefiles/gensrc/GensrcMisc.gmk
+++ /dev/null
@@ -1,240 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include ProfileNames.gmk
-
-##########################################################################################
-# Install the launcher name, release version string, full version
-# string and the runtime name into the Version.java file.
-# To be printed by java -version
-
-$(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
-$(PROFILE_VERSION_JAVA_TARGETS): \
- $(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
- $(MV) $@.tmp $@
-
-GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
- $(PROFILE_VERSION_JAVA_TARGETS)
-
-##########################################################################################
-# Version file for jconsole
-
-$(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java: \
- $(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
- $(SED) -e 's/@@jconsole_version@@/$(FULL_VERSION)/g' $< > $@.tmp
- $(MV) $@.tmp $@
-
-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/.
-
- $(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
-endif
-
-##########################################################################################
-
-GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java
-
-GENSRC_SOR_SRC := $(JDK_TOPDIR)/src/share/native/sun/nio/ch
-GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c
-GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/gensrc/genSocketOptionRegistry
-
-SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOR_SRC)/$(GENSRC_SOR_SRC_FILE) | \
- $(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))
-
-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)
- $(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
- $(call install-file)
-endif
-
-##########################################################################################
-
-ifneq ($(OPENJDK_TARGET_OS), windows)
-
- 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
-
- 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))
-
- 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)
- $(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
- $(call install-file)
- endif
-
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-
- 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
-
- 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))
-
- $(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
- $(BUILD_GENSRC_SOL_EXE) >> $@.tmp
- $(MV) $@.tmp $@
-
-
-endif
-
-##########################################################################################
-
-ifndef OPENJDK
- 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
- $(install-file)
-
- $(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
- $(install-file)
-
- $(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
-
- else
- $(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
- $(install-file)
-
- 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
-
-##########################################################################################
diff --git a/jdk/makefiles/gensrc/GensrcSwing.gmk b/jdk/makefiles/gensrc/GensrcSwing.gmk
deleted file mode 100644
index cfdc78d..0000000
--- a/jdk/makefiles/gensrc/GensrcSwing.gmk
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# 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
-
-$(JDK_OUTPUTDIR)/gensrc/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS)
- $(MKDIR) -p $(@D)
- $(ECHO) "Generating Nimbus source files"
- $(TOOL_GENERATENIMBUS) $(LOG_INFO) \
- -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(JDK_OUTPUTDIR)/gensrc \
- -packagePrefix $(NIMBUS_PACKAGE).nimbus -lafName Nimbus
- $(ECHO) $(LOG_INFO) "Finished generating Nimbus source files"
- $(TOUCH) $@
-
-GENSRC_SWING_NIMBUS := $(JDK_OUTPUTDIR)/gensrc/_the.generated_nimbus
-
-#
-# Generate beaninfo java files
-#
-
-DOCLETSRC_DIR = $(JDK_TOPDIR)/make/tools/swing-beans
-
-# javax.swing package
-BEANS = AbstractButton Box JComponent JApplet JButton \
- JCheckBox JCheckBoxMenuItem JComboBox JColorChooser \
- JDesktopPane JDialog JEditorPane JFileChooser JFrame \
- JFormattedTextField JInternalFrame JLabel JLayeredPane \
- JList JMenu JMenuBar JMenuItem JOptionPane JPanel \
- JPasswordField JPopupMenu JProgressBar JRadioButton \
- JRadioButtonMenuItem JScrollBar JScrollPane JSeparator \
- JSlider JSplitPane JSpinner JTabbedPane JTable \
- JTextArea JTextField JTextPane JToggleButton JToolBar \
- JTree JWindow
-
-# javax.swing.text package
-BEANS_TEXT = JTextComponent
-
-BEANS_SRC = $(BEANS:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/%.java) \
- $(BEANS_TEXT:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/text/%.java)
-
-# Dummy variable so far, in the old build system it was false by default
-SWINGBEAN_DEBUG_FLAG = false
-# GenDocletBeanInfo is compiled in Tools.gmk and picks up from $(JDK_OUTPUTDIR)/btclasses
-# 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)
- $(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.
- $(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
- $(TOUCH) $@
-
-# This file is the part of dt.jar
-# For some reason it is under $(JDK_TOPDIR)/make/tools/swing-beans/javax/swing
-# Should it be moved under $(JDK_TOPDIR)/src/share/classes/javax/swing instead?
-$(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
-# 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
- $(call install-file)
-
-GENSRC_SWING_BEANINFO = $(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo
diff --git a/jdk/makefiles/jprt.gmk b/jdk/makefiles/jprt.gmk
deleted file mode 100644
index 00b5f5f..0000000
--- a/jdk/makefiles/jprt.gmk
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# JPRT rule to build this workspace
-
-JPRT_ARCHIVE_BUNDLE = $(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
-
-jprt_build_product: all images
- ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
- $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-jprt_build_fastdebug: fastdebug images
- ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
- $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-jprt_build_debug: debug images
- ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
- $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-#
-# Phonies to avoid accidents.
-#
-.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
diff --git a/jdk/makefiles/jprt.properties b/jdk/makefiles/jprt.properties
deleted file mode 100644
index 6dfdf2f..0000000
--- a/jdk/makefiles/jprt.properties
+++ /dev/null
@@ -1,254 +0,0 @@
-#
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Properties for jprt
-
-# Release to build for
-jprt.tools.default.release=jdk8
-
-# The different build flavors we want, we override here so we just get these 2
-jprt.build.flavors=product,fastdebug
-
-# Standard list of jprt build targets for this source tree
-jprt.build.targets= \
- solaris_sparcv9_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_sparcv9_5.10-product-c2-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}
-
-# Default jdk test targets in test/Makefile (no fastdebug & limited c2)
-jprt.make.rule.default.test.targets= \
- \
- solaris_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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_sparcv9_5.10-product-c2-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.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}
-
-# Directories to be excluded from the source bundles
-jprt.bundle.exclude.src.dirs=build dist webrev
diff --git a/jdk/makefiles/lib/Awt2dLibraries.gmk b/jdk/makefiles/lib/Awt2dLibraries.gmk
deleted file mode 100644
index c58187a..0000000
--- a/jdk/makefiles/lib/Awt2dLibraries.gmk
+++ /dev/null
@@ -1,1498 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Openwin is defined on Solaris.
-OPENWIN_LIB := $(OPENWIN_HOME)/lib
-
-WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
-
-##########################################################################################
-
-BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib
-BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
- -I$(BUILD_LIBMLIB_SRC) \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/medialib
-
-BUILD_LIBMLIB_LDLIBS :=
-BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libmlib_image/mapfile-vers
-
-BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
-
-ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
- BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), windows)
- BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
- LIBRARY := mlib_image, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBMLIB_SRC), \
- EXCLUDE_FILES := awt_ImagingLib.c mlib_c_ImageBlendTable.c, \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(BUILD_LIBMLIB_CFLAGS), \
- MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(BUILD_LIBMLIB_LDLIBS) \
- $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=mlib_image.dll" \
- -D "JDK_INTERNAL_NAME=mlib_image" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBMLIB_IMAGE): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
-
- BUILD_LIBMLIB_IMAGE_V_FILES := \
- mlib_v_ImageLookUp.c \
- mlib_ImageCreate.c \
- mlib_ImageAffine.c \
- mlib_ImageConvMxN.c \
- mlib_ImageConvKernelConvert.c \
- mlib_sys.c \
- mlib_ImageLookUp_64.c \
- mlib_ImageLookUp_Bit.c \
- mlib_ImageColorTrue2Index.c \
- mlib_c_ImageThresh1_U8.c \
- mlib_v_ImageLookUpS16S16Func.c \
- mlib_v_ImageLookUpS16S32Func.c \
- mlib_v_ImageLookUpS16U16Func.c \
- mlib_v_ImageLookUpS16U8Func.c \
- mlib_v_ImageLookUpS32S16Func.c \
- mlib_v_ImageLookUpS32S32Func.c \
- mlib_v_ImageLookUpS32U16Func.c \
- mlib_v_ImageLookUpS32U8Func.c \
- mlib_v_ImageLookUpSIS16S16Func.c \
- mlib_v_ImageLookUpSIS16S32Func.c \
- mlib_v_ImageLookUpSIS16U16Func.c \
- mlib_v_ImageLookUpSIS16U8Func.c \
- mlib_v_ImageLookUpSIS32S16Func.c \
- mlib_v_ImageLookUpSIS32S32Func.c \
- mlib_v_ImageLookUpSIS32U16Func.c \
- mlib_v_ImageLookUpSIS32U8Func.c \
- mlib_v_ImageLookUpSIU16S16Func.c \
- mlib_v_ImageLookUpSIU16S32Func.c \
- mlib_v_ImageLookUpSIU16U16Func.c \
- mlib_v_ImageLookUpSIU16U8Func.c \
- mlib_v_ImageLookUpSIU8S16Func.c \
- mlib_v_ImageLookUpSIU8S32Func.c \
- mlib_v_ImageLookUpSIU8U16Func.c \
- mlib_v_ImageLookUpSIU8U8Func.c \
- mlib_v_ImageLookUpU16S16Func.c \
- mlib_v_ImageLookUpU16S32Func.c \
- mlib_v_ImageLookUpU16U16Func.c \
- mlib_v_ImageLookUpU16U8Func.c \
- mlib_v_ImageLookUpU8S16Func.c \
- mlib_v_ImageLookUpU8S32Func.c \
- mlib_v_ImageLookUpU8U16Func.c \
- mlib_v_ImageLookUpU8U8Func.c \
- mlib_v_ImageAffineIndex_BC.c \
- mlib_v_ImageAffine_BC.c \
- mlib_v_ImageAffine_BC_S16.c \
- mlib_v_ImageAffine_BC_U16.c \
- mlib_v_ImageAffine_BL.c \
- mlib_v_ImageAffine_BL_S16.c \
- mlib_v_ImageAffine_BL_U16.c \
- mlib_v_ImageAffine_NN.c \
- mlib_v_ImageFilters.c \
- mlib_ImageAffineEdge.c \
- mlib_ImageAffine_BC_D64.c \
- mlib_ImageAffine_BC_F32.c \
- mlib_ImageAffine_BC_S32.c \
- mlib_ImageAffine_BL_D64.c \
- mlib_ImageAffine_BL_F32.c \
- mlib_ImageAffine_BL_S32.c \
- mlib_ImageAffine_NN.c \
- mlib_ImageAffine_NN_Bit.c \
- mlib_ImageFilters.c \
- mlib_ImageScanPoly.c \
- mlib_ImageConv_8nw.c \
- mlib_ImageConv_8ext.c \
- mlib_ImageConv_16nw.c \
- mlib_ImageConv_16ext.c \
- mlib_ImageConv_u16nw.c \
- mlib_ImageConv_u16ext.c \
- mlib_ImageConv_32nw.c \
- mlib_ImageConv_F32nw.c \
- mlib_ImageConvMxN_Fp.c \
- mlib_ImageConvMxN_ext.c \
- mlib_ImageConv_D64nw.c \
- mlib_ImageClipping.c \
- mlib_ImageConvCopyEdge_Bit.c \
- mlib_ImageConvClearEdge_Bit.c \
- mlib_ImageConv2x2_f.c \
- mlib_ImageConvClearEdge_Fp.c \
- mlib_v_ImageConvMxN_8.c \
- mlib_v_ImageConvClearEdge.c \
- mlib_v_ImageConvCopyEdge.c \
- mlib_v_ImageConvMxN_8ext.c \
- mlib_v_ImageConvVersion.c \
- mlib_v_ImageConv_8nw.c \
- mlib_ImageConvCopyEdge_Fp.c \
- mlib_v_ImageChannelInsert_1.c \
- mlib_v_ImageChannelExtract_43.c \
- mlib_v_ImageChannelExtract_1.c \
- mlib_ImageCopy_Bit.c \
- mlib_v_ImageCopy_f.c \
- mlib_ImageUtils.c \
- mlib_ImageDivTables.c
-
- BUILD_LIBMLIB_V_CFLAGS := $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V, \
- LIBRARY := mlib_image_v, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
- $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib, \
- LANG := C, \
- INCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_FILES), \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := -xarch=sparcvis \
- $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il \
- $(BUILD_LIBMLIB_V_CFLAGS) \
- $(CFLAGS_JDKLIB), \
- MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image_v, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
-
-endif
-
-##########################################################################################
-
-LIBAWT_DIRS := \
- $(JDK_TOPDIR)/src/share/native/sun/awt \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/gif \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
- $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
- $(JDK_TOPDIR)/src/share/native/sun/java2d \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/share/native/sun/font
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBAWT_DIRS += \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
-else ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBAWT_DIRS += \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
-endif
-
-LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
- $(X_CFLAGS) \
- $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
-
-LIBAWT_FILES := \
- gifdecoder.c \
- imageInitIDs.c \
- img_globals.c \
- SurfaceData.c \
- Region.c \
- BufImgSurfaceData.c \
- Disposer.c \
- Trace.c \
- GraphicsPrimitiveMgr.c \
- Blit.c \
- BlitBg.c \
- ScaledBlit.c \
- FillRect.c \
- FillSpans.c \
- FillParallelogram.c \
- DrawParallelogram.c \
- DrawLine.c \
- DrawRect.c \
- DrawPolygons.c \
- DrawPath.c \
- FillPath.c \
- ProcessPath.c \
- MaskBlit.c \
- MaskFill.c \
- TransformHelper.c \
- AlphaMath.c \
- AlphaMacros.c \
- AnyByte.c \
- ByteBinary1Bit.c \
- ByteBinary2Bit.c \
- ByteBinary4Bit.c \
- ByteIndexed.c \
- ByteGray.c \
- Index8Gray.c \
- Index12Gray.c \
- AnyShort.c \
- Ushort555Rgb.c \
- Ushort565Rgb.c \
- Ushort4444Argb.c \
- Ushort555Rgbx.c \
- UshortGray.c \
- UshortIndexed.c \
- Any3Byte.c \
- ThreeByteBgr.c \
- AnyInt.c \
- IntArgb.c \
- IntArgbPre.c \
- IntArgbBm.c \
- IntRgb.c \
- IntBgr.c \
- IntRgbx.c \
- Any4Byte.c \
- FourByteAbgr.c \
- FourByteAbgrPre.c \
- BufferedMaskBlit.c \
- BufferedRenderPipe.c \
- ShapeSpanIterator.c \
- SpanClipRenderer.c \
- awt_ImageRep.c \
- awt_ImagingLib.c \
- awt_Mlib.c \
- awt_parseImage.c \
- DataBufferNative.c \
- dither.c \
- debug_assert.c \
- debug_mem.c \
- debug_trace.c \
- debug_util.c
-
-ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris linux))
- LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBAWT_FILES += awt_LoadLibrary.c img_colors.c
- LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
-endif
-
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
- LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
- LIBAWT_CFLAGS += -xarch=sparcvis
- LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il
- LIBAWT_CFLAGS += \
- -I$(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
- -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/medialib \
- -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
-
- LIBAWT_DIRS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
- $(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
-
- LIBAWT_FILES += \
- vis_FuncArray.c \
- java2d_Mlib.c \
- mlib_ImageCreate.c \
- mlib_ImageZoom_NN.c \
- mlib_ImageCopy_Bit.c \
- mlib_sys.c \
- mlib_v_ImageClear.c \
- mlib_v_ImageClear_f.c \
- mlib_v_ImageConstXor.c \
- mlib_v_ImageCopy.c \
- mlib_v_ImageCopy_f.c \
- mlib_v_ImageXor.c \
- mlib_v_ImageZoom_NN_f.c \
- vis_Interp.c \
- vis_AlphaMacros.c \
- vis_AlphaMaskBlit.c \
- vis_AlphaMaskFill.c \
- vis_ByteGray.c \
- vis_ByteGray_FromRgb.c \
- vis_ByteGray_Mask.c \
- vis_ByteIndexed.c \
- vis_DrawLine.c \
- vis_FourByteAbgr.c \
- vis_IntArgb.c \
- vis_IntArgbPre.c \
- vis_IntArgbPre_Mask.c \
- vis_IntBgr.c \
- vis_IntRgb.c \
- vis_IntRgbx.c \
- vis_SrcMaskFill.c \
- vis_SrcOverMaskBlit.c \
- vis_SrcOverMaskFill.c \
- vis_FourByteAbgrPre.c \
- vis_GlyphList.c \
- vis_GlyphListXor.c \
- vis_IntArgbBm.c \
- vis_ThreeByteBgr.c \
- vis_UshortGray.c \
- vis_UshortGray_FromRgb.c \
- vis_XorBlit.c \
- mlib_v_ImageCopy_blk.s
-
- ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
- LIBAWT_ASFLAGS = -P -xarch=v9a
- else
- LIBAWT_ASFLAGS = -P -xarch=v8plusa
- endif
-else
- LIBAWT_FILES += MapAccelFunc.c
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
-endif
-
-LIBAWT_LANG := C
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBAWT_FILES += AccelGlyphCache.c \
- ShaderList.c \
- CmdIDList.cpp \
- Hashtable.cpp \
- GDIHashtable.cpp \
- Devices.cpp \
- ObjectList.cpp \
- GDIBlitLoops.cpp \
- GDIRenderer.cpp \
- GDIWindowSurfaceData.cpp \
- WindowsFlags.cpp \
- WPrinterJob.cpp \
- awt_%.cpp \
- D3DBlitLoops.cpp \
- D3DBufImgOps.cpp \
- D3DContext.cpp \
- D3DGlyphCache.cpp \
- D3DGraphicsDevice.cpp \
- D3DMaskBlit.cpp \
- D3DMaskCache.cpp \
- D3DMaskFill.cpp \
- D3DPipelineManager.cpp \
- D3DPaints.cpp \
- D3DRenderer.cpp \
- D3DRenderQueue.cpp \
- D3DResourceManager.cpp \
- D3DSurfaceData.cpp \
- D3DTextRenderer.cpp \
- D3DVertexCacher.cpp \
- ShellFolder2.cpp \
- ThemeReader.cpp \
- ComCtl32Util.cpp \
- DllUtil.cpp \
- initIDs.cpp \
- MouseInfo.cpp \
- rect.c \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- WGLGraphicsConfig.c \
- WGLSurfaceData.c
-
- LIBAWT_LANG := C++
- LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
- ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
- LIBAWT_CFLAGS += -DMLIB_OS64BIT
- endif
-
- ifdef OPENJDK
- LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/windows/resource/icons"
- else
- LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
- endif
- LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/native/sun/windows/awt.rc
-endif
-
-ifeq ($(MILESTONE), internal)
- LIBAWT_CFLAGS += -DINTERNAL_BUILD
-endif
-
-LIBAWT_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt/mapfile-vers
-ifeq ($(OPENJDK_TARGET_OS), linux)
- LIBAWT_MAPFILE :=
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
- LIBRARY := awt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBAWT_DIRS), \
- INCLUDE_FILES := $(LIBAWT_FILES), \
- LANG := $(LIBAWT_LANG), \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
- ASFLAGS := $(LIBAWT_ASFLAGS), \
- MAPFILE := $(LIBAWT_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
- LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \
- LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \
- LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \
- -framework Cocoa \
- -framework OpenGL \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -framework ApplicationServices \
- -framework AudioToolbox \
- -ljava, \
- LDFLAGS_SUFFIX_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
- imm32.lib ole32.lib uuid.lib shell32.lib \
- comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
- delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
- -DELAYLOAD:user32.dll -DELAYLOAD:gdi32.dll \
- -DELAYLOAD:shell32.dll -DELAYLOAD:winmm.dll \
- -DELAYLOAD:winspool.drv -DELAYLOAD:imm32.dll \
- -DELAYLOAD:ole32.dll -DELAYLOAD:comdlg32.dll \
- -DELAYLOAD:comctl32.dll -DELAYLOAD:shlwapi.dll, \
- VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
- RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
- -D "JDK_FNAME=awt.dll" \
- -D "JDK_INTERNAL_NAME=awt" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBAWT): $(BUILD_LIBJAVA)
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
-endif
-
-BUILD_LIBRARIES += $(BUILD_LIBAWT)
-
-##########################################################################################
-
-ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
- ifndef BUILD_HEADLESS_ONLY
-
- LIBAWT_XAWT_DIRS := \
- $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
- $(JDK_TOPDIR)/src/share/native/sun/font \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \
-
- LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \
- -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
- $(CUPS_CFLAGS) \
- $(foreach dir, $(LIBAWT_XAWT_DIRS), -I$(dir)) \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga
-
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
- endif
-
- ifeq ($(OPENJDK_TARGET_OS), linux)
- ifndef OPENJDK
- include $(JDK_TOPDIR)/make/closed/xawt.gmk
- endif
-
- ifeq ($(DISABLE_XRENDER), true)
- LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
- endif
- endif
-
- ifeq ($(MILESTONE), internal)
- LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD
- endif
-
- LIBAWT_XAWT_FILES := \
- XlibWrapper.c \
- XWindow.c \
- XToolkit.c \
- X11Color.c \
- X11SurfaceData.c \
- awt_GraphicsEnv.c \
- awt_InputMethod.c \
- robot_common.c \
- awt_Robot.c \
- list.c \
- multiVis.c \
- initIDs.c \
- awt_util.c \
- awt_Desktop.c \
- awt_UNIXToolkit.c \
- X11FontScaler_md.c \
- X11TextRenderer_md.c \
- fontpath.c \
- awt_Insets.c \
- awt_Event.c \
- X11Renderer.c \
- X11PMBlitLoops.c \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- GLXGraphicsConfig.c \
- GLXSurfaceData.c \
- AccelGlyphCache.c \
- awt_Font.c \
- multi_font.c \
- awt_AWTEvent.c \
- awt_DrawingSurface.c \
- jawt.c \
- CUPSfuncs.c \
- debug_assert.c \
- debug_mem.c \
- debug_trace.c \
- debug_util.c \
- awt_Plugin.c \
- gnome_interface.c \
- gtk2_interface.c \
- swing_GTKEngine.c \
- swing_GTKStyle.c \
- rect.c \
- sun_awt_X11_GtkFileDialogPeer.c \
- XRSurfaceData.c \
- XRBackendNative.c
-
- LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
-
- ifeq ($(OPENJDK_TARGET_OS), linux)
- # To match old build, add this to LDFLAGS instead of suffix.
- LIBAWT_XAWT_LDFLAGS += -lpthread
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \
- LIBRARY := awt_xawt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBAWT_XAWT_DIRS), \
- INCLUDE_FILES := $(LIBAWT_XAWT_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
- $(X_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_xawt/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS), \
- LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN) \
- $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
- LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
- -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
- -R$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
- -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
- -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
- $(call SET_SHARED_LIBRARY_ORIGIN) \
- $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
- LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=xawt.dll" \
- -D "JDK_INTERNAL_NAME=xawt" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_xawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBAWT_XAWT): $(BUILD_LIBJAVA)
-
- $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
-
- BUILD_LIBRARIES += $(BUILD_LIBAWT_XAWT)
-
- endif
-endif
-
-##########################################################################################
-
-# TODO: Update awt lib path when awt is converted
-$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
- LIBRARY := lcms, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
- $(SHARED_LIBRARY_FLAGS) \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
- CFLAGS_solaris := -xc99=no_lib, \
- CFLAGS_windows := -DCMS_IS_WINDOWS_, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/liblcms/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
- LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
- LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
- LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=lcms.dll" \
- -D "JDK_INTERNAL_NAME=lcms" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBLCMS)
-
-$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
-
-##########################################################################################
-
-ifdef OPENJDK
- BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers
-else
- BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed
- BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
- BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
-endif
-
-BUILD_LIBJPEG_REORDER :=
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
- BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
- endif
-endif
-
-# Suppress gcc warnings like "variable might be clobbered by 'longjmp'
-# or 'vfork'": this warning indicates that some variable is placed to
-# a register by optimized compiler and it's value might be lost on longjmp().
-# Recommended way to avoid such warning is to declare the variable as
-# volatile to prevent the optimization. However, this approach does not
-# work because we have to declare all variables as volatile in result.
-#ifndef CROSS_COMPILE_ARCH
-# CC_43_OR_NEWER := \
-# $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
-# \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
-# ifeq ($(CC_43_OR_NEWER), 1)
-# BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered
-# endif
-#endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \
- LIBRARY := jpeg, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
- LANG := C, \
- OPTIMIZATION := HIGHEST, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
- MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jpeg.dll" \
- -D "JDK_INTERNAL_NAME=jpeg" \
- -D "JDK_FTYPE=0x2L", \
- REORDER := $(BUILD_LIBJPEG_REORDER), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJPEG)
-
-##########################################################################################
-
-ifndef OPENJDK
- FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k
- BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers
- LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
-else
- FONT_HEADERS := $(FREETYPE_CFLAGS)
- BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk
- BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS)
-endif
-
-LIBFONTMANAGER_OPTIMIZATION := HIGH
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
- X11TextRenderer.c
- LIBFONTMANAGER_OPTIMIZATION := HIGHEST
-else ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
- X11TextRenderer.c \
- fontpath.c \
- lcdglyph.c
-else
- LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
- lcdglyph.c
-endif
-
-BUILD_LIBFONTMANAGER_CFLAGS_COMMON := \
- $(X_CFLAGS) \
- -DLE_STANDALONE -DHEADLESS \
- $(FONT_HEADERS) \
- -I$(JDK_TOPDIR)/src/share/native/sun/font \
- -I$(JDK_TOPDIR)/src/share/native/sun/font/layout \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d
-
-# Turn off aliasing with GCC for ExtensionSubtables.cpp
-ifeq ($(OPENJDK_TARGET_OS), linux)
- BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
- LIBRARY := fontmanager, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/font \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font, \
- EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
- AccelGlyphCache.c, \
- LANG := C++, \
- CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
- CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
- OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
- CFLAGS_windows = -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
- -DCC_NOEX, \
- MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
- LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
- LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
- LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
- -ljava -ljvm, \
- LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
- $(WIN_AWT_LIB), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=fontmanager.dll" \
- -D "JDK_INTERNAL_NAME=fontmanager" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfontmanager, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_XAWT)
-endif
-
-BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER)
-
-##########################################################################################
-
-ifndef OPENJDK
-
- #ifeq ($(OPENJDK_TARGET_OS), linux)
- # ifeq ("$(CC_VER_MAJOR)", "3")
- # OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
- # endif
- #endif
- #
- # The resulting size of the t2k lib file is (at least on linux) dependant on the order of
- # the input .o files. Because of this the new build will differ in size to the old build.
- BUILD_LIBT2K_CFLAGS_COMMON := -I$(JDK_TOPDIR)/src/share/native/sun/font \
- -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
- -I$(JDK_TOPDIR)/src/closed/share/native/sun/font \
- -I$(JDK_TOPDIR)/src/share/share/native/sun/font \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \
- LIBRARY := t2k, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/font \
- $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
- $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k/ttHints, \
- EXCLUDE_FILES := orion.c, \
- LANG := C++, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
- CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
- CFLAGS_windows = -DCC_NOEX, \
- CXXFLAGS_windows = -DCC_NOEX, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libt2k/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
- LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=t2k.dll" \
- -D "JDK_INTERNAL_NAME=t2k" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libt2k, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- # t2k is linked against fontmanager
- $(BUILD_LIBT2K): $(BUILD_LIBFONTMANAGER)
-
- BUILD_LIBRARIES += $(BUILD_LIBT2K)
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- ifeq ($(OPENJDK_TARGET_CPU), x86)
- KERNEL32_LIB := kernel32.lib
- endif
- $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
- LIBRARY := jawt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows, \
- INCLUDE_FILES := jawt.cpp, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CXXFLAGS_JDKLIB) \
- -EHsc -DUNICODE -D_UNICODE \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \
- advapi32.lib $(WIN_AWT_LIB), \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jawt.dll" \
- -D "JDK_INTERNAL_NAME=jawt" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
-
- $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
- $(ECHO) Copying $(@F)
- $(CP) $(JDK_OUTPUTDIR)/objs/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
-
- BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
-
-else # OPENJDK_TARGET_OS not windows
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- JAWT_FILES := jawt.m
- JAWT_LIBS := -lawt_lwawt
- else
- JAWT_FILES := jawt.c
- JAWT_LIBS :=
- ifneq ($(OPENJDK_TARGET_OS), solaris)
- JAWT_LIBS += -lawt
- endif
- ifndef BUILD_HEADLESS_ONLY
- JAWT_LIBS += -lawt_xawt
- else
- JAWT_LIBS += -lawt_headless
- HEADLESS_CFLAG += -DHEADLESS
- endif
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
- LIBRARY := jawt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
- $(JDK_TOPDIR)/src/macosx/native/sun/awt, \
- INCLUDE_FILES := $(JAWT_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB), \
- CFLAGS_linux := $(HEADLESS_CFLAG), \
- CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjawt/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
- LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \
- LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \
- -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- ifndef BUILD_HEADLESS_ONLY
- $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
- else
- $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
- endif
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
- endif
-
-endif # OPENJDK_TARGET_OS
-
-BUILD_LIBRARIES += $(BUILD_LIBJAWT)
-
-##########################################################################################
-
-ifndef OPENJDK
-
- BUILD_LIBKCMS_EXCLUDE_FILES :=
- ifeq ($(OPENJDK_TARGET_OS), windows)
- BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c
- else
- BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c
- endif
-
- BUILD_LIBKCMS_FLAGS := $(CFLAGS_JDKLIB)
-
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- # This particular library uses a feature called PIC_CODE_SMALL (on solaris)
- # implement it like this...since it's only used here
- BUILD_LIBKCMS_FLAGS := $(patsubst -KPIC, -Kpic, $(BUILD_LIBKCMS_FLAGS))
- else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
- BUILD_LIBKCMS_FLAGS := $(patsubst -fPIC, -fpic, $(BUILD_LIBKCMS_FLAGS))
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \
- LIBRARY := kcms, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms, \
- LANG := C, \
- EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \
- OPTIMIZATION := LOW, \
- CFLAGS := $(BUILD_LIBKCMS_FLAGS) \
- -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \
- CFLAGS_linux := -Wno-missing-field-initializers, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libkcms/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := -lc -lpthread, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
- LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=kcms.dll" \
- -D "JDK_INTERNAL_NAME=kcms" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBKCMS): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBKCMS)
-
-endif
-
-##########################################################################################
-
-ifndef OPENJDK
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-
- ifeq ($(shell if test "$(OS_VERSION_MAJOR)" -eq 5 -a "$(OS_VERSION_MINOR)" -le 10; then $(ECHO) ok; fi), ok)
-
- SUNWJDGA_MAPFILE :=
- ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
- SUNWJDGA_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjdga/mapfile-vers
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \
- LIBRARY := sunwjdga, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/solaris/native/sun/jdga, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/javavm/export \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
- -I$(OPENWIN_HOME)/include, \
- MAPFILE := $(SUNWJDGA_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -ldga -lX11 $(LIBDL) -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA)
-
- endif
- endif
- endif
-endif
-
-##########################################################################################
-
-ifeq ($(BUILD_HEADLESS), true)
- # Mac and Windows only use the native AWT lib, do not build libawt_headless
- ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
-
- LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/solaris/native/sun/font \
- $(JDK_TOPDIR)/src/solaris/native/sun/awt \
- $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBAWT_HEADLESS_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/font
- endif
-
- LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \
- -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
- $(CUPS_CFLAGS) \
- $(X_CFLAGS) \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
- $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBAWT_HEADLESS_CFLAGS += \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
- endif
-
- LIBAWT_HEADLESS_FILES := \
- awt_Font.c \
- HeadlessToolkit.c \
- fontpath.c \
- VDrawingArea.c \
- X11Color.c \
- X11Renderer.c \
- X11PMBlitLoops.c \
- X11SurfaceData.c \
- X11FontScaler_md.c \
- X11TextRenderer_md.c \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- GLXGraphicsConfig.c \
- GLXSurfaceData.c \
- AccelGlyphCache.c \
- CUPSfuncs.c
-
- LIBAWT_HEADLESS_REORDER :=
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
- LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
- endif
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
- LIBRARY := awt_headless, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBAWT_HEADLESS_DIRS), \
- INCLUDE_FILES := $(LIBAWT_HEADLESS_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
- LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..) \
- -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
- -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
- LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \
- REORDER := $(LIBAWT_HEADLESS_REORDER), \
- LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \
- LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
-
- BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS)
-
- endif
-endif
-
-##########################################################################################
-
-ifndef BUILD_HEADLESS_ONLY
- LIBSPLASHSCREEN_DIRS := \
- $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
- $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
- $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
-
- ifeq ($(USE_EXTERNAL_LIBGIF), true)
- GIFLIB_LDFLAGS := -lgif
- else
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
- GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
- endif
-
- ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
- else
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
- endif
-
- LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
- $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
- $(LIBSPLASHSCREEN_CFLAGS) \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks
- LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
- LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
-
- LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
- LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
-
- else ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
- else ifeq ($(OPENJDK_TARGET_OS), solaris)
- LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
- else
- LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
- endif
-
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX :=
-
- ifneq ($(USE_EXTERNAL_LIBZ), true)
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
- LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
- endif
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \
- -framework ApplicationServices \
- -framework Foundation \
- -framework Cocoa \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation
- else ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
- else ifeq ($(OPENJDK_TARGET_OS), solaris)
- # Solaris still uses OPENWIN_LIB ..
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
- else # .. all other Unixes can use X_LIBS
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
- endif
-
- $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \
- LIBRARY := splashscreen, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBSPLASHSCREEN_DIRS), \
- EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(GIFLIB_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=splashscreen.dll" \
- -D "JDK_INTERNAL_NAME=splashscreen" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsplashscreen, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(LIBSPLASHSCREEN)
-
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- $(LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
- endif
-
-endif
-
-##########################################################################################
-
-ifndef OPENJDK
-
- LIBDCPR_SRC_DIRS := \
- $(JDK_TOPDIR)/src/closed/share/native/sun/dc/doe \
- $(JDK_TOPDIR)/src/closed/share/native/sun/dc/path \
- $(JDK_TOPDIR)/src/closed/share/native/sun/dc/pr \
- $(JDK_TOPDIR)/src/closed/share/native/sun/dc/util
-
- LIBDCPR_CFLAGS := $(foreach dir, $(LIBDCPR_SRC_DIRS), -I$(dir)) \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBDCPR, \
- LIBRARY := dcpr, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBDCPR_SRC_DIRS), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(LIBDCPR_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libdcpr/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBM) $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_posix := -lm, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=dcpr.dll" \
- -D "JDK_INTERNAL_NAME=dcpr" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdcpr, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBDCPR): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBDCPR)
-
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-
- LIBAWT_LWAWT_FILES := \
- awt.m \
- ApplicationDelegate.m \
- CFRetainedResource.m \
- CGLGraphicsConfig.m \
- CGLSurfaceData.m \
- CGLLayer.m \
- CGraphicsConfig.m \
- CGraphicsDevice.m \
- CGraphicsEnv.m \
- CCharToGlyphMapper.m \
- CSystemColors.m \
- AWTFont.m \
- CGGlyphOutlines.m \
- CGGlyphImages.m \
- CoreTextSupport.m \
- AWTStrike.m \
- InitIDs.m \
- AWTEvent.m \
- AWTView.m \
- AWTWindow.m \
- AWTSurfaceLayers.m \
- CCursorManager.m \
- CClipboard.m \
- CDataTransferer.m \
- CDragSource.m \
- CDragSourceContextPeer.m \
- CDropTarget.m \
- CDropTargetContextPeer.m \
- CInputMethod.m \
- CDesktopPeer.m \
- OSVersion.m \
- DnDUtilities.m \
- CFileDialog.m \
- CImage.m \
- CMenu.m \
- CMenuBar.m \
- CMenuComponent.m \
- CMenuItem.m \
- CPopupMenu.m \
- CRobot.m \
- CTrayIcon.m \
- CWrapper.m \
- JavaAccessibilityAction.m \
- JavaAccessibilityUtilities.m \
- JavaComponentAccessibility.m \
- JavaTextAccessibility.m \
- LWCToolkit.m \
- GeomUtilities.m \
- CPrinterJob.m \
- PrintModel.m \
- PrinterSurfaceData.m \
- PrinterView.m \
- QuartzSurfaceData.m \
- QuartzRenderer.m \
- CTextPipe.m \
- ImageSurfaceData.m \
- awt_DrawingSurface.m \
- \
- OGLBlitLoops.c \
- OGLBufImgOps.c \
- OGLContext.c \
- OGLFuncs.c \
- OGLMaskBlit.c \
- OGLMaskFill.c \
- OGLPaints.c \
- OGLRenderQueue.c \
- OGLRenderer.c \
- OGLSurfaceData.c \
- OGLTextRenderer.c \
- OGLVertexCache.c \
- AccelGlyphCache.c \
- CUPSfuncs.c
-
-
- LIBAWT_LWAWT_DIRS := \
- $(JDK_TOPDIR)/src/macosx/native/sun/awt \
- $(JDK_TOPDIR)/src/macosx/native/sun/font \
- $(JDK_TOPDIR)/src/macosx/native/sun/java2d/opengl \
- $(JDK_TOPDIR)/src/solaris/native/sun/awt \
- $(JDK_TOPDIR)/src/share/native/sun/font \
- $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
- LIBRARY := awt_lwawt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBAWT_LWAWT_DIRS), \
- LANG := C, \
- INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(X_CFLAGS) \
- $(X_LIBS) \
- $(foreach dir, $(LIBAWT_LWAWT_DIRS), -I$(dir)) \
- -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
- -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
- -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
- -framework Accelerate \
- -framework ApplicationServices \
- -framework AudioToolbox \
- -framework Carbon \
- -framework Cocoa \
- -framework Security \
- -framework ExceptionHandling \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -framework OpenGL \
- -framework QuartzCore -ljava, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT)
-
- $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
-
- $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
-
- $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBOSXAPP)
-
- $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBJAVA)
-
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \
- LIBRARY := osxui, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/macosx/native/com/apple/laf, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \
- -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
- -I$(JDK_TOPDIR)/src/macosx/native/sun/awt \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN) \
- -Xlinker -rpath -Xlinker @loader_path, \
- LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \
- -framework Cocoa \
- -framework Carbon \
- -framework ApplicationServices \
- -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
- -framework JavaNativeFoundation \
- -framework JavaRuntimeSupport \
- -ljava -ljvm, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBOSXUI)
-
- $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
-
- $(BUILD_LIBOSXUI): $(BUILD_LIBOSXAPP)
-
- $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
-
- #$(BUILD_LIBOSXUI): $(BUILD_LIBJAVA)
-
-endif
diff --git a/jdk/makefiles/lib/CoreLibraries.gmk b/jdk/makefiles/lib/CoreLibraries.gmk
deleted file mode 100644
index b773af1..0000000
--- a/jdk/makefiles/lib/CoreLibraries.gmk
+++ /dev/null
@@ -1,509 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-WIN_VERIFY_LIB := $(JDK_OUTPUTDIR)/objs/libverify/verify.lib
-
-##########################################################################################
-
-BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
-
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- BUILD_LIBFDLIBM_OPTIMIZATION := NONE
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \
- STATIC_LIBRARY := fdlibm, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
- SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
- LANG := C, \
- OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
- CFLAGS_windows_debug := -DLOGGING, \
- ARFLAGS := $(ARFLAGS), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-else
-
- # On macosx the old build does partial (incremental) linking of fdlibm instead of
- # a plain static library.
- $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC, \
- LIBRARY := fdlibm, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
- SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
- LANG := C, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
- LDFLAGS := -nostdlib -r -arch x86_64, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
- $(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC)
- $(call install-file)
-
-endif
-
-BUILD_LIBRARIES += $(BUILD_LIBFDLIBM)
-
-##########################################################################################
-
-BUILD_LIBVERIFY_SRC := check_code.c check_format.c
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
- BUILD_LIBVERIFY_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
- endif
-endif
-
-LIBVERIFY_OPTIMIZATION := HIGH
-ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
- ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
- LIBVERIFY_OPTIMIZATION := LOW
- endif
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \
- LIBRARY := verify, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/common, \
- INCLUDE_FILES := $(BUILD_LIBVERIFY_SRC), \
- LANG := C, \
- OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
- CFLAGS := $(CFLAGS_JDKLIB), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := -ljvm -lc, \
- LDFLAGS_SUFFIX_windows := jvm.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=verify.dll" \
- -D "JDK_INTERNAL_NAME=verify" \
- -D "JDK_FTYPE=0x2L", \
- REORDER := $(BUILD_LIBVERIFY_REORDER), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libverify, \
- DEBUG_SYMBOLS := true))
-
-BUILD_LIBRARIES += $(BUILD_LIBVERIFY)
-
-##########################################################################################
-
-LIBJAVA_SRC_DIRS := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lang \
- $(JDK_TOPDIR)/src/share/native/java/lang \
- $(JDK_TOPDIR)/src/share/native/java/lang/reflect \
- $(JDK_TOPDIR)/src/share/native/java/io \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
- $(JDK_TOPDIR)/src/share/native/java/nio \
- $(JDK_TOPDIR)/src/share/native/java/security \
- $(JDK_TOPDIR)/src/share/native/common \
- $(JDK_TOPDIR)/src/share/native/sun/misc \
- $(JDK_TOPDIR)/src/share/native/sun/reflect \
- $(JDK_TOPDIR)/src/share/native/java/util \
- $(JDK_TOPDIR)/src/share/native/java/util/concurrent/atomic \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/util/locale/provider
-else
- LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/util/locale/provider
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/provider \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io
-endif
-
-LIBJAVA_CFLAGS := $(foreach dir, $(LIBJAVA_SRC_DIRS), -I$(dir)) \
- -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \
- -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
-
-LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
- -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
- -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
- -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
-
-ifneq (, $(JDK_UPDATE_VERSION))
- LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
-endif
-
-LIBJAVA_EXCLUDE_FILES := check_code.c check_format.c jspawnhelper.c
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBJAVA_EXCLUDE_FILES += java_props_macosx.c
-else
- BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
- BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBJAVA_EXCLUDE_FILES += \
- UNIXProcess_md.c \
- UnixFileSystem_md.c \
- FileSystemPreferences.c
-else
- LIBJAVA_EXCLUDE_FILES += \
- ProcessImpl_md.c \
- WinNTFileSystem_md.c \
- dirent_md.c \
- WindowsPreferences.c \
- sun/security/provider/WinCAPISeedGenerator.c \
- sun/io/Win32ErrorMode.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
- LIBJAVA_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
- endif
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
- LIBRARY := java, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBJAVA_SRC_DIRS), \
- EXCLUDES := fdlibm/src zip, \
- EXCLUDE_FILES := $(LIBJAVA_EXCLUDE_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(LIBJAVA_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := -ljvm -lverify, \
- LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
- LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
- LDFLAGS_SUFFIX_macosx := -L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \
- -framework CoreFoundation \
- -framework Foundation \
- -framework Security -framework SystemConfiguration, \
- LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \
- jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
- shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
- advapi32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=java.dll" \
- -D "JDK_INTERNAL_NAME=java" \
- -D "JDK_FTYPE=0x2L", \
- REORDER := $(LIBJAVA_REORDER), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBJAVA)
-
-$(BUILD_LIBJAVA): $(LIBJLI_BINARY)
-
-$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
-
-$(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
-
-##########################################################################################
-
-BUILD_LIBZIP_EXCLUDES :=
-ifeq ($(USE_EXTERNAL_LIBZ), true)
- LIBZ := -lz
- LIBZIP_EXCLUDES += zlib-1.2.5
-else
- ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
-endif
-
-BUILD_LIBZIP_REORDER :=
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
- BUILD_LIBZIP_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
- endif
-endif
-
-ifeq ($(LIBZIP_CAN_USE_MMAP), true)
- BUILD_LIBZIP_MMAP := -DUSE_MMAP
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
- LIBRARY := zip, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- SRC := $(JDK_TOPDIR)/src/share/native/java/util/zip, \
- EXCLUDES := $(LIBZIP_EXCLUDES), \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(ZLIB_CPPFLAGS) \
- -I$(JDK_TOPDIR)/src/share/native/java/io \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io, \
- CFLAGS_posix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libzip/mapfile-vers, \
- REORDER := $(BUILD_LIBZIP_REORDER), \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN) \
- $(EXPORT_ZIP_FUNCS), \
- LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
- -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \
- $(WIN_JAVA_LIB), \
- LDFLAGS_SUFFIX_linux := -ljvm -ljava $(LIBZ), \
- LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \
- LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=zip.dll" \
- -D "JDK_INTERNAL_NAME=zip" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libzip, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-
-$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBZIP)
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \
- LIBRARY := unpack, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \
- EXCLUDE_FILES := main.cpp, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CXXFLAGS_JDKLIB) \
- -DNO_ZLIB -DUNPACK_JNI -DFULL, \
- CFLAGS_release := -DPRODUCT, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := -map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \
- jvm.lib $(WIN_JAVA_LIB), \
- LDFLAGS_SUFFIX_posix := -ljvm $(LIBCXX) -ljava -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libunpack, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=unpack.dll" \
- -D "JDK_INTERNAL_NAME=unpack" \
- -D "JDK_FTYPE=0x2L", \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBUNPACK): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBUNPACK)
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.map: $(BUILD_LIBUNPACK)
- $(ECHO) Copying $(@F)
- $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.map, $<) $@
-
- $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.pdb: $(BUILD_LIBUNPACK)
- $(ECHO) Copying $(@F)
- $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.pdb, $<) $@
-endif
-
-##########################################################################################
-
-BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin
-LIBJLI_CFLAGS := $(CFLAGS_JDKLIB) $(foreach dir, $(BUILD_LIBJLI_SRC_DIRS), -I$(dir))
-
-BUILD_LIBJLI_FILES := \
- java.c \
- splashscreen_stubs.c \
- parse_manifest.c \
- version_comp.c \
- wildcard.c \
- jli_util.c
-
-ifeq ($(JVM_VARIANT_ZERO), true)
- ERGO_FAMILY := zero
-else
- ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
- ERGO_FAMILY := i586
- else
- ERGO_FAMILY := $(OPENJDK_TARGET_CPU_ARCH)
- endif
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBJLI_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/bin
- BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/bin
- BUILD_LIBJLI_FILES += java_md_common.c java_md_macosx.c
-
- BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c
- BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS := -x objective-c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- BUILD_LIBJLI_FILES += java_md.c \
- cmdtoargs.c
- # Staticically link with c runtime on windows.
- LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS))
-else ifneq ($(OPENJDK_TARGET_OS), macosx)
-
- BUILD_LIBJLI_FILES += java_md_common.c
- BUILD_LIBJLI_FILES += java_md_solinux.c ergo.c
-
- ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
-
- # if the architecture specific ergo file exists then
- # use it, else use the generic definitions from ergo.c
- ifneq ($(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(ERGO_ARCH_FILE)), )
- BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE)
- else # !ERGO_ARCH_FILE
- LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
- endif # ERGO_ARCH_FILE
-endif #WINDOWS
-
-# Append defines depending on target platform
-LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS)
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
-endif
-
-ifneq ($(USE_EXTERNAL_LIBZ), true)
- BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
- LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
- BUILD_LIBJLI_FILES += \
- inflate.c \
- inftrees.c \
- inffast.c \
- zadler32.c \
- zcrc32.c \
- zutil.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
-else
- LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
- LIBRARY := jli, \
- OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
- SRC := $(BUILD_LIBJLI_SRC_DIRS), \
- INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(LIBJLI_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjli/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
- LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
- LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
- LDFLAGS_SUFFIX_solaris := $(LIBZ) $(LIBDL) -lc, \
- LDFLAGS_SUFFIX_linux := $(LIBZ) $(LIBDL) -lc -lpthread, \
- LDFLAGS_SUFFIX_macosx := $(LIBZ), \
- LDFLAGS_SUFFIX_windows := \
- -export:JLI_Launch \
- -export:JLI_ManifestIterate \
- -export:JLI_SetTraceLauncher \
- -export:JLI_ReportErrorMessage \
- -export:JLI_ReportErrorMessageSys \
- -export:JLI_ReportMessage \
- -export:JLI_ReportExceptionDescription \
- -export:JLI_MemAlloc \
- -export:JLI_CmdToArgs \
- -export:JLI_GetStdArgc \
- -export:JLI_GetStdArgs \
- advapi32.lib \
- comctl32.lib \
- user32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jli.dll" \
- -D "JDK_INTERNAL_NAME=jli" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBJLI)
-
-# On windows, the static library has the same suffix as the import library created by
-# with the shared library, so the static library is given a different name. No harm
-# in doing it for all platform to reduce complexity.
-ifeq ($(OPENJDK_TARGET_OS), windows)
- $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
- STATIC_LIBRARY := jli_static, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
- SRC := $(BUILD_LIBJLI_SRC_DIRS), \
- INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
- ARFLAGS := $(ARFLAGS), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
-
-else ifeq ($(OPENJDK_TARGET_OS), macosx)
- #
- # On macosx they do partial (incremental) linking of libjli_static.a
- # code it here...rather than add support to NativeCompilation
- # as this is first time I see it
- $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
- LIBRARY := jli_static, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
- SRC := $(BUILD_LIBJLI_SRC_DIRS), \
- INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
- LDFLAGS := -nostdlib -r, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(JDK_OUTPUTDIR)/objs/libjli_static.a: $(BUILD_LIBJLI_STATIC)
- $(call install-file)
-
- BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
-endif
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \
- LIBRARY := npt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/npt $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/npt \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnpt/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_macosx := -liconv, \
- LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=npt.dll" \
- -D "JDK_INTERNAL_NAME=npt" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnpt, \
- DEBUG_SYMBOLS := true))
-
-BUILD_LIBRARIES += $(BUILD_LIBNPT)
diff --git a/jdk/makefiles/lib/NetworkingLibraries.gmk b/jdk/makefiles/lib/NetworkingLibraries.gmk
deleted file mode 100644
index 546565a..0000000
--- a/jdk/makefiles/lib/NetworkingLibraries.gmk
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBNET_SRC_DIRS := $(JDK_TOPDIR)/src/share/native/java/net \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/dns \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/spi
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/www/protocol/http/ntlm
-else
- LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/sdp
-endif
-
-LIBNET_CFLAGS := $(foreach dir, $(LIBNET_SRC_DIRS), -I$(dir))
-
-LIBNET_EXCLUDE_FILES :=
-ifneq ($(OPENJDK_TARGET_OS), linux)
- LIBNET_EXCLUDE_FILES += linux_close.c
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBNET_EXCLUDE_FILES += bsd_close.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBNET_EXCLUDE_FILES += PlainSocketImpl.c PlainDatagramSocketImpl.c SdpSupport.c
-else
- LIBNET_EXCLUDE_FILES += TwoStacksPlainSocketImpl.c DualStackPlainSocketImpl.c \
- TwoStacksPlainDatagramSocketImpl.c DualStackPlainDatagramSocketImpl.c \
- NTLMAuthSequence.c NetworkInterface_winXP.c
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBNET, \
- LIBRARY := net, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBNET_SRC_DIRS), \
- EXCLUDE_FILES := $(LIBNET_EXCLUDE_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(LIBNET_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnet/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_macosx := -ljvm -ljava, \
- LDFLAGS_SUFFIX_solaris := -ljvm -ljava -lnsl -lsocket $(LIBDL) -lc, \
- LDFLAGS_SUFFIX_linux := $(LIBDL) -ljvm -lpthread -ljava, \
- LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \
- delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \
- -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=net.dll" \
- -D "JDK_INTERNAL_NAME=net" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnet, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBNET): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBNET)
-
-$(JDK_OUTPUTDIR)/lib/net.properties: $(JDK_TOPDIR)/src/share/lib/net.properties
- $(ECHO) $(LOG_INFO) Copying $(@F)
- $(call install-file)
-
-COPY_FILES += $(JDK_OUTPUTDIR)/lib/net.properties
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/${OPENJDK_TARGET_OS_API_DIR}/lib/sdp/sdp.conf.template
- $(ECHO) $(LOG_INFO) Copying $(@F)
- $(call install-file)
-
- COPY_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template
-endif
diff --git a/jdk/makefiles/lib/NioLibraries.gmk b/jdk/makefiles/lib/NioLibraries.gmk
deleted file mode 100644
index afab1c9..0000000
--- a/jdk/makefiles/lib/NioLibraries.gmk
+++ /dev/null
@@ -1,186 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-BUILD_LIBNIO_SRC := \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/nio \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
-
-BUILD_LIBNIO_CFLAGS := \
- -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
- -I$(JDK_TOPDIR)/src/share/native/java/io \
- -I$(JDK_TOPDIR)/src/share/native/java/net \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net
-
-BUILD_LIBNIO_FILES := \
- DatagramChannelImpl.c \
- DatagramDispatcher.c \
- FileChannelImpl.c \
- FileDispatcherImpl.c \
- FileKey.c \
- IOUtil.c \
- MappedByteBuffer.c \
- Net.c \
- ServerSocketChannelImpl.c \
- SocketChannelImpl.c \
- SocketDispatcher.c
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- BUILD_LIBNIO_FILES += \
- Iocp.c \
- RegistryFileTypeDetector.c \
- WindowsAsynchronousFileChannelImpl.c \
- WindowsAsynchronousServerSocketChannelImpl.c \
- WindowsAsynchronousSocketChannelImpl.c \
- WindowsNativeDispatcher.c \
- WindowsSelectorImpl.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), linux)
- BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
- BUILD_LIBNIO_FILES += \
- EPoll.c \
- EPollArrayWrapper.c \
- EPollPort.c \
- InheritedChannel.c \
- NativeThread.c \
- PollArrayWrapper.c \
- UnixAsynchronousServerSocketChannelImpl.c \
- UnixAsynchronousSocketChannelImpl.c \
- GnomeFileTypeDetector.c \
- MagicFileTypeDetector.c \
- LinuxNativeDispatcher.c \
- LinuxWatchService.c \
- UnixCopyFile.c \
- UnixNativeDispatcher.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
- BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/macosx/native/sun/nio/ch
- BUILD_LIBNIO_FILES += \
- InheritedChannel.c \
- NativeThread.c \
- PollArrayWrapper.c \
- UnixAsynchronousServerSocketChannelImpl.c \
- UnixAsynchronousSocketChannelImpl.c \
- BsdNativeDispatcher.c \
- MacOSXNativeDispatcher.c \
- UnixCopyFile.c \
- UnixNativeDispatcher.c \
- KQueue.c \
- KQueuePort.c \
- KQueueArrayWrapper.c
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
- BUILD_LIBNIO_FILES += \
- DevPollArrayWrapper.c \
- InheritedChannel.c \
- NativeThread.c \
- PollArrayWrapper.c \
- SolarisEventPort.c \
- UnixAsynchronousServerSocketChannelImpl.c \
- UnixAsynchronousSocketChannelImpl.c \
- GnomeFileTypeDetector.c \
- SolarisNativeDispatcher.c \
- SolarisWatchService.c \
- UnixCopyFile.c \
- UnixNativeDispatcher.c
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \
- LIBRARY := nio, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBNIO_SRC), \
- INCLUDE_FILES := $(BUILD_LIBNIO_FILES), \
- LANG := C, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(BUILD_LIBNIO_CFLAGS), \
- MAPFILE := $(BUILD_LIBNIO_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := -ljava -lnet -lpthread $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \
- -lsendfile -ljava -lnet -lc, \
- LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \
- $(JDK_OUTPUTDIR)/objs/libnet/net.lib \
- advapi32.lib, \
- LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \
- LDFLAGS_SUFFIX :=, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=nio.dll" \
- -D "JDK_INTERNAL_NAME=nio" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnio, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBNIO)
-
-$(BUILD_LIBNIO): $(BUILD_LIBNET)
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS_API), posix)
-
- ifneq ($(OPENJDK_TARGET_OS), macosx)
-
- # Suppress unused parameters required by exported JNI functions.
- SCTP_WERROR := -Werror -Wno-error=unused-parameter
- ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
- SCTP_WERROR :=
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \
- LIBRARY := sctp, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch/sctp, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
- -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch/sctp \
- -I$(JDK_TOPDIR)/src/share/native/java/net \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net, \
- CFLAGS_linux := $(SCTP_WERROR), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsctp/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \
- LDFLAGS_SUFFIX_posix := -lnio -lnet, \
- LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_macosx := -ljava -ljvm, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsctp, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBSCTP)
-
- $(BUILD_LIBSCTP): $(BUILD_LIBNIO)
- endif
-endif
diff --git a/jdk/makefiles/lib/SecurityLibraries.gmk b/jdk/makefiles/lib/SecurityLibraries.gmk
deleted file mode 100644
index 779504f..0000000
--- a/jdk/makefiles/lib/SecurityLibraries.gmk
+++ /dev/null
@@ -1,289 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBJAAS_MAPFILE :=
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- LIBJAAS_EXCLUDE_FILES := Solaris.c
-else
- # only on solaris...wonder why
- LIBJAAS_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjaas/mapfile-vers
-endif
-
-LIBJAAS_NAME := jaas_unix
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBJAAS_NAME := jaas_nt
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJAAS, \
- LIBRARY := $(LIBJAAS_NAME), \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/security/auth/module, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB), \
- MAPFILE := $(LIBJAAS_MAPFILE), \
- LDFLAGS := $(filter-out -ljava, $(LDFLAGS_JDKLIB)) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib, \
- LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- EXCLUDE_FILES := $(LIBJAAS_EXCLUDE_FILES), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \
- -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjaas, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBJAAS): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJAAS)
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \
- LIBRARY := j2pcsc, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio, \
- LANG := C, \
- CFLAGS_posix := -D__sun_jdk, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio/MUSCLE, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pcsc/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := $(LIBDL), \
- LDFLAGS_SUFFIX_windows := winscard.lib, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=j2pcsc.dll" \
- -D "JDK_INTERNAL_NAME=j2pcsc" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pcsc, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC)
-
-##########################################################################################
-
-ifneq ($(OPENJDK_TARGET_OS), windows)
- $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS, \
- LIBRARY := j2gss, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2gss, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
-endif
-
-##########################################################################################
-
-ifneq ($(BUILD_CRYPTO), no)
- BUILD_LIBKRB5_NAME :=
- ifeq ($(OPENJDK_TARGET_OS), windows)
- BUILD_LIBKRB5_NAME := w2k_lsa_auth
- BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5
- BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
- gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
- ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
- else ifeq ($(OPENJDK_TARGET_OS), macosx)
- BUILD_LIBKRB5_NAME := osxkrb5
- BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/share/native/sun/security/krb5
- BUILD_LIBKRB5_LIBS := -framework Kerberos
- endif
-
- ifneq ($(BUILD_LIBKRB5_NAME), )
- $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \
- LIBRARY := $(BUILD_LIBKRB5_NAME), \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBKRB5_SRC), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/krb5 \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
- -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkrb5, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBKRB5)
- endif
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI, \
- LIBRARY := sunmscapi, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := Crypt32.Lib advapi32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=sunmscapi.dll" \
- -D "JDK_INTERNAL_NAME=sunmscapi" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunmscapi, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBSUNMSCAPI)
-endif
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \
- LIBRARY := j2pkcs11, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
- $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pkcs11/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=j2pkcs11.dll" \
- -D "JDK_INTERNAL_NAME=j2pkcs11" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pkcs11, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11)
-
-##########################################################################################
-
-ifeq ($(ENABLE_INTREE_EC), yes)
-
- BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
- -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
-
- #
- # On sol-sparc...all libraries are compiled with -xregs=no%appl
- # (set in CFLAGS_REQUIRED_sparc)
- #
- # except!!! libsunec.so
- #
- ECC_JNI_SOLSPARC_FILTER :=
- ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
- ECC_JNI_SOLSPARC_FILTER := -xregs=no%appl
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
- LIBRARY := sunec, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
- $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
- $(BUILD_LIBSUNEC_FLAGS) \
- -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
- CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
- $(BUILD_LIBSUNEC_FLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsunec/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
- LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBCXX), \
- LDFLAGS_SUFFIX_linux := -lc, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=sunec.dll" \
- -D "JDK_INTERNAL_NAME=sunec" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunec, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBSUNEC)
-endif
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifndef OPENJDK
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJ2UCRYPTO, \
- LIBRARY := j2ucrypto, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2ucrypto/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB), \
- LDFLAGS_SUFFIX := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBJ2UCRYPTO)
-
- endif
-endif
diff --git a/jdk/makefiles/lib/ServiceabilityLibraries.gmk b/jdk/makefiles/lib/ServiceabilityLibraries.gmk
deleted file mode 100644
index d408eb3..0000000
--- a/jdk/makefiles/lib/ServiceabilityLibraries.gmk
+++ /dev/null
@@ -1,424 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBATTACH_EXCLUDE_FILES :=
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- LIBATTACH_EXCLUDE_FILES += SolarisVirtualMachine.c
-endif
-ifneq ($(OPENJDK_TARGET_OS), linux)
- LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c
-endif
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBATTACH_EXCLUDE_FILES += BsdVirtualMachine.c
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \
- LIBRARY := attach, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tools/attach, \
- EXCLUDE_FILES := $(LIBATTACH_EXCLUDE_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB), \
- CFLAGS_windows := /Gy, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=attach.dll" \
- -D "JDK_INTERNAL_NAME=attach" \
- -D "JDK_FTYPE=0x2L", \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := -ldoor, \
- LDFLAGS_windows := /ORDER:@$(JDK_TOPDIR)/makefiles/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libattach, \
- DEBUG_SYMBOLS := true))
-
-$(BUILD_LIBATTACH): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBATTACH)
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \
- LIBRARY := dt_socket, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/transport/socket \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
- -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
- -I$(JDK_TOPDIR)/src/share/transport/socket \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket \
- -I$(JDK_TOPDIR)/src/share/back/export \
- -I$(JDK_TOPDIR)/src/share/back, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libdt_socket/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := -lpthread, \
- LDFLAGS_SUFFIX_solaris := -lnsl -lsocket -lc, \
- LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=dt_socket.dll" \
- -D "JDK_INTERNAL_NAME=dt_socket" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_socket, \
- DEBUG_SYMBOLS := true))
-
-$(BUILD_LIBDT_SOCKET): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBDT_SOCKET)
-
-##########################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SHMEM, \
- LIBRARY := dt_shmem, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/com/sun/tools/jdi \
- $(JDK_TOPDIR)/src/share/transport/shmem \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
- -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
- -I$(JDK_TOPDIR)/src/share/transport/shmem \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem \
- -I$(JDK_TOPDIR)/src/share/back/export, \
- LDFLAGS := $(LDFLAGS_JDKLIB), \
- LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=dt_shmem.dll" \
- -D "JDK_INTERNAL_NAME=dt_shmem" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_shmem, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBDT_SHMEM)
-
-endif # OPENJDK_TARGET_OS
-
-##########################################################################################
-
-# JDWP_LOGGING causes log messages to be compiled into the library.
-$(eval $(call SetupNativeCompilation,BUILD_LIBJDWP, \
- LIBRARY := jdwp, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/back $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
- -I$(JDK_TOPDIR)/src/share/transport/export \
- -I$(JDK_TOPDIR)/src/share/back/export \
- -I$(JDK_TOPDIR)/src/share/npt \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
- -I$(JDK_TOPDIR)/src/share/back \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back \
- -I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjdwp/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := $(LIBDL) -lc, \
- LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jdwp.dll" \
- -D "JDK_INTERNAL_NAME=jdwp" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjdwp, \
- DEBUG_SYMBOLS := true))
-
-$(BUILD_LIBJDWP): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJDWP)
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJSDT, \
- LIBRARY := jsdt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tracing/dtrace, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsdt/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := $(LIBDL), \
- LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL), \
- LDFLAGS_SUFFIX_macosx := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jsdt.dll" \
- -D "JDK_INTERNAL_NAME=jsdt" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsdt, \
- DEBUG_SYMBOLS := true))
-
-$(BUILD_LIBJSDT): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJSDT)
-
-##########################################################################################
-
-LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/share/instrument \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument
-
-LIBINSTRUMENT_FILES := \
- EncodingSupport.c \
- EncodingSupport_md.c \
- FileSystemSupport_md.c \
- InstrumentationImplNativeMethods.c \
- InvocationAdapter.c \
- JarFacade.c \
- JPLISAgent.c \
- JPLISAssert.c \
- JavaExceptions.c \
- PathCharsValidator.c \
- Reentrancy.c \
- Utilities.c \
- canonicalize_md.c
-
-LIBINSTRUMENT_DIR := $(JDK_OUTPUTDIR)/objs/libinstrument
-LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/instrument \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument \
- -I$(JDK_TOPDIR)/src/share/bin
-
-LIBINSTRUMENT_LDFLAGS :=
-LIBINSTRUMENT_LDFLAGS_SUFFIX :=
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBINSTRUMENT_LDFLAGS += $(JDK_OUTPUTDIR)/objs/jli_static.lib $(WIN_JAVA_LIB) \
- -export:Agent_OnAttach advapi32.lib
- # Statically link the C runtime so that there are not dependencies on modules
- # not on the search patch when invoked from the Windows system directory
- # (or elsewhere).
- LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS))
- # equivalent of strcasecmp is stricmp on Windows
- LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \
- LIBRARY := instrument, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBINSTRUMENT_SRC), \
- INCLUDE_FILES := $(LIBINSTRUMENT_FILES), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
- CFLAGS_debug := -DJPLIS_LOGGING, \
- CFLAGS_release := -DNO_JPLIS_LOGGING, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libinstrument/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN) \
- $(LIBINSTRUMENT_LDFLAGS), \
- LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
- LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
- LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
- -framework Cocoa -framework Security -framework ApplicationServices, \
- LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \
- LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \
- LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
- LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=instrument.dll" \
- -D "JDK_INTERNAL_NAME=instrument" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(LIBINSTRUMENT_DIR), \
- DEBUG_SYMBOLS := true))
-
-ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows))
- $(BUILD_LIBINSTRUMENT): $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX)
-else
- $(BUILD_LIBINSTRUMENT): $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX)
-endif
-$(BUILD_LIBINSTRUMENT): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBINSTRUMENT)
-
-##########################################################################################
-
-BUILD_LIBMANAGEMENT_SRC := $(JDK_TOPDIR)/src/share/native/sun/management \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/management
-
-BUILD_LIBMANAGEMENT_EXCLUDES :=
-
-BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/management
-
-ifneq ($(OPENJDK_TARGET_OS), solaris)
- BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), linux)
- BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c
-endif
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c
-endif
-
-LIBMANAGEMENT_OPTIMIZATION := HIGH
-ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
- ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
- LIBMANAGEMENT_OPTIMIZATION := LOW
- endif
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \
- LIBRARY := management, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBMANAGEMENT_SRC), \
- EXCLUDE_FILES := $(BUILD_LIBMANAGEMENT_EXCLUDES), \
- LANG := C, \
- OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
- CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBMANAGEMENT_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libmanagement/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_solaris := -lkstat, \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=management.dll" \
- -D "JDK_INTERNAL_NAME=management" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmanagement, \
- DEBUG_SYMBOLS := true))
-
-$(BUILD_LIBMANAGEMENT): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBMANAGEMENT)
-
-##########################################################################################
-
-BUILD_LIBHPROF_SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/hprof $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/hprof
-BUILD_LIBHPROF_CFLAGS := -I$(JDK_TOPDIR)/src/share/demo/jvmti/hprof \
- -I$(JDK_TOPDIR)/src/share/npt \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
- -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo
-
-BUILD_LIBHPROF_LDFLAGS :=
-
-LIBHPROF_OPTIMIZATION := HIGHEST
-ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
- ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
- LIBHPROF_OPTIMIZATION := LOW
- endif
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBHPROF, \
- LIBRARY := hprof, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(BUILD_LIBHPROF_SRC), \
- LANG := C, \
- OPTIMIZATION := $(LIBHPROF_OPTIMIZATION), \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(BUILD_LIBHPROF_CFLAGS), \
- CFLAGS_debug := -DHPROF_LOGGING, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libhprof/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := wsock32.lib winmm.lib advapi32.lib, \
- LDFLAGS_SUFFIX_linux := $(LIBDL), \
- LDFLAGS_SUFFIX_macosx := $(LIBDL), \
- LDFLAGS_SUFFIX_solaris := -lsocket -lnsl $(LIBDL) -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=hprof.dll" \
- -D "JDK_INTERNAL_NAME=hprof" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libhprof_jvmti, \
- DEBUG_SYMBOLS := true))
-
-BUILD_LIBRARIES += $(BUILD_LIBHPROF)
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA_CRW_DEMO, \
- LIBRARY := java_crw_demo, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjava_crw_demo/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=java_crw_demo.dll" \
- -D "JDK_INTERNAL_NAME=java_crw_demo" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava_crw_demo, \
- DEBUG_SYMBOLS := true))
-
-BUILD_LIBRARIES += $(BUILD_LIBJAVA_CRW_DEMO)
-
-##########################################################################################
-
-ifndef OPENJDK
- ifeq ($(ENABLE_JFR), true)
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJFR, \
- LIBRARY := jfr, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/closed/share/native/oracle/jfr, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/closed/share/javavm/export, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjfr/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jfr.dll" \
- -D "JDK_INTERNAL_NAME=jfr" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjfr, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- BUILD_LIBRARIES += $(BUILD_LIBJFR)
-
- endif
-endif
diff --git a/jdk/makefiles/lib/SoundLibraries.gmk b/jdk/makefiles/lib/SoundLibraries.gmk
deleted file mode 100644
index dc507ab..0000000
--- a/jdk/makefiles/lib/SoundLibraries.gmk
+++ /dev/null
@@ -1,237 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBJSOUND_SRC_DIRS := \
- $(JDK_TOPDIR)/src/share/native/com/sun/media/sound \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/media/sound
-
-LIBJSOUND_SRC_FILES := Utilities.c Platform.c
-
-LIBJSOUND_LANG := C
-LIBJSOUND_CFLAGS := $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir))
-
-EXTRA_SOUND_JNI_LIBS :=
-
-LIBJSOUND_MIDIFILES := \
- MidiInDevice.c \
- MidiInDeviceProvider.c \
- MidiOutDevice.c \
- MidiOutDeviceProvider.c \
- PlatformMidi.c
-
-# files needed for ports
-LIBJSOUND_PORTFILES := \
- PortMixerProvider.c \
- PortMixer.c
-
-# files needed for direct audio
-LIBJSOUND_DAUDIOFILES := \
- DirectAudioDeviceProvider.c \
- DirectAudioDevice.c
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- EXTRA_SOUND_JNI_LIBS += jsoundds
- LIBJSOUND_CFLAGS += -DX_PLATFORM=X_WINDOWS \
- -DUSE_PLATFORM_MIDI_OUT=TRUE \
- -DUSE_PLATFORM_MIDI_IN=TRUE \
- -DUSE_PORTS=TRUE
- LIBJSOUND_SRC_FILES += \
- PLATFORM_API_WinOS_MidiIn.cpp \
- PLATFORM_API_WinOS_MidiOut.c \
- PLATFORM_API_WinOS_Util.c \
- PLATFORM_API_WinOS_Ports.c
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
-endif # OPENJDK_TARGET_OS windows
-
-ifeq ($(OPENJDK_TARGET_OS), linux)
- EXTRA_SOUND_JNI_LIBS += jsoundalsa
- LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX
-endif # OPENJDK_TARGET_OS linux
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBJSOUND_LANG := C++
- LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \
- -DUSE_PORTS=TRUE \
- -DUSE_DAUDIO=TRUE \
- -DUSE_PLATFORM_MIDI_OUT=TRUE \
- -DUSE_PLATFORM_MIDI_IN=TRUE
- LIBJSOUND_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/com/sun/media/sound
- LIBJSOUND_SRC_FILES += \
- PLATFORM_API_MacOSX_Utils.cpp \
- PLATFORM_API_MacOSX_PCM.cpp \
- PLATFORM_API_MacOSX_Ports.cpp \
- PLATFORM_API_MacOSX_MidiIn.c \
- PLATFORM_API_MacOSX_MidiOut.c \
- PLATFORM_API_MacOSX_MidiUtils.c
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
-endif # OPENJDK_TARGET_OS macosx
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- LIBJSOUND_CFLAGS += -DX_PLATFORM=X_SOLARIS \
- -DUSE_PORTS=TRUE \
- -DUSE_DAUDIO=TRUE
- LIBJSOUND_SRC_FILES += \
- PLATFORM_API_SolarisOS_Utils.c \
- PLATFORM_API_SolarisOS_Ports.c \
- PLATFORM_API_SolarisOS_PCM.c
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
- LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
-endif # OPENJDK_TARGET_OS solaris
-
-
-ifeq ($(JVM_VARIANT_ZERO), true)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_ZERO
-else
- ifeq ($(OPENJDK_TARGET_CPU), x86)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_I586
- endif
-
- ifeq ($(OPENJDK_TARGET_CPU), sparc)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARC
- endif
-
- ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARCV9
- endif
-
- ifeq ($(OPENJDK_TARGET_CPU), x86_64)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_AMD64
- endif
-
- ifeq ($(OPENJDK_TARGET_CPU), arm)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_ARM
- endif
-
- ifeq ($(OPENJDK_TARGET_CPU), ppc)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC
- endif
-endif
-
-LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
- LIBRARY := jsound, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBJSOUND_SRC_DIRS), \
- INCLUDE_FILES := $(LIBJSOUND_SRC_FILES), \
- LANG := $(LIBJSOUND_LANG), \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(LIBJSOUND_CFLAGS), \
- CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsound/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_macosx := -framework CoreAudio -framework CoreFoundation \
- -framework CoreServices -framework AudioUnit $(LIBCXX) \
- -framework CoreMIDI -framework AudioToolbox, \
- LDFLAGS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \
- LDFLAGS_SUFFIX_posix := -ljava -ljvm, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jsound.dll" \
- -D "JDK_INTERNAL_NAME=jsound" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsound, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-$(BUILD_LIBJSOUND): $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJSOUND)
-
-##########################################################################################
-
-ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), )
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA, \
- LIBRARY := jsoundalsa, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBJSOUND_SRC_DIRS), \
- INCLUDE_FILES := Utilities.c $(LIBJSOUND_MIDIFILES) $(LIBJSOUND_PORTFILES) \
- $(LIBJSOUND_DAUDIOFILES) \
- PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \
- PLATFORM_API_LinuxOS_ALSA_PCM.c \
- PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \
- PLATFORM_API_LinuxOS_ALSA_MidiIn.c \
- PLATFORM_API_LinuxOS_ALSA_MidiOut.c \
- PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
- PLATFORM_API_LinuxOS_ALSA_Ports.c, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) $(ALSA_CFLAGS) \
- $(LIBJSOUND_CFLAGS) \
- -DUSE_DAUDIO=TRUE \
- -DUSE_PORTS=TRUE \
- -DUSE_PLATFORM_MIDI_OUT=TRUE \
- -DUSE_PLATFORM_MIDI_IN=TRUE, \
- MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBJSOUNDALSA)
-
-endif
-
-##########################################################################################
-
-ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)), )
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDDS, \
- LIBRARY := jsoundds, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBJSOUND_SRC_DIRS), \
- INCLUDE_FILES := Utilities.c $(LIBJSOUND_DAUDIOFILES) \
- PLATFORM_API_WinOS_DirectSound.cpp, \
- LANG := C++, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(LIBJSOUND_CFLAGS) \
- -DUSE_DAUDIO=TRUE, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=jsoundds.dll" \
- -D "JDK_INTERNAL_NAME=jsoundds" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundds, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA)
-
- BUILD_LIBRARIES += $(BUILD_LIBJSOUNDDS)
-
-endif
diff --git a/jdk/makefiles/sun/awt/ToBin.java b/jdk/makefiles/sun/awt/ToBin.java
deleted file mode 100644
index 5f91542..0000000
--- a/jdk/makefiles/sun/awt/ToBin.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt;
-
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-import java.awt.*;
-
-public class ToBin {
- public static void main(String[] args) throws Exception {
- BufferedImage im = ImageIO.read(System.in);
- BufferedImage bi = null;
- int iconWidth = im.getWidth(null);
- int iconHeight = im.getHeight(null);
- if (im != null && iconHeight != 0 && iconWidth != 0) {
- bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB);
- Graphics g = bi.getGraphics();
- try {
- g.drawImage(im, 0, 0, iconWidth, iconHeight, null);
- } finally {
- g.dispose();
- }
- }
- DataBuffer srcBuf = bi.getData().getDataBuffer();
- int[] buf = ((DataBufferInt)srcBuf).getData();
- System.out.print(iconWidth + ",");
- System.out.println(iconHeight + ",");
- for (int i = 0; i < buf.length; i++) {
- System.out.print("0x" + Integer.toHexString(buf[i]) + ", ");
- if (i % 10 == 0) {
- System.out.println();
- }
- }
- }
-}
diff --git a/jdk/makefiles/sun/osxapp/ToBin.java b/jdk/makefiles/sun/osxapp/ToBin.java
deleted file mode 100644
index 9fdcba3..0000000
--- a/jdk/makefiles/sun/osxapp/ToBin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.osxapp;
-
-import java.io.*;
-
-public class ToBin {
- public static void main(String[] args) throws Exception {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- int nRead;
- byte[] data = new byte[4096];
-
- while ((nRead = System.in.read(data, 0, data.length)) != -1) {
- baos.write(data, 0, nRead);
- }
-
- baos.flush();
-
- byte[] buf = baos.toByteArray();
- for (int i = 0; i < buf.length; i++) {
- System.out.print(String.format("0x%1$02X", buf[i]) + ", ");
- if (i % 20 == 0) {
- System.out.println();
- }
- }
- }
-}
diff --git a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
index a3dc7e4..22795f3 100644
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
@@ -158,12 +158,12 @@
boolean fsSupported = isFullScreenSupported();
if (fsSupported && old != null) {
- // restore original display mode and enter windowed mode.
+ // enter windowed mode and restore original display mode
+ exitFullScreenExclusive(old);
if (originalMode != null) {
setDisplayMode(originalMode);
originalMode = null;
}
- exitFullScreenExclusive(old);
}
super.setFullScreenWindow(w);
@@ -227,14 +227,10 @@
throw new IllegalArgumentException("Invalid display mode");
}
if (!Objects.equals(dm, getDisplayMode())) {
- final Window w = getFullScreenWindow();
- if (w != null) {
- exitFullScreenExclusive(w);
- }
nativeSetDisplayMode(displayID, dm.getWidth(), dm.getHeight(),
- dm.getBitDepth(), dm.getRefreshRate());
- if (isFullScreenSupported() && w != null) {
- enterFullScreenExclusive(w);
+ dm.getBitDepth(), dm.getRefreshRate());
+ if (isFullScreenSupported() && getFullScreenWindow() != null) {
+ getFullScreenWindow().setSize(dm.getWidth(), dm.getHeight());
}
}
}
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java
index 0ab1d1e..5880d06 100644
--- a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java
+++ b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java
@@ -379,10 +379,6 @@
return windowPeer.getPlatformWindow();
}
- protected AppContext getAppContext() {
- return SunToolkit.targetToAppContext(getTarget());
- }
-
// ---- PEER METHODS ---- //
// Just a helper method
@@ -1162,8 +1158,8 @@
/**
* Post an event to the proper Java EDT.
*/
- public void postEvent(AWTEvent event) {
- SunToolkit.postEvent(getAppContext(), event);
+ public void postEvent(final AWTEvent event) {
+ LWToolkit.postEvent(event);
}
protected void postPaintEvent(int x, int y, int w, int h) {
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java b/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java
index 7b3cff5..d61dc7a 100644
--- a/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java
+++ b/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java
@@ -949,7 +949,8 @@
KeyEvent keyEvent = new KeyEvent(focusOwner, id, when, modifiers,
keyCode, keyChar, keyLocation);
AWTAccessor.getKeyEventAccessor().setExtendedKeyCode(keyEvent,
- ExtendedKeyCodes.getExtendedKeyCodeForChar(keyChar));
+ (keyChar == KeyEvent.CHAR_UNDEFINED) ? keyCode
+ : ExtendedKeyCodes.getExtendedKeyCodeForChar(keyChar));
postEvent(keyEvent);
}
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java
index 51fbf52..a0da9e8 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java
@@ -25,8 +25,10 @@
package sun.lwawt.macosx;
+import java.awt.*;
import java.awt.datatransfer.*;
import java.io.IOException;
+import java.io.NotSerializableException;
import java.util.*;
import sun.awt.datatransfer.*;
@@ -65,12 +67,10 @@
long[] formatArray = dataTransferer.getFormatsForTransferableAsArray(contents, flavorMap);
declareTypes(formatArray, this);
- Map<Long, DataFlavor> formatMap = DataTransferer.getInstance().getFormatsForTransferable(contents, flavorMap);
-
- for (Iterator<Long> iter = formatMap.keySet().iterator(); iter.hasNext(); ) {
- Long lFormat = iter.next();
- long format = lFormat.longValue();
- DataFlavor flavor = formatMap.get(lFormat);
+ Map<Long, DataFlavor> formatMap = dataTransferer.getFormatsForTransferable(contents, flavorMap);
+ for (Map.Entry<Long, DataFlavor> entry : formatMap.entrySet()) {
+ long format = entry.getKey();
+ DataFlavor flavor = entry.getValue();
try {
byte[] bytes = DataTransferer.getInstance().translateTransferable(contents, flavor, format);
@@ -80,17 +80,27 @@
// javaJVMLocalObjectMimeType failed to serialize.
// May remove this if-check when 5078787 is fixed.
if (!(flavor.isMimeTypeEqual(DataFlavor.javaJVMLocalObjectMimeType) &&
- e instanceof java.io.NotSerializableException)) {
+ e instanceof NotSerializableException)) {
e.printStackTrace();
}
}
}
+
+ notifyChanged();
}
- private void lostSelectionOwnershipImpl() {
+ private void notifyLostOwnership() {
lostOwnershipImpl();
}
+ private static void notifyChanged() {
+ CClipboard clipboard = (CClipboard) Toolkit.getDefaultToolkit().getSystemClipboard();
+ if (!clipboard.areFlavorListenersRegistered()) {
+ return;
+ }
+ clipboard.checkChange(clipboard.getClipboardFormats());
+ }
+
protected native long[] getClipboardFormats();
protected native byte[] getClipboardData(long format) throws IOException;
diff --git a/jdk/src/macosx/native/sun/awt/AWTWindow.m b/jdk/src/macosx/native/sun/awt/AWTWindow.m
index 687fa6b..f9a7919 100644
--- a/jdk/src/macosx/native/sun/awt/AWTWindow.m
+++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m
@@ -468,8 +468,6 @@
// TODO: create generic AWT assert
}
- [AWTWindow synthesizeMouseEnteredExitedEventsForAllWindows];
-
NSRect frame = ConvertNSScreenRect(env, [self.nsWindow frame]);
static JNF_MEMBER_CACHE(jm_deliverMoveResizeEvent, jc_CPlatformWindow, "deliverMoveResizeEvent", "(IIIIZ)V");
@@ -480,6 +478,8 @@
(jint)frame.size.height,
(jboolean)[self.nsWindow inLiveResize]);
(*env)->DeleteLocalRef(env, platformWindow);
+
+ [AWTWindow synthesizeMouseEnteredExitedEventsForAllWindows];
}
- (void)windowDidMove:(NSNotification *)notification {
@@ -1236,7 +1236,9 @@
NSRect screenRect = [[nsWindow screen] frame];
[nsWindow setFrame:screenRect display:YES];
} else {
- [JNFException raise:env as:kRuntimeException reason:"Failed to enter full screen."];
+ [JNFException raise:[ThreadUtilities getJNIEnv]
+ as:kRuntimeException
+ reason:"Failed to enter full screen."];
}
}];
@@ -1261,7 +1263,9 @@
// GraphicsDevice takes care of restoring pre full screen bounds
} else {
- [JNFException raise:env as:kRuntimeException reason:"Failed to exit full screen."];
+ [JNFException raise:[ThreadUtilities getJNIEnv]
+ as:kRuntimeException
+ reason:"Failed to exit full screen."];
}
}];
diff --git a/jdk/src/macosx/native/sun/awt/CClipboard.h b/jdk/src/macosx/native/sun/awt/CClipboard.h
index a62bebd..926a1d5 100644
--- a/jdk/src/macosx/native/sun/awt/CClipboard.h
+++ b/jdk/src/macosx/native/sun/awt/CClipboard.h
@@ -43,6 +43,4 @@
- (NSArray *) javaGetTypes;
- (NSData *) javaGetDataForType:(NSString *)inFormat;
-- (void) pasteboardChangedOwner:(NSPasteboard *)sender;
-
@end
diff --git a/jdk/src/macosx/native/sun/awt/CClipboard.m b/jdk/src/macosx/native/sun/awt/CClipboard.m
index 27000ae..e70e78b 100644
--- a/jdk/src/macosx/native/sun/awt/CClipboard.m
+++ b/jdk/src/macosx/native/sun/awt/CClipboard.m
@@ -91,7 +91,9 @@
{
if (sClipboard == nil) {
sClipboard = [[CClipboard alloc] init];
- [[NSNotificationCenter defaultCenter] addObserver:sClipboard selector: @selector(checkPasteboard:) name: NSApplicationDidBecomeActiveNotification object: nil];
+ [[NSNotificationCenter defaultCenter] addObserver:sClipboard selector: @selector(checkPasteboard:)
+ name: NSApplicationDidBecomeActiveNotification
+ object: nil];
}
return sClipboard;
@@ -110,8 +112,6 @@
- (void) javaDeclareTypes:(NSArray *)inTypes withOwner:(jobject)inClipboard jniEnv:(JNIEnv *)inEnv {
- //NSLog(@"CClipboard javaDeclareTypes %@ withOwner", inTypes);
-
@synchronized(self) {
if (inClipboard != NULL) {
if (fClipboardOwner != NULL) {
@@ -126,8 +126,6 @@
- (void) _nativeDeclareTypes:(NSArray *)inTypes {
AWT_ASSERT_APPKIT_THREAD;
- //NSLog(@"CClipboard _nativeDeclareTypes %@ withOwner", inTypes);
-
fChangeCount = [[NSPasteboard generalPasteboard] declareTypes:inTypes owner:self];
}
@@ -136,8 +134,6 @@
NSMutableArray *args = [NSMutableArray arrayWithCapacity:1];
[ThreadUtilities performOnMainThread:@selector(_nativeGetTypes:) on:self withObject:args waitUntilDone:YES];
-
- //NSLog(@"CClipboard getTypes returns %@", [args lastObject]);
return [args lastObject];
}
@@ -145,8 +141,6 @@
AWT_ASSERT_APPKIT_THREAD;
[args addObject:[[NSPasteboard generalPasteboard] types]];
-
- //NSLog(@"CClipboard getTypes returns %@", [args lastObject]);
}
- (void) javaSetData:(NSData *)inData forType:(NSString *) inFormat {
@@ -154,25 +148,18 @@
CClipboardUpdate *newUpdate = [[CClipboardUpdate alloc] initWithData:inData withFormat:inFormat];
[ThreadUtilities performOnMainThread:@selector(_nativeSetData:) on:self withObject:newUpdate waitUntilDone:YES];
[newUpdate release];
-
- //NSLog(@"CClipboard javaSetData forType %@", inFormat);
}
- (void) _nativeSetData:(CClipboardUpdate *)newUpdate {
AWT_ASSERT_APPKIT_THREAD;
[[NSPasteboard generalPasteboard] setData:[newUpdate data] forType:[newUpdate format]];
-
- //NSLog(@"CClipboard _nativeSetData setData %@", [newUpdate data]);
- //NSLog(@"CClipboard _nativeSetData forType %@", [newUpdate format]);
}
- (NSData *) javaGetDataForType:(NSString *) inFormat {
NSMutableArray *args = [NSMutableArray arrayWithObject:inFormat];
[ThreadUtilities performOnMainThread:@selector(_nativeGetDataForType:) on:self withObject:args waitUntilDone:YES];
-
- //NSLog(@"CClipboard javaGetDataForType %@ returns an NSData", inFormat);
return [args lastObject];
}
@@ -183,15 +170,11 @@
if (returnValue) [args replaceObjectAtIndex:0 withObject:returnValue];
else [args removeLastObject];
-
- //NSLog(@"CClipboard _nativeGetDataForType");
}
- (void) checkPasteboard:(id)application {
AWT_ASSERT_APPKIT_THREAD;
- //NSLog(@"CClipboard checkPasteboard oldCount %d newCount %d newTypes %@", fChangeCount, [[NSPasteboard generalPasteboard] changeCount], [[NSPasteboard generalPasteboard] types]);
-
// This is called via NSApplicationDidBecomeActiveNotification.
// If the change count on the general pasteboard is different than when we set it
@@ -199,27 +182,23 @@
NSInteger newChangeCount = [[NSPasteboard generalPasteboard] changeCount];
if (fChangeCount != newChangeCount) {
- fChangeCount = newChangeCount;
-
- [self pasteboardChangedOwner:[NSPasteboard generalPasteboard]];
- }
-}
+ fChangeCount = newChangeCount;
-- (void)pasteboardChangedOwner:(NSPasteboard *)sender; {
- AWT_ASSERT_APPKIT_THREAD;
+ // Notify that the content might be changed
+ static JNF_CLASS_CACHE(jc_CClipboard, "sun/lwawt/macosx/CClipboard");
+ static JNF_STATIC_MEMBER_CACHE(jm_contentChanged, jc_CClipboard, "notifyChanged", "()V");
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+ JNFCallStaticVoidMethod(env, jm_contentChanged);
- static JNF_CLASS_CACHE(jc_CClipboard, "sun/lwawt/macosx/CClipboard");
- static JNF_MEMBER_CACHE(jm_lostOwnership, jc_CClipboard, "lostSelectionOwnershipImpl", "()V");
-
- //NSLog(@"CClipboard pasteboardChangedOwner");
-
- // If we have a Java pasteboard owner, tell it that it doesn't own the pasteboard anymore.
- @synchronized(self) {
- if (fClipboardOwner) {
- JNIEnv *env = [ThreadUtilities getJNIEnv];
- JNFCallVoidMethod(env, fClipboardOwner, jm_lostOwnership); // AWT_THREADING Safe (event)
- JNFDeleteGlobalRef(env, fClipboardOwner);
- fClipboardOwner = NULL;
+ // If we have a Java pasteboard owner, tell it that it doesn't own the pasteboard anymore.
+ static JNF_MEMBER_CACHE(jm_lostOwnership, jc_CClipboard, "notifyLostOwnership", "()V");
+ @synchronized(self) {
+ if (fClipboardOwner) {
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+ JNFCallVoidMethod(env, fClipboardOwner, jm_lostOwnership); // AWT_THREADING Safe (event)
+ JNFDeleteGlobalRef(env, fClipboardOwner);
+ fClipboardOwner = NULL;
+ }
}
}
}
@@ -265,9 +244,6 @@
}
JNF_COCOA_ENTER(env);
-
- //NSLog(@"Java_sun_lwawt_macosx_CClipboard_setData");
-
jint nBytes = (*env)->GetArrayLength(env, inBytes);
jbyte *rawBytes = (*env)->GetPrimitiveArrayCritical(env, inBytes, NULL);
NSData *bytesAsData = [NSData dataWithBytes:rawBytes length:nBytes];
@@ -288,8 +264,6 @@
jlongArray returnValue = NULL;
JNF_COCOA_ENTER(env);
- //NSLog(@"Java_sun_lwawt_macosx_CClipboard_getClipboardFormats");
-
NSArray *dataTypes = [[CClipboard sharedClipboard] javaGetTypes];
NSUInteger nFormats = [dataTypes count];
NSUInteger knownFormats = 0;
@@ -346,8 +320,6 @@
// a byte array back to Java. CDataTransferer will do that if necessary.
JNF_COCOA_ENTER(env);
- //NSLog(@"Java_sun_lwawt_macosx_CClipboard_getClipboardData");
-
NSString *formatAsString = formatForIndex(format);
NSData *clipData = [[CClipboard sharedClipboard] javaGetDataForType:formatAsString];
diff --git a/jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java b/jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java
index 1de6b0a..d21d1a4 100644
--- a/jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java
+++ b/jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java
@@ -24,11 +24,12 @@
*/
package com.sun.beans.finder;
-import com.sun.beans.WeakCache;
+import com.sun.beans.util.Cache;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
+import static com.sun.beans.util.Cache.Kind.SOFT;
import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
/**
@@ -41,7 +42,18 @@
* @author Sergey A. Malenkov
*/
public final class ConstructorFinder extends AbstractFinder<Constructor<?>> {
- private static final WeakCache<Signature, Constructor<?>> CACHE = new WeakCache<Signature, Constructor<?>>();
+ private static final Cache<Signature, Constructor<?>> CACHE = new Cache<Signature, Constructor<?>>(SOFT, SOFT) {
+ @Override
+ public Constructor create(Signature signature) {
+ try {
+ ConstructorFinder finder = new ConstructorFinder(signature.getArgs());
+ return finder.find(signature.getType().getConstructors());
+ }
+ catch (Exception exception) {
+ throw new SignatureException(exception);
+ }
+ }
+ };
/**
* Finds public constructor
@@ -69,13 +81,12 @@
PrimitiveWrapperMap.replacePrimitivesWithWrappers(args);
Signature signature = new Signature(type, args);
- Constructor<?> constructor = CACHE.get(signature);
- if (constructor != null) {
- return constructor;
+ try {
+ return CACHE.get(signature);
}
- constructor = new ConstructorFinder(args).find(type.getConstructors());
- CACHE.put(signature, constructor);
- return constructor;
+ catch (SignatureException exception) {
+ throw exception.toNoSuchMethodException("Constructor is not found");
+ }
}
/**
diff --git a/jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java b/jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java
index 83a3ced..a10a1e7 100644
--- a/jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java
+++ b/jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java
@@ -25,7 +25,7 @@
package com.sun.beans.finder;
import com.sun.beans.TypeResolver;
-import com.sun.beans.WeakCache;
+import com.sun.beans.util.Cache;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -33,6 +33,7 @@
import java.lang.reflect.Type;
import java.util.Arrays;
+import static com.sun.beans.util.Cache.Kind.SOFT;
import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
/**
@@ -45,7 +46,18 @@
* @author Sergey A. Malenkov
*/
public final class MethodFinder extends AbstractFinder<Method> {
- private static final WeakCache<Signature, Method> CACHE = new WeakCache<Signature, Method>();
+ private static final Cache<Signature, Method> CACHE = new Cache<Signature, Method>(SOFT, SOFT) {
+ @Override
+ public Method create(Signature signature) {
+ try {
+ MethodFinder finder = new MethodFinder(signature.getName(), signature.getArgs());
+ return findAccessibleMethod(finder.find(signature.getType().getMethods()));
+ }
+ catch (Exception exception) {
+ throw new SignatureException(exception);
+ }
+ }
+ };
/**
* Finds public method (static or non-static)
@@ -65,16 +77,13 @@
PrimitiveWrapperMap.replacePrimitivesWithWrappers(args);
Signature signature = new Signature(type, name, args);
- Method method = CACHE.get(signature);
- boolean cached = method != null;
- if (cached && isPackageAccessible(method.getDeclaringClass())) {
- return method;
+ try {
+ Method method = CACHE.get(signature);
+ return (method == null) || isPackageAccessible(method.getDeclaringClass()) ? method : CACHE.create(signature);
}
- method = findAccessibleMethod(new MethodFinder(name, args).find(type.getMethods()));
- if (!cached) {
- CACHE.put(signature, method);
+ catch (SignatureException exception) {
+ throw exception.toNoSuchMethodException("Method '" + name + "' is not found");
}
- return method;
}
/**
diff --git a/jdk/src/share/classes/com/sun/beans/finder/Signature.java b/jdk/src/share/classes/com/sun/beans/finder/Signature.java
index 9e169b6..1468403 100644
--- a/jdk/src/share/classes/com/sun/beans/finder/Signature.java
+++ b/jdk/src/share/classes/com/sun/beans/finder/Signature.java
@@ -62,6 +62,18 @@
this.args = args;
}
+ Class<?> getType() {
+ return this.type;
+ }
+
+ String getName() {
+ return this.name;
+ }
+
+ Class<?>[] getArgs() {
+ return this.args;
+ }
+
/**
* Indicates whether some other object is "equal to" this one.
*
diff --git a/jdk/src/share/classes/com/sun/beans/finder/SignatureException.java b/jdk/src/share/classes/com/sun/beans/finder/SignatureException.java
new file mode 100644
index 0000000..07307d5
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/beans/finder/SignatureException.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.beans.finder;
+
+final class SignatureException extends RuntimeException {
+ SignatureException(Throwable cause) {
+ super(cause);
+ }
+
+ NoSuchMethodException toNoSuchMethodException(String message) {
+ Throwable throwable = getCause();
+ if (throwable instanceof NoSuchMethodException) {
+ return (NoSuchMethodException) throwable;
+ }
+ NoSuchMethodException exception = new NoSuchMethodException(message);
+ exception.initCause(throwable);
+ return exception;
+ }
+}
diff --git a/jdk/src/share/classes/com/sun/beans/util/Cache.java b/jdk/src/share/classes/com/sun/beans/util/Cache.java
new file mode 100644
index 0000000..751da65
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/beans/util/Cache.java
@@ -0,0 +1,613 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.beans.util;
+
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.Objects;
+
+/**
+ * Hash table based implementation of the cache,
+ * which allows to use weak or soft references for keys and values.
+ * An entry in a {@code Cache} will automatically be removed
+ * when its key or value is no longer in ordinary use.
+ *
+ * @author Sergey Malenkov
+ * @since 1.8
+ */
+public abstract class Cache<K,V> {
+ private static final int MAXIMUM_CAPACITY = 1 << 30; // maximum capacity MUST be a power of two <= 1<<30
+
+ private final boolean identity; // defines whether the identity comparison is used
+ private final Kind keyKind; // a reference kind for the cache keys
+ private final Kind valueKind; // a reference kind for the cache values
+
+ private final ReferenceQueue<Object> queue = new ReferenceQueue<>(); // queue for references to remove
+
+ private volatile CacheEntry<K,V>[] table = newTable(1 << 3); // table's length MUST be a power of two
+ private int threshold = 6; // the next size value at which to resize
+ private int size; // the number of key-value mappings contained in this map
+
+ /**
+ * Creates a corresponding value for the specified key.
+ *
+ * @param key a key that can be used to create a value
+ * @return a corresponding value for the specified key
+ */
+ public abstract V create(K key);
+
+ /**
+ * Constructs an empty {@code Cache}.
+ * The default initial capacity is 8.
+ * The default load factor is 0.75.
+ *
+ * @param keyKind a reference kind for keys
+ * @param valueKind a reference kind for values
+ *
+ * @throws NullPointerException if {@code keyKind} or {@code valueKind} are {@code null}
+ */
+ public Cache(Kind keyKind, Kind valueKind) {
+ this(keyKind, valueKind, false);
+ }
+
+ /**
+ * Constructs an empty {@code Cache}
+ * with the specified comparison method.
+ * The default initial capacity is 8.
+ * The default load factor is 0.75.
+ *
+ * @param keyKind a reference kind for keys
+ * @param valueKind a reference kind for values
+ * @param identity defines whether reference-equality
+ * is used in place of object-equality
+ *
+ * @throws NullPointerException if {@code keyKind} or {@code valueKind} are {@code null}
+ */
+ public Cache(Kind keyKind, Kind valueKind, boolean identity) {
+ Objects.requireNonNull(keyKind, "keyKind");
+ Objects.requireNonNull(valueKind, "valueKind");
+ this.keyKind = keyKind;
+ this.valueKind = valueKind;
+ this.identity = identity;
+ }
+
+ /**
+ * Returns the value to which the specified key is mapped,
+ * or {@code null} if there is no mapping for the key.
+ *
+ * @param key the key whose cached value is to be returned
+ * @return a value to which the specified key is mapped,
+ * or {@code null} if there is no mapping for {@code key}
+ *
+ * @throws NullPointerException if {@code key} is {@code null}
+ * or corresponding value is {@code null}
+ */
+ public final V get(K key) {
+ Objects.requireNonNull(key, "key");
+ removeStaleEntries();
+ int hash = hash(key);
+ // unsynchronized search improves performance
+ // the null value does not mean that there are no needed entry
+ CacheEntry<K,V>[] table = this.table; // unsynchronized access
+ V current = getEntryValue(key, hash, table[index(hash, table)]);
+ if (current != null) {
+ return current;
+ }
+ synchronized (this.queue) {
+ // synchronized search improves stability
+ // we must create and add new value if there are no needed entry
+ int index = index(hash, this.table);
+ current = getEntryValue(key, hash, this.table[index]);
+ if (current != null) {
+ return current;
+ }
+ V value = create(key);
+ Objects.requireNonNull(value, "value");
+ this.table[index] = new CacheEntry<>(hash, key, value, this.table[index]);
+ if (++this.size >= this.threshold) {
+ if (this.table.length == MAXIMUM_CAPACITY) {
+ this.threshold = Integer.MAX_VALUE;
+ } else {
+ removeStaleEntries();
+ table = newTable(this.table.length << 1);
+ transfer(this.table, table);
+ // If ignoring null elements and processing ref queue caused massive
+ // shrinkage, then restore old table. This should be rare, but avoids
+ // unbounded expansion of garbage-filled tables.
+ if (this.size >= this.threshold / 2) {
+ this.table = table;
+ this.threshold <<= 1;
+ } else {
+ transfer(table, this.table);
+ }
+ removeStaleEntries();
+ }
+ }
+ return value;
+ }
+ }
+
+ /**
+ * Removes the cached value that corresponds to the specified key.
+ *
+ * @param key the key whose mapping is to be removed from this cache
+ */
+ public final void remove(K key) {
+ if (key != null) {
+ synchronized (this.queue) {
+ removeStaleEntries();
+ int hash = hash(key);
+ int index = index(hash, this.table);
+ CacheEntry<K,V> prev = this.table[index];
+ CacheEntry<K,V> entry = prev;
+ while (entry != null) {
+ CacheEntry<K,V> next = entry.next;
+ if (entry.matches(hash, key)) {
+ if (entry == prev) {
+ this.table[index] = next;
+ } else {
+ prev.next = next;
+ }
+ entry.unlink();
+ break;
+ }
+ prev = entry;
+ entry = next;
+ }
+ }
+ }
+ }
+
+ /**
+ * Removes all of the mappings from this cache.
+ * It will be empty after this call returns.
+ */
+ public final void clear() {
+ synchronized (this.queue) {
+ int index = this.table.length;
+ while (0 < index--) {
+ CacheEntry<K,V> entry = this.table[index];
+ while (entry != null) {
+ CacheEntry<K,V> next = entry.next;
+ entry.unlink();
+ entry = next;
+ }
+ this.table[index] = null;
+ }
+ while (null != this.queue.poll()) {
+ // Clear out the reference queue.
+ }
+ }
+ }
+
+ /**
+ * Retrieves object hash code and applies a supplemental hash function
+ * to the result hash, which defends against poor quality hash functions.
+ * This is critical because {@code Cache} uses power-of-two length hash tables,
+ * that otherwise encounter collisions for hashCodes that do not differ
+ * in lower bits.
+ *
+ * @param key the object which hash code is to be calculated
+ * @return a hash code value for the specified object
+ */
+ private int hash(Object key) {
+ if (this.identity) {
+ int hash = System.identityHashCode(key);
+ return (hash << 1) - (hash << 8);
+ }
+ int hash = key.hashCode();
+ // This function ensures that hashCodes that differ only by
+ // constant multiples at each bit position have a bounded
+ // number of collisions (approximately 8 at default load factor).
+ hash ^= (hash >>> 20) ^ (hash >>> 12);
+ return hash ^ (hash >>> 7) ^ (hash >>> 4);
+ }
+
+ /**
+ * Returns index of the specified hash code in the given table.
+ * Note that the table size must be a power of two.
+ *
+ * @param hash the hash code
+ * @param table the table
+ * @return an index of the specified hash code in the given table
+ */
+ private static int index(int hash, Object[] table) {
+ return hash & (table.length - 1);
+ }
+
+ /**
+ * Creates a new array for the cache entries.
+ *
+ * @param size requested capacity MUST be a power of two
+ * @return a new array for the cache entries
+ */
+ @SuppressWarnings("unchecked")
+ private CacheEntry<K,V>[] newTable(int size) {
+ return (CacheEntry<K,V>[]) new CacheEntry[size];
+ }
+
+ private V getEntryValue(K key, int hash, CacheEntry<K,V> entry) {
+ while (entry != null) {
+ if (entry.matches(hash, key)) {
+ return entry.value.getReferent();
+ }
+ entry = entry.next;
+ }
+ return null;
+ }
+
+ private void removeStaleEntries() {
+ Object reference = this.queue.poll();
+ if (reference != null) {
+ synchronized (this.queue) {
+ do {
+ if (reference instanceof Ref) {
+ Ref ref = (Ref) reference;
+ @SuppressWarnings("unchecked")
+ CacheEntry<K,V> owner = (CacheEntry<K,V>) ref.getOwner();
+ if (owner != null) {
+ int index = index(owner.hash, this.table);
+ CacheEntry<K,V> prev = this.table[index];
+ CacheEntry<K,V> entry = prev;
+ while (entry != null) {
+ CacheEntry<K,V> next = entry.next;
+ if (entry == owner) {
+ if (entry == prev) {
+ this.table[index] = next;
+ } else {
+ prev.next = next;
+ }
+ entry.unlink();
+ break;
+ }
+ prev = entry;
+ entry = next;
+ }
+ }
+ }
+ reference = this.queue.poll();
+ }
+ while (reference != null);
+ }
+ }
+ }
+
+ private void transfer(CacheEntry<K,V>[] oldTable, CacheEntry<K,V>[] newTable) {
+ int oldIndex = oldTable.length;
+ while (0 < oldIndex--) {
+ CacheEntry<K,V> entry = oldTable[oldIndex];
+ oldTable[oldIndex] = null;
+ while (entry != null) {
+ CacheEntry<K,V> next = entry.next;
+ if (entry.key.isStale() || entry.value.isStale()) {
+ entry.unlink();
+ } else {
+ int newIndex = index(entry.hash, newTable);
+ entry.next = newTable[newIndex];
+ newTable[newIndex] = entry;
+ }
+ entry = next;
+ }
+ }
+ }
+
+ /**
+ * Represents a cache entry (key-value pair).
+ */
+ private final class CacheEntry<K,V> {
+ private final int hash;
+ private final Ref<K> key;
+ private final Ref<V> value;
+ private volatile CacheEntry<K,V> next;
+
+ /**
+ * Constructs an entry for the cache.
+ *
+ * @param hash the hash code calculated for the entry key
+ * @param key the entry key
+ * @param value the initial value of the entry
+ * @param next the next entry in a chain
+ */
+ private CacheEntry(int hash, K key, V value, CacheEntry<K,V> next) {
+ this.hash = hash;
+ this.key = Cache.this.keyKind.create(this, key, Cache.this.queue);
+ this.value = Cache.this.valueKind.create(this, value, Cache.this.queue);
+ this.next = next;
+ }
+
+ /**
+ * Determines whether the entry has the given key with the given hash code.
+ *
+ * @param hash an expected hash code
+ * @param object an object to be compared with the entry key
+ * @return {@code true} if the entry has the given key with the given hash code;
+ * {@code false} otherwise
+ */
+ private boolean matches(int hash, Object object) {
+ if (this.hash != hash) {
+ return false;
+ }
+ Object key = this.key.getReferent();
+ return (key == object) || !Cache.this.identity && (key != null) && key.equals(object);
+ }
+
+ /**
+ * Marks the entry as actually removed from the cache.
+ */
+ private void unlink() {
+ this.next = null;
+ this.key.removeOwner();
+ this.value.removeOwner();
+ Cache.this.size--;
+ }
+ }
+
+ /**
+ * Basic interface for references.
+ * It defines the operations common for the all kind of references.
+ *
+ * @param <T> the type of object to refer
+ */
+ private static interface Ref<T> {
+ /**
+ * Returns the object that possesses information about the reference.
+ *
+ * @return the owner of the reference or {@code null} if the owner is unknown
+ */
+ Object getOwner();
+
+ /**
+ * Returns the object to refer.
+ *
+ * @return the referred object or {@code null} if it was collected
+ */
+ T getReferent();
+
+ /**
+ * Determines whether the referred object was taken by the garbage collector or not.
+ *
+ * @return {@code true} if the referred object was collected
+ */
+ boolean isStale();
+
+ /**
+ * Marks this reference as removed from the cache.
+ */
+ void removeOwner();
+ }
+
+ /**
+ * Represents a reference kind.
+ */
+ public static enum Kind {
+ STRONG {
+ <T> Ref<T> create(Object owner, T value, ReferenceQueue<? super T> queue) {
+ return new Strong<>(owner, value);
+ }
+ },
+ SOFT {
+ <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue) {
+ return (referent == null)
+ ? new Strong<>(owner, referent)
+ : new Soft<>(owner, referent, queue);
+ }
+ },
+ WEAK {
+ <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue) {
+ return (referent == null)
+ ? new Strong<>(owner, referent)
+ : new Weak<>(owner, referent, queue);
+ }
+ };
+
+ /**
+ * Creates a reference to the specified object.
+ *
+ * @param <T> the type of object to refer
+ * @param owner the owner of the reference, if needed
+ * @param referent the object to refer
+ * @param queue the queue to register the reference with,
+ * or {@code null} if registration is not required
+ * @return the reference to the specified object
+ */
+ abstract <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue);
+
+ /**
+ * This is an implementation of the {@link Cache.Ref} interface
+ * that uses the strong references that prevent their referents
+ * from being made finalizable, finalized, and then reclaimed.
+ *
+ * @param <T> the type of object to refer
+ */
+ private static final class Strong<T> implements Ref<T> {
+ private Object owner;
+ private final T referent;
+
+ /**
+ * Creates a strong reference to the specified object.
+ *
+ * @param owner the owner of the reference, if needed
+ * @param referent the non-null object to refer
+ */
+ private Strong(Object owner, T referent) {
+ this.owner = owner;
+ this.referent = referent;
+ }
+
+ /**
+ * Returns the object that possesses information about the reference.
+ *
+ * @return the owner of the reference or {@code null} if the owner is unknown
+ */
+ public Object getOwner() {
+ return this.owner;
+ }
+
+ /**
+ * Returns the object to refer.
+ *
+ * @return the referred object
+ */
+ public T getReferent() {
+ return this.referent;
+ }
+
+ /**
+ * Determines whether the referred object was taken by the garbage collector or not.
+ *
+ * @return {@code true} if the referred object was collected
+ */
+ public boolean isStale() {
+ return false;
+ }
+
+ /**
+ * Marks this reference as removed from the cache.
+ */
+ public void removeOwner() {
+ this.owner = null;
+ }
+ }
+
+ /**
+ * This is an implementation of the {@link Cache.Ref} interface
+ * that uses the soft references that are cleared at the discretion
+ * of the garbage collector in response to a memory request.
+ *
+ * @param <T> the type of object to refer
+ * @see java.lang.ref.SoftReference
+ */
+ private static final class Soft<T> extends SoftReference<T> implements Ref<T> {
+ private Object owner;
+
+ /**
+ * Creates a soft reference to the specified object.
+ *
+ * @param owner the owner of the reference, if needed
+ * @param referent the non-null object to refer
+ * @param queue the queue to register the reference with,
+ * or {@code null} if registration is not required
+ */
+ private Soft(Object owner, T referent, ReferenceQueue<? super T> queue) {
+ super(referent, queue);
+ this.owner = owner;
+ }
+
+ /**
+ * Returns the object that possesses information about the reference.
+ *
+ * @return the owner of the reference or {@code null} if the owner is unknown
+ */
+ public Object getOwner() {
+ return this.owner;
+ }
+
+ /**
+ * Returns the object to refer.
+ *
+ * @return the referred object or {@code null} if it was collected
+ */
+ public T getReferent() {
+ return get();
+ }
+
+ /**
+ * Determines whether the referred object was taken by the garbage collector or not.
+ *
+ * @return {@code true} if the referred object was collected
+ */
+ public boolean isStale() {
+ return null == get();
+ }
+
+ /**
+ * Marks this reference as removed from the cache.
+ */
+ public void removeOwner() {
+ this.owner = null;
+ }
+ }
+
+ /**
+ * This is an implementation of the {@link Cache.Ref} interface
+ * that uses the weak references that do not prevent their referents
+ * from being made finalizable, finalized, and then reclaimed.
+ *
+ * @param <T> the type of object to refer
+ * @see java.lang.ref.WeakReference
+ */
+ private static final class Weak<T> extends WeakReference<T> implements Ref<T> {
+ private Object owner;
+
+ /**
+ * Creates a weak reference to the specified object.
+ *
+ * @param owner the owner of the reference, if needed
+ * @param referent the non-null object to refer
+ * @param queue the queue to register the reference with,
+ * or {@code null} if registration is not required
+ */
+ private Weak(Object owner, T referent, ReferenceQueue<? super T> queue) {
+ super(referent, queue);
+ this.owner = owner;
+ }
+
+ /**
+ * Returns the object that possesses information about the reference.
+ *
+ * @return the owner of the reference or {@code null} if the owner is unknown
+ */
+ public Object getOwner() {
+ return this.owner;
+ }
+
+ /**
+ * Returns the object to refer.
+ *
+ * @return the referred object or {@code null} if it was collected
+ */
+ public T getReferent() {
+ return get();
+ }
+
+ /**
+ * Determines whether the referred object was taken by the garbage collector or not.
+ *
+ * @return {@code true} if the referred object was collected
+ */
+ public boolean isStale() {
+ return null == get();
+ }
+
+ /**
+ * Marks this reference as removed from the cache.
+ */
+ public void removeOwner() {
+ this.owner = null;
+ }
+ }
+ }
+}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java b/jdk/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java
index c32aa7f..51d95c1 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java
@@ -186,29 +186,15 @@
byte[] plain, int plainOffset)
{
int i;
- byte[] cipherOrig=null;
int endIndex = cipherOffset + cipherLen;
- if (cipher==plain && (cipherOffset >= plainOffset)
- && ((cipherOffset - plainOffset) < blockSize)) {
- // Save the original ciphertext blocks, so they can be
- // stored in the feedback register "r".
- // This is necessary because in this constellation, a
- // ciphertext block (or parts of it) will be overridden by
- // the plaintext result.
- cipherOrig = cipher.clone();
- }
for (; cipherOffset < endIndex;
cipherOffset += blockSize, plainOffset += blockSize) {
embeddedCipher.decryptBlock(cipher, cipherOffset, k, 0);
for (i = 0; i < blockSize; i++) {
plain[i+plainOffset] = (byte)(k[i] ^ r[i]);
}
- if (cipherOrig==null) {
- System.arraycopy(cipher, cipherOffset, r, 0, blockSize);
- } else {
- System.arraycopy(cipherOrig, cipherOffset, r, 0, blockSize);
- }
+ System.arraycopy(cipher, cipherOffset, r, 0, blockSize);
}
return cipherLen;
}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/CipherCore.java b/jdk/src/share/classes/com/sun/crypto/provider/CipherCore.java
index dab1b4d..8d54633 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/CipherCore.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/CipherCore.java
@@ -732,8 +732,12 @@
System.arraycopy(buffer, len, buffer, 0, buffered);
}
} else { // len > buffered
- if (buffered == 0) {
+ if ((input != output) && (buffered == 0)) {
// all to-be-processed data are from 'input'
+ // however, note that if 'input' and 'output' are the same,
+ // then they can't be passed directly to the underlying cipher
+ // engine operations as data may be overwritten before they
+ // are read.
if (decrypting) {
outLen = cipher.decrypt(input, inputOffset, len, output, outputOffset);
} else {
@@ -744,12 +748,16 @@
} else {
// assemble the data using both 'buffer' and 'input'
byte[] in = new byte[len];
- System.arraycopy(buffer, 0, in, 0, buffered);
int inConsumed = len - buffered;
- System.arraycopy(input, inputOffset, in, buffered, inConsumed);
- buffered = 0;
- inputOffset += inConsumed;
- inputLen -= inConsumed;
+ if (buffered != 0) {
+ System.arraycopy(buffer, 0, in, 0, buffered);
+ buffered = 0;
+ }
+ if (inConsumed != 0) {
+ System.arraycopy(input, inputOffset, in, len - inConsumed, inConsumed);
+ inputOffset += inConsumed;
+ inputLen -= inConsumed;
+ }
if (decrypting) {
outLen = cipher.decrypt(in, 0, len, output, outputOffset);
} else {
@@ -907,11 +915,18 @@
" when decrypting with padded cipher");
}
- // prepare the final input avoiding copying if possible
+ /*
+ * prepare the final input, assemble a new buffer if any
+ * of the following is true:
+ * - 'input' and 'output' are the same buffer
+ * - there are internally buffered bytes
+ * - doing encryption and padding is needed
+ */
byte[] finalBuf = input;
int finalOffset = inputOffset;
int finalBufLen = inputLen;
- if ((buffered != 0) || (!decrypting && padding != null)) {
+ if ((input == output) || (buffered != 0) ||
+ (!decrypting && padding != null)) {
if (decrypting || padding == null) {
paddingLen = 0;
}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java b/jdk/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
index d4e2752..06ef9e2 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
@@ -50,6 +50,9 @@
(byte) 0x79, (byte) 0xe8, (byte) 0x21, (byte) 0x05
};
+ private static final int CHECKSUM_LEN = 8;
+ private static final int IV_LEN = 8;
+
/*
* internal cipher object which does the real work.
*/
@@ -135,7 +138,7 @@
// can only return an upper-limit if not initialized yet.
int result = 0;
if (decrypting) {
- result = inputLen - 16;
+ result = inputLen - 16; // CHECKSUM_LEN + IV_LEN;
} else {
result = inputLen + 16;
}
@@ -215,7 +218,7 @@
if (opmode == Cipher.WRAP_MODE) {
decrypting = false;
if (params == null) {
- iv = new byte[8];
+ iv = new byte[IV_LEN];
if (random == null) {
random = SunJCE.getRandom();
}
@@ -449,14 +452,15 @@
}
byte[] cks = getChecksum(keyVal);
- byte[] out = new byte[iv.length + keyVal.length + cks.length];
+ byte[] in = new byte[keyVal.length + CHECKSUM_LEN];
+ System.arraycopy(keyVal, 0, in, 0, keyVal.length);
+ System.arraycopy(cks, 0, in, keyVal.length, CHECKSUM_LEN);
- System.arraycopy(keyVal, 0, out, iv.length, keyVal.length);
- System.arraycopy(cks, 0, out, iv.length+keyVal.length, cks.length);
- cipher.encrypt(out, iv.length, keyVal.length+cks.length,
- out, iv.length);
-
+ byte[] out = new byte[iv.length + in.length];
System.arraycopy(iv, 0, out, 0, iv.length);
+
+ cipher.encrypt(in, 0, in.length, out, iv.length);
+
// reverse the array content
for (int i = 0; i < out.length/2; i++) {
byte temp = out[i];
@@ -470,7 +474,8 @@
// should never happen
throw new RuntimeException("Internal cipher key is corrupted");
}
- cipher.encrypt(out, 0, out.length, out, 0);
+ byte[] out2 = new byte[out.length];
+ cipher.encrypt(out, 0, out.length, out2, 0);
// restore cipher state to prior to this call
try {
@@ -480,7 +485,7 @@
// should never happen
throw new RuntimeException("Internal cipher key is corrupted");
}
- return out;
+ return out2;
}
/**
@@ -520,25 +525,26 @@
buffer[i] = buffer[buffer.length-1-i];
buffer[buffer.length-1-i] = temp;
}
- iv = new byte[IV2.length];
+ iv = new byte[IV_LEN];
System.arraycopy(buffer, 0, iv, 0, iv.length);
cipher.init(true, cipherKey.getAlgorithm(), cipherKey.getEncoded(),
iv);
- cipher.decrypt(buffer, iv.length, buffer.length-iv.length,
- buffer, iv.length);
- int origLen = buffer.length - iv.length - 8;
- byte[] cks = getChecksum(buffer, iv.length, origLen);
- int offset = iv.length + origLen;
- for (int i = 0; i < cks.length; i++) {
- if (buffer[offset + i] != cks[i]) {
+ byte[] buffer2 = new byte[buffer.length - iv.length];
+ cipher.decrypt(buffer, iv.length, buffer2.length,
+ buffer2, 0);
+ int keyValLen = buffer2.length - CHECKSUM_LEN;
+ byte[] cks = getChecksum(buffer2, 0, keyValLen);
+ int offset = keyValLen;
+ for (int i = 0; i < CHECKSUM_LEN; i++) {
+ if (buffer2[offset + i] != cks[i]) {
throw new InvalidKeyException("Checksum comparison failed");
}
}
// restore cipher state to prior to this call
cipher.init(decrypting, cipherKey.getAlgorithm(),
cipherKey.getEncoded(), IV2);
- byte[] out = new byte[origLen];
- System.arraycopy(buffer, iv.length, out, 0, out.length);
+ byte[] out = new byte[keyValLen];
+ System.arraycopy(buffer2, 0, out, 0, keyValLen);
return ConstructKeys.constructKey(out, wrappedKeyAlgorithm,
wrappedKeyType);
}
@@ -554,7 +560,7 @@
throw new RuntimeException("SHA1 message digest not available");
}
md.update(in, offset, len);
- byte[] cks = new byte[8];
+ byte[] cks = new byte[CHECKSUM_LEN];
System.arraycopy(md.digest(), 0, cks, 0, cks.length);
return cks;
}
diff --git a/jdk/src/share/classes/java/awt/Container.java b/jdk/src/share/classes/java/awt/Container.java
index a779d72..7bb4da9 100644
--- a/jdk/src/share/classes/java/awt/Container.java
+++ b/jdk/src/share/classes/java/awt/Container.java
@@ -43,7 +43,6 @@
import java.security.AccessController;
-import java.util.Arrays;
import java.util.EventListener;
import java.util.HashSet;
import java.util.Set;
@@ -4427,6 +4426,7 @@
stopListeningForOtherDrags();
mouseEventTarget = null;
targetLastEntered = null;
+ targetLastEnteredDT = null;
}
/**
@@ -4617,59 +4617,80 @@
}
/*
+ * Generates dnd enter/exit events as mouse moves over lw components
+ * @param targetOver Target mouse is over (including native container)
+ * @param e SunDropTarget mouse event in native container
+ */
+ private void trackDropTargetEnterExit(Component targetOver, MouseEvent e) {
+ int id = e.getID();
+ if (id == MouseEvent.MOUSE_ENTERED && isMouseDTInNativeContainer) {
+ // This can happen if a lightweight component which initiated the
+ // drag has an associated drop target. MOUSE_ENTERED comes when the
+ // mouse is in the native container already. To propagate this event
+ // properly we should null out targetLastEntered.
+ targetLastEnteredDT = null;
+ } else if (id == MouseEvent.MOUSE_ENTERED) {
+ isMouseDTInNativeContainer = true;
+ } else if (id == MouseEvent.MOUSE_EXITED) {
+ isMouseDTInNativeContainer = false;
+ }
+ targetLastEnteredDT = retargetMouseEnterExit(targetOver, e,
+ targetLastEnteredDT,
+ isMouseDTInNativeContainer);
+ }
+
+ /*
* Generates enter/exit events as mouse moves over lw components
* @param targetOver Target mouse is over (including native container)
* @param e Mouse event in native container
*/
private void trackMouseEnterExit(Component targetOver, MouseEvent e) {
- Component targetEnter = null;
- int id = e.getID();
+ if (e instanceof SunDropTargetEvent) {
+ trackDropTargetEnterExit(targetOver, e);
+ return;
+ }
+ int id = e.getID();
- if (e instanceof SunDropTargetEvent &&
- id == MouseEvent.MOUSE_ENTERED &&
- isMouseInNativeContainer == true) {
- // This can happen if a lightweight component which initiated the
- // drag has an associated drop target. MOUSE_ENTERED comes when the
- // mouse is in the native container already. To propagate this event
- // properly we should null out targetLastEntered.
- targetLastEntered = null;
- } else if ( id != MouseEvent.MOUSE_EXITED &&
+ if ( id != MouseEvent.MOUSE_EXITED &&
id != MouseEvent.MOUSE_DRAGGED &&
id != LWD_MOUSE_DRAGGED_OVER &&
- isMouseInNativeContainer == false ) {
+ !isMouseInNativeContainer) {
// any event but an exit or drag means we're in the native container
isMouseInNativeContainer = true;
startListeningForOtherDrags();
- } else if ( id == MouseEvent.MOUSE_EXITED ) {
+ } else if (id == MouseEvent.MOUSE_EXITED) {
isMouseInNativeContainer = false;
stopListeningForOtherDrags();
}
+ targetLastEntered = retargetMouseEnterExit(targetOver, e,
+ targetLastEntered,
+ isMouseInNativeContainer);
+ }
- if (isMouseInNativeContainer) {
- targetEnter = targetOver;
- }
+ private Component retargetMouseEnterExit(Component targetOver, MouseEvent e,
+ Component lastEntered,
+ boolean inNativeContainer) {
+ int id = e.getID();
+ Component targetEnter = inNativeContainer ? targetOver : null;
- if (targetLastEntered == targetEnter) {
- return;
- }
+ if (lastEntered != targetEnter) {
+ if (lastEntered != null) {
+ retargetMouseEvent(lastEntered, MouseEvent.MOUSE_EXITED, e);
+ }
+ if (id == MouseEvent.MOUSE_EXITED) {
+ // consume native exit event if we generate one
+ e.consume();
+ }
- if (targetLastEntered != null) {
- retargetMouseEvent(targetLastEntered, MouseEvent.MOUSE_EXITED, e);
+ if (targetEnter != null) {
+ retargetMouseEvent(targetEnter, MouseEvent.MOUSE_ENTERED, e);
+ }
+ if (id == MouseEvent.MOUSE_ENTERED) {
+ // consume native enter event if we generate one
+ e.consume();
+ }
}
- if (id == MouseEvent.MOUSE_EXITED) {
- // consume native exit event if we generate one
- e.consume();
- }
-
- if (targetEnter != null) {
- retargetMouseEvent(targetEnter, MouseEvent.MOUSE_ENTERED, e);
- }
- if (id == MouseEvent.MOUSE_ENTERED) {
- // consume native enter event if we generate one
- e.consume();
- }
-
- targetLastEntered = targetEnter;
+ return targetEnter;
}
/*
@@ -4908,21 +4929,31 @@
private transient Component mouseEventTarget;
/**
- * The last component entered
+ * The last component entered by the {@code MouseEvent}.
*/
private transient Component targetLastEntered;
/**
+ * The last component entered by the {@code SunDropTargetEvent}.
+ */
+ private transient Component targetLastEnteredDT;
+
+ /**
* Indicates whether {@code mouseEventTarget} was removed and nulled
*/
private transient boolean isCleaned;
/**
- * Is the mouse over the native container
+ * Is the mouse over the native container.
*/
private transient boolean isMouseInNativeContainer = false;
/**
+ * Is DnD over the native container.
+ */
+ private transient boolean isMouseDTInNativeContainer = false;
+
+ /**
* This variable is not used, but kept for serialization compatibility
*/
private Cursor nativeCursor;
@@ -4960,5 +4991,8 @@
if (targetLastEntered == removedComponent) {
targetLastEntered = null;
}
+ if (targetLastEnteredDT == removedComponent) {
+ targetLastEnteredDT = null;
+ }
}
}
diff --git a/jdk/src/share/classes/java/awt/Font.java b/jdk/src/share/classes/java/awt/Font.java
index c5c400c..e6363c8 100644
--- a/jdk/src/share/classes/java/awt/Font.java
+++ b/jdk/src/share/classes/java/awt/Font.java
@@ -71,7 +71,7 @@
* and to render sequences of glyphs on <code>Graphics</code> and
* <code>Component</code> objects.
*
- * <h4>Characters and Glyphs</h4>
+ * <h3>Characters and Glyphs</h3>
*
* A <em>character</em> is a symbol that represents an item such as a letter,
* a digit, or punctuation in an abstract way. For example, <code>'g'</code>,
@@ -192,7 +192,7 @@
* not serializable. See {@link java.awt.im.InputMethodHighlight}.</li>
* </ul>
*
- * Clients who create custom subclasses of <code>Paint</code> and
+ * <p>Clients who create custom subclasses of <code>Paint</code> and
* <code>GraphicAttribute</code> can make them serializable and
* avoid this problem. Clients who use input method highlights can
* convert these to the platform-specific attributes for that
diff --git a/jdk/src/share/classes/java/awt/Graphics2D.java b/jdk/src/share/classes/java/awt/Graphics2D.java
index c8bb23d..6c6c1ab 100644
--- a/jdk/src/share/classes/java/awt/Graphics2D.java
+++ b/jdk/src/share/classes/java/awt/Graphics2D.java
@@ -78,7 +78,7 @@
* <p>
* When creating a <code>Graphics2D</code> object, the
* <code>GraphicsConfiguration</code>
- * specifies the <a name="#deftransform">default transform</a> for
+ * specifies the <a name="deftransform">default transform</a> for
* the target of the <code>Graphics2D</code> (a
* {@link Component} or {@link Image}). This default transform maps the
* user space coordinate system to screen and printer device coordinates
@@ -1103,7 +1103,7 @@
* method is intended only for restoring the original
* <code>Graphics2D</code> transform after rendering, as shown in this
* example:
- * <pre><blockquote>
+ * <pre>
* // Get the current transform
* AffineTransform saveAT = g2.getTransform();
* // Perform transformation
@@ -1112,7 +1112,7 @@
* g2d.draw(...);
* // Restore original transform
* g2d.setTransform(saveAT);
- * </blockquote></pre>
+ * </pre>
*
* @param Tx the <code>AffineTransform</code> that was retrieved
* from the <code>getTransform</code> method
diff --git a/jdk/src/share/classes/java/awt/GraphicsConfiguration.java b/jdk/src/share/classes/java/awt/GraphicsConfiguration.java
index 1e5abd7..c4ca1d1 100644
--- a/jdk/src/share/classes/java/awt/GraphicsConfiguration.java
+++ b/jdk/src/share/classes/java/awt/GraphicsConfiguration.java
@@ -75,7 +75,7 @@
* bounds of the virtual device. The following code sample
* calculates the bounds of the virtual device.
*
- * <pre>
+ * <pre>{@code
* Rectangle virtualBounds = new Rectangle();
* GraphicsEnvironment ge = GraphicsEnvironment.
* getLocalGraphicsEnvironment();
@@ -89,7 +89,7 @@
* virtualBounds =
* virtualBounds.union(gc[i].getBounds());
* }
- * } </pre>
+ * } }</pre>
*
* @see Window
* @see Frame
diff --git a/jdk/src/share/classes/java/awt/GraphicsDevice.java b/jdk/src/share/classes/java/awt/GraphicsDevice.java
index d55cced..819aa49 100644
--- a/jdk/src/share/classes/java/awt/GraphicsDevice.java
+++ b/jdk/src/share/classes/java/awt/GraphicsDevice.java
@@ -46,7 +46,7 @@
* following code sample demonstrates how to create a <code>JFrame</code>
* object for each <code>GraphicsConfiguration</code> on each screen
* device in the <code>GraphicsEnvironment</code>:
- * <pre>
+ * <pre>{@code
* GraphicsEnvironment ge = GraphicsEnvironment.
* getLocalGraphicsEnvironment();
* GraphicsDevice[] gs = ge.getScreenDevices();
@@ -66,7 +66,7 @@
* f.show();
* }
* }
- * </pre>
+ * }</pre>
* <p>
* For more information on full-screen exclusive mode API, see the
* <a href="http://docs.oracle.com/javase/tutorial/extra/fullscreen/index.html">
diff --git a/jdk/src/share/classes/java/awt/Image.java b/jdk/src/share/classes/java/awt/Image.java
index ce23169..b7629f1 100644
--- a/jdk/src/share/classes/java/awt/Image.java
+++ b/jdk/src/share/classes/java/awt/Image.java
@@ -124,7 +124,7 @@
* @param name a property name.
* @param observer an object waiting for this image to be loaded.
* @return the value of the named property.
- * @throws <code>NullPointerException</code> if the property name is null.
+ * @throws NullPointerException if the property name is null.
* @see java.awt.image.ImageObserver
* @see java.awt.Image#UndefinedProperty
*/
diff --git a/jdk/src/share/classes/java/awt/MediaTracker.java b/jdk/src/share/classes/java/awt/MediaTracker.java
index 23ec357..ec76ce4 100644
--- a/jdk/src/share/classes/java/awt/MediaTracker.java
+++ b/jdk/src/share/classes/java/awt/MediaTracker.java
@@ -66,7 +66,7 @@
* <p>
* Here is an example of using <code>MediaTracker</code>:
* <p>
- * <hr><blockquote><pre>
+ * <hr><blockquote><pre>{@code
* import java.applet.Applet;
* import java.awt.Color;
* import java.awt.Image;
@@ -160,7 +160,7 @@
* }
* }
* }
- * </pre></blockquote><hr>
+ * } </pre></blockquote><hr>
*
* @author Jim Graham
* @since JDK1.0
diff --git a/jdk/src/share/classes/java/awt/PageAttributes.java b/jdk/src/share/classes/java/awt/PageAttributes.java
index 85f52ff..7e7bf1c 100644
--- a/jdk/src/share/classes/java/awt/PageAttributes.java
+++ b/jdk/src/share/classes/java/awt/PageAttributes.java
@@ -187,55 +187,55 @@
};
/**
- * The MediaType instance for ISO/DIN & JIS 4A0, 1682 x 2378 mm.
+ * The MediaType instance for ISO/DIN and JIS 4A0, 1682 x 2378 mm.
*/
public static final MediaType ISO_4A0 = new MediaType(I_ISO_4A0);
/**
- * The MediaType instance for ISO/DIN & JIS 2A0, 1189 x 1682 mm.
+ * The MediaType instance for ISO/DIN and JIS 2A0, 1189 x 1682 mm.
*/
public static final MediaType ISO_2A0 = new MediaType(I_ISO_2A0);
/**
- * The MediaType instance for ISO/DIN & JIS A0, 841 x 1189 mm.
+ * The MediaType instance for ISO/DIN and JIS A0, 841 x 1189 mm.
*/
public static final MediaType ISO_A0 = new MediaType(I_ISO_A0);
/**
- * The MediaType instance for ISO/DIN & JIS A1, 594 x 841 mm.
+ * The MediaType instance for ISO/DIN and JIS A1, 594 x 841 mm.
*/
public static final MediaType ISO_A1 = new MediaType(I_ISO_A1);
/**
- * The MediaType instance for ISO/DIN & JIS A2, 420 x 594 mm.
+ * The MediaType instance for ISO/DIN and JIS A2, 420 x 594 mm.
*/
public static final MediaType ISO_A2 = new MediaType(I_ISO_A2);
/**
- * The MediaType instance for ISO/DIN & JIS A3, 297 x 420 mm.
+ * The MediaType instance for ISO/DIN and JIS A3, 297 x 420 mm.
*/
public static final MediaType ISO_A3 = new MediaType(I_ISO_A3);
/**
- * The MediaType instance for ISO/DIN & JIS A4, 210 x 297 mm.
+ * The MediaType instance for ISO/DIN and JIS A4, 210 x 297 mm.
*/
public static final MediaType ISO_A4 = new MediaType(I_ISO_A4);
/**
- * The MediaType instance for ISO/DIN & JIS A5, 148 x 210 mm.
+ * The MediaType instance for ISO/DIN and JIS A5, 148 x 210 mm.
*/
public static final MediaType ISO_A5 = new MediaType(I_ISO_A5);
/**
- * The MediaType instance for ISO/DIN & JIS A6, 105 x 148 mm.
+ * The MediaType instance for ISO/DIN and JIS A6, 105 x 148 mm.
*/
public static final MediaType ISO_A6 = new MediaType(I_ISO_A6);
/**
- * The MediaType instance for ISO/DIN & JIS A7, 74 x 105 mm.
+ * The MediaType instance for ISO/DIN and JIS A7, 74 x 105 mm.
*/
public static final MediaType ISO_A7 = new MediaType(I_ISO_A7);
/**
- * The MediaType instance for ISO/DIN & JIS A8, 52 x 74 mm.
+ * The MediaType instance for ISO/DIN and JIS A8, 52 x 74 mm.
*/
public static final MediaType ISO_A8 = new MediaType(I_ISO_A8);
/**
- * The MediaType instance for ISO/DIN & JIS A9, 37 x 52 mm.
+ * The MediaType instance for ISO/DIN and JIS A9, 37 x 52 mm.
*/
public static final MediaType ISO_A9 = new MediaType(I_ISO_A9);
/**
- * The MediaType instance for ISO/DIN & JIS A10, 26 x 37 mm.
+ * The MediaType instance for ISO/DIN and JIS A10, 26 x 37 mm.
*/
public static final MediaType ISO_A10 = new MediaType(I_ISO_A10);
/**
diff --git a/jdk/src/share/classes/java/awt/Rectangle.java b/jdk/src/share/classes/java/awt/Rectangle.java
index c826022..0b55007 100644
--- a/jdk/src/share/classes/java/awt/Rectangle.java
+++ b/jdk/src/share/classes/java/awt/Rectangle.java
@@ -76,19 +76,19 @@
* negative width and height or it should use the first point in the set
* to construct the {@code Rectangle}.
* For example:
- * <pre>
+ * <pre>{@code
* Rectangle bounds = new Rectangle(0, 0, -1, -1);
* for (int i = 0; i < points.length; i++) {
* bounds.add(points[i]);
* }
- * </pre>
+ * }</pre>
* or if we know that the points array contains at least one point:
- * <pre>
+ * <pre>{@code
* Rectangle bounds = new Rectangle(points[0]);
* for (int i = 1; i < points.length; i++) {
* bounds.add(points[i]);
* }
- * </pre>
+ * }</pre>
* <p>
* This class uses 32-bit integers to store its location and dimensions.
* Frequently operations may produce a result that exceeds the range of
diff --git a/jdk/src/share/classes/java/awt/RenderingHints.java b/jdk/src/share/classes/java/awt/RenderingHints.java
index 4238679..931639c 100644
--- a/jdk/src/share/classes/java/awt/RenderingHints.java
+++ b/jdk/src/share/classes/java/awt/RenderingHints.java
@@ -999,15 +999,15 @@
}
/**
- * Returns <code>true</code> if this <code>RenderingHints</code>
+ * Returns {@code true} if this {@code RenderingHints}
* contains a mapping for the specified key.
*
* @param key key whose presence in this
- * <code>RenderingHints</code> is to be tested.
- * @return <code>true</code> if this <code>RenderingHints</code>
+ * {@code RenderingHints} is to be tested.
+ * @return {@code true} if this {@code RenderingHints}
* contains a mapping for the specified key.
- * @exception <code>ClassCastException</code> if the key can not
- * be cast to <code>RenderingHints.Key</code>
+ * @exception ClassCastException if the key can not
+ * be cast to {@code RenderingHints.Key}
*/
public boolean containsKey(Object key) {
return hintmap.containsKey((Key) key);
@@ -1039,10 +1039,10 @@
* Returns the value to which the specified key is mapped.
* @param key a rendering hint key
* @return the value to which the key is mapped in this object or
- * <code>null</code> if the key is not mapped to any value in
+ * {@code null} if the key is not mapped to any value in
* this object.
- * @exception <code>ClassCastException</code> if the key can not
- * be cast to <code>RenderingHints.Key</code>
+ * @exception ClassCastException if the key can not
+ * be cast to {@code RenderingHints.Key}
* @see #put(Object, Object)
*/
public Object get(Object key) {
@@ -1050,20 +1050,20 @@
}
/**
- * Maps the specified <code>key</code> to the specified
- * <code>value</code> in this <code>RenderingHints</code> object.
- * Neither the key nor the value can be <code>null</code>.
- * The value can be retrieved by calling the <code>get</code> method
+ * Maps the specified {@code key} to the specified
+ * {@code value} in this {@code RenderingHints} object.
+ * Neither the key nor the value can be {@code null}.
+ * The value can be retrieved by calling the {@code get} method
* with a key that is equal to the original key.
* @param key the rendering hint key.
* @param value the rendering hint value.
* @return the previous value of the specified key in this object
- * or <code>null</code> if it did not have one.
- * @exception <code>NullPointerException</code> if the key is
- * <code>null</code>.
- * @exception <code>ClassCastException</code> if the key can not
- * be cast to <code>RenderingHints.Key</code>
- * @exception <code>IllegalArgumentException</code> if the
+ * or {@code null} if it did not have one.
+ * @exception NullPointerException if the key is
+ * {@code null}.
+ * @exception ClassCastException if the key can not
+ * be cast to {@code RenderingHints.Key}
+ * @exception IllegalArgumentException if the
* {@link Key#isCompatibleValue(java.lang.Object)
* Key.isCompatibleValue()}
* method of the specified key returns false for the
@@ -1102,13 +1102,13 @@
/**
* Removes the key and its corresponding value from this
- * <code>RenderingHints</code> object. This method does nothing if the
- * key is not in this <code>RenderingHints</code> object.
+ * {@code RenderingHints} object. This method does nothing if the
+ * key is not in this {@code RenderingHints} object.
* @param key the rendering hints key that needs to be removed
- * @exception <code>ClassCastException</code> if the key can not
- * be cast to <code>RenderingHints.Key</code>
+ * @exception ClassCastException if the key can not
+ * be cast to {@code RenderingHints.Key}
* @return the value to which the key had previously been mapped in this
- * <code>RenderingHints</code> object, or <code>null</code>
+ * {@code RenderingHints} object, or {@code null}
* if the key did not have a mapping.
*/
public Object remove(Object key) {
@@ -1116,18 +1116,18 @@
}
/**
- * Copies all of the mappings from the specified <code>Map</code>
- * to this <code>RenderingHints</code>. These mappings replace
- * any mappings that this <code>RenderingHints</code> had for any
- * of the keys currently in the specified <code>Map</code>.
- * @param m the specified <code>Map</code>
- * @exception <code>ClassCastException</code> class of a key or value
- * in the specified <code>Map</code> prevents it from being
- * stored in this <code>RenderingHints</code>.
- * @exception <code>IllegalArgumentException</code> some aspect
- * of a key or value in the specified <code>Map</code>
+ * Copies all of the mappings from the specified {@code Map}
+ * to this {@code RenderingHints}. These mappings replace
+ * any mappings that this {@code RenderingHints} had for any
+ * of the keys currently in the specified {@code Map}.
+ * @param m the specified {@code Map}
+ * @exception ClassCastException class of a key or value
+ * in the specified {@code Map} prevents it from being
+ * stored in this {@code RenderingHints}.
+ * @exception IllegalArgumentException some aspect
+ * of a key or value in the specified {@code Map}
* prevents it from being stored in
- * this <code>RenderingHints</code>.
+ * this {@code RenderingHints}.
*/
public void putAll(Map<?,?> m) {
// ## javac bug?
diff --git a/jdk/src/share/classes/java/awt/font/NumericShaper.java b/jdk/src/share/classes/java/awt/font/NumericShaper.java
index 0de80e9..63a1a6a 100644
--- a/jdk/src/share/classes/java/awt/font/NumericShaper.java
+++ b/jdk/src/share/classes/java/awt/font/NumericShaper.java
@@ -1212,7 +1212,7 @@
* For example, to check if a shaper shapes to Arabic, you would use the
* following:
* <blockquote>
- * <code>if ((shaper.getRanges() & shaper.ARABIC) != 0) { ... </code>
+ * {@code if ((shaper.getRanges() & shaper.ARABIC) != 0) { ... }
* </blockquote>
*
* <p>Note that this method supports only the bit mask-based
diff --git a/jdk/src/share/classes/java/awt/font/TextAttribute.java b/jdk/src/share/classes/java/awt/font/TextAttribute.java
index c462636..8b1612d 100644
--- a/jdk/src/share/classes/java/awt/font/TextAttribute.java
+++ b/jdk/src/share/classes/java/awt/font/TextAttribute.java
@@ -66,7 +66,7 @@
* <LI>a description of the effect.
* </UL>
* <p>
- * <H4>Values</H4>
+ * <H3>Values</H3>
* <UL>
* <LI>The values of attributes must always be immutable.
* <LI>Where value limitations are given, any value outside of that
@@ -96,7 +96,6 @@
*
* <h4>Summary of attributes</h4>
* <p>
- * <font size="-1">
* <table style="float:center" border="0" cellspacing="0" cellpadding="2" width="%95"
* summary="Key, value type, principal constants, and default value
* behavior of all TextAttributes">
@@ -110,9 +109,9 @@
* <td valign="TOP">{@link #FAMILY}</td>
* <td valign="TOP">String</td>
* <td valign="TOP">See Font {@link java.awt.Font#DIALOG DIALOG},
-{@link java.awt.Font#DIALOG_INPUT DIALOG_INPUT},<br> {@link java.awt.Font#SERIF SERIF},
-{@link java.awt.Font#SANS_SERIF SANS_SERIF}, and {@link java.awt.Font#MONOSPACED MONOSPACED}.
-</td>
+ * {@link java.awt.Font#DIALOG_INPUT DIALOG_INPUT},<br> {@link java.awt.Font#SERIF SERIF},
+ * {@link java.awt.Font#SANS_SERIF SANS_SERIF}, and {@link java.awt.Font#MONOSPACED MONOSPACED}.
+ * </td>
* <td valign="TOP">"Default" (use platform default)</td>
* </tr>
* <tr style="background-color:#eeeeff">
@@ -248,7 +247,6 @@
* <td valign="TOP">0 (do not add tracking)</td>
* </tr>
* </table>
- * </font>
*
* @see java.awt.Font
* @see java.awt.font.TextLayout
diff --git a/jdk/src/share/classes/java/awt/geom/FlatteningPathIterator.java b/jdk/src/share/classes/java/awt/geom/FlatteningPathIterator.java
index 35a7895..3ee163e 100644
--- a/jdk/src/share/classes/java/awt/geom/FlatteningPathIterator.java
+++ b/jdk/src/share/classes/java/awt/geom/FlatteningPathIterator.java
@@ -109,7 +109,7 @@
* control points and the flattened curve
* @param limit the maximum number of recursive subdivisions
* allowed for any curved segment
- * @exception <code>IllegalArgumentException</code> if
+ * @exception IllegalArgumentException if
* <code>flatness</code> or <code>limit</code>
* is less than zero
*/
@@ -336,7 +336,7 @@
* @param coords an array that holds the data returned from
* this method
* @return the path segment type of the current path segment.
- * @exception <code>NoSuchElementException</code> if there
+ * @exception NoSuchElementException if there
* are no more elements in the flattening path to be
* returned.
* @see PathIterator#SEG_MOVETO
@@ -371,7 +371,7 @@
* @param coords an array that holds the data returned from
* this method
* @return the path segment type of the current path segment.
- * @exception <code>NoSuchElementException</code> if there
+ * @exception NoSuchElementException if there
* are no more elements in the flattening path to be
* returned.
* @see PathIterator#SEG_MOVETO
diff --git a/jdk/src/share/classes/java/awt/geom/Path2D.java b/jdk/src/share/classes/java/awt/geom/Path2D.java
index acf781a..d968e2e 100644
--- a/jdk/src/share/classes/java/awt/geom/Path2D.java
+++ b/jdk/src/share/classes/java/awt/geom/Path2D.java
@@ -794,7 +794,7 @@
* ({@link #WIND_EVEN_ODD WIND_EVEN_ODD} or
* {@link #WIND_NON_ZERO WIND_NON_ZERO})
* <li>followed by
- * NP (or unlimited if NP < 0) sets of values consisting of
+ * {@code NP} (or unlimited if {@code NP < 0}) sets of values consisting of
* a single byte indicating a path segment type
* followed by one or more pairs of float or double
* values representing the coordinates of the path segment
@@ -1520,7 +1520,7 @@
* ({@link #WIND_EVEN_ODD WIND_EVEN_ODD} or
* {@link #WIND_NON_ZERO WIND_NON_ZERO})
* <li>followed by
- * NP (or unlimited if NP < 0) sets of values consisting of
+ * {@code NP} (or unlimited if {@code NP < 0}) sets of values consisting of
* a single byte indicating a path segment type
* followed by one or more pairs of float or double
* values representing the coordinates of the path segment
diff --git a/jdk/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java b/jdk/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
index 8095dad..ebd41f6 100644
--- a/jdk/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
+++ b/jdk/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
@@ -348,7 +348,7 @@
* data
* @return the specified band containing the sample of the specified
* pixel.
- * @exception ArrayIndexOutOfBoundException if the specified
+ * @exception ArrayIndexOutOfBoundsException if the specified
* coordinates are not in bounds.
* @see #setSample(int, int, int, int, DataBuffer)
*/
diff --git a/jdk/src/share/classes/java/awt/print/Book.java b/jdk/src/share/classes/java/awt/print/Book.java
index abf02e0..72f032e 100644
--- a/jdk/src/share/classes/java/awt/print/Book.java
+++ b/jdk/src/share/classes/java/awt/print/Book.java
@@ -129,7 +129,7 @@
* @param painter the <code>Printable</code> instance that
* renders the page
* @param page the size and orientation of the page
- * @throws <code>NullPointerException</code>
+ * @throws NullPointerException
* If the <code>painter</code> or <code>page</code>
* argument is <code>null</code>
*/
@@ -146,7 +146,7 @@
* @param page the size and orientation of the page
* @param numPages the number of pages to be added to the
* this <code>Book</code>.
- * @throws <code>NullPointerException</code>
+ * @throws NullPointerException
* If the <code>painter</code> or <code>page</code>
* argument is <code>null</code>
*/
diff --git a/jdk/src/share/classes/java/awt/print/PageFormat.java b/jdk/src/share/classes/java/awt/print/PageFormat.java
index 0b25201..fc6e023 100644
--- a/jdk/src/share/classes/java/awt/print/PageFormat.java
+++ b/jdk/src/share/classes/java/awt/print/PageFormat.java
@@ -286,7 +286,7 @@
* <code>PageFormat</code>.
* @param paper the <code>Paper</code> object to which to set
* the <code>Paper</code> object for this <code>PageFormat</code>.
- * @exception <code>NullPointerException</code>
+ * @exception NullPointerException
* a null paper instance was passed as a parameter.
* @see #getPaper
*/
diff --git a/jdk/src/share/classes/java/awt/print/Printable.java b/jdk/src/share/classes/java/awt/print/Printable.java
index 6737aec..c34b7e6 100644
--- a/jdk/src/share/classes/java/awt/print/Printable.java
+++ b/jdk/src/share/classes/java/awt/print/Printable.java
@@ -76,7 +76,7 @@
* <li>With the exception of re-imaging an entire document for multiple
* collated copies, the increasing page index order means that when
* page N is requested if a client needs to calculate page break position,
- * it may safely discard any state related to pages < N, and make current
+ * it may safely discard any state related to pages < N, and make current
* that for page N. "State" usually is just the calculated position in the
* document that corresponds to the start of the page.
*
diff --git a/jdk/src/share/classes/java/awt/print/PrinterJob.java b/jdk/src/share/classes/java/awt/print/PrinterJob.java
index 6ac1133..74121c5 100644
--- a/jdk/src/share/classes/java/awt/print/PrinterJob.java
+++ b/jdk/src/share/classes/java/awt/print/PrinterJob.java
@@ -113,7 +113,7 @@
* A convenience method which locates factories for stream print
* services which can image 2D graphics.
* Sample usage :
- * <pre>
+ * <pre>{@code
* FileOutputStream outstream;
* StreamPrintService psPrinter;
* String psMimeType = "application/postscript";
@@ -131,7 +131,7 @@
* e.printStackTrace();
* }
* }
- * </pre>
+ * }</pre>
* Services returned from this method may be installed on
* <code>PrinterJob</code> instances which support print services.
* Calling this method is equivalent to calling
diff --git a/jdk/src/share/classes/java/io/EOFException.java b/jdk/src/share/classes/java/io/EOFException.java
index ed6ca0f..0f9a326 100644
--- a/jdk/src/share/classes/java/io/EOFException.java
+++ b/jdk/src/share/classes/java/io/EOFException.java
@@ -32,7 +32,6 @@
* This exception is mainly used by data input streams to signal end of
* stream. Note that many other input operations return a special value on
* end of stream rather than throwing an exception.
- * <p>
*
* @author Frank Yellin
* @see java.io.DataInputStream
diff --git a/jdk/src/share/classes/java/io/FilePermission.java b/jdk/src/share/classes/java/io/FilePermission.java
index 89f2c33..bac39d3 100644
--- a/jdk/src/share/classes/java/io/FilePermission.java
+++ b/jdk/src/share/classes/java/io/FilePermission.java
@@ -380,7 +380,7 @@
/**
* Checks two FilePermission objects for equality. Checks that <i>obj</i> is
* a FilePermission, and has the same pathname and actions as this object.
- * <P>
+ *
* @param obj the object we are testing for equality with this object.
* @return <code>true</code> if obj is a FilePermission, and has the same
* pathname and actions as this FilePermission object,
diff --git a/jdk/src/share/classes/java/lang/String.java b/jdk/src/share/classes/java/lang/String.java
index e0a73d5..4efec83 100644
--- a/jdk/src/share/classes/java/lang/String.java
+++ b/jdk/src/share/classes/java/lang/String.java
@@ -123,7 +123,7 @@
* Class String is special cased within the Serialization Stream Protocol.
*
* A String instance is written into an ObjectOutputStream according to
- * <a href="{@docroot}../platform/serialization/spec/output.html">
+ * <a href="{@docRoot}/../platform/serialization/spec/output.html">
* Object Serialization Specification, Section 6.2, "Stream Elements"</a>
*/
private static final ObjectStreamField[] serialPersistentFields =
@@ -1893,7 +1893,7 @@
}
/**
- * Returns a new string that is a substring of this string. The
+ * Returns a string that is a substring of this string. The
* substring begins with the character at the specified index and
* extends to the end of this string. <p>
* Examples:
@@ -1921,7 +1921,7 @@
}
/**
- * Returns a new string that is a substring of this string. The
+ * Returns a string that is a substring of this string. The
* substring begins at the specified {@code beginIndex} and
* extends to the character at index {@code endIndex - 1}.
* Thus the length of the substring is {@code endIndex-beginIndex}.
@@ -1970,6 +1970,7 @@
* <blockquote><pre>
* str.substring(begin, end)</pre></blockquote>
*
+ * @apiNote
* This method is defined so that the {@code String} class can implement
* the {@link CharSequence} interface.
*
@@ -1993,8 +1994,8 @@
* Concatenates the specified string to the end of this string.
* <p>
* If the length of the argument string is {@code 0}, then this
- * {@code String} object is returned. Otherwise, a new
- * {@code String} object is created, representing a character
+ * {@code String} object is returned. Otherwise, a
+ * {@code String} object is returned that represents a character
* sequence that is the concatenation of the character sequence
* represented by this {@code String} object and the character
* sequence represented by the argument string.<p>
@@ -2021,13 +2022,13 @@
}
/**
- * Returns a new string resulting from replacing all occurrences of
+ * Returns a string resulting from replacing all occurrences of
* {@code oldChar} in this string with {@code newChar}.
* <p>
* If the character {@code oldChar} does not occur in the
* character sequence represented by this {@code String} object,
* then a reference to this {@code String} object is returned.
- * Otherwise, a new {@code String} object is created that
+ * Otherwise, a {@code String} object is returned that
* represents a character sequence identical to the character sequence
* represented by this {@code String} object, except that every
* occurrence of {@code oldChar} is replaced by an occurrence
@@ -2818,8 +2819,8 @@
}
/**
- * Returns a copy of the string, with leading and trailing whitespace
- * omitted.
+ * Returns a string whose value is this string, with any leading and trailing
+ * whitespace removed.
* <p>
* If this {@code String} object represents an empty character
* sequence, or the first and last characters of character sequence
@@ -2828,15 +2829,15 @@
* reference to this {@code String} object is returned.
* <p>
* Otherwise, if there is no character with a code greater than
- * {@code '\u005Cu0020'} in the string, then a new
- * {@code String} object representing an empty string is created
- * and returned.
+ * {@code '\u005Cu0020'} in the string, then a
+ * {@code String} object representing an empty string is
+ * returned.
* <p>
* Otherwise, let <i>k</i> be the index of the first character in the
* string whose code is greater than {@code '\u005Cu0020'}, and let
* <i>m</i> be the index of the last character in the string whose code
- * is greater than {@code '\u005Cu0020'}. A new {@code String}
- * object is created, representing the substring of this string that
+ * is greater than {@code '\u005Cu0020'}. A {@code String}
+ * object is returned, representing the substring of this string that
* begins with the character at index <i>k</i> and ends with the
* character at index <i>m</i>-that is, the result of
* {@code this.substring(k, m + 1)}.
@@ -2844,7 +2845,7 @@
* This method may be used to trim whitespace (as defined above) from
* the beginning and end of a string.
*
- * @return A copy of this string with leading and trailing white
+ * @return A string whose value is this string, with any leading and trailing white
* space removed, or this string if it has no leading or
* trailing white space.
*/
@@ -2981,12 +2982,12 @@
/**
* Returns the string representation of the {@code char} array
* argument. The contents of the character array are copied; subsequent
- * modification of the character array does not affect the newly
- * created string.
+ * modification of the character array does not affect the returned
+ * string.
*
- * @param data a {@code char} array.
- * @return a newly allocated string representing the same sequence of
- * characters contained in the character array argument.
+ * @param data the character array.
+ * @return a {@code String} that contains the characters of the
+ * character array.
*/
public static String valueOf(char data[]) {
return new String(data);
@@ -3000,14 +3001,13 @@
* character of the subarray. The {@code count} argument
* specifies the length of the subarray. The contents of the subarray
* are copied; subsequent modification of the character array does not
- * affect the newly created string.
+ * affect the returned string.
*
* @param data the character array.
- * @param offset the initial offset into the value of the
- * {@code String}.
- * @param count the length of the value of the {@code String}.
- * @return a string representing the sequence of characters contained
- * in the subarray of the character array argument.
+ * @param offset initial offset of the subarray.
+ * @param count length of the subarray.
+ * @return a {@code String} that contains the characters of the
+ * specified subarray of the character array.
* @exception IndexOutOfBoundsException if {@code offset} is
* negative, or {@code count} is negative, or
* {@code offset+count} is larger than
@@ -3018,23 +3018,24 @@
}
/**
- * Returns a String that represents the character sequence in the
- * array specified.
+ * Equivalent to {@link #valueOf(char[], int, int)}.
*
* @param data the character array.
* @param offset initial offset of the subarray.
* @param count length of the subarray.
* @return a {@code String} that contains the characters of the
* specified subarray of the character array.
+ * @exception IndexOutOfBoundsException if {@code offset} is
+ * negative, or {@code count} is negative, or
+ * {@code offset+count} is larger than
+ * {@code data.length}.
*/
public static String copyValueOf(char data[], int offset, int count) {
- // All public String constructors now copy the data.
return new String(data, offset, count);
}
/**
- * Returns a String that represents the character sequence in the
- * array specified.
+ * Equivalent to {@link #valueOf(char[])}.
*
* @param data the character array.
* @return a {@code String} that contains the characters of the
diff --git a/jdk/src/share/classes/java/lang/annotation/ElementType.java b/jdk/src/share/classes/java/lang/annotation/ElementType.java
index a1125ff..4590f39 100644
--- a/jdk/src/share/classes/java/lang/annotation/ElementType.java
+++ b/jdk/src/share/classes/java/lang/annotation/ElementType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,15 +26,49 @@
package java.lang.annotation;
/**
- * A program element type. The constants of this enumerated type
- * provide a simple classification of the declared elements in a
- * Java program.
+ * The constants of this enumerated type provide a simple classification of the
+ * syntactic locations where annotations may appear in a Java program. These
+ * constants are used in {@link Target java.lang.annotation.Target}
+ * meta-annotations to specify where it is legal to write annotations of a
+ * given type.
*
- * <p>These constants are used with the {@link Target} meta-annotation type
- * to specify where it is legal to use an annotation type.
+ * <p>The syntactic locations where annotations may appear are split into
+ * <em>declaration contexts</em> , where annotations apply to declarations, and
+ * <em>type contexts</em> , where annotations apply to types used in
+ * declarations and expressions.
+ *
+ * <p>The constants {@link #ANNOTATION_TYPE} , {@link #CONSTRUCTOR} , {@link
+ * #FIELD} , {@link #LOCAL_VARIABLE} , {@link #METHOD} , {@link #PACKAGE} ,
+ * {@link #PARAMETER} , {@link #TYPE} , and {@link #TYPE_PARAMETER} correspond
+ * to the declaration contexts in JLS 9.6.4.1.
+ *
+ * <p>For example, an annotation whose type is meta-annotated with
+ * {@code @Target(ElementType.FIELD)} may only be written as a modifier for a
+ * field declaration.
+ *
+ * <p>The constant {@link #TYPE_USE} corresponds to the 15 type contexts in JLS
+ * 4.11, as well as to two declaration contexts: type declarations (including
+ * annotation type declarations) and type parameter declarations.
+ *
+ * <p>For example, an annotation whose type is meta-annotated with
+ * {@code @Target(ElementType.TYPE_USE)} may be written on the type of a field
+ * (or within the type of the field, if it is a nested, parameterized, or array
+ * type), and may also appear as a modifier for, say, a class declaration.
+ *
+ * <p>The {@code TYPE_USE} constant includes type declarations and type
+ * parameter declarations as a convenience for designers of type checkers which
+ * give semantics to annotation types. For example, if the annotation type
+ * {@code NonNull} is meta-annotated with
+ * {@code @Target(ElementType.TYPE_USE)}, then {@code @NonNull}
+ * {@code class C {...}} could be treated by a type checker as indicating that
+ * all variables of class {@code C} are non-null, while still allowing
+ * variables of other classes to be non-null or not non-null based on whether
+ * {@code @NonNull} appears at the variable's declaration.
*
* @author Joshua Bloch
* @since 1.5
+ * @jls 9.6.4.1 @Target
+ * @jls 4.1 The Kinds of Types and Values
*/
public enum ElementType {
/** Class, interface (including annotation type), or enum declaration */
diff --git a/jdk/src/share/classes/java/lang/annotation/Target.java b/jdk/src/share/classes/java/lang/annotation/Target.java
index 1ceec38..1ad4056 100644
--- a/jdk/src/share/classes/java/lang/annotation/Target.java
+++ b/jdk/src/share/classes/java/lang/annotation/Target.java
@@ -26,33 +26,42 @@
package java.lang.annotation;
/**
- * Indicates the kinds of program element to which an annotation type
- * is applicable. If a Target meta-annotation is not present on an
- * annotation type declaration, the declared type may be used on any
- * program element. If such a meta-annotation is present, the compiler
- * will enforce the specified usage restriction.
+ * Indicates the contexts in which an annotation type is applicable. The
+ * declaration contexts and type contexts in which an annotation type may be
+ * applicable are specified in JLS 9.6.4.1, and denoted in source code by enum
+ * constants of {@link ElementType java.lang.annotation.ElementType}.
*
- * For example, this meta-annotation indicates that the declared type is
- * itself a meta-annotation type. It can only be used on annotation type
- * declarations:
+ * <p>If an {@code @Target} meta-annotation is not present on an annotation type
+ * {@code T} , then an annotation of type {@code T} may be written as a
+ * modifier for any declaration except a type parameter declaration.
+ *
+ * <p>If an {@code @Target} meta-annotation is present, the compiler will enforce
+ * the usage restrictions indicated by {@code ElementType}
+ * enum constants, in line with JLS 9.7.4.
+ *
+ * <p>For example, this {@code @Target} meta-annotation indicates that the
+ * declared type is itself a meta-annotation type. It can only be used on
+ * annotation type declarations:
* <pre>
* @Target(ElementType.ANNOTATION_TYPE)
* public @interface MetaAnnotationType {
* ...
* }
* </pre>
- * This meta-annotation indicates that the declared type is intended solely
- * for use as a member type in complex annotation type declarations. It
- * cannot be used to annotate anything directly:
+ *
+ * <p>This {@code @Target} meta-annotation indicates that the declared type is
+ * intended solely for use as a member type in complex annotation type
+ * declarations. It cannot be used to annotate anything directly:
* <pre>
* @Target({})
* public @interface MemberType {
* ...
* }
* </pre>
- * It is a compile-time error for a single ElementType constant to
- * appear more than once in a Target annotation. For example, the
- * following meta-annotation is illegal:
+ *
+ * <p>It is a compile-time error for a single {@code ElementType} constant to
+ * appear more than once in an {@code @Target} annotation. For example, the
+ * following {@code @Target} meta-annotation is illegal:
* <pre>
* @Target({ElementType.FIELD, ElementType.METHOD, ElementType.FIELD})
* public @interface Bogus {
@@ -61,7 +70,8 @@
* </pre>
*
* @since 1.5
- * @jls 9.6.3.1 @Target
+ * @jls 9.6.4.1 @Target
+ * @jls 9.7.4 Where Annotations May Appear
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java b/jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
index aa56bbf..8f7cdd6 100644
--- a/jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
+++ b/jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
@@ -66,7 +66,6 @@
* <th>Description</th>
* </tr>
* <tr>
- * <tr>
* <td> {@code java.nio.channels.DefaultThreadPool.threadFactory} </td>
* <td> The value of this property is taken to be the fully-qualified name
* of a concrete {@link java.util.concurrent.ThreadFactory ThreadFactory}
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java b/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
index c40fb37..24ec4df 100644
--- a/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
@@ -178,7 +178,7 @@
* written synchronously to the underlying storage device. (see <a
* href="../file/package-summary.html#integrity"> Synchronized I/O file
* integrity</a>). </td>
- * <tr>
+ * </tr>
* <tr>
* <td> {@link StandardOpenOption#DSYNC DSYNC} </td>
* <td> Requires that every update to the file's content be written
diff --git a/jdk/src/share/classes/java/nio/channels/FileChannel.java b/jdk/src/share/classes/java/nio/channels/FileChannel.java
index 57ce3e1..f6f332a 100644
--- a/jdk/src/share/classes/java/nio/channels/FileChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/FileChannel.java
@@ -229,7 +229,7 @@
* written synchronously to the underlying storage device. (see <a
* href="../file/package-summary.html#integrity"> Synchronized I/O file
* integrity</a>). </td>
- * <tr>
+ * </tr>
* <tr>
* <td> {@link StandardOpenOption#DSYNC DSYNC} </td>
* <td> Requires that every update to the file's content be written
diff --git a/jdk/src/share/classes/java/nio/charset/Charset.java b/jdk/src/share/classes/java/nio/charset/Charset.java
index 3d946f1..ae05661 100644
--- a/jdk/src/share/classes/java/nio/charset/Charset.java
+++ b/jdk/src/share/classes/java/nio/charset/Charset.java
@@ -118,10 +118,10 @@
* {@link java.io.InputStreamReader#getEncoding InputStreamReader} and {@link
* java.io.OutputStreamWriter#getEncoding OutputStreamWriter} classes.
*
- * <p><a name="iana">If a charset listed in the <a
+ * <p><a name="iana"> </a>If a charset listed in the <a
* href="http://www.iana.org/assignments/character-sets"><i>IANA Charset
* Registry</i></a> is supported by an implementation of the Java platform then
- * its canonical name must be the name listed in the registry.</a> Many charsets
+ * its canonical name must be the name listed in the registry. Many charsets
* are given more than one name in the registry, in which case the registry
* identifies one of the names as <i>MIME-preferred</i>. If a charset has more
* than one registry name then its canonical name must be the MIME-preferred
diff --git a/jdk/src/share/classes/java/nio/file/FileSystem.java b/jdk/src/share/classes/java/nio/file/FileSystem.java
index 2a961fb..a5dbe0f 100644
--- a/jdk/src/share/classes/java/nio/file/FileSystem.java
+++ b/jdk/src/share/classes/java/nio/file/FileSystem.java
@@ -325,7 +325,6 @@
* <td>Matches file names containing a dot</td>
* </tr>
* <tr>
- * <tr>
* <td>{@code *.{java,class}}</td>
* <td>Matches file names ending with {@code .java} or {@code .class}</td>
* </tr>
diff --git a/jdk/src/share/classes/java/nio/file/Files.java b/jdk/src/share/classes/java/nio/file/Files.java
index 920ac93..5c8d8be 100644
--- a/jdk/src/share/classes/java/nio/file/Files.java
+++ b/jdk/src/share/classes/java/nio/file/Files.java
@@ -284,7 +284,7 @@
* written synchronously to the underlying storage device. (see <a
* href="package-summary.html#integrity"> Synchronized I/O file
* integrity</a>). </td>
- * <tr>
+ * </tr>
* <tr>
* <td> {@link StandardOpenOption#DSYNC DSYNC} </td>
* <td> Requires that every update to the file's content be written
diff --git a/jdk/src/share/classes/java/nio/package.html b/jdk/src/share/classes/java/nio/package.html
index 27059e7..1f02634 100644
--- a/jdk/src/share/classes/java/nio/package.html
+++ b/jdk/src/share/classes/java/nio/package.html
@@ -62,7 +62,7 @@
implementations.
-<a name="buffers">
+<a name="buffers"> </a>
<blockquote><table cellspacing=1 cellpadding=0 summary="Description of the various buffers">
<tr><th><p align="left">Buffers</p></th><th><p align="left">Description</p></th></tr>
@@ -115,7 +115,7 @@
best effort to perform native I/O operations directly upon it. </p></li>
<li><p> A byte buffer can be created by {@link
- java.nio.channels.FileChannel#map </code><i>mapping</i><code>} a region of a
+ java.nio.channels.FileChannel#map <i>mapping</i>} a region of a
file directly into memory, in which case a few additional file-related
operations defined in the {@link java.nio.MappedByteBuffer} class are
available. </p></li>
diff --git a/jdk/src/share/classes/java/util/logging/XMLFormatter.java b/jdk/src/share/classes/java/util/logging/XMLFormatter.java
index d32d978..34c61c4 100644
--- a/jdk/src/share/classes/java/util/logging/XMLFormatter.java
+++ b/jdk/src/share/classes/java/util/logging/XMLFormatter.java
@@ -58,7 +58,7 @@
private void appendISO8601(StringBuilder sb, long millis) {
GregorianCalendar cal = new GregorianCalendar();
cal.setTimeInMillis(millis);
- sb.append(cal.get(Calendar.YEAR) + 1900);
+ sb.append(cal.get(Calendar.YEAR));
sb.append('-');
a2(sb, cal.get(Calendar.MONTH) + 1);
sb.append('-');
diff --git a/jdk/src/share/classes/java/util/stream/DoubleStream.java b/jdk/src/share/classes/java/util/stream/DoubleStream.java
index 68d792d..163e5c4 100644
--- a/jdk/src/share/classes/java/util/stream/DoubleStream.java
+++ b/jdk/src/share/classes/java/util/stream/DoubleStream.java
@@ -207,12 +207,12 @@
* @apiNote This method exists mainly to support debugging, where you want
* to see the elements as they flow past a certain point in a pipeline:
* <pre>{@code
- * list.stream()
- * .filter(filteringFunction)
- * .peek(e -> System.out.println("Filtered value: " + e));
- * .map(mappingFunction)
- * .peek(e -> System.out.println("Mapped value: " + e));
- * .collect(Collectors.toDoubleSummaryStastistics());
+ * DoubleStream.of(1, 2, 3, 4)
+ * .filter(e -> e > 2)
+ * .peek(e -> System.out.println("Filtered value: " + e))
+ * .map(e -> e * e)
+ * .peek(e -> System.out.println("Mapped value: " + e))
+ * .sum();
* }</pre>
*
* @param action a <a href="package-summary.html#NonInterference">
diff --git a/jdk/src/share/classes/java/util/stream/IntStream.java b/jdk/src/share/classes/java/util/stream/IntStream.java
index b9fae57..3030f46 100644
--- a/jdk/src/share/classes/java/util/stream/IntStream.java
+++ b/jdk/src/share/classes/java/util/stream/IntStream.java
@@ -200,12 +200,12 @@
* @apiNote This method exists mainly to support debugging, where you want
* to see the elements as they flow past a certain point in a pipeline:
* <pre>{@code
- * list.stream()
- * .filter(filteringFunction)
- * .peek(e -> System.out.println("Filtered value: " + e));
- * .map(mappingFunction)
- * .peek(e -> System.out.println("Mapped value: " + e));
- * .collect(Collectors.toIntSummaryStastistics());
+ * IntStream.of(1, 2, 3, 4)
+ * .filter(e -> e > 2)
+ * .peek(e -> System.out.println("Filtered value: " + e))
+ * .map(e -> e * e)
+ * .peek(e -> System.out.println("Mapped value: " + e))
+ * .sum();
* }</pre>
*
* @param action a <a href="package-summary.html#NonInterference">
diff --git a/jdk/src/share/classes/java/util/stream/LongStream.java b/jdk/src/share/classes/java/util/stream/LongStream.java
index d9fe6b3..983afef 100644
--- a/jdk/src/share/classes/java/util/stream/LongStream.java
+++ b/jdk/src/share/classes/java/util/stream/LongStream.java
@@ -205,12 +205,12 @@
* @apiNote This method exists mainly to support debugging, where you want
* to see the elements as they flow past a certain point in a pipeline:
* <pre>{@code
- * list.stream()
- * .filter(filteringFunction)
- * .peek(e -> System.out.println("Filtered value: " + e));
- * .map(mappingFunction)
- * .peek(e -> System.out.println("Mapped value: " + e));
- * .collect(Collectors.toLongSummaryStastistics());
+ * LongStream.of(1, 2, 3, 4)
+ * .filter(e -> e > 2)
+ * .peek(e -> System.out.println("Filtered value: " + e))
+ * .map(e -> e * e)
+ * .peek(e -> System.out.println("Mapped value: " + e))
+ * .sum();
* }</pre>
*
* @param action a <a href="package-summary.html#NonInterference">
diff --git a/jdk/src/share/classes/java/util/stream/Stream.java b/jdk/src/share/classes/java/util/stream/Stream.java
index 9c88e68..966cd79 100644
--- a/jdk/src/share/classes/java/util/stream/Stream.java
+++ b/jdk/src/share/classes/java/util/stream/Stream.java
@@ -403,12 +403,12 @@
* @apiNote This method exists mainly to support debugging, where you want
* to see the elements as they flow past a certain point in a pipeline:
* <pre>{@code
- * list.stream()
- * .filter(filteringFunction)
- * .peek(e -> System.out.println("Filtered value: " + e));
- * .map(mappingFunction)
- * .peek(e -> System.out.println("Mapped value: " + e));
- * .collect(Collectors.intoList());
+ * Stream.of("one", "two", "three", "four")
+ * .filter(e -> e.length() > 3)
+ * .peek(e -> System.out.println("Filtered value: " + e))
+ * .map(String::toUpperCase)
+ * .peek(e -> System.out.println("Mapped value: " + e))
+ * .collect(Collectors.toList());
* }</pre>
*
* @param action a <a href="package-summary.html#NonInterference">
diff --git a/jdk/src/share/classes/javax/swing/JPopupMenu.java b/jdk/src/share/classes/javax/swing/JPopupMenu.java
index 0967eba..4112de6 100644
--- a/jdk/src/share/classes/javax/swing/JPopupMenu.java
+++ b/jdk/src/share/classes/javax/swing/JPopupMenu.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -736,7 +736,7 @@
if (pref == null || pref.width != getWidth() ||
pref.height != getHeight()) {
- popup = getPopup();
+ showPopup();
} else {
validate();
}
@@ -787,7 +787,7 @@
if(b) {
firePopupMenuWillBecomeVisible();
- popup = getPopup();
+ showPopup();
firePropertyChange("visible", Boolean.FALSE, Boolean.TRUE);
@@ -805,7 +805,7 @@
}
/**
- * Returns a <code>Popup</code> instance from the
+ * Retrieves <code>Popup</code> instance from the
* <code>PopupMenuUI</code> that has had <code>show</code> invoked on
* it. If the current <code>popup</code> is non-null,
* this will invoke <code>dispose</code> of it, and then
@@ -814,7 +814,7 @@
* This does NOT fire any events, it is up the caller to dispatch
* the necessary events.
*/
- private Popup getPopup() {
+ private void showPopup() {
Popup oldPopup = popup;
if (oldPopup != null) {
@@ -838,8 +838,8 @@
desiredLocationY);
popupFactory.setPopupType(PopupFactory.LIGHT_WEIGHT_POPUP);
+ popup = newPopup;
newPopup.show();
- return newPopup;
}
/**
@@ -873,7 +873,7 @@
desiredLocationX = x;
desiredLocationY = y;
if(popup != null && (x != oldX || y != oldY)) {
- popup = getPopup();
+ showPopup();
}
}
@@ -1030,7 +1030,7 @@
Dimension newSize = getPreferredSize();
if (!oldSize.equals(newSize)) {
- popup = getPopup();
+ showPopup();
}
}
}
diff --git a/jdk/src/share/classes/sun/applet/AppletPanel.java b/jdk/src/share/classes/sun/applet/AppletPanel.java
index 5ca5662..2d1da2c 100644
--- a/jdk/src/share/classes/sun/applet/AppletPanel.java
+++ b/jdk/src/share/classes/sun/applet/AppletPanel.java
@@ -794,18 +794,13 @@
doInit = true;
} else {
// serName is not null;
- InputStream is = (InputStream)
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
- return loader.getResourceAsStream(serName);
- }
- });
- ObjectInputStream ois =
- new AppletObjectInputStream(is, loader);
- Object serObject = ois.readObject();
- applet = (Applet) serObject;
- doInit = false; // skip over the first init
+ try (InputStream is = AccessController.doPrivileged(
+ (PrivilegedAction<InputStream>)() -> loader.getResourceAsStream(serName));
+ ObjectInputStream ois = new AppletObjectInputStream(is, loader)) {
+
+ applet = (Applet) ois.readObject();
+ doInit = false; // skip over the first init
+ }
}
// Determine the JDK level that the applet targets.
@@ -1239,20 +1234,13 @@
// append .class
final String resourceName = name + ".class";
- InputStream is = null;
byte[] classHeader = new byte[8];
- try {
- is = (InputStream) java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
- return loader.getResourceAsStream(resourceName);
- }
- });
+ try (InputStream is = AccessController.doPrivileged(
+ (PrivilegedAction<InputStream>) () -> loader.getResourceAsStream(resourceName))) {
// Read the first 8 bytes of the class file
int byteRead = is.read(classHeader, 0, 8);
- is.close();
// return if the header is not read in entirely
// for some reasons.
diff --git a/jdk/src/share/classes/sun/applet/AppletViewer.java b/jdk/src/share/classes/sun/applet/AppletViewer.java
index 69d400a..03335e8 100644
--- a/jdk/src/share/classes/sun/applet/AppletViewer.java
+++ b/jdk/src/share/classes/sun/applet/AppletViewer.java
@@ -668,11 +668,11 @@
String dname = fd.getDirectory();
File file = new File(dname, fname);
- try {
- BufferedOutputStream s = new BufferedOutputStream(new FileOutputStream(file));
- ObjectOutputStream os = new ObjectOutputStream(s);
- showStatus(amh.getMessage("appletsave.err1",
- panel.applet.toString(), file.toString()));
+ try (FileOutputStream fos = new FileOutputStream(file);
+ BufferedOutputStream bos = new BufferedOutputStream(fos);
+ ObjectOutputStream os = new ObjectOutputStream(bos)) {
+
+ showStatus(amh.getMessage("appletsave.err1", panel.applet.toString(), file.toString()));
os.writeObject(panel.applet);
} catch (IOException ex) {
System.err.println(amh.getMessage("appletsave.err2", ex));
diff --git a/jdk/src/share/classes/sun/applet/Main.java b/jdk/src/share/classes/sun/applet/Main.java
index e5ef4fd..2367074 100644
--- a/jdk/src/share/classes/sun/applet/Main.java
+++ b/jdk/src/share/classes/sun/applet/Main.java
@@ -432,10 +432,8 @@
}
// SAVE THE FILE
- try {
- FileOutputStream out = new FileOutputStream(dotAV);
+ try (FileOutputStream out = new FileOutputStream(dotAV)) {
avProps.store(out, lookup("main.prop.store"));
- out.close();
} catch (IOException e) {
System.err.println(lookup("main.err.prop.cantsave",
dotAV.toString()));
@@ -472,13 +470,10 @@
// read the file
Properties tmpProps = new Properties();
- try {
- FileInputStream in = new FileInputStream(inFile);
+ try (FileInputStream in = new FileInputStream(inFile)) {
tmpProps.load(new BufferedInputStream(in));
- in.close();
} catch (IOException e) {
- System.err.println(lookup("main.err.prop.cantread",
- inFile.toString()));
+ System.err.println(lookup("main.err.prop.cantread", inFile.toString()));
}
// pick off the properties we care about
diff --git a/jdk/src/share/classes/sun/misc/Unsafe.java b/jdk/src/share/classes/sun/misc/Unsafe.java
index 25fb99e..1a2e915 100644
--- a/jdk/src/share/classes/sun/misc/Unsafe.java
+++ b/jdk/src/share/classes/sun/misc/Unsafe.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1131,4 +1131,12 @@
*/
public native void fullFence();
+ /**
+ * Throws IllegalAccessError; for use by the VM.
+ * @since 1.8
+ */
+ private static void throwIllegalAccessError() {
+ throw new IllegalAccessError();
+ }
+
}
diff --git a/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotation.java b/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotation.java
index 5c94db4..e1d1bba 100644
--- a/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotation.java
+++ b/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotation.java
@@ -147,13 +147,13 @@
public static final LocationInfo BASE_LOCATION = new LocationInfo();
public static LocationInfo parseLocationInfo(ByteBuffer buf) {
- int depth = buf.get();
+ int depth = buf.get() & 0xFF;
if (depth == 0)
return BASE_LOCATION;
Location[] locations = new Location[depth];
for (int i = 0; i < depth; i++) {
byte tag = buf.get();
- byte index = buf.get();
+ short index = (short)(buf.get() & 0xFF);
if (!(tag == 0 || tag == 1 | tag == 2 || tag == 3))
throw new AnnotationFormatError("Bad Location encoding in Type Annotation");
if (tag != 3 && index != 0)
@@ -164,26 +164,26 @@
}
public LocationInfo pushArray() {
- return pushLocation((byte)0, (byte)0);
+ return pushLocation((byte)0, (short)0);
}
public LocationInfo pushInner() {
- return pushLocation((byte)1, (byte)0);
+ return pushLocation((byte)1, (short)0);
}
public LocationInfo pushWildcard() {
- return pushLocation((byte) 2, (byte) 0);
+ return pushLocation((byte) 2, (short) 0);
}
- public LocationInfo pushTypeArg(byte index) {
+ public LocationInfo pushTypeArg(short index) {
return pushLocation((byte) 3, index);
}
- public LocationInfo pushLocation(byte tag, byte index) {
+ public LocationInfo pushLocation(byte tag, short index) {
int newDepth = this.depth + 1;
Location[] res = new Location[newDepth];
System.arraycopy(this.locations, 0, res, 0, depth);
- res[newDepth - 1] = new Location(tag, index);
+ res[newDepth - 1] = new Location(tag, (short)(index & 0xFF));
return new LocationInfo(newDepth, res);
}
@@ -207,13 +207,13 @@
public static final class Location {
public final byte tag;
- public final byte index;
+ public final short index;
boolean isSameLocation(Location other) {
return tag == other.tag && index == other.index;
}
- public Location(byte tag, byte index) {
+ public Location(byte tag, short index) {
this.tag = tag;
this.index = index;
}
diff --git a/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotationParser.java b/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotationParser.java
index abd28cf..9bd4b6c 100644
--- a/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotationParser.java
+++ b/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotationParser.java
@@ -394,20 +394,25 @@
ConstantPool cp,
AnnotatedElement baseDecl,
Class<?> container) {
- TypeAnnotationTargetInfo ti = parseTargetInfo(buf);
- LocationInfo locationInfo = LocationInfo.parseLocationInfo(buf);
- Annotation a = AnnotationParser.parseAnnotation(buf, cp, container, false);
- if (ti == null) // Inside a method for example
- return null;
- return new TypeAnnotation(ti, locationInfo, a, baseDecl);
+ try {
+ TypeAnnotationTargetInfo ti = parseTargetInfo(buf);
+ LocationInfo locationInfo = LocationInfo.parseLocationInfo(buf);
+ Annotation a = AnnotationParser.parseAnnotation(buf, cp, container, false);
+ if (ti == null) // Inside a method for example
+ return null;
+ return new TypeAnnotation(ti, locationInfo, a, baseDecl);
+ } catch (IllegalArgumentException | // Bad type in const pool at specified index
+ BufferUnderflowException e) {
+ throw new AnnotationFormatError(e);
+ }
}
private static TypeAnnotationTargetInfo parseTargetInfo(ByteBuffer buf) {
- byte posCode = buf.get();
+ int posCode = buf.get() & 0xFF;
switch(posCode) {
case CLASS_TYPE_PARAMETER:
case METHOD_TYPE_PARAMETER: {
- byte index = buf.get();
+ int index = buf.get() & 0xFF;
TypeAnnotationTargetInfo res;
if (posCode == CLASS_TYPE_PARAMETER)
res = new TypeAnnotationTargetInfo(TypeAnnotationTarget.CLASS_TYPE_PARAMETER,
@@ -418,7 +423,7 @@
return res;
} // unreachable break;
case CLASS_EXTENDS: {
- short index = buf.getShort();
+ short index = buf.getShort(); //needs to be signed
if (index == -1) {
return new TypeAnnotationTargetInfo(TypeAnnotationTarget.CLASS_EXTENDS);
} else if (index >= 0) {
@@ -437,7 +442,7 @@
case METHOD_RECEIVER:
return new TypeAnnotationTargetInfo(TypeAnnotationTarget.METHOD_RECEIVER);
case METHOD_FORMAL_PARAMETER: {
- byte index = buf.get();
+ int index = buf.get() & 0xFF;
return new TypeAnnotationTargetInfo(TypeAnnotationTarget.METHOD_FORMAL_PARAMETER,
index);
} //unreachable break;
@@ -486,12 +491,12 @@
}
private static TypeAnnotationTargetInfo parseShortTarget(TypeAnnotationTarget target, ByteBuffer buf) {
- short index = buf.getShort();
+ int index = buf.getShort() & 0xFFFF;
return new TypeAnnotationTargetInfo(target, index);
}
private static TypeAnnotationTargetInfo parse2ByteTarget(TypeAnnotationTarget target, ByteBuffer buf) {
- byte count = buf.get();
- byte secondaryIndex = buf.get();
+ int count = buf.get() & 0xFF;
+ int secondaryIndex = buf.get() & 0xFF;
return new TypeAnnotationTargetInfo(target,
count,
secondaryIndex);
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java b/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
index cbbda2e..4a0733d 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
@@ -326,6 +326,48 @@
}
}
+ private void checkKeySize(String keyAlgo, Key key)
+ throws InvalidKeyException {
+ CK_MECHANISM_INFO mechInfo = null;
+ try {
+ mechInfo = token.getMechanismInfo(mechanism);
+ } catch (PKCS11Exception e) {
+ // should not happen, ignore for now.
+ }
+ if (mechInfo == null) {
+ // skip the check if no native info available
+ return;
+ }
+ int minKeySize = (int) mechInfo.ulMinKeySize;
+ int maxKeySize = (int) mechInfo.ulMaxKeySize;
+
+ int keySize = 0;
+ if (key instanceof P11Key) {
+ keySize = ((P11Key) key).length();
+ } else {
+ if (keyAlgo.equals("RSA")) {
+ keySize = ((RSAKey) key).getModulus().bitLength();
+ } else if (keyAlgo.equals("DSA")) {
+ keySize = ((DSAKey) key).getParams().getP().bitLength();
+ } else if (keyAlgo.equals("EC")) {
+ keySize = ((ECKey) key).getParams().getCurve().getField().getFieldSize();
+ } else {
+ throw new ProviderException("Error: unsupported algo " + keyAlgo);
+ }
+ }
+ if ((minKeySize != -1) && (keySize < minKeySize)) {
+ throw new InvalidKeyException(keyAlgo +
+ " key must be at least " + minKeySize + " bits");
+ }
+ if ((maxKeySize != -1) && (keySize > maxKeySize)) {
+ throw new InvalidKeyException(keyAlgo +
+ " key must be at most " + maxKeySize + " bits");
+ }
+ if (keyAlgo.equals("RSA")) {
+ checkRSAKeyLength(keySize);
+ }
+ }
+
private void checkRSAKeyLength(int len) throws InvalidKeyException {
RSAPadding padding;
try {
@@ -364,15 +406,9 @@
if (publicKey == null) {
throw new InvalidKeyException("Key must not be null");
}
- // Need to check RSA key length whenever a new key is set
- if (keyAlgorithm.equals("RSA") && publicKey != p11Key) {
- int keyLen;
- if (publicKey instanceof P11Key) {
- keyLen = ((P11Key) publicKey).length();
- } else {
- keyLen = ((RSAKey) publicKey).getModulus().bitLength();
- }
- checkRSAKeyLength(keyLen);
+ // Need to check key length whenever a new key is set
+ if (publicKey != p11Key) {
+ checkKeySize(keyAlgorithm, publicKey);
}
cancelOperation();
mode = M_VERIFY;
@@ -387,14 +423,8 @@
throw new InvalidKeyException("Key must not be null");
}
// Need to check RSA key length whenever a new key is set
- if (keyAlgorithm.equals("RSA") && privateKey != p11Key) {
- int keyLen;
- if (privateKey instanceof P11Key) {
- keyLen = ((P11Key) privateKey).keyLength;
- } else {
- keyLen = ((RSAKey) privateKey).getModulus().bitLength();
- }
- checkRSAKeyLength(keyLen);
+ if (privateKey != p11Key) {
+ checkKeySize(keyAlgorithm, privateKey);
}
cancelOperation();
mode = M_SIGN;
diff --git a/jdk/src/share/classes/sun/security/pkcs11/Token.java b/jdk/src/share/classes/sun/security/pkcs11/Token.java
index f19f8b7..b97ab0c 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/Token.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/Token.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
package sun.security.pkcs11;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
import java.io.*;
import java.lang.ref.*;
@@ -151,8 +152,8 @@
privateCache = new KeyCache();
templateManager = config.getTemplateManager();
explicitCancel = config.getExplicitCancel();
- mechInfoMap = Collections.synchronizedMap
- (new HashMap<Long, CK_MECHANISM_INFO>(10));
+ mechInfoMap =
+ new ConcurrentHashMap<Long, CK_MECHANISM_INFO>(10);
}
boolean isWriteProtected() {
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java b/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
index 2c375a8..dce8fd6 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
@@ -129,7 +129,8 @@
("Exception while encoding OCSPRequest", e);
}
OCSPResponse ocspResponse = check(Collections.singletonList(certId),
- responderURI, issuerCert, null, Collections.<Extension>emptyList());
+ responderURI, issuerCert, null, null,
+ Collections.<Extension>emptyList());
return (RevocationStatus)ocspResponse.getSingleResponse(certId);
}
@@ -176,7 +177,7 @@
("Exception while encoding OCSPRequest", e);
}
OCSPResponse ocspResponse = check(Collections.singletonList(certId),
- responderURI, responderCert, date, extensions);
+ responderURI, issuerCert, responderCert, date, extensions);
return (RevocationStatus) ocspResponse.getSingleResponse(certId);
}
@@ -185,6 +186,7 @@
*
* @param certs the CertIds to be checked
* @param responderURI the URI of the OCSP responder
+ * @param issuerCert the issuer's certificate
* @param responderCert the OCSP responder's certificate
* @param date the time the validity of the OCSP responder's certificate
* should be checked against. If null, the current time is used.
@@ -195,6 +197,7 @@
* encoding the OCSP Request or validating the OCSP Response
*/
static OCSPResponse check(List<CertId> certIds, URI responderURI,
+ X509Certificate issuerCert,
X509Certificate responderCert, Date date,
List<Extension> extensions)
throws IOException, CertPathValidatorException
@@ -284,7 +287,8 @@
}
// verify the response
- ocspResponse.verify(certIds, responderCert, date, request.getNonce());
+ ocspResponse.verify(certIds, issuerCert, responderCert, date,
+ request.getNonce());
return ocspResponse;
}
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/OCSPRequest.java b/jdk/src/share/classes/sun/security/provider/certpath/OCSPRequest.java
index 0854243..6bded97 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/OCSPRequest.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/OCSPRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,8 @@
class OCSPRequest {
- private static final boolean dump = false;
+ private static final Debug debug = Debug.getInstance("certpath");
+ private static final boolean dump = debug != null && Debug.isOn("ocsp");
// List of request CertIds
private final List<CertId> certIds;
@@ -138,8 +139,8 @@
if (dump) {
HexDumpEncoder hexEnc = new HexDumpEncoder();
- System.out.println("OCSPRequest bytes are... ");
- System.out.println(hexEnc.encode(bytes));
+ debug.println("OCSPRequest bytes...\n\n" +
+ hexEnc.encode(bytes) + "\n");
}
return bytes;
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java b/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
index 955d63b..1139837 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
@@ -132,7 +132,7 @@
private static ResponseStatus[] rsvalues = ResponseStatus.values();
private static final Debug debug = Debug.getInstance("certpath");
- private static final boolean dump = false;
+ private static final boolean dump = debug != null && Debug.isOn("ocsp");
private static final ObjectIdentifier OCSP_BASIC_RESPONSE_OID =
ObjectIdentifier.newInternal(new int[] { 1, 3, 6, 1, 5, 5, 7, 48, 1, 1});
private static final int CERT_STATUS_GOOD = 0;
@@ -177,11 +177,14 @@
private final ResponseStatus responseStatus;
private final Map<CertId, SingleResponse> singleResponseMap;
- private final List<X509CertImpl> certs;
private final AlgorithmId sigAlgId;
private final byte[] signature;
private final byte[] tbsResponseData;
private final byte[] responseNonce;
+ private List<X509CertImpl> certs;
+ private X509CertImpl signerCert = null;
+ private X500Principal responderName = null;
+ private KeyIdentifier responderKeyId = null;
/*
* Create an OCSP response from its ASN.1 DER encoding.
@@ -189,8 +192,8 @@
OCSPResponse(byte[] bytes) throws IOException {
if (dump) {
HexDumpEncoder hexEnc = new HexDumpEncoder();
- System.out.println("OCSPResponse bytes are...");
- System.out.println(hexEnc.encode(bytes));
+ debug.println("OCSPResponse bytes...\n\n" +
+ hexEnc.encode(bytes) + "\n");
}
DerValue der = new DerValue(bytes);
if (der.tag != DerValue.tag_Sequence) {
@@ -213,7 +216,7 @@
if (responseStatus != ResponseStatus.SUCCESSFUL) {
// no need to continue, responseBytes are not set.
singleResponseMap = Collections.emptyMap();
- certs = Collections.<X509CertImpl>emptyList();
+ certs = new ArrayList<X509CertImpl>();
sigAlgId = null;
signature = null;
tbsResponseData = null;
@@ -288,16 +291,15 @@
// responderID
short tag = (byte)(seq.tag & 0x1f);
if (tag == NAME_TAG) {
+ responderName = new X500Principal(seq.getData().toByteArray());
if (debug != null) {
- X500Principal responderName =
- new X500Principal(seq.getData().toByteArray());
- debug.println("OCSP Responder name: " + responderName);
+ debug.println("Responder's name: " + responderName);
}
} else if (tag == KEY_TAG) {
+ responderKeyId = new KeyIdentifier(seq.getData().getOctetString());
if (debug != null) {
- byte[] responderKey = seq.getData().getOctetString();
- debug.println("OCSP Responder key: " +
- Debug.toString(responderKey));
+ debug.println("Responder's key ID: " +
+ Debug.toString(responderKeyId.getIdentifier()));
}
} else {
throw new IOException("Bad encoding in responderID element of " +
@@ -368,18 +370,25 @@
certs = new ArrayList<X509CertImpl>(derCerts.length);
try {
for (int i = 0; i < derCerts.length; i++) {
- certs.add(new X509CertImpl(derCerts[i].toByteArray()));
+ X509CertImpl cert =
+ new X509CertImpl(derCerts[i].toByteArray());
+ certs.add(cert);
+
+ if (debug != null) {
+ debug.println("OCSP response cert #" + (i + 1) + ": " +
+ cert.getSubjectX500Principal());
+ }
}
} catch (CertificateException ce) {
throw new IOException("Bad encoding in X509 Certificate", ce);
}
} else {
- certs = Collections.<X509CertImpl>emptyList();
+ certs = new ArrayList<X509CertImpl>();
}
}
- void verify(List<CertId> certIds, X509Certificate responderCert,
- Date date, byte[] nonce)
+ void verify(List<CertId> certIds, X509Certificate issuerCert,
+ X509Certificate responderCert, Date date, byte[] nonce)
throws CertPathValidatorException
{
switch (responseStatus) {
@@ -414,22 +423,58 @@
}
}
+ // Locate the signer cert
+ if (signerCert == null) {
+ // Add the Issuing CA cert and/or Trusted Responder cert to the list
+ // of certs from the OCSP response
+ certs.add((X509CertImpl) issuerCert);
+ if (responderCert != null) {
+ certs.add((X509CertImpl) responderCert);
+ }
- // Check whether the cert returned by the responder is trusted
- if (!certs.isEmpty()) {
- X509CertImpl cert = certs.get(0);
- // First check if the cert matches the expected responder cert
- if (cert.equals(responderCert)) {
+ if (responderName != null) {
+ for (X509CertImpl cert : certs) {
+ if (cert.getSubjectX500Principal().equals(responderName)) {
+ signerCert = cert;
+ break;
+ }
+ }
+ } else if (responderKeyId != null) {
+ for (X509CertImpl cert : certs) {
+ KeyIdentifier certKeyId = cert.getSubjectKeyId();
+ if (certKeyId != null && responderKeyId.equals(certKeyId)) {
+ signerCert = cert;
+ break;
+ }
+ }
+ }
+ }
+
+ // Check whether the signer cert returned by the responder is trusted
+ if (signerCert != null) {
+ // Check if the response is signed by the issuing CA
+ if (signerCert.equals(issuerCert)) {
+ if (debug != null) {
+ debug.println("OCSP response is signed by the target's " +
+ "Issuing CA");
+ }
// cert is trusted, now verify the signed response
- // Next check if the cert was issued by the responder cert
- // which was set locally.
- } else if (cert.getIssuerX500Principal().equals(
- responderCert.getSubjectX500Principal())) {
+ // Check if the response is signed by a trusted responder
+ } else if (signerCert.equals(responderCert)) {
+ if (debug != null) {
+ debug.println("OCSP response is signed by a Trusted " +
+ "Responder");
+ }
+ // cert is trusted, now verify the signed response
+
+ // Check if the response is signed by an authorized responder
+ } else if (signerCert.getIssuerX500Principal().equals(
+ issuerCert.getSubjectX500Principal())) {
// Check for the OCSPSigning key purpose
try {
- List<String> keyPurposes = cert.getExtendedKeyUsage();
+ List<String> keyPurposes = signerCert.getExtendedKeyUsage();
if (keyPurposes == null ||
!keyPurposes.contains(KP_OCSP_SIGNING_OID)) {
throw new CertPathValidatorException(
@@ -446,16 +491,16 @@
// Check algorithm constraints specified in security property
// "jdk.certpath.disabledAlgorithms".
AlgorithmChecker algChecker = new AlgorithmChecker(
- new TrustAnchor(responderCert, null));
+ new TrustAnchor(issuerCert, null));
algChecker.init(false);
- algChecker.check(cert, Collections.<String>emptySet());
+ algChecker.check(signerCert, Collections.<String>emptySet());
// check the validity
try {
if (date == null) {
- cert.checkValidity();
+ signerCert.checkValidity();
} else {
- cert.checkValidity(date);
+ signerCert.checkValidity(date);
}
} catch (CertificateException e) {
throw new CertPathValidatorException(
@@ -471,7 +516,7 @@
// extension id-pkix-ocsp-nocheck.
//
Extension noCheck =
- cert.getExtension(PKIXExtensions.OCSPNoCheck_Id);
+ signerCert.getExtension(PKIXExtensions.OCSPNoCheck_Id);
if (noCheck != null) {
if (debug != null) {
debug.println("Responder's certificate includes " +
@@ -484,12 +529,15 @@
// verify the signature
try {
- cert.verify(responderCert.getPublicKey());
- responderCert = cert;
+ signerCert.verify(issuerCert.getPublicKey());
+ if (debug != null) {
+ debug.println("OCSP response is signed by an " +
+ "Authorized Responder");
+ }
// cert is trusted, now verify the signed response
} catch (GeneralSecurityException e) {
- responderCert = null;
+ signerCert = null;
}
} else {
throw new CertPathValidatorException(
@@ -500,12 +548,12 @@
// Confirm that the signed response was generated using the public
// key from the trusted responder cert
- if (responderCert != null) {
+ if (signerCert != null) {
// Check algorithm constraints specified in security property
// "jdk.certpath.disabledAlgorithms".
- AlgorithmChecker.check(responderCert.getPublicKey(), sigAlgId);
+ AlgorithmChecker.check(signerCert.getPublicKey(), sigAlgId);
- if (!verifySignature(responderCert)) {
+ if (!verifySignature(signerCert)) {
throw new CertPathValidatorException(
"Error verifying OCSP Response's signature");
}
@@ -555,7 +603,6 @@
/*
* Verify the signature of the OCSP response.
- * The responder's cert is implicitly trusted.
*/
private boolean verifySignature(X509Certificate cert)
throws CertPathValidatorException {
@@ -594,6 +641,13 @@
}
/*
+ * Returns the certificate for the authority that signed the OCSP response.
+ */
+ X509Certificate getSignerCertificate() {
+ return signerCert; // set in verify()
+ }
+
+ /*
* A class representing a single OCSP response.
*/
final static class SingleResponse implements OCSP.RevocationStatus {
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java b/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java
index f34e737..bdd01c6 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java
@@ -668,9 +668,6 @@
throw new CertPathValidatorException(ce);
}
- X509Certificate respCert = (responderCert == null) ? issuerCert
- : responderCert;
-
// The algorithm constraints of the OCSP trusted responder certificate
// does not need to be checked in this code. The constraints will be
// checked when the responder's certificate is validated.
@@ -702,8 +699,8 @@
nonce = ext.getValue();
}
}
- response.verify(Collections.singletonList(certId), respCert,
- params.date(), nonce);
+ response.verify(Collections.singletonList(certId), issuerCert,
+ responderCert, params.date(), nonce);
} else {
URI responderURI = (this.responderURI != null)
@@ -716,8 +713,8 @@
}
response = OCSP.check(Collections.singletonList(certId),
- responderURI, respCert, null,
- ocspExtensions);
+ responderURI, issuerCert, responderCert,
+ null, ocspExtensions);
}
} catch (IOException e) {
throw new CertPathValidatorException(
@@ -733,7 +730,7 @@
if (revocationTime.before(params.date())) {
Throwable t = new CertificateRevokedException(
revocationTime, rs.getRevocationReason(),
- respCert.getSubjectX500Principal(),
+ response.getSignerCertificate().getSubjectX500Principal(),
rs.getSingleExtensions());
throw new CertPathValidatorException(t.getMessage(), t, null,
-1, BasicReason.REVOKED);
diff --git a/jdk/src/share/classes/sun/security/x509/X509CertImpl.java b/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
index b96674e..b3f448b 100644
--- a/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
+++ b/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
@@ -1109,6 +1109,20 @@
}
/**
+ * Returns the subject's key identifier, or null
+ */
+ public KeyIdentifier getSubjectKeyId() {
+ SubjectKeyIdentifierExtension ski = getSubjectKeyIdentifierExtension();
+ if (ski != null) {
+ try {
+ return (KeyIdentifier)ski.get(
+ SubjectKeyIdentifierExtension.KEY_ID);
+ } catch (IOException ioe) {} // not possible
+ }
+ return null;
+ }
+
+ /**
* Get AuthorityKeyIdentifier extension
* @return AuthorityKeyIdentifier object or null (if no such object
* in certificate)
diff --git a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
index d3ca7e9..4c423b7 100644
--- a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
@@ -406,6 +406,9 @@
// LocalDateTime.of(2037, 1, 1, 0, 0, 0).toEpochSecond(ZoneOffset.UTC));
private static final long LDT2037 = 2114380800L;
+ //Current time. Used to determine future GMToffset transitions
+ private static final long CURRT = System.currentTimeMillis()/1000;
+
/* Get a ZoneInfo instance.
*
* @param standardTransitions the standard transitions, not null
@@ -427,8 +430,10 @@
boolean willGMTOffsetChange = false;
// rawOffset, pick the last one
- if (standardTransitions.length > 0)
+ if (standardTransitions.length > 0) {
rawOffset = standardOffsets[standardOffsets.length - 1] * 1000;
+ willGMTOffsetChange = standardTransitions[standardTransitions.length - 1] > CURRT;
+ }
else
rawOffset = standardOffsets[0] * 1000;
diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
index 81b28e7..f275a71 100644
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
@@ -44,6 +44,9 @@
protected final Object[][] getContents() {
// Note: generic names came from CLDR with some adjustments.
+ String ACT[] = new String[] {"Acre Time", "ACT",
+ "Acre Summer Time", "ACST",
+ "Acre Time", "ACT"};
String ADELAIDE[] = new String[] {"Central Standard Time (South Australia)", "CST",
"Central Summer Time (South Australia)", "CST",
"Central Time (South Australia)", "CT"};
@@ -362,7 +365,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -424,7 +427,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", AMT},
+ {"America/Eirunepe", ACT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -510,7 +513,7 @@
"Suriname Time", "SRT"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", AMT},
+ {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -518,7 +521,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -765,7 +768,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", AMT},
+ {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
@@ -893,7 +896,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Middle Europe Time", "MET",
"Middle Europe Summer Time", "MEST",
"Middle Europe Time", "MET"}},
diff --git a/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java b/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
index b61fbd3..e49f233 100644
--- a/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
+++ b/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
@@ -45,6 +45,8 @@
public final class TimeZoneNames_de extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre Normalzeit", "ACT",
+ "Acre Sommerzeit", "ACST"};
String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "CST",
"Zentrale Sommerzeit (S\u00FCdaustralien)", "CST"};
String AGT[] = new String[] {"Argentinische Zeit", "ART",
@@ -287,7 +289,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -345,7 +347,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", AMT},
+ {"America/Eirunepe", ACT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -422,7 +424,7 @@
"Suriname Sommerzeit", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", AMT},
+ {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -430,7 +432,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,7 +637,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", AMT},
+ {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Zentraleurop\u00e4ische Zeit", "MET",
"Zentraleurop\u00e4ische Sommerzeit", "MEST"}},
{"Mexico/BajaNorte", PST},
diff --git a/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java b/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
index 822ba2d..55a4040 100644
--- a/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
+++ b/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
@@ -45,6 +45,8 @@
public final class TimeZoneNames_es extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Hora de Acre", "ACT",
+ "Hora de verano de Acre", "ACST"};
String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "CST",
"Hora de verano Central (Sur de Australia)", "CST"};
String AGT[] = new String[] {"Hora de Argentina", "ART",
@@ -287,7 +289,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -345,7 +347,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", AMT},
+ {"America/Eirunepe", ACT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -422,7 +424,7 @@
"Hora de verano de Surinam", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", AMT},
+ {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -430,7 +432,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,7 +637,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", AMT},
+ {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Hora de Europa Central", "MET",
"Hora de verano de Europa Central", "MEST"}},
{"Mexico/BajaNorte", PST},
diff --git a/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java b/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
index fd487e2..3f9565e 100644
--- a/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
+++ b/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
@@ -45,6 +45,8 @@
public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Heure de l'Acre", "ACT",
+ "Heure d'\u00e9t\u00e9 de l'Acre", "ACST"};
String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "CST",
"Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "CST"};
String AGT[] = new String[] {"Heure D'Argentine", "ART",
@@ -287,7 +289,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -345,7 +347,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", AMT},
+ {"America/Eirunepe", ACT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -422,7 +424,7 @@
"Heure d'\u00e9t\u00e9 du Surinam", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", AMT},
+ {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -430,7 +432,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,7 +637,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", AMT},
+ {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Heure de l'Europe centrale", "MET",
"Heure d'\u00e9t\u00e9 de l'Europe centrale", "MEST"}},
{"Mexico/BajaNorte", PST},
diff --git a/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java b/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
index 0b51765..8217ce5 100644
--- a/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
+++ b/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
@@ -45,6 +45,8 @@
public final class TimeZoneNames_it extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Ora di Acre", "ACT",
+ "Ora estiva di Acre", "ACST"};
String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "CST",
"Ora estiva centrale (Australia del Sud)", "CST"};
String AGT[] = new String[] {"Ora dell'Argentina", "ART",
@@ -287,7 +289,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -345,7 +347,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", AMT},
+ {"America/Eirunepe", ACT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -422,7 +424,7 @@
"Ora estiva di Suriname", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", AMT},
+ {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -430,7 +432,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,7 +637,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", AMT},
+ {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Ora dell'Europa centrale", "MET",
"Ora estiva dell'Europa centrale", "MEST"}},
{"Mexico/BajaNorte", PST},
diff --git a/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java b/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
index 2c8734c..6a71a9f 100644
--- a/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
+++ b/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
@@ -45,6 +45,8 @@
public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"\u30a2\u30af\u30ec\u6642\u9593", "ACT",
+ "\u30a2\u30af\u30ec\u590f\u6642\u9593", "ACST"};
String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST",
"\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST"};
String AGT[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "ART",
@@ -287,7 +289,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -345,7 +347,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", AMT},
+ {"America/Eirunepe", ACT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -422,7 +424,7 @@
"\u30b9\u30ea\u30ca\u30e0\u590f\u6642\u9593", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", AMT},
+ {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -430,7 +432,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,7 +637,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", AMT},
+ {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "MET",
"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "MEST"}},
{"Mexico/BajaNorte", PST},
diff --git a/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java b/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
index 79542f7..12e8b83 100644
--- a/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
+++ b/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
@@ -45,6 +45,8 @@
public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT",
+ "\uc5d0\uc774\ucee4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ACST"};
String ADELAIDE[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST",
"\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST"};
String AGT[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "ART",
@@ -287,7 +289,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -345,7 +347,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", AMT},
+ {"America/Eirunepe", ACT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -422,7 +424,7 @@
"\uc218\ub9ac\ub0a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", AMT},
+ {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -430,7 +432,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,7 +637,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", AMT},
+ {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"\uc911\ubd80 \uc720\ub7fd \uc2dc\uac04", "MET",
"\uc911\ubd80 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MEST"}},
{"Mexico/BajaNorte", PST},
diff --git a/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java b/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
index d549c10..29feb18 100644
--- a/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
+++ b/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
@@ -45,6 +45,8 @@
public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT",
+ "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST"};
String ADELAIDE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul)", "CST",
"Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "CST"};
String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART",
@@ -287,7 +289,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -345,7 +347,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", AMT},
+ {"America/Eirunepe", ACT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -422,7 +424,7 @@
"Fuso hor\u00e1rio de ver\u00e3o do Suriname", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", AMT},
+ {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -430,7 +432,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,7 +637,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", AMT},
+ {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Fuso hor\u00e1rio da Europa M\u00e9dia", "MET",
"Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST"}},
{"Mexico/BajaNorte", PST},
diff --git a/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java b/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
index 667b103..8d3c000 100644
--- a/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
+++ b/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
@@ -45,6 +45,8 @@
public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre, normaltid", "ACT",
+ "Acre, sommartid", "ACST"};
String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "CST",
"Central sommartid (South Australia)", "CST"};
String AGT[] = new String[] {"Argentina, normaltid", "ART",
@@ -287,7 +289,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -345,7 +347,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", AMT},
+ {"America/Eirunepe", ACT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -422,7 +424,7 @@
"Surinam, sommartid", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", AMT},
+ {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -430,7 +432,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,7 +637,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", AMT},
+ {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Mellaneuropeisk tid", "MET",
"Mellaneuropeisk sommartid", "MEST"}},
{"Mexico/BajaNorte", PST},
diff --git a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
index a3bbb33..9bf8d1b 100644
--- a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
+++ b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
@@ -45,6 +45,8 @@
public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre \u65f6\u95f4", "ACT",
+ "Acre \u590f\u4ee4\u65f6", "ACST"};
String ADELAIDE[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST",
"\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST"};
String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART",
@@ -287,7 +289,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -345,7 +347,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", AMT},
+ {"America/Eirunepe", ACT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -422,7 +424,7 @@
"\u82cf\u5229\u5357\u590f\u4ee4\u65f6", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", AMT},
+ {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -430,7 +432,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,7 +637,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", AMT},
+ {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"\u4e2d\u6b27\u65f6\u95f4", "MET",
"\u4e2d\u6b27\u590f\u4ee4\u65f6", "MEST"}},
{"Mexico/BajaNorte", PST},
diff --git a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
index 322eecf..ab14a98 100644
--- a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
+++ b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
@@ -45,6 +45,8 @@
public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre \u6642\u9593", "ACT",
+ "Acre \u590f\u4ee4\u6642\u9593", "ACST"};
String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "CST",
"\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "CST"};
String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART",
@@ -287,7 +289,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -345,7 +347,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", AMT},
+ {"America/Eirunepe", ACT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -422,7 +424,7 @@
"\u8607\u5229\u5357\u590f\u4ee4\u6642\u9593", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", AMT},
+ {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -430,7 +432,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -636,7 +638,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", AMT},
+ {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
@@ -754,7 +756,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"\u4e2d\u6b50\u6642\u9593", "MET",
"\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "MEST"}},
{"Mexico/BajaNorte", PST},
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
index 912a951..fa5c884 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
@@ -740,37 +740,7 @@
// Bounds of the window
Rectangle targetBounds = AWTAccessor.getComponentAccessor().getBounds((Component)target);
- Point newLocation = targetBounds.getLocation();
- if (xe.get_send_event() || runningWM == XWM.NO_WM || XWM.isNonReparentingWM()) {
- // Location, Client size + insets
- newLocation = new Point(xe.get_x() - currentInsets.left, xe.get_y() - currentInsets.top);
- } else {
- // ICCCM 4.1.5 states that a real ConfigureNotify will be sent when
- // a window is resized but the client can not tell if the window was
- // moved or not. The client should consider the position as unkown
- // and use TranslateCoordinates to find the actual position.
- //
- // TODO this should be the default for every case.
- switch (XWM.getWMID()) {
- case XWM.CDE_WM:
- case XWM.MOTIF_WM:
- case XWM.METACITY_WM:
- case XWM.MUTTER_WM:
- case XWM.SAWFISH_WM:
- {
- Point xlocation = queryXLocation();
- if (log.isLoggable(PlatformLogger.Level.FINE)) {
- log.fine("New X location: {0}", xlocation);
- }
- if (xlocation != null) {
- newLocation = xlocation;
- }
- break;
- }
- default:
- break;
- }
- }
+ Point newLocation = getNewLocation(xe, currentInsets.left, currentInsets.top);
WindowDimensions newDimensions =
new WindowDimensions(newLocation,
@@ -1261,12 +1231,4 @@
}
super.handleWindowFocusOut(oppositeWindow, serial);
}
-
- private Point queryXLocation()
- {
- return XlibUtil.translateCoordinates(
- getContentWindow(),
- XlibWrapper.RootWindow(XToolkit.getDisplay(), getScreenNumber()),
- new Point(0, 0));
- }
}
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
index e0b1cc4..8dcd15b 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
@@ -740,15 +740,67 @@
public void paletteChanged() {
}
+ private Point queryXLocation()
+ {
+ return XlibUtil.translateCoordinates(
+ getContentWindow(),
+ XlibWrapper.RootWindow(XToolkit.getDisplay(), getScreenNumber()),
+ new Point(0, 0));
+ }
+
+ protected Point getNewLocation(XConfigureEvent xe, int leftInset, int topInset) {
+ // Bounds of the window
+ Rectangle targetBounds = AWTAccessor.getComponentAccessor().getBounds((Component)target);
+
+ int runningWM = XWM.getWMID();
+ Point newLocation = targetBounds.getLocation();
+ if (xe.get_send_event() || runningWM == XWM.NO_WM || XWM.isNonReparentingWM()) {
+ // Location, Client size + insets
+ newLocation = new Point(xe.get_x() - leftInset, xe.get_y() - topInset);
+ } else {
+ // ICCCM 4.1.5 states that a real ConfigureNotify will be sent when
+ // a window is resized but the client can not tell if the window was
+ // moved or not. The client should consider the position as unkown
+ // and use TranslateCoordinates to find the actual position.
+ //
+ // TODO this should be the default for every case.
+ switch (runningWM) {
+ case XWM.CDE_WM:
+ case XWM.MOTIF_WM:
+ case XWM.METACITY_WM:
+ case XWM.MUTTER_WM:
+ case XWM.SAWFISH_WM:
+ {
+ Point xlocation = queryXLocation();
+ if (log.isLoggable(PlatformLogger.Level.FINE)) {
+ log.fine("New X location: {0}", xlocation);
+ }
+ if (xlocation != null) {
+ newLocation = xlocation;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ }
+ return newLocation;
+ }
+
/*
* Overridden to check if we need to update our GraphicsDevice/Config
* Added for 4934052.
*/
@Override
public void handleConfigureNotifyEvent(XEvent xev) {
- // TODO: We create an XConfigureEvent every time we override
- // handleConfigureNotify() - too many!
XConfigureEvent xe = xev.get_xconfigure();
+ /*
+ * Correct window location which could be wrong in some cases.
+ * See getNewLocation() for the details.
+ */
+ Point newLocation = getNewLocation(xe, 0, 0);
+ xe.set_x(newLocation.x);
+ xe.set_y(newLocation.y);
checkIfOnNewScreen(new Rectangle(xe.get_x(),
xe.get_y(),
xe.get_width(),
diff --git a/jdk/src/solaris/classes/sun/font/XRTextRenderer.java b/jdk/src/solaris/classes/sun/font/XRTextRenderer.java
index 308de3a..243fa85 100644
--- a/jdk/src/solaris/classes/sun/font/XRTextRenderer.java
+++ b/jdk/src/solaris/classes/sun/font/XRTextRenderer.java
@@ -36,6 +36,10 @@
* @author Clemens Eisserer
*/
public class XRTextRenderer extends GlyphListPipe {
+ // Workarround for a bug in libXrender.
+ // In case the number of glyphs of an ELT is a multiple of 254,
+ // a few garbage bytes are sent to the XServer causing hangs.
+ static final int MAX_ELT_GLYPH_COUNT = 253;
XRGlyphCache glyphCache;
XRCompositeManager maskBuffer;
@@ -92,8 +96,11 @@
int posX = 0, posY = 0;
if (gl.usePositions()
- || (cacheEntry.getXAdvance() != ((float) cacheEntry.getXOff()) || cacheEntry.getYAdvance() != ((float) cacheEntry.getYOff()))
- || eltIndex < 0 || glyphSet != activeGlyphSet) {
+ || cacheEntry.getXAdvance() != ((float) cacheEntry.getXOff())
+ || cacheEntry.getYAdvance() != ((float) cacheEntry.getYOff())
+ || glyphSet != activeGlyphSet
+ || eltIndex < 0
+ || eltList.getCharCnt(eltIndex) == MAX_ELT_GLYPH_COUNT) {
eltIndex = eltList.getNextIndex();
eltList.setCharCnt(eltIndex, 1);
@@ -101,7 +108,7 @@
eltList.setGlyphSet(eltIndex, glyphSet);
if (gl.usePositions()) {
- // /*In this case advX only stores rounding errors*/
+ // In this case advX only stores rounding errors
float x = positions[i * 2] + advX;
float y = positions[i * 2 + 1] + advY;
posX = (int) Math.floor(x);
@@ -120,16 +127,14 @@
posX = (int) Math.floor(advX);
posY = (int) Math.floor(advY);
- // Advance of ELT = difference between stored
- // relative
+ // Advance of ELT = difference between stored relative
// positioning information and required float.
advX += (cacheEntry.getXAdvance() - cacheEntry.getXOff());
advY += (cacheEntry.getYAdvance() - cacheEntry.getYOff());
}
- /*
- * Offset of the current glyph is the difference to the last
- * glyph and this one
- */
+
+ // Offset of the current glyph is the difference
+ // to the last glyph and this one
eltList.setXOff(eltIndex, (posX - oldPosX));
eltList.setYOff(eltIndex, (posY - oldPosY));
diff --git a/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java b/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java
index f05243e..c695315 100644
--- a/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java
+++ b/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java
@@ -245,7 +245,17 @@
ColorModel cm, Image image,
long drawable,
int transparency) {
- int depth = transparency > Transparency.OPAQUE ? 32 : 24;
+ int depth;
+ // If we have a 32 bit color model for the window it needs
+ // alpha to support translucency of the window so we need
+ // to upgrade what was requested for the surface.
+ if (gc.getColorModel().getPixelSize() == 32) {
+ depth = 32;
+ transparency = Transparency.TRANSLUCENT;
+ } else {
+ depth = transparency > Transparency.OPAQUE ? 32 : 24;
+ }
+
if (depth == 24) {
cm = new DirectColorModel(depth,
0x00FF0000, 0x0000FF00, 0x000000FF);
diff --git a/jdk/src/solaris/classes/sun/print/IPPPrintService.java b/jdk/src/solaris/classes/sun/print/IPPPrintService.java
index 329bb29..f48dd5b 100644
--- a/jdk/src/solaris/classes/sun/print/IPPPrintService.java
+++ b/jdk/src/solaris/classes/sun/print/IPPPrintService.java
@@ -44,6 +44,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.net.URLConnection;
import java.net.HttpURLConnection;
import java.io.File;
import java.io.InputStream;
@@ -1607,14 +1608,16 @@
public static HttpURLConnection getIPPConnection(URL url) {
HttpURLConnection connection;
+ URLConnection urlc;
try {
- connection = (HttpURLConnection)url.openConnection();
+ urlc = url.openConnection();
} catch (java.io.IOException ioe) {
return null;
}
- if (!(connection instanceof HttpURLConnection)) {
+ if (!(urlc instanceof HttpURLConnection)) {
return null;
}
+ connection = (HttpURLConnection)urlc;
connection.setUseCaches(false);
connection.setDefaultUseCaches(false);
connection.setDoInput(true);
diff --git a/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java b/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
index 2c9acbc..fb6950b 100644
--- a/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
+++ b/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
@@ -620,7 +620,7 @@
if (CUPSPrinter.isCupsRunning()) {
try {
PrintService defaultPS;
- if (psuri != null) {
+ if ((psuri != null) && !psuri.startsWith("file")) {
defaultPS = new IPPPrintService(defaultPrinter,
psuri, true);
} else {
diff --git a/jdk/test/Makefile b/jdk/test/Makefile
index d8e7dd8..71053da 100644
--- a/jdk/test/Makefile
+++ b/jdk/test/Makefile
@@ -250,7 +250,7 @@
# ------------------------------------------------------------------
-jdk_%:
+jdk_% core_% svc_%:
$(ECHO) "Running tests: $@"
for each in $@; do \
$(MAKE) -j 1 TEST_SELECTION=":$$each" UNIQUE_DIR=$$each jtreg_tests; \
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 6cb3ce7..ec7f3d6 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -120,19 +120,16 @@
# jdk_lang
-# 6944188
-java/lang/management/ThreadMXBean/ThreadStateTest.java generic-all
-
# 7067973
java/lang/management/MemoryMXBean/CollectionUsageThreshold.java generic-all
+# 8029415
+java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java generic-all
+
############################################################################
# jdk_management
-# 8010897
-sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java macosx-all
-
# 8028150
sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh windows-all
@@ -154,13 +151,6 @@
# 7027502
demo/jvmti/hprof/MonitorTest.java generic-all
-# 8024423 - JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
-demo/jvmti/hprof/HeapAllTest.java generic-all
-demo/jvmti/hprof/HeapBinaryFormatTest.java generic-all
-demo/jvmti/hprof/HeapDumpTest.java generic-all
-demo/jvmti/hprof/OptionsTest.java generic-all
-demo/jvmti/hprof/StackMapTableTest.java generic-all
-
# 8027973
javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java windows-all
@@ -171,12 +161,6 @@
# Filed 7052625
com/sun/net/httpserver/bugs/6725892/Test.java generic-all
-# Filed 7036666
-com/sun/net/httpserver/Test9a.java generic-all
-
-# 7102670
-java/net/InetAddress/CheckJNI.java linux-all
-
# failing on vista 32/64 on nightly
# 7102702
java/net/PortUnreachableException/OneExceptionOnly.java windows-all
@@ -291,6 +275,9 @@
# 7132203
sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all
+# 8028474
+sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh generic-all
+
# Tests take too long, on sparcs see 7143279
tools/pack200/CommandLineTests.java solaris-all, macosx-all
tools/pack200/Pack200Test.java solaris-all, macosx-all
@@ -308,9 +295,6 @@
# Filed 6653793
com/sun/jdi/RedefineCrossEvent.java generic-all
-# Filed 6402201
-com/sun/jdi/ProcessAttachTest.sh generic-all
-
############################################################################
# jdk_util
diff --git a/jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java b/jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java
new file mode 100644
index 0000000..d5fa81c
--- /dev/null
+++ b/jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8028215
+ * @summary SetDefaultORBTest setting ORB impl via properties test
+ * @run main/othervm SetDefaultORBTest
+ *
+ */
+
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+
+
+public class SetDefaultORBTest {
+
+ public static void main(String[] args) {
+ Properties systemProperties = System.getProperties();
+ systemProperties.setProperty("org.omg.CORBA.ORBSingletonClass",
+ "com.sun.corba.se.impl.orb.ORBSingleton");
+ System.setSecurityManager(new SecurityManager());
+ Properties props = new Properties();
+ props.put("org.omg.CORBA.ORBClass", "com.sun.corba.se.impl.orb.ORBImpl");
+ ORB orb = ORB.init(args, props);
+ Class<?> orbClass = orb.getClass();
+ if (orbClass.getName().equals("com.sun.corba.se.impl.orb.ORBImpl")) {
+ System.out.println("orbClass is com.sun.corba.se.impl.orb.ORBimpl as expected");
+ } else {
+ throw new RuntimeException("com.sun.corba.se.impl.orb.ORBimpl class expected for ORBImpl");
+ }
+ ORB singletonORB = ORB.init();
+ Class<?> singletoneOrbClass = singletonORB.getClass();
+ if (singletoneOrbClass.getName().equals("com.sun.corba.se.impl.orb.ORBSingleton")) {
+ System.out.println("singeletonOrbClass is com.sun.corba.se.impl.orb.ORBSingleton as expected");
+ } else {
+ throw new RuntimeException("com.sun.corba.se.impl.orb.ORBSingleton class expected for ORBSingleton");
+ }
+ }
+}
diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestCopySafe.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestCopySafe.java
new file mode 100644
index 0000000..20dff83
--- /dev/null
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestCopySafe.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8026943
+ * @summary Verify that same buffer can be used as input and output when
+ * using Cipher objects.
+ * @author Valerie Peng
+ */
+import java.security.*;
+import java.security.spec.*;
+
+import java.util.Arrays;
+
+import javax.crypto.*;
+import javax.crypto.spec.*;
+
+public class TestCopySafe {
+
+ private static boolean DEBUG = false;
+ private static int INPUT_LENGTH = 160; // must be multiple of block size
+ private static byte[] PT = new byte[INPUT_LENGTH];
+ private static SecretKey KEY = new SecretKeySpec(new byte[16], "AES");
+ private static byte[] IV = new byte[16];
+
+ private static int[] OFFSETS = { 1, 8, 17 };
+
+ private static final String[] MODES = {
+ "ECB", "CBC", "PCBC", "CTR", "CTS",
+ "CFB", "CFB8", "CFB16", "CFB24", "CFB32", "CFB40",
+ "CFB48", "CFB56", "CFB64",
+ "OFB", "OFB8", "OFB16", "OFB24", "OFB32", "OFB40",
+ "OFB48", "OFB56", "OFB64",
+ "GCM"
+ };
+
+ public static void main(String[] argv) throws Exception {
+
+ Provider p = Security.getProvider("SunJCE");
+
+ AlgorithmParameterSpec params = null;
+ boolean result = true;
+ for (String mode : MODES) {
+ String transformation = "AES/" + mode + "/NoPadding";
+ boolean isGCM = (mode == "GCM");
+ if (isGCM) {
+ params = new GCMParameterSpec(128, IV);
+ } else if (mode != "ECB") {
+ params = new IvParameterSpec(IV);
+ }
+ Cipher c = Cipher.getInstance(transformation, p);
+ System.out.println("Testing " + transformation + ":");
+ for (int offset : OFFSETS) {
+ System.out.print("=> offset " + offset + ": ");
+ try {
+ test(c, params, offset, isGCM);
+ System.out.println("Passed");
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ result = false;
+ continue;
+ }
+ }
+ }
+ if (!result) {
+ throw new Exception("One or more test failed");
+ }
+ }
+
+ private static void test(Cipher c, AlgorithmParameterSpec params,
+ int offset, boolean isGCM) throws Exception {
+
+ // Test encryption first
+ if (isGCM) {
+ // re-init with only key value first to bypass the
+ // Key+IV-uniqueness check for GCM encryption
+ c.init(Cipher.ENCRYPT_MODE, KEY);
+ }
+ c.init(Cipher.ENCRYPT_MODE, KEY, params);
+ byte[] answer = c.doFinal(PT);
+ byte[] pt2 = Arrays.copyOf(PT, answer.length + offset);
+
+ // #1: outOfs = inOfs = 0
+ if (isGCM) {
+ c.init(Cipher.ENCRYPT_MODE, KEY);
+ c.init(Cipher.ENCRYPT_MODE, KEY, params);
+ }
+ c.doFinal(pt2, 0, PT.length, pt2, 0);
+ if (!isTwoArraysEqual(pt2, 0, answer, 0, answer.length)) {
+ throw new Exception("Enc#1 diff check failed!");
+ } else if (DEBUG) {
+ System.out.println("Enc#1 diff check passed");
+ }
+
+ // #2: inOfs = 0, outOfs = offset
+ System.arraycopy(PT, 0, pt2, 0, PT.length);
+ if (isGCM) {
+ c.init(Cipher.ENCRYPT_MODE, KEY);
+ c.init(Cipher.ENCRYPT_MODE, KEY, params);
+ }
+ c.doFinal(pt2, 0, PT.length, pt2, offset);
+ if (!isTwoArraysEqual(pt2, offset, answer, 0, answer.length)) {
+ throw new Exception("Enc#2 diff check failed");
+ } else if (DEBUG) {
+ System.out.println("Enc#2 diff check passed");
+ }
+
+ // #3: inOfs = offset, outOfs = 0
+ System.arraycopy(PT, 0, pt2, offset, PT.length);
+ if (isGCM) {
+ c.init(Cipher.ENCRYPT_MODE, KEY);
+ c.init(Cipher.ENCRYPT_MODE, KEY, params);
+ }
+ c.doFinal(pt2, offset, PT.length, pt2, 0);
+ if (!isTwoArraysEqual(pt2, 0, answer, 0, answer.length)) {
+ throw new Exception("Enc#3 diff check failed");
+ } else if (DEBUG) {
+ System.out.println("Enc#3 diff check passed");
+ }
+
+ // Test decryption now, we should get back PT as a result
+ c.init(Cipher.DECRYPT_MODE, KEY, params);
+ pt2 = Arrays.copyOf(answer, answer.length + offset);
+
+ // #1: outOfs = inOfs = 0
+ c.doFinal(pt2, 0, answer.length, pt2, 0);
+ if (!isTwoArraysEqual(pt2, 0, PT, 0, PT.length)) {
+ throw new Exception("Dec#1 diff check failed!");
+ } else if (DEBUG) {
+ System.out.println("Dec#1 diff check passed");
+ }
+
+ // #2: inOfs = 0, outOfs = offset
+ System.arraycopy(answer, 0, pt2, 0, answer.length);
+ c.doFinal(pt2, 0, answer.length, pt2, offset);
+ if (!isTwoArraysEqual(pt2, offset, PT, 0, PT.length)) {
+ throw new Exception("Dec#2 diff check failed");
+ } else if (DEBUG) {
+ System.out.println("Dec#2 diff check passed");
+ }
+
+ // #3: inOfs = offset, outOfs = 0
+ System.arraycopy(answer, 0, pt2, offset, answer.length);
+ c.doFinal(pt2, offset, answer.length, pt2, 0);
+ if (!isTwoArraysEqual(pt2, 0, PT, 0, PT.length)) {
+ throw new Exception("Dec#3 diff check failed");
+ } else if (DEBUG) {
+ System.out.println("Dec#3 diff check passed");
+ }
+ }
+
+ private static boolean isTwoArraysEqual(byte[] a, int aOff, byte[] b, int bOff,
+ int len) {
+ for (int i = 0; i < len; i++) {
+ if (a[aOff + i] != b[bOff + i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
+
diff --git a/jdk/test/com/sun/jdi/BreakpointWithFullGC.sh b/jdk/test/com/sun/jdi/BreakpointWithFullGC.sh
index ef0da88..e358487 100644
--- a/jdk/test/com/sun/jdi/BreakpointWithFullGC.sh
+++ b/jdk/test/com/sun/jdi/BreakpointWithFullGC.sh
@@ -60,7 +60,7 @@
public static void main(String[] args) {
for (int i = 0; i < 10; i++) {
System.out.println("top of loop"); // @1 breakpoint
- init(1000000);
+ init(500000);
objList.clear();
System.gc();
System.out.println("bottom of loop"); // @1 breakpoint
diff --git a/jdk/test/com/sun/jdi/ProcessAttachDebuggee.java b/jdk/test/com/sun/jdi/ProcessAttachDebuggee.java
index feca088..3208b15 100644
--- a/jdk/test/com/sun/jdi/ProcessAttachDebuggee.java
+++ b/jdk/test/com/sun/jdi/ProcessAttachDebuggee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,9 @@
*/
import java.net.Socket;
import java.net.ServerSocket;
+import java.nio.file.CopyOption;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
import java.io.File;
import java.io.FileOutputStream;
@@ -39,10 +42,12 @@
int port = ss.getLocalPort();
// Write the port number to the given file
- File f = new File(args[0]);
- FileOutputStream fos = new FileOutputStream(f);
- fos.write( Integer.toString(port).getBytes("UTF-8") );
- fos.close();
+ File partial = new File(args[0] + ".partial");
+ File portFile = new File(args[0]);
+ try (FileOutputStream fos = new FileOutputStream(partial)) {
+ fos.write( Integer.toString(port).getBytes("UTF-8") );
+ }
+ Files.move(partial.toPath(), portFile.toPath(), StandardCopyOption.ATOMIC_MOVE);
System.out.println("Debuggee bound to port: " + port);
System.out.flush();
diff --git a/jdk/test/com/sun/jdi/ProcessAttachTest.sh b/jdk/test/com/sun/jdi/ProcessAttachTest.sh
index d48ea5e..10b5d50 100644
--- a/jdk/test/com/sun/jdi/ProcessAttachTest.sh
+++ b/jdk/test/com/sun/jdi/ProcessAttachTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -158,7 +158,17 @@
# The debuggee is suspended and doesn't run until the debugger
# disconnects. We have to give it time to write the port number
# to ${PORTFILE}
-sleep 10
+
+echo "Waiting for port file to be written..."
+attempts=0
+while true; do
+ sleep 1
+ attempts=`expr $attempts + 1`
+ if [ -f ${PORTFILE} ]; then
+ break
+ fi
+ echo "Waiting $attempts second(s) ..."
+done
if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
stopDebuggee "${PORTFILE}"
diff --git a/jdk/test/com/sun/net/httpserver/Test9a.java b/jdk/test/com/sun/net/httpserver/Test9a.java
index fa6f365..66e7948 100644
--- a/jdk/test/com/sun/net/httpserver/Test9a.java
+++ b/jdk/test/com/sun/net/httpserver/Test9a.java
@@ -40,8 +40,9 @@
public class Test9a extends Test {
- static SSLContext serverCtx, clientCtx;
- static boolean error = false;
+ static SSLContext serverCtx;
+ static volatile SSLContext clientCtx = null;
+ static volatile boolean error = false;
public static void main (String[] args) throws Exception {
HttpsServer server = null;
@@ -176,6 +177,7 @@
compare (new File(orig), temp);
temp.delete();
} catch (IOException e) {
+ e.printStackTrace();
error = true;
}
}
diff --git a/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java b/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java
index d7ae259..58f4bb9 100644
--- a/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java
+++ b/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011,2013 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
/*
* @test
- * @bug 7122796
- * @summary Tests 7122796
- * @author anthony.petrov@oracle.com
+ * @bug 8004584
+ * @summary Tests 8004584
+ * @author anthony.petrov@oracle.com, petr.pchelko@oracle.com
*/
import java.awt.*;
@@ -37,12 +37,10 @@
public static void main(String[] args) {
ThreadGroup secondGroup = new ThreadGroup("test");
- new Thread(secondGroup, new Runnable() {
- public void run() {
- SunToolkit.createNewAppContext();
- test(true);
- }
- }).start();
+ new Thread(secondGroup, () -> {
+ SunToolkit.createNewAppContext();
+ test(true);
+ }).start();
// Sleep on the main thread so that the AWT Toolkit is initialized
// in a user AppContext first
@@ -51,9 +49,11 @@
test(false);
}
- private static void test(boolean userAppContext) {
- if (Toolkit.getDefaultToolkit().getSystemEventQueue() == null) {
- throw new RuntimeException("No EventQueue for the current app context! userAppContext: " + userAppContext);
+ private static void test(boolean expectAppContext) {
+ boolean appContextIsCreated = AppContext.getAppContext() != null;
+ if (expectAppContext != appContextIsCreated) {
+ throw new RuntimeException("AppContext is created: " + appContextIsCreated
+ + " expected: " + expectAppContext);
}
}
}
diff --git a/jdk/test/java/awt/Graphics2D/DrawString/TextRenderingTest.java b/jdk/test/java/awt/Graphics2D/DrawString/TextRenderingTest.java
new file mode 100644
index 0000000..205cda9
--- /dev/null
+++ b/jdk/test/java/awt/Graphics2D/DrawString/TextRenderingTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
+import java.awt.GradientPaint;
+import java.awt.geom.Point2D;
+
+import java.awt.Font;
+
+import java.awt.image.BufferedImage;
+import java.awt.image.VolatileImage;
+
+
+/*
+ * @test
+ * @bug 7189452 8024767
+ * @summary Check if source offset for text rendering is handled correctly
+ * (shouldn't see the text on a similarly colored background).
+ * @author a.stepanov
+ * @run main TextRenderingTest
+ */
+
+public class TextRenderingTest {
+
+ private static final int width = 450;
+ private static final int height = 150;
+
+ public static void main(final String[] args) {
+
+ GraphicsEnvironment ge =
+ GraphicsEnvironment.getLocalGraphicsEnvironment();
+ GraphicsConfiguration gc =
+ ge.getDefaultScreenDevice().getDefaultConfiguration();
+ VolatileImage vi = gc.createCompatibleVolatileImage(width, height);
+
+ while (true) {
+ vi.validate(gc);
+ Graphics2D g2d = vi.createGraphics();
+ g2d.setColor(Color.white);
+ g2d.fillRect(0, 0, width, height);
+
+ g2d.setPaint(new GradientPaint(
+ new Point2D.Float(0, height / 2), Color.white,
+ new Point2D.Float(width, height / 2), Color.black));
+ g2d.fillRect(0, 0, width, height);
+
+ String fnt = g2d.getFont().getFamily();
+ g2d.setFont(new Font(fnt, Font.PLAIN, 100));
+ g2d.drawString("IIIIIIIIII", 100, 100); // draw text with offset
+
+ g2d.dispose();
+
+ if (vi.validate(gc) != VolatileImage.IMAGE_OK) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {}
+ continue;
+ }
+
+ if (vi.contentsLost()) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {}
+ continue;
+ }
+
+ break;
+ }
+
+ BufferedImage bi = vi.getSnapshot();
+
+ // the text shifted shouldn't be visible onto a painted rectangle!
+ // so the check: color component (blue) must decrease monotonously
+
+ int prev = Integer.MAX_VALUE;
+ for (int x = 0; x < width; ++x) {
+ int color = bi.getRGB(x, height / 2);
+ int b = color & 0xFF;
+
+ if (b > prev) {
+ throw new RuntimeException("test failed: can see the text rendered!");
+ }
+
+ prev = b;
+ }
+ }
+}
diff --git a/jdk/test/java/awt/Graphics2D/DrawString/XRenderElt254TextTest.java b/jdk/test/java/awt/Graphics2D/DrawString/XRenderElt254TextTest.java
new file mode 100644
index 0000000..33e834f
--- /dev/null
+++ b/jdk/test/java/awt/Graphics2D/DrawString/XRenderElt254TextTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.*;
+import java.awt.MultipleGradientPaint.*;
+import java.awt.image.*;
+import java.io.*;
+
+import javax.imageio.*;
+import javax.swing.*;
+
+/**
+ * @test
+ * @bug 8028722
+ * @summary tests wether drawString with 254 characters causes the xrender
+ * pipeline to hang.
+ * @author ceisserer
+ */
+public class XRenderElt254TextTest extends Frame implements Runnable {
+ public volatile boolean success = false;
+
+ public void run() {
+ Image dstImg = getGraphicsConfiguration().createCompatibleVolatileImage(400, 400);
+ Graphics2D g = (Graphics2D) dstImg.getGraphics();
+
+ StringBuilder strBuilder = new StringBuilder(254);
+ for (int c = 0; c < 254; c++) {
+ strBuilder.append('a');
+ }
+
+ for (int i = 0; i < 100; i++) {
+ g.drawString(strBuilder.toString(), 20, 20);
+ Toolkit.getDefaultToolkit().sync();
+ }
+ success = true;
+ }
+
+ public static void main(String[] args) throws Exception {
+ XRenderElt254TextTest test = new XRenderElt254TextTest();
+ new Thread(test).start();
+
+ for (int i = 0; i < 30; i++) {
+ Thread.sleep(1000);
+
+ if (test.success) {
+ return; // Test finished successful
+ }
+ }
+
+ throw new RuntimeException("Test Failed");
+ }
+}
diff --git a/jdk/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java b/jdk/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java
index de89957..669a21a 100644
--- a/jdk/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java
+++ b/jdk/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java
@@ -33,6 +33,8 @@
import java.awt.*;
import java.awt.event.*;
+
+import sun.awt.OSInfo;
import test.java.awt.regtesthelpers.Util;
public class OpensWithNoGrab
@@ -49,8 +51,8 @@
Sysout.createDialog( );
Sysout.printInstructions( instructions );
- String toolkit = Toolkit.getDefaultToolkit().getClass().getName();
- if (toolkit.equals("sun.awt.windows.WToolkit")){
+ if (!(OSInfo.getOSType().equals(OSInfo.OSType.LINUX)
+ || OSInfo.getOSType().equals(OSInfo.OSType.SOLARIS))) {
System.out.println("This test is for XAWT/Motif only");
OpensWithNoGrab.pass();
}
diff --git a/jdk/test/java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java b/jdk/test/java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java
index e78145e..eceec4b 100644
--- a/jdk/test/java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java
+++ b/jdk/test/java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,15 +28,16 @@
import java.awt.Robot;
import java.awt.Toolkit;
import java.awt.event.InputEvent;
+
import sun.awt.SunToolkit;
-/*
+
+/**
* @test
* @bug 8008728
* @summary [macosx] Swing. JDialog. Modal dialog goes to background
* @author Alexandr Scherbatiy
* @run main ModalDialogOrderingTest
*/
-
public class ModalDialogOrderingTest {
private static final Color DIALOG_COLOR = Color.GREEN;
@@ -45,13 +46,13 @@
public static void main(String[] args) {
final Frame frame = new Frame("Test");
- frame.setSize(100, 100);
+ frame.setSize(400, 400);
frame.setBackground(FRAME_COLOR);
frame.setVisible(true);
- final Dialog modalDialog = new Dialog((Frame) null, true);
+ final Dialog modalDialog = new Dialog(null, true);
modalDialog.setTitle("Modal Dialog");
- modalDialog.setSize(50, 50);
+ modalDialog.setSize(400, 200);
modalDialog.setBackground(DIALOG_COLOR);
modalDialog.setModal(true);
@@ -68,40 +69,35 @@
private static void runTest(Dialog dialog, Frame frame) {
try {
- SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
Robot robot = new Robot();
- robot.setAutoDelay(15);
+ robot.setAutoDelay(50);
robot.mouseMove(300, 300);
while (!dialog.isVisible()) {
- toolkit.realSync();
+ sleep();
}
Rectangle dialogBounds = dialog.getBounds();
Rectangle frameBounds = frame.getBounds();
- double x0 = dialogBounds.getX();
- double y0 = dialogBounds.getY();
- double x1 = dialogBounds.getX() + dialogBounds.getWidth();
- double y1 = dialogBounds.getY() + dialogBounds.getHeight();
- double x2 = frameBounds.getX() + frameBounds.getWidth();
- double y2 = frameBounds.getY() + frameBounds.getHeight();
+ int y1 = dialogBounds.y + dialogBounds.height;
+ int y2 = frameBounds.y + frameBounds.height;
- int clickX = (int) ((x2 + x1) / 2);
- int clickY = (int) ((y2 + y1) / 2);
+ int clickX = frameBounds.x + frameBounds.width / 2;
+ int clickY = y1 + (y2 - y1) / 2;
robot.mouseMove(clickX, clickY);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
- toolkit.realSync();
+ sleep();
- int colorX = (int) ((x0 + x1) / 2);
- int colorY = (int) ((y0 + y1) / 2);
+ int colorX = dialogBounds.x + dialogBounds.width / 2;
+ int colorY = dialogBounds.y + dialogBounds.height / 2;
Color color = robot.getPixelColor(colorX, colorY);
- dialog.setVisible(false);
- frame.setVisible(false);
+ dialog.dispose();
+ frame.dispose();
if (!DIALOG_COLOR.equals(color)) {
throw new RuntimeException("The frame is on top"
@@ -111,4 +107,12 @@
throw new RuntimeException(ex);
}
}
+
+ private static void sleep() {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignored) {
+ }
+ ((SunToolkit) Toolkit.getDefaultToolkit()).realSync();
+ }
}
diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java b/jdk/test/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java
index a018b27..4b8f92d 100644
--- a/jdk/test/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java
+++ b/jdk/test/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java
@@ -61,6 +61,12 @@
return;
}
+ //Move the mouse out, because it could interfere with the test.
+ Robot r = Util.createRobot();
+ Util.waitForIdle(r);
+ r.mouseMove(0, 0);
+ Util.waitForIdle(r);
+
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
@@ -69,7 +75,6 @@
});
//Move the mouse away from the frame and check the View-base full screen mode
- Robot r = Util.createRobot();
Util.waitForIdle(r);
r.mouseMove(500, 500);
Util.waitForIdle(r);
@@ -92,6 +97,7 @@
});
//Test native full screen support
+ Util.waitForIdle(r);
Point fullScreenButtonPos = frame.getLocation();
fullScreenButtonPos.translate(frame.getWidth() - 10, 10);
r.mouseMove(fullScreenButtonPos.x, fullScreenButtonPos.y);
diff --git a/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java b/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java
new file mode 100644
index 0000000..9e229b7
--- /dev/null
+++ b/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8027628
+ * @author Oleg Pekhovskiy
+ * @summary JWindow jumps to (0, 0) after mouse clicked
+ * @run main TopLevelLocation
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.JFrame;
+import javax.swing.JWindow;
+
+public class TopLevelLocation {
+
+ private static JFrame frame;
+ private static JWindow window;
+ private static boolean passed = true;
+
+ public static void main(String[] args) throws Exception {
+ EventQueue.invokeAndWait(() -> {
+ frame = new JFrame();
+ frame.getContentPane().setBackground(Color.PINK);
+ frame.setBounds(100, 100, 500, 400);
+ frame.setUndecorated(true);
+ frame.setVisible(true);
+ window = new JWindow(frame);
+ window.setBackground(Color.BLUE);
+ window.setAlwaysOnTop(true);
+ window.setBounds(200, 200, 200, 200);
+ window.addMouseListener(new MouseAdapter() {
+ private Point dragOrigin = null;
+ private Dimension origSize = null;
+ private Point origLoc = null;
+ private Point lastLoc = null;
+ private boolean left = false;
+ private boolean top = false;
+ private boolean bottom = false;
+ private boolean right = false;
+
+ @Override
+ public void mousePressed(MouseEvent e) {
+ System.out.println("mousePressed");
+ dragOrigin = e.getLocationOnScreen();
+ origSize = window.getSize();
+ origLoc = window.getLocationOnScreen();
+ if (lastLoc != null) {
+ System.out.println("SET LOCATION: " + lastLoc);
+ System.out.println("CURRENT LOCATION: " + origLoc);
+ if (lastLoc.x != origLoc.x || lastLoc.y != origLoc.y) {
+ passed = false;
+ }
+ }
+ right = (origLoc.x + window.getWidth() - dragOrigin.x) < 5;
+ left = !right && dragOrigin.x - origLoc.x < 5;
+ bottom = (origLoc.y + window.getHeight() - dragOrigin.y) < 5;
+ top = !bottom && dragOrigin.y - origLoc.y < 5;
+ }
+
+ @Override
+ public void mouseDragged(MouseEvent e) {
+ System.out.println("mouseDragged");
+ resize(e);
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ System.out.println("mouseReleased");
+ resize(e);
+ }
+
+ void resize(MouseEvent e) {
+ Point dragDelta = e.getLocationOnScreen();
+ dragDelta.translate(-dragOrigin.x, -dragOrigin.y);
+ Point newLoc = new Point(origLoc);
+ newLoc.translate(dragDelta.x, dragDelta.y);
+ Dimension newSize = new Dimension(origSize);
+ if (left || right) {
+ newSize.width += right ? dragDelta.x : -dragDelta.x;
+ }
+ if (top || bottom) {
+ newSize.height += bottom ? dragDelta.y : -dragDelta.y;
+ }
+ if (right || (top || bottom) && !left) {
+ newLoc.x = origLoc.x;
+ }
+ if (bottom || (left || right) && !top) {
+ newLoc.y = origLoc.y;
+ }
+ window.setBounds(newLoc.x, newLoc.y, newSize.width, newSize.height);
+ lastLoc = newLoc;
+ }
+ });
+ window.setVisible(true);
+ });
+ Thread.sleep(500);
+ Dimension size = window.getSize();
+ Point location = window.getLocation();
+ Robot robot = new Robot();
+ robot.setAutoDelay(200);
+ robot.setAutoWaitForIdle(true);
+ robot.waitForIdle();
+ robot.mouseMove(location.x + size.height - 2, location.y + size.width - 2);
+ robot.mousePress(MouseEvent.BUTTON1_DOWN_MASK);
+ robot.mouseMove(location.x + size.height, location.y + size.width);
+ robot.mouseRelease(MouseEvent.BUTTON1_DOWN_MASK);
+ robot.mousePress(MouseEvent.BUTTON1_DOWN_MASK);
+ robot.mouseMove(location.x + size.height + 2, location.y + size.width + 2);
+ robot.mouseRelease(MouseEvent.BUTTON1_DOWN_MASK);
+ Thread.sleep(500);
+ frame.dispose();
+ if (!passed) {
+ throw new RuntimeException("TEST FAILED: Location doesn't match!");
+ }
+ System.out.println("TEST PASSED!");
+ }
+}
+
diff --git a/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java b/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java
new file mode 100644
index 0000000..5a6a3ec
--- /dev/null
+++ b/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8027913
+ * @library ../../regtesthelpers
+ * @build Util
+ * @compile MissingDragExitEventTest.java
+ * @run main/othervm MissingDragExitEventTest
+ * @author Sergey Bylokhov
+ */
+
+import java.awt.Color;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetAdapter;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JFrame;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+
+import sun.awt.SunToolkit;
+import test.java.awt.regtesthelpers.Util;
+
+public class MissingDragExitEventTest {
+
+ private static volatile JFrame frame;
+ private static boolean FAILED;
+ private static boolean MOUSE_ENTERED_DT;
+ private static boolean MOUSE_ENTERED;
+ private static boolean MOUSE_EXIT_TD;
+ private static boolean MOUSE_EXIT;
+ private static int SIZE = 300;
+
+ private static void initAndShowUI() {
+ frame = new JFrame("Test frame");
+
+ frame.setSize(SIZE, SIZE);
+ frame.setLocationRelativeTo(null);
+ final JTextArea jta = new JTextArea();
+ jta.setBackground(Color.RED);
+ frame.add(jta);
+ jta.setText("1234567890");
+ jta.setFont(jta.getFont().deriveFont(150f));
+ jta.setDragEnabled(true);
+ jta.selectAll();
+ jta.setDropTarget(new DropTarget(jta, DnDConstants.ACTION_COPY,
+ new TestdropTargetListener()));
+ jta.addMouseListener(new TestMouseAdapter());
+ frame.setVisible(true);
+ }
+
+ public static void main(final String[] args) throws Exception {
+ try {
+ final Robot r = new Robot();
+ r.setAutoDelay(50);
+ r.mouseMove(100, 100);
+ Util.waitForIdle(r);
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ initAndShowUI();
+ }
+ });
+
+ final Point inside = new Point(frame.getLocationOnScreen());
+ inside.translate(20, SIZE / 2);
+ final Point outer = new Point(inside);
+ outer.translate(-40, 0);
+ r.mouseMove(inside.x, inside.y);
+ r.mousePress(InputEvent.BUTTON1_MASK);
+ try {
+ for (int i = 0; i < 3; ++i) {
+ Util.mouseMove(r, inside, outer);
+ Util.mouseMove(r, outer, inside);
+ }
+ } finally {
+ r.mouseRelease(InputEvent.BUTTON1_MASK);
+ }
+ sleep();
+
+ if (FAILED || !MOUSE_ENTERED || !MOUSE_ENTERED_DT || !MOUSE_EXIT
+ || !MOUSE_EXIT_TD) {
+ throw new RuntimeException("Failed");
+ }
+ } finally {
+ if (frame != null) {
+ frame.dispose();
+ }
+ }
+ }
+
+ private static void sleep() {
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException ignored) {
+ }
+ ((SunToolkit) Toolkit.getDefaultToolkit()).realSync();
+ }
+
+ static class TestdropTargetListener extends DropTargetAdapter {
+
+ private volatile boolean inside;
+
+ @Override
+ public void dragEnter(final DropTargetDragEvent dtde) {
+ if (inside) {
+ FAILED = true;
+ Thread.dumpStack();
+ }
+ inside = true;
+ MOUSE_ENTERED_DT = true;
+ try {
+ Thread.sleep(10000); // we should have time to leave a component
+ } catch (InterruptedException ignored) {
+ }
+ }
+
+ @Override
+ public void dragOver(final DropTargetDragEvent dtde) {
+ if (!inside) {
+ FAILED = true;
+ Thread.dumpStack();
+ }
+ }
+
+ @Override
+ public void dragExit(final DropTargetEvent dte) {
+ if (!inside) {
+ FAILED = true;
+ Thread.dumpStack();
+ }
+ inside = false;
+ MOUSE_EXIT_TD = true;
+ }
+
+ @Override
+ public void drop(final DropTargetDropEvent dtde) {
+ if (!inside) {
+ FAILED = true;
+ Thread.dumpStack();
+ }
+ inside = false;
+ }
+ }
+
+ static class TestMouseAdapter extends MouseAdapter {
+
+ private volatile boolean inside;
+
+ @Override
+ public void mouseEntered(final MouseEvent e) {
+ if (inside) {
+ FAILED = true;
+ Thread.dumpStack();
+ }
+ inside = true;
+ MOUSE_ENTERED = true;
+ }
+
+ @Override
+ public void mouseExited(final MouseEvent e) {
+ if (!inside) {
+ FAILED = true;
+ Thread.dumpStack();
+ }
+ inside = false;
+ MOUSE_EXIT = true;
+ }
+ }
+}
diff --git a/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java b/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java
index 5d1342d..6b21ea0 100644
--- a/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java
+++ b/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java
@@ -31,7 +31,7 @@
/*
* @test
- * @bug 8007156
+ * @bug 8007156 8025126
* @summary Extended key code is not set for a key event
* @author Alexandr Scherbatiy
* @run main ExtendedKeyCodeTest
@@ -44,6 +44,7 @@
public static void main(String[] args) throws Exception {
SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
Robot robot = new Robot();
+ robot.setAutoDelay(50);
Frame frame = new Frame();
frame.setSize(300, 300);
@@ -54,14 +55,14 @@
public void keyPressed(KeyEvent e) {
eventsCount++;
setExtendedKeyCode = setExtendedKeyCode && (e.getExtendedKeyCode()
- == ExtendedKeyCodes.getExtendedKeyCodeForChar(e.getKeyChar()));
+ == ExtendedKeyCodes.getExtendedKeyCodeForChar(e.getKeyChar()));
}
@Override
public void keyReleased(KeyEvent e) {
eventsCount++;
setExtendedKeyCode = setExtendedKeyCode && (e.getExtendedKeyCode()
- == ExtendedKeyCodes.getExtendedKeyCodeForChar(e.getKeyChar()));
+ == ExtendedKeyCodes.getExtendedKeyCodeForChar(e.getKeyChar()));
}
});
@@ -77,5 +78,29 @@
if (eventsCount != 2 || !setExtendedKeyCode) {
throw new RuntimeException("Wrong extended key code");
}
+
+ frame = new Frame();
+ frame.setSize(300, 300);
+ setExtendedKeyCode = false;
+
+ frame.addKeyListener(new KeyAdapter() {
+
+ @Override
+ public void keyPressed(KeyEvent e) {
+ setExtendedKeyCode = e.getExtendedKeyCode() == KeyEvent.VK_LEFT;
+ }
+ });
+
+ frame.setVisible(true);
+ toolkit.realSync();
+
+ robot.keyPress(KeyEvent.VK_LEFT);
+ robot.keyRelease(KeyEvent.VK_LEFT);
+ toolkit.realSync();
+ frame.dispose();
+
+ if (!setExtendedKeyCode) {
+ throw new RuntimeException("Wrong extended key code!");
+ }
}
}
diff --git a/jdk/test/java/awt/print/PageFormat/PageFormatFromAttributes.java b/jdk/test/java/awt/print/PageFormat/PageFormatFromAttributes.java
index de154c0..8b29138 100644
--- a/jdk/test/java/awt/print/PageFormat/PageFormatFromAttributes.java
+++ b/jdk/test/java/awt/print/PageFormat/PageFormatFromAttributes.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4500750 6848799
+ * @bug 4500750 6848799 8028584
* @summary Tests creating page format from attributes
* @run main PageFormatFromAttributes
*/
diff --git a/jdk/test/java/beans/XMLDecoder/8028054/Task.java b/jdk/test/java/beans/XMLDecoder/8028054/Task.java
new file mode 100644
index 0000000..9aa477c
--- /dev/null
+++ b/jdk/test/java/beans/XMLDecoder/8028054/Task.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+abstract class Task<T> implements Runnable {
+ private transient boolean working = true;
+ private final List<T> methods;
+ private final Thread thread;
+
+ Task(List<T> methods) {
+ this.methods = methods;
+ this.thread = new Thread(this);
+ this.thread.start();
+ }
+
+ boolean isAlive() {
+ return this.thread.isAlive();
+ }
+
+ boolean isWorking() {
+ boolean working = this.working && this.thread.isAlive();
+ this.working = false;
+ return working;
+ }
+
+ @Override
+ public void run() {
+ long time = -System.currentTimeMillis();
+ for (T method : this.methods) {
+ this.working = true;
+ try {
+ for (int i = 0; i < 100; i++) {
+ process(method);
+ }
+ } catch (NoSuchMethodException ignore) {
+ }
+ }
+ time += System.currentTimeMillis();
+ print("thread done in " + time / 1000 + " seconds");
+ }
+
+ protected abstract void process(T method) throws NoSuchMethodException;
+
+ static synchronized void print(Object message) {
+ System.out.println(message);
+ System.out.flush();
+ }
+
+ static List<Class<?>> getClasses(int count) throws Exception {
+ String resource = ClassLoader.getSystemClassLoader().getResource("java/lang/Object.class").toString();
+
+ Pattern pattern = Pattern.compile("jar:file:(.*)!.*");
+ Matcher matcher = pattern.matcher(resource);
+ matcher.matches();
+ resource = matcher.group(1);
+
+ List<Class<?>> classes = new ArrayList<>();
+ try (JarFile jarFile = new JarFile(resource)) {
+ Enumeration<JarEntry> entries = jarFile.entries();
+ while (entries.hasMoreElements()) {
+ String name = entries.nextElement().getName();
+ if (name.startsWith("java") && name.endsWith(".class")) {
+ classes.add(Class.forName(name.substring(0, name.indexOf(".")).replace('/', '.')));
+ if (count == classes.size()) {
+ break;
+ }
+ }
+ }
+ }
+ return classes;
+ }
+}
diff --git a/jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java b/jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java
new file mode 100644
index 0000000..1bce91e
--- /dev/null
+++ b/jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import com.sun.beans.finder.ConstructorFinder;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/*
+ * @test
+ * @bug 8028054
+ * @summary Tests that cached constructors have synchronized access
+ * @author Sergey Malenkov
+ * @compile -XDignore.symbol.file TestConstructorFinder.java
+ * @run main TestConstructorFinder
+ */
+
+public class TestConstructorFinder {
+ public static void main(String[] args) throws Exception {
+ List<Class<?>> classes = Task.getClasses(Integer.MAX_VALUE);
+ List<Constructor> constructors = new ArrayList<>();
+ for (Class<?> type : classes) {
+ Collections.addAll(constructors, type.getConstructors());
+ }
+ Task.print("found " + constructors.size() + " constructors in " + classes.size() + " classes");
+
+ List<Task> tasks = new ArrayList<>();
+ for (int i = 0; i < 50; i++) {
+ tasks.add(new Task<Constructor>(constructors) {
+ @Override
+ protected void process(Constructor constructor) throws NoSuchMethodException {
+ ConstructorFinder.findConstructor(constructor.getDeclaringClass(), constructor.getParameterTypes());
+ }
+ });
+ }
+ int alarm = 0;
+ while (true) {
+ int alive = 0;
+ int working = 0;
+ for (Task task : tasks) {
+ if (task.isWorking()) {
+ working++;
+ alive++;
+ } else if (task.isAlive()) {
+ alive++;
+ }
+ }
+ if (alive == 0) {
+ break;
+ }
+ Task.print(working + " out of " + alive + " threads are working");
+ if ((working == 0) && (++alarm == 10)) {
+ Task.print("DEADLOCK DETECTED");
+ System.exit(100);
+ }
+ Thread.sleep(1000);
+ }
+ }
+}
diff --git a/jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java b/jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java
new file mode 100644
index 0000000..7ff7a90
--- /dev/null
+++ b/jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import com.sun.beans.finder.MethodFinder;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/*
+ * @test
+ * @bug 8028054
+ * @summary Tests that cached methods have synchronized access
+ * @author Sergey Malenkov
+ * @compile -XDignore.symbol.file TestMethodFinder.java
+ * @run main TestMethodFinder
+ */
+
+public class TestMethodFinder {
+ public static void main(String[] args) throws Exception {
+ List<Class<?>> classes = Task.getClasses(4000);
+ List<Method> methods = new ArrayList<>();
+ for (Class<?> type : classes) {
+ Collections.addAll(methods, type.getMethods());
+ }
+ Task.print("found " + methods.size() + " methods in " + classes.size() + " classes");
+
+ List<Task> tasks = new ArrayList<>();
+ for (int i = 0; i < 50; i++) {
+ tasks.add(new Task<Method>(methods) {
+ @Override
+ protected void process(Method method) throws NoSuchMethodException {
+ MethodFinder.findMethod(method.getDeclaringClass(), method.getName(), method.getParameterTypes());
+ }
+ });
+ }
+ int alarm = 0;
+ while (true) {
+ int alive = 0;
+ int working = 0;
+ for (Task task : tasks) {
+ if (task.isWorking()) {
+ working++;
+ alive++;
+ } else if (task.isAlive()) {
+ alive++;
+ }
+ }
+ if (alive == 0) {
+ break;
+ }
+ Task.print(working + " out of " + alive + " threads are working");
+ if ((working == 0) && (++alarm == 10)) {
+ Task.print("DEADLOCK DETECTED");
+ System.exit(100);
+ }
+ Thread.sleep(1000);
+ }
+ }
+}
diff --git a/jdk/test/java/io/pathNames/General.java b/jdk/test/java/io/pathNames/General.java
index 29be50e..6df31d2 100644
--- a/jdk/test/java/io/pathNames/General.java
+++ b/jdk/test/java/io/pathNames/General.java
@@ -39,12 +39,40 @@
private static int gensymCounter = 0;
+ protected static final String userDir = System.getProperty("user.dir");
+
+ protected static String baseDir = null;
+ protected static String relative = null;
/* Generate a filename unique to this run */
- protected static String gensym() {
+ private static String gensym() {
return "x." + ++gensymCounter;
}
+ /**
+ * Create files and folders in the test working directory.
+ * The purpose is to make sure the test will not go out of
+ * its user dir when walking the file tree.
+ *
+ * @param depth The number of directory levels to be created under
+ * the user directory. It should be the maximum value
+ * of the depths passed to checkNames method (including
+ * direct or indirect calling) in a whole test.
+ */
+ protected static void initTestData(int depth) throws IOException {
+ File parent = new File(userDir);
+ for (int i = 0; i < depth; i++) {
+ File tmp = new File(parent, gensym());
+ tmp.createNewFile();
+ tmp = new File(parent, gensym());
+ if (tmp.mkdir())
+ parent = tmp;
+ else
+ throw new IOException("Fail to create directory, " + tmp);
+ }
+ baseDir = parent.getAbsolutePath();
+ relative = baseDir.substring(userDir.length() + 1);
+ }
/**
* Find a file in the given subdirectory, or descend into further
@@ -214,7 +242,7 @@
/** Hash table of input pathnames, used to detect duplicates */
- private static Hashtable checked = new Hashtable();
+ private static Hashtable<String, String> checked = new Hashtable<>();
/**
* Check the given pathname. Its canonical pathname should be the given
@@ -272,7 +300,7 @@
/** Check a single slash case, plus its children */
- public static void checkSlash(int depth, boolean create,
+ private static void checkSlash(int depth, boolean create,
String ans, String ask, String slash)
throws Exception
{
diff --git a/jdk/test/java/io/pathNames/GeneralSolaris.java b/jdk/test/java/io/pathNames/GeneralSolaris.java
new file mode 100644
index 0000000..5b3c3d7
--- /dev/null
+++ b/jdk/test/java/io/pathNames/GeneralSolaris.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ @bug 4035924 4095767
+ @summary General exhaustive test of solaris pathname handling
+ @author Mark Reinhold
+
+ @build General GeneralSolaris
+ @run main GeneralSolaris
+ */
+
+import java.io.*;
+import java.util.*;
+import java.nio.file.*;
+import java.nio.file.attribute.*;
+
+public class GeneralSolaris extends General {
+
+ private static void checkUnreadable() throws Exception {
+ Path file = Paths.get(baseDir, "unreadableFile");
+ Path dir = Paths.get(baseDir, "unreadableDir");
+ Set<PosixFilePermission> perms = PosixFilePermissions.fromString("---------");
+ FileAttribute<Set<PosixFilePermission>> attr = PosixFilePermissions.asFileAttribute(perms);
+ Files.createFile(file, attr);
+ Files.createDirectory(dir, attr);
+
+ String unreadableFile = file.toString();
+ String unreadableDir = dir.toString();
+
+ checkSlashes(2, false, unreadableDir, unreadableDir);
+ checkSlashes(2, false, unreadableFile, unreadableFile);
+
+ Files.delete(file);
+ Files.delete(dir);
+ }
+
+ private static void checkPaths() throws Exception {
+ // Make sure that an empty relative path is tested
+ checkNames(1, true, userDir + File.separator, "");
+ checkNames(3, true, baseDir + File.separator,
+ relative + File.separator);
+
+ checkSlashes(2, true, baseDir, baseDir);
+ }
+
+ public static void main(String[] args) throws Exception {
+ if (File.separatorChar != '/') {
+ /* This test is only valid on Unix systems */
+ return;
+ }
+ if (args.length > 0) debug = true;
+
+ initTestData(3);
+ checkUnreadable();
+ checkPaths();
+ }
+}
diff --git a/jdk/test/java/io/pathNames/GeneralWin32.java b/jdk/test/java/io/pathNames/GeneralWin32.java
index 23c34f3..4644a6f 100644
--- a/jdk/test/java/io/pathNames/GeneralWin32.java
+++ b/jdk/test/java/io/pathNames/GeneralWin32.java
@@ -47,29 +47,24 @@
private static final String EXISTENT_UNC_SHARE = "pcdist";
private static final String NONEXISTENT_UNC_HOST = "non-existent-unc-host";
private static final String NONEXISTENT_UNC_SHARE = "bogus-share";
- private static final int DEPTH = 2;
- private static String baseDir = null;
- private static String userDir = null;
- private static String relative = null;
/* Pathnames relative to working directory */
private static void checkCaseLookup() throws IOException {
/* Use long names here to avoid 8.3 format, which Samba servers often
force to lowercase */
- File d1 = new File(relative, "XyZzY0123");
- File d2 = new File(d1, "FOO_bar_BAZ");
- File f = new File(d2, "GLORPified");
+ File d = new File("XyZzY0123", "FOO_bar_BAZ");
+ File f = new File(d, "GLORPified");
if (!f.exists()) {
- if (!d2.exists()) {
- if (!d2.mkdirs()) {
- throw new RuntimeException("Can't create directory " + d2);
+ if (!d.exists()) {
+ if (!d.mkdirs()) {
+ throw new RuntimeException("Can't create directory " + d);
}
}
OutputStream o = new FileOutputStream(f);
o.close();
}
- File f2 = new File(d2.getParent(), "mumble"); /* For later ud tests */
+ File f2 = new File(d.getParent(), "mumble"); /* For later ud tests */
if (!f2.exists()) {
OutputStream o = new FileOutputStream(f2);
o.close();
@@ -79,9 +74,9 @@
case of filenames, rather than just using the input case */
File y = new File(userDir, f.getPath());
String ans = y.getPath();
- check(ans, relative + "XyZzY0123\\FOO_bar_BAZ\\GLORPified");
- check(ans, relative + "xyzzy0123\\foo_bar_baz\\glorpified");
- check(ans, relative + "XYZZY0123\\FOO_BAR_BAZ\\GLORPIFIED");
+ check(ans, "XyZzY0123\\FOO_bar_BAZ\\GLORPified");
+ check(ans, "xyzzy0123\\foo_bar_baz\\glorpified");
+ check(ans, "XYZZY0123\\FOO_BAR_BAZ\\GLORPIFIED");
}
private static void checkWild(File f) throws Exception {
@@ -94,16 +89,19 @@
}
private static void checkWildCards() throws Exception {
- File d = new File(baseDir).getCanonicalFile();
+ File d = new File(userDir).getCanonicalFile();
checkWild(new File(d, "*.*"));
checkWild(new File(d, "*.???"));
checkWild(new File(new File(d, "*.*"), "foo"));
}
- private static void checkRelativePaths() throws Exception {
+ private static void checkRelativePaths(int depth) throws Exception {
checkCaseLookup();
checkWildCards();
- checkNames(3, true, baseDir, relative);
+ // Make sure that an empty relative path is tested
+ checkNames(1, true, userDir + File.separator, "");
+ checkNames(depth, true, baseDir + File.separator,
+ relative + File.separator);
}
@@ -135,22 +133,22 @@
String ans = exists ? df.getAbsolutePath() : d;
if (!ans.endsWith("\\"))
ans = ans + "\\";
- checkNames(depth, false, ans + relative, d + relative);
+ checkNames(depth, false, ans, d);
}
- private static void checkDrivePaths() throws Exception {
- checkDrive(2, findActiveDrive(), true);
- checkDrive(2, findInactiveDrive(), false);
+ private static void checkDrivePaths(int depth) throws Exception {
+ checkDrive(depth, findActiveDrive(), true);
+ checkDrive(depth, findInactiveDrive(), false);
}
/* UNC pathnames */
- private static void checkUncPaths() throws Exception {
+ private static void checkUncPaths(int depth) throws Exception {
String s = ("\\\\" + NONEXISTENT_UNC_HOST
+ "\\" + NONEXISTENT_UNC_SHARE);
ensureNon(s);
- checkSlashes(DEPTH, false, s, s);
+ checkSlashes(depth, false, s, s);
s = "\\\\" + EXISTENT_UNC_HOST + "\\" + EXISTENT_UNC_SHARE;
if (!(new File(s)).exists()) {
@@ -159,7 +157,7 @@
return;
}
- checkSlashes(DEPTH, false, s, s);
+ checkSlashes(depth, false, s, s);
}
@@ -169,34 +167,11 @@
return;
}
if (args.length > 0) debug = true;
- userDir = System.getProperty("user.dir") + '\\';
- baseDir = initTestData(6) + '\\';
- relative = baseDir.substring(userDir.length());
- checkRelativePaths();
- checkDrivePaths();
- checkUncPaths();
- }
- private static String initTestData(int maxDepth) throws IOException {
- File parent = new File(userDir);
- String baseDir = null;
- maxDepth = maxDepth < DEPTH + 2 ? DEPTH + 2 : maxDepth;
- for (int i = 0; i < maxDepth; i ++) {
- File dir1 = new File(parent, gensym());
- dir1.mkdir();
- if (i != 0) {
- File dir2 = new File(parent, gensym());
- dir2.mkdir();
- File f1 = new File(parent, gensym());
- f1.createNewFile();
- File f2 = new File(parent, gensym());
- f2.createNewFile();
- }
- if (i == DEPTH + 1) {
- baseDir = dir1.getAbsolutePath();
- }
- parent = dir1;
- }
- return baseDir;
+ initTestData(3);
+
+ checkRelativePaths(3);
+ checkDrivePaths(2);
+ checkUncPaths(2);
}
}
diff --git a/jdk/test/java/lang/ProcessBuilder/Basic.java b/jdk/test/java/lang/ProcessBuilder/Basic.java
index 5a55cb6..4434e9b 100644
--- a/jdk/test/java/lang/ProcessBuilder/Basic.java
+++ b/jdk/test/java/lang/ProcessBuilder/Basic.java
@@ -561,9 +561,10 @@
System.getProperty("java.class.path");
private static final List<String> javaChildArgs =
- Arrays.asList(new String[]
- { javaExe, "-classpath", absolutifyPath(classpath),
- "Basic$JavaChild"});
+ Arrays.asList(javaExe,
+ "-XX:+DisplayVMOutputToStderr",
+ "-classpath", absolutifyPath(classpath),
+ "Basic$JavaChild");
private static void testEncoding(String encoding, String tested) {
try {
@@ -1627,8 +1628,8 @@
javaExe));
list.add("ArrayOOME");
ProcessResults r = run(new ProcessBuilder(list));
- check(r.out().contains("java.lang.OutOfMemoryError:"));
- check(r.out().contains(javaExe));
+ check(r.err().contains("java.lang.OutOfMemoryError:"));
+ check(r.err().contains(javaExe));
check(r.err().contains(System.getProperty("java.version")));
equal(r.exitValue(), 1);
} catch (Throwable t) { unexpected(t); }
@@ -2016,6 +2017,7 @@
&& new File("/bin/bash").exists()
&& new File("/bin/sleep").exists()) {
final String[] cmd = { "/bin/bash", "-c", "(/bin/sleep 6666)" };
+ final String[] cmdkill = { "/bin/bash", "-c", "(/usr/bin/pkill -f \"sleep 6666\")" };
final ProcessBuilder pb = new ProcessBuilder(cmd);
final Process p = pb.start();
final InputStream stdout = p.getInputStream();
@@ -2043,6 +2045,7 @@
stdout.close();
stderr.close();
stdin.close();
+ new ProcessBuilder(cmdkill).start();
//----------------------------------------------------------
// There remain unsolved issues with asynchronous close.
// Here's a highly non-portable experiment to demonstrate:
@@ -2243,7 +2246,7 @@
try {
try {
latch.countDown();
- p.waitFor(10000, TimeUnit.MILLISECONDS);
+ p.waitFor(30000, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
return;
}
diff --git a/jdk/test/java/lang/annotation/typeAnnotations/BadCPIndex.java b/jdk/test/java/lang/annotation/typeAnnotations/BadCPIndex.java
new file mode 100644
index 0000000..9985f23
--- /dev/null
+++ b/jdk/test/java/lang/annotation/typeAnnotations/BadCPIndex.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8023878
+ * @summary Test that the right kind of exception is thrown from the type
+ * annotation reflection code.
+ * @run testng BadCPIndex
+ */
+
+import java.lang.annotation.*;
+import java.util.Base64;
+import java.util.function.Function;
+
+import org.testng.annotations.Test;
+import org.testng.annotations.DataProvider;
+
+public class BadCPIndex {
+ private static final MyLoader loader = new MyLoader(BadCPIndex.class.getClassLoader());
+
+ // Blueprint for broken C
+ //public static class C extends @BadCPIndex.A Object {}
+ private static final String encodedBrokenC = "yv66vgAAADQAFgoAAwAPBwARBwATAQAGPGluaXQ+AQADKClWAQAEQ29kZQEAD0xpbmVOdW1iZXJUYWJsZQEAClNvdXJjZUZpbGUBAA9CYWRDUEluZGV4LmphdmEBAB1SdW50aW1lVmlzaWJsZVR5cGVBbm5vdGF0aW9ucwcAFAEAAUEBAAxJbm5lckNsYXNzZXMBAA5MQmFkQ1BJbmRleCRBOwwABAAFBwAVAQAMQmFkQ1BJbmRleCRDAQABQwEAEGphdmEvbGFuZy9PYmplY3QBAAxCYWRDUEluZGV4JEEBAApCYWRDUEluZGV4ACEAAgADAAAAAAABAAEABAAFAAEABgAAAB0AAQABAAAABSq3AAGxAAAAAQAHAAAABgABAAAAKQADAAgAAAACAAkACgAAAAoAARD//wAADwAAAA0AAAASAAIACwAQAAwmCQACABAAEgAJ";
+
+ // Blueprint for broken D
+ //public static class D<@BadCPIndex.B U> {}
+ private static final String encodedBrokenD = "yv66vgAAADQAGAoAAwARBwATBwAVAQAGPGluaXQ+AQADKClWAQAEQ29kZQEAD0xpbmVOdW1iZXJUYWJsZQEACVNpZ25hdHVyZQEAKDxVOkxqYXZhL2xhbmcvT2JqZWN0Oz5MamF2YS9sYW5nL09iamVjdDsBAApTb3VyY2VGaWxlAQAPQmFkQ1BJbmRleC5qYXZhAQAdUnVudGltZVZpc2libGVUeXBlQW5ub3RhdGlvbnMHABYBAAFCAQAMSW5uZXJDbGFzc2VzAQAOTEJhZENQSW5kZXgkQjsMAAQABQcAFwEADEJhZENQSW5kZXgkRAEAAUQBABBqYXZhL2xhbmcvT2JqZWN0AQAMQmFkQ1BJbmRleCRCAQAKQmFkQ1BJbmRleAAhAAIAAwAAAAAAAQABAAQABQABAAYAAAAdAAEAAQAAAAUqtwABsQAAAAEABwAAAAYAAQAAAEAABAAIAAAAAgAJAAoAAAACAAsADAAAAAkAAQAAAAARAAAADwAAABIAAgANABIADiYJAAIAEgAUAAk=";
+
+ // Blueprint for broken E
+ //public static class E extends @BadCPIndex.A Object {}
+ private static final String encodedBrokenE = "yv66vgAAADQAFgoAAwAPBwARBwATAQAGPGluaXQ+AQADKClWAQAEQ29kZQEAD0xpbmVOdW1iZXJUYWJsZQEAClNvdXJjZUZpbGUBAA9CYWRDUEluZGV4LmphdmEBAB1SdW50aW1lVmlzaWJsZVR5cGVBbm5vdGF0aW9ucwcAFAEAAUEBAAxJbm5lckNsYXNzZXMBAA5MQmFkQ1BJbmRleCRBOwwABAAFBwAVAQAMQmFkQ1BJbmRleCRFAQABRQEAEGphdmEvbGFuZy9PYmplY3QBAAxCYWRDUEluZGV4JEEBAApCYWRDUEluZGV4ACEAAgADAAAAAAABAAEABAAFAAEABgAAAB0AAQABAAAABSq3AAGxAAAAAQAHAAAABgABAAAARgADAAgAAAACAAkACgAAAAoAARD//wAADgAKAA0AAAASAAIACwAQAAwmCQACABAAEgAJ";
+
+ private static final Object[][] cases = {
+ { new Case("BadCPIndex$C", encodedBrokenC, Class::getAnnotatedSuperclass) },
+ { new Case("BadCPIndex$D", encodedBrokenD, (c -> c.getTypeParameters()[0].getAnnotations()))},
+ { new Case("BadCPIndex$E", encodedBrokenE, Class::getAnnotatedSuperclass) },
+ };
+
+ @DataProvider
+ public static Object[][] data() { return cases; }
+
+ @Test(dataProvider="data")
+ public static void testOpThrowsAFE(Case testCase) {
+ Class<?> c = loader.defineClass(testCase.name, Base64.getDecoder().decode(testCase.encoding));
+ try {
+ System.out.println("Testing: " + c);
+ testCase.trigger.apply(c);
+ throw new RuntimeException("Expecting AnnotationFormatError here");
+ } catch (AnnotationFormatError e) {
+ ; //ok
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private static class MyLoader extends ClassLoader {
+ public MyLoader(ClassLoader parent) {
+ super(parent);
+ }
+
+ public Class<?> defineClass(String name, byte[] bytes) {
+ return defineClass(name, bytes, 0, bytes.length);
+ }
+ }
+
+ private static class Case {
+ public String name;
+ public String encoding;
+ public Function<Class<?>, Object> trigger;
+
+ public Case(String name, String encoding, Function<Class<?>, Object> trigger) {
+ this.name = name;
+ this.encoding = encoding;
+ this.trigger = trigger;
+ }
+ }
+
+ @Target(ElementType.TYPE_USE)
+ @Retention(RetentionPolicy.RUNTIME)
+ public static @interface A {}
+
+ @Target(ElementType.TYPE_PARAMETER)
+ @Retention(RetentionPolicy.RUNTIME)
+ public static @interface B {}
+}
diff --git a/jdk/test/java/lang/instrument/PremainClass/NoPremainAgent.sh b/jdk/test/java/lang/instrument/PremainClass/NoPremainAgent.sh
deleted file mode 100644
index 3f8c745..0000000
--- a/jdk/test/java/lang/instrument/PremainClass/NoPremainAgent.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 6289149
-# @summary test when the agent's class is missing the premain() function.
-# @author Daniel D. Daugherty, Sun Microsystems
-#
-# @run build DummyMain
-# @run shell ../MakeJAR3.sh NoPremainAgent
-# @run shell NoPremainAgent.sh
-#
-
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${COMPILEJAVA}" = "" ]
-then
- COMPILEJAVA="${TESTJAVA}"
-fi
-echo "COMPILEJAVA=${COMPILEJAVA}"
-
-if [ "${TESTSRC}" = "" ]
-then
- echo "TESTSRC not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-JAVAC="${COMPILEJAVA}"/bin/javac
-JAVA="${TESTJAVA}"/bin/java
-
-"${JAVA}" ${TESTVMOPTS} -javaagent:NoPremainAgent.jar \
- -classpath "${TESTCLASSES}" DummyMain > output.log 2>&1
-cat output.log
-
-MESG="java.lang.NoSuchMethodException"
-grep "$MESG" output.log
-result=$?
-if [ "$result" = 0 ]; then
- echo "PASS: found '$MESG' in the test output"
-else
- echo "FAIL: did NOT find '$MESG' in the test output"
-fi
-
-exit $result
diff --git a/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java b/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java
new file mode 100644
index 0000000..9d08a7b
--- /dev/null
+++ b/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.Utils;
+
+/*
+ * @test
+ * @bug 6289149
+ * @summary test when the agent's class is missing the premain() function.
+ * @library /lib/testlibrary
+ * @run build DummyMain
+ * @run shell ../MakeJAR3.sh NoPremainAgent
+ * @run main NoPremainAgentTest
+ */
+public class NoPremainAgentTest {
+ // Use a javaagent without the premain() function.
+ // Verify that we get the correct exception.
+ public static void main(String[] a) throws Exception {
+ String testArgs = String.format(
+ "-javaagent:NoPremainAgent.jar -classpath %s DummyMain",
+ System.getProperty("test.classes", "."));
+
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ Utils.addTestJavaOpts(testArgs.split("\\s+")));
+ System.out.println("testjvm.cmd:" + Utils.getCommandLine(pb));
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ System.out.println("testjvm.stdout:" + output.getStdout());
+ System.out.println("testjvm.stderr:" + output.getStderr());
+
+ output.stderrShouldContain("java.lang.NoSuchMethodException");
+ if (0 == output.getExitValue()) {
+ throw new RuntimeException("Expected error but got exit value 0");
+ }
+ }
+}
diff --git a/jdk/test/java/lang/instrument/PremainClass/PremainClassTest.java b/jdk/test/java/lang/instrument/PremainClass/PremainClassTest.java
new file mode 100644
index 0000000..9ebe4a6
--- /dev/null
+++ b/jdk/test/java/lang/instrument/PremainClass/PremainClassTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.Utils;
+
+/*
+ * @test
+ * @bug 5055293
+ * @summary Test non ascii characters in the Premain-Class attribute.
+ * @library /lib/testlibrary
+ * @run build DummyMain
+ * @run main PremainClassTest
+ */
+public class PremainClassTest {
+ // Use a javaagent where the manifest Premain-Class contains
+ // a non ascii character.
+ // Verify that the premain() function is executed correctly.
+ public static void main(String[] a) throws Exception {
+ String testArgs = String.format(
+ "-javaagent:%s/Agent.jar -classpath %s DummyMain",
+ System.getProperty("test.src"),
+ System.getProperty("test.classes", "."));
+
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ Utils.addTestJavaOpts(testArgs.split("\\s+")));
+ System.out.println("testjvm.cmd:" + Utils.getCommandLine(pb));
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ System.out.println("testjvm.stdout:" + output.getStdout());
+ System.out.println("testjvm.stderr:" + output.getStderr());
+
+ output.shouldHaveExitValue(0);
+ output.stdoutShouldContain("premain running");
+ output.stdoutShouldContain("Hello from DummyMain!");
+ }
+}
diff --git a/jdk/test/java/lang/instrument/PremainClass/PremainClassTest.sh b/jdk/test/java/lang/instrument/PremainClass/PremainClassTest.sh
deleted file mode 100644
index e4cd42b..0000000
--- a/jdk/test/java/lang/instrument/PremainClass/PremainClassTest.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 5055293
-# @summary Test non US-ASCII characters in the value of the Premain-Class
-# attribute.
-
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${COMPILEJAVA}" = "" ]
-then
- COMPILEJAVA="${TESTJAVA}"
-fi
-echo "COMPILEJAVA=${COMPILEJAVA}"
-
-if [ "${TESTSRC}" = "" ]
-then
- echo "TESTSRC not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-JAVAC="${COMPILEJAVA}"/bin/javac
-JAVA="${TESTJAVA}"/bin/java
-
-"$JAVAC" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" "${TESTSRC}"/DummyMain.java
-
-"${JAVA}" ${TESTVMOPTS} -javaagent:"${TESTSRC}"/Agent.jar -classpath "${TESTCLASSES}" DummyMain
-result=$?
-
-exit $result
diff --git a/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgent.sh b/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgent.sh
deleted file mode 100644
index 3fc7e48..0000000
--- a/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgent.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 6289149
-# @summary test when the agent's class has a zero arg premain() function.
-# @author Daniel D. Daugherty, Sun Microsystems
-#
-# @run build DummyMain
-# @run shell ../MakeJAR3.sh ZeroArgPremainAgent
-# @run shell ZeroArgPremainAgent.sh
-#
-
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${COMPILEJAVA}" = "" ]
-then
- COMPILEJAVA="${TESTJAVA}"
-fi
-echo "COMPILEJAVA=${COMPILEJAVA}"
-
-if [ "${TESTSRC}" = "" ]
-then
- echo "TESTSRC not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-JAVAC="${COMPILEJAVA}"/bin/javac
-JAVA="${TESTJAVA}"/bin/java
-
-"${JAVA}" ${TESTVMOPTS} -javaagent:ZeroArgPremainAgent.jar \
- -classpath "${TESTCLASSES}" DummyMain > output.log 2>&1
-cat output.log
-
-MESG="java.lang.NoSuchMethodException"
-grep "$MESG" output.log
-result=$?
-if [ "$result" = 0 ]; then
- echo "PASS: found '$MESG' in the test output"
-else
- echo "FAIL: did NOT find '$MESG' in the test output"
-fi
-
-exit $result
diff --git a/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java b/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java
new file mode 100644
index 0000000..7b67e4c
--- /dev/null
+++ b/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.Utils;
+
+/*
+ * @test
+ * @bug 6289149
+ * @summary test when the agent's class has a zero arg premain() function.
+ * @library /lib/testlibrary
+ * @run build DummyMain
+ * @run shell ../MakeJAR3.sh ZeroArgPremainAgent
+ * @run main ZeroArgPremainAgentTest
+ */
+public class ZeroArgPremainAgentTest {
+ // Use a javaagent with a zero argument premain() function.
+ // Verify that we get the correct exception.
+ public static void main(String[] a) throws Exception {
+ String testArgs = String.format(
+ "-javaagent:ZeroArgPremainAgent.jar -classpath %s DummyMain",
+ System.getProperty("test.classes", "."));
+
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ Utils.addTestJavaOpts(testArgs.split("\\s+")));
+ System.out.println("testjvm.cmd:" + Utils.getCommandLine(pb));
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ System.out.println("testjvm.stdout:" + output.getStdout());
+ System.out.println("testjvm.stderr:" + output.getStderr());
+
+ output.stderrShouldContain("java.lang.NoSuchMethodException");
+ if (0 == output.getExitValue()) {
+ throw new RuntimeException("Expected error but got exit value 0");
+ }
+ }
+}
diff --git a/jdk/test/java/net/NetworkInterface/IndexTest.java b/jdk/test/java/net/NetworkInterface/IndexTest.java
index 4d5a015..ed9e225 100644
--- a/jdk/test/java/net/NetworkInterface/IndexTest.java
+++ b/jdk/test/java/net/NetworkInterface/IndexTest.java
@@ -33,11 +33,16 @@
import static java.lang.System.out;
public class IndexTest {
+ static final boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+
public static void main(String[] args) throws Exception {
Enumeration<NetworkInterface> netifs = NetworkInterface.getNetworkInterfaces();
- NetworkInterface nif = null;
+ NetworkInterface nif;
while (netifs.hasMoreElements()) {
nif = netifs.nextElement();
+ // JDK-8022212, Skip (Windows) Teredo Tunneling seudo-Interface
+ if (nif.getDisplayName().contains("Teredo") && isWindows)
+ continue;
int index = nif.getIndex();
if (index >= 0) {
NetworkInterface nif2 = NetworkInterface.getByIndex(index);
diff --git a/jdk/test/java/net/Socket/LingerTest.java b/jdk/test/java/net/Socket/LingerTest.java
index 84a02ef..aa7b7d0 100644
--- a/jdk/test/java/net/Socket/LingerTest.java
+++ b/jdk/test/java/net/Socket/LingerTest.java
@@ -68,20 +68,21 @@
}
}
- static class Another implements Runnable {
+ static class Other implements Runnable {
int port;
long delay;
boolean connected = false;
- public Another(int port, long delay) {
+ public Other(int port, long delay) {
this.port = port;
this.delay = delay;
}
public void run() {
- System.out.println ("Another starts");
+ System.out.println ("Other starts: sleep " + delay);
try {
Thread.sleep(delay);
+ System.out.println ("Other opening socket");
Socket s = new Socket("localhost", port);
synchronized (this) {
connected = true;
@@ -91,7 +92,7 @@
catch (Exception ioe) {
ioe.printStackTrace();
}
- System.out.println ("Another ends");
+ System.out.println ("Other ends");
}
public synchronized boolean connected() {
@@ -115,27 +116,29 @@
Thread thr = new Thread(new Sender(s1));
thr.start();
- // another thread that will connect after 5 seconds.
- Another another = new Another(ss.getLocalPort(), 5000);
- thr = new Thread(another);
+ // other thread that will connect after 5 seconds.
+ Other other = new Other(ss.getLocalPort(), 5000);
+ thr = new Thread(other);
thr.start();
// give sender time to queue the data
+ System.out.println ("Main sleep 1000");
Thread.sleep(1000);
+ System.out.println ("Main continue");
// close the socket asynchronously
(new Thread(new Closer(s1))).start();
- // give another time to run
- Thread.sleep(10000);
+ System.out.println ("Main sleep 15000");
+ // give other time to run
+ Thread.sleep(15000);
+ System.out.println ("Main closing serversocket");
ss.close();
- // check that another is done
- if (!another.connected()) {
- throw new RuntimeException("Another thread is blocked");
+ // check that other is done
+ if (!other.connected()) {
+ throw new RuntimeException("Other thread is blocked");
}
System.out.println ("Main ends");
-
}
-
}
diff --git a/jdk/test/java/nio/channels/FileChannel/Size.java b/jdk/test/java/nio/channels/FileChannel/Size.java
index d17ed6b..8a658e0 100644
--- a/jdk/test/java/nio/channels/FileChannel/Size.java
+++ b/jdk/test/java/nio/channels/FileChannel/Size.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,67 +39,57 @@
public class Size {
- private static Random generator = new Random();
-
- private static File blah;
-
public static void main(String[] args) throws Exception {
- test1();
- test2();
+ testSmallFile();
+ testLargeFile();
}
- private static void test1() throws Exception {
- blah = File.createTempFile("blah", null);
- blah.deleteOnExit();
+ private static void testSmallFile() throws Exception {
+ File smallFile = new File("smallFileTest");
+ Random generator = new Random();
for(int i=0; i<100; i++) {
long testSize = generator.nextInt(1000);
- initTestFile(blah, testSize);
- FileInputStream fis = new FileInputStream(blah);
- FileChannel c = fis.getChannel();
- if (c.size() != testSize)
- throw new RuntimeException("Size failed");
- c.close();
- fis.close();
+ initTestFile(smallFile, testSize);
+ try (FileChannel c = new FileInputStream(smallFile).getChannel()) {
+ if (c.size() != testSize) {
+ throw new RuntimeException("Size failed in testSmallFile. "
+ + "Expect size " + testSize
+ + ", actual size " + c.size());
+ }
+ }
}
- blah.delete();
+ smallFile.deleteOnExit();
}
// Test for bug 4563125
- private static void test2() throws Exception {
- // Windows and Linux can't handle the really large file sizes for a truncate
- // or a positional write required by the test for 4563125
- String osName = System.getProperty("os.name");
- if (osName.startsWith("SunOS") || osName.contains("OS X")) {
- blah = File.createTempFile("blah", null);
- long testSize = ((long)Integer.MAX_VALUE) * 2;
- initTestFile(blah, 10);
- RandomAccessFile raf = new RandomAccessFile(blah, "rw");
- FileChannel fc = raf.getChannel();
+ private static void testLargeFile() throws Exception {
+ File largeFile = new File("largeFileTest");
+ long testSize = ((long)Integer.MAX_VALUE) * 2;
+ initTestFile(largeFile, 10);
+ try (FileChannel fc = new RandomAccessFile(largeFile, "rw").getChannel())
+ {
fc.size();
fc.map(FileChannel.MapMode.READ_WRITE, testSize, 10);
- if (fc.size() != testSize + 10)
- throw new RuntimeException("Size failed " + fc.size());
- fc.close();
- raf.close();
- blah.delete();
+ if (fc.size() != testSize + 10) {
+ throw new RuntimeException("Size failed in testLargeFile. "
+ + "Expect size " + (testSize + 10)
+ + ", actual size " + fc.size());
+ }
}
+ largeFile.deleteOnExit();
}
/**
- * Creates file blah of specified size in bytes.
+ * Create a file with the specified size in bytes.
*
*/
- private static void initTestFile(File blah, long size) throws Exception {
- if (blah.exists())
- blah.delete();
- FileOutputStream fos = new FileOutputStream(blah);
- BufferedWriter awriter
- = new BufferedWriter(new OutputStreamWriter(fos, "8859_1"));
-
- for(int i=0; i<size; i++) {
- awriter.write("e");
+ private static void initTestFile(File f, long size) throws Exception {
+ try (BufferedWriter awriter = new BufferedWriter(
+ new OutputStreamWriter(new FileOutputStream(f), "8859_1")))
+ {
+ for(int i=0; i<size; i++) {
+ awriter.write("e");
+ }
}
- awriter.flush();
- awriter.close();
}
}
diff --git a/jdk/test/java/nio/file/Files/Misc.java b/jdk/test/java/nio/file/Files/Misc.java
index 6e704ee..191a4fa 100644
--- a/jdk/test/java/nio/file/Files/Misc.java
+++ b/jdk/test/java/nio/file/Files/Misc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -313,8 +313,14 @@
acl.add(0, entry);
view.setAcl(acl);
try {
- assertTrue(!isWritable(file));
- assertTrue(!isExecutable(file));
+ if (isRoot()) {
+ // root has all permissions
+ assertTrue(isWritable(file));
+ assertTrue(isExecutable(file));
+ } else {
+ assertTrue(!isWritable(file));
+ assertTrue(!isExecutable(file));
+ }
} finally {
// Restore ACL
acl.remove(0);
@@ -353,4 +359,12 @@
if (!okay)
throw new RuntimeException("Assertion Failed");
}
+
+ private static boolean isRoot() {
+ if (System.getProperty("os.name").startsWith("Windows"))
+ return false;
+
+ Path passwd = Paths.get("/etc/passwd");
+ return Files.isWritable(passwd);
+ }
}
diff --git a/jdk/test/java/rmi/testlibrary/RMID.java b/jdk/test/java/rmi/testlibrary/RMID.java
index f528b20..7688a1b 100644
--- a/jdk/test/java/rmi/testlibrary/RMID.java
+++ b/jdk/test/java/rmi/testlibrary/RMID.java
@@ -74,6 +74,10 @@
// +
// " -Djava.security.debug=all ";
+ // Set execTimeout to 60 sec (default is 30 sec)
+ // to avoid spurious timeouts on slow machines.
+ options += " -Dsun.rmi.activation.execTimeout=60000";
+
return options;
}
diff --git a/jdk/test/java/rmi/testlibrary/TestLibrary.java b/jdk/test/java/rmi/testlibrary/TestLibrary.java
index 10b84c6..87733be8 100644
--- a/jdk/test/java/rmi/testlibrary/TestLibrary.java
+++ b/jdk/test/java/rmi/testlibrary/TestLibrary.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -127,6 +127,33 @@
bomb(null, e);
}
+ /**
+ * Helper method to determine if registry has started
+ *
+ * @param port The port number to check
+ * @param msTimeout The amount of milliseconds to spend checking
+ */
+
+ public static boolean checkIfRegistryRunning(int port, int msTimeout) {
+ long stopTime = System.currentTimeMillis() + msTimeout;
+ do {
+ try {
+ Registry r = LocateRegistry.getRegistry(port);
+ String[] s = r.list();
+ // no exception. We're now happy that registry is running
+ return true;
+ } catch (RemoteException e) {
+ // problem - not ready ? Try again
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException ie) {
+ // not expected
+ }
+ }
+ } while (stopTime > System.currentTimeMillis());
+ return false;
+ }
+
public static String getProperty(String property, String defaultVal) {
final String prop = property;
final String def = defaultVal;
diff --git a/jdk/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java b/jdk/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java
index 2b1f1ee..2e990df 100644
--- a/jdk/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java
+++ b/jdk/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java
@@ -58,7 +58,7 @@
verifyPortInUse(PORT);
UnicastRemoteObject.unexportObject(registry, true);
System.err.println("- unexported registry");
- Thread.sleep(1); // work around BindException (bug?)
+ Thread.sleep(1000); // work around BindException (bug?)
verifyPortFree(PORT);
/*
diff --git a/jdk/test/java/text/Bidi/Bug6665028.java b/jdk/test/java/text/Bidi/Bug6665028.java
deleted file mode 100644
index ffd1044..0000000
--- a/jdk/test/java/text/Bidi/Bug6665028.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6665028
- * @summary verify that the memory corruption doesn't happen. Note
- * that this test case fails without the fix in some different ways,
- * including timeout, due to the memory corruption.
- * @build Bug6665028
- * @run main/othervm -Xmx16m Bug6665028 10
- */
-
-import java.awt.font.TextAttribute;
-import java.text.AttributedString;
-import java.text.Bidi;
-
-// test1() and test2() were derived from BidiEmbeddingTest.
-// Usage: java Bug6665028 [duration]
-public class Bug6665028 {
-
- private static boolean runrun = true;
-
- private static class Test extends Thread {
- public void run() {
- while (runrun) {
- test1();
- test2();
- }
- }
- }
-
- public static void main(String[] args) {
- int duration = 45;
- if (args.length == 1) {
- duration = Math.max(1, Math.min(Integer.parseInt(args[0]), 45));
- }
-
- Test[] tests = new Test[4];
- for (int i = 0; i < tests.length; i++) {
- Test t = new Test();
- tests[i] = t;
- t.start();
- }
-
- try {
- Thread.sleep(duration * 1000);
- } catch (InterruptedException e) {
- }
-
- runrun = false;
-
- for (int i = 0; i < tests.length; i++) {
- try {
- tests[i].join();
- } catch (InterruptedException e) {
- }
- }
- }
-
- static String target;
- static {
- String s = "A Bidi object provides information on the bidirectional reordering of the text used to create it. This is required, for example, to properly display Arabic or Hebrew text. ";
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < 1000; i++) {
- sb.append(s);
- }
- target = sb.toString();
- }
-
- static void test1() {
- String str = "If this text is >" + target + "< the test passed.";
- int start = str.indexOf(target);
- int limit = start + target.length();
-
- AttributedString astr = new AttributedString(str);
- astr.addAttribute(TextAttribute.BIDI_EMBEDDING,
- new Integer(-1),
- start,
- limit);
-
- Bidi bidi = new Bidi(astr.getIterator());
-
- byte[] embs = new byte[str.length() + 3];
- for (int i = start + 1; i < limit + 1; ++i) {
- embs[i] = -1;
- }
-
- Bidi bidi2 = new Bidi(str.toCharArray(), 0, embs, 1, str.length(), Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
- if (bidi.getRunCount() != 3 || bidi2.getRunCount() != 3) {
- throw new Error("Bidi run count incorrect");
- }
- }
-
- static void test2() {
- String str = "If this text is >" + target + "< the test passed.";
- int length = str.length();
- int start = str.indexOf(target);
- int limit = start + target.length();
-
- AttributedString astr = new AttributedString(str);
- astr.addAttribute(TextAttribute.RUN_DIRECTION, TextAttribute.RUN_DIRECTION_RTL);
-
- astr.addAttribute(TextAttribute.BIDI_EMBEDDING,
- new Integer(-3),
- start,
- limit);
-
- Bidi bidi = new Bidi(astr.getIterator());
-
- if (bidi.getRunCount() != 6) { // runs of spaces and angles at embedding bound,s and final period, each get level 1
- throw new Error("Bidi embedding processing failed");
- }
- }
-}
diff --git a/jdk/test/java/util/Locale/InternationalBAT.java b/jdk/test/java/util/Locale/InternationalBAT.java
index bb84a00..9533272 100644
--- a/jdk/test/java/util/Locale/InternationalBAT.java
+++ b/jdk/test/java/util/Locale/InternationalBAT.java
@@ -39,11 +39,13 @@
public static void main(String[] args) {
boolean pass = true;
- if (!testRequiredLocales()) {
- pass = false;
- }
- if (!testRequiredEncodings()) {
- pass = false;
+
+ TimeZone tz = TimeZone.getDefault();
+ try {
+ pass &= testRequiredLocales();
+ pass &= testRequiredEncodings();
+ } finally {
+ TimeZone.setDefault(tz);
}
if (!pass) {
diff --git a/jdk/test/java/util/Locale/LocaleProviders.java b/jdk/test/java/util/Locale/LocaleProviders.java
index 811e78f..59fd4f1 100644
--- a/jdk/test/java/util/Locale/LocaleProviders.java
+++ b/jdk/test/java/util/Locale/LocaleProviders.java
@@ -80,6 +80,12 @@
static void adapterTest(String expected, String lang, String ctry) {
Locale testLocale = new Locale(lang, ctry);
+ LocaleProviderAdapter ldaExpected =
+ LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.valueOf(expected));
+ if (!ldaExpected.getDateFormatProvider().isSupportedLocale(testLocale)) {
+ System.out.println("test locale: "+testLocale+" is not supported by the expected provider: "+ldaExpected+". Ignoring the test.");
+ return;
+ }
String preference = System.getProperty("java.locale.providers", "");
LocaleProviderAdapter lda = LocaleProviderAdapter.getAdapter(DateFormatProvider.class, testLocale);
LocaleProviderAdapter.Type type = lda.getAdapterType();
diff --git a/jdk/test/java/util/Locale/LocaleProviders.sh b/jdk/test/java/util/Locale/LocaleProviders.sh
index bf8b7af..db6e4a9 100644
--- a/jdk/test/java/util/Locale/LocaleProviders.sh
+++ b/jdk/test/java/util/Locale/LocaleProviders.sh
@@ -24,7 +24,7 @@
#
# @test
# @bug 6336885 7196799 7197573 7198834 8000245 8000615 8001440 8010666
-# 8013086 8013233 8013903 8015960
+# 8013086 8013233 8013903 8015960 8028771
# @summary tests for "java.locale.providers" system property
# @compile -XDignore.symbol.file LocaleProviders.java
# @run shell/timeout=600 LocaleProviders.sh
diff --git a/jdk/test/java/util/logging/CheckLockLocationTest.java b/jdk/test/java/util/logging/CheckLockLocationTest.java
index 956621a..5f3a3a8 100644
--- a/jdk/test/java/util/logging/CheckLockLocationTest.java
+++ b/jdk/test/java/util/logging/CheckLockLocationTest.java
@@ -33,7 +33,10 @@
import java.io.IOException;
import java.nio.file.AccessDeniedException;
import java.nio.file.FileSystemException;
+import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.attribute.UserPrincipal;
import java.util.logging.FileHandler;
public class CheckLockLocationTest {
@@ -169,14 +172,19 @@
nonWritableDir.deleteOnExit();
// make it non-writable
- if (nonWritableDir.setWritable(false)) {
+ Path path = nonWritableDir.toPath();
+ final boolean nonWritable = nonWritableDir.setWritable(false);
+ final boolean isWritable = Files.isWritable(path);
+ if (nonWritable && !isWritable) {
runNonWritableDirTest = true;
+ System.out.println("Created non writable dir for "
+ + getOwner(path) + " at: " + path.toString());
} else {
runNonWritableDirTest = false;
System.out.println( "Test Setup WARNING: unable to make"
+ " working directory " + nonWritableDir.getAbsolutePath()
- + " non-writable on platform " + System.getProperty("os.name"));
-
+ + "\n\t non-writable for " + getOwner(path)
+ + " on platform " + System.getProperty("os.name"));
}
// make sure non-existent directory really doesn't exist
@@ -184,9 +192,21 @@
if (nonExistentDir.exists()) {
nonExistentDir.delete();
}
+ System.out.println("Setup completed - writableDir is: " + writableDir.getPath());
return writableDir;
}
+ private static String getOwner(Path path) {
+ UserPrincipal user = null;
+ try {
+ user = Files.getOwner(path);
+ } catch (Exception x) {
+ System.err.println("Failed to get owner of: " + path);
+ System.err.println("\terror is: " + x);
+ }
+ return user == null ? "???" : user.getName();
+ }
+
/**
* @param newFile
* @return true if file already exists or creation succeeded
diff --git a/jdk/test/java/util/logging/XMLFormatterDate.java b/jdk/test/java/util/logging/XMLFormatterDate.java
new file mode 100644
index 0000000..28eb124
--- /dev/null
+++ b/jdk/test/java/util/logging/XMLFormatterDate.java
@@ -0,0 +1,102 @@
+
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.XMLFormatter;
+
+/**
+ * @test
+ * @bug 8028185
+ * @summary XMLFormatter.format emits incorrect year (year + 1900)
+ * @author dfuchs
+ */
+public class XMLFormatterDate {
+
+ /**
+ * Before the fix, JDK8 prints: {@code
+ * <record>
+ * <date>3913-11-18T17:35:40</date>
+ * <millis>1384792540403</millis>
+ * <sequence>0</sequence>
+ * <level>INFO</level>
+ * <thread>1</thread>
+ * <message>test</message>
+ * </record>
+ * }
+ * After the fix, it should print: {@code
+ * <record>
+ * <date>2013-11-18T17:35:40</date>
+ * <millis>1384792696519</millis>
+ * <sequence>0</sequence>
+ * <level>INFO</level>
+ * <thread>1</thread>
+ * <message>test</message>
+ * </record>
+ * }
+ * @param args the command line arguments
+ */
+ public static void main(String[] args) {
+ Locale locale = Locale.getDefault();
+ try {
+ Locale.setDefault(Locale.ENGLISH);
+
+ final GregorianCalendar cal1 = new GregorianCalendar();
+ final int year1 = cal1.get(Calendar.YEAR);
+
+ LogRecord record = new LogRecord(Level.INFO, "test");
+ XMLFormatter formatter = new XMLFormatter();
+ final String formatted = formatter.format(record);
+ System.out.println(formatted);
+
+ final GregorianCalendar cal2 = new GregorianCalendar();
+ final int year2 = cal2.get(Calendar.YEAR);
+ if (year2 < 1900) {
+ throw new Error("Invalid system year: " + year2);
+ }
+
+ StringBuilder buf2 = new StringBuilder()
+ .append("<date>").append(year2).append("-");
+ if (!formatted.contains(buf2.toString())) {
+ StringBuilder buf1 = new StringBuilder()
+ .append("<date>").append(year1).append("-");
+ if (formatted.contains(buf1)
+ && year2 == year1 + 1
+ && cal2.get(Calendar.MONTH) == Calendar.JANUARY
+ && cal2.get(Calendar.DAY_OF_MONTH) == 1) {
+ // Oh! The year just switched in the midst of the test...
+ System.out.println("Happy new year!");
+ } else {
+ throw new Error("Expected year " + year2
+ + " not found in log:\n" + formatted);
+ }
+ }
+ } finally {
+ Locale.setDefault(locale);
+ }
+ }
+
+}
diff --git a/jdk/test/javax/swing/JFrame/8016356/bug8016356.java b/jdk/test/javax/swing/JFrame/8016356/bug8016356.java
new file mode 100644
index 0000000..b5ee38e
--- /dev/null
+++ b/jdk/test/javax/swing/JFrame/8016356/bug8016356.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ @bug 8016356
+ @summary Any swing frame resizes ugly.
+ @run main bug8016356
+ @author Oleg Pekhovskiy
+*/
+
+import java.awt.AWTException;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.event.InputEvent;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import sun.awt.OSInfo;
+
+public class bug8016356 {
+ private static JFrame frame;
+ private static Color color;
+ private static int scrTop;
+
+ private static Point frLoc;
+ private static Dimension frSize;
+
+ public static void main(String[] args) throws Exception {
+
+ // Windows only test
+ if (OSInfo.getOSType() == OSInfo.OSType.WINDOWS) {
+
+ // Retrieving top edge of Desktop
+ GraphicsConfiguration grConf = GraphicsEnvironment
+ .getLocalGraphicsEnvironment().getDefaultScreenDevice()
+ .getDefaultConfiguration();
+ Rectangle scrRect = grConf.getBounds();
+ Insets scrInsets = Toolkit.getDefaultToolkit().getScreenInsets(grConf);
+ scrTop = scrRect.y + scrInsets.top;
+
+ color = new Color(0, 255, 0);
+
+ SwingUtilities.invokeAndWait(() -> {
+ createAndShowUI();
+ });
+
+ try {
+ Robot robot = new Robot();
+ robot.setAutoDelay(500);
+ robot.setAutoWaitForIdle(true);
+ robot.delay(1000);
+
+ // Resizing a window to invoke Windows Snap feature
+ readFrameInfo();
+ robot.mouseMove(frLoc.x + frSize.width / 2, frLoc.y);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseMove(frLoc.x + frSize.width / 2, scrTop);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+
+ // Retrieving the color of window expanded area
+ readFrameInfo();
+ Insets insets = frame.getInsets();
+ Color bgColor = robot.getPixelColor(frLoc.x + frSize.width / 2,
+ frLoc.y + frSize.height - insets.bottom - 1);
+
+ frame.dispose();
+
+ if (!bgColor.equals(color)) {
+ throw new RuntimeException("TEST FAILED: got "
+ + bgColor + " instead of " + color);
+ }
+ System.out.println("TEST PASSED!");
+ } catch (AWTException ex) {
+ throw new RuntimeException("TEST FAILED!");
+ }
+ }
+ }
+
+ private static void createAndShowUI() {
+ frame = new JFrame();
+ frame.setBounds(10, scrTop + 10, 300, 100);
+ JPanel panel = new JPanel();
+ panel.setBackground(color);
+ frame.getContentPane().add(panel);
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.setVisible(true);
+ }
+
+ private static void readFrameInfo() throws Exception {
+ SwingUtilities.invokeAndWait(() -> {
+ frLoc = frame.getLocationOnScreen();
+ frSize = frame.getSize();
+ });
+ }
+}
diff --git a/jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.html b/jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.html
new file mode 100644
index 0000000..d1356c3
--- /dev/null
+++ b/jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.html
@@ -0,0 +1,30 @@
+<!--
+ Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<html>
+<body>
+<applet code="bug7160604.class" width=400 height=100></applet>
+Click on the top-bar and combo-box more than once.
+Make sure popup menu and drop-down list have a border and their items are drawn properly.
+</body>
+</html>
diff --git a/jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.java b/jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.java
new file mode 100644
index 0000000..dfbff70
--- /dev/null
+++ b/jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ @bug 7160604
+ @summary Using non-opaque windows - popups are initially not painted correctly
+ @author Oleg Pekhovskiy
+ @run applet/manual=yesno bug7160604.html
+*/
+
+import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
+import javax.swing.JApplet;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JWindow;
+import javax.swing.SwingUtilities;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class bug7160604 extends JApplet {
+
+ public void init() {
+ SwingUtilities.invokeLater(() -> {
+ final JWindow window = new JWindow();
+ window.setLocation(200, 200);
+ window.setSize(300, 300);
+
+ final JLabel label = new JLabel("...click to invoke JPopupMenu");
+ label.setOpaque(true);
+ final JPanel contentPane = new JPanel(new BorderLayout());
+ contentPane.setBorder(BorderFactory.createLineBorder(Color.RED));
+ window.setContentPane(contentPane);
+ contentPane.add(label, BorderLayout.NORTH);
+
+ final JComboBox comboBox = new JComboBox(new Object[]{"1", "2", "3", "4"});
+ contentPane.add(comboBox, BorderLayout.SOUTH);
+
+ final JPopupMenu jPopupMenu = new JPopupMenu();
+
+ jPopupMenu.add("string");
+ jPopupMenu.add(new AbstractAction("action") {
+ @Override
+ public void actionPerformed(final ActionEvent e) {
+ }
+ });
+ jPopupMenu.add(new JLabel("label"));
+ jPopupMenu.add(new JMenuItem("MenuItem"));
+ label.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseReleased(final MouseEvent e) {
+ jPopupMenu.show(label, 0, 0);
+ }
+ });
+
+ window.setBackground(new Color(0, 0, 0, 0));
+
+ window.setVisible(true);
+ });
+ }
+}
diff --git a/jdk/test/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java b/jdk/test/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java
index e090875..fdd7e11 100644
--- a/jdk/test/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java
+++ b/jdk/test/javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java
@@ -22,7 +22,7 @@
*/
/* @test
- @bug 8001633
+ @bug 8001633 8028271
@summary Wrong alt processing during switching between windows
@author mikhail.cherkasov@oracle.com
@run main WrongAltProcessing
@@ -44,16 +44,27 @@
private static JTextField mainFrameTf2;
private static JTextField secondFrameTf;
- public static void main(String[] args) throws AWTException {
+ public static void main(String[] args) throws Exception {
try {
UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
} catch (Exception e) {
return;// miss unsupported platforms.
}
- createWindows();
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ createWindows();
+ }
+ });
+ sync();
initRobot();
runScript();
- verify();
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ verify();
+ }
+ });
}
private static void verify() {
@@ -76,7 +87,7 @@
private static void clickWindowsTitle(JFrame frame) {
Point point = frame.getLocationOnScreen();
- robot.mouseMove(point.x + (frame.getWidth() / 2), point.y + 5);
+ robot.mouseMove(point.x + (frame.getWidth() / 2), point.y + frame.getInsets().top / 2);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
}
@@ -112,6 +123,7 @@
public static void createWindows() {
firstFrame = new JFrame("Frame");
firstFrame.setLayout(new FlowLayout());
+ firstFrame.setPreferredSize(new Dimension(600,100));
JMenuBar bar = new JMenuBar();
JMenu menu = new JMenu("File");
@@ -146,24 +158,16 @@
firstFrame.pack();
secondFrame = new JFrame("Frame 2");
+ secondFrame.setPreferredSize(new Dimension(600,100));
secondFrame.setLocation(0, 150);
secondFrameTf = new JTextField(20);
secondFrame.add(secondFrameTf);
secondFrame.pack();
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- secondFrame.setVisible(true);
- }
- });
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- firstFrame.setVisible(true);
- }
- });
+
+ secondFrame.setVisible(true);
+
+ firstFrame.setVisible(true);
mainFrameTf1.requestFocus();
- sync();
}
}
diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/SecureProcessingTest.xml b/jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml
similarity index 100%
rename from jdk/test/javax/xml/jaxp/transform/jdk8004476/SecureProcessingTest.xml
rename to jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml
diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/TestBase.java b/jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java
similarity index 100%
rename from jdk/test/javax/xml/jaxp/transform/jdk8004476/TestBase.java
rename to jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java
diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/XPathExFuncTest.java b/jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java
similarity index 100%
rename from jdk/test/javax/xml/jaxp/transform/jdk8004476/XPathExFuncTest.java
rename to jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java
diff --git a/jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java b/jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java
new file mode 100644
index 0000000..b86bcff
--- /dev/null
+++ b/jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/**
+ * @test
+ * @bug 8004476
+ * @summary test XSLT extension functions
+ * @run main/othervm XSLTExFuncTest
+ */
+
+import java.io.StringWriter;
+import java.security.AllPermission;
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.Policy;
+import java.security.ProtectionDomain;
+import javax.xml.transform.*;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamResult;
+import org.xml.sax.InputSource;
+
+/**
+ * test XSLT extension functions
+ *
+ * @author huizhe.wang@oracle.com
+ */
+public class XSLTExFuncTest extends TestBase {
+
+ final static String ENABLE_EXTENSION_FUNCTIONS = "http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions";
+ final static String CLASSNAME = "DocumentBuilderFactoryImpl";
+
+ /**
+ * Creates a new instance of StreamReader
+ */
+ public XSLTExFuncTest(String name) {
+ super(name);
+ }
+ boolean hasSM;
+ String xslFile, xslFileId;
+ String xmlFile, xmlFileId;
+
+ protected void setUp() {
+ super.setUp();
+ xmlFile = filepath + "/tokenize.xml";
+ xslFile = filepath + "/tokenize.xsl";
+
+ /**
+ * On Windows platform it needs triple '/' for valid URL while double '/' is enough on Linux or Solaris.
+ * Here use file:/// directly to make it work on Windows and it will not impact other platforms.
+ */
+ xslFileId = "file:///" + xslFile;
+ }
+
+ /**
+ * @param args the command line arguments
+ */
+ public static void main(String[] args) {
+ XSLTExFuncTest test = new XSLTExFuncTest("OneTest");
+ test.setUp();
+
+ test.testExtFunc();
+ test.testExtFuncNotAllowed();
+ test.testEnableExtFunc();
+ test.testTemplatesEnableExtFunc();
+ test.tearDown();
+
+ }
+
+ /**
+ * by default, extension function is enabled
+ */
+ public void testExtFunc() {
+ TransformerFactory factory = TransformerFactory.newInstance();
+
+ try {
+ transform(factory);
+ System.out.println("testExtFunc: OK");
+ } catch (TransformerConfigurationException e) {
+ fail(e.getMessage());
+ } catch (TransformerException ex) {
+ fail(ex.getMessage());
+ }
+ }
+
+ /**
+ * Security is enabled, extension function not allowed
+ */
+ public void testExtFuncNotAllowed() {
+ Policy p = new SimplePolicy(new AllPermission());
+ Policy.setPolicy(p);
+ System.setSecurityManager(new SecurityManager());
+ TransformerFactory factory = TransformerFactory.newInstance();
+
+ try {
+ transform(factory);
+ } catch (TransformerConfigurationException e) {
+ fail(e.getMessage());
+ } catch (TransformerException ex) {
+ //expected since extension function is disallowed
+ System.out.println("testExtFuncNotAllowed: OK");
+ } finally {
+ System.setSecurityManager(null);
+ }
+ }
+
+ /**
+ * Security is enabled, use new feature: enableExtensionFunctions
+ */
+ public void testEnableExtFunc() {
+ Policy p = new SimplePolicy(new AllPermission());
+ Policy.setPolicy(p);
+ System.setSecurityManager(new SecurityManager());
+ TransformerFactory factory = TransformerFactory.newInstance();
+
+ /**
+ * Use of the extension function 'http://exslt.org/strings:tokenize' is
+ * not allowed when the secure processing feature is set to true.
+ * Attempt to use the new property to enable extension function
+ */
+ boolean isExtensionSupported = enableExtensionFunction(factory);
+
+ try {
+ transform(factory);
+ System.out.println("testEnableExt: OK");
+ } catch (TransformerConfigurationException e) {
+ fail(e.getMessage());
+ } catch (TransformerException e) {
+ fail(e.getMessage());
+ } finally {
+ System.setSecurityManager(null);
+ }
+ }
+
+ /**
+ * use Templates template = factory.newTemplates(new StreamSource( new
+ * FileInputStream(xslFilename))); // Use the template to create a
+ * transformer Transformer xformer = template.newTransformer();
+ *
+ * @param factory
+ * @return
+ */
+ /**
+ * Security is enabled, use new feature: enableExtensionFunctions Use the
+ * template to create a transformer
+ */
+ public void testTemplatesEnableExtFunc() {
+ Policy p = new SimplePolicy(new AllPermission());
+ Policy.setPolicy(p);
+ System.setSecurityManager(new SecurityManager());
+ TransformerFactory factory = TransformerFactory.newInstance();
+
+ /**
+ * Use of the extension function 'http://exslt.org/strings:tokenize' is
+ * not allowed when the secure processing feature is set to true.
+ * Attempt to use the new property to enable extension function
+ */
+ boolean isExtensionSupported = enableExtensionFunction(factory);
+
+ try {
+ SAXSource xslSource = new SAXSource(new InputSource(xslFile));
+ xslSource.setSystemId(xslFileId);
+ Templates template = factory.newTemplates(xslSource);
+ Transformer transformer = template.newTransformer();
+ StringWriter stringResult = new StringWriter();
+ Result result = new StreamResult(stringResult);
+ transformer.transform(new SAXSource(new InputSource(xmlFile)), result);
+ System.out.println("testTemplatesEnableExtFunc: OK");
+ } catch (TransformerConfigurationException e) {
+ fail(e.getMessage());
+ } catch (TransformerException e) {
+ fail(e.getMessage());
+ } finally {
+ System.setSecurityManager(null);
+ }
+ }
+
+ boolean enableExtensionFunction(TransformerFactory factory) {
+ boolean isSupported = true;
+ try {
+ factory.setFeature(ENABLE_EXTENSION_FUNCTIONS, true);
+ } catch (TransformerConfigurationException ex) {
+ isSupported = false;
+ }
+ return isSupported;
+ }
+
+ void transform(TransformerFactory factory) throws TransformerConfigurationException, TransformerException {
+ SAXSource xslSource = new SAXSource(new InputSource(xslFile));
+ xslSource.setSystemId(xslFileId);
+ Transformer transformer = factory.newTransformer(xslSource);
+ StringWriter stringResult = new StringWriter();
+ Result result = new StreamResult(stringResult);
+ transformer.transform(new SAXSource(new InputSource(xmlFile)), result);
+ }
+
+ class SimplePolicy extends Policy {
+
+ private final Permissions perms;
+
+ public SimplePolicy(Permission... permissions) {
+ perms = new Permissions();
+ for (Permission permission : permissions) {
+ perms.add(permission);
+ }
+ }
+
+ @Override
+ public PermissionCollection getPermissions(CodeSource cs) {
+ return perms;
+ }
+
+ @Override
+ public PermissionCollection getPermissions(ProtectionDomain pd) {
+ return perms;
+ }
+
+ @Override
+ public boolean implies(ProtectionDomain pd, Permission p) {
+ return perms.implies(p);
+ }
+
+ //for older jdk
+ @Override
+ public void refresh() {
+ }
+ }
+}
diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/tokenize.xml b/jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml
similarity index 100%
rename from jdk/test/javax/xml/jaxp/transform/jdk8004476/tokenize.xml
rename to jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml
diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/tokenize.xsl b/jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl
similarity index 100%
rename from jdk/test/javax/xml/jaxp/transform/jdk8004476/tokenize.xsl
rename to jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl
diff --git a/jdk/test/javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java b/jdk/test/javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java
deleted file mode 100644
index 3565ba7..0000000
--- a/jdk/test/javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-/**
- * @test
- * @bug 8004476
- * @summary test XSLT extension functions
- * @run main/othervm XSLTExFuncTest
- */
-
-import java.io.StringWriter;
-import java.security.AllPermission;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.ProtectionDomain;
-import javax.xml.transform.*;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
-import org.xml.sax.InputSource;
-
-/**
- * test XSLT extension functions
- *
- * @author huizhe.wang@oracle.com
- */
-public class XSLTExFuncTest extends TestBase {
-
- final static String ENABLE_EXTENSION_FUNCTIONS = "http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions";
- final static String CLASSNAME = "DocumentBuilderFactoryImpl";
-
- /**
- * Creates a new instance of StreamReader
- */
- public XSLTExFuncTest(String name) {
- super(name);
- }
- boolean hasSM;
- String xslFile, xslFileId;
- String xmlFile, xmlFileId;
-
- protected void setUp() {
- super.setUp();
- xmlFile = filepath + "/tokenize.xml";
- xslFile = filepath + "/tokenize.xsl";
-
- /**
- * if (isWindows) { xslFile = "/" + xslFile; }
- *
- */
- xslFileId = "file://" + xslFile;
- }
-
- /**
- * @param args the command line arguments
- */
- public static void main(String[] args) {
- XSLTExFuncTest test = new XSLTExFuncTest("OneTest");
- test.setUp();
-
- test.testExtFunc();
- test.testExtFuncNotAllowed();
- test.testEnableExtFunc();
- test.testTemplatesEnableExtFunc();
- test.tearDown();
-
- }
-
- /**
- * by default, extension function is enabled
- */
- public void testExtFunc() {
- TransformerFactory factory = TransformerFactory.newInstance();
-
- try {
- transform(factory);
- System.out.println("testExtFunc: OK");
- } catch (TransformerConfigurationException e) {
- fail(e.getMessage());
- } catch (TransformerException ex) {
- fail(ex.getMessage());
- }
- }
-
- /**
- * Security is enabled, extension function not allowed
- */
- public void testExtFuncNotAllowed() {
- Policy p = new SimplePolicy(new AllPermission());
- Policy.setPolicy(p);
- System.setSecurityManager(new SecurityManager());
- TransformerFactory factory = TransformerFactory.newInstance();
-
- try {
- transform(factory);
- } catch (TransformerConfigurationException e) {
- fail(e.getMessage());
- } catch (TransformerException ex) {
- //expected since extension function is disallowed
- System.out.println("testExtFuncNotAllowed: OK");
- } finally {
- System.setSecurityManager(null);
- }
- }
-
- /**
- * Security is enabled, use new feature: enableExtensionFunctions
- */
- public void testEnableExtFunc() {
- Policy p = new SimplePolicy(new AllPermission());
- Policy.setPolicy(p);
- System.setSecurityManager(new SecurityManager());
- TransformerFactory factory = TransformerFactory.newInstance();
-
- /**
- * Use of the extension function 'http://exslt.org/strings:tokenize' is
- * not allowed when the secure processing feature is set to true.
- * Attempt to use the new property to enable extension function
- */
- boolean isExtensionSupported = enableExtensionFunction(factory);
-
- try {
- transform(factory);
- System.out.println("testEnableExt: OK");
- } catch (TransformerConfigurationException e) {
- fail(e.getMessage());
- } catch (TransformerException e) {
- fail(e.getMessage());
- } finally {
- System.setSecurityManager(null);
- }
- }
-
- /**
- * use Templates template = factory.newTemplates(new StreamSource( new
- * FileInputStream(xslFilename))); // Use the template to create a
- * transformer Transformer xformer = template.newTransformer();
- *
- * @param factory
- * @return
- */
- /**
- * Security is enabled, use new feature: enableExtensionFunctions Use the
- * template to create a transformer
- */
- public void testTemplatesEnableExtFunc() {
- Policy p = new SimplePolicy(new AllPermission());
- Policy.setPolicy(p);
- System.setSecurityManager(new SecurityManager());
- TransformerFactory factory = TransformerFactory.newInstance();
-
- /**
- * Use of the extension function 'http://exslt.org/strings:tokenize' is
- * not allowed when the secure processing feature is set to true.
- * Attempt to use the new property to enable extension function
- */
- boolean isExtensionSupported = enableExtensionFunction(factory);
-
- try {
- SAXSource xslSource = new SAXSource(new InputSource(xslFile));
- xslSource.setSystemId(xslFileId);
- Templates template = factory.newTemplates(xslSource);
- Transformer transformer = template.newTransformer();
- StringWriter stringResult = new StringWriter();
- Result result = new StreamResult(stringResult);
- transformer.transform(new SAXSource(new InputSource(xmlFile)), result);
- System.out.println("testTemplatesEnableExtFunc: OK");
- } catch (TransformerConfigurationException e) {
- fail(e.getMessage());
- } catch (TransformerException e) {
- fail(e.getMessage());
- } finally {
- System.setSecurityManager(null);
- }
- }
-
- boolean enableExtensionFunction(TransformerFactory factory) {
- boolean isSupported = true;
- try {
- factory.setFeature(ENABLE_EXTENSION_FUNCTIONS, true);
- } catch (TransformerConfigurationException ex) {
- isSupported = false;
- }
- return isSupported;
- }
-
- void transform(TransformerFactory factory) throws TransformerConfigurationException, TransformerException {
- SAXSource xslSource = new SAXSource(new InputSource(xslFile));
- xslSource.setSystemId(xslFileId);
- Transformer transformer = factory.newTransformer(xslSource);
- StringWriter stringResult = new StringWriter();
- Result result = new StreamResult(stringResult);
- transformer.transform(new SAXSource(new InputSource(xmlFile)), result);
- }
-
- class SimplePolicy extends Policy {
-
- private final Permissions perms;
-
- public SimplePolicy(Permission... permissions) {
- perms = new Permissions();
- for (Permission permission : permissions) {
- perms.add(permission);
- }
- }
-
- @Override
- public PermissionCollection getPermissions(CodeSource cs) {
- return perms;
- }
-
- @Override
- public PermissionCollection getPermissions(ProtectionDomain pd) {
- return perms;
- }
-
- @Override
- public boolean implies(ProtectionDomain pd, Permission p) {
- return perms.implies(p);
- }
-
- //for older jdk
- @Override
- public void refresh() {
- }
- }
-}
diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/FileUtils.java b/jdk/test/lib/testlibrary/jdk/testlibrary/FileUtils.java
index 161e222..7882262 100644
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/FileUtils.java
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/FileUtils.java
@@ -68,6 +68,31 @@
}
}
+ /**
+ * Deletes a file, retrying if necessary.
+ * No exception thrown if file doesn't exist.
+ *
+ * @param path the file to delete
+ *
+ * @throws NoSuchFileException
+ * if the file does not exist (optional specific exception)
+ * @throws DirectoryNotEmptyException
+ * if the file is a directory and could not otherwise be deleted
+ * because the directory is not empty (optional specific exception)
+ * @throws IOException
+ * if an I/O error occurs
+ */
+ public static void deleteFileIfExistsWithRetry(Path path)
+ throws IOException
+ {
+ try {
+ if(Files.exists(path))
+ deleteFileWithRetry0(path);
+ } catch (InterruptedException x) {
+ throw new IOException("Interrupted while deleting.", x);
+ }
+ }
+
private static void deleteFileWithRetry0(Path path)
throws IOException, InterruptedException
{
diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java
index 6ed9f30..9f96baa 100644
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java
@@ -32,6 +32,7 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.Phaser;
@@ -131,6 +132,10 @@
phs.awaitAdvanceInterruptibly(0, timeout, unit);
}
} catch (TimeoutException | InterruptedException e) {
+ System.err.println("Failed to start a process (thread dump follows)");
+ for(Map.Entry<Thread, StackTraceElement[]> s : Thread.getAllStackTraces().entrySet()) {
+ printStack(s.getKey(), s.getValue());
+ }
stdoutTask.cancel(true);
stderrTask.cancel(true);
throw e;
@@ -250,4 +255,15 @@
return new ProcessBuilder(args.toArray(new String[args.size()]));
}
+ private static void printStack(Thread t, StackTraceElement[] stack) {
+ System.out.println("\t" + t +
+ " stack: (length = " + stack.length + ")");
+ if (t != null) {
+ for (StackTraceElement stack1 : stack) {
+ System.out.println("\t" + stack1);
+ }
+ System.out.println();
+ }
+ }
+
}
diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
index f8da7cf..387c0e3 100644
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java
@@ -31,6 +31,8 @@
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Arrays;
+import java.util.Collections;
/**
* Common library for various test helper functions.
@@ -45,7 +47,12 @@
/**
* Returns the value of 'test.vm.opts'system property.
*/
- public static final String VM_OPTIONS = System.getProperty("test.vm.opts", "");
+ public static final String VM_OPTIONS = System.getProperty("test.vm.opts", "").trim();
+
+ /**
+ * Returns the value of 'test.java.opts'system property.
+ */
+ public static final String JAVA_OPTIONS = System.getProperty("test.java.opts", "").trim();
private Utils() {
@@ -58,7 +65,7 @@
* @return List of VM options
*/
public static List<String> getVmOptions() {
- return getVmOptions(false);
+ return Arrays.asList(safeSplitString(VM_OPTIONS));
}
/**
@@ -67,24 +74,58 @@
* @return The list of VM options with -J prefix
*/
public static List<String> getForwardVmOptions() {
- return getVmOptions(true);
+ String[] opts = safeSplitString(VM_OPTIONS);
+ for (int i = 0; i < opts.length; i++) {
+ opts[i] = "-J" + opts[i];
+ }
+ return Arrays.asList(opts);
}
- private static List<String> getVmOptions(boolean forward) {
- List<String> optionsList = new ArrayList<>();
- String options = VM_OPTIONS.trim();
- if (!options.isEmpty()) {
- options = options.replaceAll("\\s+", " ");
- for (String option : options.split(" ")) {
- if (forward) {
- optionsList.add("-J" + option);
- } else {
- optionsList.add(option);
- }
- }
- }
+ /**
+ * Returns the default JTReg arguments for a jvm running a test.
+ * This is the combination of JTReg arguments test.vm.opts and test.java.opts.
+ * @return An array of options, or an empty array if no opptions.
+ */
+ public static String[] getTestJavaOpts() {
+ List<String> opts = new ArrayList<String>();
+ Collections.addAll(opts, safeSplitString(VM_OPTIONS));
+ Collections.addAll(opts, safeSplitString(JAVA_OPTIONS));
+ return opts.toArray(new String[0]);
+ }
- return optionsList;
+ /**
+ * Combines given arguments with default JTReg arguments for a jvm running a test.
+ * This is the combination of JTReg arguments test.vm.opts and test.java.opts
+ * @return The combination of JTReg test java options and user args.
+ */
+ public static String[] addTestJavaOpts(String... userArgs) {
+ List<String> opts = new ArrayList<String>();
+ Collections.addAll(opts, getTestJavaOpts());
+ Collections.addAll(opts, userArgs);
+ return opts.toArray(new String[0]);
+ }
+
+ /**
+ * Splits a string by white space.
+ * Works like String.split(), but returns an empty array
+ * if the string is null or empty.
+ */
+ private static String[] safeSplitString(String s) {
+ if (s == null || s.trim().isEmpty()) {
+ return new String[] {};
+ }
+ return s.trim().split("\\s+");
+ }
+
+ /**
+ * @return The full command line for the ProcessBuilder.
+ */
+ public static String getCommandLine(ProcessBuilder pb) {
+ StringBuilder cmd = new StringBuilder();
+ for (String s : pb.command()) {
+ cmd.append(s).append(" ");
+ }
+ return cmd.toString();
}
/**
diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java b/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java
index 325ddc6..c485905 100644
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @summary Basic unit test of HotspotClassLoadingMBean.getClassLoadingTime()
* @author Steve Bohne
* @build ClassToLoad0
- * @run main GetClassLoadingTime
+ * @run main/othervm -XX:+UsePerfData GetClassLoadingTime
*/
/*
diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java b/jdk/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java
index 454d2b6..a2d12a4 100644
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @bug 4858522
* @summary Basic unit test of HotspotClassLoadingMBean.getInitializedClassCount()
* @author Steve Bohne
+ * @run main/othervm -XX:+UsePerfData GetInitializedClassCount
*/
/*
diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java b/jdk/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java
index edb04d8..6e29430 100644
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @bug 4858522
* @summary Basic unit test of HotspotClassLoadingMBean.getLoadedClassSize()
* @author Steve Bohne
+ * @run main/othervm -XX:+UsePerfData GetLoadedClassSize
*/
/*
diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java b/jdk/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java
index e84fc05..234b484 100644
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @bug 4858522
* @summary Basic unit test of HotspotClassLoadingMBean.getMethodDataSize()
* @author Steve Bohne
+ * @run main/othervm -XX:+UsePerfData GetMethodDataSize
*/
/*
diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java b/jdk/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java
index 4e9b8c8..87d1dc7 100644
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @bug 4858522
* @summary Basic unit test of HotspotClassLoadingMBean.getUnloadedClassSize()
* @author Steve Bohne
+ * @run main/othervm -XX:+UsePerfData GetUnloadedClassSize
*/
/*
diff --git a/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java b/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java
index f2623fb..7ddf3e7 100644
--- a/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java
+++ b/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
* @bug 4858522
* @summary Basic unit test of HotspotClassLoadingMBean.getSafepointCount()
* @author Steve Bohne
+ * @run main/othervm -XX:+UsePerfData GetSafepointCount
*/
/*
diff --git a/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java b/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java
index 16ec619..bd37193 100644
--- a/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java
+++ b/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java
@@ -45,12 +45,9 @@
private static final long MIN_VALUE_FOR_PASS = 1;
private static final long MAX_VALUE_FOR_PASS = Long.MAX_VALUE;
- private static boolean trace = false;
-
public static void main(String args[]) throws Exception {
- if (args.length > 0 && args[0].equals("trace")) {
- trace = true;
- }
+ long count = mbean.getSafepointCount();
+ long value = mbean.getSafepointSyncTime();
// Thread.getAllStackTraces() should cause safepoints.
// If this test is failing because it doesn't,
@@ -59,15 +56,15 @@
Thread.getAllStackTraces();
}
- long value = mbean.getSafepointSyncTime();
+ long count1 = mbean.getSafepointCount();
+ long value1 = mbean.getSafepointSyncTime();
- if (trace) {
- System.out.println("Safepoint sync time (ms): " + value);
- }
+ System.out.format("Safepoint count=%d (diff=%d), sync time=%d ms (diff=%d)%n",
+ count1, count1-count, value1, value1-value);
- if (value < MIN_VALUE_FOR_PASS || value > MAX_VALUE_FOR_PASS) {
+ if (value1 < MIN_VALUE_FOR_PASS || value1 > MAX_VALUE_FOR_PASS) {
throw new RuntimeException("Safepoint sync time " +
- "illegal value: " + value + " ms " +
+ "illegal value: " + value1 + " ms " +
"(MIN = " + MIN_VALUE_FOR_PASS + "; " +
"MAX = " + MAX_VALUE_FOR_PASS + ")");
}
@@ -76,16 +73,16 @@
Thread.getAllStackTraces();
}
+ long count2 = mbean.getSafepointCount();
long value2 = mbean.getSafepointSyncTime();
- if (trace) {
- System.out.println("Safepoint sync time2 (ms): " + value2);
- }
+ System.out.format("Safepoint count=%d (diff=%d), sync time=%d ms (diff=%d)%n",
+ count2, count2-count1, value2, value2-value1);
- if (value2 <= value) {
+ if (value2 <= value1) {
throw new RuntimeException("Safepoint sync time " +
"did not increase " +
- "(value = " + value + "; " +
+ "(value1 = " + value1 + "; " +
"value2 = " + value2 + ")");
}
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java
index 3d2036d..d1f9633 100644
--- a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java
+++ b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java
@@ -25,7 +25,11 @@
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Files;
+import java.nio.file.LinkOption;
import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.HashSet;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
@@ -35,12 +39,13 @@
* @test
* @bug 6434402 8004926
* @library /lib/testlibrary
+ * @build jdk.testlibrary.ProcessTools
* @build TestManager TestApplication CustomLauncherTest
- * @run main CustomLauncherTest
+ * @run main/othervm CustomLauncherTest
* @author Jaroslav Bachorik
*/
public class CustomLauncherTest {
- private static final String TEST_CLASSES = System.getProperty("test.classes");
+ private static final String TEST_CLASSPATH = System.getProperty("test.class.path");
private static final String TEST_JDK = System.getProperty("test.jdk");
private static final String TEST_SRC = System.getProperty("test.src");
@@ -67,6 +72,9 @@
ARCH = "amd64";
break;
}
+ case "sparc":
+ ARCH = "sparcv9";
+ break;
default: {
ARCH = osarch;
}
@@ -75,7 +83,7 @@
}
public static void main(String[] args) throws Exception {
- if (TEST_CLASSES == null || TEST_CLASSES.isEmpty()) {
+ if (TEST_CLASSPATH == null || TEST_CLASSPATH.isEmpty()) {
System.out.println("Test is designed to be run from jtreg only");
return;
}
@@ -101,7 +109,10 @@
File.separator + "launcher";
final FileSystem FS = FileSystems.getDefault();
- final boolean hasLauncher = Files.isExecutable(FS.getPath(LAUNCHER));
+ Path launcherPath = FS.getPath(LAUNCHER);
+
+ final boolean hasLauncher = Files.isRegularFile(launcherPath, LinkOption.NOFOLLOW_LINKS)&&
+ Files.isReadable(launcherPath);
if (!hasLauncher) {
System.out.println("Launcher [" + LAUNCHER + "] does not exist. Skipping the test.");
return;
@@ -114,13 +125,23 @@
Process serverPrc = null, clientPrc = null;
+ final Set<PosixFilePermission> launcherOrigPerms =
+ Files.getPosixFilePermissions(launcherPath, LinkOption.NOFOLLOW_LINKS);
try {
+ // It is impossible to store an executable file in the source control
+ // We need to set the executable flag here
+ if (!Files.isExecutable(launcherPath)) {
+ Set<PosixFilePermission> perms = new HashSet<>(launcherOrigPerms);
+ perms.add(PosixFilePermission.OWNER_EXECUTE);
+ Files.setPosixFilePermissions(launcherPath, perms);
+ }
+
System.out.println("Starting custom launcher:");
System.out.println("=========================");
System.out.println(" launcher : " + LAUNCHER);
System.out.println(" libjvm : " + libjvmPath.toString());
- System.out.println(" classpath : " + TEST_CLASSES);
- ProcessBuilder server = new ProcessBuilder(LAUNCHER, libjvmPath.toString(), TEST_CLASSES, "TestApplication");
+ System.out.println(" classpath : " + TEST_CLASSPATH);
+ ProcessBuilder server = new ProcessBuilder(LAUNCHER, libjvmPath.toString(), TEST_CLASSPATH, "TestApplication");
final AtomicReference<String> port = new AtomicReference<>();
final AtomicReference<String> pid = new AtomicReference<>();
@@ -149,7 +170,7 @@
ProcessBuilder client = ProcessTools.createJavaProcessBuilder(
"-cp",
- TEST_CLASSES +
+ TEST_CLASSPATH +
File.pathSeparator +
TEST_JDK +
File.separator +
@@ -177,6 +198,8 @@
throw new Error("Test failed");
}
} finally {
+ // Let's restore the original launcher permissions
+ Files.setPosixFilePermissions(launcherPath, launcherOrigPerms);
if (clientPrc != null) {
clientPrc.destroy();
clientPrc.waitFor();
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java b/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java
index dc3b5de..efe2a31 100644
--- a/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java
+++ b/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java
@@ -41,14 +41,15 @@
* without connection or username/password details.
* TestManager will attempt a connection to the address obtained from
* both agent properties and jvmstat buffer.
+ * @build jdk.testlibrary.ProcessTools
* @build TestManager TestApplication
- * @run main/timeout=300 LocalManagementTest
+ * @run main/othervm/timeout=300 LocalManagementTest
*/
import jdk.testlibrary.ProcessTools;
public class LocalManagementTest {
- private static final String TEST_CLASSES = System.getProperty("test.classes");
+ private static final String TEST_CLASSPATH = System.getProperty("test.class.path");
private static final String TEST_JDK = System.getProperty("test.jdk");
public static void main(String[] args) throws Exception {
@@ -77,14 +78,14 @@
}
private static boolean test1() throws Exception {
- return doTest("-Dcom.sun.management.jmxremote");
+ return doTest("1", "-Dcom.sun.management.jmxremote");
}
private static boolean test2() throws Exception {
Path agentPath = findAgent();
if (agentPath != null) {
String agent = agentPath.toString();
- return doTest("-javaagent:" + agent);
+ return doTest("2", "-javaagent:" + agent);
} else {
return false;
}
@@ -94,7 +95,7 @@
* no args (blank) - manager should attach and start agent
*/
private static boolean test3() throws Exception {
- return doTest(null);
+ return doTest("3", null);
}
/**
@@ -109,7 +110,7 @@
"com.sun.management.jmxremote.authenticate=false," +
"com.sun.management.jmxremote.ssl=false",
"-cp",
- TEST_CLASSES,
+ TEST_CLASSPATH,
"TestApplication",
"-exit"
);
@@ -136,7 +137,7 @@
* use DNS-only name service
*/
private static boolean test5() throws Exception {
- return doTest("-Dsun.net.spi.namservice.provider.1=\"dns,sun\"");
+ return doTest("5", "-Dsun.net.spi.namservice.provider.1=\"dns,sun\"");
}
private static Path findAgent() {
@@ -160,10 +161,10 @@
return Files.isRegularFile(path) && Files.isReadable(path);
}
- private static boolean doTest(String arg) throws Exception {
+ private static boolean doTest(String testId, String arg) throws Exception {
List<String> args = new ArrayList<>();
args.add("-cp");
- args.add(TEST_CLASSES);
+ args.add(TEST_CLASSPATH);
if (arg != null) {
args.add(arg);
@@ -179,7 +180,7 @@
final AtomicReference<String> pid = new AtomicReference<>();
serverPrc = ProcessTools.startProcess(
- "TestApplication",
+ "TestApplication(" + testId + ")",
server,
(String line) -> {
if (line.startsWith("port:")) {
@@ -202,7 +203,7 @@
ProcessBuilder client = ProcessTools.createJavaProcessBuilder(
"-cp",
- TEST_CLASSES +
+ TEST_CLASSPATH +
File.pathSeparator +
TEST_JDK +
File.separator +
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher b/jdk/test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher
new file mode 100644
index 0000000..ac766de
--- /dev/null
+++ b/jdk/test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher
Binary files differ
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher b/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
deleted file mode 100644
index d68fb14..0000000
--- a/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
+++ /dev/null
Binary files differ
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher b/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher
deleted file mode 100644
index c8d0417..0000000
--- a/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher
+++ /dev/null
Binary files differ
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher b/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher
new file mode 100644
index 0000000..8ac4061
--- /dev/null
+++ b/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher
Binary files differ
diff --git a/jdk/test/sun/security/krb5/runNameEquals.sh b/jdk/test/sun/security/krb5/runNameEquals.sh
index b9cfb08..7ee81e5 100644
--- a/jdk/test/sun/security/krb5/runNameEquals.sh
+++ b/jdk/test/sun/security/krb5/runNameEquals.sh
@@ -57,10 +57,10 @@
FILESEP="/"
NATIVE=true
# Not all *nix has native GSS libs installed
- krb5-config --libs gssapi 2> /dev/null
+ krb5-config --libs 2> /dev/null
if [ $? != 0 ]; then
# Fedora has a different path
- /usr/kerberos/bin/krb5-config --libs gssapi 2> /dev/null
+ /usr/kerberos/bin/krb5-config --libs 2> /dev/null
if [ $? != 0 ]; then
NATIVE=false
fi
@@ -97,6 +97,15 @@
if [ $? != 0 ] ; then
echo "Native provider fails"
EXIT_STATUS=1
+ if [ "$OS" = "Linux" -a `arch` = "x86_64" ]; then
+ ${TESTJAVA}${FILESEP}bin${FILESEP}java -XshowSettings:properties -version 2> allprop
+ cat allprop | grep sun.arch.data.model | grep 32
+ if [ "$?" = "0" ]; then
+ echo "Running 32-bit JDK on 64-bit Linux. Maybe only 64-bit library is installed."
+ echo "Please manually check if this is the case. Treated as PASSED now."
+ EXIT_STATUS=0
+ fi
+ fi
fi
fi
diff --git a/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java b/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java
new file mode 100644
index 0000000..a3ad441
--- /dev/null
+++ b/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @bug 7200306
+ * @run main/othervm/timeout=250 TestDSAKeyLength
+ * @summary verify that P11Signature impl will error out when initialized
+ * with unsupported key sizes
+ */
+
+
+import java.security.*;
+import java.security.spec.*;
+import java.security.interfaces.*;
+
+public class TestDSAKeyLength extends PKCS11Test {
+
+ public static void main(String[] args) throws Exception {
+ main(new TestDSAKeyLength());
+ }
+
+ public void main(Provider provider) throws Exception {
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance("DSA", "SUN");
+ kpg.initialize(2048, new SecureRandom());
+ KeyPair pair = kpg.generateKeyPair();
+
+ boolean status = true;
+ Signature sig = Signature.getInstance("SHA1withDSA", provider);
+ try {
+ sig.initSign(pair.getPrivate());
+ status = false;
+ } catch (InvalidKeyException ike) {
+ System.out.println("Expected IKE thrown for initSign()");
+ }
+ try {
+ sig.initVerify(pair.getPublic());
+ status = false;
+ } catch (InvalidKeyException ike) {
+ System.out.println("Expected IKE thrown for initVerify()");
+ }
+ if (status) {
+ System.out.println("Test Passed");
+ } else {
+ throw new Exception("Test Failed - expected IKE not thrown");
+ }
+ }
+}
diff --git a/jdk/test/sun/security/provider/KeyStore/DKSTest.java b/jdk/test/sun/security/provider/KeyStore/DKSTest.java
index d1c4f18..a11210e 100644
--- a/jdk/test/sun/security/provider/KeyStore/DKSTest.java
+++ b/jdk/test/sun/security/provider/KeyStore/DKSTest.java
@@ -38,6 +38,7 @@
public class DKSTest {
private static final String TEST_SRC = System.getProperty("test.src");
+ private static final String USER_DIR = System.getProperty("user.dir");
private static final String CERT = TEST_SRC + "/../../pkcs12/trusted.pem";
private static final String CONFIG = "file://" + TEST_SRC + "/domains.cfg";
private static final Map<String, KeyStore.ProtectionParameter> PASSWORDS =
@@ -60,19 +61,6 @@
}};
public static void main(String[] args) throws Exception {
- try {
- main0();
- } finally {
- // cleanup
- new File(TEST_SRC + "/empty.jks").delete();
- new File(TEST_SRC + "/Alias.keystore_tmp").delete();
- new File(TEST_SRC + "/pw.jks_tmp").delete();
- new File(TEST_SRC + "/secp256r1server-secp384r1ca.p12_tmp").delete();
- new File(TEST_SRC + "/sect193r1server-rsa1024ca.p12_tmp").delete();
- }
- }
-
- private static void main0() throws Exception {
/*
* domain keystore: system
*/
@@ -120,7 +108,7 @@
empty.load(null, null);
try (OutputStream outStream =
- new FileOutputStream(TEST_SRC + "/empty.jks")) {
+ new FileOutputStream(new File(USER_DIR, "empty.jks"))) {
empty.store(outStream, "passphrase".toCharArray());
}
config = new URI(CONFIG + "#empty");
diff --git a/jdk/test/sun/security/provider/KeyStore/domains.cfg b/jdk/test/sun/security/provider/KeyStore/domains.cfg
index 203d9d0..f26d6f0 100644
--- a/jdk/test/sun/security/provider/KeyStore/domains.cfg
+++ b/jdk/test/sun/security/provider/KeyStore/domains.cfg
@@ -35,14 +35,14 @@
keystoreType="PKCS12" {
keystore policy_keystore
keystoreType="JKS"
- keystoreURI="${test.src}/Alias.keystore_tmp";
+ keystoreURI="${user.dir}/Alias.keystore_tmp";
keystore pw_keystore
keystoreType="CaseExactJKS"
- keystoreURI="${test.src}/pw.jks_tmp";
+ keystoreURI="${user.dir}/pw.jks_tmp";
keystore eckeystore1
- keystoreURI="${test.src}/sect193r1server-rsa1024ca.p12_tmp";
+ keystoreURI="${user.dir}/sect193r1server-rsa1024ca.p12_tmp";
keystore eckeystore2
- keystoreURI="${test.src}/secp256r1server-secp384r1ca.p12_tmp";
+ keystoreURI="${user.dir}/secp256r1server-secp384r1ca.p12_tmp";
};
// domain where passwords are supplied via environment variables
@@ -61,5 +61,5 @@
keystoreType="JKS"
keystoreProviderName="SUN" {
keystore empty
- keystoreURI="${test.src}/empty.jks";
+ keystoreURI="${user.dir}/empty.jks";
};
diff --git a/jdk/test/sun/security/tools/jarsigner/TimestampCheck.java b/jdk/test/sun/security/tools/jarsigner/TimestampCheck.java
index ab7d5c7..2b04e91 100644
--- a/jdk/test/sun/security/tools/jarsigner/TimestampCheck.java
+++ b/jdk/test/sun/security/tools/jarsigner/TimestampCheck.java
@@ -202,7 +202,7 @@
SignerInfo signerInfo = new SignerInfo(
new X500Name(signer.getIssuerX500Principal().getName()),
signer.getSerialNumber(),
- aid, AlgorithmId.get("DSA"), sig.sign());
+ aid, AlgorithmId.get("RSA"), sig.sign());
SignerInfo[] signerInfos = {signerInfo};
PKCS7 p7 =
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
index ea1c49a..1d76989 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2013g
+tzdata2013h
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/africa b/jdk/test/sun/util/calendar/zi/tzdata/africa
index 19bc98a..0eed8b1 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/africa
+++ b/jdk/test/sun/util/calendar/zi/tzdata/africa
@@ -474,6 +474,14 @@
# (either two days before them or five days after them, so as to fall on
# lastFri instead of lastSun).
+# From Even Scharning (2013-10-25):
+# The scheduled end of DST in Libya on Friday, October 25, 2013 was
+# cancelled yesterday....
+# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+#
+# From Paul Eggert (2013-10-25):
+# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Libya 1951 only - Oct 14 2:00 1:00 S
Rule Libya 1952 only - Jan 1 0:00 0 -
@@ -490,19 +498,21 @@
Rule Libya 1987 1989 - Oct 1 0:00 0 -
Rule Libya 1997 only - Apr 4 0:00 1:00 S
Rule Libya 1997 only - Oct 4 0:00 0 -
-Rule Libya 2013 max - Mar lastFri 1:00 1:00 S
-Rule Libya 2013 max - Oct lastFri 2:00 0 -
+Rule Libya 2013 only - Mar lastFri 1:00 1:00 S
+Rule Libya 2013 only - Oct lastFri 2:00 0 -
+
+# The 1996 and 1997 entries are from Shanks & Pottenger;
+# the IATA SSIM data contain some obvious errors.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Tripoli 0:52:44 - LMT 1920
1:00 Libya CE%sT 1959
2:00 - EET 1982
1:00 Libya CE%sT 1990 May 4
-# The 1996 and 1997 entries are from Shanks & Pottenger;
-# the IATA SSIM data contain some obvious errors.
2:00 - EET 1996 Sep 30
1:00 Libya CE%sT 1997 Oct 4
2:00 - EET 2012 Nov 10 2:00
- 1:00 Libya CE%sT
+ 1:00 Libya CE%sT 2013 Oct 25 2:00
+ 2:00 - EET
# Madagascar
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -707,15 +717,6 @@
# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
# </a>
-# From Alex Krivenyshev (2008-05-09):
-# Is Western Sahara (part which administrated by Morocco) going to follow
-# Morocco DST changes? Any information? What about other part of
-# Western Sahara - under administration of POLISARIO Front (also named
-# SADR Saharawi Arab Democratic Republic)?
-
-# From Arthur David Olson (2008-05-09):
-# XXX--guess that it is only Morocco for now; guess only 2008 for now.
-
# From Steffen Thorsen (2008-08-27):
# Morocco will change the clocks back on the midnight between August 31
# and September 1. They originally planned to observe DST to near the end
@@ -891,13 +892,13 @@
# Another source (specifying the time for start and end in the decree):
# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
-# From Paul Eggert (2013-09-30):
+# From Paul Eggert (2013-10-03):
# To estimate what the Moroccan government will do in future years,
-# transition dates for 2014 through 2037 were determined by running
+# transition dates for 2014 through 2038 were determined by running
# the following program under GNU Emacs 24.3:
#
# (let ((islamic-year 1435))
-# (while (< islamic-year 1460)
+# (while (< islamic-year 1461)
# (let ((a
# (calendar-gregorian-from-absolute
# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
@@ -917,9 +918,13 @@
# all transitions removed for 2026-2035, where the estimated Ramadan
# falls entirely outside daylight-saving time; and with fall-back
# transitions removed for 2036-2037, where the normal fall-back
-# date falls during the estimated Ramadan. Problems continue after that,
-# but 32-bit time_t values roll around in 2038 so for now do not worry
-# about dates after 2037.
+# date falls during the estimated Ramadan. Normally, the table would
+# stop after 2037 because 32-bit time_t values roll around early in 2038,
+# but that would imply a prediction of perpetual DST after March 2038
+# due to the year-2037 glitches. So, this table instead stops after
+# 2038, the first non-glitchy year after the 32-bit rollover.
+# An advantage of stopping after 2038 is that it lets zic guess
+# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -987,10 +992,21 @@
0:00 Morocco WE%sT 1984 Mar 16
1:00 - CET 1986
0:00 Morocco WE%sT
+
# Western Sahara
+#
+# From Gwillim Law (2013-10-22):
+# A correspondent who is usually well informed about time zone matters
+# ... says that Western Sahara observes daylight saving time, just as
+# Morocco does.
+#
+# From Paul Eggert (2013-10-23):
+# Assume that this has been true since Western Sahara switched to GMT,
+# since most of it was then controlled by Morocco.
+
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
-1:00 - WAT 1976 Apr 14
- 0:00 - WET
+ 0:00 Morocco WE%sT
# Mozambique
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/southamerica b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
index 2230d06..071f890 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica
+++ b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
@@ -874,6 +874,15 @@
# We will keep this article updated when this is confirmed:
# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
+# From Steffen Thorsen (2013-10-17):
+# http://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
+# Senator Jorge Viana announced that Acre will change time zone on November 10.
+# He did not specify the time of the change, nor if western parts of Amazonas
+# will change as well.
+#
+# From Paul Eggert (2013-10-17):
+# For now, assume western Amazonas will change as well.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
@@ -1162,13 +1171,15 @@
-5:00 - ACT 1993 Sep 28
-5:00 Brazil AC%sT 1994 Sep 22
-5:00 - ACT 2008 Jun 24 00:00
- -4:00 - AMT
+ -4:00 - AMT 2013 Nov 10
+ -5:00 - ACT
#
# Acre (AC)
Zone America/Rio_Branco -4:31:12 - LMT 1914
-5:00 Brazil AC%sT 1988 Sep 12
-5:00 - ACT 2008 Jun 24 00:00
- -4:00 - AMT
+ -4:00 - AMT 2013 Nov 10
+ -5:00 - ACT
# Chile
diff --git a/jdk/test/tools/jar/JarEntryTime.java b/jdk/test/tools/jar/JarEntryTime.java
index deef85b..74b413e 100644
--- a/jdk/test/tools/jar/JarEntryTime.java
+++ b/jdk/test/tools/jar/JarEntryTime.java
@@ -29,10 +29,15 @@
import java.io.File;
import java.io.PrintWriter;
-import java.util.Date;
+import java.nio.file.attribute.FileTime;
import sun.tools.jar.Main;
public class JarEntryTime {
+
+ // ZipEntry's mod date has 2 seconds precision: give extra time to
+ // allow for e.g. rounding/truncation and networked/samba drives.
+ static final long PRECISION = 10000L;
+
static boolean cleanup(File dir) throws Throwable {
boolean rc = true;
File[] x = dir.listFiles();
@@ -88,9 +93,9 @@
check(dirOuter.mkdir());
check(dirInner.mkdir());
File fileInner = new File(dirInner, "foo.txt");
- PrintWriter pw = new PrintWriter(fileInner);
- pw.println("hello, world");
- pw.close();
+ try (PrintWriter pw = new PrintWriter(fileInner)) {
+ pw.println("hello, world");
+ }
// Get the "now" from the "last-modified-time" of the last file we
// just created, instead of the "System.currentTimeMillis()", to
@@ -98,13 +103,10 @@
final long now = fileInner.lastModified();
final long earlier = now - (60L * 60L * 6L * 1000L);
final long yesterday = now - (60L * 60L * 24L * 1000L);
- // ZipEntry's mod date has 2 seconds precision: give extra time to
- // allow for e.g. rounding/truncation and networked/samba drives.
- final long PRECISION = 10000L;
- dirOuter.setLastModified(now);
- dirInner.setLastModified(yesterday);
- fileInner.setLastModified(earlier);
+ check(dirOuter.setLastModified(now));
+ check(dirInner.setLastModified(yesterday));
+ check(fileInner.setLastModified(earlier));
// Make a jar file from that directory structure
Main jartool = new Main(System.out, System.err, "jar");
@@ -122,9 +124,9 @@
check(dirOuter.exists());
check(dirInner.exists());
check(fileInner.exists());
- check(Math.abs(dirOuter.lastModified() - now) <= PRECISION);
- check(Math.abs(dirInner.lastModified() - yesterday) <= PRECISION);
- check(Math.abs(fileInner.lastModified() - earlier) <= PRECISION);
+ checkFileTime(dirOuter.lastModified(), now);
+ checkFileTime(dirInner.lastModified(), yesterday);
+ checkFileTime(fileInner.lastModified(), earlier);
check(cleanup(dirInner));
check(cleanup(dirOuter));
@@ -135,9 +137,9 @@
check(dirOuter.exists());
check(dirInner.exists());
check(fileInner.exists());
- check(Math.abs(dirOuter.lastModified() - now) <= PRECISION);
- check(Math.abs(dirInner.lastModified() - now) <= PRECISION);
- check(Math.abs(fileInner.lastModified() - now) <= PRECISION);
+ checkFileTime(dirOuter.lastModified(), now);
+ checkFileTime(dirInner.lastModified(), now);
+ checkFileTime(fileInner.lastModified(), now);
check(cleanup(dirInner));
check(cleanup(dirOuter));
@@ -145,6 +147,14 @@
check(jarFile.delete());
}
+ static void checkFileTime(long now, long original) {
+ if (Math.abs(now - original) > PRECISION) {
+ System.out.format("Extracted to %s, expected to be close to %s%n",
+ FileTime.fromMillis(now), FileTime.fromMillis(original));
+ fail();
+ }
+ }
+
//--------------------- Infrastructure ---------------------------
static volatile int passed = 0, failed = 0;
static void pass() {passed++;}
diff --git a/jdk/test/tools/launcher/DiacriticTest.java b/jdk/test/tools/launcher/DiacriticTest.java
index 9b2cc94..f46adb0 100644
--- a/jdk/test/tools/launcher/DiacriticTest.java
+++ b/jdk/test/tools/launcher/DiacriticTest.java
@@ -30,6 +30,8 @@
import java.io.File;
import java.io.IOException;
+import java.nio.file.InvalidPathException;
+import java.nio.charset.UnmappableCharacterException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -46,6 +48,13 @@
return;
}
+ String lang = System.getenv("LANG");
+ if (lang != null && !lang.contains("UTF-8")) {
+ System.out.println("LANG variable set to the language that " +
+ "does not support unicode, test passes vacuously");
+ return;
+ }
+
File sourceFile = new File(NAME_NFC + ".java");
String source = "public class " + NAME_NFC + " { " +
" public static void main(String args[]) {\n" +
@@ -56,7 +65,7 @@
content.add(source);
try {
createFile(sourceFile, content);
- } catch (java.nio.file.InvalidPathException ipe) {
+ } catch (UnmappableCharacterException | InvalidPathException ipe) {
System.out.println("The locale or file system is configured in a way " +
"that prevents file creation. Real testing impossible.");
return;
diff --git a/jdk/test/tools/launcher/ExecutionEnvironment.java b/jdk/test/tools/launcher/ExecutionEnvironment.java
index 3587a1c..c3dc1ab 100644
--- a/jdk/test/tools/launcher/ExecutionEnvironment.java
+++ b/jdk/test/tools/launcher/ExecutionEnvironment.java
@@ -89,10 +89,6 @@
static final File testJarFile = new File("EcoFriendly.jar");
- static final String LIBJVM = TestHelper.isWindows
- ? "jvm.dll"
- : "libjvm" + (TestHelper.isMacOSX ? ".dylib" : ".so");
-
public ExecutionEnvironment() {
createTestJar();
}
@@ -192,7 +188,7 @@
tr = doExec(env, javaCmd, "-jar", testJarFile.getAbsolutePath());
verifyJavaLibraryPathGeneric(tr);
- } else {
+ } else { // Solaris
// no override
env.clear();
env.put(LD_LIBRARY_PATH, LD_LIBRARY_PATH_VALUE);
@@ -236,23 +232,24 @@
}
/*
- * ensures we have indeed exec'ed the correct vm of choice, all VMs support
- * -server, however 32-bit VMs support -client and -server.
+ * ensures we have indeed exec'ed the correct vm of choice if it exists
*/
@Test
void testVmSelection() {
TestResult tr = null;
- if (is32Bit) {
+ if (haveClientVM) {
tr = doExec(javaCmd, "-client", "-version");
if (!tr.matches(".*Client VM.*")) {
flagError(tr, "the expected vm -client did not launch");
}
}
- tr = doExec(javaCmd, "-server", "-version");
- if (!tr.matches(".*Server VM.*")) {
- flagError(tr, "the expected vm -server did not launch");
+ if (haveServerVM) {
+ tr = doExec(javaCmd, "-server", "-version");
+ if (!tr.matches(".*Server VM.*")) {
+ flagError(tr, "the expected vm -server did not launch");
+ }
}
}
diff --git a/jdk/test/tools/launcher/Test7029048.java b/jdk/test/tools/launcher/Test7029048.java
index 9437c3e..1a32322 100644
--- a/jdk/test/tools/launcher/Test7029048.java
+++ b/jdk/test/tools/launcher/Test7029048.java
@@ -208,6 +208,10 @@
System.out.println("Note: applicable on neither Windows nor MacOSX");
return;
}
+ if (!TestHelper.haveServerVM) {
+ System.out.println("Note: test relies on server vm, not found, exiting");
+ return;
+ }
// create our test jar first
ExecutionEnvironment.createTestJar();
diff --git a/jdk/test/tools/launcher/TestHelper.java b/jdk/test/tools/launcher/TestHelper.java
index 6f827f3..da23181 100644
--- a/jdk/test/tools/launcher/TestHelper.java
+++ b/jdk/test/tools/launcher/TestHelper.java
@@ -67,11 +67,15 @@
static final String JAVAHOME = System.getProperty("java.home");
static final String JAVA_BIN;
static final String JAVA_JRE_BIN;
+ static final String JAVA_LIB;
+ static final String JAVA_JRE_LIB;
static final boolean isSDK = JAVAHOME.endsWith("jre");
static final String javaCmd;
static final String javawCmd;
static final String javacCmd;
static final String jarCmd;
+ static final boolean haveServerVM;
+ static final boolean haveClientVM;
static final JavaCompiler compiler;
@@ -88,6 +92,9 @@
System.getProperty("os.name", "unknown").startsWith("SunOS");
static final boolean isLinux =
System.getProperty("os.name", "unknown").startsWith("Linux");
+ static final String LIBJVM = isWindows
+ ? "jvm.dll"
+ : "libjvm" + (isMacOSX ? ".dylib" : ".so");
static final boolean isSparc = System.getProperty("os.arch").startsWith("sparc");
@@ -124,12 +131,19 @@
throw new RuntimeException("arch model is not 32 or 64 bit ?");
}
compiler = ToolProvider.getSystemJavaCompiler();
+
File binDir = (isSDK)
? new File((new File(JAVAHOME)).getParentFile(), "bin")
: new File(JAVAHOME, "bin");
JAVA_BIN = binDir.getAbsolutePath();
- JAVA_JRE_BIN = new File((new File(JAVAHOME)).getParentFile(),
- (isSDK) ? "jre/bin" : "bin").getAbsolutePath();
+ JAVA_JRE_BIN = new File(JAVAHOME, "bin").getAbsolutePath();
+
+ File libDir = (isSDK)
+ ? new File((new File(JAVAHOME)).getParentFile(), "lib")
+ : new File(JAVAHOME, "lib");
+ JAVA_LIB = libDir.getAbsolutePath();
+ JAVA_JRE_LIB = new File(JAVAHOME, "lib").getAbsolutePath();
+
File javaCmdFile = (isWindows)
? new File(binDir, "java.exe")
: new File(binDir, "java");
@@ -168,6 +182,21 @@
throw new RuntimeException("java <" + javacCmd +
"> must exist and should be executable");
}
+
+ haveClientVM = haveVmVariant("client");
+ haveServerVM = haveVmVariant("server");
+ }
+ private static boolean haveVmVariant(String type) {
+ if (isWindows) {
+ File vmDir = new File(JAVA_JRE_BIN, type);
+ File jvmFile = new File(vmDir, LIBJVM);
+ return jvmFile.exists();
+ } else {
+ File vmDir = new File(JAVA_JRE_LIB, type);
+ File vmArchDir = new File(vmDir, getJreArch());
+ File jvmFile = new File(vmArchDir, LIBJVM);
+ return jvmFile.exists();
+ }
}
void run(String[] args) throws Exception {
int passed = 0, failed = 0;
diff --git a/langtools/.hgtags b/langtools/.hgtags
index a4c2f9b..909bc7e 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -239,3 +239,4 @@
6b4d6205366c1170ebefea95b1b9ae1d69add036 jdk8-b115
3c040b04af05646878798216ebf939d27e6fe687 jdk8-b116
19de039a03a619b99f1a8b454e1618c9fa9dae66 jdk8-b117
+4fd6a7ff8c068eceaaaf8bf12a394195203b99b3 jdk8-b118
diff --git a/langtools/make/BuildLangtools.gmk b/langtools/make/BuildLangtools.gmk
new file mode 100644
index 0000000..0ffcb31
--- /dev/null
+++ b/langtools/make/BuildLangtools.gmk
@@ -0,0 +1,205 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This must be the first rule
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+# The BOOT_JAVAC setup uses the bootdir compiler to compile the tools
+# and the bootstrap javac, to be run by the bootdir jvm.
+$(eval $(call SetupJavaCompiler,BOOT_JAVAC, \
+ JAVAC := $(JAVAC), \
+ SERVER_DIR := $(SJAVAC_SERVER_DIR), \
+ SERVER_JVM := $(SJAVAC_SERVER_JAVA), \
+ FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
+
+# javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
+RESOURCE_SUFFIXES := .gif .xml .css .js javax.tools.JavaCompilerTool
+
+# Now setup the compilation of the properties compilation tool. You can depend
+# upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we
+# add src/share/classes to the sourcepath. This is necessary since the GenStubs
+# program needs to be linked and run towards the new javac sources.
+$(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
+ SETUP := BOOT_JAVAC, \
+ DISABLE_SJAVAC := true, \
+ ADD_JAVAC_FLAGS := -Xprefer:source, \
+ SRC := $(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes, \
+ INCLUDES := compileproperties genstubs, \
+ BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses))
+
+# The compileprops tools compiles a properties file into a resource bundle.
+TOOL_COMPILEPROPS_CMD := $(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet
+
+# Lookup the properties that need to be compiled into resource bundles.
+PROPSOURCES := $(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties")
+
+# Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN"
+PROPPATHS := $(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties, %, $(PROPSOURCES))
+
+# Generate the list of java files to be created.
+PROPJAVAS := $(patsubst %, $(LANGTOOLS_OUTPUTDIR)/gensrc/%.java, $(PROPPATHS))
+
+# Generate the package dirs for the tobe generated java files.
+PROPDIRS := $(dir $(PROPJAVAS))
+
+# Now generate a sequence of "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle"
+# suitable to be fed into the CompileProperties command.
+PROPCMDLINE := $(subst _SPACE_, $(SPACE), $(join $(addprefix -compile_SPACE_, $(PROPSOURCES)), \
+ $(addsuffix _SPACE_java.util.ListResourceBundle, $(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/, $(addsuffix .java, $(PROPPATHS))))))
+
+# Now setup the rule for the generation of the resource bundles.
+$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d: $(PROPSOURCES) $(BUILD_TOOLS)
+ $(RM) -r $(@D)/*
+ $(MKDIR) -p $(@D) $(PROPDIRS)
+ $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties
+ $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties
+ $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties
+ $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties
+ $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javadoc/resources/version.properties
+ $(ECHO) Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles
+ $(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \
+ -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \
+ $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \
+ java.util.ListResourceBundle \
+ -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \
+ $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \
+ java.util.ListResourceBundle \
+ -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \
+ $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \
+ java.util.ListResourceBundle \
+ -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \
+ $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \
+ java.util.ListResourceBundle \
+ -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javadoc/resources/version.properties \
+ $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javadoc/resources/version.java \
+ java.util.ListResourceBundle
+ $(ECHO) PROPS_ARE_CREATED = yes > $@
+
+# Trigger the generation of the resource bundles. After the resource bundles have
+# been compiled, then the makefile will restart and the newly created java files
+# will become part of the build further along in the makefile.
+-include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
+
+ifeq ($(PROPS_ARE_CREATED), yes)
+ # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac
+ # that can be compiled with an old javac. The intermediate javac is then used
+ # to compile javac again and to build the complete new jdk.
+ $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS, \
+ SETUP := BOOT_JAVAC, \
+ DISABLE_SJAVAC := true, \
+ SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \
+ EXCLUDES := com/sun/tools/javac/nio, \
+ COPY := $(RESOURCE_SUFFIXES), \
+ BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
+
+ $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC, $(BUILD_BOOTSTRAP_LANGTOOLS), \
+ SRCS := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap, \
+ JAR := $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar, \
+ SUFFIXES := .class $(RESOURCE_SUFFIXES)))
+
+ # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not
+ # yet built. It is currently not needed but might be again in the future. The following
+ # exercises the functionality to verify that it works.
+ TOOL_GENSTUBS_CMD = $(JAVA) \
+ "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
+ -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \
+ genstubs.GenStubs
+
+ # We fetch source from the JDK...
+ JDKS = $(JDK_TOPDIR)/src/share/classes
+
+ # Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't
+ # currently needed, but is used as a demo for now.
+
+ STUBSOURCES := $(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \
+ -e "$(JDKS)/java/util/function/Predicate.java")
+
+ # Rewrite the file names into class names because the GenStubs tool require this.
+ STUBCLASSES := $(subst /,., $(patsubst $(JDKS)/%.java, %, $(STUBSOURCES)))
+
+ # Now setup the build recipe for genstubs.
+ $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d: $(STUBSOURCES) $(BUILD_TOOLS) \
+ $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
+ $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
+ $(MKDIR) -p $(@D)
+ $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs
+ $(ECHO) $(LOG_INFO) Generating stubs from JDK sources.
+ ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED = yes > $@)
+ if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \
+ $(ECHO) $(LOG_INFO) No changes in the stubs!; \
+ $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \
+ else \
+ $(ECHO) $(LOG_INFO) Changes in stubs detected!; \
+ $(RM) -r $(@D); \
+ $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \
+ fi
+ $(ECHO) STUBS_ARE_CREATED = yes > $@
+
+ # Trigger a generation of the genstubs java source code and a restart
+ # of the makefile to make sure that the following build setup use the
+ # newly created java files.
+ -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d
+
+ ifeq ($(STUBS_ARE_CREATED), yes)
+ # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar
+ # that generates code for the new jdk that is being built.
+ # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm.
+ $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \
+ JVM := $(JAVA), \
+ JAVAC := "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
+ -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
+ com.sun.tools.javac.Main, \
+ FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror, \
+ SERVER_DIR := $(SJAVAC_SERVER_DIR), \
+ SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
+
+ $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC, \
+ SETUP := GENERATE_NEWBYTECODE, \
+ SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \
+ $(LANGTOOLS_OUTPUTDIR)/genstubs, \
+ EXCLUDES := java/util java/io java/nio, \
+ COPY := $(RESOURCE_SUFFIXES), \
+ BIN := $(LANGTOOLS_OUTPUTDIR)/classes))
+
+ $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC, $(BUILD_FULL_JAVAC), \
+ SETUP := GENERATE_NEWBYTECODE, \
+ SRCS := $(LANGTOOLS_OUTPUTDIR)/classes, \
+ SUFFIXES := .class $(RESOURCE_SUFFIXES), \
+ JAR := $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar))
+
+ $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE, \
+ SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \
+ ZIP := $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip))
+
+ all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \
+ $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \
+ $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
+
+ endif
+endif
diff --git a/langtools/make/Makefile b/langtools/make/Makefile
index 5735a54..4570070 100644
--- a/langtools/make/Makefile
+++ b/langtools/make/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,199 +23,27 @@
# questions.
#
-# Makefile for langtools: wrapper around Ant build.xml file
-
-#
-# On Solaris, the standard 'make' utility will not work with these makefiles.
-# This little rule is only understood by Solaris make, and is harmless
-# when seen by the GNU make tool. If using Solaris make, this causes the
-# make command to fail.
-#
-SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
-
-#
-# Minimal platform defs
-# Need FullPath because we can't rely on gnumake abspath, until we use v3.81
-#
-
-SYSTEM_UNAME := $(shell uname)
-
-# Where is unwanted output to be delivered?
-# On Windows, MKS uses the special file "NUL", cygwin uses the customary unix file.
-ifeq ($(SYSTEM_UNAME), Windows_NT)
-DEV_NULL = NUL
+# Locate this Makefile
+ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
+ makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
else
-DEV_NULL = /dev/null
+ makefile_path := $(lastword $(MAKEFILE_LIST))
endif
+repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path))
-ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
-USING_CYGWIN = true
-endif
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name := $(notdir $(repo_dir))
-ifdef USING_CYGWIN
-define FullPath
-$(shell cygpath -a -s -m $1 2> $(DEV_NULL))
-endef
+# Try to locate top-level makefile
+top_level_makefile := $(repo_dir)/../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 ===================================================)
else
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
+ $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+ $(error Build from top-level Makefile instead)
endif
-#
-# Makefile args
-#
-
-ifdef QUIET
- ANT_OPTIONS += -quiet
-endif
-
-ifdef VERBOSE
- ANT_OPTIONS += -verbose -debug
-endif
-
-ifdef JDK_VERSION
- ANT_OPTIONS += -Djdk.version=$(JDK_VERSION)
-endif
-
-ifdef FULL_VERSION
- ANT_OPTIONS += -Dfull.version='$(FULL_VERSION)' # will contain spaces
-endif
-
-ifdef MILESTONE
-ifneq ($(MILESTONE),fcs)
- ANT_OPTIONS += -Dmilestone=$(MILESTONE)
-else
- ANT_OPTIONS += -Drelease=$(JDK_VERSION)
-endif
-endif
-
-ifdef BUILD_NUMBER
- ANT_OPTIONS += -Dbuild.number=$(BUILD_NUMBER)
-else
- ifdef JDK_BUILD_NUMBER
- ANT_OPTIONS += -Dbuild.number=$(JDK_BUILD_NUMBER)
- endif
-endif
-
-ifeq ($(VARIANT), DBG)
- ANT_OPTIONS += -Djavac.debug=true
-else
- ifeq ($(VARIANT), OPT)
- ANT_OPTIONS += -Djavac.debug=false
- endif
-endif
-
-ifeq ($(DEBUG_CLASSFILES), true)
- ANT_OPTIONS += -Djavac.debug=true
- ANT_OPTIONS += -Ddebug.classfiles=true
-endif
-
-# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
-# and the somewhat misnamed CLASS_VERSION (-target NN)
-ifdef TARGET_CLASS_VERSION
- ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION)
-else
- ifdef JAVAC_TARGET_ARG
- ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG)
- endif
-endif
-
-ifdef SOURCE_LANGUAGE_VERSION
- ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
-else
- ifdef JAVAC_SOURCE_ARG
- ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
- endif
-endif
-
-ifdef ALT_BOOTDIR
- ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-endif
-
-# To facilitate bootstrapping, much of langtools can be compiled with (just)
-# a boot JDK. However, some source files need to be compiled against
-# new JDK API. In a bootstrap build, an import JDK may not be available,
-# so build.xml can also build against the source files in a jdk repo,
-# in which case it will automatically generate stub files for the new JDK API.
-ifdef JDK_TOPDIR
- ANT_OPTIONS += -Dimport.jdk=$(JDK_TOPDIR)
-else
- ifdef ALT_JDK_TOPDIR
- ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_TOPDIR)
- else
- ifdef ALT_JDK_IMPORT_PATH
- ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_IMPORT_PATH)
- endif
- endif
-endif
-
-ifdef ALT_OUTPUTDIR
- OUTPUTDIR = $(ALT_OUTPUTDIR)
- ANT_OPTIONS += -Dbuild.dir=$(ALT_OUTPUTDIR)/build
- ANT_OPTIONS += -Ddist.dir=$(ALT_OUTPUTDIR)/dist
-else
- OUTPUTDIR = ..
-endif
-#ABS_OUTPUTDIR = $(abspath $(OUTPUTDIR))
-ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR))
-
-ANT_TMPDIR = $(ABS_OUTPUTDIR)/build/ant-tmp
-ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'
-
-ifdef FINDBUGS_HOME
- ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
-endif
-
-ifdef ANT_HOME
- ANT = $(ANT_HOME)/bin/ant
- ifneq ($(shell test -x $(ANT) && echo OK), OK)
- $(error $(ANT) not found -- please update ANT_HOME)
- endif
-else
- ANT = ant
- ifneq ($(shell test -x "`which $(ANT)`" && echo OK), OK)
- $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
- endif
-endif
-
-# Default target and expected 'do everything' target
-all: build
-
-# Standard make clobber target
-clobber: clean
-
-# All ant targets of interest
-ANT_TARGETS = build clean sanity post-sanity diagnostics build-all-tools # for now
-
-# Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
-$(OUTPUTDIR)/build/ant-diagnostics.log:
- @mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
- @$(RM) $@
- $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $@ ; \
- $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -version >> $@
-
-# Create a make target for each
-$(ANT_TARGETS): $(OUTPUTDIR)/build/ant-diagnostics.log
- @ mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
- $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) $(ANT_OPTIONS) $@
-
-#-------------------------------------------------------------------
-#
-# Targets for Oracle's internal JPRT build system
-
-CD = cd
-ZIP = zip
-
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
-
-jprt_build_product jprt_build_debug jprt_build_fastdebug: all
- ( $(CD) $(OUTPUTDIR) && \
- $(ZIP) -q -r $(JPRT_ARCHIVE_BUNDLE) build dist )
-
-#-------------------------------------------------------------------
-
-# Declare these phony (not filenames)
-.PHONY: $(ANT_TARGETS) all clobber \
- jprt_build_product jprt_build_debug jprt_build_fastdebug
+all:
+ @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/langtools/make/jprt.properties b/langtools/make/jprt.properties
deleted file mode 100644
index f2d5638..0000000
--- a/langtools/make/jprt.properties
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Properties for jprt
-
-# Locked down to jdk8
-jprt.tools.default.release=jdk8
-
-# The different build flavors we want, we override here so we just get these 2
-jprt.build.flavors=product,fastdebug
-
-# Standard list of jprt build targets for this source tree
-jprt.build.targets= \
- solaris_sparcv9_5.10-{product|fastdebug}, \
- solaris_x64_5.10-{product|fastdebug}, \
- linux_i586_2.6-{product|fastdebug}, \
- linux_x64_2.6-{product|fastdebug}, \
- macosx_x64_10.7-{product|fastdebug}, \
- windows_i586_6.1-{product|fastdebug}, \
- windows_x64_6.1-{product|fastdebug}
-
-# Test target list (no fastdebug & limited c2 testing)
-jprt.my.test.target.set= \
- solaris_sparcv9_5.10-product-c2-TESTNAME, \
- solaris_x64_5.10-product-c2-TESTNAME, \
- linux_i586_2.6-product-{c1|c2}-TESTNAME, \
- linux_x64_2.6-product-c2-TESTNAME, \
- macosx_x64_10.7-product-c2-TESTNAME, \
- windows_i586_6.1-product-c1-TESTNAME, \
- windows_x64_6.1-product-c2-TESTNAME
-
-# Default test targets
-jprt.make.rule.test.targets= \
- ${jprt.my.test.target.set:TESTNAME=jtreg}
-
-# Directories to be excluded from the source bundles
-jprt.bundle.exclude.src.dirs=build dist webrev
-
-# Test target list (no fastdebug & limited c2 testing)
-jprt.my.test.target.set= \
- solaris_sparcv9_5.10-product-c2-TESTNAME, \
- solaris_x64_5.10-product-c2-TESTNAME, \
- linux_i586_2.6-product-{c1|c2}-TESTNAME, \
- linux_x64_2.6-product-c2-TESTNAME, \
- macosx_x64_10.7-product-c2-TESTNAME, \
- windows_i586_6.1-product-c1-TESTNAME, \
- windows_x64_6.1-product-c2-TESTNAME
-
-# Default test targets
-jprt.make.rule.test.targets= \
- ${jprt.my.test.target.set:TESTNAME=jtreg}
diff --git a/langtools/makefiles/BuildLangtools.gmk b/langtools/makefiles/BuildLangtools.gmk
deleted file mode 100644
index 9932c11..0000000
--- a/langtools/makefiles/BuildLangtools.gmk
+++ /dev/null
@@ -1,201 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This must be the first rule
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-
-# The BOOT_JAVAC setup uses the bootdir compiler to compile the tools
-# and the bootstrap javac, to be run by the bootdir jvm.
-$(eval $(call SetupJavaCompiler,BOOT_JAVAC, \
- JAVAC := $(JAVAC), \
- SERVER_DIR := $(SJAVAC_SERVER_DIR), \
- SERVER_JVM := $(SJAVAC_SERVER_JAVA), \
- FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
-
-# javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
-RESOURCE_SUFFIXES := .gif .xml .css .js javax.tools.JavaCompilerTool
-
-# Now setup the compilation of the properties compilation tool. You can depend
-# upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we
-# add src/share/classes to the sourcepath. This is necessary since the GenStubs
-# program needs to be linked and run towards the new javac sources.
-$(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
- SETUP := BOOT_JAVAC, \
- DISABLE_SJAVAC := true, \
- ADD_JAVAC_FLAGS := -Xprefer:source, \
- SRC := $(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes, \
- INCLUDES := compileproperties genstubs, \
- BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses))
-
-# The compileprops tools compiles a properties file into a resource bundle.
-TOOL_COMPILEPROPS_CMD := $(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet
-
-# Lookup the properties that need to be compiled into resource bundles.
-PROPSOURCES := $(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties")
-
-# Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN"
-PROPPATHS := $(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties, %, $(PROPSOURCES))
-
-# Generate the list of java files to be created.
-PROPJAVAS := $(patsubst %, $(LANGTOOLS_OUTPUTDIR)/gensrc/%.java, $(PROPPATHS))
-
-# Generate the package dirs for the tobe generated java files.
-PROPDIRS := $(dir $(PROPJAVAS))
-
-# Now generate a sequence of "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle"
-# suitable to be fed into the CompileProperties command.
-PROPCMDLINE := $(subst _SPACE_, $(SPACE), $(join $(addprefix -compile_SPACE_, $(PROPSOURCES)), \
- $(addsuffix _SPACE_java.util.ListResourceBundle, $(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/, $(addsuffix .java, $(PROPPATHS))))))
-
-# Now setup the rule for the generation of the resource bundles.
-$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d: $(PROPSOURCES) $(BUILD_TOOLS)
- $(RM) -r $(@D)/*
- $(MKDIR) -p $(@D) $(PROPDIRS)
- $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties
- $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties
- $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties
- $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties
- $(ECHO) Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles
- $(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \
- -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \
- $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \
- java.util.ListResourceBundle \
- -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \
- $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \
- java.util.ListResourceBundle \
- -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \
- $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \
- java.util.ListResourceBundle \
- -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \
- $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \
- java.util.ListResourceBundle
- $(ECHO) PROPS_ARE_CREATED = yes > $@
-
-# Trigger the generation of the resource bundles. After the resource bundles have
-# been compiled, then the makefile will restart and the newly created java files
-# will become part of the build further along in the makefile.
--include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
-
-ifeq ($(PROPS_ARE_CREATED), yes)
- # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac
- # that can be compiled with an old javac. The intermediate javac is then used
- # to compile javac again and to build the complete new jdk.
- $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS, \
- SETUP := BOOT_JAVAC, \
- DISABLE_SJAVAC := true, \
- SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \
- EXCLUDES := com/sun/tools/javac/nio, \
- COPY := $(RESOURCE_SUFFIXES), \
- BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
-
- $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC, $(BUILD_BOOTSTRAP_LANGTOOLS), \
- SRCS := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap, \
- JAR := $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar, \
- SUFFIXES := .class $(RESOURCE_SUFFIXES)))
-
- # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not
- # yet built. It is currently not needed but might be again in the future. The following
- # exercises the functionality to verify that it works.
- TOOL_GENSTUBS_CMD = $(JAVA) \
- "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
- -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \
- genstubs.GenStubs
-
- # We fetch source from the JDK...
- JDKS = $(JDK_TOPDIR)/src/share/classes
-
- # Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't
- # currently needed, but is used as a demo for now.
-
- STUBSOURCES := $(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \
- -e "$(JDKS)/java/util/function/Predicate.java")
-
- # Rewrite the file names into class names because the GenStubs tool require this.
- STUBCLASSES := $(subst /,., $(patsubst $(JDKS)/%.java, %, $(STUBSOURCES)))
-
- # Now setup the build recipe for genstubs.
- $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d: $(STUBSOURCES) $(BUILD_TOOLS) \
- $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
- $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
- $(MKDIR) -p $(@D)
- $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs
- $(ECHO) $(LOG_INFO) Generating stubs from JDK sources.
- ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED = yes > $@)
- if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \
- $(ECHO) $(LOG_INFO) No changes in the stubs!; \
- $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \
- else \
- $(ECHO) $(LOG_INFO) Changes in stubs detected!; \
- $(RM) -r $(@D); \
- $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \
- fi
- $(ECHO) STUBS_ARE_CREATED = yes > $@
-
- # Trigger a generation of the genstubs java source code and a restart
- # of the makefile to make sure that the following build setup use the
- # newly created java files.
- -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d
-
- ifeq ($(STUBS_ARE_CREATED), yes)
- # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar
- # that generates code for the new jdk that is being built.
- # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm.
- $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \
- JVM := $(JAVA), \
- JAVAC := "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
- -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
- com.sun.tools.javac.Main, \
- FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror, \
- SERVER_DIR := $(SJAVAC_SERVER_DIR), \
- SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
-
- $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC, \
- SETUP := GENERATE_NEWBYTECODE, \
- SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \
- $(LANGTOOLS_OUTPUTDIR)/genstubs, \
- EXCLUDES := java/util java/io java/nio, \
- COPY := $(RESOURCE_SUFFIXES), \
- BIN := $(LANGTOOLS_OUTPUTDIR)/classes))
-
- $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC, $(BUILD_FULL_JAVAC), \
- SETUP := GENERATE_NEWBYTECODE, \
- SRCS := $(LANGTOOLS_OUTPUTDIR)/classes, \
- SUFFIXES := .class $(RESOURCE_SUFFIXES), \
- JAR := $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar))
-
- $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE, \
- SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \
- ZIP := $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip))
-
- all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \
- $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \
- $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
-
- endif
-endif
diff --git a/langtools/makefiles/Makefile b/langtools/makefiles/Makefile
deleted file mode 100644
index c7d0dd0..0000000
--- a/langtools/makefiles/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Locate this Makefile
-ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
- makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
- makefile_path := $(lastword $(MAKEFILE_LIST))
-endif
-repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path))
-
-# What is the name of this subsystem (langtools, corba, etc)?
-subsystem_name := $(notdir $(repo_dir))
-
-# Try to locate 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 ===================================================)
-else
- $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
- $(error Build from top-level Makefile instead)
-endif
-
-all:
- @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
index 5d5132a..414db80 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
@@ -204,12 +204,27 @@
"com.sun.tools.doclets.formats.html.resources.standard");
}
+ private final String versionRBName = "com.sun.tools.javadoc.resources.version";
+ private ResourceBundle versionRB;
+
/**
* Return the build date for the doclet.
*/
@Override
public String getDocletSpecificBuildDate() {
- return BUILD_DATE;
+ if (versionRB == null) {
+ try {
+ versionRB = ResourceBundle.getBundle(versionRBName);
+ } catch (MissingResourceException e) {
+ return BUILD_DATE;
+ }
+ }
+
+ try {
+ return versionRB.getString("release");
+ } catch (MissingResourceException e) {
+ return BUILD_DATE;
+ }
}
/**
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
index 3c63c11..1ddf6e6 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
@@ -331,7 +331,7 @@
if (timestamp) {
Calendar calendar = new GregorianCalendar(TimeZone.getDefault());
Date today = calendar.getTime();
- text += " ("+ ConfigurationImpl.BUILD_DATE + ") on " + today;
+ text += " ("+ configuration.getDocletSpecificBuildDate() + ") on " + today;
}
return new Comment(text);
}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java b/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java
index 3b1c40e..e02285d 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java
@@ -293,7 +293,7 @@
ExtendedStandardFlags = (long)StandardFlags | DEFAULT,
ModifierFlags = ((long)StandardFlags & ~INTERFACE) | DEFAULT,
InterfaceMethodMask = ABSTRACT | STATIC | PUBLIC | STRICTFP | DEFAULT,
- AnnotationTypeElementMask = FINAL | ABSTRACT | PUBLIC | STRICTFP,
+ AnnotationTypeElementMask = ABSTRACT | PUBLIC,
LocalVarFlags = FINAL | PARAMETER;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java
index 58bb0f1..bcf0c83 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java
@@ -970,13 +970,6 @@
public boolean allInterfaces;
- public enum IntersectionKind {
- EXPLICIT,
- IMPLICT;
- }
-
- public IntersectionKind intersectionKind;
-
public IntersectionClassType(List<Type> bounds, ClassSymbol csym, boolean allInterfaces) {
super(Type.noType, List.<Type>nil(), csym);
this.allInterfaces = allInterfaces;
@@ -1008,9 +1001,7 @@
@Override
public <R, P> R accept(TypeVisitor<R, P> v, P p) {
- return intersectionKind == IntersectionKind.EXPLICIT ?
- v.visitIntersection(this, p) :
- v.visitDeclared(this, p);
+ return v.visitIntersection(this, p);
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
index bc02d7b..466178a 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -933,7 +933,8 @@
chk.validate(tree.typarams, localEnv);
// Check that result type is well-formed.
- chk.validate(tree.restype, localEnv);
+ if (tree.restype != null && !tree.restype.type.hasTag(VOID))
+ chk.validate(tree.restype, localEnv);
// Check that receiver type is well-formed.
if (tree.recvparam != null) {
@@ -3982,10 +3983,6 @@
return bounds.head.type;
} else {
Type owntype = types.makeCompoundType(TreeInfo.types(bounds));
- if (tree.hasTag(TYPEINTERSECTION)) {
- ((IntersectionClassType)owntype).intersectionKind =
- IntersectionClassType.IntersectionKind.EXPLICIT;
- }
// ... the variable's bound is a class type flagged COMPOUND
// (see comment for TypeVar.bound).
// In this case, generate a class tree that represents the
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
index bde7379..6a682fb 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
@@ -1326,6 +1326,14 @@
tree.underlyingType.accept(this);
}
+ @Override
+ public void visitTypeIdent(JCPrimitiveTypeTree that) {
+ if (that.type.hasTag(TypeTag.VOID)) {
+ log.error(that.pos(), "void.not.allowed.here");
+ }
+ super.visitTypeIdent(that);
+ }
+
/** Default visitor method: do nothing.
*/
@Override
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index dc9c044..74ed71e 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -357,9 +357,11 @@
//first determine the method symbol to be used to generate the sam instance
//this is either the method reference symbol, or the bridged reference symbol
- Symbol refSym = localContext.needsBridge() ?
- localContext.bridgeSym :
- tree.sym;
+ Symbol refSym = localContext.needsBridge()
+ ? localContext.bridgeSym
+ : localContext.isSignaturePolymorphic()
+ ? localContext.sigPolySym
+ : tree.sym;
//build the bridge method, if needed
if (localContext.needsBridge()) {
@@ -1995,6 +1997,7 @@
final boolean isSuper;
final Symbol bridgeSym;
+ final Symbol sigPolySym;
ReferenceTranslationContext(JCMemberReference tree) {
super(tree);
@@ -2004,6 +2007,12 @@
referenceBridgeName(), null,
owner.enclClass())
: null;
+ this.sigPolySym = isSignaturePolymorphic()
+ ? makePrivateSyntheticMethod(tree.sym.flags(),
+ tree.sym.name,
+ bridgedRefSig(),
+ tree.sym.enclClass())
+ : null;
if (dumpLambdaToMethodStats) {
String key = bridgeSym == null ?
"mref.stat" : "mref.stat.1";
@@ -2106,6 +2115,15 @@
}
/**
+ * Signature polymorphic methods need special handling.
+ * e.g. MethodHandle.invoke() MethodHandle.invokeExact()
+ */
+ final boolean isSignaturePolymorphic() {
+ return tree.sym.kind == MTH &&
+ types.isSignaturePolymorphic((MethodSymbol)tree.sym);
+ }
+
+ /**
* Does this reference needs a bridge (i.e. var args need to be
* expanded or "super" is used)
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
index 4eb5c64..826dbf4 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -1378,11 +1378,14 @@
ref = make.Ident(sym);
args = make.Idents(md.params);
} else {
- Symbol msym = sym;
- if (sym.owner.isInterface()) {
- msym = msym.clone(types.supertype(accessor.owner.type).tsym);
+ JCExpression site = make.Ident(md.params.head);
+ if (acode % 2 != 0) {
+ //odd access codes represent qualified super accesses - need to
+ //emit reference to the direct superclass, even if the refered
+ //member is from an indirect superclass (JLS 13.1)
+ site.setType(types.erasure(types.supertype(vsym.owner.enclClass().type)));
}
- ref = make.Select(make.Ident(md.params.head), msym);
+ ref = make.Select(site, sym);
args = make.Idents(md.params.tail);
}
JCStatement stat; // The statement accessing the private symbol.
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
index 5412243..fbee06b 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -1174,9 +1174,8 @@
}
// counter for number of generic local variables
- int nGenericVars = 0;
-
- if (code.varBufferSize > 0) {
+ if (code.varDebugInfo && code.varBufferSize > 0) {
+ int nGenericVars = 0;
int alenIdx = writeAttr(names.LocalVariableTable);
databuf.appendChar(code.getLVTSize());
for (int i=0; i<code.varBufferSize; i++) {
@@ -1195,37 +1194,38 @@
Type vartype = sym.erasure(types);
databuf.appendChar(pool.put(typeSig(vartype)));
databuf.appendChar(var.reg);
- if (needsLocalVariableTypeEntry(var.sym.type))
+ if (needsLocalVariableTypeEntry(var.sym.type)) {
nGenericVars++;
+ }
}
}
endAttr(alenIdx);
acount++;
- }
- if (nGenericVars > 0) {
- int alenIdx = writeAttr(names.LocalVariableTypeTable);
- databuf.appendChar(nGenericVars);
- int count = 0;
+ if (nGenericVars > 0) {
+ alenIdx = writeAttr(names.LocalVariableTypeTable);
+ databuf.appendChar(nGenericVars);
+ int count = 0;
- for (int i=0; i<code.varBufferSize; i++) {
- Code.LocalVar var = code.varBuffer[i];
- VarSymbol sym = var.sym;
- if (!needsLocalVariableTypeEntry(sym.type))
- continue;
- for (Code.LocalVar.Range r : var.aliveRanges) {
- // write variable info
- databuf.appendChar(r.start_pc);
- databuf.appendChar(r.length);
- databuf.appendChar(pool.put(sym.name));
- databuf.appendChar(pool.put(typeSig(sym.type)));
- databuf.appendChar(var.reg);
- count++;
+ for (int i=0; i<code.varBufferSize; i++) {
+ Code.LocalVar var = code.varBuffer[i];
+ VarSymbol sym = var.sym;
+ if (!needsLocalVariableTypeEntry(sym.type))
+ continue;
+ for (Code.LocalVar.Range r : var.aliveRanges) {
+ // write variable info
+ databuf.appendChar(r.start_pc);
+ databuf.appendChar(r.length);
+ databuf.appendChar(pool.put(sym.name));
+ databuf.appendChar(pool.put(typeSig(sym.type)));
+ databuf.appendChar(var.reg);
+ count++;
+ }
}
+ Assert.check(count == nGenericVars);
+ endAttr(alenIdx);
+ acount++;
}
- Assert.check(count == nGenericVars);
- endAttr(alenIdx);
- acount++;
}
if (code.stackMapBufferSize > 0) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
index 2e03ada..5f352c0 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -2420,7 +2420,7 @@
if (isInvokeDynamic(sym)) {
result = items.makeDynamicItem(sym);
return;
- } else if (!accessSuper) {
+ } else {
sym = binaryQualifier(sym, tree.selected.type);
}
if ((sym.flags() & STATIC) != 0) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java b/langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
index 535dbd2..b96c7c3 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
@@ -280,7 +280,7 @@
try {
nextChar();
if (isIdentifierStart(ch)) {
- Name name = readIdentifier();
+ Name name = readTagName();
TagParser tp = tagParsers.get(name);
if (tp == null) {
List<DCTree> content = blockContent();
@@ -329,7 +329,7 @@
try {
nextChar();
if (isIdentifierStart(ch)) {
- Name name = readIdentifier();
+ Name name = readTagName();
skipWhitespace();
TagParser tp = tagParsers.get(name);
@@ -905,6 +905,14 @@
return names.fromChars(buf, start, bp - start);
}
+ protected Name readTagName() {
+ int start = bp;
+ nextChar();
+ while (bp < buflen && (Character.isUnicodeIdentifierPart(ch) || ch == '.'))
+ nextChar();
+ return names.fromChars(buf, start, bp - start);
+ }
+
protected boolean isJavaIdentifierStart(char ch) {
return Character.isJavaIdentifierStart(ch);
}
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java b/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
index a294373..49933a8 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
@@ -39,6 +39,7 @@
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type.ClassType;
import com.sun.tools.javac.comp.Check;
+import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.Context;
@@ -146,6 +147,9 @@
chk = Check.instance(context);
types = Types.instance(context);
fileManager = context.get(JavaFileManager.class);
+ if (fileManager instanceof JavacFileManager) {
+ ((JavacFileManager)fileManager).setSymbolFileEnabled(false);
+ }
// Default. Should normally be reset with setLocale.
this.doclocale = new DocLocale(this, "", breakiterator);
diff --git a/langtools/src/share/classes/javax/lang/model/type/DeclaredType.java b/langtools/src/share/classes/javax/lang/model/type/DeclaredType.java
index c1f500ee..80f6cd5 100644
--- a/langtools/src/share/classes/javax/lang/model/type/DeclaredType.java
+++ b/langtools/src/share/classes/javax/lang/model/type/DeclaredType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,14 +49,6 @@
* Types#directSupertypes(TypeMirror)} method. This returns the
* supertypes with any type arguments substituted in.
*
- * <p> This interface is also used to represent intersection types.
- * An intersection type is implicit in a program rather than being
- * explictly declared. For example, the bound of the type parameter
- * {@code <T extends Number & Runnable>}
- * is an intersection type. It is represented by a {@code DeclaredType}
- * with {@code Number} as its superclass and {@code Runnable} as its
- * lone superinterface.
- *
* @author Joseph D. Darcy
* @author Scott Seligman
* @author Peter von der Ahé
diff --git a/langtools/src/share/classes/javax/lang/model/type/IntersectionType.java b/langtools/src/share/classes/javax/lang/model/type/IntersectionType.java
index 80dca49..0bfbb28 100644
--- a/langtools/src/share/classes/javax/lang/model/type/IntersectionType.java
+++ b/langtools/src/share/classes/javax/lang/model/type/IntersectionType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,15 @@
/**
* Represents an intersection type.
*
- * As of the {@link javax.lang.model.SourceVersion#RELEASE_8
- * RELEASE_8} source version, intersection types can appear as the target type
- * of a cast expression.
+ * <p>An intersection type can be either implicitly or explicitly
+ * declared in a program. For example, the bound of the type parameter
+ * {@code <T extends Number & Runnable>} is an (implicit) intersection
+ * type. As of {@link javax.lang.model.SourceVersion#RELEASE_8
+ * RELEASE_8}, this is represented by an {@code IntersectionType} with
+ * {@code Number} and {@code Runnable} as its bounds. Also as of the
+ * {@link javax.lang.model.SourceVersion#RELEASE_8 RELEASE_8},
+ * intersection types can explicitly appear as the target type of a
+ * cast expression.
*
* @since 1.8
*/
diff --git a/langtools/src/share/classes/javax/lang/model/type/TypeVariable.java b/langtools/src/share/classes/javax/lang/model/type/TypeVariable.java
index 993bba6..dd45b59 100644
--- a/langtools/src/share/classes/javax/lang/model/type/TypeVariable.java
+++ b/langtools/src/share/classes/javax/lang/model/type/TypeVariable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -62,10 +62,9 @@
* <p> If this type variable was declared with no explicit
* upper bounds, the result is {@code java.lang.Object}.
* If it was declared with multiple upper bounds,
- * the result is an intersection type (modeled as a
- * {@link DeclaredType}).
- * Individual bounds can be found by examining the result's
- * {@linkplain Types#directSupertypes(TypeMirror) supertypes}.
+ * the result is an {@linkplain IntersectionType intersection type};
+ * individual bounds can be found by examining the result's
+ * {@linkplain IntersectionType#getBounds() bounds}.
*
* @return the upper bound of this type variable
*/
diff --git a/langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java b/langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java
new file mode 100644
index 0000000..87a9cf7
--- /dev/null
+++ b/langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8027977
+ * @summary Test to verify javadoc executes without CompletionFailure exception.
+ * @author Bhavesh Patel
+ * @library ../lib/
+ * @build JavadocTester TestCompletionFailure
+ * @run main TestCompletionFailure
+ */
+
+public class TestCompletionFailure extends JavadocTester {
+
+ private static final String BUG_ID = "8027977";
+
+ //Input for string search tests.
+ private static final String[][] NEGATED_TEST = {
+ {ERROR_OUTPUT, "TestCompletionFailure: error - " +
+ "com.sun.tools.javac.code.Symbol$CompletionFailure: class file for " +
+ "sun.util.locale.provider.LocaleProviderAdapter not found"
+ }
+ };
+
+ private static final String[] ARGS = new String[] {
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"
+ };
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) throws Exception {
+ TestCompletionFailure tester = new TestCompletionFailure();
+ run(tester, ARGS, NO_TEST, NEGATED_TEST);
+ tester.printSummary();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
diff --git a/langtools/test/com/sun/javadoc/testCompletionFailure/pkg1/NumberFormatTest.java b/langtools/test/com/sun/javadoc/testCompletionFailure/pkg1/NumberFormatTest.java
new file mode 100644
index 0000000..a02ffe9
--- /dev/null
+++ b/langtools/test/com/sun/javadoc/testCompletionFailure/pkg1/NumberFormatTest.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg1;
+
+import java.text.NumberFormat;
+
+public abstract class NumberFormatTest extends NumberFormat { }
diff --git a/langtools/test/tools/doclint/CustomTagTest.java b/langtools/test/tools/doclint/CustomTagTest.java
index 3340dfb..64ae347 100644
--- a/langtools/test/tools/doclint/CustomTagTest.java
+++ b/langtools/test/tools/doclint/CustomTagTest.java
@@ -1,17 +1,18 @@
/*
* @test /nodynamiccopyright/
- * @bug 8006248
+ * @bug 8006248 8028318
* @summary DocLint should report unknown tags
* @build DocLintTester
* @run main DocLintTester CustomTagTest.java
* @run main DocLintTester -XcustomTags: -ref CustomTagTest.out CustomTagTest.java
- * @run main DocLintTester -XcustomTags:customTag -ref CustomTagTestWithOption.out CustomTagTest.java
- * @run main DocLintTester -XcustomTags:customTag,anotherCustomTag -ref CustomTagTestWithOption.out CustomTagTest.java
+ * @run main DocLintTester -XcustomTags:customTag,custom.tag -ref CustomTagTestWithOption.out CustomTagTest.java
+ * @run main DocLintTester -XcustomTags:customTag,custom.tag,anotherCustomTag -ref CustomTagTestWithOption.out CustomTagTest.java
* @author bpatel
*/
/**
* @customTag Text for a custom tag.
+ * @custom.tag Text for another custom tag.
* @unknownTag Text for an unknown tag.
*/
public class CustomTagTest {
diff --git a/langtools/test/tools/doclint/CustomTagTest.out b/langtools/test/tools/doclint/CustomTagTest.out
index 063e313..4c58a3d 100644
--- a/langtools/test/tools/doclint/CustomTagTest.out
+++ b/langtools/test/tools/doclint/CustomTagTest.out
@@ -1,8 +1,11 @@
CustomTagTest.java:14: error: unknown tag: customTag
* @customTag Text for a custom tag.
^
-CustomTagTest.java:15: error: unknown tag: unknownTag
+CustomTagTest.java:15: error: unknown tag: custom.tag
+ * @custom.tag Text for another custom tag.
+ ^
+CustomTagTest.java:16: error: unknown tag: unknownTag
* @unknownTag Text for an unknown tag.
^
-2 errors
+3 errors
diff --git a/langtools/test/tools/doclint/CustomTagTestWithOption.out b/langtools/test/tools/doclint/CustomTagTestWithOption.out
index 0915014..f5b67cf 100644
--- a/langtools/test/tools/doclint/CustomTagTestWithOption.out
+++ b/langtools/test/tools/doclint/CustomTagTestWithOption.out
@@ -1,4 +1,4 @@
-CustomTagTest.java:15: error: unknown tag: unknownTag
+CustomTagTest.java:16: error: unknown tag: unknownTag
* @unknownTag Text for an unknown tag.
^
1 error
diff --git a/langtools/test/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java b/langtools/test/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java
new file mode 100644
index 0000000..2dd2200
--- /dev/null
+++ b/langtools/test/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8028504
+ * @summary javac generates LocalVariableTable even with -g:none
+ * @compile -g:none DontGenerateLVTForGNoneOpTest.java
+ * @run main DontGenerateLVTForGNoneOpTest
+ */
+
+import java.io.File;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.nio.file.Paths;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.Code_attribute;
+import com.sun.tools.classfile.Method;
+
+public class DontGenerateLVTForGNoneOpTest {
+
+ public static void main(String[] args) throws Exception {
+ new DontGenerateLVTForGNoneOpTest().run();
+ }
+
+ void run() throws Exception {
+ checkClassFile(new File(Paths.get(System.getProperty("test.classes"),
+ this.getClass().getName() + ".class").toUri()));
+ }
+
+ void checkClassFile(final File cfile) throws Exception {
+ ClassFile classFile = ClassFile.read(cfile);
+ for (Method method : classFile.methods) {
+ Code_attribute code = (Code_attribute)method.attributes.get(Attribute.Code);
+ if (code != null) {
+ if (code.attributes.get(Attribute.LocalVariableTable) != null) {
+ throw new AssertionError("LVT shouldn't be generated for g:none");
+ }
+ }
+ }
+ }
+
+ public void bar() {
+ try {
+ System.out.println();
+ } catch(@TA Exception e) {
+ } catch(Throwable t) {}
+ }
+
+ @Target(ElementType.TYPE_USE)
+ @interface TA {}
+}
diff --git a/langtools/test/tools/javac/annotations/AnnotationTypeElementModifiers.java b/langtools/test/tools/javac/annotations/AnnotationTypeElementModifiers.java
new file mode 100644
index 0000000..1929f24
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/AnnotationTypeElementModifiers.java
@@ -0,0 +1,46 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8028428
+ * @summary Test that only 'public' and 'abstract' elements compile
+ * @compile/fail/ref=AnnotationTypeElementModifiers.out -XDrawDiagnostics AnnotationTypeElementModifiers.java
+ */
+
+public @interface AnnotationTypeElementModifiers {
+ // First 4 should work
+ public int A();
+ public int AA() default 1;
+
+ abstract int B();
+ abstract int BB() default 1;
+
+ // These shouldn't work
+ private int C();
+ private int CC() default 1;
+
+ protected int D();
+ protected int DD() default 1;
+
+ static int E();
+ static int EE() default 1;
+
+ final int F();
+ final int FF() default 1;
+
+ synchronized int H();
+ synchronized int HH() default 1;
+
+ volatile int I();
+ volatile int II() default 1;
+
+ transient int J();
+ transient int JJ() default 1;
+
+ native int K();
+ native int KK() default 1;
+
+ strictfp float L();
+ strictfp float LL() default 0.1f;
+
+ default int M();
+ default int MM() default 1;
+}
diff --git a/langtools/test/tools/javac/annotations/AnnotationTypeElementModifiers.out b/langtools/test/tools/javac/annotations/AnnotationTypeElementModifiers.out
new file mode 100644
index 0000000..b05f4f7
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/AnnotationTypeElementModifiers.out
@@ -0,0 +1,21 @@
+AnnotationTypeElementModifiers.java:17:17: compiler.err.mod.not.allowed.here: private
+AnnotationTypeElementModifiers.java:18:17: compiler.err.mod.not.allowed.here: private
+AnnotationTypeElementModifiers.java:20:19: compiler.err.mod.not.allowed.here: protected
+AnnotationTypeElementModifiers.java:21:19: compiler.err.mod.not.allowed.here: protected
+AnnotationTypeElementModifiers.java:23:16: compiler.err.mod.not.allowed.here: static
+AnnotationTypeElementModifiers.java:24:16: compiler.err.mod.not.allowed.here: static
+AnnotationTypeElementModifiers.java:26:15: compiler.err.mod.not.allowed.here: final
+AnnotationTypeElementModifiers.java:27:15: compiler.err.mod.not.allowed.here: final
+AnnotationTypeElementModifiers.java:29:22: compiler.err.mod.not.allowed.here: synchronized
+AnnotationTypeElementModifiers.java:30:22: compiler.err.mod.not.allowed.here: synchronized
+AnnotationTypeElementModifiers.java:32:18: compiler.err.mod.not.allowed.here: volatile
+AnnotationTypeElementModifiers.java:33:18: compiler.err.mod.not.allowed.here: volatile
+AnnotationTypeElementModifiers.java:35:19: compiler.err.mod.not.allowed.here: transient
+AnnotationTypeElementModifiers.java:36:19: compiler.err.mod.not.allowed.here: transient
+AnnotationTypeElementModifiers.java:38:16: compiler.err.mod.not.allowed.here: native
+AnnotationTypeElementModifiers.java:39:16: compiler.err.mod.not.allowed.here: native
+AnnotationTypeElementModifiers.java:41:20: compiler.err.mod.not.allowed.here: strictfp
+AnnotationTypeElementModifiers.java:42:20: compiler.err.mod.not.allowed.here: strictfp
+AnnotationTypeElementModifiers.java:44:17: compiler.err.mod.not.allowed.here: default
+AnnotationTypeElementModifiers.java:45:17: compiler.err.mod.not.allowed.here: default
+20 errors
diff --git a/langtools/test/tools/javac/declaration/method/MethodVoidParameter.java b/langtools/test/tools/javac/declaration/method/MethodVoidParameter.java
new file mode 100644
index 0000000..eb572b5
--- /dev/null
+++ b/langtools/test/tools/javac/declaration/method/MethodVoidParameter.java
@@ -0,0 +1,9 @@
+/* @test /nodynamiccopyright/
+ * @bug 8026374
+ * @summary Cannot use void as a variable type
+ * @compile/fail/ref=MethodVoidParameter.out -XDrawDiagnostics MethodVoidParameter.java
+ */
+public class MethodVoidParameter {
+ void method(void v) { }
+ void method(void... v) { }
+}
diff --git a/langtools/test/tools/javac/declaration/method/MethodVoidParameter.out b/langtools/test/tools/javac/declaration/method/MethodVoidParameter.out
new file mode 100644
index 0000000..0f00786
--- /dev/null
+++ b/langtools/test/tools/javac/declaration/method/MethodVoidParameter.out
@@ -0,0 +1,3 @@
+MethodVoidParameter.java:7:17: compiler.err.void.not.allowed.here
+MethodVoidParameter.java:8:17: compiler.err.void.not.allowed.here
+2 errors
diff --git a/langtools/test/tools/javac/expression/_super/NonDirectSuper/Base.java b/langtools/test/tools/javac/expression/_super/NonDirectSuper/Base.java
new file mode 100644
index 0000000..cbe5b96
--- /dev/null
+++ b/langtools/test/tools/javac/expression/_super/NonDirectSuper/Base.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package base;
+
+public class Base extends PackagePrivate { }
+
+class PackagePrivate {
+ protected int refTobaseBase() {
+ return 0;
+ }
+ protected int refTotestOtherPackageTest() {
+ return 0;
+ }
+ protected int refTotestTarget11() {
+ return 0;
+ }
+ protected int refTotestCurPackagePrivateExt11() {
+ return 0;
+ }
+ protected int refTobaseBase;
+ protected int refTotestOtherPackageTest;
+ protected int refTotestTarget11;
+ protected int refTotestCurPackagePrivateExt11;
+}
diff --git a/langtools/test/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java b/langtools/test/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java
new file mode 100644
index 0000000..e9070e0
--- /dev/null
+++ b/langtools/test/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8027789
+ * @summary check that the direct superclass is used as the site when calling
+ * a superclass' method
+ * @compile Base.java NonDirectSuper.java
+ * @compile -source 1.2 -target 1.1 Target11.java
+ * @run main test.NonDirectSuper
+ */
+
+package test;
+
+import java.io.File;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.Code_attribute;
+import com.sun.tools.classfile.ConstantPool.CPRefInfo;
+import com.sun.tools.classfile.Instruction;
+import com.sun.tools.classfile.Method;
+import com.sun.tools.classfile.Opcode;
+
+public class NonDirectSuper {
+ public static void main(String... args) {
+ new NonDirectSuper().run();
+ }
+
+ void run() {
+ String workDir = System.getProperty("test.classes");
+ File testPackage = new File(workDir, "test");
+
+ for (File clazz : testPackage.listFiles()) {
+ if ("NonDirectSuper.class".equals(clazz.getName())) continue;
+ verifyInvokeSpecialRefToObject(clazz);
+ }
+ }
+
+ void verifyInvokeSpecialRefToObject(File clazz) {
+ try {
+ final ClassFile cf = ClassFile.read(clazz);
+ for (Method m : cf.methods) {
+ Code_attribute codeAttr = (Code_attribute)m.attributes.get(Attribute.Code);
+ for (Instruction instr : codeAttr.getInstructions()) {
+ if (instr.getOpcode() == Opcode.INVOKESPECIAL ||
+ instr.getOpcode() == Opcode.INVOKEVIRTUAL) {
+ int pc_index = instr.getShort(1);
+ CPRefInfo ref = (CPRefInfo)cf.constant_pool.get(pc_index);
+ String className = ref.getClassName();
+ String methodName = ref.getNameAndTypeInfo().getName();
+ if (methodName.equals("toString")) {
+ if (!className.equals("java/lang/Object"))
+ throw new IllegalStateException("Must directly refer to j.l.Object");
+ } else if (methodName.startsWith("refTo")) {
+ String expectedClass = methodName.substring("refTo".length());
+ if (!className.replace("/", "").equals(expectedClass)) {
+ throw new IllegalStateException("Unexpected reference to: " +
+ className + ", should be " + expectedClass);
+ }
+ }
+ }
+ if (instr.getOpcode() == Opcode.GETFIELD ||
+ instr.getOpcode() == Opcode.PUTFIELD) {
+ int pc_index = instr.getShort(1);
+ CPRefInfo ref = (CPRefInfo)cf.constant_pool.get(pc_index);
+ String className = ref.getClassName();
+ String fieldName = ref.getNameAndTypeInfo().getName();
+ if (fieldName.startsWith("refTo")) {
+ String expectedClass = fieldName.substring("refTo".length());
+ if (!className.replace("/", "").equals(expectedClass)) {
+ throw new IllegalStateException("Unexpected reference to: " +
+ className + ", should be " + expectedClass);
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new Error("error reading " + clazz +": " + e);
+ }
+ }
+}
+
+class OtherPackageTest extends base.Base {
+ void run() {
+ new Runnable() {
+ public void run() {
+ OtherPackageTest.super.refTobaseBase();
+ OtherPackageTest.super.refTobaseBase = OtherPackageTest.super.refTobaseBase + 1;
+ OtherPackageTest.super.toString();
+ refTotestOtherPackageTest();
+ refTotestOtherPackageTest = refTotestOtherPackageTest + 1;
+ OtherPackageTest.this.refTotestOtherPackageTest();
+ OtherPackageTest.this.refTotestOtherPackageTest =
+ OtherPackageTest.this.refTotestOtherPackageTest + 1;
+ }
+ }.run();
+ super.refTobaseBase();
+ super.refTobaseBase = super.refTobaseBase + 1;
+ super.toString();
+ OtherPackageTest.super.refTobaseBase();
+ OtherPackageTest.super.refTobaseBase = OtherPackageTest.super.refTobaseBase + 1;
+ OtherPackageTest.super.toString();
+ refTotestOtherPackageTest();
+ refTotestOtherPackageTest = refTotestOtherPackageTest + 1;
+ }
+
+ static class InnerBase {
+ private void refTotestOtherPackageTest$InnerBase() { }
+ }
+ static class InnerTest extends InnerBase {
+ void run() {
+ new Runnable() {
+ public void run() {
+ InnerTest.super.refTotestOtherPackageTest$InnerBase();
+ }
+ }.run();
+ super.refTotestOtherPackageTest$InnerBase();
+ InnerTest.super.refTotestOtherPackageTest$InnerBase();
+ }
+ }
+}
+
+class CurPackagePrivateBase {
+ void refTotestCurPackagePrivateExt() { }
+ void refTotestCurPackagePrivateTest() { }
+ int refTotestCurPackagePrivateExt;
+ int refTotestCurPackagePrivateTest;
+}
+
+class CurPackagePrivateExt extends CurPackagePrivateBase {
+}
+
+class CurPackagePrivateTest extends CurPackagePrivateExt {
+ void run() {
+ new Runnable() {
+ public void run() {
+ CurPackagePrivateTest.super.refTotestCurPackagePrivateExt();
+ CurPackagePrivateTest.super.refTotestCurPackagePrivateExt =
+ CurPackagePrivateTest.super.refTotestCurPackagePrivateExt + 1;
+ CurPackagePrivateTest.this.refTotestCurPackagePrivateTest();
+ CurPackagePrivateTest.this.refTotestCurPackagePrivateTest =
+ CurPackagePrivateTest.this.refTotestCurPackagePrivateTest + 1;
+ refTotestCurPackagePrivateTest();
+ refTotestCurPackagePrivateTest = refTotestCurPackagePrivateTest + 1;
+ }
+ }.run();
+ super.refTotestCurPackagePrivateExt();
+ super.refTotestCurPackagePrivateExt = super.refTotestCurPackagePrivateExt + 1;
+ CurPackagePrivateTest.super.refTotestCurPackagePrivateExt();
+ CurPackagePrivateTest.super.refTotestCurPackagePrivateExt =
+ CurPackagePrivateTest.super.refTotestCurPackagePrivateExt + 1;
+ refTotestCurPackagePrivateTest();
+ refTotestCurPackagePrivateTest = refTotestCurPackagePrivateTest + 1;
+ }
+}
diff --git a/langtools/test/tools/javac/expression/_super/NonDirectSuper/Target11.java b/langtools/test/tools/javac/expression/_super/NonDirectSuper/Target11.java
new file mode 100644
index 0000000..a2d1e66
--- /dev/null
+++ b/langtools/test/tools/javac/expression/_super/NonDirectSuper/Target11.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test;
+
+class Target11 extends CurPackagePrivateExt11 {
+ void run() {
+ new Runnable() {
+ public void run() {
+ Target11.super.refTotestCurPackagePrivateBase11();
+ Target11.super.refTotestCurPackagePrivateBase11 =
+ Target11.super.refTotestCurPackagePrivateBase11 + 1;
+ Target11.super.refTotestCurPackagePrivateExt11();
+ Target11.super.refTotestCurPackagePrivateExt11 =
+ Target11.super.refTotestCurPackagePrivateExt11 + 1;
+ Target11.super.toString();
+ refTotestCurPackagePrivateBase11();
+ refTotestCurPackagePrivateBase11 =
+ refTotestCurPackagePrivateBase11 + 1;
+ refTotestTarget11();
+ refTotestTarget11 = refTotestTarget11 + 1;
+ Target11.this.refTotestCurPackagePrivateBase11();
+ Target11.this.refTotestCurPackagePrivateBase11 =
+ Target11.this.refTotestCurPackagePrivateBase11 + 1;
+ Target11.this.refTotestTarget11();
+ Target11.this.refTotestTarget11 =
+ Target11.this.refTotestTarget11 + 1;
+ }
+ }.run();
+ super.refTotestCurPackagePrivateBase11();
+ super.refTotestCurPackagePrivateBase11 =
+ super.refTotestCurPackagePrivateBase11 + 1;
+ super.refTotestCurPackagePrivateExt11();
+ super.refTotestCurPackagePrivateExt11 =
+ super.refTotestCurPackagePrivateExt11 + 1;
+ super.toString();
+
+ Target11.super.refTotestCurPackagePrivateBase11();
+ Target11.super.refTotestCurPackagePrivateBase11 =
+ Target11.super.refTotestCurPackagePrivateBase11 + 1;
+ Target11.super.refTotestCurPackagePrivateExt11();
+ Target11.super.refTotestCurPackagePrivateExt11 =
+ Target11.super.refTotestCurPackagePrivateExt11 + 1;
+
+ refTotestCurPackagePrivateBase11();
+ refTotestCurPackagePrivateBase11 = refTotestCurPackagePrivateBase11 + 1;
+ refTotestTarget11 = refTotestTarget11 + 1;
+ }
+}
+
+class CurPackagePrivateBase11 extends base.Base {
+ protected void refTotestCurPackagePrivateBase11() {}
+ protected int refTotestCurPackagePrivateBase11;
+}
+
+class CurPackagePrivateExt11 extends CurPackagePrivateBase11 { }
diff --git a/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestMethodHandle.java b/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestMethodHandle.java
new file mode 100644
index 0000000..4673643
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestMethodHandle.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8028739
+ * @summary javac generates incorrect descriptor for MethodHandle::invoke
+ * @run testng MethodReferenceTestMethodHandle
+ */
+
+import java.lang.invoke.*;
+import java.util.*;
+
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
+
+@Test
+public class MethodReferenceTestMethodHandle {
+
+ MethodHandles.Lookup lookup = MethodHandles.lookup();
+
+ interface ReplaceItf {
+ Object apply(String a, char b, char c) throws Throwable;
+ }
+
+ interface FormatItf {
+ Object apply(String a, Object... args) throws Throwable;
+ }
+
+ interface AddItf {
+ void apply(List st, int idx, Object v) throws Throwable;
+ }
+
+ public void testVirtual() throws Throwable {
+
+ MethodType mt = MethodType.methodType(String.class, char.class, char.class);
+ MethodHandle ms = lookup.findVirtual(String.class, "replace", mt);
+
+ // --- String.replace(String, char, char) ---
+
+ assertEquals("oome otring to oearch", ms.invoke("some string to search", 's', 'o'));
+
+ ReplaceItf f1 = (a, b, c) -> ms.invoke(a,b,c);
+ assertEquals("oome otring to oearch", f1.apply("some string to search", 's', 'o'));
+
+ ReplaceItf f2 = ms::invoke;
+ assertEquals("oome otring to oearch", f2.apply("some string to search", 's', 'o'));
+ assertEquals("oome otring to oearch", f2.apply("some string to search", new Character('s'), 'o'));
+ assertEquals("oome otring to oearch", ((ReplaceItf) ms::invoke).apply("some string to search", 's', 'o'));
+ }
+
+ public void testStatic() throws Throwable {
+ MethodType fmt = MethodType.methodType(String.class, String.class, (new Object[1]).getClass());
+ MethodHandle fms = lookup.findStatic(String.class, "format", fmt);
+
+ // --- String.format(String, Object...) ---
+
+ assertEquals("Testing One 2 3", fms.invoke("Testing %s %d %x", "One", new Integer(2), 3));
+
+ FormatItf ff2 = fms::invoke;
+ assertEquals("Testing One 2 3", ff2.apply("Testing %s %d %x", "One", new Integer(2), 3));
+ assertEquals("Testing One 2 3", ((FormatItf) fms::invoke).apply("Testing %s %d %x", "One", new Integer(2), 3));
+ assertEquals("Testing One 2 3 four", ff2.apply("Testing %s %d %x %s", "One", new Integer(2), 3, "four"));
+ }
+
+ public void testVoid() throws Throwable {
+ MethodType pmt = MethodType.methodType(void.class, int.class, Object.class);
+ MethodHandle pms = lookup.findVirtual(List.class, "add", pmt);
+ List<String> list = new ArrayList<>();
+
+ // --- List.add(int,String) ---
+
+ pms.invoke(list, 0, "Hi");
+
+ AddItf pf2 = pms::invoke;
+ pf2.apply(list, 1, "there");
+ AddItf pf3 = pms::invokeExact;
+ pf3.apply(list, 2, "you");
+ assertEquals("Hi", list.get(0));
+ assertEquals("there", list.get(1));
+ assertEquals("you", list.get(2));
+ }
+}
diff --git a/langtools/test/tools/javac/processing/model/type/IntersectionPropertiesTest.java b/langtools/test/tools/javac/processing/model/type/IntersectionPropertiesTest.java
index 9beeb63..cbbcfa0 100644
--- a/langtools/test/tools/javac/processing/model/type/IntersectionPropertiesTest.java
+++ b/langtools/test/tools/javac/processing/model/type/IntersectionPropertiesTest.java
@@ -31,26 +31,27 @@
*/
import com.sun.source.util.*;
-import com.sun.tools.javac.api.*;
-import com.sun.tools.javac.file.*;
+import com.sun.tools.javac.util.Assert;
import javax.annotation.processing.*;
-import javax.lang.model.SourceVersion;
import javax.lang.model.type.*;
import javax.lang.model.util.ElementFilter;
import javax.lang.model.element.*;
import javax.tools.*;
import java.util.*;
import java.io.*;
+import javax.lang.model.util.Types;
public class IntersectionPropertiesTest {
private int errors = 0;
private static final String Intersection_name = "IntersectionTest.java";
private static final String Intersection_contents =
+ "import java.util.AbstractList;\n" +
"import java.util.List;\n" +
"import java.io.Serializable;\t" +
- "public class IntersectionTest<S extends List & Serializable> {\n" +
- " void method(S s) { }\n" +
+ "public class IntersectionTest<S extends List & Serializable, One extends AbstractList & Runnable & Serializable, Two extends AbstractList & Serializable & Runnable> {\n" +
+ " void method(S s, One o, Two t) { }\n" +
+ " public static abstract class SubType extends AbstractList implements Runnable, Serializable { } \n" +
"}";
private static final File classesdir = new File("intersectionproperties");
@@ -116,7 +117,8 @@
TypeParameterElement typeParameterElement = ((TypeParameterElement) typeVariable.asElement());
final List<? extends TypeMirror> bounds = typeParameterElement.getBounds();
- final HashSet<TypeMirror> actual = new HashSet<TypeMirror>(processingEnv.getTypeUtils().directSupertypes(upperBound));
+ Types types = processingEnv.getTypeUtils();
+ final HashSet<TypeMirror> actual = new HashSet<TypeMirror>(types.directSupertypes(upperBound));
final HashSet<TypeMirror> expected = new HashSet<TypeMirror>(bounds);
if (!expected.equals(actual)) {
System.err.println("Mismatched expected and actual bounds.");
@@ -128,6 +130,40 @@
System.err.println(" " + tm);
errors++;
}
+
+ TypeVariable oneTypeVariable = (TypeVariable) method.getParameters().get(1).asType();
+ TypeMirror oneUpperBound = oneTypeVariable.getUpperBound();
+ TypeVariable twoTypeVariable = (TypeVariable) method.getParameters().get(2).asType();
+ TypeMirror twoUpperBound = twoTypeVariable.getUpperBound();
+ TypeElement oneUpperBoundElement = (TypeElement) types.asElement(oneUpperBound);
+
+ Assert.checkNonNull(oneUpperBoundElement);
+
+ Assert.check("java.util.AbstractList".equals(oneUpperBoundElement.getSuperclass().toString()),
+ oneUpperBoundElement.getSuperclass().toString());
+
+ List<String> superInterfaces = new java.util.ArrayList<>();
+
+ for (TypeMirror tm : oneUpperBoundElement.getInterfaces()) {
+ superInterfaces.add(tm.toString());
+ }
+
+ Assert.check(java.util.Arrays.asList("java.lang.Runnable",
+ "java.io.Serializable").equals(superInterfaces),
+ superInterfaces);
+
+ Assert.check(types.isSameType(upperBound, types.capture(upperBound)));
+ Assert.check(types.isSameType(types.erasure(typeVariable), types.erasure(upperBound)));
+
+ TypeElement subTypeClass = processingEnv.getElementUtils().getTypeElement("IntersectionTest.SubType");
+
+ Assert.checkNonNull(subTypeClass);
+
+ Assert.check(types.isAssignable(subTypeClass.asType(), oneUpperBound));
+ Assert.check(types.isSameType(oneUpperBound, twoUpperBound));
+ Assert.check(!types.isSameType(upperBound, twoUpperBound));
+ Assert.check(types.isSubtype(subTypeClass.asType(), oneUpperBound));
+ Assert.check(types.isSubtype(oneUpperBound, upperBound));
}
}
diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk
deleted file mode 100644
index 15374ff..0000000
--- a/make/Defs-internal.gmk
+++ /dev/null
@@ -1,383 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Common variables used by all the Java makefiles. This file should
-# not contain rules.
-#
-
-# The build times report is turned off by setting REPORT_BUILD_TIMES to nothing.
-# This is necessary for the target clobber/clean which will erase the
-# directories where the buildtimes are stored.
-REPORT_BUILD_TIMES=1
-# Store the build times in this directory.
-BUILDTIMESDIR=$(ABS_OUTPUTDIR)/tmp/buildtimes
-
-# Record starting time for build of a sub repository.
-define RecordStartTime
-$(MKDIR) -p $(BUILDTIMESDIR)
-$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$1
-$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$1_human_readable
-endef
-
-# Indicate that we started to build a sub repository and record starting time.
-define MakeStart
-$(call RecordStartTime,$1)
-$(PRINTF) "\n\n%s\n%s\n##### %-60.60s #####\n%s\n\n" \
-"########################################################################" \
-"########################################################################" \
-"Entering $1 for target(s) $2" \
-"########################################################################"
-endef
-
-# Record ending time and calculate the difference and store it in a
-# easy to read format. Handles builds that cross midnight. Expects
-# that a build will never take 24 hours or more.
-define RecordEndTime
-$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$1
-$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$1_human_readable
-$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$1` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$1` $1 | \
- $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
- M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
- > $(BUILDTIMESDIR)/build_time_diff_$1
-endef
-
-# Indicate that we are done.
-# Record ending time and print out the total time it took to build.
-define MakeFinish
-$(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,$1),)
-$(PRINTF) "%s\n##### %-60.60s #####\n%s\n##### %-60.60s #####\n%s\n\n" \
-"########################################################################" \
-"Leaving $1 for target(s) $2" \
-"########################################################################" \
-$(if $(REPORT_BUILD_TIMES),"Build time `$(CAT) $(BUILDTIMESDIR)/build_time_diff_$1` for target(s) $2","") \
-"########################################################################"
-endef
-
-# Find all build_time_* files and print their contents in a list sorted
-# on the name of the sub repository.
-define ReportBuildTimes
-$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
-$1 \
-"`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
-"`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
-"`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | $(XARGS) $(CAT) | $(SORT) -k 2`" \
-"`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`"
-endef
-
-ifdef OPENJDK
- ifneq ($(OPENJDK),true)
- x:=$(error "OPENJDK (if defined) can only be set to true")
- endif
-endif
-
-# Define absolute paths to TOPDIRs
-ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)")
-ABS_CORBA_TOPDIR:=$(call OptFullPath,"$(CORBA_TOPDIR)")
-ABS_JAXP_TOPDIR:=$(call OptFullPath,"$(JAXP_TOPDIR)")
-ABS_JAXWS_TOPDIR:=$(call OptFullPath,"$(JAXWS_TOPDIR)")
-ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)")
-ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)")
-ABS_NASHORN_TOPDIR:=$(call OptFullPath,"$(NASHORN_TOPDIR)")
-ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)")
-ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)")
-ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)")
-
-# Macro to return true or false if a file exists and is readable
-define MkExists
-$(shell if [ -r $1 ]; then $(ECHO) true; else $(ECHO) false; fi)
-endef
-
-HOTSPOT_SRC_AVAILABLE := $(call MkExists,$(HOTSPOT_TOPDIR)/make/Makefile)
-ifndef BUILD_HOTSPOT
- ifdef ALT_HOTSPOT_IMPORT_PATH
- BUILD_HOTSPOT := false
- else
- BUILD_HOTSPOT := $(HOTSPOT_SRC_AVAILABLE)
- endif
-endif
-
-LANGTOOLS_SRC_AVAILABLE := $(call MkExists,$(LANGTOOLS_TOPDIR)/make/Makefile)
-ifndef BUILD_LANGTOOLS
- ifdef ALT_LANGTOOLS_DIST
- BUILD_LANGTOOLS := false
- else
- BUILD_LANGTOOLS := $(LANGTOOLS_SRC_AVAILABLE)
- endif
-endif
-
-CORBA_SRC_AVAILABLE := $(call MkExists,$(CORBA_TOPDIR)/make/Makefile)
-ifndef BUILD_CORBA
- ifdef ALT_CORBA_DIST
- BUILD_CORBA := false
- else
- BUILD_CORBA := $(CORBA_SRC_AVAILABLE)
- endif
-endif
-
-JAXP_SRC_AVAILABLE := $(call MkExists,$(JAXP_TOPDIR)/make/Makefile)
-ifndef BUILD_JAXP
- ifdef ALT_JAXP_DIST
- BUILD_JAXP := false
- else
- BUILD_JAXP := $(JAXP_SRC_AVAILABLE)
- endif
-endif
-
-JAXWS_SRC_AVAILABLE := $(call MkExists,$(JAXWS_TOPDIR)/make/Makefile)
-ifndef BUILD_JAXWS
- ifdef ALT_JAXWS_DIST
- BUILD_JAXWS := false
- else
- BUILD_JAXWS := $(JAXWS_SRC_AVAILABLE)
- endif
-endif
-
-JDK_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/make/Makefile)
-ifndef BUILD_JDK
- BUILD_JDK := $(JDK_SRC_AVAILABLE)
-endif
-ifeq ($(JDK_SRC_AVAILABLE),true)
- JDK_CLOSED_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/src/closed)
- ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false)
- OPENJDK = true
- endif
-endif
-
-NASHORN_SRC_AVAILABLE := $(call MkExists,$(NASHORN_TOPDIR)/make/Makefile)
-ifndef BUILD_NASHORN
- ifdef ALT_NASHORN_DIST
- BUILD_NASHORN := false
- else
- BUILD_NASHORN := $(NASHORN_SRC_AVAILABLE)
- endif
-endif
-
-DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile)
-ifndef BUILD_DEPLOY
- BUILD_DEPLOY := $(DEPLOY_SRC_AVAILABLE)
-endif
-
-INSTALL_SRC_AVAILABLE := $(call MkExists,$(INSTALL_TOPDIR)/make/Makefile)
-ifndef BUILD_INSTALL
- ifdef DEV_ONLY
- BUILD_INSTALL := false
- else
- BUILD_INSTALL := $(INSTALL_SRC_AVAILABLE)
- endif
-endif
-
-SPONSORS_SRC_AVAILABLE := $(call MkExists,$(SPONSORS_TOPDIR)/make/Makefile)
-ifndef BUILD_SPONSORS
- ifdef DEV_ONLY
- BUILD_SPONSORS := false
- else
- BUILD_SPONSORS := $(SPONSORS_SRC_AVAILABLE)
- endif
-endif
-
-
-# Do we build the source bundles?
-BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
-ifeq ($(SKIP_BUNDLES_BUILD), true)
- BUNDLE_RULES_AVAILABLE := false
-else
- BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
-endif
-
-# Current things we do NOT build for OPENJDK
-ifdef OPENJDK
- BUILD_DEPLOY = false
- BUILD_INSTALL = false
- BUILD_SPONSORS = false
- BUNDLE_RULES_AVAILABLE := false
- # These could be over-ridden on the command line or in environment
- ifndef SKIP_FASTDEBUG_BUILD
- SKIP_FASTDEBUG_BUILD = true
- endif
- ifndef SKIP_DEBUG_BUILD
- SKIP_DEBUG_BUILD = true
- endif
- ifndef SKIP_COMPARE_IMAGES
- SKIP_COMPARE_IMAGES = true
- endif
-else
-
- # Various non-OPENJDK reasons to NOT build the deploy repository
- ifeq ($(ARCH), ia64)
- BUILD_DEPLOY=false
- endif
- ifeq ($(ARCH), sparcv9)
- BUILD_DEPLOY=false
- endif
- ifeq ($(ARCH), amd64)
- ifeq ($(PLATFORM), solaris)
- BUILD_DEPLOY=false
- endif
- endif
-
-endif
-ifndef SKIP_PRODUCT_BUILD
- SKIP_PRODUCT_BUILD = false
-endif
-
-# Many reasons why we would want to skip the comparison to previous jdk
-ifndef SKIP_COMPARE_IMAGES
- ifeq ($(BUILD_JDK), false)
- SKIP_COMPARE_IMAGES = true
- endif
- ifeq ($(BUILD_DEPLOY), false)
- SKIP_COMPARE_IMAGES = true
- endif
- ifeq ($(BUILD_INSTALL), false)
- SKIP_COMPARE_IMAGES = true
- endif
- ifdef DEV_ONLY
- SKIP_COMPARE_IMAGES = true
- endif
-endif
-
-# Select defaults if these are not set to true or false
-ifndef SKIP_DEBUG_BUILD
- SKIP_DEBUG_BUILD=true
-endif
-ifndef SKIP_FASTDEBUG_BUILD
- SKIP_FASTDEBUG_BUILD=true
-endif
-
-# Select javadoc setting GENERATE_DOCS
-ifndef NO_DOCS
- # Default value (we want javadoc run)
- GENERATE_DOCS=true
- # No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds
- ifndef OPENJDK
- ifdef JDK_UPDATE_VERSION
- GENERATE_DOCS=false
- endif
- endif
- # If langtools, corba, jaxp, and jaxws are not being built,
- # a full jdk javadoc is not possible
- ifneq ($(BUILD_LANGTOOLS), true)
- GENERATE_DOCS=false
- endif
- ifneq ($(BUILD_CORBA), true)
- GENERATE_DOCS=false
- endif
- ifneq ($(BUILD_JAXP), true)
- GENERATE_DOCS=false
- endif
- ifneq ($(BUILD_JAXWS), true)
- GENERATE_DOCS=false
- endif
- ifeq ($(GENERATE_DOCS),false)
- NO_DOCS=true
- endif
-else
- GENERATE_DOCS=false
-endif
-
-# Output directory for hotspot build
-HOTSPOT_DIR = $(ABS_OUTPUTDIR)/hotspot
-
-# If we are building components
-ifndef ALT_LANGTOOLS_DIST
- LANGTOOLS_OUTPUTDIR = $(ABS_OUTPUTDIR)/langtools
- ABS_LANGTOOLS_DIST = $(LANGTOOLS_OUTPUTDIR)/dist
-endif
-ifndef ALT_CORBA_DIST
- CORBA_OUTPUTDIR = $(ABS_OUTPUTDIR)/corba
- ABS_CORBA_DIST = $(CORBA_OUTPUTDIR)/dist
-endif
-ifndef ALT_JAXP_DIST
- JAXP_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxp
- ABS_JAXP_DIST = $(JAXP_OUTPUTDIR)/dist
-endif
-ifndef ALT_JAXWS_DIST
- JAXWS_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxws
- ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist
-endif
-ifndef ALT_NASHORN_DIST
- NASHORN_OUTPUTDIR = $(ABS_OUTPUTDIR)/nashorn
- ABS_NASHORN_DIST = $(NASHORN_OUTPUTDIR)/dist
-endif
-
-# Common make arguments (supplied to all component builds)
-COMMON_BUILD_ARGUMENTS = \
- JDK_TOPDIR=$(ABS_JDK_TOPDIR) \
- JDK_MAKE_SHARED_DIR=$(ABS_JDK_TOPDIR)/make/common/shared \
- EXTERNALSANITYCONTROL=true \
- SOURCE_LANGUAGE_VERSION=$(SOURCE_LANGUAGE_VERSION) \
- TARGET_CLASS_VERSION=$(TARGET_CLASS_VERSION) \
- MILESTONE=$(MILESTONE) \
- BUILD_NUMBER=$(BUILD_NUMBER) \
- JDK_BUILD_NUMBER=$(JDK_BUILD_NUMBER) \
- FULL_VERSION=$(FULL_VERSION) \
- PREVIOUS_JDK_VERSION=$(PREVIOUS_JDK_VERSION) \
- JDK_VERSION=$(JDK_VERSION) \
- JDK_MKTG_VERSION=$(JDK_MKTG_VERSION) \
- JDK_MAJOR_VERSION=$(JDK_MAJOR_VERSION) \
- JDK_MINOR_VERSION=$(JDK_MINOR_VERSION) \
- JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \
- PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \
- PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \
- PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION)
-
-ifdef OPENJDK
- COMMON_BUILD_ARGUMENTS += OPENJDK=$(OPENJDK)
-endif
-
-ifdef ARCH_DATA_MODEL
- COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
-endif
-
-ifeq ($(DEBUG_NAME), debug)
- COMMON_BUILD_ARGUMENTS += VARIANT=DBG DEBUG_CLASSFILES=true
-endif
-
-ifeq ($(DEBUG_NAME), fastdebug)
- COMMON_BUILD_ARGUMENTS += VARIANT=DBG FASTDEBUG=true DEBUG_CLASSFILES=true
-endif
-
-ifdef COOKED_JDK_UPDATE_VERSION
- COMMON_BUILD_ARGUMENTS += COOKED_JDK_UPDATE_VERSION=$(COOKED_JDK_UPDATE_VERSION)
-endif
-
-ifdef COOKED_BUILD_NUMBER
- COMMON_BUILD_ARGUMENTS += COOKED_BUILD_NUMBER=$(COOKED_BUILD_NUMBER)
-endif
-
-ifdef ANT_HOME
- COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)"
-endif
-
-# When all repos support FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES,
-# then these can be set here:
-#ifdef FULL_DEBUG_SYMBOLS
-# COMMON_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
-#endif
-#
-#ifdef ZIP_DEBUGINFO_FILES
-# COMMON_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
-#endif
diff --git a/common/makefiles/HotspotWrapper.gmk b/make/HotspotWrapper.gmk
similarity index 100%
rename from common/makefiles/HotspotWrapper.gmk
rename to make/HotspotWrapper.gmk
diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
new file mode 100644
index 0000000..70c9a67
--- /dev/null
+++ b/make/Javadoc.gmk
@@ -0,0 +1,1210 @@
+# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include $(SPEC)
+include MakeBase.gmk
+
+.SUFFIXES: # Delete the default suffixes
+.SUFFIXES: .java
+
+#
+# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
+#
+
+DOCSDIR=$(OUTPUT_ROOT)/docs
+TEMPDIR=$(OUTPUT_ROOT)/docstemp
+
+JDK_SHARE_SRC=$(JDK_TOPDIR)/src/share
+JDK_SHARE_CLASSES=$(JDK_SHARE_SRC)/classes
+
+JDK_IMPSRC = $(JDK_OUTPUTDIR)/impsrc
+
+JDK_GENSRC = $(JDK_OUTPUTDIR)/gensrc
+
+HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
+
+BUILD_NUMBER=$(JDK_BUILD_NUMBER)
+
+JAVADOC_CMD = $(JAVA) \
+ -Xmx1024m \
+ -Djava.awt.headless=true \
+ $(NEW_JAVADOC) \
+ -bootclasspath $(JDK_OUTPUTDIR)/classes
+
+# Copyright year for beginning of Java and some of the apis
+# (Needed when creating the javadocs)
+FIRST_COPYRIGHT_YEAR = 1993
+DOMAPI_FIRST_COPYRIGHT_YEAR = 2005
+MIRROR_FIRST_COPYRIGHT_YEAR = 2004
+DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993
+TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993
+JDI_FIRST_COPYRIGHT_YEAR = 1999
+JAAS_FIRST_COPYRIGHT_YEAR = 1998
+JGSS_FIRST_COPYRIGHT_YEAR = 2000
+SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005
+HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005
+MGMT_FIRST_COPYRIGHT_YEAR = 2003
+ATTACH_FIRST_COPYRIGHT_YEAR = 2005
+JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006
+SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
+TRACING_FIRST_COPYRIGHT_YEAR = 2008
+TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
+JNLP_FIRST_COPYRIGHT_YEAR = 1998
+PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
+
+# Oracle name
+FULL_COMPANY_NAME = Oracle and/or its affiliates
+
+# Copyright address
+COMPANY_ADDRESS = 500 Oracle Parkway<br>Redwood Shores, CA 94065 USA.
+
+# The trademark symbol
+TRADEMARK = ™
+
+# Common copyright lines used
+# The word "Copyright" might optionally be a link to the file cpyr.html.
+# The first year of copyright may vary or not be available.
+# The address to the company might be optional.
+COMMA:= ,
+EMPTY:=
+SPACE:=$(EMPTY) $(EMPTY)
+COPYRIGHT_SYMBOL = &\#x00a9;
+# Macro to construct the copyright line
+# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
+define CopyrightLine # optionalurl optionalfirstyear optionaladdress
+$(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
+$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
+$(FULL_COMPANY_NAME). $3 All rights reserved.
+endef
+
+# Url to root of documents
+DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
+
+# Url to copyright html file
+COPYRIGHT_URL-7 = $(DOCSDIR_URL)/legal/cpyr.html
+# This isn't added in old build yet.
+#COPYRIGHT_URL-8 = $(DOCSDIR_URL)/legal/cpyr.html
+COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
+
+# Url to bug filing site
+BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/
+
+# Common line for how to submit a bug or rfe
+BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
+
+# Url to devdocs page
+# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
+DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
+DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
+DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
+DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
+
+# Common Java trademark line
+JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
+$(FULL_COMPANY_NAME) in the US and other countries.
+
+#################################################################
+# Macros:
+
+
+# List of all possible directories for javadoc to look for sources
+# NOTE: Quotes are required around sourcepath argument only on Windows.
+# Otherwise, you get "No packages or classes specified." due
+# to $(PATH_SEP) being interpreted as an end of
+# command (newline or shell ; character)
+ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
+ $(JDK_IMPSRC) \
+ $(JDK_GENSRC) \
+ $(JDK_OUTPUTDIR)/gendocsrc_rmic \
+ $(JDK_TOPDIR)/src/solaris/classes \
+ $(JDK_TOPDIR)/src/windows/classes \
+ $(JDK_SHARE_SRC)/doc/stub
+
+# List of directories that actually exist
+ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
+
+# List with classpath separator between them
+EMPTY:=
+SPACE:= $(EMPTY) $(EMPTY)
+RELEASEDOCS_SOURCEPATH = \
+ $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS)))
+
+define prep-target
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+endef
+
+# Prep for javadoc creation, assumes $@ is an index.html file
+define prep-javadoc
+ @if [ -f "$@" -a "$?" != "" ] ; then \
+ $(ECHO) "# Dependencies have changed: $?"; \
+ fi
+ $(RM) -r $(@D)
+ $(MKDIR) -p $(@D)
+endef
+
+# A cache of the directories in ALL_SOURCE_DIRS
+DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
+
+# Given a list of packages, return a list of files or dirs to be dependent on
+# (Currently only returning a list of directories)
+define PackageDependencies # packages
+ $(shell \
+ if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
+ for p in $1 ; do \
+ pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
+ $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
+ done; \
+ fi \
+ )
+endef
+
+# Given a list of packages, add packages that exist to $@, print summary
+define PackageFilter # packages
+ @if [ "$1" != "" ] ; then \
+ for p in $1 ; do \
+ pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
+ found="false"; \
+ for cp in $(ALL_SOURCE_DIRS) ; do \
+ if [ -d $${cp}/$${pd} ] ; then \
+ $(ECHO) "$${p}" >> $@; \
+ found="true"; \
+ break; \
+ fi; \
+ done; \
+ if [ "$${found}" = "false" ] ; then \
+ $(ECHO) "WARNING: Package not found: $${p}"; \
+ fi; \
+ done; \
+ fi
+endef
+
+# Print out a summary of the javadoc command about to be run
+define JavadocSummary # optionsfile packagesfile
+ @$(ECHO) "# Summary for $@"; \
+ $(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@# @' $1; \
+ $(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@# @' $2
+endef
+
+#
+# Temporary directory for javadoc creation
+#
+DOCSTMPDIR = $(TEMPDIR)/doctmp
+
+#
+# Different api directories created from root directory
+#
+COREAPI_DOCSDIR = $(DOCSDIR)/api
+JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
+JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
+PLATFORM_DOCSDIR = $(DOCSDIR)/platform
+
+# The non-core api javadocs need to be able to access the root of the core
+# api directory, so for jdk/api or jre/api to get to the core api/
+# directory we would use this:
+JDKJRE2COREAPI = ../../api
+
+# Common bottom argument
+define CommonBottom # year
+<font size="-1"><br> $(call CopyrightLine,,$1,)</font>
+endef
+
+# Common trademark bottom argument (Not sure why this is used sometimes)
+define CommonTrademarkBottom # year
+<font size="-1">\
+$(BUG_SUBMIT_LINE)<br>$(JAVA_TRADEMARK_LINE)<br>\
+$(call CopyrightLine,,$1,$(COMPANY_ADDRESS))\
+</font>
+endef
+
+# Common echo of option
+define OptionOnly # opt
+ $(PRINTF) "%s\n" "$1"
+endef
+define OptionPair # opt arg
+ $(PRINTF) "%s '%s'\n" "$1" '$2'
+endef
+define OptionTrip # opt arg arg
+ $(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
+endef
+
+# Core api bottom argument (with special sauce)
+COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\
+<br>For further API reference and developer documentation, \
+see <a href="$(DEV_DOCS_URL)" target="_blank">Java SE Documentation</a>. \
+That documentation contains more detailed, developer-targeted descriptions, \
+with conceptual overviews, definitions of terms, workarounds, \
+and working code examples.<br>\
+$(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
+</font>
+
+# Common javadoc options used by all
+COMMON_JAVADOCFLAGS = \
+ -XDignore.symbol.file=true \
+ -quiet \
+ -use \
+ -keywords \
+ -Xdoclint:none \
+ -Xprofilespath $(JDK_TOPDIR)/make/profile-rtjar-includes.txt \
+ $(ADDITIONAL_JAVADOCFLAGS)
+
+ifdef OPENJDK
+ ADDITIONAL_JAVADOCFLAGS = \
+ -Xdocrootparent $(DOCS_BASE_URL)
+else
+ ADDITIONAL_JAVADOCFLAGS =
+endif
+
+# Draft used for non-fcs documents
+DRAFT_HEADER =
+ifneq ($(MILESTONE), fcs)
+ DRAFT_HEADER = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
+ DRAFT_BOTTOM = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
+ DRAFT_WINTITLE = $(BUILD_NUMBER)
+ # Early access top text (not used in FCS releases)
+ COREAPI_TOP_EARLYACCESS = \
+<div style="background-color: \#EEEEEE"> \
+<div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
+margin-left: 6px; margin-right: 6px; text-align: justify; \
+font-size: 80%; font-family: Helvetica, Arial, sans-serif; \
+font-weight: normal;"> \
+Please note that the specifications and other information \
+contained herein are not final and are subject to change. \
+The information is being made available to you solely for purpose of \
+evaluation. \
+</div> </div>
+
+endif
+
+#################################################################
+
+#
+# CORE_PKGS environment variable has been moved to the following file
+#
+include CORE_PKGS.gmk
+
+#
+# Load environment variables for API package names that are not part of
+# the Java SE platform
+#
+include NON_CORE_PKGS.gmk
+
+#################################################################
+
+#
+# Default target is same as docs target, create core api and all others it can
+#
+
+all: docs
+docs: coredocs otherdocs
+
+#################################################################
+# Production Targets -- USE THESE TARGETS WHEN:
+# a) You're generating docs outside of release engineering's
+# standard control build.
+# b) The docs will be pushed to the web and/or included in
+# the downloaded doc bundle.
+#
+# See: Notes.html#releaseTargets
+# Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
+#
+
+sanitycheckcoredocs:
+ @$(ECHO) ""
+ @$(ECHO) "Building core api docs with these values:"
+ @$(ECHO) " BUILD_NUMBER = $(BUILD_NUMBER)"
+ @$(ECHO) " MILESTONE = $(MILESTONE)"
+ @$(ECHO) ""
+ ifeq ($(BUILD_NUMBER), b00)
+ @$(ECHO) "ERROR: Build number must be defined"
+ @$(ECHO) "MILESTONE is set to $(MILESTONE)"
+ @$(ECHO) ""
+ exit 1
+ endif
+
+#############################################################
+#
+# coredocs
+#
+COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
+$(JDK_MINOR_VERSION)<br>API Specification
+COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
+COREAPI_HEADER = \
+<strong>Java$(TRADEMARK) Platform<br>Standard Ed. $(JDK_MINOR_VERSION)</strong>
+
+# Java language specification cite
+TAG_JLS = jls:a:See <cite> \
+The Java™ Language Specification</cite>:
+
+# Overview file for core apis
+COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html
+
+# The index.html, options, and packages files
+COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
+COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
+COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
+
+coredocs: $(COREAPI_INDEX_FILE)
+
+# Set relative location to core api document root
+$(COREAPI_INDEX_FILE): GET2DOCSDIR=..
+
+# Run javadoc if the index file is out of date or missing
+$(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE)
+ $(prep-javadoc)
+ $(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ISO-8859-1) ; \
+ $(call OptionPair,-tag,beaninfo:X) ; \
+ $(call OptionPair,-tag,revised:X) ; \
+ $(call OptionPair,-tag,since.unbundled:X) ; \
+ $(call OptionPair,-tag,spec:X) ; \
+ $(call OptionPair,-tag,specdefault:X) ; \
+ $(call OptionPair,-tag,Note:X) ; \
+ $(call OptionPair,-tag,ToDo:X) ; \
+ $(call OptionPair,-tag,apiNote:a:API Note:) ; \
+ $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \
+ $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \
+ $(call OptionPair,-tag,param) ; \
+ $(call OptionPair,-tag,return) ; \
+ $(call OptionPair,-tag,throws) ; \
+ $(call OptionPair,-tag,since) ; \
+ $(call OptionPair,-tag,version) ; \
+ $(call OptionPair,-tag,serialData) ; \
+ $(call OptionPair,-tag,factory) ; \
+ $(call OptionPair,-tag,see) ; \
+ $(call OptionPair,-tag,$(TAG_JLS)) ; \
+ $(call OptionOnly,-splitIndex) ; \
+ $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
+ $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ; \
+ $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ ) >> $@
+ ifdef COREAPI_TOP_EARLYACCESS
+ @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
+ endif
+
+# Create a file with the package names in it
+$(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(CORE_PKGS))
+
+#############################################################
+#
+# docletapidocs
+#
+
+ALL_OTHER_TARGETS += docletapidocs
+
+DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
+DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
+DOCLETAPI_DOCTITLE := Doclet API
+DOCLETAPI_WINDOWTITLE := Doclet API
+DOCLETAPI_HEADER := <strong>Doclet API</strong>
+DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
+DOCLETAPI_GROUPNAME := Packages
+DOCLETAPI_REGEXP := com.sun.javadoc
+# DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
+DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
+DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages
+
+docletapidocs: $(DOCLETAPI_INDEX_FILE)
+
+# Set relative location to core api document root
+$(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(DOCLETAPI_OPTIONS_FILE):
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionOnly,-breakiterator) ; \
+ $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
+ $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(DOCLETAPI_PKGS))
+
+#############################################################
+#
+# tagletapidocs
+#
+
+ALL_OTHER_TARGETS += tagletapidocs
+TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
+TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
+TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
+# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
+
+# Temporary directory (special generation rules)
+TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
+
+# The index.html, options, and packages files
+TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
+TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
+TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
+
+tagletapidocs: $(TAGLETAPI_INDEX_FILE)
+
+# Set relative location to core api document root
+$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(RM) -r $(TAGLETAPI_TEMPDIR)
+ $(MKDIR) -p $(TAGLETAPI_TEMPDIR)
+ $(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \
+ @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
+ cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
+ cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
+ $(RM) -r $(TAGLETAPI_TEMPDIR)
+
+# Create file with javadoc options in it
+$(TAGLETAPI_OPTIONS_FILE):
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionOnly,-nonavbar) ; \
+ $(call OptionOnly,-noindex) ; \
+ $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS))
+ $(prep-target)
+ @($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
+
+#############################################################
+#
+# domapidocs
+#
+
+ALL_OTHER_TARGETS += domapidocs
+
+DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
+DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
+DOMAPI_DOCTITLE := Common DOM API
+DOMAPI_WINDOWTITLE := Common DOM API
+DOMAPI_HEADER := <strong>Common DOM API</strong>
+DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
+DOMAPI_GROUPNAME := Packages
+DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
+# DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
+DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
+DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages
+
+domapidocs: $(DOMAPI_INDEX_FILE)
+
+# Set relative location to core api document root
+$(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(DOMAPI_OPTIONS_FILE):
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionOnly,-splitIndex) ; \
+ $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
+ $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(DOMAPI_PKGS))
+
+#############################################################
+#
+# jpdadocs
+#
+
+ALL_OTHER_TARGETS += jpdadocs
+
+jpdadocs: jdidocs jdwpdocs jvmtidocs
+
+#############################################################
+#
+# jdidocs
+#
+
+ALL_OTHER_TARGETS += jdidocs
+
+JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
+JDI2COREAPI := ../../$(JDKJRE2COREAPI)
+JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
+JDI_WINDOWTITLE := Java Debug Interface
+JDI_HEADER := <strong>Java Debug Interface</strong>
+JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
+JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
+# JDI_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
+JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
+JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages
+
+jdidocs: $(JDI_INDEX_FILE)
+
+# Set relative location to core api document root
+$(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
+ $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(JDI_PKGS))
+
+#############################################################
+#
+# jdwpdocs
+#
+
+ALL_OTHER_TARGETS += jdwpdocs
+
+JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
+
+jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
+$(JDWP_DOCDIR)/jdwp-protocol.html : $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(CP) $< $@
+
+#############################################################
+#
+# jvmtidocs
+#
+
+ALL_OTHER_TARGETS += jvmtidocs
+
+JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
+JVMTI_HTML = $(HOTSPOT_DIST)/docs/platform/jvmti/jvmti.html
+
+jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
+$(JVMTI_DOCDIR)/jvmti.html:
+ @$(prep-javadoc)
+ @if [ -f $(JVMTI_HTML) ] ; then \
+ $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
+ $(CP) $(JVMTI_HTML) $@; \
+ else \
+ $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
+ fi
+
+#############################################################
+#
+# jaasdocs
+#
+
+ALL_OTHER_TARGETS += jaasdocs
+
+JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
+JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
+JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
+JAAS_WINDOWTITLE := Java Authentication and Authorization Service
+JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
+JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
+# JAAS_PKGS is located in NON_CORE_PKGS.gmk
+JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
+
+# The index.html, options, and packages files
+JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
+JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
+JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages
+
+jaasdocs: $(JAAS_INDEX_FILE)
+
+# Set relative location to core api document root
+$(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
+ $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(JAAS_PKGS))
+
+#############################################################
+#
+# jgssdocs
+#
+
+ALL_OTHER_TARGETS += jgssdocs
+
+JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
+JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
+JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
+JGSS_WINDOWTITLE := Java GSS-API Utilities
+JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
+JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
+JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
+# JGSS_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
+JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
+JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages
+
+jgssdocs: $(JGSS_INDEX_FILE)
+
+# Set relative location to core api document root
+$(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionOnly,-nodeprecatedlist) ; \
+ $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
+ $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(JGSS_PKGS))
+
+#############################################################
+#
+# smartcardiodocs
+#
+
+ALL_OTHER_TARGETS += smartcardiodocs
+
+SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
+SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
+SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
+SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O
+SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
+SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
+# SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
+SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
+SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages
+
+smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
+
+# Set relative location to core api document root
+$(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(SMARTCARDIO_OPTIONS_FILE):
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionOnly,-nodeprecatedlist) ; \
+ $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
+ $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
+ $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(SMARTCARDIO_PKGS))
+
+#############################################################
+#
+# httpserverdocs
+#
+
+ALL_OTHER_TARGETS += httpserverdocs
+
+HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
+HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
+HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
+HTTPSERVER_WINDOWTITLE := Java HTTP Server
+HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
+HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
+# HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
+
+HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
+HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
+HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages
+
+httpserverdocs: $(HTTPSERVER_INDEX_HTML)
+
+# Set relative location to core api document root
+$(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(HTTPSERVER_OPTIONS_FILE):
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionOnly,-nodeprecatedlist) ; \
+ $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
+ $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
+ $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(HTTPSERVER_PKGS))
+
+#############################################################
+#
+# mgmtdocs
+#
+
+ALL_OTHER_TARGETS += mgmtdocs
+
+MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
+MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
+JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
+JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
+MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
+MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
+MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
+MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
+MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
+# MGMT_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
+MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
+MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages
+
+mgmtdocs: $(MGMT_INDEX_FILE)
+
+# Set relative location to core api document root
+$(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ @if [ -f $(JVM_MIB_SRC) ] ; then \
+ $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
+ $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
+ else \
+ $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
+ fi
+ $(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionOnly,-nodeprecatedlist) ; \
+ $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
+ $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(MGMT_PKGS))
+
+#############################################################
+#
+# attachdocs
+#
+
+ALL_OTHER_TARGETS += attachdocs
+
+ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
+ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
+ATTACH_DOCTITLE := Attach API
+ATTACH_WINDOWTITLE := Attach API
+ATTACH_HEADER := <strong>Attach API</strong>
+ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
+# ATTACH_PKGS is located in NON_CORE_PKGS.gmk
+
+ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
+ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
+ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages
+
+attachdocs: $(ATTACH_INDEX_HTML)
+
+# Set relative location to core api document root
+$(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(ATTACH_OPTIONS_FILE):
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionOnly,-nodeprecatedlist) ; \
+ $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(ATTACH_PKGS))
+
+#############################################################
+#
+# jconsoledocs
+#
+
+ALL_OTHER_TARGETS += jconsoledocs
+
+JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
+JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
+JCONSOLE_DOCTITLE := JConsole API
+JCONSOLE_WINDOWTITLE := JConsole API
+JCONSOLE_HEADER := <strong>JConsole API</strong>
+JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
+# JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk
+
+JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
+JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
+JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages
+
+jconsoledocs: $(JCONSOLE_INDEX_HTML)
+
+# Set relative location to core api document root
+$(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(JCONSOLE_OPTIONS_FILE):
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionOnly,-nodeprecatedlist) ; \
+ $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(JCONSOLE_PKGS))
+
+#############################################################
+#
+# treeapidocs
+#
+
+ALL_OTHER_TARGETS += treeapidocs
+
+TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
+TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
+TREEAPI_DOCTITLE := Compiler Tree API
+TREEAPI_WINDOWTITLE := Compiler Tree API
+TREEAPI_HEADER := <strong>Compiler Tree API</strong>
+TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
+TREEAPI_GROUPNAME := Packages
+TREEAPI_REGEXP := com.sun.source.*
+# TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
+
+TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
+TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
+TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
+
+treeapidocs: $(TREEAPI_INDEX_HTML)
+
+# Set relative location to core api document root
+$(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(TREEAPI_OPTIONS_FILE):
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-tag,$(TAG_JLS)) ; \
+ $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
+ $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(TREEAPI_PKGS))
+
+#############################################################
+#
+# sctpdocs
+#
+
+ALL_OTHER_TARGETS += sctpdocs
+
+SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
+SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
+SCTPAPI_DOCTITLE := SCTP API
+SCTPAPI_WINDOWTITLE := SCTP API
+SCTPAPI_HEADER := <strong>SCTP API</strong>
+SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
+# SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
+
+SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
+SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
+SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages
+
+sctpdocs: $(SCTPAPI_INDEX_HTML)
+
+# Set relative location to core api document root
+$(SCTPAPI_INDEX_HTML): GET2DOCSDIR=$(SCTPAPI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) coredocs
+ $(prep-javadoc)
+ $(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
+ $(JAVADOC_CMD) -d $(@D) \
+ @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(SCTPAPI_OPTIONS_FILE):
+ $(prep-target)
+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionOnly,-nodeprecatedlist) ; \
+ $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(SCTPAPI_PKGS))
+
+#############################################################
+#
+# Get a cache of all the directories
+
+$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
+ $(prep-target)
+ @for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
+ $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
+ $(FIND) $${cp} -type f >> $@; \
+ done
+
+#############################################################
+#release version of core packages ########
+
+# The rel-coredocs and rel-docs targets were added by Eric Armstrong. rel-coredocs
+# assumes the kind of large, 32-bit machine used in the javapubs group's docs-release
+# process. It specifies memory settings accordingly to maximize performance.
+#
+# The performance settings, like the sanity check, are most important for the core
+# docs--the platform APIs. Running javadoc on those APIs takes a significant amount
+# of time and memory. Setting the initial heap size as large as possible is important
+# to prevent thrashing as the heap grows. Setting the maximum as large as necessary
+# is also important to keep the job from failing.
+#
+# -J-Xmx512 sets a maximum of 512, which became necessary in 6.0
+# -J-Xms256 sets starting size to 256 (default is 8)
+#
+# rel-coredocs also includes a sanity check to help ensure that BUILD_NUMBER and
+# MILESTONE are specified properly when docs are built outside of the normal release
+# engineering process, with the intention of releasing them on the web or in a downloaded
+# docs bundle. (When invoked in release engineering's control build, the values are always
+# set properly. But when the targets are run by themselves, they default to b00 and
+# "internal"--which silently sabotage the result of a build that can take many hours
+# to complete.
+
+# Maximize performance and ensure that build number & milestone are set.
+
+rel-coredocs: sanitycheckcoredocs
+ $(MAKE) coredocs
+
+rel-docs: rel-coredocs $(ALL_OTHER_TARGETS)
+#
+# end of production targets
+
+otherdocs: $(ALL_OTHER_TARGETS)
+
+clean:
+ $(RM) -r $(DOCSDIR) $(DOCSTMPDIR)
+
+#############################################################
+# DEBUG TARGET
+# List the values defined in the makefile hierarchy, to make sure everything
+# is set properly, and to help identify values we can use instead of making new ones.
+# (Most of them come from common/shared/Defs.gmk)
+#
+# Notes:
+# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
+# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
+#
+
+#############################################################
+.PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
+ sanitycheckcoredocs $(ALL_OTHER_TARGETS)
diff --git a/make/Jprt.gmk b/make/Jprt.gmk
new file mode 100644
index 0000000..0075adc
--- /dev/null
+++ b/make/Jprt.gmk
@@ -0,0 +1,248 @@
+#
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This file is included by the root NewerMakefile and contains targets
+# and utilities needed by JPRT.
+
+# Utilities used in this Makefile. Most of this makefile executes without
+# the context of a spec file from configure.
+CAT=cat
+CMP=cmp
+CP=cp
+ECHO=echo
+MKDIR=mkdir
+PRINTF=printf
+PWD=pwd
+# Insure we have a path that looks like it came from pwd
+# (This is mostly for Windows sake and drive letters)
+define UnixPath # path
+$(shell (cd "$1" && $(PWD)))
+endef
+
+BUILD_DIR_ROOT:=$(root_dir)/build
+
+ifdef OPENJDK
+ OPEN_BUILD=true
+else
+ OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
+ $(wildcard $(root_dir)/jdk/make/closed), \
+ $(wildcard $(root_dir)/jdk/test/closed), \
+ $(wildcard $(root_dir)/hotspot/src/closed), \
+ $(wildcard $(root_dir)/hotspot/make/closed), \
+ $(wildcard $(root_dir)/hotspot/test/closed)), \
+ false,true)
+endif
+
+HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
+
+###########################################################################
+# To help in adoption of the new configure&&make build process, a bridge
+# build will use the old settings to run configure and do the build.
+
+# Build with the configure bridge. After running configure, restart make
+# to parse the new spec file.
+BRIDGE_TARGETS := all
+# Add bootcycle-images target if legacy variable is set.
+ifeq ($(SKIP_BOOT_CYCLE),false)
+ BRIDGE_TARGETS += bootcycle-images
+endif
+bridgeBuild: bridge2configure
+ @cd $(root_dir) && $(MAKE) -f Makefile $(BRIDGE_TARGETS)
+
+# Bridge from old Makefile ALT settings to configure options
+bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts
+ bash ./configure $(strip $(shell $(CAT) $<))
+
+# Create a file with configure options created from old Makefile mechanisms.
+$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest
+ $(RM) $@
+ $(CP) $< $@
+
+# Use this file to only change when obvious things have changed
+$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC
+ $(RM) $@.tmp
+ $(MKDIR) -p $(BUILD_DIR_ROOT)
+ @$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
+ ifdef ARCH_DATA_MODEL
+ @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
+ endif
+ ifeq ($(ARCH_DATA_MODEL),32)
+ @$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp
+ endif
+ ifdef ALT_PARALLEL_COMPILE_JOBS
+ @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
+ endif
+ ifdef ALT_BOOTDIR
+ @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
+ endif
+ ifdef ALT_CUPS_HEADERS_PATH
+ @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
+ endif
+ ifdef ALT_FREETYPE_HEADERS_PATH
+ @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
+ endif
+ ifdef ENABLE_SJAVAC
+ @$(ECHO) " --enable-sjavac" >> $@.tmp
+ endif
+ ifeq ($(HOTSPOT_AVAILABLE),false)
+ ifdef ALT_JDK_IMPORT_PATH
+ @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
+ endif
+ endif
+ ifeq ($(OPEN_BUILD),true)
+ @$(ECHO) " --enable-openjdk-only " >> $@.tmp
+ else
+# Todo: move to closed?
+ ifdef ALT_MOZILLA_HEADERS_PATH
+ @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp
+ endif
+ ifdef ALT_JUNIT_DIR
+ @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp
+ endif
+ ifdef ANT_HOME
+ @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp
+ endif
+ ifdef ALT_JAVAFX_ZIP_DIR
+ @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp
+ endif
+ ifdef ALT_JMC_ZIP_DIR
+ @$(ECHO) " --with-jmc-zip-dir=$(call UnixPath,$(ALT_JMC_ZIP_DIR)) " >> $@.tmp
+ endif
+ ifdef ALT_WIXDIR
+ @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
+ endif
+ ifdef ALT_INSTALL_LZMA_PATH
+ @$(ECHO) " --with-lzma-path=$(call UnixPath,$(ALT_INSTALL_LZMA_PATH)) " >> $@.tmp
+ endif
+ ifdef ALT_INSTALL_UPX_PATH
+ @$(ECHO) " --with-upx-path=$(call UnixPath,$(ALT_INSTALL_UPX_PATH)) " >> $@.tmp
+ endif
+ ifdef ALT_INSTALL_UPX_FILENAME
+ @$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
+ endif
+ ifdef ALT_CCSS_SIGNING_DIR
+ @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
+ endif
+ ifdef ALT_SLASH_JAVA
+ @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
+ endif
+ ifdef ALT_SPARKLE_FRAMEWORK_DIR
+ @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
+ endif
+ endif
+ @if [ -f $@ ] ; then \
+ if ! $(CMP) $@ $@.tmp > /dev/null ; then \
+ $(CP) $@.tmp $@ ; \
+ fi ; \
+ else \
+ $(CP) $@.tmp $@ ; \
+ fi
+ $(RM) $@.tmp
+
+PHONY_LIST += bridge2configure bridgeBuild
+
+###########################################################################
+# JPRT targets
+
+ifndef JPRT_ARCHIVE_BUNDLE
+ JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
+endif
+ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
+ JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
+endif
+
+# These targets execute in a SPEC free context, before calling bridgeBuild
+# to generate the SPEC.
+jprt_build_product: DEBUG_LEVEL=release
+jprt_build_product: BUILD_DIRNAME=*-release
+jprt_build_product: jprt_build_generic
+
+jprt_build_fastdebug: DEBUG_LEVEL=fastdebug
+jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug
+jprt_build_fastdebug: jprt_build_generic
+
+jprt_build_debug: DEBUG_LEVEL=slowdebug
+jprt_build_debug: BUILD_DIRNAME=*-debug
+jprt_build_debug: jprt_build_generic
+
+jprt_build_generic: BRIDGE_TARGETS+=jprt_bundle
+jprt_build_generic: bridgeBuild
+
+# This target must be called in the context of a SPEC file
+jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
+ @$(call CheckIfMakeAtEnd)
+
+# This target must be called in the context of a SPEC file
+$(JPRT_ARCHIVE_BUNDLE): bundles
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
+
+SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
+SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
+SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
+SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
+
+# Bundle up the images
+bundles: all bundles-only
+bundles-only: start-make
+ @$(call TargetEnter)
+ $(MKDIR) -p $(BUILD_OUTPUT)/bundles
+ $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
+ $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
+ if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
+ $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
+ fi
+ @$(call TargetExit)
+
+# Copy images to one unified location regardless of platform etc.
+final-images: all final-images-only
+final-images-only: start-make
+ @$(call TargetEnter)
+ $(RM) -r $(BUILD_OUTPUT)/final-images
+ $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
+ $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
+ $(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
+ $(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/
+ ifeq ($(OPENJDK_TARGET_OS),macosx)
+ $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)
+ $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)
+ $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/
+ $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/
+ endif
+ @$(call TargetExit)
+
+
+# Keep track of phony targets
+PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
+ jprt_build_generic bundles jprt_bundle \
+ final-images final-images-only
+
+###########################################################################
+# Phony targets
+.PHONY: $(PHONY_LIST)
+
+# Force target
+FRC:
diff --git a/make/Main.gmk b/make/Main.gmk
new file mode 100644
index 0000000..2988f78
--- /dev/null
+++ b/make/Main.gmk
@@ -0,0 +1,245 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+### This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file.
+
+# Now load the spec
+include $(SPEC)
+
+# Load the vital tools for all the makefiles.
+include $(SRC_ROOT)/make/common/MakeBase.gmk
+
+# Include the corresponding custom file, if present.
+-include $(CUSTOM_MAKE_DIR)/Main.gmk
+
+### Clean up from previous run
+
+# Remove any build.log from a previous run, if they exist
+ifneq (,$(BUILD_LOG))
+ ifneq (,$(BUILD_LOG_PREVIOUS))
+ # Rotate old log
+ $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
+ $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
+ else
+ $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
+ endif
+ $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
+endif
+# Remove any javac server logs and port files. This
+# prevents a new make run to reuse the previous servers.
+ifneq (,$(SJAVAC_SERVER_DIR))
+ $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
+endif
+
+# Reset the build timers.
+$(eval $(call ResetAllTimers))
+
+# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
+# hence this workaround.
+MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
+
+### Main targets
+
+default: jdk
+ @$(call CheckIfMakeAtEnd)
+
+all: images docs
+ @$(call CheckIfMakeAtEnd)
+
+# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
+# is up to date after changes to configure
+$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
+ @$(ECHO) ERROR: $(SPEC) is not up to date
+ @$(ECHO) Please rerun configure!
+ @if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
+
+start-make: $(SPEC)
+ @$(call AtMakeStart)
+
+langtools: langtools-only
+langtools-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(LANGTOOLS_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildLangtools.gmk)
+ @$(call TargetExit)
+
+corba: langtools corba-only
+corba-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(CORBA_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildCorba.gmk)
+ @$(call TargetExit)
+
+jaxp: langtools jaxp-only
+jaxp-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JAXP_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxp.gmk)
+ @$(call TargetExit)
+
+jaxws: langtools jaxp jaxws-only
+jaxws-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JAXWS_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxws.gmk)
+ @$(call TargetExit)
+
+ifeq ($(BUILD_HOTSPOT),true)
+ hotspot: hotspot-only
+ hotspot-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
+ @$(call TargetExit)
+endif
+
+jdk: langtools hotspot corba jaxp jaxws jdk-only
+jdk-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
+ @$(call TargetExit)
+
+nashorn: jdk nashorn-only
+nashorn-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(NASHORN_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
+ @$(call TargetExit)
+
+demos: jdk demos-only
+demos-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos)
+ @$(call TargetExit)
+
+# Note: This double-colon rule is intentional, to support
+# custom make file integration.
+images:: source-tips demos nashorn images-only
+images-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
+ @$(call TargetExit)
+
+overlay-images: source-tips demos overlay-images-only
+overlay-images-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
+ @$(call TargetExit)
+
+profiles: profiles-oscheck source-tips jdk hotspot profiles-only
+profiles-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
+ @$(call TargetExit)
+
+profiles-oscheck:
+ ifneq ($(OPENJDK_TARGET_OS), linux)
+ @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
+ endif
+
+install: images install-only
+install-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk install)
+ @$(call TargetExit)
+
+docs: jdk docs-only
+docs-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
+ @$(call TargetExit)
+
+sign-jars: jdk sign-jars-only
+sign-jars-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
+ @$(call TargetExit)
+
+bootcycle-images: images bootcycle-images-only
+bootcycle-images-only: start-make
+ @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
+ @($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
+
+test: images test-only
+test-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
+ @$(call TargetExit)
+
+# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
+# used to track the exact sources used to build that image.
+source-tips: $(OUTPUT_ROOT)/source_tips
+$(OUTPUT_ROOT)/source_tips: FRC
+ @$(MKDIR) -p $(@D)
+ @$(RM) $@
+ @$(call GetSourceTips)
+
+
+# Remove everything, except the output from configure.
+clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs clean-test
+ @($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
+ @$(ECHO) Cleaned all build artifacts.
+
+# Remove everything, including configure configuration.
+# If the output directory was created by configure and now becomes empty, remove it as well.
+# FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh!
+dist-clean: clean
+ @($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers)
+ @$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
+ if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
+ $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
+ else \
+ ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
+ fi \
+ )
+ @$(ECHO) Cleaned everything, you will have to re-run configure.
+
+clean-langtools:
+ $(call CleanComponent,langtools)
+clean-corba:
+ $(call CleanComponent,corba)
+clean-jaxp:
+ $(call CleanComponent,jaxp)
+clean-jaxws:
+ $(call CleanComponent,jaxws)
+clean-hotspot:
+ $(call CleanComponent,hotspot)
+clean-jdk:
+ $(call CleanComponent,jdk)
+clean-nashorn:
+ $(call CleanComponent,nashorn)
+clean-images:
+ $(call CleanComponent,images)
+clean-overlay-images:
+ $(call CleanComponent,overlay-images)
+clean-bootcycle-build:
+ $(call CleanComponent,bootcycle-build)
+clean-docs:
+ $(call CleanComponent,docs)
+ $(call CleanComponent,docstemp)
+clean-test:
+ $(call CleanComponent,testoutput)
+
+.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
+.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
+.PHONY: default all clean dist-clean bootcycle-images start-make
+.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
+.PHONY: profiles profiles-only profiles-oscheck
+
+FRC: # Force target
diff --git a/common/makefiles/MakeHelpers.gmk b/make/MakeHelpers.gmk
similarity index 100%
rename from common/makefiles/MakeHelpers.gmk
rename to make/MakeHelpers.gmk
diff --git a/make/README.pre-components b/make/README.pre-components
deleted file mode 100644
index cb79e68..0000000
--- a/make/README.pre-components
+++ /dev/null
@@ -1,41 +0,0 @@
-README-pre-components:
----------------------
-Current pre-components are langtools, jaxws, jaxp, and corba.
-
-Pre-components can use ant to build but must have a make/Makefile for
-building (a GNU make Makefile).
-All ant knowledge is being isolated in the workspaces that use it.
-
-Also for various reasons it is nice to have a Makefile wrapper over the
-running of ant, but in general having to do
-anything with shell commands is much easier to do in a Makefile
-than in an ant script.
-
-The make/makefile rules are:
-
- Variables:
- ALT_BOOTDIR The jdk home to use to build, if provided
- ALT_LANGTOOLS_DIST The dist area from a langtools build to use, if provided
- ALT_OUTPUTDIR Parent dir of build and dist directories, if provided
- VARIANT If DBG, debug build, if OPT, optimized build
- TARGET_CLASS_VERSION The classfile version number (currently 7)
- ANT_HOME Home of ant to use, if provided
- QUIET If defined, be quiet
- VERBOSE If defined, be verbose
- JDK_VERSION Version being built
- FULL_VERSION Full version string for this jdk build
- MILESTONE fcs, beta, internal or empty
- BUILD_NUMBER Number of the jdk build
- JPRT_ARCHIVE_BUNDLE Path to zip bundle to create for JPRT
-
- Targets:
- all Build everything, including dist
- build Build build area
- clean Clean up
- clobber Same as clean (don't ask)
- sanity Perform any sanity checks, exit non-zero if errors
- jprt_build_product JPRT product build, zip results into JPRT_ARCHIVE_BUNDLE
- jprt_build_debug JPRT debug build, zip results into JPRT_ARCHIVE_BUNDLE
- jprt_build_fastdebug JPRT fastdebug build, zip results into JPRT_ARCHIVE_BUNDLE
-
-Then of course we expect a dist/lib/classes.jar, dist/lib/src.zip and dist/lib/bin.zip.
diff --git a/common/makefiles/javadoc/CORE_PKGS.gmk b/make/common/CORE_PKGS.gmk
similarity index 100%
rename from common/makefiles/javadoc/CORE_PKGS.gmk
rename to make/common/CORE_PKGS.gmk
diff --git a/common/makefiles/IdlCompilation.gmk b/make/common/IdlCompilation.gmk
similarity index 100%
rename from common/makefiles/IdlCompilation.gmk
rename to make/common/IdlCompilation.gmk
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
new file mode 100644
index 0000000..6180327
--- /dev/null
+++ b/make/common/JavaCompilation.gmk
@@ -0,0 +1,592 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This makefile is much simpler now that it can use the smart javac wrapper
+# for dependency tracking between java packages and incremental compiles.
+# It could be even more simple if we added support for incremental jar updates
+# directly from the smart javac wrapper.
+
+# Cleaning/copying properties here is not a good solution. The properties
+# should be cleaned/copied by a annotation processor in sjavac.
+
+# When you read this source. Remember that $(sort ...) has the side effect
+# of removing duplicates. It is actually this side effect that is
+# desired whenever sort is used below!
+
+ifeq (,$(_MAKEBASE_GMK))
+ $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
+endif
+
+FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
+
+define SetupJavaCompiler
+ # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE
+ # This is the name of the compiler setup.
+ # param 2-9 are named args.
+ # JVM:=The jvm used to run the javac/javah command
+ # JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
+ # FLAGS:=Flags to be supplied to javac
+ # SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
+ # SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
+ $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+ $(call LogSetupMacroEntry,SetupJavaCompiler($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 SetupJavaCompiler, please update JavaCompilation.gmk))
+
+ # The port file contains the tcp/ip on which the server listens
+ # and the cookie necessary to talk to the server.
+ $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
+ # You can use a different JVM to run the background javac server.
+ ifeq ($$($1_SERVER_JVM),)
+ # It defaults to the same JVM that is used to start the javac command.
+ $1_SERVER_JVM:=$$($1_JVM)
+ endif
+endef
+
+define SetupArchive
+ # param 1 is for example ARCHIVE_MYPACKAGE
+ # param 2 are the dependecies
+ # param 3,4,5,6,7,8,9 are named args.
+ # SRCS:=List of directories in where to find files to add to archive
+ # SUFFIXES:=File suffixes to include in jar
+ # INCLUDES:=List of directories/packages in SRCS that should be included
+ # EXCLUDES:=List of directories/packages in SRCS that should be excluded
+ # EXCLUDE_FILES:=List of files in SRCS that should be excluded
+ # EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match.
+ # JAR:=Jar file to create
+ # MANIFEST:=Optional manifest file template.
+ # JARMAIN:=Optional main class to add to manifest
+ # JARINDEX:=true means generate the index in the jar file.
+ # SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically
+ # added to the archive.
+ # EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest.
+ # CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable
+
+ # NOTE: $2 is dependencies, not a named argument!
+ $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+ $(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+ $(if $(findstring $(LOG_LEVEL),trace), $(info *[2] <dependencies> = $(strip $2)))
+ $(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk))
+
+ $1_JARMAIN:=$(strip $$($1_JARMAIN))
+ $1_JARNAME:=$$(notdir $$($1_JAR))
+ $1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest
+ $1_DELETESS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletess
+ $1_DELETES_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletes
+ $1_BIN:=$$(dir $$($1_JAR))
+
+ ifeq (,$$($1_SUFFIXES))
+ # No suffix was set, default to classes.
+ $1_SUFFIXES:=.class
+ endif
+ # Convert suffixes to a find expression
+ $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
+ # On windows, a lot of includes/excludes risk making the command line too long, so
+ # writing the grep patterns to files.
+ ifneq (,$$($1_INCLUDES))
+ $1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS), \
+ $$(addprefix $$(src)/,$$($1_INCLUDES)))
+ # If there are a lot of include patterns, output to file to shorten command lines
+ ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
+ $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
+ else
+ $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include $$(NEWLINE) \
+ $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \
+ >> $$($1_BIN)/_the.$$($1_JARNAME)_include)
+ $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
+ endif
+ endif
+ ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
+ $1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
+ $$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))
+ # If there are a lot of include patterns, output to file to shorten command lines
+ ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
+ $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
+ else
+ $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude $$(NEWLINE) \
+ $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \
+ >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)
+ $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
+ endif
+ endif
+
+ # Check if this jar needs to have its index generated.
+ ifneq (,$$($1_JARINDEX))
+ $1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@))
+ else
+ $1_JARINDEX = true
+ endif
+ # When this macro is run in the same makefile as the java compilation, dependencies are
+ # transfered in make variables. When the macro is run in a different makefile than the
+ # java compilation, the dependencies need to be found in the filesystem.
+ ifneq (,$2)
+ $1_DEPS:=$2
+ else
+ $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \
+ $$(call CacheFind,$$($1_SRCS)))
+ ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
+ $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS))
+ endif
+ ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
+ $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
+ endif
+ # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command
+ # lines, but not here for use in make dependencies.
+ $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
+ ifeq (,$$($1_SKIP_METAINF))
+ $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
+ endif
+ endif
+
+ # Utility macros, to make the shell script receipt somewhat easier to decipher.
+
+ # The capture contents macro finds all files (matching the patterns, typically
+ # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
+ $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
+ (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
+ $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
+ $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES))) > \
+ $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+ # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
+ ifeq (,$$($1_SKIP_METAINF))
+ $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE))
+ endif
+ # The capture deletes macro finds all deleted files and concatenates them. The resulting file
+ # tells us what to remove from the jar-file.
+ $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
+ # The update contents macro updates the jar file with the previously capture contents.
+ # xargs is used to trim the whitespace from the contents file, to see if it is empty.
+ $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
+ (cd $$(src) && \
+ if [ -n "`$(CAT) _the.$$($1_JARNAME)_contents | $(XARGS)`" ]; then \
+ $(ECHO) " updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
+ $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
+ fi) $$(NEWLINE))
+ # The s-variants of the above macros are used when the jar is created from scratch.
+ $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
+ (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
+ $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
+ $$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES))) > \
+ $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+
+ ifeq (,$$($1_SKIP_METAINF))
+ $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \
+ ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \
+ $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+ endif
+ $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
+ (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+
+ # Use a slightly shorter name for logging, but with enough path to identify this jar.
+ $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
+
+ ifneq (,$$($1_CHECK_COMPRESS_JAR))
+ $1_JAR_CREATE_OPTIONS := c0fm
+ $1_JAR_UPDATE_OPTIONS := u0f
+ ifeq ($(COMPRESS_JARS), true)
+ $1_JAR_CREATE_OPTIONS := cfm
+ $1_JAR_UPDATE_OPTIONS := uf
+ endif
+ else
+ $1_JAR_CREATE_OPTIONS := cfm
+ $1_JAR_UPDATE_OPTIONS := uf
+ endif
+
+ # Here is the rule that creates/updates the jar file.
+ $$($1_JAR) : $$($1_DEPS)
+ $(MKDIR) -p $$($1_BIN)
+ $$($1_GREP_INCLUDE_OUTPUT)
+ $$($1_GREP_EXCLUDE_OUTPUT)
+ $$(if $$($1_MANIFEST), \
+ $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
+ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
+ , \
+ $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
+ $$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
+ $$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE))
+ $$(if $$(wildcard $$@), \
+ $(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \
+ $$($1_CAPTURE_CONTENTS) \
+ $$($1_CAPTURE_METAINF) \
+ $(RM) $$($1_DELETES_FILE) $$(NEWLINE) \
+ $$($1_CAPTURE_DELETES) \
+ $(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE) \
+ if [ -s $$($1_DELETESS_FILE) ]; then \
+ $(ECHO) " deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \
+ $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \
+ fi $$(NEWLINE) \
+ $$($1_UPDATE_CONTENTS) true $$(NEWLINE) \
+ $$($1_JARINDEX) && true \
+ , \
+ $(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
+ $$($1_SCAPTURE_CONTENTS) \
+ $$($1_SCAPTURE_METAINF) \
+ $$($1_SUPDATE_CONTENTS) \
+ $$($1_JARINDEX) && true )
+
+endef
+
+define SetupZipArchive
+ # param 1 is for example ZIP_MYSOURCE
+ # param 2,3,4,5,6,7,8,9 are named args.
+ # SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
+ $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+ $(call LogSetupMacroEntry,SetupZipArchive($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 SetupZipArchive, please update JavaCompilation.gmk))
+
+ # To avoid running find over too large sets of files, which causes make to crash
+ # on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
+ # of directories to run find in, if available.
+ ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
+ $1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC), \
+ $$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
+ else
+ $1_FIND_LIST := $$($1_SRC)
+ endif
+
+ # Find all files in the source tree.
+ $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST)))
+
+ # Filter on suffixes if set
+ ifneq ($$($1_SUFFIXES),)
+ $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS))
+ endif
+
+ ifneq ($$($1_INCLUDES),)
+ ifneq ($$($1_SUFFIXES),)
+ $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \
+ $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
+ else
+ $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
+ endif
+ endif
+ ifneq ($$($1_INCLUDE_FILES),)
+ $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
+ endif
+ ifneq ($$($1_EXCLUDES),)
+ $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
+ $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
+ $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
+ endif
+
+ # Use a slightly shorter name for logging, but with enough path to identify this zip.
+ $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP))
+
+ # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
+ # I.e. the zip -i and -x options should match the filtering done in the makefile.
+ # Explicitly excluded files can be given with absolute path. The patsubst solution
+ # isn't perfect but the likelyhood of an absolute path to match something in a src
+ # dir is very small.
+ # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
+ # and only fail if it's not.
+ $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
+ $(MKDIR) -p $$(@D)
+ $(ECHO) Updating $$($1_NAME)
+ $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
+ $(TOUCH) $$@
+endef
+
+define add_file_to_copy
+ # param 1 = BUILD_MYPACKAGE
+ # parma 2 = The source file to copy.
+ $2_TARGET:=$2
+ # Remove the source prefix.
+ $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
+ # Now we can setup the depency that will trigger the copying.
+ $$($1_BIN)$$($2_TARGET) : $2
+ $(MKDIR) -p $$(@D)
+ $(CP) $$< $$@
+ $(CHMOD) -f ug+w $$@
+
+ # And do not forget this target
+ $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
+endef
+
+
+# This macro is used only for properties files that are to be
+# copied over to the classes directory in cleaned form:
+# Previously this was inconsistently done in different repositories.
+# This is the new clean standard. Though it is to be superseded by
+# a standard annotation processor from with sjavac.
+define add_file_to_copy_and_clean
+ # param 1 = BUILD_MYPACKAGE
+ # parma 2 = The source file to copy and clean.
+ $2_TARGET:=$2
+ # Remove the source prefix.
+ $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
+ # Now we can setup the depency that will trigger the copying.
+ $$($1_BIN)$$($2_TARGET) : $2
+ $(MKDIR) -p $$(@D)
+ $(CAT) $$< | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
+ | $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \
+ | $(SED) -e '/^#/d' -e '/^$$$$/d' \
+ -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
+ -e 's/^[ \t]*//;s/[ \t]*$$$$//' \
+ -e 's/\\=/=/' | LANG=C $(SORT) > $$@
+ $(CHMOD) -f ug+w $$@
+
+ # And do not forget this target
+ $1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET)
+endef
+
+define remove_string
+ $2 := $$(subst $1,,$$($2))
+endef
+
+define replace_space_with_pathsep
+ $1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2)))
+endef
+
+define SetupJavaCompilation
+ # param 1 is for example BUILD_MYPACKAGE
+ # param 2,3,4,5,6,7,8 are named args.
+ # SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC
+ # JVM:=path to ..bin/java
+ # ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
+ # SRC:=one or more directories to search for sources
+ # BIN:=store classes here
+ # INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
+ # EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
+ # COPY:=.prp means copy all prp files to the corresponding package in BIN.
+ # CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN.
+ # COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo
+ # SRCZIP:=Create a src.zip based on the found sources and copied files.
+ # INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
+ # EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
+ # "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
+ # JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete
+ # source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
+ # HEADERS:=path to directory where all generated c-headers are written.
+ # DEPENDS:=Extra dependecy
+ $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+ $(call LogSetupMacroEntry,SetupJavaCompilation($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 SetupJavaCompilation, please update JavaCompilation.gmk))
+
+ # Extract the info from the java compiler setup.
+ $1_JVM := $$($$($1_SETUP)_JVM)
+ $1_JAVAC := $$($$($1_SETUP)_JAVAC)
+ $1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS)
+ ifeq ($$($1_JAVAC),)
+ $$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP))
+ endif
+ $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
+ $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
+
+ # Handle addons and overrides.
+ $1_SRC:=$$(call ADD_SRCS,$$($1_SRC))
+ # Make sure the dirs exist.
+ $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d)))
+ $$(eval $$(call MakeDir,$$($1_BIN)))
+ # Find all files in the source trees.
+ $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC)))
+ # Extract the java files.
+ ifneq ($$($1_EXCLUDE_FILES),)
+ $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
+ endif
+ $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$(filter %.java,$$($1_ALL_SRCS)))
+ ifneq ($$($1_INCLUDE_FILES),)
+ $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
+ $1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS))
+ endif
+
+ # Now we have a list of all java files to compile: $$($1_SRCS)
+
+ # Create the corresponding smart javac wrapper command line.
+ $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix .*,$$(subst /,.,$$($1_EXCLUDES)))) \
+ $$(addprefix -i ,$$(addsuffix .*,$$(subst /,.,$$($1_INCLUDES)))) \
+ $$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
+ $$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
+ -src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"
+
+ # Prepend the source/bin path to the filter expressions.
+ ifneq ($$($1_INCLUDES),)
+ $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
+ $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
+ endif
+ ifneq ($$($1_EXCLUDES),)
+ $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
+ $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
+ endif
+
+ # Find all files to be copied from source to bin.
+ ifneq (,$$($1_COPY))
+ # Search for all files to be copied.
+ $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
+ # Copy these explicitly
+ $1_ALL_COPIES += $$($1_COPY_FILES)
+ # Copy must also respect filters.
+ ifneq (,$$($1_INCLUDES))
+ $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
+ endif
+ ifneq (,$$($1_EXCLUDES))
+ $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
+ endif
+ ifneq (,$$($1_EXCLUDE_FILES))
+ $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
+ endif
+ # All files below META-INF are always copied.
+ $1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
+ ifneq (,$$($1_ALL_COPIES))
+ # Yep, there are files to be copied!
+ $1_ALL_COPY_TARGETS:=
+ $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
+ # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
+ endif
+ endif
+
+ # Find all property files to be copied and cleaned from source to bin.
+ ifneq (,$$($1_CLEAN))
+ # Search for all files to be copied.
+ $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
+ # Copy and clean must also respect filters.
+ ifneq (,$$($1_INCLUDES))
+ $1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS))
+ endif
+ ifneq (,$$($1_EXCLUDES))
+ $1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS))
+ endif
+ ifneq (,$$($1_EXCLUDE_FILES))
+ $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS))
+ endif
+ ifneq (,$$($1_ALL_CLEANS))
+ # Yep, there are files to be copied and cleaned!
+ $1_ALL_COPY_CLEAN_TARGETS:=
+ $$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_copy_and_clean,$1,$$i)))
+ # Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files!
+ endif
+ endif
+
+ # Prep the source paths.
+ ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),)
+ $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE)))
+ else
+ $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
+ endif
+
+ # Create a sed expression to remove the source roots and to replace / with .
+ # and remove .java at the end.
+ $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
+
+ ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
+ ifneq (,$$($1_HEADERS))
+ $1_HEADERS_ARG := -h $$($1_HEADERS)
+ endif
+
+ # Using sjavac to compile.
+ $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
+
+ # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be
+ # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
+ # and javac is simply replaced with sjavac.
+ $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
+
+ # Set the $1_REMOTE to spawn a background javac server.
+ $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
+
+ $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
+ $(MKDIR) -p $$(@D)
+ $$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
+ $(ECHO) Compiling $1
+ ($$($1_JVM) $$($1_SJAVAC) \
+ $$($1_REMOTE) \
+ -j $(JOBS) \
+ --permit-unidentified-artifacts \
+ --permit-sources-without-package \
+ --compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
+ --log=$(LOG_LEVEL) \
+ $$($1_SJAVAC_ARGS) \
+ $$($1_FLAGS) \
+ $$($1_HEADERS_ARG) \
+ -d $$($1_BIN) && \
+ $(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
+ else
+ # Using plain javac to batch compile everything.
+ $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch
+
+ # When building in batch, put headers in a temp dir to filter out those that actually
+ # changed before copying them to the real header dir.
+ ifneq (,$$($1_HEADERS))
+ $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
+
+ $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
+ $(MKDIR) -p $$(@D)
+ for f in `ls $$($1_HEADERS).tmp`; do \
+ if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \
+ $(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \
+ fi; \
+ done
+ $(RM) -r $$($1_HEADERS).tmp
+ $(TOUCH) $$@
+
+ $1 += $$($1_HEADERS)/_the.$1_headers
+ endif
+
+ # When not using sjavac, pass along all sources to javac using an @file.
+ $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS)
+ $(MKDIR) -p $$(@D)
+ $(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp
+ $$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
+ $(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
+ ($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
+ -implicit:none -sourcepath "$$($1_SRCROOTSC)" \
+ -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \
+ $(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
+
+ endif
+
+ # Check if a jar file was specified, then setup the rules for the jar.
+ ifneq (,$$($1_JAR))
+ # If no suffixes was explicitly set for this jar file.
+ # Use class and the cleaned/copied properties file suffixes as the default
+ # for the types of files to be put into the jar.
+ ifeq (,$$($1_SUFFIXES))
+ $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
+ endif
+
+ $$(eval $$(call SetupArchive,ARCHIVE_$1,$$($1), \
+ SRCS:=$$($1_BIN), \
+ SUFFIXES:=$$($1_SUFFIXES), \
+ EXCLUDE:=$$($1_EXCLUDES), \
+ INCLUDES:=$$($1_INCLUDES), \
+ EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \
+ JAR:=$$($1_JAR), \
+ JARMAIN:=$$($1_JARMAIN), \
+ MANIFEST:=$$($1_MANIFEST), \
+ EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
+ JARINDEX:=$$($1_JARINDEX), \
+ HEADERS:=$$($1_HEADERS), \
+ SETUP:=$$($1_SETUP)))
+ endif
+
+ # Check if a srczip was specified, then setup the rules for the srczip.
+ ifneq (,$$($1_SRCZIP))
+ $$(eval $$(call SetupZipArchive,ARCHIVE_$1, \
+ SRC:=$$($1_SRC), \
+ ZIP:=$$($1_SRCZIP), \
+ INCLUDES:=$$($1_INCLUDES), \
+ EXCLUDES:=$$($1_EXCLUDES), \
+ EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
+ endif
+
+endef
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
new file mode 100644
index 0000000..2b276c6
--- /dev/null
+++ b/make/common/MakeBase.gmk
@@ -0,0 +1,449 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################
+#
+# Check that GNU make and cygwin are recent enough.
+# Setup common utility functions.
+#
+################################################################
+
+ifndef _MAKEBASE_GMK
+_MAKEBASE_GMK := 1
+
+# If the variable that you want to send to stdout for piping into a file or otherwise,
+# is potentially long, for example the a list of file paths, eg a list of all package directories.
+# Then you need to use ListPathsSafely, which optimistically splits the output into several shell
+# calls as well as use compression on recurrent file paths segments, to get around the potential
+# command line length problem that exists in cygwin and other shells.
+compress_pre:=$(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-pre-compress.incl))
+compress_post:=$(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-post-compress.incl))
+compress_paths=$(compress_pre)\
+$(subst $(SRC_ROOT),X97,\
+$(subst $(OUTPUT_ROOT),X98,\
+$(subst X,X00,\
+$(subst $(SPACE),\n,$(strip $1)))))\
+$(compress_post)
+
+decompress_paths=$(SED) -f $(SRC_ROOT)/make/common/support/ListPathsSafely-uncompress.sed -e 's|X99|\\n|g' \
+ -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
+ -e 's|X00|X|g' | tr '\n' '$2'
+
+define ListPathsSafely_If
+ $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
+endef
+
+define ListPathsSafely_Printf
+ $(if $(strip $($1_LPS$4)),$(if $(findstring $(LOG_LEVEL),trace),,@)printf \
+ -- "$(strip $($1_LPS$4))\n" | $(decompress_paths) $3)
+endef
+
+# Receipt example:
+# rm -f thepaths
+# $(call ListPathsSafely,THEPATHS,\n, >> thepaths)
+# The \n argument means translate spaces into \n
+# if instead , , (a space) is supplied, then spaces remain spaces.
+define ListPathsSafely
+ $(if $(word 16001,$($1)),$(error Cannot list safely more than 16000 paths. $1 has $(words $($1)) paths!))
+ $(ECHO) $(LOG_DEBUG) Writing $(words $($1)) paths to '$3'
+ $(call ListPathsSafely_If,$1,$2,1,250)
+ $(call ListPathsSafely_If,$1,$2,251,500)
+ $(call ListPathsSafely_If,$1,$2,501,750)
+ $(call ListPathsSafely_If,$1,$2,751,1000)
+
+ $(call ListPathsSafely_If,$1,$2,1001,1250)
+ $(call ListPathsSafely_If,$1,$2,1251,1500)
+ $(call ListPathsSafely_If,$1,$2,1501,1750)
+ $(call ListPathsSafely_If,$1,$2,1751,2000)
+
+ $(call ListPathsSafely_If,$1,$2,2001,2250)
+ $(call ListPathsSafely_If,$1,$2,2251,2500)
+ $(call ListPathsSafely_If,$1,$2,2501,2750)
+ $(call ListPathsSafely_If,$1,$2,2751,3000)
+
+ $(call ListPathsSafely_If,$1,$2,3001,3250)
+ $(call ListPathsSafely_If,$1,$2,3251,3500)
+ $(call ListPathsSafely_If,$1,$2,3501,3750)
+ $(call ListPathsSafely_If,$1,$2,3751,4000)
+
+ $(call ListPathsSafely_If,$1,$2,4001,4250)
+ $(call ListPathsSafely_If,$1,$2,4251,4500)
+ $(call ListPathsSafely_If,$1,$2,4501,4750)
+ $(call ListPathsSafely_If,$1,$2,4751,5000)
+
+ $(call ListPathsSafely_If,$1,$2,5001,5250)
+ $(call ListPathsSafely_If,$1,$2,5251,5500)
+ $(call ListPathsSafely_If,$1,$2,5501,5750)
+ $(call ListPathsSafely_If,$1,$2,5751,6000)
+
+ $(call ListPathsSafely_If,$1,$2,6001,6250)
+ $(call ListPathsSafely_If,$1,$2,6251,6500)
+ $(call ListPathsSafely_If,$1,$2,6501,6750)
+ $(call ListPathsSafely_If,$1,$2,6751,7000)
+
+ $(call ListPathsSafely_If,$1,$2,7001,7250)
+ $(call ListPathsSafely_If,$1,$2,7251,7500)
+ $(call ListPathsSafely_If,$1,$2,7501,7750)
+ $(call ListPathsSafely_If,$1,$2,7751,8000)
+
+ $(call ListPathsSafely_If,$1,$2,8001,8250)
+ $(call ListPathsSafely_If,$1,$2,8251,8500)
+ $(call ListPathsSafely_If,$1,$2,8501,8750)
+ $(call ListPathsSafely_If,$1,$2,8751,9000)
+
+ $(call ListPathsSafely_If,$1,$2,9001,9250)
+ $(call ListPathsSafely_If,$1,$2,9251,9500)
+ $(call ListPathsSafely_If,$1,$2,9501,9750)
+ $(call ListPathsSafely_If,$1,$2,9751,10000)
+
+ $(call ListPathsSafely_If,$1,$2,10001,10250)
+ $(call ListPathsSafely_If,$1,$2,10251,10500)
+ $(call ListPathsSafely_If,$1,$2,10501,10750)
+ $(call ListPathsSafely_If,$1,$2,10751,11000)
+
+ $(call ListPathsSafely_If,$1,$2,11001,11250)
+ $(call ListPathsSafely_If,$1,$2,11251,11500)
+ $(call ListPathsSafely_If,$1,$2,11501,11750)
+ $(call ListPathsSafely_If,$1,$2,11751,12000)
+
+ $(call ListPathsSafely_If,$1,$2,12001,12250)
+ $(call ListPathsSafely_If,$1,$2,12251,12500)
+ $(call ListPathsSafely_If,$1,$2,12501,12750)
+ $(call ListPathsSafely_If,$1,$2,12751,13000)
+
+ $(call ListPathsSafely_If,$1,$2,13001,13250)
+ $(call ListPathsSafely_If,$1,$2,13251,13500)
+ $(call ListPathsSafely_If,$1,$2,13501,13750)
+ $(call ListPathsSafely_If,$1,$2,13751,14000)
+
+ $(call ListPathsSafely_If,$1,$2,14001,14250)
+ $(call ListPathsSafely_If,$1,$2,14251,14500)
+ $(call ListPathsSafely_If,$1,$2,14501,14750)
+ $(call ListPathsSafely_If,$1,$2,14751,15000)
+
+ $(call ListPathsSafely_If,$1,$2,15001,15250)
+ $(call ListPathsSafely_If,$1,$2,15251,15500)
+ $(call ListPathsSafely_If,$1,$2,15501,15750)
+ $(call ListPathsSafely_If,$1,$2,15751,16000)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,1)
+ $(call ListPathsSafely_Printf,$1,$2,$3,251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,1001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,1251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,1501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,1751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,2001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,2251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,2501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,2751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,3001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,3251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,3501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,3751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,4001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,4251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,4501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,4751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,5001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,5251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,5501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,5751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,6001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,6251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,6501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,6751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,7001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,7251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,7501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,7751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,8001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,8251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,8501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,8751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,9001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,9251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,9501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,9751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,10001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,10251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,10501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,10751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,11001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,11251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,11501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,11751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,12001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,12251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,12501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,12751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,13001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,13251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,13501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,13751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,14001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,14251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,14501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,14751)
+
+ $(call ListPathsSafely_Printf,$1,$2,$3,15001)
+ $(call ListPathsSafely_Printf,$1,$2,$3,15251)
+ $(call ListPathsSafely_Printf,$1,$2,$3,15501)
+ $(call ListPathsSafely_Printf,$1,$2,$3,15751)
+endef
+
+define ListPathsSafelyNow_IfPrintf
+ ifneq (,$$(word $4,$$($1)))
+ $$(eval $1_LPS$4:=$$(call compress_paths,$$(wordlist $4,$5,$$($1))))
+ $$(shell printf -- "$$(strip $$($1_LPS$4))\n" | $(decompress_paths) $3)
+ endif
+endef
+
+# And an non-receipt version:
+define ListPathsSafelyNow
+ ifneq (,$$(word 10001,$$($1)))
+ $$(error Cannot list safely more than 10000 paths. $1 has $$(words $$($1)) paths!)
+ endif
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1,250)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,251,500)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,501,750)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,751,1000)
+
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1001,1250)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1251,1500)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1501,1750)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1751,2000)
+
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2001,2250)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2251,2500)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2501,2750)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2751,3000)
+
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3001,3250)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3251,3500)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3501,3750)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3751,4000)
+
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4001,4250)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4251,4500)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4501,4750)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4751,5000)
+
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5001,5250)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5251,5500)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5501,5750)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5751,6000)
+
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6001,6250)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6251,6500)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6501,6750)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6751,7000)
+
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7001,7250)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7251,7500)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7501,7750)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7751,8000)
+
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8001,8250)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8251,8500)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8501,8750)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8751,9000)
+
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9001,9250)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9251,9500)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9501,9750)
+ $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9751,10000)
+
+endef
+
+# The source tips can come from the Mercurial repository, or in the files
+# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
+# directory as the original $(HGDIR) directory.
+# These should not be := assignments, only used from the root Makefile.
+HG_VERSION = $(shell $(HG) version 2> /dev/null)
+HG_DIRECTORY=.hg
+HGTIP_FILENAME=.hgtip
+HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO
+REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
+ $(shell $(CD) $(SRC_ROOT) ; ( $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \
+ $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
+ 2> /dev/null)))))
+
+# Emit the repo:tip pairs to $@
+define GetSourceTips
+ $(CD) $(SRC_ROOT) ; \
+ for i in $(REPO_LIST) IGNORE ; do \
+ if [ "$${i}" = "IGNORE" ] ; then \
+ continue; \
+ elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
+ $(PRINTF) " %s:%s" \
+ "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \
+ elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
+ $(PRINTF) " %s:%s" \
+ "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
+ fi; \
+ done >> $@
+ $(PRINTF) "\n" >> $@
+endef
+
+# Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk
+define CreateHgTip
+ $(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \
+ $(ECHO) $1/$(HGTIP_FILENAME)
+endef
+
+define SetupLogging
+ ifeq ($$(LOG_LEVEL),trace)
+ # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
+ # For each target executed, will print
+ # Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer)
+ # but with a limit of 20 on <ALL NEWER PREREQUISITES>, to avoid cluttering logs too much
+ # (and causing a crash on Cygwin).
+ # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
+ # Only use time if it's GNU time which supports format and output file.
+ WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash
+ SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
+ endif
+ # Never remove warning messages; this is just for completeness
+ LOG_WARN=
+ ifneq ($$(findstring $$(LOG_LEVEL),info debug trace),)
+ LOG_INFO=
+ else
+ LOG_INFO=> /dev/null
+ endif
+ ifneq ($$(findstring $$(LOG_LEVEL),debug trace),)
+ LOG_DEBUG=
+ else
+ LOG_DEBUG=> /dev/null
+ endif
+ ifneq ($$(findstring $$(LOG_LEVEL),trace),)
+ LOG_TRACE=
+ else
+ LOG_TRACE=> /dev/null
+ endif
+endef
+
+# Make sure logging is setup for everyone that includes MakeBase.gmk.
+$(eval $(call SetupLogging))
+
+# This is to be called by all SetupFoo macros
+define LogSetupMacroEntry
+ $(if $(27),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
+ $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
+endef
+
+# Make directory without forking mkdir if not needed
+define MakeDir
+ ifneq ($$(wildcard $1 $2 $3 $4 $5 $6 $7 $8 $9),$$(strip $1 $2 $3 $4 $5 $6 $7 $8 $9))
+ $$(shell $(MKDIR) -p $1 $2 $3 $4 $5 $6 $7 $8 $9)
+ endif
+endef
+
+ifeq ($(OPENJDK_TARGET_OS),solaris)
+ # On Solaris, if the target is a symlink and exists, cp won't overwrite.
+ # Cp has to operate in recursive mode to allow for -P flag, to preserve soft links. If the
+ # name of the target file differs from the source file, rename after copy.
+ define install-file
+ $(MKDIR) -p $(@D)
+ $(RM) '$@'
+ $(CP) -f -r -P '$<' '$(@D)'
+ if [ "$(@F)" != "$(<F)" ]; then $(MV) '$(@D)/$(<F)' '$@'; fi
+ endef
+else ifeq ($(OPENJDK_TARGET_OS),macosx)
+ # On mac, extended attributes sometimes creep into the source files, which may later
+ # cause the creation of ._* files which confuses testing. Clear these with xattr if
+ # set. Some files get their write permissions removed after being copied to the
+ # output dir. When these are copied again to images, xattr would fail. By only clearing
+ # attributes when they are present, failing on this is avoided.
+ define install-file
+ $(MKDIR) -p $(@D)
+ $(CP) -fRP '$<' '$@'
+ if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi
+ endef
+else
+ define install-file
+ $(MKDIR) -p $(@D)
+ $(CP) -fP '$<' '$@'
+ endef
+endif
+
+# Convenience functions for working around make's limitations with $(filter ).
+containing = $(foreach v,$2,$(if $(findstring $1,$v),$v))
+not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
+
+################################################################################
+# In Cygwin, finds are very costly, both because of expensive forks and because
+# of bad file system caching. Find is used extensively in $(shell) commands to
+# find source files. This makes rerunning make with no or few changes rather
+# expensive. To speed this up, these two macros are used to cache the results
+# of simple find commands for reuse.
+#
+# Runs a find and stores both the directories where it was run and the results.
+# This macro can be called multiple times to add to the cache. Only finds files
+# with no filters.
+#
+# Needs to be called with $(eval )
+#
+# Param 1 - Dir to find in
+ifeq ($(OPENJDK_BUILD_OS),windows)
+ define FillCacheFind
+ FIND_CACHE_DIR += $1
+ FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $1 -type f -o -type l))
+ endef
+else
+ define FillCacheFind
+ endef
+endif
+
+# Mimics find by looking in the cache if all of the directories have been cached.
+# Otherwise reverts to shell find. This is safe to call on all platforms, even if
+# cache is deactivated.
+#
+# The extra - is needed when FIND_CACHE_DIR is empty but should be harmless.
+# Param 1 - Dirs to find in
+define CacheFind
+ $(if $(filter-out $(addsuffix %,- $(FIND_CACHE_DIR)),$1), \
+ $(shell $(FIND) $1 -type f -o -type l), \
+ $(filter $(addsuffix %,$1),$(FIND_CACHE)))
+endef
+
+################################################################################
+
+endif # _MAKEBASE_GMK
diff --git a/common/makefiles/javadoc/NON_CORE_PKGS.gmk b/make/common/NON_CORE_PKGS.gmk
similarity index 100%
rename from common/makefiles/javadoc/NON_CORE_PKGS.gmk
rename to make/common/NON_CORE_PKGS.gmk
diff --git a/common/makefiles/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
similarity index 100%
rename from common/makefiles/NativeCompilation.gmk
rename to make/common/NativeCompilation.gmk
diff --git a/common/makefiles/RMICompilation.gmk b/make/common/RMICompilation.gmk
similarity index 100%
rename from common/makefiles/RMICompilation.gmk
rename to make/common/RMICompilation.gmk
diff --git a/common/makefiles/support/ListPathsSafely-post-compress.incl b/make/common/support/ListPathsSafely-post-compress.incl
similarity index 100%
rename from common/makefiles/support/ListPathsSafely-post-compress.incl
rename to make/common/support/ListPathsSafely-post-compress.incl
diff --git a/common/makefiles/support/ListPathsSafely-pre-compress.incl b/make/common/support/ListPathsSafely-pre-compress.incl
similarity index 100%
rename from common/makefiles/support/ListPathsSafely-pre-compress.incl
rename to make/common/support/ListPathsSafely-pre-compress.incl
diff --git a/common/makefiles/support/ListPathsSafely-uncompress.sed b/make/common/support/ListPathsSafely-uncompress.sed
similarity index 100%
rename from common/makefiles/support/ListPathsSafely-uncompress.sed
rename to make/common/support/ListPathsSafely-uncompress.sed
diff --git a/common/makefiles/support/unicode2x.sed b/make/common/support/unicode2x.sed
similarity index 100%
rename from common/makefiles/support/unicode2x.sed
rename to make/common/support/unicode2x.sed
diff --git a/make/corba-rules.gmk b/make/corba-rules.gmk
deleted file mode 100644
index 7bfedde..0000000
--- a/make/corba-rules.gmk
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# CORBA TARGETS
-################################################################
-
-CORBA_BUILD_ARGUMENTS = \
- $(COMMON_BUILD_ARGUMENTS) \
- ALT_OUTPUTDIR=$(CORBA_OUTPUTDIR) \
- ALT_BOOTDIR=$(BOOTDIR) \
- ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
-
-ifeq ($(BUILD_LANGTOOLS), true)
- CORBA_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-corba: corba-build
-corba-build:
- $(MKDIR) -p $(CORBA_OUTPUTDIR)
- @$(call MakeStart,corba,all)
- ($(CD) $(CORBA_TOPDIR)/make && \
- $(MAKE) $(CORBA_BUILD_ARGUMENTS) all)
- @$(call MakeFinish,corba,all)
-
-corba-clobber::
- $(MKDIR) -p $(CORBA_OUTPUTDIR)
- @$(call MakeStart,corba,clobber)
- ($(CD) $(CORBA_TOPDIR)/make && \
- $(MAKE) $(CORBA_BUILD_ARGUMENTS) clobber)
- @$(call MakeFinish,corba,clobber)
-
-.PHONY: corba corba-build corba-clobber
-
diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk
deleted file mode 100644
index 69c493d..0000000
--- a/make/deploy-rules.gmk
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# DEPLOY TARGETS
-################################################################
-
-deploy: deploy-build
-
-DEPLOY = deploy
-
-# put the generated bundles in their own place in OUTPUTDIR
-DEPLOY_OUTPUTDIR = $(ABS_OUTPUTDIR)
-
-# NO_IMAGES may be set in conjunction with DEV_ONLY
-ifdef NO_IMAGES
- IMAGES_TARGET =
-else
- IMAGES_TARGET = images
-endif
-
-DEPLOY_BUILD_TARGETS = sanity deploy
-
-ifneq ($(JQS), off)
- ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(PLATFORM), windows)
- DEPLOY_BUILD_TARGETS += jqs-all
- endif
- endif
-endif
-
-ifndef DEV_ONLY
- DEPLOY_BUILD_TARGETS += images
-else
- DEPLOY_BUILD_TARGETS += $(IMAGES_TARGET)
-endif
-
-DEPLOY_BUILD_ARGUMENTS = $(COMMON_BUILD_ARGUMENTS) \
- ALT_OUTPUTDIR=$(DEPLOY_OUTPUTDIR)
-
-ifeq ($(BUILD_LANGTOOLS), true)
- DEPLOY_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-ifdef ALT_IMAGE_DIR
- DEPLOY_BUILD_ARGUMENTS += ALT_IMAGE_DIR=$(ALT_IMAGE_DIR)
-endif
-
-ifdef ALT_BUNDLE_DATE
- DEPLOY_BUILD_ARGUMENTS += ALT_BUNDLE_DATE=$(ALT_BUNDLE_DATE)
-endif
-
-ifdef ALT_JAVAWS_BOOTDIR
- DEPLOY_BUILD_ARGUMENTS += ALT_JAVAWS_BOOTDIR=$(ALT_JAVAWS_BOOTDIR)
-endif
-
-ifdef CERT
- DEPLOY_BUILD_ARGUMENTS += CERT=$(CERT)
-endif
-
-ifdef PKEY
- DEPLOY_BUILD_ARGUMENTS += PKEY=$(PKEY)
-endif
-
-deploy-build:
-ifeq ($(BUILD_DEPLOY), true)
- @$(call MakeStart,deploy,$(DEPLOY_BUILD_TARGETS))
- ($(CD) $(DEPLOY_TOPDIR)/make && \
- $(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS))
- @$(call MakeFinish,deploy,$(DEPLOY_BUILD_TARGETS))
-endif
-
-deploy-clobber::
-ifeq ($(BUILD_DEPLOY), true)
- @$(call MakeStart,deploy,clobber)
- ($(CD) $(DEPLOY_TOPDIR)/make && \
- $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS))
- @$(call MakeFinish,deploy,clobber)
-endif
-
-deploy-sanity::
-ifeq ($(BUILD_DEPLOY), true)
- ($(CD) $(DEPLOY_TOPDIR)/make && \
- $(MAKE) sanity $(DEPLOY_BUILD_ARGUMENTS))
-endif
-
-.PHONY: deploy deploy-build deploy-clobber deploy-sanity
-
diff --git a/common/makefiles/devkit/Makefile b/make/devkit/Makefile
similarity index 100%
rename from common/makefiles/devkit/Makefile
rename to make/devkit/Makefile
diff --git a/common/makefiles/devkit/Tools.gmk b/make/devkit/Tools.gmk
similarity index 100%
rename from common/makefiles/devkit/Tools.gmk
rename to make/devkit/Tools.gmk
diff --git a/make/hotspot-rules.gmk b/make/hotspot-rules.gmk
deleted file mode 100644
index 4271210..0000000
--- a/make/hotspot-rules.gmk
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# HOTSPOT TARGETS
-################################################################
-
-# All the output from a hotspot build should be re-located to the
-# build output area.
-#
-HOTSPOT_OUTPUTDIR = $(HOTSPOT_DIR)/outputdir
-
-# HOTSPOT_EXPORT_PATH points to a dir that contains files
-# that are needed in an SDK build, in the same relative positions as
-# these files are in an SDK image.
-# The SDK java/redist/Makefile will copy files from HOTSPOT_EXPORT_PATH
-# into the SDK being built.
-# This is the export path supplied to the hotspot makefiles.
-#
-HOTSPOT_EXPORT_PATH = $(HOTSPOT_DIR)/import
-
-# Default targets
-HOTSPOT = hotspot-sanity hotspot-build
-
-hotspot:: $(HOTSPOT)
-
-# Hotspot clobber removes the output directory and exported files
-hotspot-clobber::
- $(RM) -r $(HOTSPOT_OUTPUTDIR)
- $(RM) -r $(HOTSPOT_EXPORT_PATH)
-
-hotspot-sanity::
- @$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
- @$(MKDIR) -p $(HOTSPOT_EXPORT_PATH)
- @$(ECHO) "Hotspot Settings: \n" \
- " HOTSPOT_BUILD_JOBS = $(HOTSPOT_BUILD_JOBS) \n" \
- " HOTSPOT_OUTPUTDIR = $(HOTSPOT_OUTPUTDIR) \n" \
- " HOTSPOT_EXPORT_PATH = $(HOTSPOT_EXPORT_PATH) \n" \
- "\n" >> $(MESSAGE_FILE)
-
-#
-# Basic hotspot build and export of it's files
-#
-
-HOTSPOT_TARGET = all_product
-ifeq ($(DEBUG_NAME), debug)
- HOTSPOT_TARGET = all_debug
-endif
-ifeq ($(DEBUG_NAME), fastdebug)
- HOTSPOT_TARGET = all_fastdebug
-endif
-BUILD_FLAVOR=$(HOTSPOT_TARGET:all_%=%)
-
-ifeq ($(ZERO_BUILD), true)
- ifeq ($(SHARK_BUILD), true)
- HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
- else
- HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
- endif
-endif
-
-HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
-HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
-HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
-HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
-
-# Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
-# Or is there something wrong with hotspot/make/Makefile?
-HOTSPOT_BUILD_ARGUMENTS += ALT_SLASH_JAVA=$(SLASH_JAVA)
-HOTSPOT_BUILD_ARGUMENTS += ALT_BOOTDIR=$(BOOTDIR)
-
-ifeq ($(BUILD_LANGTOOLS), true)
- HOTSPOT_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-# Move to COMMON_BUILD_ARGUMENTS when all repos support
-# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES:
-ifdef FULL_DEBUG_SYMBOLS
- HOTSPOT_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
-endif
-
-ifdef ZIP_DEBUGINFO_FILES
- HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
-endif
-
-hotspot-build::
- $(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
- $(MKDIR) -p $(HOTSPOT_EXPORT_PATH)
- @$(call MakeStart,hotspot,$(HOTSPOT_TARGET))
- $(CD) $(HOTSPOT_TOPDIR)/make && \
- $(MAKE) $(HOTSPOT_BUILD_ARGUMENTS) $(HOTSPOT_TARGET)
- @$(call MakeFinish,hotspot,$(HOTSPOT_TARGET))
-
-#####################
-# .PHONY
-#####################
-.PHONY: hotspot-build hotspot-clobber hotspot-sanity
-
diff --git a/make/install-rules.gmk b/make/install-rules.gmk
deleted file mode 100644
index 2ba4a66..0000000
--- a/make/install-rules.gmk
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# INSTALL TARGETS
-################################################################
-
-install: install-build
-
-# The generated java files are generated as a set, so instead of
-# setting the INSTALL variable to that list of files, set it to
-# the .PHONY target that generates the set of files.
-INSTALL = install
-
-# put the generated patch in their own place in OUTPUTDIR
-INSTALL_OUTPUTDIR = $(ABS_OUTPUTDIR)
-
-INSTALL_DEBUG_NAME=fastdebug
-
-INSTALL_BUILD_TARGETS = sanity all
-INSTALL_BUILD_ARGUMENTS = $(COMMON_BUILD_ARGUMENTS) \
- ALT_OUTPUTDIR=$(INSTALL_OUTPUTDIR) \
- ALT_RTPATCH_DIR=$(ALT_RTPATCH_DIR) \
- ALT_BASE_IMAGE_ZIP=$(ALT_BASE_IMAGE_ZIP) \
- ALT_BASE_IMAGE_DIR=$(ALT_BASE_IMAGE_DIR) \
- ALT_NEW_IMAGE_DIR=$(ALT_NEW_IMAGE_DIR) \
- ALT_BUNDLE_DATE=$(BUNDLE_DATE) \
- INSTALL_DEBUG_NAME=$(INSTALL_DEBUG_NAME)
-
-ifeq ($(BUILD_LANGTOOLS), true)
- INSTALL_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-install: install-build
-
-install-build:
-ifeq ($(BUILD_INSTALL), true)
- @$(call MakeStart,install,$(INSTALL_BUILD_TARGETS))
- ($(CD) $(INSTALL_TOPDIR)/make && \
- $(MAKE) $(INSTALL_BUILD_TARGETS) $(INSTALL_BUILD_ARGUMENTS))
- @$(call MakeFinish,install,$(INSTALL_BUILD_TARGETS))
-endif
-
-update-patcher:
-ifeq ($(BUILD_INSTALL), true)
- if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \
- $(call MakeStart,install_update,all); \
- ( $(CD) $(INSTALL_TOPDIR)/make/update && \
- $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \
- $(call MakeFinish,install_update,all); \
- fi
-endif
-
-update-patchgen:
-ifeq ($(BUILD_INSTALL), true)
- if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \
- $(call MakeStart,install_update,patchgen); \
- ( $(CD) $(INSTALL_TOPDIR)/make/update && \
- $(MAKE) patchgen $(INSTALL_BUILD_ARGUMENTS) ); \
- $(call MakeFinish,install_update,patchgen); \
- fi
-endif
-
-installer:
-ifeq ($(BUILD_INSTALL), true)
- if [ -r $(INSTALL_TOPDIR)/make/installer/Makefile ]; then \
- $(call MakeStart,install_installer,all); \
- ( $(CD) $(INSTALL_TOPDIR)/make/installer && \
- $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \
- $(call MakeFinish,install_installer,all); \
- fi
-endif
-
-combo_build:
- @$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
- $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
- $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/jre ; $(MAKE) au_combo
- $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/xmlinffile ; $(MAKE) all
-
-install-clobber:
-ifeq ($(BUILD_INSTALL), true)
- @$(call MakeStart,install,clobber)
- ($(CD) $(INSTALL_TOPDIR)/make && \
- $(MAKE) clobber $(INSTALL_BUILD_ARGUMENTS))
- @$(call MakeFinish,install,clobber)
-endif
-
-install-sanity::
-ifeq ($(BUILD_INSTALL), true)
- ($(CD) $(INSTALL_TOPDIR)/make && \
- $(MAKE) sanity $(INSTALL_BUILD_ARGUMENTS))
-endif
-
-######################################
-# Rules for making the install
-######################################
-
-.PHONY: install install-build install-clobber install-sanity \
- update-installer update-patchgen installer
diff --git a/make/jaxp-rules.gmk b/make/jaxp-rules.gmk
deleted file mode 100644
index 8f542fa..0000000
--- a/make/jaxp-rules.gmk
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# JAXP TARGETS
-################################################################
-
-JAXP_BUILD_ARGUMENTS = \
- $(COMMON_BUILD_ARGUMENTS) \
- ALT_OUTPUTDIR=$(JAXP_OUTPUTDIR) \
- ALT_BOOTDIR=$(BOOTDIR) \
- ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
-
-ifeq ($(BUILD_LANGTOOLS), true)
- JAXP_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-jaxp: jaxp-build
-jaxp-build:
- $(MKDIR) -p $(JAXP_OUTPUTDIR)
- @$(call MakeStart,jaxp,all)
- ($(CD) $(JAXP_TOPDIR)/make && \
- $(MAKE) $(JAXP_BUILD_ARGUMENTS) all)
- @$(call MakeFinish,jaxp,all)
-
-jaxp-clobber::
- $(MKDIR) -p $(JAXP_OUTPUTDIR)
- @$(call MakeStart,jaxp,clobber)
- ($(CD) $(JAXP_TOPDIR)/make && \
- $(MAKE) $(JAXP_BUILD_ARGUMENTS) clobber)
- @$(call MakeFinish,jaxp,clobber)
-
-.PHONY: jaxp jaxp-build jaxp-clobber
-
diff --git a/make/jaxws-rules.gmk b/make/jaxws-rules.gmk
deleted file mode 100644
index 59e33f3..0000000
--- a/make/jaxws-rules.gmk
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# JAXWS TARGETS
-################################################################
-
-JAXWS_BUILD_ARGUMENTS = \
- $(COMMON_BUILD_ARGUMENTS) \
- ALT_OUTPUTDIR=$(JAXWS_OUTPUTDIR) \
- ALT_BOOTDIR=$(BOOTDIR) \
- ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
-
-ifeq ($(BUILD_LANGTOOLS), true)
- JAXWS_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-jaxws: jaxws-build
-jaxws-build:
- $(MKDIR) -p $(JAXWS_OUTPUTDIR)
- @$(call MakeStart,jaxws,all)
- ($(CD) $(JAXWS_TOPDIR)/make && \
- $(MAKE) $(JAXWS_BUILD_ARGUMENTS) all)
- @$(call MakeFinish,jaxws,all)
-
-jaxws-clobber::
- $(MKDIR) -p $(JAXWS_OUTPUTDIR)
- @$(call MakeStart,jaxws,clobber)
- ($(CD) $(JAXWS_TOPDIR)/make && \
- $(MAKE) $(JAXWS_BUILD_ARGUMENTS) clobber)
- @$(call MakeFinish,jaxws,clobber)
-
-.PHONY: jaxws jaxws-build jaxws-clobber
-
diff --git a/make/jdk-rules.gmk b/make/jdk-rules.gmk
deleted file mode 100644
index dc6b555..0000000
--- a/make/jdk-rules.gmk
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# JDK TARGETS
-################################################################
-
-JDK_JAVA_EXE = $(OUTPUTDIR)/bin/java$(EXE_SUFFIX)
-
-# NO_IMAGES may be set in conjunction with DEV_ONLY
-IMAGES_TARGET = images
-ifdef DEV_ONLY
- ifdef NO_IMAGES
- IMAGES_TARGET =
- endif
-endif
-
-# GENERATE_DOCS determines if we ask for the docs target
-DOCS_TARGET = docs
-ifeq ($(GENERATE_DOCS),false)
- DOCS_TARGET =
-endif
-
-JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) $(IMAGES_TARGET)
-
-JDK_CLOBBER_TARGETS = clobber
-
-JDK_BUILD_ARGUMENTS = $(COMMON_BUILD_ARGUMENTS) \
- ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)
-
-ifeq ($(BUILD_LANGTOOLS), true)
- JDK_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-ifeq ($(BUILD_CORBA), true)
- JDK_BUILD_ARGUMENTS += ALT_CORBA_DIST=$(ABS_CORBA_DIST)
-endif
-ifeq ($(BUILD_JAXP), true)
- JDK_BUILD_ARGUMENTS += ALT_JAXP_DIST=$(ABS_JAXP_DIST)
-endif
-ifeq ($(BUILD_JAXWS), true)
- JDK_BUILD_ARGUMENTS += ALT_JAXWS_DIST=$(ABS_JAXWS_DIST)
-endif
-ifeq ($(BUILD_NASHORN), true)
- JDK_BUILD_ARGUMENTS += ALT_NASHORN_DIST=$(ABS_NASHORN_DIST)
-endif
-
-ifeq ($(BUILD_HOTSPOT), true)
- JDK_BUILD_ARGUMENTS += ALT_HOTSPOT_IMPORT_PATH=$(HOTSPOT_DIR)/import
-endif
-
-JDK_BUILD_ARGUMENTS += \
- BUILD_HOTSPOT=$(BUILD_HOTSPOT)
-
-# Move to COMMON_BUILD_ARGUMENTS when all repos support
-# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES:
-ifdef FULL_DEBUG_SYMBOLS
- JDK_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
-endif
-
-ifdef ZIP_DEBUGINFO_FILES
- JDK_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
-endif
-
-
-$(JDK_JAVA_EXE):: jdk-build
-
-jdk: jdk-build
-jdk-build:
- @$(call MakeStart,jdk,$(JDK_BUILD_TARGETS))
- ( $(CD) $(JDK_TOPDIR)/make && \
- $(MAKE) $(JDK_BUILD_TARGETS) $(JDK_BUILD_ARGUMENTS) ; )
- @$(call MakeFinish,jdk,$(JDK_BUILD_TARGETS))
-
-jdk-clobber::
- @$(call MakeStart,jdk,$(JDK_CLOBBER_TARGETS))
- ( $(CD) $(JDK_TOPDIR)/make && \
- $(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; )
- @$(call MakeFinish,jdk,$(JDK_CLOBBER_TARGETS))
-
-jdk-sanity::
- ( $(CD) $(JDK_TOPDIR)/make && \
- $(MAKE) sanity HOTSPOT_IMPORT_CHECK=false $(JDK_BUILD_ARGUMENTS) ; )
-
-compare-images: compare-image
-compare-image:
- @$(call MakeStart,jdk,compare-image)
- ( $(CD) $(JDK_TOPDIR)/make && \
- $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image )
- @$(call MakeFinish,jdk,compare-image)
-
-compare-images-clobber: compare-image-clobber
-compare-image-clobber:
- @$(call MakeStart,jdk,compare-image-clobber)
- ( $(CD) $(JDK_TOPDIR)/make && \
- $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image-clobber )
- @$(call MakeFinish,jdk,compare-image-clobber)
-
-.PHONY: jdk jdk-build jdk-clobber jdk-sanity
-
diff --git a/make/jprt.gmk b/make/jprt.gmk
deleted file mode 100644
index 09505a4..0000000
--- a/make/jprt.gmk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# JPRT rule to build
-################################################################
-
-# To get all the bundles from JPRT, use:
-# jprt submit -buildenv HAVE_JPRT_SAVE_BUNDLES=true -control "..." ...
-
-DEFAULT_BUILD_FLAVOR=product
-
-# JPRT will define these when it builds
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip
-JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip
-
-ifeq ($(PLATFORM),windows)
- ZIPFLAGS=-q
-else
- # store symbolic links as the link
- ZIPFLAGS=-q -y
-endif
-
-jprt_build_product: sanity all_product_build
- ( $(CD) $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME) && \
- $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
-ifdef HAVE_JPRT_SAVE_BUNDLES
- ( $(CD) $(OUTPUTDIR)/bundles && \
- $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . )
-endif
-
-jprt_build_fastdebug: fastdebug_build
- ( $(CD) $(OUTPUTDIR)/$(REL_JDK_FASTDEBUG_IMAGE_DIR) && \
- $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-jprt_build_debug: debug_build
- ( $(CD) $(OUTPUTDIR)/$(REL_JDK_DEBUG_IMAGE_DIR) && \
- $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-################################################################
-# PHONY
-################################################################
-
-.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
-
diff --git a/make/jprt.properties b/make/jprt.properties
index 5768ed2..ae20e82 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -66,15 +66,17 @@
jprt.make.rule.default.test.targets= \
${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \
${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_math}
+ ${jprt.my.test.target.set:TESTNAME=jdk_math}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_util}
+
# Default vm test targets (testset=core)
-jprt.vm.core.test.targets= \
- ${jprt.vm.default.test.targets}
+jprt.vm.core.test.targets=
# Core jdk test targets (testset=core)
jprt.make.rule.core.test.targets= \
- ${jprt.make.rule.default.test.targets}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_math}, \
${jprt.my.test.target.set:TESTNAME=jdk_util}, \
${jprt.my.test.target.set:TESTNAME=jdk_io}, \
${jprt.my.test.target.set:TESTNAME=jdk_net}, \
@@ -83,13 +85,22 @@
${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \
${jprt.my.test.target.set:TESTNAME=jdk_text}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
${jprt.my.test.target.set:TESTNAME=jdk_time}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_other}
+ ${jprt.my.test.target.set:TESTNAME=jdk_other}, \
+ ${jprt.my.test.target.set:TESTNAME=core_tools}
+
+# Svc vm test targets (testset=svc)
+jprt.vm.svc.test.targets=
+
+# Core jdk test targets (testset=svc)
+jprt.make.rule.svc.test.targets= \
+ ${jprt.my.test.target.set:TESTNAME=jdk_management}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_instrument}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
+ ${jprt.my.test.target.set:TESTNAME=svc_tools}
# All vm test targets (testset=all)
jprt.vm.all.test.targets= \
@@ -100,14 +111,24 @@
# All jdk test targets (testset=all)
jprt.make.rule.all.test.targets= \
${jprt.make.rule.core.test.targets}, \
+ ${jprt.make.rule.svc.test.targets}, \
${jprt.my.test.target.set:TESTNAME=jdk_awt}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \
${jprt.my.test.target.set:TESTNAME=jdk_sound}, \
${jprt.my.test.target.set:TESTNAME=jdk_swing}
+# PIT vm test targets (testset=pit)
+jprt.vm.pit.test.targets= \
+ ${jprt.vm.all.test.targets}
+
+# PIT jdk test targets (testset=pit)
+jprt.make.rule.pit.test.targets= \
+ ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \
+ ${jprt.make.rule.core.test.targets}, \
+ ${jprt.make.rule.svc.test.targets}
+
# JCK test targets in test/Makefile (no windows)
jprt.my.jck.test.target.set= \
solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \
diff --git a/make/langtools-rules.gmk b/make/langtools-rules.gmk
deleted file mode 100644
index ea96295..0000000
--- a/make/langtools-rules.gmk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# LANGTOOLS TARGETS
-################################################################
-
-LANGTOOLS_BUILD_ARGUMENTS = \
- $(COMMON_BUILD_ARGUMENTS) \
- ALT_OUTPUTDIR=$(LANGTOOLS_OUTPUTDIR) \
- ALT_BOOTDIR=$(BOOTDIR)
-
-langtools: langtools-build
-langtools-build:
- $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)
- @$(call MakeStart,langtools,all)
- ($(CD) $(LANGTOOLS_TOPDIR)/make && \
- $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) all)
- @$(call MakeFinish,langtools,all)
-
-langtools-clobber::
- $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)
- @$(call MakeStart,langtools,clobber)
- ($(CD) $(LANGTOOLS_TOPDIR)/make && \
- $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) clobber)
- @$(call MakeFinish,langtools,clobber)
-
-.PHONY: langtools langtools-build langtools-clobber
-
diff --git a/make/nashorn-rules.gmk b/make/nashorn-rules.gmk
deleted file mode 100644
index a86a047..0000000
--- a/make/nashorn-rules.gmk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# NASHORN TARGETS
-################################################################
-
-NASHORN_BUILD_ARGUMENTS = \
- $(COMMON_BUILD_ARGUMENTS) \
- ALT_OUTPUTDIR=$(NASHORN_OUTPUTDIR) \
- ALT_BOOTDIR=$(BOOTDIR) \
- ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
-
-ifeq ($(BUILD_LANGTOOLS), true)
- NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-# Default targets
-NASHORN = nashorn-build
-
-nashorn: nashorn-build
-nashorn-build:
- $(MKDIR) -p $(NASHORN_OUTPUTDIR)
- @$(call MakeStart,nashorn,all)
- ($(CD) $(NASHORN_TOPDIR)/make && \
- $(MAKE) $(NASHORN_BUILD_ARGUMENTS) all)
- @$(call MakeFinish,nashorn,all)
-
-nashorn-clobber::
- $(MKDIR) -p $(NASHORN_OUTPUTDIR)
- @$(call MakeStart,nashorn,clobber)
- ($(CD) $(NASHORN_TOPDIR)/make && \
- $(MAKE) $(NASHORN_BUILD_ARGUMENTS) clobber)
- @$(call MakeFinish,nashorn,clobber)
-
-.PHONY: nashorn nashorn-build nashorn-clobber
-
diff --git a/make/sanity-rules.gmk b/make/sanity-rules.gmk
deleted file mode 100644
index ee3d6f8..0000000
--- a/make/sanity-rules.gmk
+++ /dev/null
@@ -1,336 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# SANITY
-################################################################
-
-sanity:: pre-sanity settings insane environment
-
-ifeq ($(BUILD_HOTSPOT), true)
- sanity:: hotspot-sanity
-endif
-
-ifeq ($(BUILD_DEPLOY), true)
- sanity:: deploy-sanity
-endif
-
-ifeq ($(BUILD_JDK), true)
- sanity:: jdk-sanity
-endif
-
-# Only need these sanity rules when not doing a debug build
-ifeq ($(DEBUG_NAME),)
-
- ifeq ($(BUILD_INSTALL), true)
- sanity:: install-sanity
- endif
-
- ifeq ($(BUILD_SPONSORS), true)
- sanity:: sponsors-sanity
- endif
-
-endif
-
-sanity:: post-sanity
-
-source-sanity : pre-sanity post-sanity
-
-$(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE):
- @$(prep-target)
-
-purge-sanity: $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
- -@$(RM) $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
-
-pre-sanity: purge-sanity
-
-# this should be the last rule in any target's sanity rule.
-post-sanity post-sanity-hotspot post-sanity-jdk post-sanity-install post-sanity-deploy:
- @if [ -r $(MESSAGE_FILE) ]; then \
- $(ECHO) "" ; \
- $(CAT) $(MESSAGE_FILE) ; \
- fi
- @if [ -r $(WARNING_FILE) ]; then \
- $(CAT) $(WARNING_FILE) ; \
- fi
- @if [ "x$(INSANE)" != x ]; then \
- $(ECHO) "INSANE mode requested. \n" \
- "Sanity will not force a build termination, even with errors.\n" \
- "" >> $(ERROR_FILE); \
- fi
- @if [ -r $(ERROR_FILE) ]; then \
- if [ "x$(INSANE)" = x ]; then \
- $(ECHO) "Exiting because of the above error(s). \n" \
- "">> $(ERROR_FILE); \
- fi ; \
- $(CAT) $(ERROR_FILE) ; \
- if [ "x$(INSANE)" = x ]; then \
- exit 1 ; \
- fi ; \
- fi
-ifdef PEDANTIC
- @if [ -r $(WARNING_FILE) ]; then \
- $(ECHO) "PEDANTIC mode requested. \n" \
- "Exiting because of the above warning(s). \n" \
- "" >> $(ERROR_FILE); \
- $(CAT) $(ERROR_FILE) ; \
- exit 1 ; \
- fi
-endif
- @if [ ! -r $(ERROR_FILE) ]; then \
- $(ECHO) "Sanity check passed." ; \
- fi
-
-insane:
-ifdef INSANE
- @$(ECHO) "WARNING: You are building in 'INSANE' mode. You \n" \
- " should not use this mode, and in fact, \n" \
- " it may be removed at any time. If you \n" \
- " have build problems as a result of using \n" \
- " INSANE mode, then you should not expect \n" \
- " assistance from anyone with the problems \n" \
- " or consequences you experience. \n" \
- "" >> $(WARNING_FILE)
-endif
-
-# Get list of environment variables set that we do not want set
-ifdef ALT_HOTSPOT_SERVER_PATH
- DO_NOT_SET_LIST += ALT_HOTSPOT_SERVER_PATH
-endif
-ifdef ALT_HOTSPOT_CLIENT_PATH
- DO_NOT_SET_LIST += ALT_HOTSPOT_CLIENT_PATH
-endif
-ifdef ALT_HOTSPOT_LIB_PATH
- DO_NOT_SET_LIST += ALT_HOTSPOT_LIB_PATH
-endif
-
-# Error message for environment variable set that should not be
-%.do_not_set:
- @$(ECHO) "ERROR: Your build environment has the variable\n" \
- " $* defined. Please unset it and restart your build. \n" \
- "" >> $(ERROR_FILE)
-
-# Check the environment variables
-environment: $(DO_NOT_SET_LIST:%=%.do_not_set)
-ifeq ($(LANGTOOLS_SRC_AVAILABLE), true)
- ifneq ($(BUILD_LANGTOOLS), true)
- @$(ECHO) "WARNING: You are not building the LANGTOOLS sources.\n" \
- " Lang tools (javac) will be obtained from \n" \
- " the location set in ALT_JDK_IMPORT_PATH. \n" \
- "" >> $(WARNING_FILE)
- endif
-endif
-ifeq ($(JAXP_SRC_AVAILABLE), true)
- ifneq ($(BUILD_JAXP), true)
- @$(ECHO) "WARNING: You are not building the JAXP sources.\n" \
- " The jaxp files will be obtained from \n" \
- " the location set in ALT_JDK_IMPORT_PATH. \n" \
- "" >> $(WARNING_FILE)
- endif
-endif
-ifeq ($(JAXWS_SRC_AVAILABLE), true)
- ifneq ($(BUILD_JAXWS), true)
- @$(ECHO) "WARNING: You are not building the JAXWS sources.\n" \
- " The jaxws files will be obtained from \n" \
- " the location set in ALT_JDK_IMPORT_PATH. \n" \
- "" >> $(WARNING_FILE)
- endif
-endif
-ifeq ($(CORBA_SRC_AVAILABLE), true)
- ifneq ($(BUILD_CORBA), true)
- @$(ECHO) "WARNING: You are not building the CORBA sources.\n" \
- " The corba files will be obtained from \n" \
- " the location set in ALT_JDK_IMPORT_PATH. \n" \
- "" >> $(WARNING_FILE)
- endif
-endif
-ifeq ($(HOTSPOT_SRC_AVAILABLE), true)
- ifneq ($(BUILD_HOTSPOT), true)
- @$(ECHO) "WARNING: You are not building the HOTSPOT sources.\n" \
- " Hotspot libs will be obtained from \n" \
- " the location set in ALT_HOTSPOT_IMPORT_PATH. \n" \
- "" >> $(WARNING_FILE)
- endif
-endif
-ifeq ($(JDK_SRC_AVAILABLE), true)
- ifneq ($(BUILD_JDK), true)
- @$(ECHO) "WARNING: You are not building the JDK sources.\n" \
- " This will result in a development-only\n" \
- " build of the JDK , lacking the jdk binaries.\n" \
- "" >> $(WARNING_FILE)
- endif
-endif
-ifeq ($(NASHORN_SRC_AVAILABLE), true)
- ifneq ($(BUILD_NASHORN), true)
- @$(ECHO) "WARNING: You are not building the NASHORN sources.\n" \
- " The nashorn files will be obtained from \n" \
- " the location set in ALT_JDK_IMPORT_PATH. \n" \
- "" >> $(WARNING_FILE)
- endif
-endif
-ifeq ($(DEPLOY_SRC_AVAILABLE), true)
- ifneq ($(BUILD_DEPLOY), true)
- @$(ECHO) "WARNING: You are not building the DEPLOY sources.\n" \
- " This will result in a development-only\n" \
- " build of the JDK, lacking the plugin and javaws binaries.\n" \
- "" >> $(WARNING_FILE)
- endif
-endif
-ifeq ($(INSTALL_SRC_AVAILABLE), true)
- ifneq ($(BUILD_INSTALL), true)
- @$(ECHO) "WARNING: You are not building the INSTALL sources.\n" \
- " This will result in a development-only\n" \
- " build of the JDK, lacking the installation bundles\n" \
- "" >> $(WARNING_FILE)
- endif
-endif
-ifeq ($(SPONSORS_SRC_AVAILABLE), true)
- ifneq ($(BUILD_SPONSORS), true)
- @$(ECHO) "WARNING: You are not building the SPONSORS sources.\n" \
- "" >> $(WARNING_FILE)
- endif
-endif
-ifeq ($(GENERATE_DOCS),false)
- @$(ECHO) "WARNING: This build does not include generating javadoc.\n" \
- "" >> $(WARNING_FILE)
-endif
-ifdef NO_DEMOS
- @$(ECHO) "WARNING: This build and any install images will not include demos.\n" \
- "" >> $(WARNING_FILE)
-endif
-ifdef NO_SAMPLES
- @$(ECHO) "WARNING: This build and any install images will not include samples.\n" \
- "" >> $(WARNING_FILE)
-endif
-ifdef NO_IMAGES
- @$(ECHO) "WARNING: Your build environment has the variable NO_IMAGES\n" \
- " defined. This will result in a development-only\n" \
- " build of the JDK, lacking the install images\n" \
- " and bundles.\n" \
- "" >> $(WARNING_FILE)
-endif
-ifdef DEV_ONLY
- @$(ECHO) "WARNING: Your build environment has the variable DEV_ONLY\n" \
- " defined. This will result in a development-only\n" \
- " build of the JDK, lacking the documentation\n" \
- " build and installation bundles.\n" \
- "" >> $(WARNING_FILE)
-endif
-
-######################################################
-# dump out the variable settings...
-######################################################
-ifneq ($(PLATFORM), windows)
- ifndef HOSTNAME
- HOSTNAME := $(shell hostname)
- endif
-endif
-settings::
- @$(ECHO) "Build Machine Information:" >> $(MESSAGE_FILE)
-ifeq ($(PLATFORM), windows)
- @$(ECHO) " build machine = $(COMPUTERNAME)" >> $(MESSAGE_FILE)
-else
- @$(ECHO) " build machine = $(HOSTNAME)" >> $(MESSAGE_FILE)
-endif
- @$(ECHO) "" >> $(MESSAGE_FILE)
- @$(ECHO) "Build Directory Structure:" >> $(MESSAGE_FILE)
- @$(ECHO) " CWD = `$(PWD)`" >> $(MESSAGE_FILE)
- @$(ECHO) " TOPDIR = $(TOPDIR)" >> $(MESSAGE_FILE)
-ifeq ($(LANGTOOLS_SRC_AVAILABLE), true)
- @$(ECHO) " LANGTOOLS_TOPDIR = $(LANGTOOLS_TOPDIR)" >> $(MESSAGE_FILE)
-endif
-ifeq ($(JAXP_SRC_AVAILABLE), true)
- @$(ECHO) " JAXP_TOPDIR = $(JAXP_TOPDIR)" >> $(MESSAGE_FILE)
-endif
-ifeq ($(JAXWS_SRC_AVAILABLE), true)
- @$(ECHO) " JAXWS_TOPDIR = $(JAXWS_TOPDIR)" >> $(MESSAGE_FILE)
-endif
-ifeq ($(CORBA_SRC_AVAILABLE), true)
- @$(ECHO) " CORBA_TOPDIR = $(CORBA_TOPDIR)" >> $(MESSAGE_FILE)
-endif
-ifeq ($(HOTSPOT_SRC_AVAILABLE), true)
- @$(ECHO) " HOTSPOT_TOPDIR = $(HOTSPOT_TOPDIR)" >> $(MESSAGE_FILE)
-endif
-ifeq ($(JDK_SRC_AVAILABLE), true)
- @$(ECHO) " JDK_TOPDIR = $(JDK_TOPDIR)" >> $(MESSAGE_FILE)
-endif
-ifeq ($(NASHORN_SRC_AVAILABLE), true)
- @$(ECHO) " NASHORN_TOPDIR = $(NASHORN_TOPDIR)" >> $(MESSAGE_FILE)
-endif
-ifeq ($(DEPLOY_SRC_AVAILABLE), true)
- @$(ECHO) " DEPLOY_TOPDIR = $(DEPLOY_TOPDIR)" >> $(MESSAGE_FILE)
-endif
-ifeq ($(INSTALL_SRC_AVAILABLE), true)
- @$(ECHO) " INSTALL_TOPDIR = $(INSTALL_TOPDIR)" >> $(MESSAGE_FILE)
-endif
-ifeq ($(SPONSORS_SRC_AVAILABLE), true)
- @$(ECHO) " SPONSORS_TOPDIR = $(SPONSORS_TOPDIR)" >> $(MESSAGE_FILE)
-endif
- @$(ECHO) "" >> $(MESSAGE_FILE)
-ifneq ($(SKIP_COMPARE_IMAGES), true)
- @$(ECHO) "External File/Binary Locations:" >> $(MESSAGE_FILE)
- @$(ECHO) " PREVIOUS_JRE_BUNDLE = $(PREVIOUS_JRE_BUNDLE) " >> $(MESSAGE_FILE)
- @$(ECHO) " PREVIOUS_JDK_BUNDLE = $(PREVIOUS_JDK_BUNDLE) " >> $(MESSAGE_FILE)
- @$(ECHO) "" >> $(MESSAGE_FILE)
-endif
- @$(ECHO) "Build Directives:" >> $(MESSAGE_FILE)
-ifeq ($(LANGTOOLS_SRC_AVAILABLE), true)
- @$(ECHO) " BUILD_LANGTOOLS = $(BUILD_LANGTOOLS) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(JAXP_SRC_AVAILABLE), true)
- @$(ECHO) " BUILD_JAXP = $(BUILD_JAXP) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(JAXWS_SRC_AVAILABLE), true)
- @$(ECHO) " BUILD_JAXWS = $(BUILD_JAXWS) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(CORBA_SRC_AVAILABLE), true)
- @$(ECHO) " BUILD_CORBA = $(BUILD_CORBA) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(HOTSPOT_SRC_AVAILABLE), true)
- @$(ECHO) " BUILD_HOTSPOT = $(BUILD_HOTSPOT) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(JDK_SRC_AVAILABLE), true)
- @$(ECHO) " BUILD_JDK = $(BUILD_JDK) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(NASHORN_SRC_AVAILABLE), true)
- @$(ECHO) " BUILD_NASHORN = $(BUILD_NASHORN) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(DEPLOY_SRC_AVAILABLE), true)
- @$(ECHO) " BUILD_DEPLOY = $(BUILD_DEPLOY) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(INSTALL_SRC_AVAILABLE), true)
- @$(ECHO) " BUILD_INSTALL = $(BUILD_INSTALL) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(SPONSORS_SRC_AVAILABLE), true)
- @$(ECHO) " BUILD_SPONSORS = $(BUILD_SPONSORS) " >> $(MESSAGE_FILE)
-endif
- @$(ECHO) " DEBUG_CLASSFILES = $(DEBUG_CLASSFILES) " >> $(MESSAGE_FILE)
- @$(ECHO) " DEBUG_BINARIES = $(DEBUG_BINARIES) " >> $(MESSAGE_FILE)
- @$(ECHO) "" >> $(MESSAGE_FILE)
-
-.PHONY: sanity settings pre-sanity insane \
- post-sanity post-sanity-hotspot post-sanity-jdk \
- post-sanity-install post-sanity-deploy \
- environment
diff --git a/make/scripts/fixpath.pl b/make/scripts/fixpath.pl
deleted file mode 100644
index 36ec981..0000000
--- a/make/scripts/fixpath.pl
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/perl
-
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Crunch down the input(s) to Windows short (mangled) form.
-# Any elements not actually found in the filesystem will be dropped.
-#
-# This script needs three modes:
-# 1) DOS mode with drive letter followed by : and ; path separator
-# 2) Cygwin mode with /cygdrive/<drive letter>/ and : path separator
-# 3) MinGW/MSYS mode with /<drive letter>/ and : path separator
-
-use strict;
-use warnings;
-use Getopt::Std;
-
-sub Usage() {
- print ("Usage:\n $0 -d | -c | -m \<PATH\>\n");
- print (" -d DOS style (drive letter, :, and ; path separator)\n");
- print (" -c Cywgin style (/cygdrive/drive/ and : path separator)\n");
- print (" -m MinGW style (/drive/ and : path separator)\n");
- exit 1;
-}
-# Process command line options:
-my %opts;
-getopts('dcm', \%opts) || Usage();
-
-if (scalar(@ARGV) != 1) {Usage()};
-
-# Translate drive letters such as C:/
-# if MSDOS, Win32::GetShortPathName() does the work (see below).
-# if Cygwin, use the /cygdrive/c/ form.
-# if MinGW, use the /c/ form.
-my $path0;
-my $sep2;
-if (defined ($opts{'d'})) {
- #MSDOS
- $path0 = '';
- $sep2 = ';';
-} elsif (defined ($opts{'c'})) {
- #Cygwin
- $path0 = '/cygdrive';
- $sep2 = ':';
-} elsif (defined ($opts{'m'})) {
- #MinGW/MSYS
- $path0 = '';
- $sep2 = ':';
-} else {
- Usage();
-}
-
-my $input = $ARGV[0];
-my $sep1;
-
-# Is the input ';' separated, or ':' separated, or a simple string?
-if (($input =~ tr/;/;/) > 0) {
- # One or more ';' implies Windows style path.
- $sep1 = ';';
-} elsif (($input =~ tr/:/:/) > 1) {
- # Two or more ':' implies Cygwin or MinGW/MSYS style path.
- $sep1 = ':';
-} else {
- # Otherwise, this is not a path - take up to the end of string in
- # one piece.
- $sep1 = '/$/';
-}
-
-# Split the input on $sep1 PATH separator and process the pieces.
-my @pieces;
-for (split($sep1, $input)) {
- my $try = $_;
-
- if (($try =~ /^\/cygdrive\/(.)\/(.*)$/) || ($try =~ /^\/(.)\/(.*)$/)) {
- # Special case #1: This is a Cygwin /cygrive/<drive letter/ path.
- # Special case #2: This is a MinGW/MSYS /<drive letter/ path.
- $try = $1.':/'.$2;
- } elsif ($try =~ /^\/(.*)$/) {
- # Special case #3: check for a Cygwin or MinGW/MSYS form with a
- # leading '/' for example '/usr/bin/bash'.
- # Look up where this is mounted and rebuild the
- # $try string with that information
- my $cmd = "df --portability --all --human-readable $try";
- my $line = qx ($cmd);
- my $status = $?;
- if ($status == 0) {
- my @lines = split ('\n', $line);
- my ($device, $junk, $mountpoint);
- # $lines[0] is the df header.
- # Example string for split - we want the first and last elements:
- # C:\jprt\products\P1\MinGW\msys\1.0 200G 78G 123G 39% /usr
- ($device, $junk, $junk, $junk, $junk, $mountpoint) = split (/\s+/, $lines[1]);
- # Replace $mountpoint with $device/ in the original string
- $try =~ s|$mountpoint|$device/|;
- } else {
- printf ("Error %d from command %s\n%s\n", $status, $cmd, $line);
- }
- }
-
- my $str = Win32::GetShortPathName($try);
- if (!defined($str)){
- # Special case #4: If the lookup did not work, loop through
- # adding extensions listed in PATHEXT, looking for the first
- # match.
- for (split(';', $ENV{'PATHEXT'})) {
- $str = Win32::GetShortPathName($try.$_);
- if (defined($str)) {
- last;
- }
- }
- }
-
- if (defined($str)){
- if (!defined($opts{'d'})) {
- # If not MSDOS, change C: to [/cygdrive]/c/
- if ($str =~ /^(\S):(.*)$/) {
- my $path1 = $1;
- my $path2 = $2;
- $str = $path0 . '/' . $path1 . '/' . $path2;
- }
- }
- push (@pieces, $str);
- }
-}
-
-# If input was a PATH, join the pieces back together with $sep2 path
-# separator.
-my $result;
-if (scalar(@pieces > 1)) {
- $result = join ($sep2, @pieces);
-} else {
- $result = $pieces[0];
-}
-
-if (defined ($result)) {
-
- # Change all '\' to '/'
- $result =~ s/\\/\//g;
-
- # Remove duplicate '/'
- $result =~ s/\/\//\//g;
-
- # Map to lower case
- $result =~ tr/A-Z/a-z/;
-
- print ("$result\n");
-}
diff --git a/make/scripts/vsvars.sh b/make/scripts/vsvars.sh
deleted file mode 100644
index 7a162de..0000000
--- a/make/scripts/vsvars.sh
+++ /dev/null
@@ -1,619 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This file should be used to set the Visual Studio environment
-# variables normally set by the vcvars32.bat or vcvars64.bat file or
-# SetEnv.cmd for older SDKs.
-
-########################################################################
-# Error functions
-msg() # message
-{
- echo "$1" 1>&2
-}
-error() # message
-{
- msg "ERROR: $1"
- exit 1
-}
-warning() # message
-{
- msg "WARNING: $1"
-}
-envpath() # path
-{
- if [ "${fixpath}" != "" -a -d "$1" ] ; then
- ${fixpath} "$1"
- else
- echo "$1"
- fi
-}
-########################################################################
-
-
-# Defaults settings
-debug="false"
-verbose="false"
-
-set -e
-
-CYGWIN="nodosfilewarning ntsec"
-export CYGWIN
-
-# pathsepIn is always ; because the input strings are coming from
-# vcvarsxx.bat. This is true under all of MKS, Cygwin, MINGW/msys
-pathsepIn=';'
-
-OS="`uname -s`"
-case "${OS}" in
- CYGWIN*)
- pathflag='-c'
- devnull=/dev/null
- pathsepOut=':'
- ;;
-
- MINGW*)
- pathflag='-m'
- devnull=/dev/null
- pathsepOut=':'
- ;;
-
- *)
- # MKS?
- # Continue using dosname -s
- pathflag='-s'
- fixpath="dosname ${pathflag}"
- fixpath_windows="${fixpath}"
- fixpath_path="echo"
- devnull=NUL
- pathsepOut=';'
- ;;
-esac
-
-case "${OS}" in
- CYGWIN*|MINGW*)
- t=`dirname ${0}`
- wd=`cd ${t} 2> ${devnull} && pwd`
- fixpath_script="${wd}/fixpath.pl"
- if [ ! -f "${fixpath_script}" ] ; then
- error "Does not exist: ${fixpath_script}"
- fi
- fixpath="perl ${fixpath_script} ${pathflag}"
- fixpath_windows="perl ${fixpath_script} -d"
- fixpath_path="${fixpath_windows}"
- ;;
-esac
-
-shellStyle="sh"
-## As far as I can tell from hg history, this has not worked
-## for a long time because PPID is unset. When run under Cygwin
-## the script quits due to the 1 return from grep.
-##parentCsh="` ps -p ${PPID} 2> ${devnull} | grep csh `"
-##if [ "${parentCsh}" != "" ] ; then
-## shellStyle="csh"
-##fi
-
-# Check environment first
-if [ "${PROGRAMFILES}" != "" ] ; then
- progfiles=`envpath "${PROGRAMFILES}"`
-elif [ "${ProgramFiles}" != "" ] ; then
- progfiles=`envpath "${ProgramFiles}"`
-elif [ "${SYSTEMDRIVE}" != "" ] ; then
- progfiles=`envpath "${SYSTEMDRIVE}/Program Files"`
-elif [ "${SystemDrive}" != "" ] ; then
- progfiles=`envpath "${SystemDrive}/Program Files"`
-else
- error "No PROGRAMFILES or SYSTEMDRIVE defined in environment"
-fi
-
-# Arch data model
-if [ "${PROCESSOR_IDENTIFIER}" != "" ] ; then
- arch=`echo "${PROCESSOR_IDENTIFIER}" | cut -d' ' -f1`
-else
- if [ "${MACHTYPE}" != "" ] ; then
- if [ "`echo ${MACHTYPE} | grep 64`" != "" ] ; then
- # Assume this is X64, not IA64
- arch="x64"
- else
- arch="x86"
- fi
- else
- arch="`uname -m`"
- fi
- PROCESSOR_IDENTIFIER="${arch}"
- export PROCESSOR_IDENTIFIER
-fi
-if [ "${arch}" = "X86" -o \
- "${arch}" = "386" -o "${arch}" = "i386" -o \
- "${arch}" = "486" -o "${arch}" = "i486" -o \
- "${arch}" = "586" -o "${arch}" = "i586" -o \
- "${arch}" = "686" -o "${arch}" = "i686" -o \
- "${arch}" = "86" ] ; then
- arch="x86"
-fi
-if [ "${arch}" = "X64" -o \
- "${arch}" = "8664" -o "${arch}" = "i8664" -o \
- "${arch}" = "amd64" -o "${arch}" = "AMD64" -o \
- "${arch}" = "EM64T" -o "${arch}" = "emt64t" -o \
- "${arch}" = "intel64" -o "${arch}" = "Intel64" -o \
- "${arch}" = "64" ] ; then
- arch="x64"
- binarch64="\\amd64"
-fi
-if [ "${arch}" = "IA64" ] ; then
- arch="ia64"
- binarch64="\\ia64"
-fi
-if [ "${arch}" != "x86" -a "${arch}" != "x64" -a "${arch}" != "ia64" ] ; then
- error "No PROCESSOR_IDENTIFIER or MACHTYPE environment variables and uname -m is not helping"
-fi
-if [ "${arch}" = "x86" ] ; then
- arch_data_model=32
- progfiles32="${progfiles}"
- progfiles64="${progfiles}"
-else
- arch_data_model=64
- progfiles32="${progfiles}"
- if [ "${PROGRAMW6432}" != "" ] ; then
- progfiles64=`envpath "${PROGRAMW6432}"`
- else
- progfiles64=`envpath "C:/Program Files"`
- fi
-fi
-
-# VS2012 (VC11)
-if [ "${VS110COMNTOOLS}" = "" ] ; then
- VS110COMNTOOLS="${progfiles32}/Microsoft Visual Studio 11.0/Common7/Tools/"
- export VS110COMNTOOLS
-fi
-vc11Bin32Dir=`envpath "${VS110COMNTOOLS}"`/../../VC/Bin
-vc11Bin64Dir="${vc11Bin32Dir}"
-vc11vars32Bat="vcvars32.bat"
-vc11vars64Bat="vcvars64.bat"
-
-# VS2010 (VC10)
-if [ "${VS100COMNTOOLS}" = "" ] ; then
- VS100COMNTOOLS="${progfiles32}/Microsoft Visual Studio 10.0/Common7/Tools/"
- export VS100COMNTOOLS
-fi
-vc10Bin32Dir=`envpath "${VS100COMNTOOLS}"`/../../VC/Bin
-vc10Bin64Dir="${vc10Bin32Dir}${binarch64}"
-vc10vars32Bat="vcvars32.bat"
-vc10vars64Bat="vcvars64.bat"
-
-# VS2008 (VC9)
-if [ "${VS90COMNTOOLS}" = "" ] ; then
- VS90COMNTOOLS="${progfiles32}/Microsoft Visual Studio 9.0/Common7/Tools/"
- export VS90COMNTOOLS
-fi
-vc9Bin32Dir=`envpath "${VS90COMNTOOLS}"`/../../VC/Bin
-vc9Bin64Dir="${vc9Bin32Dir}"
-vc9vars32Bat="vcvars32.bat"
-vc9vars64Bat="vcvars64.bat"
-
-# VS2005 (VC8)
-if [ "${VS80COMNTOOLS}" = "" ] ; then
- VS80COMNTOOLS="${progfiles32}/Microsoft Visual Studio 8.0/Common7/Tools/"
- export VS80COMNTOOLS
-fi
-vc8Bin32Dir=`envpath "${VS80COMNTOOLS}"`/../../VC/Bin
-vc8Bin64Dir="${progfiles64}/Microsoft Platform SDK"
-vc8vars32Bat="vcvars32.bat"
-vc8vars64Bat="SetEnv.cmd /X64"
-
-# VS2003 (VC7)
-if [ "${VS71COMNTOOLS}" = "" ] ; then
- VS71COMNTOOLS="${progfiles32}/Microsoft Visual Studio .NET 2003/Common7/Tools/"
- export VS71COMNTOOLS
-fi
-vc7Bin32Dir=`envpath "${VS71COMNTOOLS}"`/../../VC7/Bin
-vc7Bin64Dir="${progfiles64}/Microsoft Platform SDK"
-vc7vars32Bat="vcvars32.bat"
-vc7vars64Bat="SetEnv.cmd /X64"
-
-# Force user to select
-vcSelection=""
-
-# Parse options
-usage="Usage: $0 [-help] [-debug] [-v] [-c] [-s] [-p] [-v11] [-v10] [-v9] [-v8] [-v7] [-32] [-64]"
-while [ $# -gt 0 ] ; do
- if [ "$1" = "-help" ] ; then
- msg "${usage}"
- msg " -help Print out this help message"
- msg " -debug Print out extra env variables to help debug this script"
- msg " -v Verbose output warns about missing directories"
- msg " -c Print out csh style output"
- msg " -s Print out sh style output"
- msg " -p Print out properties style output"
- msg " -v11 Use Visual Studio 11 VS2012"
- msg " -v10 Use Visual Studio 10 VS2010"
- msg " -v9 Use Visual Studio 9 VS2008"
- msg " -v8 Use Visual Studio 8 VS2005"
- msg " -v7 Use Visual Studio 7 VS2003"
- msg " -32 Force 32bit"
- msg " -64 Force 64bit"
- exit 0
- elif [ "$1" = "-debug" ] ; then
- debug="true"
- shift
- elif [ "$1" = "-v" ] ; then
- verbose="true"
- shift
- elif [ "$1" = "-c" ] ; then
- shellStyle="csh"
- shift
- elif [ "$1" = "-s" ] ; then
- shellStyle="sh"
- shift
- elif [ "$1" = "-p" ] ; then
- shellStyle="props"
- shift
- elif [ "$1" = "-v11" ] ; then
- vcBin32Dir="${vc11Bin32Dir}"
- vcBin64Dir="${vc11Bin64Dir}"
- vcvars32Bat="${vc11vars32Bat}"
- vcvars64Bat="${vc11vars64Bat}"
- vcSelection="11"
- shift
- elif [ "$1" = "-v10" ] ; then
- vcBin32Dir="${vc10Bin32Dir}"
- vcBin64Dir="${vc10Bin64Dir}"
- vcvars32Bat="${vc10vars32Bat}"
- vcvars64Bat="${vc10vars64Bat}"
- vcSelection="10"
- shift
- elif [ "$1" = "-v9" ] ; then
- vcBin32Dir="${vc9Bin32Dir}"
- vcBin64Dir="${vc9Bin64Dir}"
- vcvars32Bat="${vc9vars32Bat}"
- vcvars64Bat="${vc9vars64Bat}"
- vcSelection="9"
- shift
- elif [ "$1" = "-v8" ] ; then
- vcBin32Dir="${vc8Bin32Dir}"
- vcBin64Dir="${vc8Bin64Dir}"
- vcvars32Bat="${vc8vars32Bat}"
- vcvars64Bat="${vc8vars64Bat}"
- vcSelection="8"
- shift
- elif [ "$1" = "-v7" ] ; then
- vcBin32Dir="${vc7Bin32Dir}"
- vcBin64Dir="${vc7Bin64Dir}"
- vcvars32Bat="${vc7vars32Bat}"
- vcvars64Bat="${vc7vars64Bat}"
- vcSelection="7"
- shift
- elif [ "$1" = "-32" ] ; then
- arch_data_model=32
- shift
- elif [ "$1" = "-64" ] ; then
- arch_data_model=64
- shift
- else
- msg "${usage}"
- error "Unknown option: $1"
- fi
-done
-
-# Need to pick
-if [ "${vcSelection}" = "" ] ; then
- msg "${usage}"
- error "You must pick the version"
-fi
-
-# Which vcvars bat file to run
-if [ "${arch_data_model}" = "32" ] ; then
- vcBinDir="${vcBin32Dir}"
- vcvarsBat="${vcvars32Bat}"
-fi
-if [ "${arch_data_model}" = "64" ] ; then
- vcBinDir="${vcBin64Dir}"
- vcvarsBat="${vcvars64Bat}"
-fi
-
-# Do not allow any error returns
-set -e
-
-# Different systems have different awk's
-if [ -f /usr/bin/nawk ] ; then
- awk="nawk"
-elif [ -f /usr/bin/gawk ] ; then
- awk="gawk"
-else
- awk="awk"
-fi
-
-if [ "${verbose}" = "true" ] ; then
- echo "# Welcome to verbose mode"
- set -x
-fi
-
-if [ "${debug}" = "true" ] ; then
- echo "# Welcome to debug mode"
- set -x
-fi
-
-# Temp file area
-tmp="/tmp/vsvars.$$"
-rm -f -r ${tmp}
-mkdir -p ${tmp}
-
-# Check paths
-checkPaths() # var path sep
-{
- set -e
- sep="$3"
- checklist="${tmp}/checklist"
- printf "%s\n" "$2" | \
- sed -e 's@\\@/@g' | \
- sed -e 's@//@/@g' | \
- ${awk} -F"${sep}" '{for(i=1;i<=NF;i++){printf "%s\n",$i;}}' \
- > ${checklist}
- cat ${checklist} | while read orig; do
- if [ "${orig}" != "" ] ; then
- if [ ! -d "${orig}" ] ; then
- warning "Directory in $1 does not exist: ${orig}"
- fi
- fi
- done
-}
-
-# Remove all duplicate entries
-removeDeadDups() # string sepIn sepOut
-{
- set -e
- sepIn="$2"
- sepOut="$3"
- pathlist="${tmp}/pathlist"
- printf "%s\n" "$1" | \
- sed -e 's@\\@/@g' | \
- sed -e 's@//@/@g' | \
- ${awk} -F"${sepIn}" '{for(i=1;i<=NF;i++){printf "%s\n",$i;}}' \
- > ${pathlist}
- upaths="${tmp}/upaths"
- cat ${pathlist} | while read orig; do
- p="${orig}"
- if [ "${fixpath}" != "" ] ; then
- if [ "${p}" != "" ] ; then
- if [ -d "${p}" ] ; then
- short=`${fixpath} "${p}"`
- if [ "${short}" != "" -a -d "${short}" ] ; then
- p="${short}"
- fi
- echo "${p}" >> ${upaths}
- fi
- fi
- fi
- done
- newpaths=""
- for i in `cat ${upaths}` ; do
- # For some reason, \r characters can get into this
- i=`echo "${i}" | tr -d '\r' | sed -e 's@/$@@'`
- if [ "${newpaths}" = "" ] ; then
- newpaths="${i}"
- else
- newpaths="${newpaths}${sepOut}${i}"
- fi
- done
- printf "%s\n" "${newpaths}" | \
- ${awk} -F"${sepOut}" \
- '{a[$1];printf "%s",$1;for(i=2;i<=NF;i++){if(!($i in a)){a[$i];printf "%s%s",FS,$i;}};printf "\n";}'
-}
-
-# Create bat file to process Visual Studio vcvars*.bat files
-createBat() # batfile bindir command
-{
- bat="$1"
- bindir="$2"
- command="$3"
- stdout="${bat}.stdout"
- rm -f ${bat} ${stdout}
- echo "Output from: ${command}" > ${stdout}
- bdir=`envpath "${bindir}"`
- cat > ${bat} << EOF
-REM Pick the right vcvars bat file
-REM Empty these out so we only get the additions we want
-set INCLUDE=
-set LIB=
-set LIBPATH=
-set MSVCDIR=
-set MSSdk=
-set Mstools=
-set DevEnvDir=
-set VCINSTALLDIR=
-set VSINSTALLDIR=
-set WindowsSdkDir=
-REM Run the vcvars bat file, send all output to stderr
-call `${fixpath_windows} ${bdir}`\\${command} > `${fixpath_windows} "${stdout}"`
-REM Echo out env var settings
-echo VS_VS71COMNTOOLS="%VS71COMNTOOLS%"
-echo export VS_VS71COMNTOOLS
-echo VS_VS80COMNTOOLS="%VS80COMNTOOLS%"
-echo export VS_VS80COMNTOOLS
-echo VS_VS90COMNTOOLS="%VS90COMNTOOLS%"
-echo export VS_VS90COMNTOOLS
-echo VS_VS100COMNTOOLS="%VS100COMNTOOLS%"
-echo export VS_VS100COMNTOOLS
-echo VS_VS110COMNTOOLS="%VS110COMNTOOLS%"
-echo export VS_VS110COMNTOOLS
-echo VS_VCINSTALLDIR="%VCINSTALLDIR%"
-echo export VS_VCINSTALLDIR
-echo VS_VSINSTALLDIR="%VSINSTALLDIR%"
-echo export VS_VSINSTALLDIR
-echo VS_DEVENVDIR="%DevEnvDir%"
-echo export VS_DEVENVDIR
-echo VS_MSVCDIR="%MSVCDIR%"
-echo export VS_MSVCDIR
-echo VS_MSSDK="%MSSdk%"
-echo export VS_MSSDK
-echo VS_MSTOOLS="%Mstools%"
-echo export VS_MSTOOLS
-echo VS_WINDOWSSDKDIR="%WindowsSdkDir%"
-echo export VS_WINDOWSSDKDIR
-echo VS_INCLUDE="%INCLUDE%"
-echo export VS_INCLUDE
-echo VS_LIB="%LIB%"
-echo export VS_LIB
-echo VS_LIBPATH="%LIBPATH%"
-echo export VS_LIBPATH
-echo VS_WPATH="%PATH%"
-echo export VS_WPATH
-EOF
- chmod a+x ${bat}
-}
-
-# Create env file
-createEnv() # batfile envfile
-{
- rm -f ${1}.stdout ${1}.temp1 ${1}.temp2
- batfile=`${fixpath} ${1}`
- cmd.exe -Q -C < "$batfile" 1> ${1}.temp1 2> ${1}.temp2
- cat ${1}.temp1 | \
- sed -e 's@^Microsoft.*@@' \
- -e 's@^.*Copyright.*@@' \
- -e 's@^.*>REM.*@@' \
- -e 's@^.*>set.*@@' \
- -e 's@^.*>echo.*@@' \
- -e 's@^.*>call.*@@' \
- -e 's@^.*>$@@' \
- -e 's@\\@/@g' | \
- sed -e 's@//@/@g' > $2
- if [ -f "${1}.stdout" ] ; then
- cat ${1}.stdout 1>&2
- fi
- chmod a+x $2
-}
-
-printEnv() # name pname vsname val
-{
- name="$1"
- pname="$2"
- vsname="$3"
- val="$4"
- if [ "${val}" != "" ] ; then
- if [ "${shellStyle}" = "csh" ] ; then
- if [ "${debug}" = "true" ] ; then
- echo "setenv ${vsname} \"${val}\";"
- fi
- echo "setenv ${name} \"${val}\";"
- elif [ "${shellStyle}" = "sh" ] ; then
- if [ "${debug}" = "true" ] ; then
- echo "${vsname}=\"${val}\";"
- echo "export ${vsname};"
- fi
- echo "${name}=\"${val}\";"
- echo "export ${name};"
- elif [ "${shellStyle}" = "props" ] ; then
- echo "vs.${pname}=${val}"
- fi
- fi
-}
-
-#############################################################################
-
-# Get Visual Studio settings
-if [ "${fixpath}" != "" ] ; then
-
- # Create bat file to run
- batfile="${tmp}/vs-to-env.bat"
- if [ ! -d "${vcBinDir}" ] ; then
- error "Does not exist: ${vcBinDir}"
- elif [ "${vcvarsBat}" = "" ] ; then
- error "No vcvars script: ${vcvarsBat}"
- else
- createBat "${batfile}" "${vcBinDir}" "${vcvarsBat}"
- fi
-
- # Run bat file to create environment variable settings
- envfile="${tmp}/env.sh"
- createEnv "${batfile}" "${envfile}"
-
- # Read in the VS_* settings
- . ${envfile}
-
- # Derive unix style path, save old, and define new (remove dups)
- VS_UPATH=`${fixpath_path} "${VS_WPATH}"`
- export VS_UPATH
- VS_OPATH=`printf "%s" "${PATH}" | sed -e 's@\\\\@/@g'`
- export VS_OPATH
- VS_PATH=`removeDeadDups "${VS_UPATH}${pathsepIn}${VS_OPATH}" "${pathsepIn}" "${pathsepOut}"`
- export VS_PATH
-
-fi
-
-# Adjustments due to differences in vcvars*bat files
-if [ "${VS_MSVCDIR}" = "" ] ; then
- VS_MSVCDIR="${VS_VCINSTALLDIR}"
-fi
-if [ "${VS_DEVENVDIR}" = "" ] ; then
- VS_DEVENVDIR="${VS_VSINSTALLDIR}"
-fi
-
-# Print env settings
-# env vs.prop vs env value
-# ------- ------- ---------- -----
-printEnv INCLUDE include VS_INCLUDE "${VS_INCLUDE}"
-printEnv LIB lib VS_LIB "${VS_LIB}"
-printEnv LIBPATH libpath VS_LIBPATH "${VS_LIBPATH}"
-if [ "${debug}" = "true" ] ; then
- printEnv UPATH upath VS_UPATH "${VS_UPATH}"
- printEnv WPATH wpath VS_WPATH "${VS_WPATH}"
- printEnv OPATH opath VS_OPATH "${VS_OPATH}"
-fi
-printEnv PATH path VS_PATH "${VS_PATH}"
-printEnv VCINSTALLDIR vcinstalldir VS_VCINSTALLDIR "${VS_VCINSTALLDIR}"
-printEnv VSINSTALLDIR vsinstalldir VS_VSINSTALLDIR "${VS_VSINSTALLDIR}"
-printEnv MSVCDIR msvcdir VS_MSVCDIR "${VS_MSVCDIR}"
-printEnv MSSDK mssdk VS_MSSDK "${VS_MSSDK}"
-printEnv MSTOOLS mstools VS_MSTOOLS "${VS_MSTOOLS}"
-printEnv DEVENVDIR devenvdir VS_DEVENVDIR "${VS_DEVENVDIR}"
-printEnv WINDOWSSDKDIR windowssdkdir VS_WINDOWSSDKDIR "${VS_WINDOWSSDKDIR}"
-if [ "${vcSelection}" = "11" ] ; then
- printEnv VS110COMNTOOLS vs110comntools VS_VS110COMNTOOLS "${VS_VS110COMNTOOLS}"
-elif [ "${vcSelection}" = "10" ] ; then
- printEnv VS100COMNTOOLS vs100comntools VS_VS100COMNTOOLS "${VS_VS100COMNTOOLS}"
-elif [ "${vcSelection}" = "9" ] ; then
- printEnv VS90COMNTOOLS vs90comntools VS_VS90COMNTOOLS "${VS_VS90COMNTOOLS}"
-elif [ "${vcSelection}" = "7" ] ; then
- printEnv VS71COMNTOOLS vs71comntools VS_VS71COMNTOOLS "${VS_VS71COMNTOOLS}"
-elif [ "${vcSelection}" = "8" ] ; then
- printEnv VS80COMNTOOLS vs80comntools VS_VS80COMNTOOLS "${VS_VS80COMNTOOLS}"
-fi
-
-# Check final settings
-if [ "${verbose}" = "true" ] ; then
- checkPaths "Windows PATH" "${VS_WPATH}" ";"
- checkPaths LIB "${VS_LIB}" ";"
- checkPaths INCLUDE "${VS_INCLUDE}" ";"
- checkPaths PATH "${VS_PATH}" "${pathsepIn}"
-fi
-
-# Remove all temp files
-if [ "${debug}" != "true" ] ; then
- rm -f -r ${tmp}
-fi
-
-exit 0
-
diff --git a/make/sponsors-rules.gmk b/make/sponsors-rules.gmk
deleted file mode 100644
index a3813b5..0000000
--- a/make/sponsors-rules.gmk
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# SPONSORS TARGETS
-################################################################
-
-ifeq ($(PLATFORM)-$(ARCH), windows-i586)
-sponsors: sponsors-build
-else
-sponsors:
-endif
-
-# The generated java files are generated as a set, so instead of
-# setting the SPONSORS variable to that list of files, set it to
-# the .PHONY target that generates the set of files.
-SPONSORS = sponsors
-
-# put the generated patch in their own place in OUTPUTDIR
-SPONSORS_OUTPUTDIR = $(ABS_OUTPUTDIR)
-
-SPONSORS_BUILD_TARGETS = dll installer
-SPONSORS_BUILD_ARGUMENTS = \
- MAKEFLAGS= \
- $(COMMON_BUILD_ARGUMENTS) \
- ALT_OUTPUTDIR=$(SPONSORS_OUTPUTDIR) \
- ALT_RTPATCH_DIR=$(ALT_RTPATCH_DIR) \
- ALT_BASE_IMAGE_ZIP=$(ALT_BASE_IMAGE_ZIP) \
- ALT_BASE_IMAGE_DIR=$(ALT_BASE_IMAGE_DIR) \
- ALT_NEW_IMAGE_DIR=$(ALT_NEW_IMAGE_DIR) \
- ALT_BUNDLE_DATE=$(BUNDLE_DATE)
-
-ifeq ($(BUILD_LANGTOOLS), true)
- SPONSORS_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-sponsors-build:
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(BUILD_SPONSORS), true)
- @$(call MakeStart,sponsors,$(SPONSORS_BUILD_TARGETS))
- ($(CD) $(SPONSORS_TOPDIR)/make && \
- $(MAKE) $(SPONSORS_BUILD_TARGETS) $(SPONSORS_BUILD_ARGUMENTS))
- @$(call MakeFinish,sponsors,$(SPONSORS_BUILD_TARGETS))
- endif
-endif
-
-sponsors-sanity:
-
-sponsors-clobber::
-
-.PHONY: sponsors sponsors-build sponsors-sanity sponsors-clobber
-
diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index b102434..3fe1fdb 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -227,3 +227,4 @@
f0d3ac2474ee755b1180ec71bcdfa190845b17eb jdk8-b115
0fb1a427fbf6e04c77cebbbf99b6631c664ed793 jdk8-b116
1db3d4e4d18913e853d7bebf86816e87fda00a71 jdk8-b117
+8d014b039b44c23fa520ce20c2c27f7aa91441e9 jdk8-b118
diff --git a/nashorn/makefiles/BuildNashorn.gmk b/nashorn/make/BuildNashorn.gmk
similarity index 100%
rename from nashorn/makefiles/BuildNashorn.gmk
rename to nashorn/make/BuildNashorn.gmk
diff --git a/nashorn/make/Makefile b/nashorn/make/Makefile
index 443f8db..4570070 100644
--- a/nashorn/make/Makefile
+++ b/nashorn/make/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,37 +23,27 @@
# questions.
#
-#
-# On Solaris, the standard 'make' utility will not work with these makefiles.
-# This little rule is only understood by Solaris make, and is harmless
-# when seen by the GNU make tool. If using Solaris make, this causes the
-# make command to fail.
-#
-SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
+# Locate this Makefile
+ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
+ makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+ makefile_path := $(lastword $(MAKEFILE_LIST))
+endif
+repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path))
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name := $(notdir $(repo_dir))
-# Default target and expected 'do everything' target
+# Try to locate top-level makefile
+top_level_makefile := $(repo_dir)/../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 ===================================================)
+else
+ $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+ $(error Build from top-level Makefile instead)
+endif
+
all:
- echo Nashorn can only be built with NEWBUILD=true
-
-# Standard make clobber target
-clobber:
-
-#-------------------------------------------------------------------
-#
-# Targets for Oracle's internal JPRT build system
-
-CD = cd
-ZIP = zip
-
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
-
-jprt_build_product jprt_build_debug jprt_build_fastdebug: all
- ( $(CD) $(OUTPUTDIR) && \
- $(ZIP) -q -r $(JPRT_ARCHIVE_BUNDLE) build dist )
-
-#-------------------------------------------------------------------
-
-# Declare these phony (not filenames)
-.PHONY: $(ANT_TARGETS) all clobber \
- jprt_build_product jprt_build_debug jprt_build_fastdebug
+ @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/nashorn/makefiles/Makefile b/nashorn/makefiles/Makefile
deleted file mode 100644
index c7d0dd0..0000000
--- a/nashorn/makefiles/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Locate this Makefile
-ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
- makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
- makefile_path := $(lastword $(MAKEFILE_LIST))
-endif
-repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path))
-
-# What is the name of this subsystem (langtools, corba, etc)?
-subsystem_name := $(notdir $(repo_dir))
-
-# Try to locate 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 ===================================================)
-else
- $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
- $(error Build from top-level Makefile instead)
-endif
-
-all:
- @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index f5c1fb8..c3b1dbe 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -2186,15 +2186,14 @@
@Override
public boolean enterWhileNode(final WhileNode whileNode) {
- lineNumber(whileNode);
-
final Expression test = whileNode.getTest();
final Block body = whileNode.getBody();
final Label breakLabel = whileNode.getBreakLabel();
final Label continueLabel = whileNode.getContinueLabel();
+ final boolean isDoWhile = whileNode.isDoWhile();
final Label loopLabel = new Label("loop");
- if (!whileNode.isDoWhile()) {
+ if (!isDoWhile) {
method._goto(continueLabel);
}
@@ -2202,6 +2201,7 @@
body.accept(this);
if (!whileNode.isTerminal()) {
method.label(continueLabel);
+ lineNumber(whileNode);
new BranchOptimizer(this, method).execute(test, loopLabel, true);
method.label(breakLabel);
}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java b/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
index f939dc6..09af647 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
@@ -28,6 +28,7 @@
import java.util.List;
import jdk.nashorn.internal.ir.BinaryNode;
import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.BlockStatement;
import jdk.nashorn.internal.ir.CaseNode;
import jdk.nashorn.internal.ir.CatchNode;
import jdk.nashorn.internal.ir.ExpressionStatement;
@@ -141,7 +142,6 @@
@Override
public boolean enterBlock(final Block block) {
sb.append(' ');
- //sb.append(Debug.id(block));
sb.append('{');
indent += TABWIDTH;
@@ -190,12 +190,17 @@
sb.append(EOLN);
indent();
sb.append('}');
- // sb.append(Debug.id(block));
return false;
}
@Override
+ public boolean enterBlockStatement(final BlockStatement statement) {
+ statement.getBlock().accept(this);
+ return false;
+ }
+
+ @Override
public boolean enterBinaryNode(final BinaryNode binaryNode) {
binaryNode.lhs().accept(this);
sb.append(' ');
@@ -233,7 +238,6 @@
public boolean enterFunctionNode(final FunctionNode functionNode) {
functionNode.toString(sb);
enterBlock(functionNode.getBody());
- //sb.append(EOLN);
return false;
}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
index 3a853ef..f853573 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
@@ -35,6 +35,7 @@
import java.util.Arrays;
import java.util.BitSet;
import jdk.nashorn.internal.runtime.AccessorProperty;
+import jdk.nashorn.internal.runtime.JSType;
import jdk.nashorn.internal.runtime.Property;
import jdk.nashorn.internal.runtime.PropertyDescriptor;
import jdk.nashorn.internal.runtime.PropertyMap;
@@ -140,8 +141,9 @@
@Override
public boolean delete(final Object key, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? deleteMapped(index, strict) : super.delete(key, strict);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = ArrayIndex.getArrayIndex(primitiveKey);
+ return isMapped(index) ? deleteMapped(index, strict) : super.delete(primitiveKey, strict);
}
/**
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
index c7db39a..5777c96 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
@@ -484,10 +484,12 @@
*/
@Function(attributes = Attribute.NOT_ENUMERABLE)
public static Object hasOwnProperty(final Object self, final Object v) {
- final String str = JSType.toString(v);
+ // Convert ScriptObjects to primitive with String.class hint
+ // but no need to convert other primitives to string.
+ final Object key = JSType.toPrimitive(v, String.class);
final Object obj = Global.toObject(self);
- return (obj instanceof ScriptObject) && ((ScriptObject)obj).hasOwnProperty(str);
+ return (obj instanceof ScriptObject) && ((ScriptObject)obj).hasOwnProperty(key);
}
/**
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index 9fd5919..95af71a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -167,11 +167,12 @@
@SuppressWarnings("unused")
private static Object get(final Object self, final Object key) {
final CharSequence cs = JSType.toCharSequence(self);
- final int index = ArrayIndex.getArrayIndex(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = ArrayIndex.getArrayIndex(primitiveKey);
if (index >= 0 && index < cs.length()) {
return String.valueOf(cs.charAt(index));
}
- return ((ScriptObject) Global.toObject(self)).get(key);
+ return ((ScriptObject) Global.toObject(self)).get(primitiveKey);
}
@SuppressWarnings("unused")
@@ -202,11 +203,12 @@
// String characters can be accessed with array-like indexing..
@Override
public Object get(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = ArrayIndex.getArrayIndex(primitiveKey);
if (index >= 0 && index < value.length()) {
return String.valueOf(value.charAt(index));
}
- return super.get(key);
+ return super.get(primitiveKey);
}
@Override
@@ -295,8 +297,9 @@
@Override
public boolean has(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isValid(index) || super.has(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = ArrayIndex.getArrayIndex(primitiveKey);
+ return isValid(index) || super.has(primitiveKey);
}
@Override
@@ -318,8 +321,9 @@
@Override
public boolean hasOwnProperty(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isValid(index) || super.hasOwnProperty(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = ArrayIndex.getArrayIndex(primitiveKey);
+ return isValid(index) || super.hasOwnProperty(primitiveKey);
}
@Override
@@ -358,8 +362,9 @@
@Override
public boolean delete(final Object key, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- return checkDeleteIndex(index, strict)? false : super.delete(key, strict);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = ArrayIndex.getArrayIndex(primitiveKey);
+ return checkDeleteIndex(index, strict)? false : super.delete(primitiveKey, strict);
}
private boolean checkDeleteIndex(final int index, final boolean strict) {
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index 869746c..8e04fdc 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -1210,21 +1210,24 @@
*/
private void whileStatement() {
// Capture WHILE token.
- final int whileLine = line;
final long whileToken = token;
// WHILE tested in caller.
next();
// Construct WHILE node.
- WhileNode whileNode = new WhileNode(whileLine, whileToken, Token.descPosition(whileToken), false);
+ WhileNode whileNode = new WhileNode(line, whileToken, Token.descPosition(whileToken), false);
lc.push(whileNode);
try {
expect(LPAREN);
- whileNode = whileNode.setTest(lc, expression());
+ final int whileLine = line;
+ final Expression test = expression();
expect(RPAREN);
- whileNode = whileNode.setBody(lc, getStatement());
- appendStatement(whileNode);
+ final Block body = getStatement();
+ appendStatement(whileNode =
+ new WhileNode(whileLine, whileToken, finish, false).
+ setTest(lc, test).
+ setBody(lc, body));
} finally {
lc.pop(whileNode);
}
@@ -1242,28 +1245,33 @@
*/
private void doStatement() {
// Capture DO token.
- final int doLine = line;
final long doToken = token;
// DO tested in the caller.
next();
- WhileNode doWhileNode = new WhileNode(doLine, doToken, Token.descPosition(doToken), true);
+ WhileNode doWhileNode = new WhileNode(-1, doToken, Token.descPosition(doToken), true);
lc.push(doWhileNode);
try {
// Get DO body.
- doWhileNode = doWhileNode.setBody(lc, getStatement());
+ final Block body = getStatement();
expect(WHILE);
expect(LPAREN);
- doWhileNode = doWhileNode.setTest(lc, expression());
+ final int doLine = line;
+ final Expression test = expression();
expect(RPAREN);
if (type == SEMICOLON) {
endOfLine();
}
doWhileNode.setFinish(finish);
- appendStatement(doWhileNode);
+
+ //line number is last
+ appendStatement(doWhileNode =
+ new WhileNode(doLine, doToken, finish, true).
+ setBody(lc, body).
+ setTest(lc, test));
} finally {
lc.pop(doWhileNode);
}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index c7c8202..02160d6 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -2373,11 +2373,13 @@
private int getInt(final int index, final String key) {
if (isValidArrayIndex(index)) {
- for (ScriptObject object = this; ; ) {
- final FindProperty find = object.findProperty(key, false, false, this);
+ for (ScriptObject object = this; ; ) {
+ if (object.getMap().containsArrayKeys()) {
+ final FindProperty find = object.findProperty(key, false, false, this);
- if (find != null) {
- return getIntValue(find);
+ if (find != null) {
+ return getIntValue(find);
+ }
}
if ((object = object.getProto()) == null) {
@@ -2389,7 +2391,7 @@
if (array.has(index)) {
return array.getInt(index);
}
- }
+ }
} else {
final FindProperty find = findProperty(key, true);
@@ -2403,14 +2405,15 @@
@Override
public int getInt(final Object key) {
- final int index = getArrayIndex(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = getArrayIndex(primitiveKey);
final ArrayData array = getArray();
if (array.has(index)) {
return array.getInt(index);
}
- return getInt(index, JSType.toString(key));
+ return getInt(index, JSType.toString(primitiveKey));
}
@Override
@@ -2439,22 +2442,25 @@
@Override
public int getInt(final int key) {
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
- if (array.has(key)) {
- return array.getInt(key);
+ if (array.has(index)) {
+ return array.getInt(index);
}
- return getInt(key, JSType.toString(key));
+ return getInt(index, JSType.toString(key));
}
private long getLong(final int index, final String key) {
if (isValidArrayIndex(index)) {
for (ScriptObject object = this; ; ) {
- final FindProperty find = object.findProperty(key, false, false, this);
+ if (object.getMap().containsArrayKeys()) {
+ final FindProperty find = object.findProperty(key, false, false, this);
- if (find != null) {
- return getLongValue(find);
+ if (find != null) {
+ return getLongValue(find);
+ }
}
if ((object = object.getProto()) == null) {
@@ -2466,7 +2472,7 @@
if (array.has(index)) {
return array.getLong(index);
}
- }
+ }
} else {
final FindProperty find = findProperty(key, true);
@@ -2480,14 +2486,15 @@
@Override
public long getLong(final Object key) {
- final int index = getArrayIndex(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = getArrayIndex(primitiveKey);
final ArrayData array = getArray();
if (array.has(index)) {
return array.getLong(index);
}
- return getLong(index, JSType.toString(key));
+ return getLong(index, JSType.toString(primitiveKey));
}
@Override
@@ -2516,22 +2523,25 @@
@Override
public long getLong(final int key) {
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
- if (array.has(key)) {
- return array.getLong(key);
+ if (array.has(index)) {
+ return array.getLong(index);
}
- return getLong(key, JSType.toString(key));
+ return getLong(index, JSType.toString(key));
}
private double getDouble(final int index, final String key) {
if (isValidArrayIndex(index)) {
for (ScriptObject object = this; ; ) {
- final FindProperty find = object.findProperty(key, false, false, this);
+ if (object.getMap().containsArrayKeys()) {
+ final FindProperty find = object.findProperty(key, false, false, this);
- if (find != null) {
- return getDoubleValue(find);
+ if (find != null) {
+ return getDoubleValue(find);
+ }
}
if ((object = object.getProto()) == null) {
@@ -2543,7 +2553,7 @@
if (array.has(index)) {
return array.getDouble(index);
}
- }
+ }
} else {
final FindProperty find = findProperty(key, true);
@@ -2557,14 +2567,15 @@
@Override
public double getDouble(final Object key) {
- final int index = getArrayIndex(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = getArrayIndex(primitiveKey);
final ArrayData array = getArray();
if (array.has(index)) {
return array.getDouble(index);
}
- return getDouble(index, JSType.toString(key));
+ return getDouble(index, JSType.toString(primitiveKey));
}
@Override
@@ -2593,22 +2604,25 @@
@Override
public double getDouble(final int key) {
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
- if (array.has(key)) {
- return array.getDouble(key);
+ if (array.has(index)) {
+ return array.getDouble(index);
}
- return getDouble(key, JSType.toString(key));
+ return getDouble(index, JSType.toString(key));
}
private Object get(final int index, final String key) {
if (isValidArrayIndex(index)) {
for (ScriptObject object = this; ; ) {
- final FindProperty find = object.findProperty(key, false, false, this);
+ if (object.getMap().containsArrayKeys()) {
+ final FindProperty find = object.findProperty(key, false, false, this);
- if (find != null) {
- return getObjectValue(find);
+ if (find != null) {
+ return getObjectValue(find);
+ }
}
if ((object = object.getProto()) == null) {
@@ -2634,14 +2648,15 @@
@Override
public Object get(final Object key) {
- final int index = getArrayIndex(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = getArrayIndex(primitiveKey);
final ArrayData array = getArray();
if (array.has(index)) {
return array.getObject(index);
}
- return get(index, JSType.toString(key));
+ return get(index, JSType.toString(primitiveKey));
}
@Override
@@ -2670,13 +2685,14 @@
@Override
public Object get(final int key) {
+ final int index = getArrayIndex(key);
final ArrayData array = getArray();
- if (array.has(key)) {
- return array.getObject(key);
+ if (array.has(index)) {
+ return array.getObject(index);
}
- return get(key, JSType.toString(key));
+ return get(index, JSType.toString(key));
}
/**
@@ -2688,7 +2704,7 @@
*/
private void doesNotHave(final int index, final Object value, final boolean strict) {
final long oldLength = getArray().length();
- final long longIndex = index & JSType.MAX_UINT;
+ final long longIndex = ArrayIndex.toLongIndex(index);
if (getMap().containsArrayKeys()) {
final String key = JSType.toString(longIndex);
@@ -2774,7 +2790,8 @@
@Override
public void set(final Object key, final int value, final boolean strict) {
- final int index = getArrayIndex(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = getArrayIndex(primitiveKey);
if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
@@ -2786,13 +2803,14 @@
return;
}
- final String propName = JSType.toString(key);
+ final String propName = JSType.toString(primitiveKey);
setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final Object key, final long value, final boolean strict) {
- final int index = getArrayIndex(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = getArrayIndex(primitiveKey);
if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
@@ -2804,13 +2822,14 @@
return;
}
- final String propName = JSType.toString(key);
+ final String propName = JSType.toString(primitiveKey);
setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final Object key, final double value, final boolean strict) {
- final int index = getArrayIndex(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = getArrayIndex(primitiveKey);
if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
@@ -2822,13 +2841,14 @@
return;
}
- final String propName = JSType.toString(key);
+ final String propName = JSType.toString(primitiveKey);
setObject(findProperty(propName, true), strict, propName, JSType.toObject(value));
}
@Override
public void set(final Object key, final Object value, final boolean strict) {
- final int index = getArrayIndex(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = getArrayIndex(primitiveKey);
if (isValidArrayIndex(index)) {
if (getArray().has(index)) {
@@ -2840,7 +2860,7 @@
return;
}
- final String propName = JSType.toString(key);
+ final String propName = JSType.toString(primitiveKey);
setObject(findProperty(propName, true), strict, propName, value);
}
@@ -3062,82 +3082,69 @@
@Override
public boolean has(final Object key) {
- final int index = getArrayIndex(key);
-
- if (isValidArrayIndex(index)) {
- for (ScriptObject self = this; self != null; self = self.getProto()) {
- if (self.getArray().has(index)) {
- return true;
- }
- }
- }
-
- return hasProperty(JSType.toString(key), true);
+ final Object primitiveKey = JSType.toPrimitive(key);
+ final int index = getArrayIndex(primitiveKey);
+ return isValidArrayIndex(index) ? hasArrayProperty(index) : hasProperty(JSType.toString(primitiveKey), true);
}
@Override
public boolean has(final double key) {
final int index = getArrayIndex(key);
-
- if (isValidArrayIndex(index)) {
- for (ScriptObject self = this; self != null; self = self.getProto()) {
- if (self.getArray().has(index)) {
- return true;
- }
- }
- }
-
- return hasProperty(JSType.toString(key), true);
+ return isValidArrayIndex(index) ? hasArrayProperty(index) : hasProperty(JSType.toString(key), true);
}
@Override
public boolean has(final long key) {
final int index = getArrayIndex(key);
-
- if (isValidArrayIndex(index)) {
- for (ScriptObject self = this; self != null; self = self.getProto()) {
- if (self.getArray().has(index)) {
- return true;
- }
- }
- }
-
- return hasProperty(JSType.toString(key), true);
+ return isValidArrayIndex(index) ? hasArrayProperty(index) : hasProperty(JSType.toString(key), true);
}
@Override
public boolean has(final int key) {
final int index = getArrayIndex(key);
+ return isValidArrayIndex(index) ? hasArrayProperty(index) : hasProperty(JSType.toString(key), true);
+ }
- if (isValidArrayIndex(index)) {
- for (ScriptObject self = this; self != null; self = self.getProto()) {
- if (self.getArray().has(index)) {
- return true;
- }
+ private boolean hasArrayProperty(final int index) {
+ boolean hasArrayKeys = false;
+
+ for (ScriptObject self = this; self != null; self = self.getProto()) {
+ if (self.getArray().has(index)) {
+ return true;
}
+ hasArrayKeys = hasArrayKeys || self.getMap().containsArrayKeys();
}
- return hasProperty(JSType.toString(key), true);
+ return hasArrayKeys && hasProperty(ArrayIndex.toKey(index), true);
}
@Override
public boolean hasOwnProperty(final Object key) {
- return getArray().has(getArrayIndex(key)) || hasProperty(JSType.toString(key), false);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = getArrayIndex(primitiveKey);
+ return isValidArrayIndex(index) ? hasOwnArrayProperty(index) : hasProperty(JSType.toString(primitiveKey), false);
}
@Override
public boolean hasOwnProperty(final int key) {
- return getArray().has(getArrayIndex(key)) || hasProperty(JSType.toString(key), false);
+ final int index = getArrayIndex(key);
+ return isValidArrayIndex(index) ? hasOwnArrayProperty(index) : hasProperty(JSType.toString(key), false);
}
@Override
public boolean hasOwnProperty(final long key) {
- return getArray().has(getArrayIndex(key)) || hasProperty(JSType.toString(key), false);
+ final int index = getArrayIndex(key);
+ return isValidArrayIndex(index) ? hasOwnArrayProperty(index) : hasProperty(JSType.toString(key), false);
}
@Override
public boolean hasOwnProperty(final double key) {
- return getArray().has(getArrayIndex(key)) || hasProperty(JSType.toString(key), false);
+ final int index = getArrayIndex(key);
+ return isValidArrayIndex(index) ? hasOwnArrayProperty(index) : hasProperty(JSType.toString(key), false);
+ }
+
+ private boolean hasOwnArrayProperty(final int index) {
+ return getArray().has(index) || (getMap().containsArrayKeys() && hasProperty(ArrayIndex.toKey(index), false));
}
@Override
@@ -3190,7 +3197,8 @@
@Override
public boolean delete(final Object key, final boolean strict) {
- final int index = getArrayIndex(key);
+ final Object primitiveKey = JSType.toPrimitive(key, String.class);
+ final int index = getArrayIndex(primitiveKey);
final ArrayData array = getArray();
if (array.has(index)) {
@@ -3201,7 +3209,7 @@
return false;
}
- return deleteObject(key, strict);
+ return deleteObject(primitiveKey, strict);
}
private boolean deleteObject(final Object key, final boolean strict) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
index 58d1a49..5c857e1 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
@@ -27,6 +27,7 @@
import jdk.nashorn.internal.runtime.ConsString;
import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
/**
* Array index computation helpers. that both throw exceptions or return
@@ -80,7 +81,12 @@
* Returns a valid array index in an int, if the object represents one. This
* routine needs to perform quickly since all keys are tested with it.
*
- * @param key key to check for array index
+ * <p>The {@code key} parameter must be a JavaScript primitive type, i.e. one of
+ * {@code String}, {@code Number}, {@code Boolean}, {@code null}, or {@code undefined}.
+ * {@code ScriptObject} instances should be converted to primitive with
+ * {@code String.class} hint before being passed to this method.</p>
+ *
+ * @param key key to check for array index.
* @return the array index, or {@code -1} if {@code key} does not represent a valid index.
* Note that negative return values other than {@code -1} are considered valid and can be converted to
* the actual index using {@link #toLongIndex(int)}.
@@ -88,18 +94,31 @@
public static int getArrayIndex(final Object key) {
if (key instanceof Integer) {
return getArrayIndex(((Integer) key).intValue());
- } else if (key instanceof Number) {
- return getArrayIndex(((Number) key).doubleValue());
+ } else if (key instanceof Double) {
+ return getArrayIndex(((Double) key).doubleValue());
} else if (key instanceof String) {
return (int)fromString((String) key);
+ } else if (key instanceof Long) {
+ return getArrayIndex(((Long) key).longValue());
} else if (key instanceof ConsString) {
return (int)fromString(key.toString());
}
+ assert !(key instanceof ScriptObject);
return INVALID_ARRAY_INDEX;
}
/**
+ * Returns a valid array index in an int, if {@code key} represents one.
+ *
+ * @param key key to check
+ * @return the array index, or {@code -1} if {@code key} is not a valid array index.
+ */
+ public static int getArrayIndex(final int key) {
+ return (key >= 0) ? key : INVALID_ARRAY_INDEX;
+ }
+
+ /**
* Returns a valid array index in an int, if the long represents one.
*
* @param key key to check
@@ -129,10 +148,7 @@
*/
public static int getArrayIndex(final double key) {
if (JSType.isRepresentableAsInt(key)) {
- final int intKey = (int)key;
- if (intKey >= 0) {
- return intKey;
- }
+ return getArrayIndex((int) key);
} else if (JSType.isRepresentableAsLong(key)) {
return getArrayIndex((long) key);
}
@@ -177,5 +193,16 @@
return index & JSType.MAX_UINT;
}
+ /**
+ * Convert an index to a key string. This is the same as calling {@link #toLongIndex(int)}
+ * and converting the result to String.
+ *
+ * @param index index to convert
+ * @return index as string
+ */
+ public static String toKey(final int index) {
+ return Long.toString(index & JSType.MAX_UINT);
+ }
+
}
diff --git a/nashorn/test/script/basic/JDK-8028210.js b/nashorn/test/script/basic/JDK-8028210.js
new file mode 100644
index 0000000..54f113a
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8028210.js
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8028210: Missing conversions on array index expression
+ *
+ * @test
+ * @run
+ */
+
+var array = [1, 2];
+var key1 = [[[0]]];
+var key2 = new String("1");
+var key3 = {
+ toString: function() {
+ print("toString called");
+ return "2";
+ }
+};
+
+print(array[key1]);
+print(array[key2]);
+array[key3] = 3;
+print(array[key3]);
+print(key3 in array);
+print(array.hasOwnProperty(key3));
+print(delete array[key3]);
+print(array[key3]);
+
+// string access
+print("abc"[key1]);
+print("abc"[key2]);
+print("abc"[key3]);
+
+// arguments object
+(function(a, b, c) {
+ print(arguments[key3]);
+ delete arguments[key3];
+ print(arguments[key3], c);
+})(1, 2, 3);
+
+// int keys
+array = [];
+array[4294967294] = 1;
+print(array[-2]);
+print(array[4294967294]);
+print(-2 in array);
+print(4294967294 in array);
+print(delete(array[-2]));
+print(array[4294967294]);
+print(delete(array[4294967294]));
+print(array[4294967294]);
+
+array = [];
+array[-2] = 1;
+print(array[-2]);
+print(array[4294967294]);
+print(-2 in array);
+print(4294967294 in array);
+print(delete(array[4294967294]));
+print(array[-2]);
+print(delete(array[-2]));
+print(array[-2]);
diff --git a/nashorn/test/script/basic/JDK-8028210.js.EXPECTED b/nashorn/test/script/basic/JDK-8028210.js.EXPECTED
new file mode 100644
index 0000000..0ac098e
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8028210.js.EXPECTED
@@ -0,0 +1,38 @@
+1
+2
+toString called
+toString called
+3
+toString called
+true
+toString called
+true
+toString called
+true
+toString called
+undefined
+a
+b
+toString called
+c
+toString called
+3
+toString called
+toString called
+undefined 3
+undefined
+1
+false
+true
+true
+1
+true
+undefined
+1
+undefined
+true
+false
+true
+1
+true
+undefined
diff --git a/nashorn/test/script/basic/JDK-8028434.js b/nashorn/test/script/basic/JDK-8028434.js
new file mode 100644
index 0000000..c337415
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8028434.js
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8028434: Check that the line number of the tests in while and do while loops
+ * is correct. It needs to correspond to the line with the test expression.
+ *
+ * @test
+ * @run
+ */
+
+try {
+ while (test.apa < 0) {
+ print("x");
+ }
+} catch (e) {
+ var st = e.getStackTrace();
+ if (st.length != 1) {
+ print("erroneous stacktrace length " + s.length);
+ }
+ if (st[0].lineNumber !== 33) {
+ print("erroneous stacktrace element, lineNumber=" + st[0].lineNumber + " elem=" + st);
+ }
+}
+
+try {
+ do {
+ print("x");
+ } while (test.apa < 0);
+} catch (e) {
+ var st = e.getStackTrace();
+ if (st.length != 1) {
+ print("erroneous stacktrace length " + s.length);
+ }
+ if (st[0].lineNumber !== 49) {
+ print("erroneous stacktrace element, lineNumber= " + st[0].lineNumber + " elem=" + st);
+ }
+}
diff --git a/nashorn/test/script/basic/JDK-8028434.js.EXPECTED b/nashorn/test/script/basic/JDK-8028434.js.EXPECTED
new file mode 100644
index 0000000..587be6b
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8028434.js.EXPECTED
@@ -0,0 +1 @@
+x
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index 55aacb3..2c7df64 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -50,7 +50,7 @@
*
* @test
* @build jdk.nashorn.api.scripting.Window jdk.nashorn.api.scripting.WindowEventHandler jdk.nashorn.api.scripting.VariableArityTestInterface jdk.nashorn.api.scripting.ScriptEngineTest
- * @run testng jdk.nashorn.api.scripting.ScriptEngineTest
+ * @run testng/othervm jdk.nashorn.api.scripting.ScriptEngineTest
*/
public class ScriptEngineTest {
diff --git a/test/Makefile b/test/Makefile
index af84275..08b91bf 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -59,7 +59,7 @@
langtools_% :
@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
-jdk_% :
+jdk_% core_%s svc_%:
@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
################################################################