stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7099017: jdk7u2-dev does not build

Browse Source 
Changes to skip demo/DEMOS_LICENSE and sample/SAMPLES_LICENSE when building OPENJDK

Reviewed-by: ohair, billyh
This commit is contained in:
Christopher Gruszka 2011-10-18 14:21:47 -04:00
parent 64c2502a16
commit 0929b68ecc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/make/common/Release.gmk
View File

@ -82,11 +82,13 @@ ifdef OPENJDK
SHARE_JRE_DOC_SRC = $(JDK_TOPDIR) SHARE_JRE_DOC_SRC = $(JDK_TOPDIR)
# Same files for jdk and jre, no name changes # Same files for jdk and jre, no name changes
IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
IMAGE_DOCLIST_JDK_DEMOS_AND_SAMPLES =
IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
else else
# make/closed/common/Defs.gmk for closed location of SHARE_JDK_DOC_SRC # 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 = 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 IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
IMAGE_DOCLIST_JRE += README.txt IMAGE_DOCLIST_JRE += README.txt
@ -98,7 +100,7 @@ endif
# Paths to these files we need # Paths to these files we need
JDK_DOCFILES = $(IMAGE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%) JDK_DOCFILES = $(IMAGE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%)
JRE_DOCFILES = $(IMAGE_DOCLIST_JRE:%=$(JRE_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 # absolute directory names: note, these must exist prior to build
# time - they are created in the main Makefile. # time - they are created in the main Makefile.