8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
Reviewed-by: ohair, tbell
This commit is contained in:
Erik Joelsson
parent
9268fe1857
commit
8ae1606066
346
NewMakefile.gmk
346
NewMakefile.gmk
@ -23,273 +23,107 @@
|
|||||||
# questions.
|
# questions.
|
||||||
#
|
#
|
||||||
|
|
||||||
# Utilities used in this Makefile
|
# This must be the first rule
|
||||||
BASENAME=basename
|
default:
|
||||||
CAT=cat
|
|
||||||
CD=cd
|
# Inclusion of this pseudo-target will cause make to execute this file
|
||||||
CMP=cmp
|
# serially, regardless of -j. Recursively called makefiles will not be
|
||||||
CP=cp
|
# affected, however. This is required for correct dependency management.
|
||||||
ECHO=echo
|
.NOTPARALLEL:
|
||||||
MKDIR=mkdir
|
|
||||||
PRINTF=printf
|
# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
|
||||||
PWD=pwd
|
# /usr/ccs/bin/make lacks basically every other flow control mechanism.
|
||||||
TAR=tar
|
TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
|
||||||
ifeq ($(PLATFORM),windows)
|
|
||||||
ZIP=zip
|
# Assume we have GNU make, but check version.
|
||||||
|
ifeq (,$(findstring 3.81,$(MAKE_VERSION)))
|
||||||
|
ifeq (,$(findstring 3.82,$(MAKE_VERSION)))
|
||||||
|
$(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Locate this Makefile
|
||||||
|
ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
|
||||||
|
makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
|
||||||
else
|
else
|
||||||
# store symbolic links as the link
|
makefile_path:=$(lastword $(MAKEFILE_LIST))
|
||||||
ZIP=zip -y
|
|
||||||
endif
|
endif
|
||||||
# Insure we have a path that looks like it came from pwd
|
root_dir:=$(dir $(makefile_path))
|
||||||
# (This is mostly for Windows sake and drive letters)
|
|
||||||
define UnixPath # path
|
|
||||||
$(shell (cd "$1" && $(PWD)))
|
|
||||||
endef
|
|
||||||
|
|
||||||
# Current root directory
|
include $(root_dir)/common/makefiles/Jprt.gmk
|
||||||
CURRENT_DIRECTORY := $(shell $(PWD))
|
|
||||||
|
|
||||||
# Build directory root
|
# ... and then we can include our helper functions
|
||||||
BUILD_DIR_ROOT = $(CURRENT_DIRECTORY)/build
|
include $(root_dir)/common/makefiles/MakeHelpers.gmk
|
||||||
|
|
||||||
# All configured Makefiles to run
|
$(eval $(call ParseLogLevel))
|
||||||
ALL_MAKEFILES = $(wildcard $(BUILD_DIR_ROOT)/*-*/Makefile)
|
$(eval $(call ParseConfAndSpec))
|
||||||
|
|
||||||
# All bundles to create
|
# Now determine if we have zero, one or several configurations to build.
|
||||||
ALL_IMAGE_DIRS = $(wildcard $(BUILD_DIR_ROOT)/*-*/images/*-image)
|
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)/common/makefiles/Main.gmk
|
||||||
|
else
|
||||||
|
# We are building multiple configurations.
|
||||||
|
# First, find out the valid targets
|
||||||
|
# Run the makefile with an arbitraty 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), $(strip $(shell \
|
||||||
|
$(MAKE) -p -q -f common/makefiles SPEC=$(firstword $(SPEC)) | \
|
||||||
|
grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
|
||||||
|
|
||||||
# Build all the standard 'all', 'images', and 'clean' targets
|
$(all_phony_targets):
|
||||||
all images clean: checks
|
@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true
|
||||||
@if [ "$(ALL_MAKEFILES)" = "" ] ; then \
|
|
||||||
$(ECHO) "ERROR: No configurations to build"; exit 1; \
|
|
||||||
fi
|
|
||||||
@for bdir in $(dir $(ALL_MAKEFILES)) ; do \
|
|
||||||
$(ECHO) "$(CD) $${bdir} && $(MAKE) $@" ; \
|
|
||||||
$(CD) $${bdir} && $(MAKE) $@ ; \
|
|
||||||
done
|
|
||||||
|
|
||||||
# TBD: Deploy input
|
|
||||||
$(BUILD_DIR_ROOT)/.deploy_input:
|
|
||||||
@if [ "$(ALL_MAKEFILES)" = "" ] ; then \
|
|
||||||
$(ECHO) "ERROR: No configurations to build"; exit 1; \
|
|
||||||
fi
|
|
||||||
@for bdir in $(dir $(ALL_MAKEFILES)) ; do \
|
|
||||||
if [ deploy/make/Makefile ] ; then \
|
|
||||||
echo "Attempting deploy build." ; \
|
|
||||||
( \
|
|
||||||
$(RM) -r $${bdir}/deploy_input ; \
|
|
||||||
$(MKDIR) -p $${bdir}/deploy_input ; \
|
|
||||||
( $(CD) $${bdir}/images && $(TAR) -cf - j2sdk-image j2re-image ) \
|
|
||||||
| ( $(CD) $${bdir}/deploy_input && $(TAR) -xf - ) ; \
|
|
||||||
) ; \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
# TBD: Deploy images
|
|
||||||
deploy: $(BUILD_DIR_ROOT)/.deploy_input
|
|
||||||
@if [ "$(ALL_MAKEFILES)" = "" ] ; then \
|
|
||||||
$(ECHO) "ERROR: No configurations to build"; exit 1; \
|
|
||||||
fi
|
|
||||||
@for bdir in $(dir $(ALL_MAKEFILES)) ; do \
|
|
||||||
if [ deploy/make/Makefile ] ; then \
|
|
||||||
echo "Attempting deploy build." ; \
|
|
||||||
( \
|
|
||||||
$(CD) deploy/make && \
|
|
||||||
$(MAKE) \
|
|
||||||
ABS_OUTPUTDIR=$${bdir}/deploy_input \
|
|
||||||
OUTPUTDIR=$${bdir}/deploy_input \
|
|
||||||
) ; \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
|
|
||||||
# TBD: Install bundles
|
|
||||||
install:
|
|
||||||
|
|
||||||
# Bundle creation
|
|
||||||
bundles:
|
|
||||||
@if [ "$(ALL_IMAGE_DIRS)" = "" ] ; then \
|
|
||||||
$(ECHO) "ERROR: No images to bundle"; exit 1; \
|
|
||||||
fi
|
|
||||||
@for i in $(ALL_IMAGE_DIRS) ; do \
|
|
||||||
$(MKDIR) -p $${i}/../../bundles && \
|
|
||||||
$(RM) $${i}/../../bundles/`$(BASENAME) $${i}`.zip && \
|
|
||||||
$(ECHO) "$(CD) $${i} && $(ZIP) -q -r ../../bundles/`$(BASENAME) $${i}`.zip ." && \
|
|
||||||
$(CD) $${i} && $(ZIP) -q -r ../../bundles/`$(BASENAME) $${i}`.zip . ; \
|
|
||||||
done
|
|
||||||
|
|
||||||
# Clobber all the built files
|
|
||||||
clobber::
|
|
||||||
$(RM) -r $(BUILD_DIR_ROOT)
|
|
||||||
|
|
||||||
# Make various checks to insure the build will be successful
|
|
||||||
# Possibilities:
|
|
||||||
# * Check that if any closed repo is provided, they all must be.
|
|
||||||
# * Check that all open repos exist, at least until we are ready for some
|
|
||||||
# kind of partial build.
|
|
||||||
checks:
|
|
||||||
@$(ECHO) "No checks yet"
|
|
||||||
|
|
||||||
# Keep track of user targets
|
|
||||||
USER_TARGETS += all deploy install images clean clobber checks
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# To help in adoption of the new configure&&make build process, a bridge
|
|
||||||
# build will use the old settings to run configure and do the build.
|
|
||||||
|
|
||||||
# Build with the configure bridge
|
|
||||||
bridgeBuild: bridge2configure images
|
|
||||||
|
|
||||||
# Bridge from old Makefile ALT settings to configure options
|
|
||||||
bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts
|
|
||||||
bash ./configure $(strip $(shell $(CAT) $<))
|
|
||||||
|
|
||||||
# Create a file with configure options created from old Makefile mechanisms.
|
|
||||||
$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest
|
|
||||||
$(RM) $@
|
|
||||||
$(CP) $< $@
|
|
||||||
|
|
||||||
# Use this file to only change when obvious things have changed
|
|
||||||
$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC
|
|
||||||
$(RM) $@.tmp
|
|
||||||
$(MKDIR) -p $(BUILD_DIR_ROOT)
|
|
||||||
@$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
|
|
||||||
ifdef ARCH_DATA_MODEL
|
|
||||||
@$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
|
|
||||||
endif
|
endif
|
||||||
ifdef ALT_PARALLEL_COMPILE_JOBS
|
|
||||||
@$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
|
|
||||||
endif
|
|
||||||
ifdef ALT_BOOTDIR
|
|
||||||
@$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
|
|
||||||
endif
|
|
||||||
ifdef ALT_CUPS_HEADERS_PATH
|
|
||||||
@$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
|
|
||||||
endif
|
|
||||||
ifdef ALT_FREETYPE_HEADERS_PATH
|
|
||||||
@$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
|
|
||||||
endif
|
|
||||||
@if [ -f $@ ] ; then \
|
|
||||||
if ! $(CMP) $@ $@.tmp > /dev/null ; then \
|
|
||||||
$(CP) $@.tmp $@ ; \
|
|
||||||
fi ; \
|
|
||||||
else \
|
|
||||||
$(CP) $@.tmp $@ ; \
|
|
||||||
fi
|
|
||||||
$(RM) $@.tmp
|
|
||||||
|
|
||||||
# Clobber all the built files
|
|
||||||
clobber:: bridge2clobber
|
|
||||||
bridge2clobber::
|
|
||||||
$(RM) $(BUILD_DIR_ROOT)/.bridge2*
|
|
||||||
$(RM) $(BUILD_DIR_ROOT)/.deploy_input
|
|
||||||
|
|
||||||
# Keep track of phony targets
|
|
||||||
PHONY_LIST += bridge2configure bridgeBuild bridge2clobber
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# Sanity checks (history target)
|
|
||||||
#
|
|
||||||
|
|
||||||
sanity: checks
|
|
||||||
|
|
||||||
# Keep track of user targets
|
|
||||||
USER_TARGETS += sanity
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# Javadocs
|
|
||||||
#
|
|
||||||
|
|
||||||
javadocs:
|
|
||||||
cd common/makefiles && $(MAKE) -f MakefileJavadoc.gmk
|
|
||||||
|
|
||||||
# Keep track of user targets
|
|
||||||
USER_TARGETS += javadocs
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# JPRT targets
|
|
||||||
|
|
||||||
ifndef JPRT_ARCHIVE_BUNDLE
|
|
||||||
JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
jprt_build_product: DEBUG_LEVEL=release
|
# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
|
||||||
jprt_build_product: BUILD_DIRNAME=*-release
|
# If you addd more global targets, please update the variable global_targets in MakeHelpers.
|
||||||
jprt_build_product: jprt_build_generic
|
|
||||||
|
|
||||||
jprt_build_fastdebug: DEBUG_LEVEL=fastdebug
|
|
||||||
jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug
|
|
||||||
jprt_build_fastdebug: jprt_build_generic
|
|
||||||
|
|
||||||
jprt_build_debug: DEBUG_LEVEL=slowdebug
|
|
||||||
jprt_build_debug: BUILD_DIRNAME=*-debug
|
|
||||||
jprt_build_debug: jprt_build_generic
|
|
||||||
|
|
||||||
jprt_build_generic: $(JPRT_ARCHIVE_BUNDLE)
|
|
||||||
|
|
||||||
$(JPRT_ARCHIVE_BUNDLE): bridgeBuild bundles
|
|
||||||
$(MKDIR) -p $(@D)
|
|
||||||
$(RM) $@
|
|
||||||
$(CP) $(BUILD_DIR_ROOT)/$(BUILD_DIRNAME)/bundles/j2sdk-image.zip $@
|
|
||||||
|
|
||||||
# Keep track of phony targets
|
|
||||||
PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
|
|
||||||
jprt_build_generic
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# Help target
|
|
||||||
|
|
||||||
HELP_FORMAT=%12s%s\n
|
|
||||||
|
|
||||||
help:
|
help:
|
||||||
@$(PRINTF) "# JDK Makefile\n"
|
$(info )
|
||||||
@$(PRINTF) "#\n"
|
$(info OpenJDK Makefile help)
|
||||||
@$(PRINTF) "# Usage: make [Target]\n"
|
$(info =====================)
|
||||||
@$(PRINTF) "#\n"
|
$(info )
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "Target " "Description"
|
$(info Common make targets)
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "------ " "-----------"
|
$(info . make [default] # Compile all product in langtools, hotspot, jaxp, jaxws,)
|
||||||
@for i in $(USER_TARGETS) ; do \
|
$(info . # corba and jdk)
|
||||||
$(MAKE) help_$${i} ; \
|
$(info . make all # Compile everything, all repos and images)
|
||||||
done
|
$(info . make images # Create complete j2sdk and j2re images)
|
||||||
@$(PRINTF) "#\n"
|
$(info . make overlay-images # Create limited images for sparc 64 bit platforms)
|
||||||
|
$(info . make bootcycle-images # Build images twice, second time with newly build JDK)
|
||||||
|
$(info . make install # Install the generated images locally)
|
||||||
|
$(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 help # Give some help on using make)
|
||||||
|
$(info . make test # Run tests, default is all tests (see TEST below))
|
||||||
|
$(info )
|
||||||
|
$(info Targets for specific components)
|
||||||
|
$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images))
|
||||||
|
$(info . make <component> # Build <component> and everything it depends on. )
|
||||||
|
$(info . make <component>-only # Build <component> only, without dependencies. This)
|
||||||
|
$(info . # is faster but can result in incorrect build results!)
|
||||||
|
$(info . make clean-<component> # Remove files generated by make for <component>)
|
||||||
|
$(info )
|
||||||
|
$(info Useful make variables)
|
||||||
|
$(info . make CONF= # Build all configurations (note, assignment is empty))
|
||||||
|
$(info . make CONF=<substring> # Build the configuration(s) with a name matching)
|
||||||
|
$(info . # <substring>)
|
||||||
|
$(info )
|
||||||
|
$(info . make 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 )
|
||||||
|
$(info . make JOBS=<n> # Run <n> parallel make jobs)
|
||||||
|
$(info . # Note that -jN does not work as expected!)
|
||||||
|
$(info )
|
||||||
|
$(info . make test TEST=<test> # Only run the given test or tests, e.g.)
|
||||||
|
$(info . # make test TEST="jdk_lang jdk_net")
|
||||||
|
$(info )
|
||||||
|
|
||||||
help_all:
|
.PHONY: help
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
|
|
||||||
"Build the entire jdk but not the images"
|
|
||||||
help_images:
|
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
|
|
||||||
"Create the jdk images for the builds"
|
|
||||||
help_deploy:
|
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
|
|
||||||
"Create the jdk deploy images from the jdk images"
|
|
||||||
help_install:
|
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
|
|
||||||
"Create the jdk install bundles from the deploy images"
|
|
||||||
help_clean:
|
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
|
|
||||||
"Clean and prepare for a fresh build from scratch"
|
|
||||||
help_clobber:
|
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
|
|
||||||
"Clean and also purge any hidden derived data"
|
|
||||||
help_checks:
|
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
|
|
||||||
"Perform various checks to make sure we can build"
|
|
||||||
help_sanity:
|
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
|
|
||||||
"Same as 'make checks'"
|
|
||||||
help_javadocs:
|
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
|
|
||||||
"Build the javadocs"
|
|
||||||
help_help:
|
|
||||||
@$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
|
|
||||||
"Print out the help messages"
|
|
||||||
|
|
||||||
# Keep track of user targets
|
|
||||||
USER_TARGETS += help
|
|
||||||
|
|
||||||
###########################################################################
|
|
||||||
# Phony targets
|
|
||||||
.PHONY: $(PHONY_LIST) $(USER_TARGETS)
|
|
||||||
|
|
||||||
# Force target
|
|
||||||
FRC:
|
|
||||||
|
|||||||
@ -24,4 +24,4 @@
|
|||||||
# This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
|
# This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
|
||||||
# GENERATED FILE, DO NOT EDIT
|
# GENERATED FILE, DO NOT EDIT
|
||||||
SPEC:=@OUTPUT_ROOT@/spec.gmk
|
SPEC:=@OUTPUT_ROOT@/spec.gmk
|
||||||
include @SRC_ROOT@/common/makefiles/Makefile
|
include @SRC_ROOT@/NewMakefile.gmk
|
||||||
|
|||||||
@ -3679,7 +3679,7 @@ fi
|
|||||||
#CUSTOM_AUTOCONF_INCLUDE
|
#CUSTOM_AUTOCONF_INCLUDE
|
||||||
|
|
||||||
# Do not change or remove the following line, it is needed for consistency checks:
|
# Do not change or remove the following line, it is needed for consistency checks:
|
||||||
DATE_WHEN_GENERATED=1356635654
|
DATE_WHEN_GENERATED=1356638459
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
#
|
#
|
||||||
|
|||||||
165
common/makefiles/Jprt.gmk
Normal file
165
common/makefiles/Jprt.gmk
Normal file
@ -0,0 +1,165 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) 2012, 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
|
||||||
|
# under the terms of the GNU General Public License version 2 only, as
|
||||||
|
# published by the Free Software Foundation. Oracle designates this
|
||||||
|
# particular file as subject to the "Classpath" exception as provided
|
||||||
|
# by Oracle in the LICENSE file that accompanied this code.
|
||||||
|
#
|
||||||
|
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
# version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
# accompanied this code).
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License version
|
||||||
|
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
#
|
||||||
|
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
# or visit www.oracle.com if you need additional information or have any
|
||||||
|
# questions.
|
||||||
|
#
|
||||||
|
|
||||||
|
# This file is included by the root NewerMakefile and contains targets
|
||||||
|
# and utilities needed by JPRT.
|
||||||
|
|
||||||
|
# Utilities used in this Makefile
|
||||||
|
CAT=cat
|
||||||
|
CMP=cmp
|
||||||
|
CP=cp
|
||||||
|
ECHO=echo
|
||||||
|
MKDIR=mkdir
|
||||||
|
PRINTF=printf
|
||||||
|
PWD=pwd
|
||||||
|
# Insure we have a path that looks like it came from pwd
|
||||||
|
# (This is mostly for Windows sake and drive letters)
|
||||||
|
define UnixPath # path
|
||||||
|
$(shell (cd "$1" && $(PWD)))
|
||||||
|
endef
|
||||||
|
|
||||||
|
BUILD_DIR_ROOT:=$(root_dir)/build
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
# To help in adoption of the new configure&&make build process, a bridge
|
||||||
|
# build will use the old settings to run configure and do the build.
|
||||||
|
|
||||||
|
# Build with the configure bridge. After running configure, restart make
|
||||||
|
# to parse the new spec file.
|
||||||
|
BRIDGE_TARGETS := all
|
||||||
|
bridgeBuild: bridge2configure
|
||||||
|
@cd $(root_dir) && $(MAKE) -f NewMakefile.gmk $(BRIDGE_TARGETS)
|
||||||
|
|
||||||
|
# Bridge from old Makefile ALT settings to configure options
|
||||||
|
bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts
|
||||||
|
bash ./configure $(strip $(shell $(CAT) $<))
|
||||||
|
|
||||||
|
# Create a file with configure options created from old Makefile mechanisms.
|
||||||
|
$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest
|
||||||
|
$(RM) $@
|
||||||
|
$(CP) $< $@
|
||||||
|
|
||||||
|
# Use this file to only change when obvious things have changed
|
||||||
|
$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC
|
||||||
|
$(RM) $@.tmp
|
||||||
|
$(MKDIR) -p $(BUILD_DIR_ROOT)
|
||||||
|
@$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
|
||||||
|
ifdef ARCH_DATA_MODEL
|
||||||
|
@$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
|
||||||
|
endif
|
||||||
|
ifeq ($(ARCH_DATA_MODEL),32)
|
||||||
|
@$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp
|
||||||
|
endif
|
||||||
|
ifdef ALT_PARALLEL_COMPILE_JOBS
|
||||||
|
@$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
|
||||||
|
endif
|
||||||
|
ifdef ALT_BOOTDIR
|
||||||
|
@$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
|
||||||
|
endif
|
||||||
|
ifdef ALT_CUPS_HEADERS_PATH
|
||||||
|
@$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
|
||||||
|
endif
|
||||||
|
ifdef ALT_FREETYPE_HEADERS_PATH
|
||||||
|
@$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
|
||||||
|
endif
|
||||||
|
ifdef OPENJDK
|
||||||
|
@$(ECHO) " --enable-openjdk-only " >> $@.tmp
|
||||||
|
endif
|
||||||
|
# Todo: move to closed?
|
||||||
|
ifdef ALT_MOZILLA_HEADERS_PATH
|
||||||
|
@$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp
|
||||||
|
endif
|
||||||
|
ifdef ALT_JUNIT_DIR
|
||||||
|
@$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp
|
||||||
|
endif
|
||||||
|
ifdef ANT_HOME
|
||||||
|
@$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp
|
||||||
|
endif
|
||||||
|
ifdef ALT_SLASH_JAVA
|
||||||
|
@$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
|
||||||
|
endif
|
||||||
|
@if [ -f $@ ] ; then \
|
||||||
|
if ! $(CMP) $@ $@.tmp > /dev/null ; then \
|
||||||
|
$(CP) $@.tmp $@ ; \
|
||||||
|
fi ; \
|
||||||
|
else \
|
||||||
|
$(CP) $@.tmp $@ ; \
|
||||||
|
fi
|
||||||
|
$(RM) $@.tmp
|
||||||
|
|
||||||
|
PHONY_LIST += bridge2configure bridgeBuild
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
# JPRT targets
|
||||||
|
|
||||||
|
ifndef JPRT_ARCHIVE_BUNDLE
|
||||||
|
JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
|
||||||
|
endif
|
||||||
|
|
||||||
|
# These targets execute in a SPEC free context, before calling bridgeBuild
|
||||||
|
# to generate the SPEC.
|
||||||
|
jprt_build_product: DEBUG_LEVEL=release
|
||||||
|
jprt_build_product: BUILD_DIRNAME=*-release
|
||||||
|
jprt_build_product: jprt_build_generic
|
||||||
|
|
||||||
|
jprt_build_fastdebug: DEBUG_LEVEL=fastdebug
|
||||||
|
jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug
|
||||||
|
jprt_build_fastdebug: jprt_build_generic
|
||||||
|
|
||||||
|
jprt_build_debug: DEBUG_LEVEL=slowdebug
|
||||||
|
jprt_build_debug: BUILD_DIRNAME=*-debug
|
||||||
|
jprt_build_debug: jprt_build_generic
|
||||||
|
|
||||||
|
jprt_build_generic: BRIDGE_TARGETS+=jprt_bundle
|
||||||
|
jprt_build_generic: bridgeBuild
|
||||||
|
|
||||||
|
# This target must be called in the context of a SPEC file
|
||||||
|
jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
|
||||||
|
@$(call CheckIfMakeAtEnd)
|
||||||
|
|
||||||
|
# This target must be called in the context of a SPEC file
|
||||||
|
$(JPRT_ARCHIVE_BUNDLE): bundles
|
||||||
|
$(MKDIR) -p $(@D)
|
||||||
|
$(RM) $@
|
||||||
|
$(CP) $(BUILD_OUTPUT)/bundles/j2sdk-image.zip $@
|
||||||
|
|
||||||
|
# This target must be called in the context of a SPEC file
|
||||||
|
bundles: all
|
||||||
|
@$(call TargetEnter)
|
||||||
|
$(MKDIR) -p $(BUILD_OUTPUT)/bundles
|
||||||
|
$(CD) $(IMAGES_OUTPUTDIR)/j2sdk-image && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
|
||||||
|
$(CD) $(IMAGES_OUTPUTDIR)/j2re-image && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
|
||||||
|
@$(call TargetExit)
|
||||||
|
|
||||||
|
# Keep track of phony targets
|
||||||
|
PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
|
||||||
|
jprt_build_generic bundles jprt_bundle
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
# Phony targets
|
||||||
|
.PHONY: $(PHONY_LIST)
|
||||||
|
|
||||||
|
# Force target
|
||||||
|
FRC:
|
||||||
@ -65,7 +65,11 @@ MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
|
|||||||
|
|
||||||
### Main targets
|
### Main targets
|
||||||
|
|
||||||
all: jdk
|
default: jdk
|
||||||
|
@$(call CheckIfMakeAtEnd)
|
||||||
|
|
||||||
|
all: images docs
|
||||||
|
@$(call CheckIfMakeAtEnd)
|
||||||
|
|
||||||
start-make:
|
start-make:
|
||||||
@$(call AtMakeStart)
|
@$(call AtMakeStart)
|
||||||
@ -126,12 +130,6 @@ overlay-images-only: start-make
|
|||||||
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
|
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
|
||||||
@$(call TargetExit)
|
@$(call TargetExit)
|
||||||
|
|
||||||
bundles: images bundles-only
|
|
||||||
bundles-only: start-make
|
|
||||||
@$(call TargetEnter)
|
|
||||||
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk bundles)
|
|
||||||
@$(call TargetExit)
|
|
||||||
|
|
||||||
install: images install-only
|
install: images install-only
|
||||||
install-only: start-make
|
install-only: start-make
|
||||||
@$(call TargetEnter)
|
@$(call TargetEnter)
|
||||||
|
|||||||
@ -50,7 +50,7 @@ BUILDTIMESDIR=$(OUTPUT_ROOT)/tmp/buildtimes
|
|||||||
|
|
||||||
# Global targets are possible to run either with or without a SPEC. The prototypical
|
# Global targets are possible to run either with or without a SPEC. The prototypical
|
||||||
# global target is "help".
|
# global target is "help".
|
||||||
global_targets=help configure
|
global_targets=help jprt% bridgeBuild
|
||||||
|
|
||||||
##############################
|
##############################
|
||||||
# Functions
|
# Functions
|
||||||
@ -112,7 +112,7 @@ endef
|
|||||||
|
|
||||||
# Do not indent this function, this will add whitespace at the start which the caller won't handle
|
# Do not indent this function, this will add whitespace at the start which the caller won't handle
|
||||||
define GetRealTarget
|
define GetRealTarget
|
||||||
$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),all))
|
$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default))
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# Do not indent this function, this will add whitespace at the start which the caller won't handle
|
# Do not indent this function, this will add whitespace at the start which the caller won't handle
|
||||||
@ -126,10 +126,7 @@ define CheckIfMakeAtEnd
|
|||||||
# Check if the current target is the last goal
|
# Check if the current target is the last goal
|
||||||
$(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd))
|
$(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd))
|
||||||
# If the target is 'foo-only', check if our goal was stated as 'foo'
|
# If the target is 'foo-only', check if our goal was stated as 'foo'
|
||||||
$(if $(filter $(patsubst %-only,%,$@),$(call LastGoal)),$(call AtMakeEnd))
|
$(if $(filter $@,$(call LastGoal)-only),$(call AtMakeEnd))
|
||||||
# If no goal is given, 'all' is default, but the last target executed for all is 'jdk-only'. Check for that, too.
|
|
||||||
# At most one of the tests can be true.
|
|
||||||
$(if $(subst all,,$(call LastGoal)),,$(if $(filter $@,jdk-only),$(call AtMakeEnd)))
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# Hook to be called when starting to execute a top-level target
|
# Hook to be called when starting to execute a top-level target
|
||||||
|
|||||||
@ -23,109 +23,4 @@
|
|||||||
# questions.
|
# questions.
|
||||||
#
|
#
|
||||||
|
|
||||||
# This must be the first rule
|
include ../../NewMakefile.gmk
|
||||||
all:
|
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# Assume we have GNU make, but check version.
|
|
||||||
ifeq (,$(findstring 3.81,$(MAKE_VERSION)))
|
|
||||||
ifeq (,$(findstring 3.82,$(MAKE_VERSION)))
|
|
||||||
$(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Locate this Makefile
|
|
||||||
ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
|
|
||||||
makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
|
|
||||||
else
|
|
||||||
makefile_path:=$(lastword $(MAKEFILE_LIST))
|
|
||||||
endif
|
|
||||||
root_dir:=$(patsubst %/common/makefiles/Makefile,%,$(makefile_path))
|
|
||||||
|
|
||||||
# ... and then we can include our helper functions
|
|
||||||
include $(dir $(makefile_path))/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
|
|
||||||
ifeq ($(words $(SPEC)),1)
|
|
||||||
# We are building a single configuration. This is the normal case. Execute the Main.gmk file.
|
|
||||||
include $(dir $(makefile_path))/Main.gmk
|
|
||||||
else
|
|
||||||
# We are building multiple configurations.
|
|
||||||
# First, find out the valid targets
|
|
||||||
# Run the makefile with an arbitraty 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), $(strip $(shell \
|
|
||||||
$(MAKE) -p -q -f $(makefile_path) SPEC=$(firstword $(SPEC)) | \
|
|
||||||
grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
|
|
||||||
|
|
||||||
$(all_phony_targets):
|
|
||||||
@$(foreach spec,$(SPEC),($(MAKE) -f $(makefile_path) SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true
|
|
||||||
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
# 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.
|
|
||||||
|
|
||||||
help:
|
|
||||||
$(info )
|
|
||||||
$(info OpenJDK Makefile help)
|
|
||||||
$(info =====================)
|
|
||||||
$(info )
|
|
||||||
$(info Common make targets)
|
|
||||||
$(info . make [all] # Compile all code but do not create images)
|
|
||||||
$(info . make images # Create complete j2sdk and j2re images)
|
|
||||||
$(info . make overlay-images # Create limited images for sparc 64 bit platforms)
|
|
||||||
$(info . make bootcycle-images # Build images twice, second time with newly build JDK)
|
|
||||||
$(info . make install # Install the generated images locally)
|
|
||||||
$(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 help # Give some help on using make)
|
|
||||||
$(info . make test # Run tests, default is all tests (see TEST below))
|
|
||||||
$(info )
|
|
||||||
$(info Targets for specific components)
|
|
||||||
$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images))
|
|
||||||
$(info . make <component> # Build <component> and everything it depends on. )
|
|
||||||
$(info . make <component>-only # Build <component> only, without dependencies. This)
|
|
||||||
$(info . # is faster but can result in incorrect build results!)
|
|
||||||
$(info . make clean-<component> # Remove files generated by make for <component>)
|
|
||||||
$(info )
|
|
||||||
$(info Useful make variables)
|
|
||||||
$(info . make CONF= # Build all configurations (note, assignment is empty))
|
|
||||||
$(info . make CONF=<substring> # Build the configuration(s) with a name matching)
|
|
||||||
$(info . # <substring>)
|
|
||||||
$(info )
|
|
||||||
$(info . make 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 )
|
|
||||||
$(info . make JOBS=<n> # Run <n> parallel make jobs)
|
|
||||||
$(info . # Note that -jN does not work as expected!)
|
|
||||||
$(info )
|
|
||||||
$(info . make test TEST=<test> # Only run the given test or tests, e.g.)
|
|
||||||
$(info . # make test TEST="jdk_lang jdk_net")
|
|
||||||
$(info )
|
|
||||||
|
|
||||||
configure:
|
|
||||||
@$(SHELL) $(root_dir)/configure $(CONFIGURE_ARGS)
|
|
||||||
@echo ====================================================
|
|
||||||
@echo "Note: This is a non-recommended way of running configure."
|
|
||||||
@echo "Instead, run 'sh configure' in the top-level directory"
|
|
||||||
|
|
||||||
.PHONY: help configure
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user