Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Mon, 23 Nov 2009 19:55:20 -0800
- author
- tbell
- date
- Mon, 23 Nov 2009 19:55:20 -0800
- changeset 145
- 08f13b9af1b2
- parent 142
- 1f17ca8353ba
- parent 144
- 382219a27386
- child 146
- 80161484b6b1
Merge
1.1 --- a/Makefile Thu Nov 12 15:35:34 2009 -0800 1.2 +++ b/Makefile Mon Nov 23 19:55:20 2009 -0800 1.3 @@ -51,7 +51,7 @@ 1.4 1.5 # For start and finish echo lines 1.6 TITLE_TEXT = Control $(PLATFORM) $(ARCH) $(RELEASE) 1.7 -DAYE_STAMP = `$(DATE) '+%y-%m-%d %H:%M'` 1.8 +DATE_STAMP = `$(DATE) '+%y-%m-%d %H:%M'` 1.9 START_ECHO = echo "$(TITLE_TEXT) $@ build started: $(DATE_STAMP)" 1.10 FINISH_ECHO = echo "$(TITLE_TEXT) $@ build finished: $(DATE_STAMP)" 1.11 1.12 @@ -188,7 +188,7 @@ 1.13 create_fresh_product_bootdir: FRC 1.14 @$(START_ECHO) 1.15 $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ 1.16 - NO_DOCS=true \ 1.17 + GENERATE_DOCS=false \ 1.18 BOOT_CYCLE_SETTINGS= \ 1.19 build_product_image 1.20 @$(FINISH_ECHO) 1.21 @@ -196,7 +196,7 @@ 1.22 create_fresh_debug_bootdir: FRC 1.23 @$(START_ECHO) 1.24 $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ 1.25 - NO_DOCS=true \ 1.26 + GENERATE_DOCS=false \ 1.27 BOOT_CYCLE_DEBUG_SETTINGS= \ 1.28 build_debug_image 1.29 @$(FINISH_ECHO) 1.30 @@ -204,7 +204,7 @@ 1.31 create_fresh_fastdebug_bootdir: FRC 1.32 @$(START_ECHO) 1.33 $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ 1.34 - NO_DOCS=true \ 1.35 + GENERATE_DOCS=false \ 1.36 BOOT_CYCLE_DEBUG_SETTINGS= \ 1.37 build_fastdebug_image 1.38 @$(FINISH_ECHO) 1.39 @@ -253,7 +253,7 @@ 1.40 $(MAKE) \ 1.41 ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \ 1.42 DEBUG_NAME=$(DEBUG_NAME) \ 1.43 - NO_DOCS=true \ 1.44 + GENERATE_DOCS=false \ 1.45 $(BOOT_CYCLE_DEBUG_SETTINGS) \ 1.46 generic_build_repo_series 1.47 @$(FINISH_ECHO) 1.48 @@ -323,7 +323,7 @@ 1.49 $(MKDIR) -p $(OPENJDK_OUTPUTDIR) 1.50 ($(CD) $(OPENJDK_BUILDDIR) && $(MAKE) \ 1.51 OPENJDK=true \ 1.52 - NO_DOCS=true \ 1.53 + GENERATE_DOCS=false \ 1.54 ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \ 1.55 ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \ 1.56 ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \
2.1 --- a/make/Defs-internal.gmk Thu Nov 12 15:35:34 2009 -0800 2.2 +++ b/make/Defs-internal.gmk Mon Nov 23 19:55:20 2009 -0800 2.3 @@ -227,6 +227,35 @@ 2.4 SKIP_FASTDEBUG_BUILD=false 2.5 endif 2.6 2.7 +# Select javadoc setting GENERATE_DOCS 2.8 +ifndef NO_DOCS 2.9 + # Default value (we want javadoc run) 2.10 + GENERATE_DOCS=true 2.11 + # No DOCS build when JDK_UPDATE_VERSION set 2.12 + ifdef JDK_UPDATE_VERSION 2.13 + GENERATE_DOCS=false 2.14 + endif 2.15 + # If langtools, corba, jaxp, and jaxws are not being built, 2.16 + # a full jdk javadoc is not possible 2.17 + ifneq ($(BUILD_LANGTOOLS), true) 2.18 + GENERATE_DOCS=false 2.19 + endif 2.20 + ifneq ($(BUILD_CORBA), true) 2.21 + GENERATE_DOCS=false 2.22 + endif 2.23 + ifneq ($(BUILD_JAXP), true) 2.24 + GENERATE_DOCS=false 2.25 + endif 2.26 + ifneq ($(BUILD_JAXWS), true) 2.27 + GENERATE_DOCS=false 2.28 + endif 2.29 + ifeq ($(GENERATE_DOCS),false) 2.30 + NO_DOCS=true 2.31 + endif 2.32 +else 2.33 + GENERATE_DOCS=false 2.34 +endif 2.35 + 2.36 # Output directory for hotspot build 2.37 HOTSPOT_DIR = $(ABS_OUTPUTDIR)/hotspot 2.38
3.1 --- a/make/jdk-rules.gmk Thu Nov 12 15:35:34 2009 -0800 3.2 +++ b/make/jdk-rules.gmk Mon Nov 23 19:55:20 2009 -0800 3.3 @@ -30,43 +30,20 @@ 3.4 JDK_JAVA_EXE = $(OUTPUTDIR)/bin/java$(EXE_SUFFIX) 3.5 3.6 # NO_IMAGES may be set in conjunction with DEV_ONLY 3.7 -ifdef NO_IMAGES 3.8 - IMAGES_TARGET = 3.9 -else 3.10 - IMAGES_TARGET = images 3.11 +IMAGES_TARGET = images 3.12 +ifdef DEV_ONLY 3.13 + ifdef NO_IMAGES 3.14 + IMAGES_TARGET = 3.15 + endif 3.16 endif 3.17 3.18 -# No DOCS build when JDK_UPDATE_VERSION set 3.19 -ifdef JDK_UPDATE_VERSION 3.20 - DOCS_TARGET = 3.21 -else 3.22 - DOCS_TARGET = docs 3.23 -endif 3.24 - 3.25 -# NO_DOCS may be set in conjunction with DEV_ONLY 3.26 -ifdef NO_DOCS 3.27 +# GENERATE_DOCS determines if we ask for the docs target 3.28 +DOCS_TARGET = docs 3.29 +ifeq ($(GENERATE_DOCS),false) 3.30 DOCS_TARGET = 3.31 endif 3.32 - 3.33 -# If langtools not being built, full jdk javadoc is not possible 3.34 -ifneq ($(BUILD_LANGTOOLS), true) 3.35 - DOCS_TARGET = 3.36 -endif 3.37 -ifneq ($(BUILD_CORBA), true) 3.38 - DOCS_TARGET = 3.39 -endif 3.40 -ifneq ($(BUILD_JAXP), true) 3.41 - DOCS_TARGET = 3.42 -endif 3.43 -ifneq ($(BUILD_JAXWS), true) 3.44 - DOCS_TARGET = 3.45 -endif 3.46 - 3.47 -ifndef DEV_ONLY 3.48 - JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) images 3.49 -else 3.50 - JDK_BUILD_TARGETS = sanity all $(IMAGES_TARGET) 3.51 -endif 3.52 + 3.53 +JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) $(IMAGES_TARGET) 3.54 3.55 JDK_CLOBBER_TARGETS = clobber 3.56
4.1 --- a/make/sanity-rules.gmk Thu Nov 12 15:35:34 2009 -0800 4.2 +++ b/make/sanity-rules.gmk Mon Nov 23 19:55:20 2009 -0800 4.3 @@ -204,13 +204,9 @@ 4.4 "" >> $(WARNING_FILE) 4.5 endif 4.6 endif 4.7 -ifndef OPENJDK 4.8 - ifdef NO_DOCS 4.9 - @$(ECHO) "WARNING: Your build environment has the variable NO_DOCS\n" \ 4.10 - " defined. This will result in a development-only\n" \ 4.11 - " build of the JDK, lacking the documentation.\n" \ 4.12 +ifeq ($(GENERATE_DOCS),false) 4.13 + @$(ECHO) "WARNING: This build does not include running javadoc.\n" \ 4.14 "" >> $(WARNING_FILE) 4.15 - endif 4.16 endif 4.17 ifdef NO_IMAGES 4.18 @$(ECHO) "WARNING: Your build environment has the variable NO_IMAGES\n" \ 4.19 @@ -355,4 +351,4 @@ 4.20 .PHONY: sanity settings pre-sanity insane \ 4.21 post-sanity post-sanity-hotspot post-sanity-jdk \ 4.22 post-sanity-install post-sanity-deploy \ 4.23 - alt_bootdir bootdir 4.24 + alt_bootdir bootdir environment
