Skip to content

Commit

Permalink
8188814: Simplify IncludeCustomExtension
Browse files Browse the repository at this point in the history 
Reviewed-by: dholmes
  • Loading branch information
@magicus
magicus committed Oct 5, 2017
1 parent ecd3cd8 commit 5f7dcca
Show file tree
Hide file tree
Showing 47 changed files with 52 additions and 53 deletions.
4 changes: 2 additions & 2 deletions make/Bundles.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ifeq ($(OPENJDK_BUILD_OS), windows)
endif

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , Bundles-pre.gmk))
$(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
################################################################################
# BUNDLE : Name of bundle to create
# FILES : Files in BASE_DIRS to add to bundle
Expand Down Expand Up @@ -322,7 +322,7 @@ endif
################################################################################

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , Bundles.gmk))
$(eval $(call IncludeCustomExtension, Bundles.gmk))

################################################################################

Expand Down
2 changes: 1 addition & 1 deletion make/CompileDemos.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ endif

################################################################################
# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , CompileDemos.gmk))
$(eval $(call IncludeCustomExtension, CompileDemos.gmk))

all: $(TARGETS)
images: $(IMAGES_TARGETS)
Expand Down
4 changes: 2 additions & 2 deletions make/CompileJavaModules.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ include JavaCompilation.gmk
include SetupJavaCompilers.gmk

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , CompileJavaModules.gmk))
$(eval $(call IncludeCustomExtension, CompileJavaModules.gmk))

################################################################################
# Module specific build settings
Expand Down Expand Up @@ -689,7 +689,7 @@ endif

################################################################################

$(eval $(call IncludeCustomExtension, , CompileJavaModules-post.gmk))
$(eval $(call IncludeCustomExtension, CompileJavaModules-post.gmk))

################################################################################

Expand Down
2 changes: 1 addition & 1 deletion make/CompileToolsHotspot.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ include SetupJavaCompilers.gmk
TARGETS :=

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , hotspot/CompileTools.gmk))
$(eval $(call IncludeCustomExtension, hotspot/CompileTools.gmk))

ifeq ($(INCLUDE_GRAAL), true)
VM_CI_SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.ci/share/classes
Expand Down
2 changes: 1 addition & 1 deletion make/CompileToolsJdk.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ include SetupJavaCompilers.gmk

################################################################################

$(eval $(call IncludeCustomExtension, , CompileTools.gmk))
$(eval $(call IncludeCustomExtension, CompileTools.gmk))

################################################################################

Expand Down
2 changes: 1 addition & 1 deletion make/Docs.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $(eval $(call ReadImportMetaData))

################################################################################
# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , Docs.gmk))
$(eval $(call IncludeCustomExtension, Docs.gmk))

################################################################################
# This file generates all documentation for OpenJDK.
Expand Down
4 changes: 2 additions & 2 deletions make/Images.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ JDK_TARGETS :=
JRE_TARGETS :=

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , Images-pre.gmk))
$(eval $(call IncludeCustomExtension, Images-pre.gmk))

############################################################################

Expand Down Expand Up @@ -426,7 +426,7 @@ $(call SetupCopyDebuginfo,JRE)

# Include custom post hook here to make it possible to augment the target lists
# before actual target prerequisites are declared.
$(eval $(call IncludeCustomExtension, , Images-post.gmk))
$(eval $(call IncludeCustomExtension, Images-post.gmk))

################################################################################

Expand Down
2 changes: 1 addition & 1 deletion make/Jprt.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ ALL_TARGETS += jprt_bundle

################################################################################

$(eval $(call IncludeCustomExtension, , Jprt.gmk))
$(eval $(call IncludeCustomExtension, Jprt.gmk))
2 changes: 1 addition & 1 deletion make/Main.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ include $(TOPDIR)/make/common/FindTests.gmk
ALL_TARGETS :=

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , Main.gmk))
$(eval $(call IncludeCustomExtension, Main.gmk))

# All modules for the current target platform.
ALL_MODULES := $(call FindAllModules)
Expand Down
2 changes: 1 addition & 1 deletion make/ReleaseFile.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ TARGETS += $(BASE_RELEASE_FILE)

################################################################################

$(eval $(call IncludeCustomExtension, , ReleaseFile.gmk))
$(eval $(call IncludeCustomExtension, ReleaseFile.gmk))

################################################################################

Expand Down
2 changes: 1 addition & 1 deletion make/RunTests.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ include FindTests.gmk
JTREG_TEST_TOPDIRS := $(TOPDIR) $(JTREG_TESTROOTS)

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , RunTests.gmk))
$(eval $(call IncludeCustomExtension, RunTests.gmk))

TEST_RESULTS_DIR := $(OUTPUTDIR)/test-results
TEST_SUPPORT_DIR := $(OUTPUTDIR)/test-support
Expand Down
2 changes: 1 addition & 1 deletion make/SourceRevision.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ default: all
include $(SPEC)
include MakeBase.gmk

$(eval $(call IncludeCustomExtension, , SourceRevision.gmk))
$(eval $(call IncludeCustomExtension, SourceRevision.gmk))

################################################################################
# Keep track of what source revision is used to create the build, by creating
Expand Down
2 changes: 1 addition & 1 deletion make/ToolsJdk.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ _TOOLS_GMK := 1
include JavaCompilation.gmk

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , Tools.gmk))
$(eval $(call IncludeCustomExtension, Tools.gmk))

################################################################################
# To avoid reevaluating the compilation setup for the tools each time this file
Expand Down
2 changes: 1 addition & 1 deletion make/UpdateBuildDocs.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ TARGETS += $(testing)

################################################################################

$(eval $(call IncludeCustomExtension, , UpdateBuildDocs.gmk))
$(eval $(call IncludeCustomExtension, UpdateBuildDocs.gmk))

################################################################################

Expand Down
2 changes: 1 addition & 1 deletion make/ZipSource.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ include Modules.gmk
SRC_ZIP_WORK_DIR := $(SUPPORT_OUTPUTDIR)/src

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , ZipSource.gmk))
$(eval $(call IncludeCustomExtension, ZipSource.gmk))

################################################################################
# Create the directory structure for src.zip using symlinks.
Expand Down
5 changes: 2 additions & 3 deletions make/autoconf/spec.gmk.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -847,9 +847,8 @@ CONFIGURE_CMD := $(TOPDIR)/configure
# This macro is called to allow inclusion of closed source counterparts.
# Unless overridden in closed sources, it expands to nothing.
# Usage: This function is called in an open makefile, with the following
# arguments:
# $1 the name of the repo, or empty if the top-level repo.
# $2 the name of the makefile
# argument:
# $1 the name of the makefile
define IncludeCustomExtension
endef

Expand Down
2 changes: 1 addition & 1 deletion make/common/FindTests.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ifndef _FIND_TESTS_GMK
_FIND_TESTS_GMK := 1

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , common/FindTests.gmk))
$(eval $(call IncludeCustomExtension, common/FindTests.gmk))

# JTREG_TESTROOTS might have been set by a custom extension
JTREG_TESTROOTS += $(addprefix $(TOPDIR)/test/, hotspot/jtreg jdk langtools nashorn jaxp)
Expand Down
2 changes: 1 addition & 1 deletion make/common/MakeBase.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,6 @@ ColonList = \
################################################################################

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , common/MakeBase.gmk))
$(eval $(call IncludeCustomExtension, common/MakeBase.gmk))

endif # _MAKEBASE_GMK
2 changes: 1 addition & 1 deletion make/common/Modules.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ AGGREGATOR_MODULES :=
DOCS_MODULES :=

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , common/Modules.gmk))
$(eval $(call IncludeCustomExtension, common/Modules.gmk))

BOOT_MODULES += \
java.base \
Expand Down
2 changes: 1 addition & 1 deletion make/copy/Copy-java.base.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

include CopyCommon.gmk

$(eval $(call IncludeCustomExtension, , copy/Copy-java.base.gmk))
$(eval $(call IncludeCustomExtension, copy/Copy-java.base.gmk))

################################################################################
#
Expand Down
2 changes: 1 addition & 1 deletion make/copy/Copy-java.desktop.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

include CopyCommon.gmk

$(eval $(call IncludeCustomExtension, , copy/Copy-java.desktop.gmk))
$(eval $(call IncludeCustomExtension, copy/Copy-java.desktop.gmk))

################################################################################

Expand Down
2 changes: 1 addition & 1 deletion make/gendata/Gendata-java.base.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
include GendataCommon.gmk

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , gendata/Gendata-java.base.gmk))
$(eval $(call IncludeCustomExtension, gendata/Gendata-java.base.gmk))

include GendataBreakIterator.gmk

Expand Down
2 changes: 1 addition & 1 deletion make/gendata/GendataBlacklistedCerts.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

$(eval $(call IncludeCustomExtension, , gendata/GendataBlacklistedCerts.gmk))
$(eval $(call IncludeCustomExtension, gendata/GendataBlacklistedCerts.gmk))

GENDATA_BLACKLISTED_CERTS_SRC += $(TOPDIR)/make/data/blacklistedcertsconverter/blacklisted.certs.pem
GENDATA_BLACKLISTED_CERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/security/blacklisted.certs
Expand Down
2 changes: 1 addition & 1 deletion make/gendata/GendataFontConfig.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

$(eval $(call IncludeCustomExtension, , gendata/GendataFontConfig.gmk))
$(eval $(call IncludeCustomExtension, gendata/GendataFontConfig.gmk))

GENDATA_FONT_CONFIG_DST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)

Expand Down
2 changes: 1 addition & 1 deletion make/gensrc/Gensrc-java.desktop.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
include GensrcCommonJdk.gmk

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-java.desktop.gmk))
$(eval $(call IncludeCustomExtension, gensrc/Gensrc-java.desktop.gmk))

ifneq ($(OPENJDK_TARGET_OS), windows)
include GensrcIcons.gmk
Expand Down
2 changes: 1 addition & 1 deletion make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ default: all
include $(SPEC)
include MakeBase.gmk

$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-jdk.internal.vm.compiler.gmk))
$(eval $(call IncludeCustomExtension, gensrc/Gensrc-jdk.internal.vm.compiler.gmk))

GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
SRC_DIR := $(TOPDIR)/src/$(MODULE)/share/classes
Expand Down
2 changes: 1 addition & 1 deletion make/gensrc/Gensrc-jdk.localedata.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
include GensrcCommonJdk.gmk

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-jdk.localedata.gmk))
$(eval $(call IncludeCustomExtension, gensrc/Gensrc-jdk.localedata.gmk))

include GensrcLocaleData.gmk
include GensrcCLDR.gmk
Expand Down
2 changes: 1 addition & 1 deletion make/gensrc/GensrcIcons.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

$(eval $(call IncludeCustomExtension, , gensrc/GensrcIcons.gmk))
$(eval $(call IncludeCustomExtension, gensrc/GensrcIcons.gmk))

GENSRC_AWT_ICONS :=
GENSRC_AWT_ICONS_SRC :=
Expand Down
2 changes: 1 addition & 1 deletion make/hotspot/gensrc/GenerateSources.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ include gensrc/GensrcAdlc.gmk
include gensrc/GensrcDtrace.gmk
include gensrc/GensrcJvmti.gmk

$(eval $(call IncludeCustomExtension, , hotspot/gensrc/GenerateSources.gmk))
$(eval $(call IncludeCustomExtension, hotspot/gensrc/GenerateSources.gmk))

# While technically the rules below are "gendata" which can be done in parallel
# with native compilation, let's keep it here for simplicity.
Expand Down
2 changes: 1 addition & 1 deletion make/hotspot/gensrc/GensrcAdlc.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

$(eval $(call IncludeCustomExtension, , hotspot/gensrc/GensrcAdlc.gmk))
$(eval $(call IncludeCustomExtension, hotspot/gensrc/GensrcAdlc.gmk))

ifeq ($(call check-jvm-feature, compiler2), true)

Expand Down
2 changes: 1 addition & 1 deletion make/hotspot/gensrc/GensrcJvmti.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

$(eval $(call IncludeCustomExtension, , hotspot/gensrc/GensrcJvmti.gmk))
$(eval $(call IncludeCustomExtension, hotspot/gensrc/GensrcJvmti.gmk))

################################################################################
# Build tools needed for the JVMTI source code generation
Expand Down
2 changes: 1 addition & 1 deletion make/hotspot/lib/CompileGtest.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

$(eval $(call IncludeCustomExtension, , hotspot/lib/CompileGtest.gmk))
$(eval $(call IncludeCustomExtension, hotspot/lib/CompileGtest.gmk))

GTEST_TEST_SRC += $(TOPDIR)/test/hotspot/gtest
GTEST_LAUNCHER_SRC := $(TOPDIR)/test/hotspot/gtest/gtestLauncher.cpp
Expand Down
2 changes: 1 addition & 1 deletion make/hotspot/lib/CompileJvm.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
include lib/JvmFeatures.gmk
include lib/JvmOverrideFiles.gmk

$(eval $(call IncludeCustomExtension, , hotspot/lib/CompileJvm.gmk))
$(eval $(call IncludeCustomExtension, hotspot/lib/CompileJvm.gmk))

################################################################################
# Setup compilation of the main Hotspot native library (libjvm).
Expand Down
2 changes: 1 addition & 1 deletion make/hotspot/lib/JvmFeatures.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

$(eval $(call IncludeCustomExtension, , hotspot/lib/JvmFeatures.gmk))
$(eval $(call IncludeCustomExtension, hotspot/lib/JvmFeatures.gmk))

################################################################################
# Setup CFLAGS and EXCLUDES for the libjvm compilation, depending on which
Expand Down
2 changes: 1 addition & 1 deletion make/hotspot/lib/JvmMapfile.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

$(eval $(call IncludeCustomExtension, , hotspot/lib/JvmMapfile.gmk))
$(eval $(call IncludeCustomExtension, hotspot/lib/JvmMapfile.gmk))

################################################################################
# Combine a list of static symbols
Expand Down
2 changes: 1 addition & 1 deletion make/hotspot/lib/JvmOverrideFiles.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

$(eval $(call IncludeCustomExtension, , hotspot/lib/JvmOverrideFiles.gmk))
$(eval $(call IncludeCustomExtension, hotspot/lib/JvmOverrideFiles.gmk))

################################################################################
# This file contains explicit overrides of CFLAGS and/or precompiled header
Expand Down
2 changes: 1 addition & 1 deletion make/launcher/Launcher-java.base.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

include LauncherCommon.gmk

$(eval $(call IncludeCustomExtension, , launcher/Launcher-java.base.gmk))
$(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk))

JAVA_RC_FLAGS += -I $(TOPDIR)/src/java.base/windows/native/common
JAVA_RC_FLAGS += -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
Expand Down
2 changes: 1 addition & 1 deletion make/launcher/Launcher-java.desktop.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
include LauncherCommon.gmk

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , launcher/Launcher-java.desktop.gmk))
$(eval $(call IncludeCustomExtension, launcher/Launcher-java.desktop.gmk))

ifeq ($(ENABLE_HEADLESS_ONLY), false)
$(eval $(call SetupBuildLauncher, appletviewer, \
Expand Down
4 changes: 2 additions & 2 deletions make/lib/Awt2dLibraries.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

$(eval $(call IncludeCustomExtension, , lib/Awt2dLibraries-pre.gmk))
$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries-pre.gmk))

WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib

Expand Down Expand Up @@ -1070,4 +1070,4 @@ endif
################################################################################

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , lib/Awt2dLibraries.gmk))
$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries.gmk))
2 changes: 1 addition & 1 deletion make/lib/CoreLibraries.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
WIN_VERIFY_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify/verify.lib

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, , lib/CoreLibraries.gmk))
$(eval $(call IncludeCustomExtension, lib/CoreLibraries.gmk))


##########################################################################################
Expand Down
Loading

0 comments on commit 5f7dcca

Please sign in to comment.