OpenJDK / jdk-updates / jdk12u
changeset 11347:57d93745934e
Merge
| author | duke |
|---|---|
| date | Wed, 05 Jul 2017 17:58:57 +0200 |
| parents | 075cd2a7d88e fc7b3e6ed04e |
| children | 6561530ea757 |
| files | |
| diffstat | 8 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags-top-repo Thu Dec 29 15:14:53 2011 -0800 +++ b/.hgtags-top-repo Wed Jul 05 17:58:57 2017 +0200 @@ -140,3 +140,4 @@ 4e06ae613e99549835896720c7a68c29ad5543f5 jdk8-b17 4e06ae613e99549835896720c7a68c29ad5543f5 jdk8-b16 7010bd24cdd07bc7daef80702f39124854dec36c jdk8-b18 +237bc29afbfc6f56a4fe4a6008e2befb59c44bac jdk8-b19
--- a/corba/.hgtags Thu Dec 29 15:14:53 2011 -0800 +++ b/corba/.hgtags Wed Jul 05 17:58:57 2017 +0200 @@ -140,3 +140,4 @@ 82dc033975bb9b553b4ef97b6d483eda8de32e0f jdk8-b17 82dc033975bb9b553b4ef97b6d483eda8de32e0f jdk8-b16 312cf15d16577ef198b033d2a4cc0a52369b7343 jdk8-b18 +e1366c5d84ef984095a332bcee70b3938232d07d jdk8-b19
--- a/hotspot/.hgtags Thu Dec 29 15:14:53 2011 -0800 +++ b/hotspot/.hgtags Wed Jul 05 17:58:57 2017 +0200 @@ -207,3 +207,4 @@ a2fef924d8e6f37dac2a887315e3502876cc8e24 hs23-b08 61165f53f1656b9f99e4fb806429bf98b99d59c3 jdk8-b18 4bcf61041217f8677dcec18e90e9196acc945bba hs23-b09 +9232e0ecbc2cec54dcc8f93004fb00c214446460 jdk8-b19
--- a/jaxp/.hgtags Thu Dec 29 15:14:53 2011 -0800 +++ b/jaxp/.hgtags Wed Jul 05 17:58:57 2017 +0200 @@ -140,3 +140,4 @@ 09eb517404b059607aca30cdd1af83ffc57eafeb jdk8-b17 09eb517404b059607aca30cdd1af83ffc57eafeb jdk8-b16 ebec6a7e8d4e481d205a2109ddeea8121d76db7f jdk8-b18 +dffeb62b1a7fc8b316bf58fe5479323f3661894e jdk8-b19
--- a/jaxws/.hgtags Thu Dec 29 15:14:53 2011 -0800 +++ b/jaxws/.hgtags Wed Jul 05 17:58:57 2017 +0200 @@ -140,3 +140,4 @@ 3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b17 3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b16 54928c8850f5498670dd43d6c9299f36de1a6746 jdk8-b18 +b73b733214aa43648d69a2da51e6b48fda902a2d jdk8-b19
--- a/jdk/.hgtags Thu Dec 29 15:14:53 2011 -0800 +++ b/jdk/.hgtags Wed Jul 05 17:58:57 2017 +0200 @@ -140,3 +140,4 @@ b71d1acfae5240d8c1359443cd02b5ddb587231c jdk8-b17 929597c6e777f742ad252660045ebaa4a3ea4772 jdk8-b16 334bd51fb3f321cd6777416ae7bafac71a84140a jdk8-b18 +3778f85773055e81eab6c5ef828935ecca241810 jdk8-b19
--- a/jdk/make/common/Release.gmk Thu Dec 29 15:14:53 2011 -0800 +++ b/jdk/make/common/Release.gmk Wed Jul 05 17:58:57 2017 +0200 @@ -82,11 +82,13 @@ 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 @@ # 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. @@ -484,6 +487,12 @@ $(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) @@ -911,7 +920,8 @@ # 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
--- a/jdk/make/common/shared/Defs-control.gmk Thu Dec 29 15:14:53 2011 -0800 +++ b/jdk/make/common/shared/Defs-control.gmk Wed Jul 05 17:58:57 2017 +0200 @@ -75,9 +75,11 @@ 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