Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 3872:d8ced728159f jdk7-b135
Merge
author | mfang |
---|---|
date | Tue, 22 Mar 2011 12:12:31 -0700 |
parents | f9d15fd48919 (current diff) 1c7cac250f71 (diff) |
children | dbdd618765a8 4770b99ba850 9b9ca2b816f0 0858c48466f0 |
files | |
diffstat | 2 files changed, 7 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Defs.gmk Mon Mar 21 11:42:38 2011 -0700 +++ b/make/common/Defs.gmk Tue Mar 22 12:12:31 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -488,6 +488,10 @@ COPYRIGHT_YEAR := $(shell $(DATE) '+%Y') endif +ifndef OPENJDK +include $(JDK_TOPDIR)/make/closed/common/Defs.gmk +endif + # Install of imported file (JDK_IMPORT_PATH, or some other external location) define install-importonly-file @$(ECHO) "ASSEMBLY_IMPORT: $@"
--- a/make/common/Release.gmk Mon Mar 21 11:42:38 2011 -0700 +++ b/make/common/Release.gmk Tue Mar 22 12:12:31 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -86,14 +86,7 @@ IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README else - # Where to find these files - ifeq ($(J4B), true) - SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdkfb - SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jrefb - else - SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdk - SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jre - endif + # make/closed/common/Defs.gmk for closed location of SHARE_JDK_DOC_SRC IMAGE_DOCLIST_JDK = COPYRIGHT README.html THIRDPARTYLICENSEREADME.txt IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html THIRDPARTYLICENSEREADME.txt