OpenJDK / amber / amber
changeset 11331:245d2d6da902
7066713: Separate demos from the bundles on Solaris and Linux
Summary: add new license files to demos and samples, new directory for bundling
Reviewed-by: katleman, ohair, billyh
| author | cgruszka |
|---|---|
| date | Thu, 15 Sep 2011 13:59:13 -0400 |
| parents | 86db042b3385 |
| children | e6d86336df34 |
| files | jdk/make/common/Release.gmk jdk/make/common/shared/Defs-control.gmk |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/common/Release.gmk Wed Jul 05 17:54:24 2017 +0200 +++ b/jdk/make/common/Release.gmk Thu Sep 15 13:59:13 2011 -0400 @@ -98,6 +98,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 = $(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 @@ $(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 @@ # 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 Wed Jul 05 17:54:24 2017 +0200 +++ b/jdk/make/common/shared/Defs-control.gmk Thu Sep 15 13:59:13 2011 -0400 @@ -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