Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorduke
Wed, 05 Jul 2017 17:05:21 +0200
changeset 4593 3480529c2758
parent 4592 8f15a8afca28 (current diff)
parent 4558 e28f9a870f12 (diff)
child 4621 8dd543b2e631
Merge
--- a/.hgtags-top-repo	Fri Jan 15 14:28:16 2010 -0800
+++ b/.hgtags-top-repo	Wed Jul 05 17:05:21 2017 +0200
@@ -53,3 +53,4 @@
 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
+20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
--- a/make/Defs-internal.gmk	Fri Jan 15 14:28:16 2010 -0800
+++ b/make/Defs-internal.gmk	Wed Jul 05 17:05:21 2017 +0200
@@ -231,9 +231,11 @@
 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
jdk-sandbox