--- a/Makefile Mon Mar 23 11:44:40 2015 -0700
+++ b/Makefile Thu Mar 26 16:17:30 2015 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, 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,200 +23,42 @@
# questions.
#
-# This must be the first rule
-default:
+###
+### This file is just a very small wrapper needed to run the real make/Init.gmk.
+### It also performs some sanity checks on make.
+###
-# 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:
+# 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
-# 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
+# The .FEATURES variable is likely to be unique for GNU Make.
+ifeq ($(.FEATURES), )
+ $(info Error: '$(MAKE)' does not seem to be GNU Make, which is a requirement.)
+ $(info Check your path, or upgrade to GNU Make 3.81 or newer.)
+ $(error Cannot continue)
+endif
-# Assume we have GNU make, but check version.
+# 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.)
+ $(info Error: This version of GNU Make is too low ($(MAKE_VERSION)).)
+ $(info Check your path, or upgrade to GNU Make 3.81 or newer.)
+ $(error Cannot continue)
+endif
+
+# In Cygwin, the MAKE variable gets prepended with the current directory if the
+# make executable is called using a Windows mixed path (c:/cygwin/bin/make.exe).
+ifneq ($(findstring :, $(MAKE)), )
+ MAKE := $(patsubst $(CURDIR)%, %, $(patsubst $(CURDIR)/%, %, $(MAKE)))
endif
# Locate this Makefile
-ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
- makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
+ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))),)
+ makefile_path := $(CURDIR)/$(strip $(lastword $(MAKEFILE_LIST)))
else
- makefile_path:=$(lastword $(MAKEFILE_LIST))
-endif
-root_dir:=$(patsubst %/,%,$(dir $(makefile_path)))
-
-ifeq ($(MAIN_TARGETS), )
- COMMAND_LINE_VARIABLES:=$(subst =command,,$(filter %=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var))))))
- MAKE_CONTROL_VARIABLES:=LOG CONF SPEC JOBS TEST IGNORE_OLD_CONFIG
- UNKNOWN_COMMAND_LINE_VARIABLES:=$(strip $(filter-out $(MAKE_CONTROL_VARIABLES), $(COMMAND_LINE_VARIABLES)))
- ifneq ($(UNKNOWN_COMMAND_LINE_VARIABLES), )
- $(info Note: Command line contains non-control variables: $(UNKNOWN_COMMAND_LINE_VARIABLES).)
- $(info Make sure it is not mistyped, and that you intend to override this variable.)
- $(info 'make help' will list known control variables)
- endif
-endif
-
-ifneq ($(findstring qp,$(MAKEFLAGS)),)
- # When called with -qp, assume an external part (e.g. bash completion) is trying
- # to understand our targets.
- # Duplication of global targets, needed before ParseConfAndSpec in case we have
- # no configurations.
- help:
- # If both CONF and SPEC are unset, look for all available configurations by
- # setting CONF to the empty string.
- ifeq ($(SPEC), )
- CONF?=
- endif
+ makefile_path := $(lastword $(MAKEFILE_LIST))
endif
-
-# ... and then we can include our helper functions
-include $(root_dir)/make/MakeHelpers.gmk
-
-$(eval $(call ParseLogLevel))
-$(eval $(call ParseConfAndSpec))
-
-# 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
- # In Cygwin, the MAKE variable gets messed up if the make executable is called with
- # a Windows mixed path (c:/cygwin/bin/make.exe). If that's the case, fix it by removing
- # the prepended root_dir.
- ifneq ($(findstring :, $(MAKE)), )
- MAKE := $(patsubst $(root_dir)%, %, $(MAKE))
- endif
-
- # We are potentially 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 := $(sort $(filter-out $(global_targets), $(strip $(shell \
- cd $(root_dir)/make && $(MAKE) -f Main.gmk -p -q FRC SPEC=$(firstword $(SPEC)) \
- -I $(root_dir)/make/common | grep "^.PHONY:" | head -n 1 | cut -d " " -f 2-))))
-
- # Loop through the configurations and call the main-wrapper for each one. The wrapper
- # target will execute with a single configuration loaded.
- $(all_phony_targets):
- @$(if $(TARGET_RUN),,\
- $(foreach spec,$(SPEC),\
- (cd $(root_dir) && $(MAKE) SPEC=$(spec) MAIN_TARGETS="$(call GetRealTarget)" \
- $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) main-wrapper) &&) true)
- @echo > /dev/null
- $(eval TARGET_RUN=true)
-
- .PHONY: $(all_phony_targets)
-
- ifneq ($(MAIN_TARGETS), )
- # The wrapper target was called so we now have a single configuration. Load the spec file
- # and call the real Main.gmk.
- include $(SPEC)
- include $(SRC_ROOT)/make/common/MakeBase.gmk
+topdir := $(strip $(patsubst %/, %, $(dir $(makefile_path))))
- ### Clean up from previous run
- # Remove any build.log from a previous run, if they exist
- ifneq (,$(BUILD_LOG))
- ifneq (,$(BUILD_LOG_PREVIOUS))
- # Rotate old log
- $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
- $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
- else
- $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
- endif
- $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
- endif
- # Remove any javac server logs and port files. This
- # prevents a new make run to reuse the previous servers.
- ifneq (,$(SJAVAC_SERVER_DIR))
- $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
- endif
-
- # Split out the targets requiring sequential execution. Run these targets separately
- # from the rest so that the rest may still enjoy full parallel execution.
- SEQUENTIAL_TARGETS := $(filter dist-clean clean% reconfigure, $(MAIN_TARGETS))
- PARALLEL_TARGETS := $(filter-out $(SEQUENTIAL_TARGETS), $(MAIN_TARGETS))
-
- main-wrapper:
- ifneq ($(SEQUENTIAL_TARGETS), )
- (cd $(SRC_ROOT)/make && $(MAKE) -f Main.gmk SPEC=$(SPEC) -j 1 \
- $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $(SEQUENTIAL_TARGETS))
- endif
- ifneq ($(PARALLEL_TARGETS), )
- @$(call AtMakeStart)
- (cd $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) -f Main.gmk SPEC=$(SPEC) -j $(JOBS) \
- $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $(PARALLEL_TARGETS) \
- $(if $(filter true, $(OUTPUT_SYNC_SUPPORTED)), -O$(OUTPUT_SYNC)))
- @$(call AtMakeEnd)
- endif
-
- .PHONY: main-wrapper
-
- endif
-endif
-
-# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
-# If you add more global targets, please update the variable global_targets in MakeHelpers.
-
-# Helper macro to allow $(info) to properly print strings beginning with spaces.
-_:=
-
-help:
- $(info )
- $(info OpenJDK Makefile help)
- $(info =====================)
- $(info )
- $(info Common make targets)
- $(info $(_) make [default] # Compile all modules in langtools, hotspot, jdk, jaxws,)
- $(info $(_) # jaxp and corba, and create a runnable "exploded" image)
- $(info $(_) make all # Compile everything, all repos, docs and images)
- $(info $(_) make images # Create complete j2sdk and j2re images)
- $(info $(_) make <phase> # Build the specified phase and everything it depends on)
- $(info $(_) # (gensrc, java, copy, libs, launchers, gendata, rmic))
- $(info $(_) make *-only # Applies to most targets and disables compling the)
- $(info $(_) # dependencies for the target. This is faster but may)
- $(info $(_) # result in incorrect build results!)
- $(info $(_) make docs # Create all docs)
- $(info $(_) make docs-javadoc # Create just javadocs, depends on less than full docs)
- $(info $(_) make profiles # Create complete j2re compact profile images)
- $(info $(_) make bootcycle-images # Build images twice, second time with newly built JDK)
- $(info $(_) make install # Install the generated images locally)
- $(info $(_) make reconfigure # Rerun configure with the same arguments as last time)
- $(info $(_) make help # Give some help on using make)
- $(info $(_) make test # Run tests, default is all tests (see TEST below))
- $(info )
- $(info Targets for cleaning)
- $(info $(_) make clean # Remove all files generated by make, but not those)
- $(info $(_) # generated by configure)
- $(info $(_) make dist-clean # Remove all files, including configuration)
- $(info $(_) make clean-<outputdir> # Remove the subdir in the output dir with the name)
- $(info $(_) make clean-<phase> # Remove all build results related to a certain build)
- $(info $(_) # phase (gensrc, java, libs, launchers))
- $(info $(_) make clean-<module> # Remove all build results related to a certain module)
- $(info $(_) make clean-<module>-<phase> # Remove all build results related to a certain)
- $(info $(_) # module and phase)
- $(info )
- $(info Targets for specific modules)
- $(info $(_) make <module> # Build <module> and everything it depends on.)
- $(info $(_) make <module>-<phase> # Compile the specified phase for the specified module)
- $(info $(_) # and everything it depends on)
- $(info $(_) # (gensrc, java, copy, libs, launchers, gendata, rmic))
- $(info )
- $(info Make control variables)
- $(info $(_) CONF= # Build all configurations (note, assignment is empty))
- $(info $(_) CONF=<substring> # Build the configuration(s) with a name matching)
- $(info $(_) # <substring>)
- $(info $(_) SPEC=<spec file> # Build the configuration given by the spec file)
- $(info $(_) LOG=<loglevel> # Change the log level from warn to <loglevel>)
- $(info $(_) # Available log levels are:)
- $(info $(_) # 'warn' (default), 'info', 'debug' and 'trace')
- $(info $(_) # To see executed command lines, use LOG=debug)
- $(info $(_) JOBS=<n> # Run <n> parallel make jobs)
- $(info $(_) # Note that -jN does not work as expected!)
- $(info $(_) IGNORE_OLD_CONFIG=true # Skip tests if spec file is up to date)
- $(info $(_) make test TEST=<test> # Only run the given test or tests, e.g.)
- $(info $(_) # make test TEST="jdk_lang jdk_net")
- $(info )
-
-.PHONY: help
+# ... and then we can include the real makefile
+include $(topdir)/make/Init.gmk