Skip to content

Commit

Permalink
Merge tag 'jdk-23+21' into labsjdk/automation-5-2-2024-624
Browse files Browse the repository at this point in the history 
Added tag jdk-23+21 for changeset e833bfc
  • Loading branch information
@OracleLabsAutomation
OracleLabsAutomation committed May 2, 2024
2 parents 83ce7f6 + e833bfc commit 5edbecf
Show file tree
Hide file tree
Showing 2,213 changed files with 33,739 additions and 32,192 deletions.
5 changes: 4 additions & 1 deletion make/Bundles.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2016, 2024, 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
Expand Down Expand Up @@ -28,6 +28,9 @@ default: all
include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include MakeIO.gmk

PRODUCT_TARGETS :=
LEGACY_TARGETS :=
TEST_TARGETS :=
Expand Down
4 changes: 3 additions & 1 deletion make/CompileDemos.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ default: all

include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include JavaCompilation.gmk
include TextFileProcessing.gmk
include ZipArchive.gmk
Expand Down Expand Up @@ -214,7 +216,7 @@ $(eval $(call SetupBuildDemo, SampleTree, \
))

$(eval $(call SetupBuildDemo, TableExample, \
DISABLED_WARNINGS := rawtypes unchecked deprecation this-escape, \
DISABLED_WARNINGS := rawtypes unchecked deprecation this-escape dangling-doc-comments, \
DEMO_SUBDIR := jfc, \
))

Expand Down
2 changes: 2 additions & 0 deletions make/CompileInterimLangtools.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ default: all

include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include JavaCompilation.gmk
include Modules.gmk

Expand Down
2 changes: 1 addition & 1 deletion make/CompileModuleTools.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JIGSAW_TOOLS, \
build/tools/jigsaw, \
COPY := .properties .html, \
BIN := $(TOOLS_CLASSES_DIR), \
DISABLED_WARNINGS := fallthrough this-escape, \
DISABLED_WARNINGS := fallthrough, \
JAVAC_FLAGS := \
--add-modules jdk.jdeps \
--add-exports java.base/jdk.internal.module=ALL-UNNAMED \
Expand Down
6 changes: 4 additions & 2 deletions make/CompileToolsJdk.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2024, 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
Expand Down Expand Up @@ -27,6 +27,8 @@ default: all

include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include JavaCompilation.gmk
include TextFileProcessing.gmk

Expand All @@ -53,7 +55,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
build/tools/depend \
, \
BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
DISABLED_WARNINGS := options, \
DISABLED_WARNINGS := dangling-doc-comments options, \
JAVAC_FLAGS := \
--add-exports java.desktop/sun.awt=ALL-UNNAMED \
--add-exports java.base/sun.text=ALL-UNNAMED \
Expand Down
2 changes: 2 additions & 0 deletions make/CopyImportModules.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ default: all
include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk

LIBS_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_LIBS)))
CMDS_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_CMDS)))
CONF_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_CONF)))
Expand Down
2 changes: 2 additions & 0 deletions make/CopyInterimTZDB.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ default: all
include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk

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

### TZDB tool needs files from java.time.zone package
Expand Down
2 changes: 2 additions & 0 deletions make/CreateJmods.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ default: all

include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include Execute.gmk
include Modules.gmk

Expand Down
2 changes: 2 additions & 0 deletions make/Docs.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ default: all

include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include Execute.gmk
include Modules.gmk
include ModuleTools.gmk
Expand Down
5 changes: 4 additions & 1 deletion make/GenerateLinkOptData.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2016, 2024, 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
Expand Down Expand Up @@ -31,6 +31,8 @@ default: all

include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include JavaCompilation.gmk

################################################################################
Expand All @@ -41,6 +43,7 @@ $(eval $(call SetupJavaCompilation, CLASSLIST_JAR, \
SMALL_JAVA := false, \
SRC := $(TOPDIR)/make/jdk/src/classes, \
INCLUDES := build/tools/classlist, \
DISABLED_WARNINGS := dangling-doc-comments, \
BIN := $(BUILDTOOLS_OUTPUTDIR)/classlist_classes, \
JAR := $(SUPPORT_OUTPUTDIR)/classlist.jar, \
))
Expand Down
2 changes: 2 additions & 0 deletions make/GraalBuilderImage.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ default: all
include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk

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

TARGETS :=
Expand Down
2 changes: 2 additions & 0 deletions make/Images.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ default: all

include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include Execute.gmk
include Modules.gmk
include Utils.gmk
Expand Down
25 changes: 25 additions & 0 deletions make/InitSupport.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,31 @@ else # $(HAS_SPEC)=true
endef
endif

##############################################################################
# Functions for timers
##############################################################################

# Store the build times in this directory.
BUILDTIMESDIR=$(OUTPUTDIR)/make-support/build-times

# Record starting time for build of a sub repository.
define RecordStartTime
$(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$(strip $1) && \
$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$(strip $1)_human_readable
endef

# Record ending time and calculate the difference and store it in a
# easy to read format. Handles builds that cross midnight. Expects
# that a build will never take 24 hours or more.
define RecordEndTime
$(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)
$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)_human_readable
$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$(strip $1)` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$(strip $1)` $1 | \
$(AWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
> $(BUILDTIMESDIR)/build_time_diff_$(strip $1)
endef

define StartGlobalTimer
$(RM) -r $(BUILDTIMESDIR) 2> /dev/null && \
$(MKDIR) -p $(BUILDTIMESDIR) && \
Expand Down
2 changes: 2 additions & 0 deletions make/JrtfsJar.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ default: all

include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include JavaCompilation.gmk
include JarArchive.gmk
include TextFileProcessing.gmk
Expand Down
2 changes: 2 additions & 0 deletions make/MacBundles.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include TextFileProcessing.gmk

default: bundles
Expand Down
2 changes: 2 additions & 0 deletions make/ModuleWrapper.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ default: all
include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk

MODULE_SRC := $(TOPDIR)/src/$(MODULE)

# All makefiles should add the targets to be built to this variable.
Expand Down
6 changes: 1 addition & 5 deletions make/RunTestsPrebuiltSpec.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2017, 2024, 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
Expand Down Expand Up @@ -176,7 +176,3 @@ ULIMIT := ulimit
ifeq ($(OPENJDK_BUILD_OS), windows)
PATHTOOL := cygpath
endif

################################################################################
# Simple macros from spec.gmk.in
SHARED_LIBRARY=$(LIBRARY_PREFIX)$1$(SHARED_LIBRARY_SUFFIX)
12 changes: 11 additions & 1 deletion make/SourceRevision.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2016, 2024, 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
Expand Down Expand Up @@ -41,6 +41,16 @@ $(eval $(call IncludeCustomExtension, SourceRevision-pre.gmk))

STORED_SOURCE_REVISION := $(TOPDIR)/.src-rev

# Locate all sourcecode repositories included in the forest, as absolute paths
FindAllReposAbs = \
$(strip $(sort $(dir $(filter-out $(TOPDIR)/build/%, $(wildcard \
$(addprefix $(TOPDIR)/, .git */.git */*/.git */*/*/.git */*/*/*/.git) \
)))))

# Locate all sourcecode repositories included in the forest, as relative paths
FindAllReposRel = \
$(strip $(subst $(TOPDIR)/,.,$(patsubst $(TOPDIR)/%/, %, $(FindAllReposAbs))))

USE_SCM := false
ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
USE_SCM := true
Expand Down
2 changes: 2 additions & 0 deletions make/StaticLibsImage.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ default: all

include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include Modules.gmk

ALL_MODULES = $(call FindAllModules)
Expand Down
Loading

0 comments on commit 5edbecf

Please sign in to comment.