diff --git a/.hgtags b/.hgtags index 85d86e447aef4d5adcc323ffad6ae16d3112b239..58e1636aaaf5aed39f1fe6cfd64067633ad5248d 100644 --- a/.hgtags +++ b/.hgtags @@ -140,3 +140,6 @@ f1ec21b8142168ff40f3278d2f6b5fe4bd5f3b26 jdk8-b09 b71d1acfae5240d8c1359443cd02b5ddb587231c jdk8-b17 929597c6e777f742ad252660045ebaa4a3ea4772 jdk8-b16 334bd51fb3f321cd6777416ae7bafac71a84140a jdk8-b18 +3778f85773055e81eab6c5ef828935ecca241810 jdk8-b19 +39e938cd1b82ec3aab0a9aa66fd8a0457cd0c9c2 jdk8-b20 +664fa4fb0ee411ef048903c479f8b962fcdb2f4b jdk8-b21 diff --git a/make/common/Defs-linux.gmk b/make/common/Defs-linux.gmk index d20efc9718029416d52d3412cb96db37bcb6ce85..026b18004d2789f7144d3752aa8f1d1fb657227b 100644 --- a/make/common/Defs-linux.gmk +++ b/make/common/Defs-linux.gmk @@ -72,7 +72,6 @@ FDDLIBM_SUFFIX = a SCRIPT_SUFFIX = # CC compiler object code output directive flag value CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required! -CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required! # Default OBJCOPY comes from GNU Binutils on Linux: DEF_OBJCOPY=/usr/bin/objcopy diff --git a/make/common/Defs-solaris.gmk b/make/common/Defs-solaris.gmk index 666cdc12ef2e11faa803240c9c2a69f4fd2aff9c..aae69291a5ffd81ce9cc296048d834f0852c45a8 100644 --- a/make/common/Defs-solaris.gmk +++ b/make/common/Defs-solaris.gmk @@ -72,7 +72,6 @@ FDDLIBM_SUFFIX = a SCRIPT_SUFFIX = # CC compiler object code output directive flag value CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required! -CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required! ifdef ENABLE_FULL_DEBUG_SYMBOLS # Only check for Full Debug Symbols support on Solaris if it is diff --git a/make/common/Defs-windows.gmk b/make/common/Defs-windows.gmk index d04d60a7924dc40c7b48f752a1518ba53e0d0f31..c23d0244906fba2a2da10638bcd43cef5640a813 100644 --- a/make/common/Defs-windows.gmk +++ b/make/common/Defs-windows.gmk @@ -36,7 +36,6 @@ include $(JDK_MAKE_SHARED_DIR)/Defs.gmk # CC compiler object code output directive flag value CC_OBJECT_OUTPUT_FLAG = -Fo -CC_PROGRAM_OUTPUT_FLAG = -Fe # The suffix applied to the library name for FDLIBM FDDLIBM_SUFFIX = lib diff --git a/make/common/Demo.gmk b/make/common/Demo.gmk index 429c4e546c98ee05392fbb30be9ca9349635fbd5..c6cf41d6b3feaef30ba8e4e2f6ddcde6d9bf7494 100644 --- a/make/common/Demo.gmk +++ b/make/common/Demo.gmk @@ -319,9 +319,12 @@ $(DEMO_LIBRARY): $(DEMO_FULL_OBJECTS) @$(prep-target) ifeq ($(PLATFORM),windows) $(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(DEMO_VERSION_INFO) $(VERSIONINFO_RESOURCE) - endif - $(LINK.demo) $(SHARED_LIBRARY_FLAG) $(CC_PROGRAM_OUTPUT_FLAG)$@ \ + $(LINK.demo) $(SHARED_LIBRARY_FLAG) -Fe$@ \ + $(DEMO_FULL_OBJECTS) $(LDLIBS.demo) + else + $(LINK.demo) $(SHARED_LIBRARY_FLAG) -o $@ \ $(DEMO_FULL_OBJECTS) $(LDLIBS.demo) + endif @$(call binary_file_verification,$@) # Generation of any javah include file, make sure objects are dependent on it diff --git a/make/common/Release.gmk b/make/common/Release.gmk index b316540edae3fb3dbb0d67710455b746dec15c5e..e6f69c3ab9d8cf93a317d11a880726ced705bf1e 100644 --- a/make/common/Release.gmk +++ b/make/common/Release.gmk @@ -82,11 +82,13 @@ ifdef OPENJDK SHARE_JRE_DOC_SRC = $(JDK_TOPDIR) # Same files for jdk and jre, no name changes IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README + IMAGE_DOCLIST_JDK_DEMOS_AND_SAMPLES = IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README else # make/closed/common/Defs.gmk for closed location of SHARE_JDK_DOC_SRC IMAGE_DOCLIST_JDK = COPYRIGHT README.html LICENSE THIRDPARTYLICENSEREADME.txt + IMAGE_DOCLIST_JDK_DEMOS_AND_SAMPLES = demo/DEMOS_LICENSE sample/SAMPLES_LICENSE IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt ifeq ($(PLATFORM), windows) IMAGE_DOCLIST_JRE += README.txt @@ -98,6 +100,7 @@ endif # Paths to these files we need JDK_DOCFILES = $(IMAGE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%) JRE_DOCFILES = $(IMAGE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%) +JDK_DEMOS_AND_SAMPLES_DOCFILES = $(IMAGE_DOCLIST_JDK_DEMOS_AND_SAMPLES:%=$(JDK_IMAGE_DIR)/%) # absolute directory names: note, these must exist prior to build # time - they are created in the main Makefile. @@ -486,6 +489,12 @@ endef $(JDK_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/% $(process-doc-file) +$(JDK_IMAGE_DIR)/demo/DEMOS_LICENSE: $(SHARE_JDK_DOC_SRC)/DEMOS_LICENSE + $(process-doc-file) + +$(JDK_IMAGE_DIR)/sample/SAMPLES_LICENSE: $(SHARE_JDK_DOC_SRC)/SAMPLES_LICENSE + $(process-doc-file) + # JRE files $(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/% $(process-doc-file) @@ -914,7 +923,8 @@ endif # Standard jdk image initial-image-jdk:: initial-image-jdk-setup \ initial-image-jdk-db \ - $(JDK_DOCFILES) + $(JDK_DOCFILES) \ + $(JDK_DEMOS_AND_SAMPLES_DOCFILES) $(MKDIR) $(JDK_IMAGE_DIR)/lib @# @# Copy in the jars in lib that only belong in the JDK diff --git a/make/common/shared/Defs-control.gmk b/make/common/shared/Defs-control.gmk index 4a67131a23570e46a6b40260d731a55fb1e56853..13858098a463d7dd8e4e939dab5e356c0819f02d 100644 --- a/make/common/shared/Defs-control.gmk +++ b/make/common/shared/Defs-control.gmk @@ -75,9 +75,11 @@ include $(JDK_MAKE_SHARED_DIR)/Defs.gmk SRC_BUNDLEDIR = $(OUTPUTDIR)/source-bundles ABS_SRC_BUNDLEDIR = $(ABS_OUTPUTDIR)/source-bundles BIN_BUNDLEDIR = $(OUTPUTDIR)/bundles +BIN_DEMOS_BUNDLEDIR = $(OUTPUTDIR)/demos-bundles ABS_BIN_BUNDLEDIR = $(ABS_OUTPUTDIR)/bundles dummy := $(shell $(MKDIR) -p $(BIN_BUNDLEDIR)) +dummy := $(shell $(MKDIR) -p $(BIN_DEMOS_BUNDLEDIR) ) dummy := $(shell $(MKDIR) -p $(SRC_BUNDLEDIR) ) TEMP_DIR = $(OUTPUTDIR)/tmp diff --git a/make/common/shared/Platform.gmk b/make/common/shared/Platform.gmk index 97cbc6ee78572e82e4d3b702fd48874e4028401c..a64c2b46ef68af63341f6c615c7d44570e9d3ab2 100644 --- a/make/common/shared/Platform.gmk +++ b/make/common/shared/Platform.gmk @@ -147,8 +147,8 @@ ifeq ($(SYSTEM_UNAME), SunOS) endif # Suffix for file bundles used in previous release BUNDLE_FILE_SUFFIX=.tar - # How much RAM does this machine have: - MB_OF_MEMORY=$(shell /usr/sbin/prtconf | fgrep 'Memory size:' | expand | cut -d' ' -f3) + # How much RAM does this machine have (zones send an error to stderr): + MB_OF_MEMORY:=$(shell /usr/sbin/prtconf 2>/dev/null | fgrep 'Memory size:' | expand | cut -d' ' -f3) endif # Platform settings specific to Linux diff --git a/make/tools/freetypecheck/Makefile b/make/tools/freetypecheck/Makefile index dcacde5362e2d2c68beb3b5119faa2dda049bff2..101542fea826a1b34a6886cb669df79f8fde847c 100644 --- a/make/tools/freetypecheck/Makefile +++ b/make/tools/freetypecheck/Makefile @@ -40,18 +40,19 @@ ifeq ($(PLATFORM), windows) FT_OPTIONS = /nologo /c FREETYPE_DLL = $(FREETYPE_LIB_PATH)/freetype.dll FT_LD_OPTIONS = $(FREETYPE_LIB_PATH)/freetype.lib -ifdef MT - FT_LD_OPTIONS += /manifest -endif + ifdef MT + FT_LD_OPTIONS += /manifest + endif else FT_OPTIONS = $(CFLAGS) FT_LD_OPTIONS = -L$(FREETYPE_LIB_PATH) # Add runtime lib search path to ensure test will be runnable - ifeq ($(PLATFORM), solaris) - FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) -lfreetype - else #linux - FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype + ifeq ($(PLATFORM), linux) + FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) + else # other unix + FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) endif + FT_LD_OPTIONS += -lfreetype endif FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH) FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)/freetype2 @@ -70,12 +71,12 @@ ifeq ($(PLATFORM), windows) $(CC) $(FT_OPTIONS) $(CC_OBJECT_OUTPUT_FLAG)$(FT_OBJ) $< $(LINK) $(FT_LD_OPTIONS) /OUT:$(FT_TEST) $(FT_OBJ) $(CP) $(FREETYPE_DLL) $(@D)/ -ifdef MT + ifdef MT $(CP) $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL) $(@D)/ $(MT) /manifest $(FT_TEST).manifest /outputresource:$(FT_TEST);#1 -endif + endif else - @$(CC) $(FT_OPTIONS) $(CC_PROGRAM_OUTPUT_FLAG)$@ $< $(FT_LD_OPTIONS) + @$(CC) $(FT_OPTIONS) -o $@ $< $(FT_LD_OPTIONS) endif else diff --git a/src/share/classes/sun/text/resources/FormatData_bg.java b/src/share/classes/sun/text/resources/FormatData_bg.java index e812aafa1bcebad8bfc631707bd7a93c09421d9d..bca077b029ba9b01bc3b7e19e4bd90fc10e5fc27 100644 --- a/src/share/classes/sun/text/resources/FormatData_bg.java +++ b/src/share/classes/sun/text/resources/FormatData_bg.java @@ -130,16 +130,16 @@ public class FormatData_bg extends ListResourceBundle { }, { "DateTimePatterns", new String[] { - "HH:mm:ss z", // full time pattern + "HH:mm:ss zzzz", // full time pattern "HH:mm:ss z", // long time pattern - "H:mm:ss", // medium time pattern - "H:mm", // short time pattern - "EEEE, yyyy, MMMM d", // full date pattern - "EEEE, yyyy, MMMM d", // long date pattern - "yyyy-M-d", // medium date pattern - "yy-M-d", // short date pattern + "HH:mm:ss", // medium time pattern + "HH:mm", // short time pattern + "dd MMMM y, EEEE", // full date pattern + "dd MMMM y", // long date pattern + "dd.MM.yyyy", // medium date pattern + "dd.MM.yy", // short date pattern "{1} {0}" // date-time pattern - } + } }, { "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" }, }; diff --git a/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData index 2c66a972a2842456c1df4320620481bef640b923..039981c5629685323df5624d3e0a6c9b29a8038c 100644 --- a/test/sun/text/resources/LocaleData +++ b/test/sun/text/resources/LocaleData @@ -7010,3 +7010,12 @@ CurrencyNames/zh_TW/zwl=\u8f9b\u5df4\u5a01\u5143 (2009) # bug 7101495 CalendarData/lv/firstDayOfWeek=2 CalendarData/lv/minimalDaysInFirstWeek=4 + +# bug 7003124 +FormatData/bg/DateTimePatterns/0=HH:mm:ss zzzz +FormatData/bg/DateTimePatterns/2=HH:mm:ss +FormatData/bg/DateTimePatterns/3=HH:mm +FormatData/bg/DateTimePatterns/4=dd MMMM y, EEEE +FormatData/bg/DateTimePatterns/5=dd MMMM y +FormatData/bg/DateTimePatterns/6=dd.MM.yyyy +FormatData/bg/DateTimePatterns/7=dd.MM.yy diff --git a/test/sun/text/resources/LocaleDataTest.java b/test/sun/text/resources/LocaleDataTest.java index 836b1b2763e704175873ea9a91d037c85afe6436..4f78d161148371e1eb066eedcc51b544e319a6a2 100644 --- a/test/sun/text/resources/LocaleDataTest.java +++ b/test/sun/text/resources/LocaleDataTest.java @@ -34,6 +34,7 @@ * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611 * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787 * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495 + * 7003124 * @summary Verify locale data * */