Skip to content

Commit 1405272

Browse files
OracleLabsAutomationOracleLabsAutomation
committed
Merge tag 'jdk-24+14' into labsjdk/adopt-jdk-24+14-master
Added tag jdk-24+14 for changeset 28de44d
2 parents 346b28a + 28de44d commit 1405272

File tree

395 files changed

+7180
-3937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

395 files changed

+7180
-3937
lines changed

‎.github/actions/upload-bundles/action.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -45,6 +45,7 @@ runs:
4545
jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
4646
symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
4747
tests_bundle="$(ls build/*/bundles/jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
48+
static_libs_bundle="$(ls build/*/bundles/jdk-*_bin-static-libs${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
4849
4950
mkdir bundles
5051
@@ -60,8 +61,11 @@ runs:
6061
if [[ "$tests_bundle" != "" ]]; then
6162
mv "$tests_bundle" "bundles/tests-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
6263
fi
64+
if [[ "$static_libs_bundle" != "" ]]; then
65+
mv "$static_libs_bundle" "bundles/static-libs-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
66+
fi
6367
64-
if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle" != "" ]]; then
68+
if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle$static_libs_bundle" != "" ]]; then
6569
echo 'bundles-found=true' >> $GITHUB_OUTPUT
6670
else
6771
echo 'bundles-found=false' >> $GITHUB_OUTPUT

‎.github/workflows/build-linux.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -133,8 +133,12 @@ jobs:
133133
- name: 'Build'
134134
id: build
135135
uses: ./.github/actions/do-build
136+
env:
137+
# Only build static-libs-bundles for release builds.
138+
# For debug builds, building static-libs often exceeds disk space.
139+
STATIC_LIBS: ${{ matrix.debug-level == 'release' && 'static-libs-bundles' }}
136140
with:
137-
make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
141+
make-target: '${{ inputs.make-target }} ${STATIC_LIBS} ${{ inputs.make-arguments }}'
138142
platform: ${{ inputs.platform }}
139143
debug-suffix: '${{ matrix.suffix }}'
140144

‎make/Bundles.gmk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
284284
ifeq ($(MACOSX_CODESIGN_MODE), hardened)
285285
# Macosx release build and code signing available.
286286

287-
################################################################################
287+
############################################################################
288288
# JDK bundle
289289
$(eval $(call SetupCopyFiles, CREATE_JDK_BUNDLE_DIR_SIGNED, \
290290
SRC := $(JDK_IMAGE_DIR), \
@@ -313,7 +313,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
313313

314314
PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
315315

316-
################################################################################
316+
############################################################################
317317
# JRE bundle
318318
$(eval $(call SetupCopyFiles, CREATE_JRE_BUNDLE_DIR_SIGNED, \
319319
SRC := $(JRE_IMAGE_DIR), \

‎make/CompileInterimLangtools.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.ja
6565
$(SED) $(INTERIM_TOOL_PROVIDER_PATTERN) $< > $@
6666

6767
java.compiler.interim_EXTRA_FILES := \
68-
$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java
68+
$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java
6969

7070
TARGETS += $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java
7171

‎make/CompileJavaModules.gmk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ $(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.pr
7575

7676
CreateHkTargets = \
7777
$(call FilterExcludedTranslations, \
78-
$(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
79-
$(subst /share/classes,, \
80-
$(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \
81-
) \
82-
), \
83-
.properties \
78+
$(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
79+
$(subst /share/classes,, \
80+
$(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \
81+
) \
82+
), \
83+
.properties \
8484
)
8585

8686
################################################################################

‎make/CompileToolsJdk.gmk‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
5252
build/tools/deps \
5353
build/tools/docs \
5454
build/tools/jigsaw \
55-
build/tools/depend \
56-
, \
55+
build/tools/depend, \
5756
BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
5857
DISABLED_WARNINGS := dangling-doc-comments options, \
5958
JAVAC_FLAGS := \
@@ -66,17 +65,19 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
6665

6766
TARGETS += $(BUILD_TOOLS_JDK)
6867

69-
$(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \
68+
$(eval $(call SetupCopyFiles, COPY_NIMBUS_TEMPLATES, \
7069
SRC := $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus, \
7170
DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources, \
72-
FILES := $(wildcard $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template)))
71+
FILES := $(wildcard $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template), \
72+
))
7373

7474
TARGETS += $(COPY_NIMBUS_TEMPLATES)
7575

76-
$(eval $(call SetupCopyFiles,COPY_CLDRCONVERTER_PROPERTIES, \
76+
$(eval $(call SetupCopyFiles, COPY_CLDRCONVERTER_PROPERTIES, \
7777
SRC := $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter, \
7878
DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/cldrconverter, \
79-
FILES := $(wildcard $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter/*.properties)))
79+
FILES := $(wildcard $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter/*.properties), \
80+
))
8081

8182
TARGETS += $(COPY_CLDRCONVERTER_PROPERTIES)
8283

‎make/CopyInterimTZDB.gmk‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ include MakeBase.gmk
3030

3131
include CopyFiles.gmk
3232

33-
##########################################################################################
33+
################################################################################
3434

3535
### TZDB tool needs files from java.time.zone package
3636

@@ -41,12 +41,13 @@ define tzdb_copyfiles
4141
< $(<) > $@
4242
endef
4343

44-
$(eval $(call SetupCopyFiles,COPY_INTERIM_TZDB, \
44+
$(eval $(call SetupCopyFiles, COPY_INTERIM_TZDB, \
4545
SRC := $(TOPDIR)/src/java.base/share/classes/java/time/zone, \
4646
DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_tzdb_classes/build/tools/tzdb, \
4747
FILES := ZoneRules.java ZoneOffsetTransition.java ZoneOffsetTransitionRule.java Ser.java, \
48-
MACRO := tzdb_copyfiles))
48+
MACRO := tzdb_copyfiles, \
49+
))
4950

50-
##########################################################################################
51+
################################################################################
5152

5253
all: $(COPY_INTERIM_TZDB)

‎make/CreateJmods.gmk‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -229,8 +229,21 @@ ifeq ($(INTERIM_JMOD), true)
229229
# Interim JMODs are not shipped anywhere, so there is no reason
230230
# to compress them at all.
231231
JMOD_FLAGS += --compress zip-0
232+
233+
JMOD_TARGET_OS := $(OPENJDK_BUILD_OS)
234+
ifeq ($(JMOD_TARGET_OS), macosx)
235+
JMOD_TARGET_OS := macos
236+
endif
237+
238+
JMOD_TARGET_CPU := $(OPENJDK_BUILD_CPU)
239+
ifeq ($(JMOD_TARGET_CPU), x86_64)
240+
JMOD_TARGET_CPU := amd64
241+
endif
242+
243+
JMOD_TARGET_PLATFORM := $(JMOD_TARGET_OS)-$(JMOD_TARGET_CPU)
232244
else
233245
JMOD_FLAGS += --compress $(JMOD_COMPRESS)
246+
JMOD_TARGET_PLATFORM := $(OPENJDK_MODULE_TARGET_PLATFORM)
234247
endif
235248

236249
# Create jmods in the support dir and then move them into place to keep the
@@ -242,7 +255,7 @@ $(eval $(call SetupExecute, create_$(JMOD_FILE), \
242255
SUPPORT_DIR := $(JMODS_SUPPORT_DIR), \
243256
PRE_COMMAND := $(RM) $(JMODS_DIR)/$(JMOD_FILE) $(JMODS_SUPPORT_DIR)/$(JMOD_FILE), \
244257
COMMAND := $(JMOD) $(JMOD_SMALL_FLAGS) create --module-version $(VERSION_SHORT) \
245-
--target-platform '$(OPENJDK_MODULE_TARGET_PLATFORM)' \
258+
--target-platform '$(JMOD_TARGET_PLATFORM)' \
246259
--module-path $(JMODS_DIR) $(JMOD_FLAGS) \
247260
--date $(SOURCE_DATE_ISO_8601) \
248261
$(JMODS_SUPPORT_DIR)/$(JMOD_FILE), \

‎make/Docs.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ define create_overview_file
247247
<!DOCTYPE html> \
248248
<html><head></head><body> \
249249
#
250-
ifneq ($$($1_GROUPS),)
250+
ifneq ($$($1_GROUPS), )
251251
$1_OVERVIEW_TEXT += \
252252
<p>This document is divided into \
253253
$$(subst 2,two,$$(subst 3,three,$$(words $$($1_GROUPS)))) sections:</p> \

‎make/Global.gmk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
###
2929

3030
# Helper macro to allow $(info) to properly print strings beginning with spaces.
31-
_:=
31+
_ :=
3232

3333
help:
3434
$(info )
@@ -108,7 +108,7 @@ help:
108108
$(info $(_) TEST_OPTS="OPT1=x;..." # Generic control of all test harnesses)
109109
$(info $(_) TEST_VM_OPTS="ARG ..." # Same as setting TEST_OPTS to VM_OPTIONS="ARG ...")
110110
$(info )
111-
$(if $(all_confs), $(info Available configurations in $(build_dir):) $(foreach var,$(all_confs),$(info * $(var))),\
111+
$(if $(all_confs), $(info Available configurations in $(build_dir):) $(foreach var,$(all_confs),$(info * $(var))), \
112112
$(info No configurations were found in $(build_dir).) $(info Run 'bash configure' to create a configuration.))
113113
# We need a dummy rule otherwise make will complain
114114
@true

0 commit comments

Comments
 (0)