Skip to content

Commit 4d26232

Browse files
author
David Simms
committed
Merge jdk
Merge jdk-25+10
2 parents cc0f8d4 + a637ccf commit 4d26232

File tree

687 files changed

+10398
-4018
lines changed

Some content is hidden

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

687 files changed

+10398
-4018
lines changed

‎.github/actions/get-gtest/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ runs:
4949
- name: 'Export path to where GTest is installed'
5050
id: path-name
5151
run: |
52-
# Export the path
53-
echo 'path=gtest' >> $GITHUB_OUTPUT
52+
# Export the absolute path
53+
echo "path=`pwd`/gtest" >> $GITHUB_OUTPUT
5454
shell: bash

‎.github/actions/get-jtreg/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ runs:
4949
- name: 'Export path to where JTReg is installed'
5050
id: path-name
5151
run: |
52-
# Export the path
53-
echo 'path=jtreg/installed' >> $GITHUB_OUTPUT
52+
# Export the absolute path
53+
echo "path=`pwd`/jtreg/installed" >> $GITHUB_OUTPUT
5454
shell: bash

‎.jcheck/conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,11 @@ ignore-tabs=.*\.gmk|Makefile
1717

1818
[checks "committer"]
1919
role=committer
20+
21+
[checks "problemlists"]
22+
dirs=test/jdk|test/langtools|test/lib-test|test/hotspot/jtreg|test/jaxp
23+
24+
[checks "copyright"]
25+
files=^(?!LICENSE|license\.txt|.*\.bin|.*\.gif|.*\.jpg|.*\.png|.*\.icon|.*\.tiff|.*\.dat|.*\.patch|.*\.wav|.*\.class|.*-header|.*\.jar).*
26+
oracle_locator=.*Copyright \(c\)(.*)Oracle and/or its affiliates\. All rights reserved\.
27+
oracle_validator=.*Copyright \(c\) (\d{4})(?:, (\d{4}))?, Oracle and/or its affiliates\. All rights reserved\.

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))),)
5959
else
6060
makefile_path := $(lastword $(MAKEFILE_LIST))
6161
endif
62-
topdir := $(strip $(patsubst %/, %, $(dir $(makefile_path))))
62+
TOPDIR := $(strip $(patsubst %/, %, $(dir $(makefile_path))))
6363

6464
# ... and then we can include the real makefile to bootstrap the build
65-
include $(topdir)/make/PreInit.gmk
65+
include $(TOPDIR)/make/PreInit.gmk

‎make/Bundles.gmk

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2016, 2025, 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
@@ -23,10 +23,9 @@
2323
# questions.
2424
#
2525

26-
default: all
26+
include MakeFileStart.gmk
2727

28-
include $(SPEC)
29-
include MakeBase.gmk
28+
################################################################################
3029

3130
include CopyFiles.gmk
3231
include MakeIO.gmk
@@ -43,8 +42,6 @@ ifeq ($(call isBuildOs, windows), true)
4342
TAR_IGNORE_EXIT_VALUE := || test "$$$$?" = "1"
4443
endif
4544

46-
# Hook to include the corresponding custom file, if present.
47-
$(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
4845
################################################################################
4946
# BUNDLE : Name of bundle to create
5047
# FILES : Files in BASE_DIRS to add to bundle
@@ -502,11 +499,6 @@ endif
502499

503500
################################################################################
504501

505-
# Hook to include the corresponding custom file, if present.
506-
$(eval $(call IncludeCustomExtension, Bundles.gmk))
507-
508-
################################################################################
509-
510502
product-bundles: $(PRODUCT_TARGETS)
511503
legacy-bundles: $(LEGACY_TARGETS)
512504
test-bundles: $(TEST_TARGETS)
@@ -517,6 +509,10 @@ static-libs-bundles: $(STATIC_LIBS_TARGETS)
517509
static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_TARGETS)
518510
jcov-bundles: $(JCOV_TARGETS)
519511

520-
.PHONY: all default product-bundles test-bundles \
512+
.PHONY: product-bundles test-bundles \
521513
docs-jdk-bundles docs-javase-bundles docs-reference-bundles \
522514
static-libs-bundles static-libs-graal-bundles jcov-bundles
515+
516+
################################################################################
517+
518+
include MakeFileEnd.gmk

‎make/CompileCommands.gmk

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2018, 2025, 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
@@ -23,10 +23,9 @@
2323
# questions.
2424
#
2525

26-
default: all
26+
include MakeFileStart.gmk
2727

28-
include $(SPEC)
29-
include MakeBase.gmk
28+
################################################################################
3029

3130
# When FIXPATH is set, let it process the file to make sure all paths are usable
3231
# by system native tools. The FIXPATH tool assumes arguments preceded by an @
@@ -50,6 +49,6 @@ $(OUTPUTDIR)/compile_commands.json: $(wildcard $(MAKESUPPORT_OUTPUTDIR)/compile-
5049

5150
TARGETS += $(OUTPUTDIR)/compile_commands.json
5251

53-
all: $(TARGETS)
52+
################################################################################
5453

55-
.PHONY: all
54+
include MakeFileEnd.gmk

‎make/CompileDemos.gmk

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,17 @@
2323
# questions.
2424
#
2525

26+
include MakeFileStart.gmk
27+
2628
################################################################################
2729
# Build demos for the JDK into $(SUPPORT_OUTPUTDIR)/demos/image.
2830
################################################################################
2931

30-
default: all
31-
32-
include $(SPEC)
33-
include MakeBase.gmk
34-
3532
include CopyFiles.gmk
3633
include JavaCompilation.gmk
3734
include TextFileProcessing.gmk
3835
include ZipArchive.gmk
3936

40-
# Hook to include the corresponding custom file, if present.
41-
$(eval $(call IncludeCustomExtension, CompileDemos-pre.gmk))
42-
4337
# Prepare the find cache.
4438
DEMO_SRC_DIRS += $(TOPDIR)/src/demo
4539

@@ -264,11 +258,8 @@ ifneq ($(filter images, $(MAKECMDGOALS)), )
264258
IMAGES_TARGETS := $(COPY_TO_TEST_IMAGE)
265259
endif
266260

267-
################################################################################
268-
# Hook to include the corresponding custom file, if present.
269-
$(eval $(call IncludeCustomExtension, CompileDemos-post.gmk))
270-
271-
all: $(TARGETS)
272261
images: $(IMAGES_TARGETS)
273262

274-
.PHONY: all
263+
################################################################################
264+
265+
include MakeFileEnd.gmk

‎make/CompileInterimLangtools.gmk

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2014, 2025, 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
@@ -23,11 +23,9 @@
2323
# questions.
2424
#
2525

26-
# This must be the first rule
27-
default: all
26+
include MakeFileStart.gmk
2827

29-
include $(SPEC)
30-
include MakeBase.gmk
28+
################################################################################
3129

3230
include CopyFiles.gmk
3331
include JavaCompilation.gmk
@@ -148,5 +146,4 @@ TARGETS += $(BUILD_JAVAC_SERVER)
148146

149147
################################################################################
150148

151-
152-
all: $(TARGETS)
149+
include MakeFileEnd.gmk

‎make/CompileJavaModules.gmk

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2014, 2025, 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
@@ -23,13 +23,12 @@
2323
# questions.
2424
#
2525

26-
# This must be the first rule
27-
default: all
26+
include MakeFileStart.gmk
27+
28+
################################################################################
2829

29-
include $(SPEC)
30-
include MakeBase.gmk
31-
include Modules.gmk
3230
include JavaCompilation.gmk
31+
include Modules.gmk
3332

3433
include CopyFiles.gmk
3534

@@ -88,7 +87,15 @@ CreateHkTargets = \
8887
################################################################################
8988
# Include module specific build settings
9089

91-
-include Java.gmk
90+
THIS_SNIPPET := modules/$(MODULE)/Java.gmk
91+
92+
ifneq ($(wildcard $(THIS_SNIPPET)), )
93+
include MakeSnippetStart.gmk
94+
95+
include $(THIS_SNIPPET)
96+
97+
include MakeSnippetEnd.gmk
98+
endif
9299

93100
################################################################################
94101
# Setup the main compilation
@@ -194,6 +201,4 @@ endif
194201

195202
################################################################################
196203

197-
all: $(TARGETS)
198-
199-
.PHONY: all
204+
include MakeFileEnd.gmk

‎make/CompileModuleTools.gmk

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2013, 2025, 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
@@ -23,14 +23,12 @@
2323
# questions.
2424
#
2525

26-
default: all
27-
28-
include $(SPEC)
29-
include MakeBase.gmk
30-
include JavaCompilation.gmk
26+
include MakeFileStart.gmk
3127

3228
################################################################################
3329

30+
include JavaCompilation.gmk
31+
3432
TOOLS_CLASSES_DIR := $(BUILDTOOLS_OUTPUTDIR)/tools_jigsaw_classes
3533

3634
# When using an external BUILDJDK, make it possible to shortcut building of
@@ -64,4 +62,4 @@ TARGETS += $(BUILD_JIGSAW_TOOLS)
6462

6563
################################################################################
6664

67-
all: $(TARGETS)
65+
include MakeFileEnd.gmk

0 commit comments

Comments
 (0)