From 64c2502a163cfb74b5e2a28fa3d3860b1d7c54c1 Mon Sep 17 00:00:00 2001 From: Christopher Gruszka Date: Thu, 15 Sep 2011 13:59:13 -0400 Subject: [PATCH 1/8] 7066713: Separate demos from the bundles on Solaris and Linux Add new license files to demos and samples, new directory for bundling Reviewed-by: katleman, ohair, billyh --- jdk/make/common/Release.gmk | 10 +++++++++- jdk/make/common/shared/Defs-control.gmk | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk index fa546979b71..417290d4ab0 100644 --- a/jdk/make/common/Release.gmk +++ b/jdk/make/common/Release.gmk @@ -98,6 +98,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 = $(JDK_IMAGE_DIR)/demo/DEMOS_LICENSE $(JDK_IMAGE_DIR)/sample/SAMPLES_LICENSE # absolute directory names: note, these must exist prior to build # time - they are created in the main Makefile. @@ -484,6 +485,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) @@ -911,7 +918,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/jdk/make/common/shared/Defs-control.gmk b/jdk/make/common/shared/Defs-control.gmk index 4a67131a235..13858098a46 100644 --- a/jdk/make/common/shared/Defs-control.gmk +++ b/jdk/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 From 0929b68ecc1051f428e0acf0a4d8cca6e5fab35e Mon Sep 17 00:00:00 2001 From: Christopher Gruszka Date: Tue, 18 Oct 2011 14:21:47 -0400 Subject: [PATCH 2/8] 7099017: jdk7u2-dev does not build Changes to skip demo/DEMOS_LICENSE and sample/SAMPLES_LICENSE when building OPENJDK Reviewed-by: ohair, billyh --- jdk/make/common/Release.gmk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk index 417290d4ab0..c443115263e 100644 --- a/jdk/make/common/Release.gmk +++ b/jdk/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,7 +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 = $(JDK_IMAGE_DIR)/demo/DEMOS_LICENSE $(JDK_IMAGE_DIR)/sample/SAMPLES_LICENSE +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. From a639e6c9920b43959f3d0fd08385ab329441ff84 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 29 Dec 2011 15:14:26 -0800 Subject: [PATCH 3/8] Added tag jdk8-b19 for changeset 13a20c009f86 --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 695382cf1b5..77afe764ab1 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -140,3 +140,4 @@ a4f28069d44a379cda99dd1d921d19f819726d22 jdk8-b15 4e06ae613e99549835896720c7a68c29ad5543f5 jdk8-b17 4e06ae613e99549835896720c7a68c29ad5543f5 jdk8-b16 7010bd24cdd07bc7daef80702f39124854dec36c jdk8-b18 +237bc29afbfc6f56a4fe4a6008e2befb59c44bac jdk8-b19 From 689eb5c788f017b7622d18344329d92ee8803347 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 29 Dec 2011 15:14:28 -0800 Subject: [PATCH 4/8] Added tag jdk8-b19 for changeset d7beecd46eba --- corba/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/corba/.hgtags b/corba/.hgtags index 8f558804bde..cf6430c3c77 100644 --- a/corba/.hgtags +++ b/corba/.hgtags @@ -140,3 +140,4 @@ e59c47de1ad8982ff3b0e843773a6902b36c2337 jdk8-b14 82dc033975bb9b553b4ef97b6d483eda8de32e0f jdk8-b17 82dc033975bb9b553b4ef97b6d483eda8de32e0f jdk8-b16 312cf15d16577ef198b033d2a4cc0a52369b7343 jdk8-b18 +e1366c5d84ef984095a332bcee70b3938232d07d jdk8-b19 From 9fc4c79d3ff2fbb78d18ae51bf32ba95a54016b3 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 29 Dec 2011 15:14:33 -0800 Subject: [PATCH 5/8] Added tag jdk8-b19 for changeset a8d0b94dcf7c --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index 55bcc9718b5..cc003255052 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -207,3 +207,4 @@ d1f29d4e0bc60e8bd7ae961f1306d8ab33290212 jdk8-b16 a2fef924d8e6f37dac2a887315e3502876cc8e24 hs23-b08 61165f53f1656b9f99e4fb806429bf98b99d59c3 jdk8-b18 4bcf61041217f8677dcec18e90e9196acc945bba hs23-b09 +9232e0ecbc2cec54dcc8f93004fb00c214446460 jdk8-b19 From da097641d1fa9326626f5402ba550ef102fb8166 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 29 Dec 2011 15:14:40 -0800 Subject: [PATCH 6/8] Added tag jdk8-b19 for changeset 5d3d2bd1dfd1 --- jaxp/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jaxp/.hgtags b/jaxp/.hgtags index ea92f5ae603..9d3b08218cb 100644 --- a/jaxp/.hgtags +++ b/jaxp/.hgtags @@ -140,3 +140,4 @@ bcc739229f6384786c7ac0b52c1822c85674dcf1 jdk8-b13 09eb517404b059607aca30cdd1af83ffc57eafeb jdk8-b17 09eb517404b059607aca30cdd1af83ffc57eafeb jdk8-b16 ebec6a7e8d4e481d205a2109ddeea8121d76db7f jdk8-b18 +dffeb62b1a7fc8b316bf58fe5479323f3661894e jdk8-b19 From 1209eff35b3ff1909566aa26bd345dd3040e4d50 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 29 Dec 2011 15:14:41 -0800 Subject: [PATCH 7/8] Added tag jdk8-b19 for changeset 3bf50beb6cfb --- jaxws/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jaxws/.hgtags b/jaxws/.hgtags index 6861a55792e..85e55fead51 100644 --- a/jaxws/.hgtags +++ b/jaxws/.hgtags @@ -140,3 +140,4 @@ c9ab96ff23d52d85d5dcce1f9c0fd7a3de418c74 jdk8-b15 3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b17 3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b16 54928c8850f5498670dd43d6c9299f36de1a6746 jdk8-b18 +b73b733214aa43648d69a2da51e6b48fda902a2d jdk8-b19 From cb15ac68aa736854f4a447af4a50ce0bac999c98 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 29 Dec 2011 15:14:45 -0800 Subject: [PATCH 8/8] Added tag jdk8-b19 for changeset d0ec48636c58 --- jdk/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jdk/.hgtags b/jdk/.hgtags index 85d86e447ae..62370d1dd86 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -140,3 +140,4 @@ f1ec21b8142168ff40f3278d2f6b5fe4bd5f3b26 jdk8-b09 b71d1acfae5240d8c1359443cd02b5ddb587231c jdk8-b17 929597c6e777f742ad252660045ebaa4a3ea4772 jdk8-b16 334bd51fb3f321cd6777416ae7bafac71a84140a jdk8-b18 +3778f85773055e81eab6c5ef828935ecca241810 jdk8-b19