changeset 4399:41e7e6e5c24f

Merge
author duke
date Wed, 05 Jul 2017 17:04:13 +0200
parents 97c33ee30c4f 4ad2b14826ea
children 47a09531e763
files
diffstat 8 files changed, 52 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Wed Dec 16 23:39:21 2009 -0800
+++ b/.hgignore	Wed Jul 05 17:04:13 2017 +0200
@@ -1,3 +1,3 @@
 ^build/
 ^dist/
-^nbproject/private/
+/nbproject/private/
--- a/.hgtags-top-repo	Wed Dec 16 23:39:21 2009 -0800
+++ b/.hgtags-top-repo	Wed Jul 05 17:04:13 2017 +0200
@@ -51,3 +51,4 @@
 2c88089b6e1c053597418099a14232182c387edc jdk7-b74
 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
+1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
--- a/Makefile	Wed Dec 16 23:39:21 2009 -0800
+++ b/Makefile	Wed Jul 05 17:04:13 2017 +0200
@@ -51,7 +51,7 @@
 
 # For start and finish echo lines
 TITLE_TEXT = Control $(PLATFORM) $(ARCH) $(RELEASE)
-DAYE_STAMP = `$(DATE) '+%y-%m-%d %H:%M'`
+DATE_STAMP = `$(DATE) '+%y-%m-%d %H:%M'`
 START_ECHO  = echo "$(TITLE_TEXT) $@ build started: $(DATE_STAMP)"
 FINISH_ECHO = echo "$(TITLE_TEXT) $@ build finished: $(DATE_STAMP)"
 
@@ -188,7 +188,7 @@
 create_fresh_product_bootdir: FRC
 	@$(START_ECHO)
 	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
-		NO_DOCS=true \
+		GENERATE_DOCS=false \
 		BOOT_CYCLE_SETTINGS= \
 		build_product_image
 	@$(FINISH_ECHO)
@@ -196,7 +196,7 @@
 create_fresh_debug_bootdir: FRC
 	@$(START_ECHO)
 	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
-		NO_DOCS=true \
+		GENERATE_DOCS=false \
 		BOOT_CYCLE_DEBUG_SETTINGS= \
 		build_debug_image
 	@$(FINISH_ECHO)
@@ -204,7 +204,7 @@
 create_fresh_fastdebug_bootdir: FRC
 	@$(START_ECHO)
 	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
-		NO_DOCS=true \
+		GENERATE_DOCS=false \
 		BOOT_CYCLE_DEBUG_SETTINGS= \
 		build_fastdebug_image
 	@$(FINISH_ECHO)
@@ -253,7 +253,7 @@
 	$(MAKE) \
 		ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \
 	        DEBUG_NAME=$(DEBUG_NAME) \
-		NO_DOCS=true \
+		GENERATE_DOCS=false \
 	        $(BOOT_CYCLE_DEBUG_SETTINGS) \
 		generic_build_repo_series
 	@$(FINISH_ECHO)
@@ -323,7 +323,7 @@
 	$(MKDIR) -p $(OPENJDK_OUTPUTDIR)
 	($(CD) $(OPENJDK_BUILDDIR) && $(MAKE) \
 	  OPENJDK=true \
-	  NO_DOCS=true \
+	  GENERATE_DOCS=false \
 	  ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \
 	  ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \
 	  ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \
--- a/hotspot/.hgignore	Wed Dec 16 23:39:21 2009 -0800
+++ b/hotspot/.hgignore	Wed Jul 05 17:04:13 2017 +0200
@@ -1,6 +1,6 @@
 ^build/
 ^dist/
-^nbproject/private/
+/nbproject/private/
 ^src/share/tools/hsdis/build/
 ^src/share/tools/IdealGraphVisualizer/[a-zA-Z0-9]*/build/
 ^src/share/tools/IdealGraphVisualizer/build/
--- a/hotspot/.hgtags	Wed Dec 16 23:39:21 2009 -0800
+++ b/hotspot/.hgtags	Wed Jul 05 17:04:13 2017 +0200
@@ -51,3 +51,4 @@
 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
+455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
--- a/make/Defs-internal.gmk	Wed Dec 16 23:39:21 2009 -0800
+++ b/make/Defs-internal.gmk	Wed Jul 05 17:04:13 2017 +0200
@@ -227,6 +227,35 @@
   SKIP_FASTDEBUG_BUILD=false
 endif
 
+# Select javadoc setting GENERATE_DOCS
+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
+  endif
+  # If langtools, corba, jaxp, and jaxws are not being built, 
+  #   a full jdk javadoc is not possible
+  ifneq ($(BUILD_LANGTOOLS), true)
+    GENERATE_DOCS=false
+  endif
+  ifneq ($(BUILD_CORBA), true)
+    GENERATE_DOCS=false
+  endif
+  ifneq ($(BUILD_JAXP), true)
+    GENERATE_DOCS=false
+  endif
+  ifneq ($(BUILD_JAXWS), true)
+    GENERATE_DOCS=false
+  endif
+  ifeq ($(GENERATE_DOCS),false)
+    NO_DOCS=true
+  endif
+else
+  GENERATE_DOCS=false
+endif
+
 # Output directory for hotspot build
 HOTSPOT_DIR = $(ABS_OUTPUTDIR)/hotspot
 
--- a/make/jdk-rules.gmk	Wed Dec 16 23:39:21 2009 -0800
+++ b/make/jdk-rules.gmk	Wed Jul 05 17:04:13 2017 +0200
@@ -30,43 +30,20 @@
 JDK_JAVA_EXE = $(OUTPUTDIR)/bin/java$(EXE_SUFFIX)
 
 # NO_IMAGES may be set in conjunction with DEV_ONLY
-ifdef NO_IMAGES
-  IMAGES_TARGET =
-else
-  IMAGES_TARGET = images
+IMAGES_TARGET = images
+ifdef DEV_ONLY
+  ifdef NO_IMAGES
+    IMAGES_TARGET =
+  endif
 endif
 
-# No DOCS build when JDK_UPDATE_VERSION set
-ifdef JDK_UPDATE_VERSION
-  DOCS_TARGET =
-else
-  DOCS_TARGET = docs
-endif
-
-# NO_DOCS may be set in conjunction with DEV_ONLY
-ifdef NO_DOCS
+# GENERATE_DOCS determines if we ask for the docs target
+DOCS_TARGET = docs
+ifeq ($(GENERATE_DOCS),false)
   DOCS_TARGET =
 endif
-
-# If langtools not being built, full jdk javadoc is not possible
-ifneq ($(BUILD_LANGTOOLS), true)
-  DOCS_TARGET =
-endif
-ifneq ($(BUILD_CORBA), true)
-  DOCS_TARGET =
-endif
-ifneq ($(BUILD_JAXP), true)
-  DOCS_TARGET =
-endif
-ifneq ($(BUILD_JAXWS), true)
-  DOCS_TARGET =
-endif
-
-ifndef DEV_ONLY
-  JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) images
-else
-  JDK_BUILD_TARGETS = sanity all $(IMAGES_TARGET)
-endif
+  
+JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) $(IMAGES_TARGET)
 
 JDK_CLOBBER_TARGETS = clobber
 
--- a/make/sanity-rules.gmk	Wed Dec 16 23:39:21 2009 -0800
+++ b/make/sanity-rules.gmk	Wed Jul 05 17:04:13 2017 +0200
@@ -204,13 +204,9 @@
 	   "" >> $(WARNING_FILE)
   endif
 endif
-ifndef OPENJDK
-  ifdef NO_DOCS
-	@$(ECHO) "WARNING: Your build environment has the variable NO_DOCS\n" \
-	   "        defined. This will result in a development-only\n" \
-	   "        build of the JDK, lacking the documentation.\n" \
+ifeq ($(GENERATE_DOCS),false)
+	@$(ECHO) "WARNING: This build does not include running javadoc.\n" \
 	   "" >> $(WARNING_FILE)
-  endif
 endif
 ifdef NO_IMAGES
 	@$(ECHO) "WARNING: Your build environment has the variable NO_IMAGES\n" \
@@ -355,4 +351,4 @@
 .PHONY: sanity settings pre-sanity insane \
 	post-sanity post-sanity-hotspot post-sanity-jdk \
 	post-sanity-install post-sanity-deploy \
-	alt_bootdir bootdir
+	alt_bootdir bootdir environment