1.1 --- a/make/common/Release.gmk	Thu Dec 29 15:14:45 2011 -0800
     1.2 +++ b/make/common/Release.gmk	Tue Jan 03 14:34:08 2012 -0500
     1.3 @@ -82,11 +82,13 @@
     1.4    SHARE_JRE_DOC_SRC = $(JDK_TOPDIR)
     1.5    # Same files for jdk and jre, no name changes
     1.6    IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
     1.7 +  IMAGE_DOCLIST_JDK_DEMOS_AND_SAMPLES =
     1.8    IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
     1.9  else
    1.10    # make/closed/common/Defs.gmk for closed location of SHARE_JDK_DOC_SRC
    1.11  
    1.12    IMAGE_DOCLIST_JDK = COPYRIGHT README.html  LICENSE THIRDPARTYLICENSEREADME.txt
    1.13 +  IMAGE_DOCLIST_JDK_DEMOS_AND_SAMPLES = demo/DEMOS_LICENSE sample/SAMPLES_LICENSE
    1.14    IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt
    1.15    ifeq ($(PLATFORM), windows)
    1.16      IMAGE_DOCLIST_JRE += README.txt
    1.17 @@ -98,6 +100,7 @@
    1.18  # Paths to these files we need
    1.19  JDK_DOCFILES   = $(IMAGE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%)
    1.20  JRE_DOCFILES   = $(IMAGE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%)
    1.21 +JDK_DEMOS_AND_SAMPLES_DOCFILES = $(IMAGE_DOCLIST_JDK_DEMOS_AND_SAMPLES:%=$(JDK_IMAGE_DIR)/%)
    1.22  
    1.23  # absolute directory names: note, these must exist prior to build
    1.24  # time - they are created in the main Makefile.
    1.25 @@ -484,6 +487,12 @@
    1.26  $(JDK_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/%
    1.27  	$(process-doc-file)
    1.28  
    1.29 +$(JDK_IMAGE_DIR)/demo/DEMOS_LICENSE: $(SHARE_JDK_DOC_SRC)/DEMOS_LICENSE
    1.30 +	$(process-doc-file)
    1.31 +
    1.32 +$(JDK_IMAGE_DIR)/sample/SAMPLES_LICENSE: $(SHARE_JDK_DOC_SRC)/SAMPLES_LICENSE
    1.33 +	$(process-doc-file)
    1.34 +
    1.35  # JRE files 
    1.36  $(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%
    1.37  	$(process-doc-file)
    1.38 @@ -911,7 +920,8 @@
    1.39  # Standard jdk image
    1.40  initial-image-jdk:: initial-image-jdk-setup \
    1.41  		    initial-image-jdk-db \
    1.42 -		    $(JDK_DOCFILES)
    1.43 +		    $(JDK_DOCFILES) \
    1.44 +		    $(JDK_DEMOS_AND_SAMPLES_DOCFILES)
    1.45  	$(MKDIR) $(JDK_IMAGE_DIR)/lib
    1.46  	@#
    1.47  	@# Copy in the jars in lib that only belong in the JDK

     2.1 --- a/make/common/shared/Defs-control.gmk	Thu Dec 29 15:14:45 2011 -0800
     2.2 +++ b/make/common/shared/Defs-control.gmk	Tue Jan 03 14:34:08 2012 -0500
     2.3 @@ -75,9 +75,11 @@
     2.4  SRC_BUNDLEDIR       = $(OUTPUTDIR)/source-bundles
     2.5  ABS_SRC_BUNDLEDIR   = $(ABS_OUTPUTDIR)/source-bundles
     2.6  BIN_BUNDLEDIR       = $(OUTPUTDIR)/bundles
     2.7 +BIN_DEMOS_BUNDLEDIR = $(OUTPUTDIR)/demos-bundles
     2.8  ABS_BIN_BUNDLEDIR   = $(ABS_OUTPUTDIR)/bundles
     2.9  
    2.10  dummy := $(shell $(MKDIR) -p $(BIN_BUNDLEDIR))
    2.11 +dummy := $(shell $(MKDIR) -p $(BIN_DEMOS_BUNDLEDIR) )
    2.12  dummy := $(shell $(MKDIR) -p $(SRC_BUNDLEDIR) )
    2.13  
    2.14  TEMP_DIR = $(OUTPUTDIR)/tmp