Skip to content

Commit

Permalink
merge latest from master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaikiran
jaikiran committed Feb 24, 2025
2 parents 73152bb + e410af0 commit d1ac517
Show file tree
Hide file tree
Showing 1,387 changed files with 26,461 additions and 18,705 deletions.
4 changes: 2 additions & 2 deletions .github/actions/get-gtest/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ runs:
- name: 'Export path to where GTest is installed'
id: path-name
run: |
# Export the path
echo 'path=gtest' >> $GITHUB_OUTPUT
# Export the absolute path
echo "path=`pwd`/gtest" >> $GITHUB_OUTPUT
shell: bash
4 changes: 2 additions & 2 deletions .github/actions/get-jtreg/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ runs:
- name: 'Export path to where JTReg is installed'
id: path-name
run: |
# Export the path
echo 'path=jtreg/installed' >> $GITHUB_OUTPUT
# Export the absolute path
echo "path=`pwd`/jtreg/installed" >> $GITHUB_OUTPUT
shell: bash
2 changes: 1 addition & 1 deletion .jcheck/conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ pattern=^([124-8][0-9]{6}): (\S.*)$
dirs=test/jdk|test/langtools|test/lib-test|test/hotspot/jtreg|test/jaxp

[checks "copyright"]
files=^(?!LICENSE|license\.txt|.*\.bin|.*\.gif|.*\.jpg|.*\.png|.*\.icon|.*\.tiff|.*\.dat|.*\.patch|.*\.wav|.*\.class|.*-header|.*\.jar|).*
files=^(?!LICENSE|license\.txt|.*\.bin|.*\.gif|.*\.jpg|.*\.png|.*\.icon|.*\.tiff|.*\.dat|.*\.patch|.*\.wav|.*\.class|.*-header|.*\.jar).*
oracle_locator=.*Copyright \(c\)(.*)Oracle and/or its affiliates\. All rights reserved\.
oracle_validator=.*Copyright \(c\) (\d{4})(?:, (\d{4}))?, Oracle and/or its affiliates\. All rights reserved\.
13 changes: 7 additions & 6 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2012, 2025, 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 All @@ -24,8 +24,9 @@
#

###
### This file is just a very small wrapper needed to run the real make/Init.gmk.
### It also performs some sanity checks on make.
### This file is just a very small wrapper which will include make/PreInit.gmk,
### where the real work is done. This wrapper also performs some sanity checks
### on make that must be done before we can include another file.
###

# The shell code below will be executed on /usr/bin/make on Solaris, but not in GNU Make.
Expand Down Expand Up @@ -58,7 +59,7 @@ ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))),)
else
makefile_path := $(lastword $(MAKEFILE_LIST))
endif
topdir := $(strip $(patsubst %/, %, $(dir $(makefile_path))))
TOPDIR := $(strip $(patsubst %/, %, $(dir $(makefile_path))))

# ... and then we can include the real makefile
include $(topdir)/make/Init.gmk
# ... and then we can include the real makefile to bootstrap the build
include $(TOPDIR)/make/PreInit.gmk
20 changes: 8 additions & 12 deletions make/Bundles.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2016, 2025, 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 All @@ -23,10 +23,9 @@
# questions.
#

default: all
include MakeFileStart.gmk

include $(SPEC)
include MakeBase.gmk
################################################################################

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

# Hook to include the corresponding custom file, if present.
$(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 @@ -502,11 +499,6 @@ endif

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

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

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

product-bundles: $(PRODUCT_TARGETS)
legacy-bundles: $(LEGACY_TARGETS)
test-bundles: $(TEST_TARGETS)
Expand All @@ -517,6 +509,10 @@ static-libs-bundles: $(STATIC_LIBS_TARGETS)
static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_TARGETS)
jcov-bundles: $(JCOV_TARGETS)

.PHONY: all default product-bundles test-bundles \
.PHONY: product-bundles test-bundles \
docs-jdk-bundles docs-javase-bundles docs-reference-bundles \
static-libs-bundles static-libs-graal-bundles jcov-bundles

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

include MakeFileEnd.gmk
11 changes: 5 additions & 6 deletions make/CompileCommands.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2018, 2025, 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 All @@ -23,10 +23,9 @@
# questions.
#

default: all
include MakeFileStart.gmk

include $(SPEC)
include MakeBase.gmk
################################################################################

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

TARGETS += $(OUTPUTDIR)/compile_commands.json

all: $(TARGETS)
################################################################################

.PHONY: all
include MakeFileEnd.gmk
19 changes: 5 additions & 14 deletions make/CompileDemos.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,17 @@
# questions.
#

include MakeFileStart.gmk

################################################################################
# Build demos for the JDK into $(SUPPORT_OUTPUTDIR)/demos/image.
################################################################################

default: all

include $(SPEC)
include MakeBase.gmk

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

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

# Prepare the find cache.
DEMO_SRC_DIRS += $(TOPDIR)/src/demo

Expand Down Expand Up @@ -264,11 +258,8 @@ ifneq ($(filter images, $(MAKECMDGOALS)), )
IMAGES_TARGETS := $(COPY_TO_TEST_IMAGE)
endif

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

all: $(TARGETS)
images: $(IMAGES_TARGETS)

.PHONY: all
################################################################################

include MakeFileEnd.gmk
11 changes: 4 additions & 7 deletions make/CompileInterimLangtools.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014, 2025, 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 All @@ -23,11 +23,9 @@
# questions.
#

# This must be the first rule
default: all
include MakeFileStart.gmk

include $(SPEC)
include MakeBase.gmk
################################################################################

include CopyFiles.gmk
include JavaCompilation.gmk
Expand Down Expand Up @@ -148,5 +146,4 @@ TARGETS += $(BUILD_JAVAC_SERVER)

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


all: $(TARGETS)
include MakeFileEnd.gmk
25 changes: 15 additions & 10 deletions make/CompileJavaModules.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014, 2025, 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 All @@ -23,13 +23,12 @@
# questions.
#

# This must be the first rule
default: all
include MakeFileStart.gmk

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

include $(SPEC)
include MakeBase.gmk
include Modules.gmk
include JavaCompilation.gmk
include Modules.gmk

################################################################################
# If this is an imported module that has prebuilt classes, only compile
Expand Down Expand Up @@ -86,7 +85,15 @@ CreateHkTargets = \
################################################################################
# Include module specific build settings

-include Java.gmk
THIS_SNIPPET := modules/$(MODULE)/Java.gmk

ifneq ($(wildcard $(THIS_SNIPPET)), )
include MakeSnippetStart.gmk

include $(THIS_SNIPPET)

include MakeSnippetEnd.gmk
endif

################################################################################
# Setup the main compilation
Expand Down Expand Up @@ -148,6 +155,4 @@ endif

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

all: $(TARGETS)

.PHONY: all
include MakeFileEnd.gmk
12 changes: 5 additions & 7 deletions make/CompileModuleTools.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2013, 2025, 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 All @@ -23,14 +23,12 @@
# questions.
#

default: all

include $(SPEC)
include MakeBase.gmk
include JavaCompilation.gmk
include MakeFileStart.gmk

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

include JavaCompilation.gmk

TOOLS_CLASSES_DIR := $(BUILDTOOLS_OUTPUTDIR)/tools_jigsaw_classes

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

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

all: $(TARGETS)
include MakeFileEnd.gmk
18 changes: 5 additions & 13 deletions make/CompileToolsHotspot.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2016, 2025, 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 All @@ -23,19 +23,12 @@
# questions.
#

# This must be the first rule
default: all
include MakeFileStart.gmk

include $(SPEC)
include MakeBase.gmk
################################################################################

include JavaCompilation.gmk

TARGETS :=

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

################################################################################
# Build tools needed for the JFR source code generation

Expand All @@ -51,7 +44,6 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_HOTSPOT, \

TARGETS += $(BUILD_TOOLS_HOTSPOT)

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

all: $(TARGETS)

.PHONY: all
include MakeFileEnd.gmk
17 changes: 6 additions & 11 deletions make/CompileToolsJdk.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2025, 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 All @@ -23,21 +23,14 @@
# questions.
#

default: all
include MakeFileStart.gmk

include $(SPEC)
include MakeBase.gmk
################################################################################

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

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

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

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

# Use += to be able to add to this from a custom extension
BUILD_TOOLS_SRC_DIRS += \
$(TOPDIR)/make/jdk/src/classes \
Expand Down Expand Up @@ -160,4 +153,6 @@ ifeq ($(ENABLE_PANDOC), true)
TARGETS += $(PANDOC_HTML_MANPAGE_FILTER_SETUP)
endif

all: $(TARGETS)
################################################################################

include MakeFileEnd.gmk
15 changes: 8 additions & 7 deletions make/CopyImportModules.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2015, 2025, 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 All @@ -23,13 +23,12 @@
# questions.
#

include MakeFileStart.gmk

################################################################################
# This makefile is called for every imported module to copy the non class
# contents into the exploded jdk image.

default: all

include $(SPEC)
include MakeBase.gmk
################################################################################

include CopyFiles.gmk

Expand Down Expand Up @@ -103,4 +102,6 @@ ifneq ($(CONF_DIR), )
TARGETS += $(COPY_CONF)
endif

all: $(TARGETS)
################################################################################

include MakeFileEnd.gmk
Loading

0 comments on commit d1ac517

Please sign in to comment.