Merge
This commit is contained in:
Tim Bell
commit
3e9fb87cf0
12
Makefile
12
Makefile
@ -51,7 +51,7 @@ endif
|
||||
|
||||
# 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 @@ FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME)/j2sdk-image
|
||||
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_product_bootdir: FRC
|
||||
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_debug_bootdir: FRC
|
||||
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 @@ generic_debug_build:
|
||||
$(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 @@ openjdk_build:
|
||||
$(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) \
|
||||
|
||||
@ -227,6 +227,35 @@ ifndef SKIP_FASTDEBUG_BUILD
|
||||
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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -204,13 +204,9 @@ ifeq ($(SPONSORS_SRC_AVAILABLE), true)
|
||||
"" >> $(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 @@ endif
|
||||
.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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user