From d298973077e95023f92106c83e2ab378291eb0df Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Thu, 7 Jan 2010 23:17:01 +0000 Subject: [PATCH 1/2] 6914986: Make sure openjdk doc generation not turned off with JDK_UPDATE_VERSION Only turn off documentation for updates when not building OpenJDK Reviewed-by: ohair --- make/Defs-internal.gmk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk index bf6e5a758a8..db3072744ba 100644 --- a/make/Defs-internal.gmk +++ b/make/Defs-internal.gmk @@ -231,9 +231,11 @@ endif ifndef NO_DOCS # Default value (we want javadoc run) GENERATE_DOCS=true - # No DOCS build when JDK_UPDATE_VERSION set - ifdef JDK_UPDATE_VERSION - GENERATE_DOCS=false + # No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds + ifndef OPENJDK + ifdef JDK_UPDATE_VERSION + GENERATE_DOCS=false + endif endif # If langtools, corba, jaxp, and jaxws are not being built, # a full jdk javadoc is not possible From 50b34833aa8536c8d104946034a0e9aea70b0fbe Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 14 Jan 2010 15:48:22 -0800 Subject: [PATCH 2/2] Added tag jdk7-b79 for changeset 142aec7359d5 --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 8e191447e9d..e43d2429adc 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -53,3 +53,4 @@ d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78 +20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79