Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 2f5770a7 编写于 作者: A asaha
浏览文件
操作

Merge

上级 f487c2de 22014437
展开全部 显示空白变更内容
内联 并排
Showing with 56484 addition and 7733 deletion
.hgtags
浏览文件 @ 2f5770a7
......@@ -155,3 +155,6 @@ cdbb33303ea344d5e9013e2dd642e7a6e7768db6 jdk8-b30
27f0c08c427c65fcab6917edf646f59058e59524 jdk8-b31
ddfe5562f61f54ed2121ac0c73b688b94f3e66b5 jdk8-b32
78cea258caaba3980ba186c426da82c8fe41bfd7 jdk8-b33
29b680393f33bf953688c17d93aca7a870ca4024 jdk8-b34
2e3e1356ffbddb2ae95c08da72830ba9ab8b3181 jdk8-b35
45da9cb055ee258dc09e69c1718e27eadea38e45 jdk8-b36
make/com/sun/tools/attach/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -24,6 +24,8 @@
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../../..
PACKAGE = com.sun.tools.attach
LIBRARY = attach
......
make/common/Defs-linux.gmk
浏览文件 @ 2f5770a7
#
# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -53,6 +53,11 @@ 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
......@@ -73,34 +78,68 @@ SCRIPT_SUFFIX =
# CC compiler object code output directive flag value
CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
# Default OBJCOPY comes from GNU Binutils on Linux:
DEF_OBJCOPY=/usr/bin/objcopy
ifdef CROSS_COMPILE_ARCH
# 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)
# Default OBJCOPY comes from GNU Binutils on Linux:
DEF_OBJCOPY=/usr/bin/objcopy
ifdef CROSS_COMPILE_ARCH
# don't try to generate .debuginfo files when cross compiling
_JUNK_ := $(shell \
echo >&2 "INFO: cross compiling for ARCH $(CROSS_COMPILE_ARCH)," \
"skipping .debuginfo generation.")
OBJCOPY=
else
else
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
endif
endif
ifdef LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
# The setting of OBJCOPY above enables the JDK build to import
# .debuginfo files from the HotSpot build. However, adding FDS
# support to the JDK build will occur in phases so a different
# make variable is used to indicate that a particular library
# supports FDS.
# 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),)
ifeq ($(OBJCOPY),)
_JUNK_ := $(shell \
echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
else
ENABLE_FULL_DEBUG_SYMBOLS=0
else
_JUNK_ := $(shell \
echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
......@@ -112,16 +151,17 @@ else
# 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.
#
DEF_STRIP_POLICY="min_strip"
ifeq ($(ALT_STRIP_POLICY),)
STRIP_POLICY=$(DEF_STRIP_POLICY)
else
STRIP_POLICY=$(ALT_STRIP_POLICY)
endif
# 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)")
endif
ZIP_DEBUGINFO_FILES ?= 1
_JUNK_ := $(shell \
echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
endif
endif
#
......@@ -220,6 +260,17 @@ ifeq ($(DEBUG_BINARIES), true)
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)
......@@ -412,6 +463,7 @@ JA_TARGET_ENCODINGS = UTF-8
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.
......
make/common/Defs-macosx.gmk
浏览文件 @ 2f5770a7
......@@ -53,6 +53,11 @@ 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.
......
make/common/Defs-solaris.gmk
浏览文件 @ 2f5770a7
#
# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -51,6 +51,11 @@ 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
......@@ -73,14 +78,42 @@ SCRIPT_SUFFIX =
# CC compiler object code output directive flag value
CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
ifdef ENABLE_FULL_DEBUG_SYMBOLS
# Only check for Full Debug Symbols support on Solaris if it is
# specifically enabled. Hopefully, it can be enabled by default
# once the .debuginfo size issues are worked out.
# 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.
# Default OBJCOPY comes from the SUNWbinutils package:
DEF_OBJCOPY=/usr/sfw/bin/gobjcopy
ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
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
ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
# On Solaris AMD64/X64, gobjcopy is not happy and fails:
#
# usr/sfw/bin/gobjcopy --add-gnu-debuglink=<lib>.debuginfo <lib>.so
......@@ -93,26 +126,27 @@ ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
_JUNK_ := $(shell \
echo >&2 "INFO: $(DEF_OBJCOPY) is not working on Solaris AMD64/X64")
OBJCOPY=
else
else
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
endif
endif
ifdef LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
# The setting of OBJCOPY above enables the JDK build to import
# .debuginfo files from the HotSpot build. However, adding FDS
# support to the JDK build will occur in phases so a different
# make variable is used to indicate that a particular library
# supports FDS.
# 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),)
ifeq ($(OBJCOPY),)
_JUNK_ := $(shell \
echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
else
ENABLE_FULL_DEBUG_SYMBOLS=0
else
_JUNK_ := $(shell \
echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
......@@ -124,16 +158,18 @@ else
# 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.
#
DEF_STRIP_POLICY="min_strip"
ifeq ($(ALT_STRIP_POLICY),)
STRIP_POLICY=$(DEF_STRIP_POLICY)
else
STRIP_POLICY=$(ALT_STRIP_POLICY)
endif
#
# 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)")
endif
endif
ZIP_DEBUGINFO_FILES ?= 1
_JUNK_ := $(shell \
echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
endif
endif
#
......@@ -203,6 +239,21 @@ ifeq ($(FASTDEBUG), true)
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).
#
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
ifeq ($(VARIANT), OPT)
CC_OPT = -g -xs $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
CXX_OPT = -g0 -xs $(CXX_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
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.
......@@ -753,5 +804,6 @@ JA_TARGET_ENCODINGS = eucJP UTF-8 PCK
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
make/common/Defs-windows.gmk
浏览文件 @ 2f5770a7
#
# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -52,6 +52,11 @@ 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
......@@ -75,6 +80,45 @@ endif
EXTRA_LFLAGS += /LIBPATH:$(DXSDK_LIB_PATH)
# 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
#
......@@ -201,7 +245,10 @@ ifeq ($(CC_VERSION),msvc)
# /D _STATIC_CPPLIB
# Use static link for the C++ runtime (so msvcpnn.dll not needed)
#
CFLAGS_COMMON += -Zi -nologo
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
CFLAGS_COMMON += -Zi
endif
CFLAGS_COMMON += -nologo
CFLAGS_OPT = $(CC_OPT)
CFLAGS_DBG = -Od $(MS_RUNTIME_DEBUG_OPTION)
......@@ -210,7 +257,9 @@ ifeq ($(CC_VERSION),msvc)
# 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
......@@ -244,7 +293,9 @@ CPPFLAGS_COMMON += -DWIN32_LEAN_AND_MEAN
#
# Output options (use specific filenames to avoid parallel compile errors)
#
CFLAGS_COMMON += -Fd$(OBJDIR)/$(basename $(@F)).pdb -Fm$(OBJDIR)/$(basename $(@F)).map
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.
......@@ -305,6 +356,7 @@ 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.
......
make/common/Library.gmk
浏览文件 @ 2f5770a7
#
# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -167,17 +167,32 @@ 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:$(OBJDIR)/$(LIBRARY).map \
$(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
......@@ -242,6 +257,37 @@ else # LIBRARY
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)
(set -e ; \
$(CD) $(@D) ; \
$(OBJCOPY) --only-keep-debug $(@F) $(LIBRARY).debuginfo ; \
$(OBJCOPY) --add-gnu-debuglink=$(LIBRARY).debuginfo $(@F) ; \
)
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 $(LIBRARY).diz $(LIBRARY).debuginfo ; \
$(RM) $(LIBRARY).debuginfo ; \
)
endif
endif # LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
endif # ENABLE_FULL_DEBUG_SYMBOLS
endif # PLATFORM-!macosx
endif # LIBRARY
endif # PLATFORM
......
make/common/Program.gmk
浏览文件 @ 2f5770a7
......@@ -171,6 +171,10 @@ ifeq ($(PLATFORM), windows)
@$(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:
......@@ -179,12 +183,21 @@ ifeq ($(PLATFORM), windows)
@set -- $?; \
$(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
$(LINK) -out:$@ /STACK:$(STACK_SIZE) \
-map:$(OBJDIR)/$(PROGRAM).map $(LFLAGS) $(LDFLAGS) \
$(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.
......@@ -228,6 +241,42 @@ else
-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)
(set -e ; \
$(CD) $(@D) ; \
$(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
$(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \
)
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::
......@@ -236,12 +285,16 @@ ifeq ($(PLATFORM), windows)
$(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::
......
make/common/Release.gmk
浏览文件 @ 2f5770a7
......@@ -144,6 +144,7 @@ JDK_MAN_PAGES = \
javadoc.1 \
javah.1 \
javap.1 \
jcmd.1 \
jconsole.1 \
jdb.1 \
jhat.1 \
......@@ -607,10 +608,6 @@ ifndef JAVASE_EMBEDDED
$(ECHO) "oracle/jrockit/jfr/parser/" >> $@
$(ECHO) "oracle/jrockit/jfr/settings/" >> $@
$(ECHO) "oracle/jrockit/jfr/tools/" >> $@
$(ECHO) "oracle/jrockit/jfr/util/" >> $@
$(ECHO) "oracle/jrockit/jfr/util/log/" >> $@
$(ECHO) "oracle/jrockit/jfr/util/os/" >> $@
$(ECHO) "oracle/jrockit/jfr/util/text/" >> $@
endif
endif
......@@ -637,7 +634,7 @@ $(TOTAL_JAR_FILELIST): $(JARREORDER_JARFILE) $(NOT_RT_JAR_LIST)
$(MV) $@.temp $@
@($(CD) $(CLASSBINDIR) && $(java-vm-cleanup))
# Create the jfr.jar containing Java Flight Recorder implementation
# Create jfr.jar
JFR_JAR=
ifndef OPENJDK
ifndef JAVASE_EMBEDDED
......@@ -876,7 +873,9 @@ ifeq ($(PLATFORM), windows)
-o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@
else
$(FIND) $(JRE_IMAGE_DIR)/lib -type f -name \*.$(LIB_SUFFIX) >> $@
$(FILE) `$(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*$(EXE_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
......@@ -1143,9 +1142,11 @@ ifeq ($(PLATFORM), windows)
else
$(RM) $@
$(FIND) $(JDK_IMAGE_DIR)/jre/lib -type f -name \*.$(LIB_SUFFIX) >> $@
$(FILE) `$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f -name \*$(EXE_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 \*$(EXE_SUFFIX)` \
file `$(FIND) $(JDK_IMAGE_DIR)/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \
| $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
endif
......
make/common/internal/Resources.gmk
浏览文件 @ 2f5770a7
......@@ -153,8 +153,8 @@ strip_prop_options_clean:
# 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) -optionsfile $(STRIP_PROP_options)" ; \
$(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) -optionsfile $(STRIP_PROP_options) ; \
$(ECHO) "$(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) @$(STRIP_PROP_options)" ; \
$(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) @$(STRIP_PROP_options) ; \
fi
@$(java-vm-cleanup)
......@@ -243,8 +243,8 @@ compile_prop_options_clean:
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) -optionsfile $(COMPILE_PROP_options)";\
$(BOOT_JAVA_CMD) -jar $(COMPILEPROPERTIES_JARFILE) -optionsfile $(COMPILE_PROP_options) ; \
$(ECHO) "$(BOOT_JAVA_CMD) -jar $(COMPILEPROPERTIES_JARFILE) @$(COMPILE_PROP_options)";\
$(BOOT_JAVA_CMD) -jar $(COMPILEPROPERTIES_JARFILE) @$(COMPILE_PROP_options) ; \
$(java-vm-cleanup); \
fi
......
make/common/shared/Sanity.gmk
浏览文件 @ 2f5770a7
#
# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -1037,11 +1037,22 @@ ifeq ($(PLATFORM), windows)
" 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" \
......@@ -1059,6 +1070,17 @@ ifeq ($(PLATFORM), windows)
"" >> $(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" \
......@@ -1075,6 +1097,8 @@ ifeq ($(PLATFORM), windows)
" and/or check your value of ALT_HOTSPOT_SERVER_PATH. \n" \
"" >> $(WARNING_FILE) ; \
fi
endif
endif
endif
......
make/java/awt/Makefile
浏览文件 @ 2f5770a7
......@@ -57,7 +57,7 @@ LIBPROPS = $(_LIBPROPS:%=$(LIBDIR)/%)
properties: $(LIBDIR) $(LIBPROPS)
$(LIBDIR)/%.properties: $(PLATFORM_SRC)/lib/%.properties
$(LIBDIR)/%.properties: $(PLATFORM_PROPERTIES)/%.properties
$(install-file)
properties.clean :
......
make/java/instrument/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -26,6 +26,8 @@
# 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
......
make/java/java/FILES_java.gmk
浏览文件 @ 2f5770a7
......@@ -51,6 +51,7 @@ JAVA_JAVA_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 \
......
make/java/java/reflect/Makefile
浏览文件 @ 2f5770a7
......@@ -36,7 +36,7 @@ include $(BUILDDIR)/common/Defs.gmk
#
# Files to compile.
#
AUTO_FILES_JAVA_DIRS = java/lang/reflect sun/reflect
AUTO_FILES_JAVA_DIRS = java/lang/reflect sun/reflect java/lang/annotation
#
# Install .lib file.
......
make/java/java_crw_demo/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../..
LIBRARY = java_crw_demo
......
make/java/java_hprof_demo/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../..
LIBRARY = hprof
PRODUCT = sun
......
make/java/main/java/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
PROGRAM = java
PRODUCT = java
......
make/java/management/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../..
PACKAGE = java.lang.management
LIBRARY = management
......
make/java/npt/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../..
# It's currently used by jpda and hprof. Put it in base module for now.
......@@ -68,7 +70,7 @@ ifeq ($(PLATFORM), windows)
endif
# Add location of iconv header
ifeq ($(PLATFORM), macosx))
ifeq ($(PLATFORM), macosx)
OTHER_LDLIBS += -liconv
endif
......
make/java/redist/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -61,9 +61,13 @@ JVMDB_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).$(LIBRARY_SUFFIX)
JVMDTRACE_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).$(LIBRARY_SUFFIX)
JVM_DEBUGINFO_NAME = $(LIB_PREFIX)jvm.debuginfo
JVM_DIZ_NAME = $(LIB_PREFIX)jvm.diz
LIBJSIG_DEBUGINFO_NAME = $(LIB_PREFIX)jsig.debuginfo
LIBJSIG_DIZ_NAME = $(LIB_PREFIX)jsig.diz
JVMDB_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).debuginfo
JVMDB_DIZ_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).diz
JVMDTRACE_DEBUGINFO_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).debuginfo
JVMDTRACE_DIZ_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).diz
CLASSSHARINGDATA_DIR = $(BUILDDIR)/tools/sharing
......@@ -86,12 +90,19 @@ INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist
ifndef BUILD_CLIENT_ONLY
IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
$(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
ifneq ($(OBJCOPY),)
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
......@@ -101,12 +112,19 @@ ifneq ($(ZERO_BUILD), true)
ifeq ($(ARCH_DATA_MODEL), 32)
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
$(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
ifneq ($(OBJCOPY),)
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
......@@ -121,21 +139,57 @@ $(BINDIR)/$(MSVCRNN_DLL): $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)
# Get the hotspot .map and .pdb files for client and server
ifndef BUILD_CLIENT_ONLY
IMPORT_LIST += \
$(LIBDIR)/$(JVMLIB_NAME) \
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
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)
......@@ -165,10 +219,22 @@ $(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
......@@ -176,40 +242,69 @@ else # PLATFORM
# NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv NOT Windows
IMPORT_LIST += $(LIB_LOCATION)/$(LIBJSIG_NAME)
ifneq ($(OBJCOPY),)
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)
ifneq ($(OBJCOPY),)
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)),)
# check for the .diz file, but create the .debuginfo link
IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_DEBUGINFO_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)
ifneq ($(OBJCOPY),)
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)
ifneq ($(OBJCOPY),)
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
......@@ -220,22 +315,37 @@ ifneq ($(ZERO_BUILD), true)
ifeq ($(ARCH_DATA_MODEL), 32)
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
ifneq ($(OBJCOPY),)
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)),)
# check for the .diz file, but create the .debuginfo link
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_DEBUGINFO_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)
ifneq ($(OBJCOPY),)
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.
......@@ -243,7 +353,15 @@ 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)
ifneq ($(OBJCOPY),)
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)
......@@ -251,6 +369,7 @@ ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_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
......@@ -259,12 +378,19 @@ 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)
ifneq ($(OBJCOPY),)
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
......@@ -272,12 +398,19 @@ ifndef BUILD_CLIENT_ONLY
# 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)
ifneq ($(OBJCOPY),)
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
......@@ -304,9 +437,14 @@ $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAM
$(install-import-file)
@$(call binary_file_verification,$@)
ifneq ($(OBJCOPY),)
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-file)
endif
endif
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME): $(HOTSPOT_KERNEL_PATH)/$(JVM_NAME)
......@@ -317,9 +455,14 @@ $(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJ
$(install-import-file)
@$(call binary_file_verification,$@)
ifneq ($(OBJCOPY),)
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-file)
endif
endif
ifndef BUILD_CLIENT_ONLY
......@@ -328,22 +471,24 @@ $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME):
@$(prep-target)
$(call install-sym-link, ../$(LIBJSIG_NAME))
ifneq ($(OBJCOPY),)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
# we don't create a symlink to a libjsig.diz file
$(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))
ifneq ($(OBJCOPY),)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
# we don't create a symlink to a libjsig.diz file
$(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)
......@@ -354,12 +499,20 @@ $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/64/$
$(install-import-file)
@$(call binary_file_verification,$@)
ifneq ($(OBJCOPY),)
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-file)
$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDB_DEBUGINFO_NAME)
$(install-import-file)
endif
endif
ifndef BUILD_CLIENT_ONLY
......@@ -371,13 +524,21 @@ $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_SERVER_PATH)/64/$
$(install-import-file)
@$(call binary_file_verification,$@)
ifneq ($(OBJCOPY),)
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-file)
$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_DEBUGINFO_NAME)
$(install-import-file)
endif
endif
endif
endif
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME)
......@@ -388,12 +549,20 @@ $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/
$(install-import-file)
@$(call binary_file_verification,$@)
ifneq ($(OBJCOPY),)
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-file)
$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_DEBUGINFO_NAME)
$(install-import-file)
endif
endif
ifndef BUILD_CLIENT_ONLY
......@@ -409,7 +578,17 @@ $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_NAM
$(install-import-file)
@$(call binary_file_verification,$@)
ifneq ($(OBJCOPY),)
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-file)
......@@ -418,6 +597,7 @@ $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_DEBUGINFO_NAME): $(HOTSPOT_SER
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_DEBUGINFO_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_DEBUGINFO_NAME)
$(install-import-file)
endif
endif
$(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt : $(HOTSPOT_SERVER_PATH)/Xusage.txt
......
make/java/redist/sajdi/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -54,16 +54,28 @@ 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
ifneq ($(OBJCOPY),)
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
......@@ -80,18 +92,23 @@ $(LIBDIR)/sa-jdi.jar: $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar
$(LIB_LOCATION)/$(SALIB_NAME): $(HOTSPOT_SALIB_PATH)/$(SALIB_NAME)
$(install-import-file)
ifeq ($(PLATFORM), windows)
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)
endif # windows
ifneq ($(OBJCOPY),)
else
$(LIB_LOCATION)/$(SA_DEBUGINFO_NAME): $(HOTSPOT_SALIB_PATH)/$(SA_DEBUGINFO_NAME)
$(install-import-file)
endif
endif
endif
endif # INCLUDE_SA
all: $(IMPORT_LIST)
......
make/java/verify/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -27,6 +27,8 @@
# Build libverify.so
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../..
PRODUCT = java
LIBRARY = verify
......
make/jpda/jdwp/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -27,6 +27,8 @@
# Makefile for building JDWP
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../..
PACKAGE = com.sun.tools.jdwp
PRODUCT = jpda
......
make/jpda/transport/socket/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -27,6 +27,8 @@
# Makefile for building the JDI back-end implementation
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
LIBRARY = dt_socket
PRODUCT = jbug
......@@ -40,7 +42,7 @@ ifeq ($(PLATFORM), linux)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
endif
ifeq ($(PLATFORM), macosx))
ifeq ($(PLATFORM), macosx)
LIBSOCKET =
OTHER_LDLIBS += -pthread
endif
......
make/jprt.gmk
浏览文件 @ 2f5770a7
#
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -27,17 +27,24 @@
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) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
$(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
jprt_build_fastdebug: fastdebug images
( $(CD) $(OUTPUTDIR)/j2sdk-image && \
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
$(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
jprt_build_debug: debug images
( $(CD) $(OUTPUTDIR)/j2sdk-image && \
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
$(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
#
# Phonies to avoid accidents.
......
make/launchers/Makefile.launcher
浏览文件 @ 2f5770a7
......@@ -27,6 +27,8 @@
# Makefile for building simple launchers
#
PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ..
PACKAGE = launcher
PRODUCT = sun
......@@ -155,9 +157,11 @@ 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
......
make/mkdemo/jvmti/compiledMethodLoad/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
PRODUCT = demo/jvmti
DEMONAME = compiledMethodLoad
......
make/mkdemo/jvmti/gctest/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
PRODUCT = demo/jvmti
DEMONAME = gctest
......
make/mkdemo/jvmti/heapTracker/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
PRODUCT = demo/jvmti
DEMONAME = heapTracker
......
make/mkdemo/jvmti/heapViewer/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
PRODUCT = demo/jvmti
DEMONAME = heapViewer
......
make/mkdemo/jvmti/hprof/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
PRODUCT = demo/jvmti
DEMONAME = hprof
......
make/mkdemo/jvmti/minst/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
PRODUCT = demo/jvmti
DEMONAME = minst
......
make/mkdemo/jvmti/mtrace/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
PRODUCT = demo/jvmti
DEMONAME = mtrace
......
make/mkdemo/jvmti/versionCheck/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
PRODUCT = demo/jvmti
DEMONAME = versionCheck
......
make/mkdemo/jvmti/waiters/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -23,6 +23,8 @@
# questions.
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
PRODUCT = demo/jvmti
DEMONAME = waiters
......
make/sun/awt/mawt.gmk
浏览文件 @ 2f5770a7
......@@ -208,7 +208,7 @@ ifeq ($(PLATFORM), linux)
$(wildcard /usr/include/X11/extensions))
endif
ifeq ($(PLATFORM), macosx))
ifeq ($(PLATFORM), macosx)
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
-I$(OPENWIN_HOME)/include
endif
......
make/sun/font/Makefile
浏览文件 @ 2f5770a7
......@@ -62,7 +62,7 @@ FILES_export = \
java/text/Bidi.java \
sun/font/FileFont.java \
sun/font/FileFontStrike.java \
sun/font/FontManager.java \
sun/font/SunFontManager.java \
sun/font/GlyphList.java \
sun/font/NativeFont.java \
sun/font/StrikeCache.java \
......@@ -172,7 +172,7 @@ else # PLATFORM
# Libraries to link, and other C flags.
#
ifeq ($(PLATFORM), macosx))
ifeq ($(PLATFORM), macosx)
OTHER_INCLUDES += -I$(X11_PATH)/include
OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX)
ifeq ($(OS_VENDOR),Apple)
......@@ -197,7 +197,7 @@ endif # PLATFORM
# set up compile flags..
ifeq ($(PLATFORM), macosx))
ifeq ($(PLATFORM), macosx)
CPPFLAGS += -I$(CLASSHDRDIR)
endif
......
make/sun/font/t2k/Makefile
浏览文件 @ 2f5770a7
......@@ -52,7 +52,6 @@ include FILES_c.gmk
FILES_export = \
java/awt/Font.java \
sun/font/FileFont.java \
sun/font/FontManager.java \
sun/font/GlyphList.java \
sun/font/NativeFont.java \
sun/font/StrikeCache.java \
......
make/sun/javazic/tzdata/VERSION
浏览文件 @ 2f5770a7
......@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2011l
tzdata2012c
make/sun/javazic/tzdata/africa
浏览文件 @ 2f5770a7
......@@ -790,6 +790,37 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
# 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&eacute;diaire web site from Morocco (infomediaire.ma),
# on March 9, 2012, (in French) Heure l&eacute;gale:
# Le Maroc adopte officiellement l'heure d'&eacute;t&eacute;
# <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>
# "...&agrave; partir du dernier dimance d'avril et non fins mars,
# comme annonc&eacute; pr&eacute;c&eacute;demment."
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Morocco 1939 only - Sep 12 0:00 1:00 S
......@@ -815,6 +846,9 @@ 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 max - Apr lastSun 2:00 1:00 S
Rule Morocco 2012 max - Sep 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
......
make/sun/javazic/tzdata/antarctica
浏览文件 @ 2f5770a7
......@@ -64,8 +64,19 @@ Rule ChileAQ 1997 only - Mar 30 3:00u 0 -
Rule ChileAQ 1998 only - Mar Sun>=9 3:00u 0 -
Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S
Rule ChileAQ 1999 only - Apr 4 3:00u 0 -
Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S
Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 -
Rule ChileAQ 1999 2010 - Oct Sun>=9 4:00u 1:00 S
Rule ChileAQ 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 ChileAQ 2008 only - Mar 30 3:00u 0 -
Rule ChileAQ 2009 only - Mar Sun>=9 3:00u 0 -
Rule ChileAQ 2010 only - Apr Sun>=1 3:00u 0 -
Rule ChileAQ 2011 only - May Sun>=2 3:00u 0 -
Rule ChileAQ 2011 only - Aug Sun>=16 4:00u 1:00 S
Rule ChileAQ 2012 only - Apr Sun>=23 3:00u 0 -
Rule ChileAQ 2012 only - Sep Sun>=2 4:00u 1:00 S
Rule ChileAQ 2013 max - Mar Sun>=9 3:00u 0 -
Rule ChileAQ 2013 max - Oct Sun>=9 4:00u 1:00 S
# These rules are stolen from the `australasia' file.
Rule AusAQ 1917 only - Jan 1 0:01 1:00 -
......@@ -164,12 +175,16 @@ Zone Antarctica/Casey 0 - zzz 1969
# Western (Aus) Standard Time
11:00 - CAST 2010 Mar 5 2:00
# Casey Time
8:00 - WST 2011 Oct 28 2:00
11:00 - CAST 2012 Feb 21 17:00u
8:00 - WST
Zone Antarctica/Davis 0 - zzz 1957 Jan 13
7:00 - DAVT 1964 Nov # Davis Time
0 - zzz 1969 Feb
7:00 - DAVT 2009 Oct 18 2:00
5:00 - DAVT 2010 Mar 10 20:00u
7:00 - DAVT 2011 Oct 28 2:00
5:00 - DAVT 2012 Feb 21 20:00u
7:00 - DAVT
Zone Antarctica/Mawson 0 - zzz 1954 Feb 13
6:00 - MAWT 2009 Oct 18 2:00
......
make/sun/javazic/tzdata/asia
浏览文件 @ 2f5770a7
......@@ -21,6 +21,7 @@
# 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.
......@@ -99,10 +100,6 @@ Rule RussiaAsia 1993 max - Mar lastSun 2:00s 1:00 S
Rule RussiaAsia 1993 1995 - Sep lastSun 2:00s 0 -
Rule RussiaAsia 1996 max - Oct lastSun 2:00s 0 -
# From Arthur David Olson (2011-06-15):
# While Russia abandoned DST in 2011, Armenia may choose to
# follow Russia's "old" rules.
# Afghanistan
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Kabul 4:36:48 - LMT 1890
......@@ -119,6 +116,21 @@ Zone Asia/Kabul 4:36:48 - LMT 1890
# in 1996, though it did use DST in 1995. IATA SSIM (1991/1998) reports that
# Armenia switched from 3:00 to 4:00 in 1998 and observed DST after 1991,
# but started switching at 3:00s in 1998.
# From Arthur David Olson (2011-06-15):
# While Russia abandoned DST in 2011, Armenia may choose to
# follow Russia's "old" rules.
# From Alexander Krivenyshev (2012-02-10):
# According to News Armenia, on Feb 9, 2012,
# http://newsarmenia.ru/society/20120209/42609695.html
#
# The Armenia National Assembly adopted final reading of Amendments to the
# Law "On procedure of calculation time on the territory of the Republic of
# Armenia" according to which Armenia [is] abolishing Daylight Saving Time.
# or
# (brief)
# http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2
3:00 - YERT 1957 Mar # Yerevan Time
......@@ -126,7 +138,8 @@ Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2
3:00 1:00 YERST 1991 Sep 23 # independence
3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s
4:00 - AMT 1997
4:00 RussiaAsia AM%sT
4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s
4:00 - AMT
# Azerbaijan
# From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23):
......@@ -2257,6 +2270,29 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
# http://www.maannews.net/eng/ViewDetails.aspx?ID=424808
# </a>
# From Steffen Thorsen (2012-03-26):
# Palestinian news sources tell that both Gaza and West Bank will start DST
# on Friday (Thursday midnight, 2012-03-29 24:00).
# Some of many sources in Arabic:
# <a href="http://www.samanews.com/index.php?act=Show&id=122638">
# http://www.samanews.com/index.php?act=Show&id=122638
# </a>
#
# <a href="http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html">
# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html
# </a>
#
# Our brief summary:
# <a href="http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html">
# http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
# </a>
# From Arthur David Olson (2012-03-27):
# The timeanddate article for 2012 says that "the end date has not yet been
# announced" and that "Last year, both...paused daylight saving time during...
# Ramadan. It is not yet known [for] 2012."
# For now, assume both switch back on the last Friday in September. XXX
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
......@@ -2289,6 +2325,8 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
2:00 Jordan EE%sT 1999
2:00 Palestine EE%sT 2011 Apr 2 12:01
2:00 1:00 EEST 2011 Aug 1
2:00 - EET 2012 Mar 30
2:00 1:00 EEST 2012 Sep 28
2:00 - EET
Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
......@@ -2302,6 +2340,8 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
2:00 1:00 EEST 2011 Aug 1
2:00 - EET 2011 Aug 30
2:00 1:00 EEST 2011 Sep 30 3:00
2:00 - EET 2012 Mar 30
2:00 1:00 EEST 2012 Sep 28 3:00
2:00 - EET
# Paracel Is
......@@ -2593,10 +2633,28 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 -
# http://sns.sy/sns/?path=news/read/11421 (Arabic)
# </a>
# From Steffen Thorsen (2012-03-26):
# Today, Syria's government announced that they will start DST early on Friday
# (00:00). This is a bit earlier than the past two years.
#
# From Syrian Arab News Agency, in Arabic:
# <a href="http://www.sana.sy/ara/2/2012/03/26/408215.htm">
# http://www.sana.sy/ara/2/2012/03/26/408215.htm
# </a>
#
# Our brief summary:
# <a href="http://www.timeanddate.com/news/time/syria-dst-2012.html">
# http://www.timeanddate.com/news/time/syria-dst-2012.html
# </a>
# From Arthur David Olson (2012-03-27):
# Assume last Friday in March going forward XXX.
Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S
Rule Syria 2008 only - Nov 1 0:00 0 -
Rule Syria 2009 only - Mar lastFri 0:00 1:00 S
Rule Syria 2010 max - Apr Fri>=1 0:00 1:00 S
Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S
Rule Syria 2012 max - Mar lastFri 0:00 1:00 S
Rule Syria 2009 max - Oct lastFri 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
......
make/sun/javazic/tzdata/australasia
浏览文件 @ 2f5770a7
......@@ -330,6 +330,20 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to
# 2am on February 26 next year.
# From Ken Rylander (2011-10-24)
# Another change to the Fiji DST end date. In the TZ database the end date for
# Fiji DST 2012, is currently Feb 26. This has been changed to Jan 22.
#
# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155">
# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155
# </a>
# states:
#
# The end of daylight saving scheduled initially for the 26th of February 2012
# has been brought forward to the 22nd of January 2012.
# The commencement of daylight saving will remain unchanged and start
# on the 23rd of October, 2011.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
......@@ -338,7 +352,7 @@ Rule Fiji 2010 only - Mar lastSun 3:00 0 -
Rule Fiji 2010 only - Oct 24 2:00 1:00 S
Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
Rule Fiji 2011 only - Oct 23 2:00 1:00 S
Rule Fiji 2012 only - Feb 26 3:00 0 -
Rule Fiji 2012 only - Jan 22 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva
12:00 Fiji FJ%sT # Fiji Time
......@@ -624,6 +638,11 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5
# Dateline Change skip Friday 30th Dec 2011
# Thursday 29th December 2011 23:59:59 Hours
# Saturday 31st December 2011 00:00:00 Hours
#
# Clarification by Tim Parenti (2012-01-03):
# Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012
# seasons, there is not yet any indication that this trend will continue on
# a regular basis. For now, we have explicitly listed the transitions below.
Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5
-11:26:56 - LMT 1911
-11:30 - SAMT 1950 # Samoa Time
......@@ -641,9 +660,28 @@ Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct # Honiara
11:00 - SBT # Solomon Is Time
# Tokelau Is
#
# From Gwillim Law (2011-12-29)
# A correspondent informed me that Tokelau, like Samoa, will be skipping
# December 31 this year, thereby changing its time zone from UTC-10 to
# UTC+14. When I tried to verify this statement, I found a confirming
# article in Time magazine online
# <a href="http://www.time.com/time/world/article/0,8599,2103243,00.html">
# (http://www.time.com/time/world/article/0,8599,2103243,00.html).
# </a>
#
# From Jonathan Leffler (2011-12-29)
# Information from the BBC to the same effect:
# <a href="http://www.bbc.co.uk/news/world-asia-16351377">
# http://www.bbc.co.uk/news/world-asia-16351377
# </a>
#
# Patch supplied by Tim Parenti (2011-12-29)
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fakaofo -11:24:56 - LMT 1901
-10:00 - TKT # Tokelau Time
-10:00 - TKT 2011 Dec 30 # Tokelau Time
14:00 - TKT
# Tonga
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
......
make/sun/javazic/tzdata/europe
浏览文件 @ 2f5770a7
......@@ -233,9 +233,15 @@
# the history of summer time legislation in the United Kingdom.
# Since 1998 Joseph S. Myers has been updating
# and extending this list, which can be found in
# <a href="http://student.cusu.cam.ac.uk/~jsm28/british-time/">
# http://student.cusu.cam.ac.uk/~jsm28/british-time/
# <a href="http://www.polyomino.org.uk/british-time/">
# History of legal time in Britain
# </a>
# Rob Crowther (2012-01-04) reports that that URL no longer
# exists, and the article can now be found at:
# <a href="http://www.polyomino.org.uk/british-time/">
# http://www.polyomino.org.uk/british-time/
# </a>
# From Joseph S. Myers (1998-01-06):
#
......@@ -1173,10 +1179,10 @@ Rule France 1940 only - Feb 25 2:00 1:00 S
# write that they were used in Monaco and in many French locations.
# Le Corre writes that the upper limit of the free zone was Arneguy, Orthez,
# Mont-de-Marsan, Bazas, Langon, Lamotte-Montravel, Marouil, La
# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Decartes,
# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Descartes,
# Loches, Montrichard, Vierzon, Bourges, Moulins, Digoin,
# Paray-le-Monial, Montceau-les-Mines, Chalons-sur-Saone, Arbois,
# Dole, Morez, St-Claude, and Collognes (Haute-Savioe).
# Dole, Morez, St-Claude, and Collonges (Haute-Savoie).
Rule France 1941 only - May 5 0:00 2:00 M # Midsummer
# Shanks & Pottenger say this transition occurred at Oct 6 1:00,
# but go with Denis Excoffier (1997-12-12),
......@@ -1677,6 +1683,41 @@ Zone Europe/Malta 0:58:04 - LMT 1893 Nov 2 0:00s # Valletta
# But [two people] separately reported via
# Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau.
# The Tiraspol entry has therefore been removed for now.
#
# From Alexander Krivenyshev (2011-10-17):
# Pridnestrovian Moldavian Republic (PMR, also known as
# "Pridnestrovie") has abolished seasonal clock change (no transition
# to the Winter Time).
#
# News (in Russian):
# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html">
# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html
# </a>
#
# <a href="http://www.allmoldova.com/moldova-news/1249064116.html">
# http://www.allmoldova.com/moldova-news/1249064116.html
# </a>
#
# The substance of this change (reinstatement of the Tiraspol entry)
# is from a patch from Petr Machata (2011-10-17)
#
# From Tim Parenti (2011-10-19)
# In addition, being situated at +4651+2938 would give Tiraspol
# a pre-1880 LMT offset of 1:58:32.
#
# (which agrees with the earlier entry that had been removed)
#
# From Alexander Krivenyshev (2011-10-26)
# NO need to divide Moldova into two timezones at this point.
# As of today, Transnistria (Pridnestrovie)- Tiraspol reversed its own
# decision to abolish DST this winter.
# Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)-
# Tiraspol will go back to winter time on October 30, 2011.
# News from Moldova (in russian):
# <a href="http://ru.publika.md/link_317061.html">
# http://ru.publika.md/link_317061.html
# </a>
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Chisinau 1:55:20 - LMT 1880
......@@ -2673,6 +2714,28 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
# <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
# </a>
#
# From Philip Pizzey (2011-10-18):
# Today my Ukrainian colleagues have informed me that the
# Ukrainian parliament have decided that they will go to winter
# time this year after all.
#
# From Udo Schwedt (2011-10-18):
# As far as I understand, the recent change to the Ukranian time zone
# (Europe/Kiev) to introduce permanent daylight saving time (similar
# to Russia) was reverted today:
#
# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995">
# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995
# </a>
#
# Also reported by Alexander Bokovoy (2011-10-18) who also noted:
# The law documents themselves are at
#
# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484">
# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
# </a>
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Most of Ukraine since 1970 has been like Kiev.
......@@ -2687,8 +2750,7 @@ Zone Europe/Kiev 2:02:04 - LMT 1880
3:00 - MSK 1990 Jul 1 2:00
2:00 - EET 1992
2:00 E-Eur EE%sT 1995
2:00 EU EE%sT 2011 Mar lastSun 1:00u
3:00 - FET # Further-eastern European Time
2:00 EU EE%sT
# Ruthenia used CET 1990/1991.
# "Uzhhorod" is the transliteration of the Ukrainian name, but
# "Uzhgorod" is more common in English.
......@@ -2702,8 +2764,7 @@ Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
1:00 - CET 1991 Mar 31 3:00
2:00 - EET 1992
2:00 E-Eur EE%sT 1995
2:00 EU EE%sT 2011 Mar lastSun 1:00u
3:00 - FET # Further-eastern European Time
2:00 EU EE%sT
# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
# "Zaporizhia" is the transliteration of the Ukrainian name, but
# "Zaporozh'ye" is more common in English. Use the common English
......@@ -2716,8 +2777,7 @@ Zone Europe/Zaporozhye 2:20:40 - LMT 1880
1:00 C-Eur CE%sT 1943 Oct 25
3:00 Russia MSK/MSD 1991 Mar 31 2:00
2:00 E-Eur EE%sT 1995
2:00 EU EE%sT 2011 Mar lastSun 1:00u
3:00 - FET # Further-eastern European Time
2:00 EU EE%sT
# Central Crimea used Moscow time 1994/1997.
Zone Europe/Simferopol 2:16:24 - LMT 1880
2:16 - SMT 1924 May 2 # Simferopol Mean T
......@@ -2742,8 +2802,7 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880
# Assume it happened in March by not changing the clocks.
3:00 Russia MSK/MSD 1997
3:00 - MSK 1997 Mar lastSun 1:00u
2:00 EU EE%sT 2011 Mar lastSun 1:00u
3:00 - FET # Further-eastern European Time
2:00 EU EE%sT
###############################################################################
......
make/sun/javazic/tzdata/leapseconds
浏览文件 @ 2f5770a7
......@@ -70,40 +70,54 @@ Leap 1997 Jun 30 23:59:60 + S
Leap 1998 Dec 31 23:59:60 + S
Leap 2005 Dec 31 23:59:60 + S
Leap 2008 Dec 31 23:59:60 + S
Leap 2012 Jun 30 23:59:60 + S
# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
#
# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
#
#
# SERVICE DE LA ROTATION TERRESTRE
# OBSERVATOIRE DE PARIS
# 61, Av. de l'Observatoire 75014 PARIS (France)
# Tel. : 33 (0) 1 40 51 22 29
# Tel. : 33 (0) 1 40 51 22 26
# FAX : 33 (0) 1 40 51 22 91
# Internet : services.iers@obspm.fr
# e-mail : (E-Mail Removed)
# http://hpiers.obspm.fr/eop-pc
#
# Paris, 5 January 2012
#
# Paris, 2 February 2011
#
# Bulletin C 41
# Bulletin C 43
#
# To authorities responsible
# for the measurement and
# distribution of time
#
# INFORMATION ON UTC - TAI
#
# NO positive leap second will be introduced at the end of June 2011.
# The difference between Coordinated Universal Time UTC and the
# International Atomic Time TAI is :
# UTC TIME STEP
# on the 1st of July 2012
#
#
# A positive leap second will be introduced at the end of June 2012.
# The sequence of dates of the UTC second markers will be:
#
# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
# 2012 June 30, 23h 59m 59s
# 2012 June 30, 23h 59m 60s
# 2012 July 1, 0h 0m 0s
#
# The difference between UTC and the International Atomic Time TAI is:
#
# from 2009 January 1, 0h UTC, to 2012 July 1 0h UTC : UTC-TAI = - 34s
# from 2012 July 1, 0h UTC, until further notice : UTC-TAI = - 35s
#
# Leap seconds can be introduced in UTC at the end of the months of December
# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
# six months, either to announce a time step in UTC, or to confirm that there
# six months, either to announce a time step in UTC or to confirm that there
# will be no time step at the next possible date.
#
#
# Daniel GAMBIS
# Head
# Earth Orientation Center of the IERS
# Earth Orientation Center of IERS
# Observatoire de Paris, France
make/sun/javazic/tzdata/northamerica
浏览文件 @ 2f5770a7
......@@ -1142,9 +1142,26 @@ Zone America/Menominee -5:50:27 - LMT 1885 Sep 18 12:00
# For now, assume all of DST-observing Canada will fall into line with the
# new US DST rules,
# From Chris Walton (2011-12-01)
# In the first of Tammy Hardwick's articles
# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260">
# http://www.ilovecreston.com/?p=articles&t=spec&ar=260
# </a>
# she quotes the Friday November 1/1918 edition of the Creston Review.
# The quote includes these two statements:
# 'Sunday the CPR went back to the old system of time...'
# '... The daylight saving scheme was dropped all over Canada at the same time,'
# These statements refer to a transition from daylight time to standard time
# that occurred nationally on Sunday October 27/1918. This transition was
# also documented in the Saturday October 26/1918 edition of the Toronto Star.
# In light of that evidence, we alter the date from the earlier believed
# Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day
# than Thursday) in all Canadian rulesets.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Canada 1918 only - Apr 14 2:00 1:00 D
Rule Canada 1918 only - Oct 31 2:00 0 S
Rule Canada 1918 only - Oct 27 2:00 0 S
Rule Canada 1942 only - Feb 9 2:00 1:00 W # War
Rule Canada 1945 only - Aug 14 23:00u 1:00 P # Peace
Rule Canada 1945 only - Sep 30 2:00 0 S
......@@ -1667,7 +1684,7 @@ Zone America/Atikokan -6:06:28 - LMT 1895
Rule Winn 1916 only - Apr 23 0:00 1:00 D
Rule Winn 1916 only - Sep 17 0:00 0 S
Rule Winn 1918 only - Apr 14 2:00 1:00 D
Rule Winn 1918 only - Oct 31 2:00 0 S
Rule Winn 1918 only - Oct 27 2:00 0 S
Rule Winn 1937 only - May 16 2:00 1:00 D
Rule Winn 1937 only - Sep 26 2:00 0 S
Rule Winn 1942 only - Feb 9 2:00 1:00 W # War
......@@ -1750,7 +1767,7 @@ Zone America/Winnipeg -6:28:36 - LMT 1887 Jul 16
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Regina 1918 only - Apr 14 2:00 1:00 D
Rule Regina 1918 only - Oct 31 2:00 0 S
Rule Regina 1918 only - Oct 27 2:00 0 S
Rule Regina 1930 1934 - May Sun>=1 0:00 1:00 D
Rule Regina 1930 1934 - Oct Sun>=1 0:00 0 S
Rule Regina 1937 1941 - Apr Sun>=8 0:00 1:00 D
......@@ -1787,7 +1804,7 @@ Zone America/Swift_Current -7:11:20 - LMT 1905 Sep
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Edm 1918 1919 - Apr Sun>=8 2:00 1:00 D
Rule Edm 1918 only - Oct 31 2:00 0 S
Rule Edm 1918 only - Oct 27 2:00 0 S
Rule Edm 1919 only - May 27 2:00 0 S
Rule Edm 1920 1923 - Apr lastSun 2:00 1:00 D
Rule Edm 1920 only - Oct lastSun 2:00 0 S
......@@ -1817,9 +1834,68 @@ Zone America/Edmonton -7:33:52 - LMT 1906 Sep
# Dawson Creek uses MST. Much of east BC is like Edmonton.
# Matthews and Vincent (1998) write that Creston is like Dawson Creek.
# It seems though that (re: Creston) is not entirely correct:
# From Chris Walton (2011-12-01):
# There are two areas within the Canadian province of British Columbia
# that do not currently observe daylight saving:
# a) The Creston Valley (includes the town of Creston and surrounding area)
# b) The eastern half of the Peace River Regional District
# (includes the cities of Dawson Creek and Fort St. John)
# Earlier this year I stumbled across a detailed article about the time
# keeping history of Creston; it was written by Tammy Hardwick who is the
# manager of the Creston & District Museum. The article was written in May 2009.
# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260">
# http://www.ilovecreston.com/?p=articles&t=spec&ar=260
# </a>
# According to the article, Creston has not changed its clocks since June 1918.
# i.e. Creston has been stuck on UTC-7 for 93 years.
# Dawson Creek, on the other hand, changed its clocks as recently as April 1972.
# Unfortunately the exact date for the time change in June 1918 remains
# unknown and will be difficult to ascertain. I e-mailed Tammy a few months
# ago to ask if Sunday June 2 was a reasonable guess. She said it was just
# as plausible as any other date (in June). She also said that after writing the
# article she had discovered another time change in 1916; this is the subject
# of another article which she wrote in October 2010.
# <a href="http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56">
# http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56
# </a>
# Here is a summary of the three clock change events in Creston's history:
# 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7)
# Exact date unknown
# 2. Oct 1916: switch to Pacific Standard Time (GMT-8)
# Exact date in October unknown; Sunday October 1 is a reasonable guess.
# 3. June 1918: switch to Pacific Daylight Time (GMT-7)
# Exact date in June unknown; Sunday June 2 is a reasonable guess.
# note#1:
# On Oct 27/1918 when daylight saving ended in the rest of Canada,
# Creston did not change its clocks.
# note#2:
# During WWII when the Federal Government legislated a mandatory clock change,
# Creston did not oblige.
# note#3:
# There is no guarantee that Creston will remain on Mountain Standard Time
# (UTC-7) forever.
# The subject was debated at least once this year by the town Council.
# <a href="http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/116760809.html">
# http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/116760809.html
# </a>
# During a period WWII, summer time (Daylight saying) was mandatory in Canada.
# In Creston, that was handled by shifting the area to PST (-8:00) then applying
# summer time to cause the offset to be -7:00, the same as it had been before
# the change. It can be argued that the timezone abbreviation during this
# period should be PDT rather than MST, but that doesn't seem important enough
# (to anyone) to further complicate the rules.
# The transition dates (and times) are guesses.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Vanc 1918 only - Apr 14 2:00 1:00 D
Rule Vanc 1918 only - Oct 31 2:00 0 S
Rule Vanc 1918 only - Oct 27 2:00 0 S
Rule Vanc 1942 only - Feb 9 2:00 1:00 W # War
Rule Vanc 1945 only - Aug 14 23:00u 1:00 P # Peace
Rule Vanc 1945 only - Sep 30 2:00 0 S
......@@ -1835,7 +1911,10 @@ Zone America/Dawson_Creek -8:00:56 - LMT 1884
-8:00 Canada P%sT 1947
-8:00 Vanc P%sT 1972 Aug 30 2:00
-7:00 - MST
Zone America/Creston -7:46:04 - LMT 1884
-7:00 - MST 1916 Oct 1
-8:00 - PST 1918 Jun 2
-7:00 - MST
# Northwest Territories, Nunavut, Yukon
......@@ -2712,6 +2791,34 @@ Zone America/Costa_Rica -5:36:20 - LMT 1890 # San Jose
# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html">
# http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html
# </a>
#
# From Steffen Thorsen (2011-10-30)
# Cuba will end DST two weeks later this year. Instead of going back
# tonight, it has been delayed to 2011-11-13 at 01:00.
#
# One source (Spanish)
# <a href="http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html">
# http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html
# </a>
#
# Our page:
# <a href="http://www.timeanddate.com/news/time/cuba-time-changes-2011.html">
# http://www.timeanddate.com/news/time/cuba-time-changes-2011.html
# </a>
#
# From Steffen Thorsen (2012-03-01)
# According to Radio Reloj, Cuba will start DST on Midnight between March
# 31 and April 1.
#
# Radio Reloj has the following info (Spanish):
# <a href="http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril">
# http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril
# </a>
#
# Our info on it:
# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html">
# http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html
# </a>
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Cuba 1928 only - Jun 10 0:00 1:00 D
......@@ -2743,12 +2850,15 @@ Rule Cuba 1997 only - Oct 12 0:00s 0 S
Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D
Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S
Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D
Rule Cuba 2006 max - Oct lastSun 0:00s 0 S
Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S
Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D
Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D
Rule Cuba 2009 2010 - Mar Sun>=8 0:00s 1:00 D
Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D
Rule Cuba 2012 max - Mar Sun>=8 0:00s 1:00 D
Rule Cuba 2011 only - Nov 13 0:00s 0 S
Rule Cuba 2012 only - Apr 1 0:00s 1:00 D
Rule Cuba 2012 max - Oct lastSun 0:00s 0 S
Rule Cuba 2013 max - Mar Sun>=8 0:00s 1:00 D
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Havana -5:29:28 - LMT 1890
......@@ -2882,6 +2992,29 @@ Zone America/Guatemala -6:02:04 - LMT 1918 Oct 5
# From Stephen Colebourne (2007-02-22):
# Some IATA info: Haiti won't be having DST in 2007.
# From Steffen Thorsen (2012-03-11):
# According to several news sources, Haiti will observe DST this year,
# apparently using the same start and end date as USA/Canada.
# So this means they have already changed their time.
#
# (Sources in French):
# <a href="http://www.alterpresse.org/spip.php?article12510">
# http://www.alterpresse.org/spip.php?article12510
# </a>
# <a href="http://radiovision2000haiti.net/home/?p=13253">
# http://radiovision2000haiti.net/home/?p=13253
# </a>
#
# Our coverage:
# <a href="http://www.timeanddate.com/news/time/haiti-dst-2012.html">
# http://www.timeanddate.com/news/time/haiti-dst-2012.html
# </a>
# From Arthur David Olson (2012-03-11):
# The alterpresse.org source seems to show a US-style leap from 2:00 a.m. to
# 3:00 a.m. rather than the traditional Haitian jump at midnight.
# Assume a US-style fall back as well XXX.
# Do not yet assume that the change carries forward past 2012 XXX.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Haiti 1983 only - May 8 0:00 1:00 D
......@@ -2893,6 +3026,8 @@ Rule Haiti 1988 1997 - Apr Sun>=1 1:00s 1:00 D
Rule Haiti 1988 1997 - Oct lastSun 1:00s 0 S
Rule Haiti 2005 2006 - Apr Sun>=1 0:00 1:00 D
Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S
Rule Haiti 2012 only - Mar Sun>=8 2:00 1:00 D
Rule Haiti 2012 only - Nov Sun>=1 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Port-au-Prince -4:49:20 - LMT 1890
-4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT
......
make/sun/javazic/tzdata/southamerica
浏览文件 @ 2f5770a7
......@@ -840,6 +840,19 @@ Zone America/La_Paz -4:32:36 - LMT 1890
# oficial 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>
# 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)
......@@ -1076,10 +1089,8 @@ Zone America/Maceio -2:22:52 - LMT 1914
# of America/Salvador.
Zone America/Bahia -2:34:04 - LMT 1914
-3:00 Brazil BR%sT 2003 Sep 24
-3:00 - BRT
# as noted above, not yet in operation.
# -3:00 - BRT 2011 Oct 16
# -3:00 Brazil BR%sT
-3:00 - BRT 2011 Oct 16
-3:00 Brazil BR%sT
#
# Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
# Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),
......@@ -1229,6 +1240,28 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
# 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.
#
# Note that...this is yet another "temporary" change that will be reevaluated
# AGAIN in 2013.
# 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 -
......@@ -1259,8 +1292,6 @@ 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 2011 only - Aug Sun>=16 4:00u 1:00 S
Rule Chile 2012 max - 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.
......@@ -1268,7 +1299,11 @@ 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 2012 max - Mar Sun>=9 3:00u 0 -
Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S
Rule Chile 2012 only - Apr Sun>=23 3:00u 0 -
Rule Chile 2012 only - Sep Sun>=2 4:00u 1:00 S
Rule Chile 2013 max - Mar Sun>=9 3:00u 0 -
Rule Chile 2013 max - Oct Sun>=9 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]
......@@ -1414,6 +1449,21 @@ Zone Pacific/Galapagos -5:58:24 - LMT 1931 # Puerto Baquerizo Moreno
# 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 -
......@@ -1426,14 +1476,14 @@ 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 2012 max - Apr Sun>=15 2:00 0 -
Rule Falk 2001 max - Sep Sun>=1 2:00 1:00 S
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
-4:00 Falk FK%sT 2010 Sep 5 02:00
-3:00 - FKST
# French Guiana
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
......
make/sun/javazic/tzdata/zone.tab
浏览文件 @ 2f5770a7
......@@ -153,6 +153,7 @@ CA +5333-11328 America/Edmonton Mountain Time - Alberta, east British Columbia &
CA +690650-1050310 America/Cambridge_Bay Mountain Time - west Nunavut
CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories
CA +682059-1334300 America/Inuvik Mountain Time - west Northwest Territories
CA +4906-11631 America/Creston Mountain Standard Time - Creston, British Columbia
CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
CA +4916-12307 America/Vancouver Pacific Time - west British Columbia
CA +6043-13503 America/Whitehorse Pacific Time - south Yukon
......@@ -355,7 +356,7 @@ RS +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad
RU +5545+03735 Europe/Moscow Moscow+00 - west Russia
RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
RU +5312+05009 Europe/Samara Moscow - Samara, Udmurtia
RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia
RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
......
make/sun/tracing/dtrace/Makefile
浏览文件 @ 2f5770a7
#
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
# 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
......@@ -26,6 +26,9 @@
#
# Makefile for building dtrace extension
#
LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
BUILDDIR = ../../..
PACKAGE = sun.tracing.dtrace
LIBRARY = jsdt
......
make/sun/xawt/Makefile
浏览文件 @ 2f5770a7
......@@ -56,7 +56,7 @@ LDFLAGS += -lpthread
dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
endif
ifeq ($(PLATFORM), macosx))
ifeq ($(PLATFORM), macosx)
LDFLAGS += -pthread
dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
endif
......
make/tools/GenerateCharacter/CharacterData00.java.template
浏览文件 @ 2f5770a7
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* 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
......@@ -211,6 +211,8 @@ class CharacterData00 extends CharacterData {
case 0x10C3 : mapChar = 0x2D23; break;
case 0x10C4 : mapChar = 0x2D24; break;
case 0x10C5 : mapChar = 0x2D25; break;
case 0x10C7 : mapChar = 0x2D27; break;
case 0x10CD : mapChar = 0x2D2D; break;
case 0x1E9E : mapChar = 0x00DF; break;
case 0x2C62 : mapChar = 0x026B; break;
case 0x2C63 : mapChar = 0x1D7D; break;
......@@ -223,6 +225,7 @@ class CharacterData00 extends CharacterData {
case 0x2C7F : mapChar = 0x0240; break;
case 0xA77D : mapChar = 0x1D79; break;
case 0xA78D : mapChar = 0x0265; break;
case 0xA7AA : mapChar = 0x0266; break;
// default mapChar is already set, so no
// need to redo it here.
// default : mapChar = ch;
......@@ -282,6 +285,7 @@ class CharacterData00 extends CharacterData {
case 0x0251 : mapChar = 0x2C6D; break;
case 0x0252 : mapChar = 0x2C70; break;
case 0x0265 : mapChar = 0xA78D; break;
case 0x0266 : mapChar = 0xA7AA; break;
case 0x026B : mapChar = 0x2C62; break;
case 0x0271 : mapChar = 0x2C6E; break;
case 0x027D : mapChar = 0x2C64; break;
......@@ -327,6 +331,8 @@ class CharacterData00 extends CharacterData {
case 0x2D23 : mapChar = 0x10C3; break;
case 0x2D24 : mapChar = 0x10C4; break;
case 0x2D25 : mapChar = 0x10C5; break;
case 0x2D27 : mapChar = 0x10C7; break;
case 0x2D2D : mapChar = 0x10CD; break;
// ch must have a 1:M case mapping, but we
// can't handle it here. Return ch.
// since mapChar is already set, no need
......@@ -425,6 +431,11 @@ class CharacterData00 extends CharacterData {
case 0x2181: retval = 5000; break; // ROMAN NUMERAL FIVE THOUSAND
case 0x2182: retval = 10000; break; // ROMAN NUMERAL TEN THOUSAND
case 0x324B: retval = 40; break;
case 0x324C: retval = 50; break;
case 0x324D: retval = 60; break;
case 0x324E: retval = 70; break;
case 0x324F: retval = 80; break;
case 0x325C: retval = 32; break;
case 0x325D: retval = 33; break; // CIRCLED NUMBER THIRTY THREE
......@@ -527,6 +538,7 @@ class CharacterData00 extends CharacterData {
case 0x0251 : mapChar = 0x2C6D; break;
case 0x0252 : mapChar = 0x2C70; break;
case 0x0265 : mapChar = 0xA78D; break;
case 0x0266 : mapChar = 0xA7AA; break;
case 0x026B : mapChar = 0x2C62; break;
case 0x0271 : mapChar = 0x2C6E; break;
case 0x027D : mapChar = 0x2C64; break;
......@@ -572,6 +584,8 @@ class CharacterData00 extends CharacterData {
case 0x2D23 : mapChar = 0x10C3; break;
case 0x2D24 : mapChar = 0x10C4; break;
case 0x2D25 : mapChar = 0x10C5; break;
case 0x2D27 : mapChar = 0x10C7; break;
case 0x2D2D : mapChar = 0x10CD; break;
default : mapChar = Character.ERROR; break;
}
}
......
make/tools/UnicodeData/PropList.txt
浏览文件 @ 2f5770a7
此差异已折叠。
make/tools/UnicodeData/Scripts.txt
浏览文件 @ 2f5770a7
此差异已折叠。
make/tools/UnicodeData/SpecialCasing.txt
浏览文件 @ 2f5770a7
# SpecialCasing-6.0.0.txt
# Date: 2010-05-18, 00:49:39 GMT [MD]
# SpecialCasing-6.1.0.txt
# Date: 2011-11-27, 05:10:51 GMT [MD]
#
# Unicode Character Database
# Copyright (c) 1991-2010 Unicode, Inc.
# Copyright (c) 1991-2011 Unicode, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html
# For documentation, see http://www.unicode.org/reports/tr44/
#
......@@ -47,7 +47,9 @@
# * Additional contexts
# * Additional fields
# ================================================================================
# @missing 0000..10FFFF; <slc>; <stc>; <suc>
# @missing: 0000..10FFFF; <slc>; <stc>; <suc>;
# ================================================================================
# Unconditional mappings
# ================================================================================
......
make/tools/src/build/tools/compileproperties/CompileProperties.java
浏览文件 @ 2f5770a7
......@@ -90,6 +90,7 @@ public class CompileProperties {
private static String outfiles[] ;
private static String supers[] ;
private static int compileCount = 0;
private static boolean quiet = false;
private static boolean parseOptions(String args[]) {
boolean ok = true;
......@@ -114,21 +115,21 @@ public class CompileProperties {
outfiles[compileCount] = args[++i];
supers[compileCount] = args[++i];
compileCount++;
} else if ( "-optionsfile".equals(args[i]) && i+1 < args.length ) {
String filename = args[++i];
} else if ( args[i].charAt(0) == '@') {
String filename = args[i].substring(1);
FileInputStream finput = null;
byte contents[] = null;
try {
finput = new FileInputStream(filename);
int byteCount = finput.available();
if ( byteCount <= 0 ) {
error("The -optionsfile file is empty", null);
error("The @file is empty", null);
ok = false;
} else {
contents = new byte[byteCount];
int bytesRead = finput.read(contents);
if ( byteCount != bytesRead ) {
error("Cannot read all of -optionsfile file", null);
error("Cannot read all of @file", null);
ok = false;
}
}
......@@ -144,7 +145,7 @@ public class CompileProperties {
error("cannot close " + filename, e);
}
}
if ( ok = true && contents != null ) {
if ( ok && contents != null ) {
String tokens[] = (new String(contents)).split("\\s+");
if ( tokens.length > 0 ) {
ok = parseOptions(tokens);
......@@ -163,6 +164,13 @@ public class CompileProperties {
public static void main(String[] args) {
boolean ok = true;
if (args.length >= 1 && args[0].equals("-quiet"))
{
quiet = true;
String[] newargs = new String[args.length-1];
System.arraycopy(args, 1, newargs, 0, newargs.length);
args = newargs;
}
/* Original usage */
if (args.length == 2 && args[0].charAt(0) != '-' ) {
ok = createFile(args[0], args[1], "ListResourceBundle");
......@@ -197,18 +205,20 @@ public class CompileProperties {
System.err.println("usage:");
System.err.println(" java -jar compileproperties.jar path_to_properties_file path_to_java_output_file [super_class]");
System.err.println(" -OR-");
System.err.println(" java -jar compileproperties.jar {-compile path_to_properties_file path_to_java_output_file super_class} -or- -optionsfile filename");
System.err.println(" java -jar compileproperties.jar {-compile path_to_properties_file path_to_java_output_file super_class} -or- @filename");
System.err.println("");
System.err.println("Example:");
System.err.println(" java -jar compileproperties.jar -compile test.properties test.java ListResourceBundle");
System.err.println(" java -jar compileproperties.jar -optionsfile option_file");
System.err.println(" java -jar compileproperties.jar @option_file");
System.err.println("option_file contains: -compile test.properties test.java ListResourceBundle");
}
private static boolean createFile(String propertiesPath, String outputPath,
String superClass) {
boolean ok = true;
if (!quiet) {
System.out.println("parsing: " + propertiesPath);
}
Properties p = new Properties();
try {
p.load(new FileInputStream(propertiesPath));
......@@ -221,7 +231,9 @@ public class CompileProperties {
}
if ( ok ) {
String packageName = inferPackageName(propertiesPath, outputPath);
if (!quiet) {
System.out.println("inferred package name: " + packageName);
}
List<String> sortedKeys = new ArrayList<>();
for ( Object key : p.keySet() ) {
sortedKeys.add((String)key);
......@@ -276,8 +288,10 @@ public class CompileProperties {
error("IO error close " + outputPath, e);
}
}
if (!quiet) {
System.out.println("wrote: " + outputPath);
}
}
return ok;
}
......
make/tools/src/build/tools/generatecharacter/CharacterScript.java
浏览文件 @ 2f5770a7
package build.tools.generatecharacter;
import java.util.regex.*;
import java.util.*;
import java.io.*;
......
make/tools/src/build/tools/stripproperties/StripProperties.java
浏览文件 @ 2f5770a7
......@@ -36,6 +36,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
......@@ -53,82 +54,89 @@ public class StripProperties {
}
}
private static List<String> parseOptions(String args[]) {
List<String> files = new ArrayList<String>();
private static List<String> infiles = new ArrayList<String>();
private static List<String> outfiles = new ArrayList<String>();
private static boolean parseOptions(String args[]) {
boolean ok = true;
for ( int i = 0; i < args.length ; i++ ) {
if ( "-optionsfile".equals(args[i]) && i+1 < args.length ) {
String filename = args[++i];
if ( "-clean".equals(args[i]) && i+2 < args.length ) {
infiles.add(args[++i]);
outfiles.add(args[++i]);
} else if ( args[i].charAt(0)=='@') {
String filename = args[i].substring(1);
FileInputStream finput = null;
byte contents[] = null;
try {
finput = new FileInputStream(filename);
int byteCount = finput.available();
if ( byteCount <= 0 ) {
error("The -optionsfile file is empty", null);
files = null;
error("The @file is empty", null);
ok = false;
} else {
contents = new byte[byteCount];
int bytesRead = finput.read(contents);
if ( byteCount != bytesRead ) {
error("Cannot read all of -optionsfile file", null);
files = null;
error("Cannot read all of @file", null);
ok = false;
}
}
} catch ( IOException e ) {
error("cannot open " + filename, e);
files = null;
ok = false;
}
if ( finput != null ) {
try {
finput.close();
} catch ( IOException e ) {
files = null;
ok = false;
error("cannot close " + filename, e);
}
}
if ( files != null && contents != null ) {
if ( ok && contents != null ) {
String tokens[] = (new String(contents)).split("\\s+");
if ( tokens.length > 0 ) {
List<String> ofiles = parseOptions(tokens);
if ( ofiles != null ) {
files.addAll(ofiles);
} else {
error("No files found in file", null);
files = null;
}
ok = parseOptions(tokens);
}
}
if ( files == null ) {
if ( !ok ) {
break;
}
} else {
files.add(args[i]);
infiles.add(args[i]);
outfiles.add(args[i]);
}
}
return files;
return ok;
}
private static boolean stripFiles(List<String> files) {
private static boolean stripFiles(List<String> infiles, List<String> outfiles) {
boolean ok = true;
for ( String file : files ) {
Iterator<String> inIter = infiles.iterator();
Iterator<String> outIter = outfiles.iterator();
for (; inIter.hasNext(); ) {
String infile = inIter.next();
String outfile = outIter.next();
Properties prop = new Properties();
InputStream in = null;
try {
in = new BufferedInputStream(new FileInputStream(file));
in = new BufferedInputStream(new FileInputStream(infile));
prop.load(in);
} catch ( FileNotFoundException e ) {
error("Cannot access file " + file, e);
error("Cannot access file " + infile, e);
ok = false;
} catch ( IOException e ) {
error("IO exception processing file " + file, e);
error("IO exception processing file " + infile, e);
ok = false;
}
if ( in != null ) {
try {
in.close();
} catch ( IOException e ) {
error("IO exception closing file " + file, e);
error("IO exception closing file " + infile, e);
ok = false;
}
}
......@@ -138,18 +146,18 @@ public class StripProperties {
OutputStream out = null;
try {
out = new FileOutputStream(file);
out = new FileOutputStream(outfile);
storeProperties(prop, out);
out.flush();
} catch ( IOException e ) {
error("IO exception processing file " + file, e);
error("IO exception processing file " + outfile, e);
ok = false;
}
if ( out != null ) {
try {
out.close();
} catch ( IOException e ) {
error("IO exception closing file " + file, e);
error("IO exception closing file " + outfile, e);
ok = false;
}
}
......@@ -166,8 +174,8 @@ public class StripProperties {
* @param args Names of properties files to process and replace contents
*/
public static void main(String args[]) {
List<String> files = parseOptions(args);
if ( files == null || !stripFiles(files) ) {
boolean ok = parseOptions(args);
if ( !ok || !stripFiles(infiles, outfiles) ) {
System.exit(1);
}
}
......
makefiles/CompileDemos.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/CompileJavaClasses.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/CompileLaunchers.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/CompileNativeLibraries.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/CopyFiles.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/CopyIntoClasses.gmk 0 → 100644
浏览文件 @ 2f5770a7
#
# 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
# Servicetag resources
SERVICETAG_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/servicetag/resources
COPY_FILES += \
$(SERVICETAG_RESOURCES_DIR)/product_registration.xsd \
$(SERVICETAG_RESOURCES_DIR)/register.html \
$(SERVICETAG_RESOURCES_DIR)/register_ja.html \
$(SERVICETAG_RESOURCES_DIR)/register_zh_CN.html \
$(wildcard $(SERVICETAG_RESOURCES_DIR)/javase_*.properties)
# 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
##########################################################################################
#
# 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.
$(shell $(MKDIR) -p $(JDK_OUTPUTDIR)/newclasses/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_hostapi:=$(shell $(FIND) $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes -type d -a -name META-INF)
# Platform specific overrides shared
ifneq ($(ALL_META-INF_DIRS_hostapi),)
ALL_META-INF_DIRS:=$(ALL_META-INF_DIRS_hostapi) \
$(filter-out %$(patsubst $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes%,%,$(ALL_META-INF_DIRS_hostapi)),\
$(ALL_META-INF_DIRS_share))
else
ALL_META-INF_DIRS:=$(ALL_META-INF_DIRS_share)
endif
# Filter out META-INF dirs that shouldn't be included
ALL_META-INF_DIRS:=$(filter-out %sun/nio/cs/ext/META-INF,$(ALL_META-INF_DIRS))
ifdef OPENJDK
ALL_META-INF_DIRS:=$(filter-out %com/sun/script/javascript/META-INF,$(ALL_META-INF_DIRS))
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.PCMM,$(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.PCMM,$(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)/newclasses/META-INF/services/yyyy
# The \n in the printf command is needed to make sed work on Solaris.
OUT_SERVICES_FILES:=$(addprefix $(JDK_OUTPUTDIR)/newclasses/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/$(LEGACY_HOST_OS_API)/classes/sun/print/services/*)
OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/newclasses/META-INF/services/,\
$(patsubst $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/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 Installing META-INF/services/$$(@F)
$(CAT) $$< | $(SED) -e "s/^#\[$(PLATFORM)\]//" > $$@
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)
makefiles/CopySamples.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/GendataBreakIterator.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/GenerateClasses.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/GenerateData.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/GenerateJavaSources.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/GensrcCharacterData.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/GensrcJDWP.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/GensrcLocaleDataMetaInfo.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/GensrcMisc.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/GensrcProperties.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/Images.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/LegacyMakefiles.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/PatchList.solaris 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/Setup.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/Tools.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/altclasses/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/apple/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/apple/applescript/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/com/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/com/apple/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/com/apple/osx/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/com/apple/osxui/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/com/oracle/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/com/oracle/jfr/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/com/oracle/security/ucrypto/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/com/oracle/security/ucrypto/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/com/oracle/security/ucrypto/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/com/sun/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/com/sun/crypto/provider/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Classes.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Cscope.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Defs-embedded.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Defs-linux.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Defs-macosx.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Defs-solaris.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Defs-windows.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Defs.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Demo.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Library.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Mapfile-vers.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Modules.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Program.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Release-embedded.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Release-macosx.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Release.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Rules.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/Subdirs.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/internal/Defs-corba.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/internal/Defs-jaxp.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/internal/Defs-jaxws.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/internal/Defs-langtools.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/internal/ImportComponents.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/internal/NativeCompileRules.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/internal/Resources.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Compiler-gcc.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Compiler-llvm.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Compiler-msvc.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Compiler-sun.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Defs-control.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Defs-java.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Defs-javadoc.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Defs-linux.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Defs-macosx.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Defs-solaris.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Defs-utils.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Defs-versions.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Defs-windows.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Defs.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Platform.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/PrivateDefs.gmk-example 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/common/shared/Sanity-Settings.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/docs/CORE_PKGS.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/docs/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/docs/NON_CORE_PKGS.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/docs/Notes.html 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/fdlibm/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/fdlibm/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/instrument/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/instrument/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/invoke/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java/Exportedfiles.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java/FILES_java.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java/localelist.sh 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java/reflect/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java/reorder-i586 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java/reorder-sparc 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java/reorder-sparcv9 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java_crw_demo/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java_crw_demo/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java_hprof_demo/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/java_hprof_demo/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/jexec/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/jli/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/jli/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/jobjc/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/jvm/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/main/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/main/java/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/main/java/mapfile-amd64 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/main/java/mapfile-i586 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/main/java/mapfile-sparc 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/main/java/mapfile-sparcv9 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/main/javaw/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/management/Exportedfiles.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/management/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/management/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/management/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/net/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/net/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/net/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/Exportedfiles.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/FILES_java.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/addNotices.sh 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/genBuffer.sh 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/genCharsetProvider.sh 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/genCoder.sh 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/genExceptions.sh 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/mapfile-bsd 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/mapfile-linux 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/mapfile-solaris 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/reorder-i586 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/reorder-sparc 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/nio/reorder-sparcv9 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/npt/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/npt/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/redist/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/redist/fonts/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/redist/sajdi/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/security/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/sun_nio/FILES_java.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/sun_nio/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/util/FILES_java.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/util/FILES_properties.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/util/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/verify/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/verify/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/verify/reorder-i586 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/verify/reorder-sparc 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/java/verify/reorder-sparcv9 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/crypto/Defs-jce.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/crypto/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/crypto/policy/limited/LIMITED 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/crypto/policy/unlimited/UNLIMITED 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/imageio/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/management/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/sound/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/sound/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/sound/SoundDefs.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/sound/jsoundalsa/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/sound/jsoundalsa/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/sound/jsoundds/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/sound/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/sql/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/swing/FILES.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/swing/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/swing/beaninfo/FILES.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/swing/beaninfo/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/swing/beaninfo/SwingBeans.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/swing/beaninfo/manifest 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/swing/html32dtd/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/swing/plaf/FILES.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/javax/swing/plaf/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/jpda/jdwp/jdwp.spec 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/jprt.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/jprt.properties 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/launchers/mapfile-amd64 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/launchers/mapfile-i586 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/launchers/mapfile-sparc 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/launchers/mapfile-sparcv9 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libattach/mapfile-linux 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libattach/mapfile-solaris 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libdt_socket/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libfontmanager/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libjaas/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libjawt/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libjdwp/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libjpeg/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libjpeg/mapfile-vers-closed 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libjpeg/reorder-i586 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libjpeg/reorder-sparc 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libjpeg/reorder-sparcv9 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libjsdt/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/liblcms/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libsctp/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libt2k/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libunpack/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libunpack/mapfile-vers-unpack200 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libverify/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libverify/reorder-i586 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libverify/reorder-sparc 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libverify/reorder-sparcv9 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libzip/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libzip/reorder-i586 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libzip/reorder-sparc 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mapfiles/libzip/reorder-sparcv9 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mkdemo/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mkdemo/jni/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mkdemo/jni/Poller/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mkdemo/jvmti/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mkdemo/jvmti/README.txt 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mkdemo/jvmti/hprof/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mkdemo/jvmti/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/mkdemo/management/README.txt 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/CondenseRules.awk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/Depend.mak 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/Depend.sed 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/FILES_c_macosx.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/FILES_c_unix.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/FILES_c_windows.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/FILES_export_macosx.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/FILES_export_unix.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/FILES_export_windows.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/README 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/make.depend 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/mapfile-mawt-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/mapfile-vers-linux 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/awt/mawt.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/cmm/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/cmm/kcms/FILES_c_unix.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/cmm/kcms/FILES_c_windows.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/cmm/kcms/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/cmm/kcms/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/dcpr/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/dcpr/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/dcpr/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/headless/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/headless/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/headless/reorder-i586 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/headless/reorder-sparc 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/headless/reorder-sparcv9 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/image/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/image/generic/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/image/generic/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/image/generic/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/image/vis/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/image/vis/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/javazic/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/jdbc/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/jdga/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/jdga/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/jkernel/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/lwawt/FILES_c_macosx.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/lwawt/FILES_export_macosx.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/lwawt/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/nio/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/nio/cs/FILES_java.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/nio/cs/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/org/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/org/mozilla/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/org/mozilla/javascript/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/osxapp/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/ec/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/ec/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/ec/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/jgss/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/jgss/wrapper/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/jgss/wrapper/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/jgss/wrapper/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/krb5/FILES_c_windows.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/krb5/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/mscapi/FILES_cpp.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/mscapi/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/other/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/pkcs11/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/pkcs11/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/pkcs11/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/smartcardio/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/smartcardio/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/smartcardio/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/tools/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/security/util/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/splashscreen/FILES_c.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/splashscreen/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/splashscreen/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/xawt/FILES_c_unix.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/xawt/FILES_export_unix.gmk 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/xawt/Makefile 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/xawt/ToBin.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
makefiles/sun/xawt/mapfile-vers 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
src/macosx/classes/java/lang/ClassLoaderHelper.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
src/macosx/lib/content-types.properties 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
src/macosx/lib/flavormap.properties 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
src/macosx/native/sun/awt/CImage.m
浏览文件 @ 2f5770a7
此差异已折叠。
src/macosx/native/sun/awt/awt.m
浏览文件 @ 2f5770a7
此差异已折叠。
src/share/native/sun/font/sunFont.c
浏览文件 @ 2f5770a7
此差异已折叠。
src/solaris/bin/java_md.c
浏览文件 @ 2f5770a7
此差异已折叠。
src/solaris/classes/java/lang/ClassLoaderHelper.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
src/windows/classes/java/lang/ClassLoaderHelper.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/ProblemList.txt
浏览文件 @ 2f5770a7
此差异已折叠。
test/demo/zipfs/ZFSTests.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/java/awt/Component/7097771/bug7097771.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/java/awt/Frame/InvisibleOwner/InvisibleOwner.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/java/awt/TextArea/DisposeTest/TestDispose.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/java/awt/TextField/DisposeTest/TestDispose.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/java/lang/SecurityManager/CheckPackageAccess.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/java/util/AbstractCollection/ToArrayTest.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/java/util/regex/RegExTest.java
浏览文件 @ 2f5770a7
此差异已折叠。
test/javax/sound/sampled/DirectAudio/bug6400879.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/javax/swing/JTabbedPane/4310381/bug4310381.html 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/javax/swing/JTabbedPane/4310381/bug4310381.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/javax/swing/border/Test7149090.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/javax/swing/plaf/synth/7158712/bug7158712.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/sun/awt/image/ImageWatched/AddNoLeak.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/sun/nio/ch/SelProvider.java
浏览文件 @ 2f5770a7
此差异已折叠。
test/sun/nio/cs/TestSJIS0213_SM.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/sun/rmi/rmic/classpath/RMICClassPathTest.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/sun/security/krb5/ccache/EmptyCC.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/sun/text/resources/LocaleData
浏览文件 @ 2f5770a7
此差异已折叠。
test/sun/tools/jcmd/dcmd-big-script.txt 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/sun/tools/jcmd/jcmd-big-script.sh 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
test/tools/launcher/TestHelper.java
浏览文件 @ 2f5770a7
此差异已折叠。
test/tools/launcher/ToolsOpts.java 0 → 100644
浏览文件 @ 2f5770a7
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或