diff -r 96c027ed69dc -r d42a72ca524d Makefile --- a/Makefile Tue Dec 03 10:46:44 2013 -0800 +++ b/Makefile Wed Jul 05 19:24:32 2017 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,549 +23,112 @@ # questions. # -# If NEWBUILD is defined, use the new build-infra Makefiles and configure. -# See NewMakefile.gmk for more information. - -# If not specified, select what the default build is -ifndef NEWBUILD - NEWBUILD=true -endif - -ifeq ($(NEWBUILD),true) - - # The new top level Makefile - include NewMakefile.gmk - -else # Original Makefile logic - -BUILD_PARENT_DIRECTORY=. +# This must be the first rule +default: -# Basename of any originally supplied ALT_OUTPUTDIR directory -ifndef ORIG_OUTPUTDIR_BASENAME - ifdef ALT_OUTPUTDIR - ORIG_OUTPUTDIR_BASENAME := $(shell basename $(ALT_OUTPUTDIR)) - else - ORIG_OUTPUTDIR_BASENAME = $(PLATFORM)-$(ARCH) - endif -endif -export ORIG_OUTPUTDIR_BASENAME - -# The three possible directories created for output (3 build flavors) -OUTPUTDIR_BASENAME- = $(ORIG_OUTPUTDIR_BASENAME) -OUTPUTDIR_BASENAME-debug = $(ORIG_OUTPUTDIR_BASENAME)-debug -OUTPUTDIR_BASENAME-fastdebug = $(ORIG_OUTPUTDIR_BASENAME)-fastdebug - -# Relative path to a debug output area -REL_JDK_OUTPUTDIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME)) - -# The created jdk image directory -JDK_IMAGE_DIRNAME = j2sdk-image -JDK_IMAGE_DIR = $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME) -ABS_JDK_IMAGE_DIR = $(ABS_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME) +# Inclusion of this pseudo-target will cause make to execute this file +# serially, regardless of -j. Recursively called makefiles will not be +# affected, however. This is required for correct dependency management. +.NOTPARALLEL: -# Relative path from an output directory to the image directory -REL_JDK_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME))/$(JDK_IMAGE_DIRNAME) -REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME) -REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME) - -ifndef TOPDIR - TOPDIR:=. -endif - -ifndef JDK_TOPDIR - JDK_TOPDIR=$(TOPDIR)/jdk -endif -ifndef JDK_MAKE_SHARED_DIR - JDK_MAKE_SHARED_DIR=$(JDK_TOPDIR)/make/common/shared -endif - -default: all +# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make. +# /usr/ccs/bin/make lacks basically every other flow control mechanism. +TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1 -include $(JDK_MAKE_SHARED_DIR)/Defs-control.gmk -include ./make/Defs-internal.gmk -include ./make/sanity-rules.gmk -include ./make/hotspot-rules.gmk -include ./make/langtools-rules.gmk -include ./make/corba-rules.gmk -include ./make/jaxp-rules.gmk -include ./make/jaxws-rules.gmk -include ./make/jdk-rules.gmk -include ./make/nashorn-rules.gmk -include ./make/install-rules.gmk -include ./make/sponsors-rules.gmk -include ./make/deploy-rules.gmk - -all:: sanity - -ifeq ($(SKIP_FASTDEBUG_BUILD), false) - all:: fastdebug_build -endif - -ifeq ($(SKIP_DEBUG_BUILD), false) - all:: debug_build +# Assume we have GNU make, but check version. +ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), ) + $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.) endif -all:: all_product_build - -all_product_build:: - -# Everything for a full product build -ifeq ($(SKIP_PRODUCT_BUILD), false) - - all_product_build:: product_build - - ifeq ($(BUILD_INSTALL), true) - all_product_build:: $(INSTALL) - clobber:: install-clobber - endif - - ifeq ($(BUILD_SPONSORS), true) - all_product_build:: $(SPONSORS) - clobber:: sponsors-clobber - endif - - ifneq ($(SKIP_COMPARE_IMAGES), true) - all_product_build:: compare-image - endif - -endif - -define StartTimer - $(MKDIR) -p $(BUILDTIMESDIR) - $(RM) $(BUILDTIMESDIR)/build_time_* - $(call RecordStartTime,TOTAL) -endef - -define StopTimer - $(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,TOTAL) && $(call ReportBuildTimes,$1),) -endef - -# Generic build of basic repo series -generic_build_repo_series:: $(SOURCE_TIPS) - $(MKDIR) -p $(JDK_IMAGE_DIR) - @$(call StartTimer) - -ifeq ($(BUILD_LANGTOOLS), true) - generic_build_repo_series:: langtools - clobber:: langtools-clobber -endif - -ifeq ($(BUILD_CORBA), true) - generic_build_repo_series:: corba - clobber:: corba-clobber -endif - -ifeq ($(BUILD_JAXP), true) - generic_build_repo_series:: jaxp - clobber:: jaxp-clobber -endif - -ifeq ($(BUILD_JAXWS), true) - generic_build_repo_series:: jaxws - clobber:: jaxws-clobber -endif - -ifeq ($(BUILD_HOTSPOT), true) - generic_build_repo_series:: $(HOTSPOT) - clobber:: hotspot-clobber +# Locate this Makefile +ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) + makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) +else + makefile_path:=$(lastword $(MAKEFILE_LIST)) endif - -ifeq ($(BUILD_JDK), true) - generic_build_repo_series:: $(JDK_JAVA_EXE) - clobber:: jdk-clobber -endif +root_dir:=$(dir $(makefile_path)) -ifeq ($(BUILD_NASHORN), true) - generic_build_repo_series:: $(NASHORN) - clobber:: nashorn-clobber -endif +# ... and then we can include our helper functions +include $(root_dir)/make/MakeHelpers.gmk -ifeq ($(BUILD_DEPLOY), true) - generic_build_repo_series:: $(DEPLOY) - clobber:: deploy-clobber -endif - -generic_build_repo_series:: - @$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build)) +$(eval $(call ParseLogLevel)) +$(eval $(call ParseConfAndSpec)) -# The debug build, fastdebug or debug. Needs special handling. -# Note that debug builds do NOT do INSTALL steps, but must be done -# after the product build and before the INSTALL step of the product build. -# -# DEBUG_NAME is fastdebug or debug -# ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix -# The resulting image directory (j2sdk-image) is used by the install makefiles -# to create a debug install bundle jdk-*-debug-** bundle (tar or zip) -# which will install in the debug or fastdebug subdirectory of the -# normal product install area. -# The install process needs to know what the DEBUG_NAME is, so -# look for INSTALL_DEBUG_NAME in the install rules. -# -# NOTE: On windows, do not use $(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME). -# Due to the use of short paths in $(ABS_OUTPUTDIR), this may -# not be the same location. -# +# Now determine if we have zero, one or several configurations to build. +ifeq ($(SPEC),) + # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing. +else + ifeq ($(words $(SPEC)),1) + # We are building a single configuration. This is the normal case. Execute the Main.gmk file. + include $(root_dir)/make/Main.gmk + else + # We are building multiple configurations. + # First, find out the valid targets + # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find + # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. + all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \ + $(MAKE) -p -q -f make/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \ + grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) -# Location of fresh bootdir output -ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk -FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME) -FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(REL_JDK_IMAGE_DIR) - -create_fresh_product_bootdir: FRC - $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ - GENERATE_DOCS=false \ - BOOT_CYCLE_SETTINGS= \ - build_product_image + $(all_phony_targets): + @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \ + $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true -create_fresh_debug_bootdir: FRC - $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ - GENERATE_DOCS=false \ - BOOT_CYCLE_DEBUG_SETTINGS= \ - build_debug_image + .PHONY: $(all_phony_targets) -create_fresh_fastdebug_bootdir: FRC - $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ - GENERATE_DOCS=false \ - BOOT_CYCLE_DEBUG_SETTINGS= \ - build_fastdebug_image - -# Create boot image? -ifeq ($(SKIP_BOOT_CYCLE),false) - ifneq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64) - DO_BOOT_CYCLE=true endif endif - - -ifeq ($(DO_BOOT_CYCLE),true) - - # Create the bootdir to use in the build - product_build:: create_fresh_product_bootdir - debug_build:: create_fresh_debug_bootdir - fastdebug_build:: create_fresh_fastdebug_bootdir - - # Define variables to be used now for the boot jdk - BOOT_CYCLE_SETTINGS= \ - ALT_BOOTDIR=$(FRESH_BOOTDIR) \ - ALT_JDK_IMPORT_PATH=$(FRESH_BOOTDIR) - BOOT_CYCLE_DEBUG_SETTINGS= \ - ALT_BOOTDIR=$(FRESH_DEBUG_BOOTDIR) \ - ALT_JDK_IMPORT_PATH=$(FRESH_DEBUG_BOOTDIR) - -else - - # Use the supplied ALT_BOOTDIR as the boot - BOOT_CYCLE_SETTINGS= - BOOT_CYCLE_DEBUG_SETTINGS= - -endif - -build_product_image: - $(MAKE) \ - SKIP_FASTDEBUG_BUILD=true \ - SKIP_DEBUG_BUILD=true \ - $(BOOT_CYCLE_SETTINGS) \ - generic_build_repo_series - -# NOTE: On windows, do not use $(ABS_OUTPUTDIR)-$(DEBUG_NAME). -# Due to the use of short paths in $(ABS_OUTPUTDIR), this may -# not be the same location. - -generic_debug_build: - $(MAKE) \ - ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \ - DEBUG_NAME=$(DEBUG_NAME) \ - GENERATE_DOCS=false \ - $(BOOT_CYCLE_DEBUG_SETTINGS) \ - generic_build_repo_series - -build_debug_image: - $(MAKE) DEBUG_NAME=debug generic_debug_build - -build_fastdebug_image: - $(MAKE) DEBUG_NAME=fastdebug generic_debug_build - -# Build final image -product_build:: build_product_image -debug_build:: build_debug_image -fastdebug_build:: build_fastdebug_image - -# The source tips are stored with the relative path to the repo. -# This file will be used when constructing the jdk image. -source_tips: $(SOURCE_TIPS) - $(CAT) $< -$(SOURCE_TIPS): FRC - @$(prep-target) - @$(call GetSourceTips) - -clobber:: REPORT_BUILD_TIMES= -clobber:: - $(RM) -r $(OUTPUTDIR)/* - -($(RMDIR) -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1; $(TRUE)) - -clean: clobber - -# -# Dev builds -# - -dev : dev-build +# Include this after a potential spec file has been included so that the bundles target +# has access to the spec variables. +include $(root_dir)/make/Jprt.gmk -dev-build: - $(MAKE) DEV_ONLY=true all -dev-sanity: - $(MAKE) DEV_ONLY=true sanity -dev-clobber: - $(MAKE) DEV_ONLY=true clobber - -# -# Quick jdk verification build -# -jdk_only: - $(MAKE) SKIP_FASTDEBUG_BUILD=true BUILD_HOTSPOT=false all - - -# -# Quick jdk verification fastdebug build -# -jdk_fastdebug_only: - $(MAKE) DEBUG_NAME=fastdebug BUILD_HOTSPOT=false BUILD_DEPLOY=false \ - BUILD_INSTALL=false BUILD_SPONSORS=false generic_debug_build - -# -# Quick deploy verification fastdebug build -# -deploy_fastdebug_only: - $(MAKE) \ - DEBUG_NAME=fastdebug \ - BUILD_HOTSPOT=false \ - BUILD_JDK=false \ - BUILD_LANGTOOLS=false \ - BUILD_NASHORN=false \ - BUILD_CORBA=false \ - BUILD_JAXP=false \ - BUILD_JAXWS=false \ - BUILD_INSTALL=false \ - BUILD_SPONSORS=false \ - generic_debug_build - -# -# Product build (skip debug builds) -# -product_only: - $(MAKE) SKIP_FASTDEBUG_BUILD=true all - -# -# Check target -# - -check: variable_check - -# -# Help target -# -help: intro_help target_help variable_help notes_help examples_help - -# Intro help message -intro_help: - @$(ECHO) "\ -Makefile for the JDK builds (all the JDK). \n\ -" - -# Target help -target_help: - @$(ECHO) "\ ---- Common Targets --- \n\ -all -- build the core JDK (default target) \n\ -help -- Print out help information \n\ -check -- Check make variable values for correctness \n\ -sanity -- Perform detailed sanity checks on system and settings \n\ -fastdebug_build -- build the core JDK in 'fastdebug' mode (-g -O) \n\ -debug_build -- build the core JDK in 'debug' mode (-g) \n\ -clean -- remove all built and imported files \n\ -clobber -- same as clean \n\ -" - -# Variable help (only common ones used by this Makefile) -variable_help: variable_help_intro variable_list variable_help_end -variable_help_intro: - @$(ECHO) "--- Common Variables ---" -variable_help_end: - @$(ECHO) " " +# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration. +# If you addd more global targets, please update the variable global_targets in MakeHelpers. -# One line descriptions for the variables -OUTPUTDIR.desc = Output directory -PARALLEL_COMPILE_JOBS.desc = Solaris/Linux parallel compile run count -SLASH_JAVA.desc = Root of all build tools, e.g. /java or J: -BOOTDIR.desc = JDK used to boot the build -JDK_IMPORT_PATH.desc = JDK used to import components of the build -COMPILER_PATH.desc = Compiler install directory -CACERTS_FILE.desc = Location of certificates file -DEVTOOLS_PATH.desc = Directory containing zip and gnumake -CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files - -# Make variables to print out (description and value) -VARIABLE_PRINTVAL_LIST += \ - OUTPUTDIR \ - PARALLEL_COMPILE_JOBS \ - SLASH_JAVA \ - BOOTDIR \ - JDK_IMPORT_PATH \ - COMPILER_PATH \ - CACERTS_FILE \ - DEVTOOLS_PATH - -# Make variables that should refer to directories that exist -VARIABLE_CHECKDIR_LIST += \ - SLASH_JAVA \ - BOOTDIR \ - JDK_IMPORT_PATH \ - COMPILER_PATH \ - DEVTOOLS_PATH - -# Make variables that should refer to files that exist -VARIABLE_CHECKFIL_LIST += \ - CACERTS_FILE - -# For pattern rules below, so all are treated the same -DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval) -DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir) -DO_CHECKFIL_LIST=$(VARIABLE_CHECKFIL_LIST:%=%.checkfil) - -# Complete variable check -variable_check: $(DO_CHECKDIR_LIST) $(DO_CHECKFIL_LIST) -variable_list: $(DO_PRINTVAL_LIST) variable_check - -# Pattern rule for printing out a variable -%.printval: - @$(ECHO) " ALT_$* - $($*.desc)" - @$(ECHO) " \t $*=$($*)" - -# Pattern rule for checking to see if a variable with a directory exists -%.checkdir: - @if [ ! -d $($*) ] ; then \ - $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \ - fi - -# Pattern rule for checking to see if a variable with a file exists -%.checkfil: - @if [ ! -f $($*) ] ; then \ - $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \ - fi - -# Misc notes on help -notes_help: - @$(ECHO) "\ ---- Notes --- \n\ -- All builds use same output directory unless overridden with \n\ - \t ALT_OUTPUTDIR=