fixup! remove jdk.compiler from modules.list

Reviewed-by: dholmes, pchilanomate, coleenp

.github/README.md

@@ -1,245 +0,0 @@
-[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
-
-# Welcome to JetBrains Runtime!
-
-JetBrains Runtime is a fork of [OpenJDK](https://github.com/openjdk/jdk) available for Windows, Mac OS X, and Linux.
-It supports enhanced class redefinition ([DCEVM](https://ssw.jku.at/dcevm/)),
-features optional [JCEF](https://github.com/JetBrains/jcef), a framework for embedding Chromium-based browsers,
-includes a number of improvements in font rendering, keyboards support, 
-windowing/focus subsystems, HiDPI, accessibility, and performance, provides better desktop integration
-and bugfixes not yet present in OpenJDK.
-
-> **_NOTE_**: This is a **development** branch that is periodically synchronized with 
-> the [OpenJDK master](https://github.com/openjdk/jdk/tree/master) branch.
-> 
- Release builds are based on these branches:
- * [jbr11](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr11) (JDK 11)
- * [jbr17](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr17) (JDK 17)
- * [jbr21](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr21) (JDK 21)
-
-Download the latest releases of JetBrains Runtime to use with JetBrains IDEs. The full list
-can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntime/releases).
-
-## Releases based on JDK 21
-
-| IDE Version | Latest JBR                                                                                              | Date Released |
-|-------------|---------------------------------------------------------------------------------------------------------|---------------|
-| 2025.1      | [21.0.6-b872.80](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.6b872.80)  | 03-Feb-2025   |
-| 2024.3      | [21.0.5-b631.28](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.5b631.28)  | 26-Nov-2024   |
-| 2024.2      | [21.0.4-b509.30](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.5b509.30)  | 26-Nov-2024   |
-| 2024.1      | [21.0.2-b346.3](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.2b346.3)    | 30-Jan-2024   |
-
-## Releases based on JDK 17
-
-| IDE Version | Latest JBR                                                                                             | Date Released |
-|-------------|--------------------------------------------------------------------------------------------------------|---------------|
-| 2024.2      | [17.0.11-b1312.2](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.11b1312.2)   | 18-Jun-2024|
-| 2024.1      | [17.0.12-b1207.37](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1207.37) | 15-Oct-2024|
-| 2023.3      | [17.0.12-b1087.25](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1087.25) | 02-Sep-2024|
-| 2023.2      | [17.0.12-b1000.54](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1000.54) | 02-Sep-2024|
-| 2023.1      | [17.0.10-b829.27](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.10b829.27) | 21-Mar-2024  |
-| 2022.3      | [17.0.6-b653.34](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b653.34) | 28-Feb-2023   |
-| 2022.2      | [17.0.6-b469.82](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b469.82) | 06-Mar-2023   |
-
-## Releases based on JDK 11
-
-| IDE Version | Latest JBR                                                                                            | Date Released |
-|-------------|-------------------------------------------------------------------------------------------------------|---------------|
-| 2022.1      | [11_0_16-b2043.64](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr11_0_16b2043.64)     | 10-Nov-2022   |
-| 2021.3      | [11_0_14_1-b1751.46](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr11_0_14_1b1751.46) | 21-Feb-2022   |
-| 2021.2      | [11_0_13-b1504.49](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jb11_0_13-b1504.49)     | 15-Nov-2021   |
-| 2021.1      | [11.0.11+9-b1341.60](https://github.com/JetBrains/JetBrainsRuntime/issues/171#issuecomment-1248891540)| 15-Jun-2021   |
-| 2020.3      | [11_0_10-b1145.115](https://github.com/JetBrains/JetBrainsRuntime/issues/171#issuecomment-1249243977) | 21-Jun-2021   |
-
-## Contents
-- [Welcome to JetBrains Runtime](#welcome-to-jetbrains-runtime)
-  - [Why Use JetBrains Runtime?](#why-use-jetbrains-runtime)
-  - [Products Built on JetBrains Runtime](#products-built-on-jetbrains-runtime)
-  - [Getting Sources](#getting-sources)
-    - [macOS, Linux](#macos-linux)
-    - [Windows](#sources-windows)
-  - [Configuring the Build Environment](#configuring-the-build-environment)
-    - [Linux (Docker)](#linux-docker)
-    - [Ubuntu Linux](#ubuntu-linux)
-    - [Windows](#build-windows)
-    - [macOS](#macos)
-  - [Developing](#developing)
-  - [Contributing](#contributing)
-  - [Resources](#resources)
-
-## Why Use JetBrains Runtime?
-* **Embedded browser**: JetBrains Runtime includes the Java Chromium Embedded Framework ([JCEF](https://github.com/JetBrains/jcef)), which
-  enables you to embed a Chromium-based browsers in your JVM-based application. 
- To use it, [download a build with JCEF](https://github.com/JetBrains/JetBrainsRuntime/releases).
-* **Enhanced class re-definition** with the [DCEVM](https://ssw.jku.at/dcevm/) technology that makes it easier to reload
-  changed code without restarting JVM; this feature needs to be explicitly enabled with `-XX:+AllowEnhancedClassRedefinition`.
-* **Better FPS performance** for graphics-intensive applications.
-* **Improved font rendering**, **keyboard input** (such as shortcuts and multinational keyboards),
-  **HiDPI** and **accessibility** support.
-* **Robust desktop experience**: GUI-related fixes often reach JetBrains Runtime much earlier than the corresponding version of OpenJDK.
-
-## Products Built on JetBrains Runtime
-* [Android Studio](https://developer.android.com/studio). The official IDE for Google's Android operating system.
-* [CLion](https://www.jetbrains.com/clion/). A cross-platform IDE for C and C++ from JetBrains.
-* [DataGrip](https://www.jetbrains.com/datagrip/). The IDE for Databases and SQL from JetBrains.
-* [GoLand](https://www.jetbrains.com/go/). The cross-platform Go IDE from JetBrains.
-* [IntelliJ IDEA](https://www.jetbrains.com/idea/). The IDE for JVM from JetBrains.
-* [JProfiler](https://www.ej-technologies.com/products/jprofiler/overview.html). The Java profiler.
-* [PhpStorm](https://www.jetbrains.com/phpstorm/). The PHP IDE from JetBrains.
-* [PyCharm](https://www.jetbrains.com/pycharm/). The Python IDE from JetBrains.
-* [Rider](https://www.jetbrains.com/rider/). The cross-platform .NET IDE from JetBrains.
-* [RubyMine](https://www.jetbrains.com/ruby/). The Ruby and Rails IDE from JetBrains.
-* [Toolbox App](https://www.jetbrains.com/toolbox-app/). JetBrains IDE manager.
-* [WebStorm](https://www.jetbrains.com/webstorm/). The JavaScript IDE from JetBrains.
-* [YourKit](https://www.yourkit.com/). Java and .NET profilers.
-
-## Getting Sources
-### macOS, Linux
-```
-git config --global core.autocrlf input
-git clone git@github.com:JetBrains/JetBrainsRuntime.git
-```
-
-### Windows
-<a name="sources-windows"></a>
-```
-git config --global core.autocrlf false
-git clone git@github.com:JetBrains/JetBrainsRuntime.git
-```
-
-## Configuring the Build Environment
-Here are quick per-platform instructions for those who can't wait to get started. 
-Please refer to [OpenJDK build docs](https://openjdk.java.net/groups/build/doc/building.html) for in-depth
-coverage of all the details.
-
-> **_TIP:_**  To get a preliminary report of what's missing, run `./configure` and check its output. 
-> It would usually have meaningful advice on how to solve the problem.
-
-### Linux (Docker)
-Download an image from [Docker Hub](https://hub.docker.com/repository/docker/jetbrains/runtime/general) related to your architecture:
-```
-$ docker pull jetbrains/runtime:oraclelinux8_aarch64
-```
-or
-```
-$ docker pull jetbrains/runtime:oraclelinux8_x64
-```
-Create and run a new container from the downloaded image
-```
-$ docker run -v $JetBrainsRuntime:/JetBrainsRuntime -it jetbrains/runtime:oraclelinux8_[arch]
-```
-where `$JetBrainsRuntime` is a full path to the directory where the repository was cloned to.
-
-Run these commands in the container:
-```
-# cd /JetBrainsRuntime
-# sh ./configure
-# make images
-```
-
-### Ubuntu Linux
-Install the necessary tools, libraries, and headers with:
-```
-$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev \
-       libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev libspeechd-dev libwayland-dev \
-       wayland-protocols libxkbcommon-x11-0
-```
-Get Java 23 (for instance, [Azul Zulu Builds of OpenJDK 23](https://www.azul.com/downloads/?version=java-23&os=linux&package=jdk#zulu)).
-
-Then run the following:
-```
-$ cd JetBrainsRuntime
-$ git checkout main
-$ sh ./configure
-$ make images
-```
-This will build the release configuration under `./build/linux-x86_64-server-release/`.
-
-### Windows
-<a name="build-windows"></a>
-Install the following:
-* [Cygwin x64](http://www.cygwin.com/).
-  Required packages: `autoconf`, `binutils`, `cpio`, `diffutils`, `file`, `gawk`, `gcc-core`, `make`, `m4`, `unzip`, `zip`.  
-  Install those together with Cygwin.
-* [Visual Studio compiler toolset](https://visualstudio.microsoft.com/downloads/).
-  Install with the desktop development kit, which includes Windows SDK and compilers.
-  Visual Studio 2019 is supported by default.
-* Java 21 (for instance, [Azul Zulu Builds of OpenJDK 21](https://www.azul.com/downloads/?version=java-21-lts&os=windows&package=jdk#zulu)).
-  If you have problems while configuring, read [Java tips on Cygwin](http://horstmann.com/articles/cygwin-tips.html).
-
-From the command line: 
-```
-"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-"c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
-```
-The first command sets up environment variables, the second starts a Cygwin shell with the proper environment.  
-
-In the Cygwin shell: 
-```
-$ cd JetBrainsRuntime
-$ git checkout main
-$ bash configure --with-toolchain-version=2019
-$ make images
-```
-This will build the release configuration under `./build/windows-x86_64-server-release/`.
-
-#### Enable optional NVDA screen reader support
-If you want to add support of a11y announcing via [NVDA screen reader](https://www.nvaccess.org/about-nvda/),
-you will need to bundle the NVDA Controller Client library.
-You can do it with the following steps:
-1. Download the NVDA Controller Client library. You can find the link in its official README [here](https://github.com/nvaccess/nvda/blob/master/extras/controllerClient/readme.md)
-2. Pass the path to the unpacked package to `configure` via an additional flag `--with-nvdacontrollerclient=<path>`.
-   The build system will search the required library files under `<path>/<target-arch>`.
-
-#### Disable optional JAWS screen reader support
-JBR is built with built-in support of JAWS screen reader.
-If you want to disable it, run `configure` with the additional flag `--disable-jaws-client`.
-
-### macOS
-Install the following:
-* Xcode command line developer tools and `autoconf` via [Homebrew](https://brew.sh/).
-* Java 21 (for instance, [Azul Zulu Builds of OpenJDK 21](https://www.azul.com/downloads/?version=java-21-lts&os=macos&package=jdk#zulu)).
-
-From the command line:
-```
-$ cd JetBrainsRuntime
-$ git checkout main
-$ sh ./configure
-$ make images
-```
-This will build the release configuration under `./build/macosx-x86_64-server-release/`.
-
-## Developing
-You can use  [CLion](https://www.jetbrains.com/clion/) to develop native parts of the JetBrains Runtime and
-[IntelliJ IDEA](https://www.jetbrains.com/idea/) for the parts written in Java.
-Both require projects to be created.
-
-### CLion
-Run
-```
-$ make compile-commands
-```
-in the git root and open the resulting `build/.../compile_commands.json` file as a project.
-Then use `Tools | Compilation Database | Change Project Root` to point to git root of this repository.
-
-See also this detailed step-by-step tutorial for all platforms:
-[How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).
-
-### IDEA
-Run
-```
-$ sh ./bin/idea.sh
-```
-in the git root to generate project files (add `--help` for options). If you have multiple
-configurations (for example, `release` and `fastdebug`), supply the `--conf <conf_name>` argument.
-Then open the git root directory as a project in IDEA.
-
-## Contributing
-We are happy to receive your pull requests! 
-Before you submit one, please sign our [Contributor License Agreement (CLA)](https://www.jetbrains.com/agreements/cla/).
-
-## Resources
-* [JetBrains Runtime on GitHub](https://github.com/JetBrains/JetBrainsRuntime).
-* [OpenJDK build instructions](https://openjdk.java.net/groups/build/doc/building.html).
-* [OpenJDK test instructions](https://htmlpreview.github.io/?https://raw.githubusercontent.com/openjdk/jdk/master/doc/building.html#running-tests).
-* [How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).

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

@@ -49,6 +49,6 @@ runs:
     - name: 'Export path to where GTest is installed'
       id: path-name
       run: |
-        # Export the absolute path
-        echo "path=`pwd`/gtest" >> $GITHUB_OUTPUT
+        # Export the path
+        echo 'path=gtest' >> $GITHUB_OUTPUT
       shell: bash

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

@@ -49,6 +49,6 @@ runs:
     - name: 'Export path to where JTReg is installed'
       id: path-name
       run: |
-        # Export the absolute path
-        echo "path=`pwd`/jtreg/installed" >> $GITHUB_OUTPUT
+        # Export the path
+        echo 'path=jtreg/installed' >> $GITHUB_OUTPUT
       shell: bash

.github/workflows/main.yml

@@ -31,7 +31,6 @@ on:
       - master
       - pr/*
       - jdk*
-      - main
   workflow_dispatch:
     inputs:
       platforms:

.github/workflows/pr.yml

@@ -1,270 +0,0 @@
-#
-# Copyright 2000-2023 JetBrains s.r.o.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Build OpenJDK on pull request'
-
-on:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  ###
-  ### Determine platforms to include
-  ###
-  select:
-    name: 'Select platforms'
-    runs-on: ubuntu-22.04
-    outputs:
-      linux-x64: ${{ steps.include.outputs.linux-x64 }}
-      linux-x86: ${{ steps.include.outputs.linux-x86 }}
-      linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
-      macos-x64: ${{ steps.include.outputs.macos-x64 }}
-      macos-aarch64: ${{ steps.include.outputs.macos-aarch64 }}
-      windows-x64: ${{ steps.include.outputs.windows-x64 }}
-      windows-aarch64: ${{ steps.include.outputs.windows-aarch64 }}
-      windows-x86: ${{ steps.include.outputs.windows-x86 }}
-
-    steps:
-      # This function must be inlined in main.yml, or we'd be forced to checkout the repo
-      - name: 'Check what jobs to run'
-        id: include
-        run: |
-          # Determine which platform jobs to run
-
-          # Returns 'true' if the input platform list matches any of the platform monikers given as argument,
-          # 'false' otherwise.
-          # arg $1: platform name or names to look for
-          function check_platform() {
-            if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
-              input='${{ github.event.inputs.platforms }}'
-            elif [[ $GITHUB_EVENT_NAME == push ]]; then
-              if [[ '${{ !secrets.JDK_SUBMIT_FILTER || startsWith(github.ref, 'refs/heads/submit/') }}' == 'false' ]]; then
-                # If JDK_SUBMIT_FILTER is set, and this is not a "submit/" branch, don't run anything
-                >&2 echo 'JDK_SUBMIT_FILTER is set and not a "submit/" branch'
-                echo 'false'
-                return
-              else
-                input='${{ secrets.JDK_SUBMIT_PLATFORMS }}'
-              fi
-            fi
-
-            normalized_input="$(echo ,$input, | tr -d ' ')"
-            if [[ "$normalized_input" == ",," ]]; then
-              # For an empty input, assume all platforms should run
-              echo 'true'
-              return
-            else
-              # Check for all acceptable platform names
-              for part in $* ; do
-                if echo "$normalized_input" | grep -q -e ",$part," ; then
-                  echo 'true'
-                  return
-                fi
-              done
-            fi
-
-            echo 'false'
-          }
-
-          echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
-          echo "linux-x86=$(check_platform linux-x86 linux x86)" >> $GITHUB_OUTPUT
-          echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT
-          echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT
-          echo "macos-x64=$(check_platform macos-x64 macos x64)" >> $GITHUB_OUTPUT
-          echo "macos-aarch64=$(check_platform macos-aarch64 macos aarch64)" >> $GITHUB_OUTPUT
-          echo "windows-x64=$(check_platform windows-x64 windows x64)" >> $GITHUB_OUTPUT
-          echo "windows-x86=$(check_platform windows-x86 windows x86)" >> $GITHUB_OUTPUT
-          echo "windows-aarch64=$(check_platform windows-aarch64 windows aarch64)" >> $GITHUB_OUTPUT
-          echo "docs=$(check_platform docs)" >> $GITHUB_OUTPUT
-
-  ###
-  ### Build jobs
-  ###
-
-  build-linux-x64:
-    name: linux-x64
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    # The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
-    if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
-
-  build-linux-x86:
-    name: linux-x86
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x86
-      gcc-major-version: '10'
-      gcc-package-suffix: '-multilib'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
-      apt-architecture: 'i386'
-      # Some multilib libraries do not have proper inter-dependencies, so we have to
-      # install their dependencies manually.
-      apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386'
-      extra-conf-options: '--with-target-bits=32'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.linux-x86 == 'true'
-
-  build-linux-cross-compile:
-    name: linux-cross-compile
-    needs:
-      - select
-      - build-linux-x64
-    uses: ./.github/workflows/build-cross-compile.yml
-    with:
-      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
-      apt-gcc-cross-version: '10.4.0-4ubuntu1~22.04cross1'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.linux-cross-compile == 'true'
-
-  build-macos-x64:
-    name: macos-x64
-    needs: select
-    uses: ./.github/workflows/build-macos.yml
-    with:
-      platform: macos-x64
-      xcode-toolset-version: '12.5.1'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.macos-x64 == 'true'
-
-  build-macos-aarch64:
-    name: macos-aarch64
-    needs: select
-    uses: ./.github/workflows/build-macos.yml
-    with:
-      platform: macos-aarch64
-      xcode-toolset-version: '12.5.1'
-      extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.macos-aarch64 == 'true'
-
-  build-windows-x64:
-    name: windows-x64
-    needs: select
-    uses: ./.github/workflows/build-windows.yml
-    with:
-      platform: windows-x64
-      msvc-toolset-version: '14.29'
-      msvc-toolset-architecture: 'x86.x64'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.windows-x64 == 'true'
-
-  build-windows-x86:
-    name: windows-x86
-    needs: select
-    uses: ./.github/workflows/build-windows.yml
-    with:
-      platform: windows-x86
-      msvc-toolset-version: '14.29'
-      msvc-toolset-architecture: 'x86'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.windows-x86 == 'true'
-
-  build-windows-aarch64:
-    name: windows-aarch64
-    needs: select
-    uses: ./.github/workflows/build-windows.yml
-    with:
-      platform: windows-aarch64
-      msvc-toolset-version: '14.29'
-      msvc-toolset-architecture: 'arm64'
-      make-target: 'hotspot'
-      extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.windows-aarch64 == 'true'
-
-  build-docs:
-    name: docs
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      debug-levels: '[ "debug" ]'
-      make-target: 'docs-jdk-bundles'
-      # Make sure we never try to make full docs, since that would require a
-      # build JDK, and we do not need the additional testing of the graphs.
-      extra-conf-options: '--disable-full-docs'
-      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.docs == 'true'
-
-  # Remove bundles so they are not misconstrued as binary distributions from the JDK project
-  remove-bundles:
-    name: 'Remove bundle artifacts'
-    runs-on: ubuntu-22.04
-    if: always()
-    needs:
-      - build-linux-x64
-      - build-linux-x86
-      - build-linux-cross-compile
-      - build-macos-x64
-      - build-macos-aarch64
-      - build-windows-x64
-      - build-windows-aarch64
-      - build-windows-x86
-
-    steps:
-      # Hack to get hold of the api environment variables that are only defined for actions
-      - name: 'Get API configuration'
-        id: api
-        uses: actions/github-script@v6
-        with:
-          script: 'return { url: process.env["ACTIONS_RUNTIME_URL"], token: process.env["ACTIONS_RUNTIME_TOKEN"] }'
-
-      - name: 'Remove bundle artifacts'
-        run: |
-          # Find and remove all bundle artifacts
-          ALL_ARTIFACT_URLS="$(curl -s \
-              -H 'Accept: application/json;api-version=6.0-preview' \
-              -H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
-              '${{ fromJson(steps.api.outputs.result).url }}_apis/pipelines/workflows/${{ github.run_id }}/artifacts?api-version=6.0-preview')"
-          BUNDLE_ARTIFACT_URLS="$(echo "$ALL_ARTIFACT_URLS" | jq -r -c '.value | map(select(.name|startswith("bundles-"))) | .[].url')"
-          for url in $BUNDLE_ARTIFACT_URLS; do
-            echo "Removing $url"
-            curl -s \
-                -H 'Accept: application/json;api-version=6.0-preview' \
-                -H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
-                -X DELETE "$url" \
-            || echo "Failed to remove bundle"
-          done

.gitignore

@@ -22,4 +22,3 @@ NashornProfile.txt
 /.cache
 /.gdbinit
 /.lldbinit
-/jbr-api/

Makefile

@@ -59,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 to bootstrap the build
-include $(TOPDIR)/make/PreInit.gmk
+include $(topdir)/make/PreInit.gmk

README.md

@@ -1,5 +1,3 @@
-[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
-
 # Welcome to the JDK!
 
 For build instructions please see the

bin/idea.sh

@@ -25,26 +25,7 @@
 # Shell script for generating an IDEA project from a given list of modules
 
 usage() {
-      echo "Usage: $0 [-h|--help] [-q|--quiet] [-a|--absolute-paths] [-r|--root <path>] [-o|--output <path>] [-c|--conf <conf_name>] [modules...]"
-      echo "    -h | --help"
-      echo "    -q | --quiet
-        No stdout output"
-      echo "    -a | --absolute-paths
-        Use absolute paths to this jdk, so that generated .idea
-        project files can be moved independently of jdk sources"
-      echo "    -r | --root <path>
-        Project content root
-        Default: $TOPLEVEL_DIR"
-      echo "    -o | --output <path>
-        Where .idea directory with project files will be generated
-        (e.g. using '-o .' will place project files in './.idea')
-        Default: same as --root"
-      echo "    -c | --conf <conf_name>
-        make configuration (release, slowdebug etc)"
-      echo "    [modules...]
-        Generate project modules for specific java modules
-        (e.g. 'java.base java.desktop')
-        Default: all existing modules (java.* and jdk.*)"
+      echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [-c|--conf <conf_name>] [modules]+"
       exit 1
 }
 
@@ -52,13 +33,10 @@ SCRIPT_DIR=`dirname $0`
 #assume TOP is the dir from which the script has been called
 TOP=`pwd`
 cd $SCRIPT_DIR; SCRIPT_DIR=`pwd`
-if [ "x$TOPLEVEL_DIR" = "x" ] ; then
-  cd .. ; TOPLEVEL_DIR=`pwd`
-fi
 cd $TOP;
 
-VERBOSE=true
-ABSOLUTE_PATHS=false
+IDEA_OUTPUT=$TOP/.idea
+VERBOSE="false"
 CONF_ARG=
 while [ $# -gt 0 ]
 do
@@ -67,24 +45,14 @@ do
       usage
       ;;
 
-    -q | --quiet )
-      VERBOSE=false
-      ;;
-
-    -a | --absolute-paths )
-      ABSOLUTE_PATHS=true
-      ;;
-
-    -r | --root )
-      TOPLEVEL_DIR="$2"
-      shift
+    -v | --vebose )
+      VERBOSE="true"
       ;;
 
     -o | --output )
-      IDEA_OUTPUT="$2/.idea"
+      IDEA_OUTPUT=$2/.idea
       shift
       ;;
-
     -c | --conf )
       CONF_ARG="CONF_NAME=$2"
       shift
@@ -101,17 +69,20 @@ do
   shift
 done
 
-if [ "x$IDEA_OUTPUT" = "x" ] ; then
-  IDEA_OUTPUT="$TOPLEVEL_DIR/.idea"
+if [ -e $IDEA_OUTPUT ] ; then
+    rm -r $IDEA_OUTPUT
+fi
+mkdir -p $IDEA_OUTPUT || exit 1
+cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
+
+if [ "x$TOPLEVEL_DIR" = "x" ] ; then
+    cd $SCRIPT_DIR/..
+    TOPLEVEL_DIR=`pwd`
+    cd $IDEA_OUTPUT
 fi
 
-mkdir -p $IDEA_OUTPUT || exit 1
-cd "$TOP" ; cd $TOPLEVEL_DIR; TOPLEVEL_DIR=`pwd`
-cd "$TOP" ; cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
-cd ..; IDEA_OUTPUT_PARENT=`pwd`
-cd "$SCRIPT_DIR/.." ; OPENJDK_DIR=`pwd`
-
-IDEA_MAKE="$OPENJDK_DIR/make/ide/idea/jdk"
+MAKE_DIR="$SCRIPT_DIR/../make"
+IDEA_MAKE="$MAKE_DIR/ide/idea/jdk"
 IDEA_TEMPLATE="$IDEA_MAKE/template"
 
 cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
@@ -123,31 +94,31 @@ if [ -d "$TEMPLATES_OVERRIDE" ] ; then
     done
 fi
 
-if [ "$VERBOSE" = true ] ; then
-  echo "Will generate IDEA project files in \"$IDEA_OUTPUT\" for project \"$TOPLEVEL_DIR\""
+if [ "$VERBOSE" = "true" ] ; then
+  echo "output dir: $IDEA_OUTPUT"
+  echo "idea template dir: $IDEA_TEMPLATE"
 fi
 
-cd $TOP ; make idea-gen-config ALLOW=TOPLEVEL_DIR,IDEA_OUTPUT_PARENT,IDEA_OUTPUT,MODULES TOPLEVEL_DIR="$TOPLEVEL_DIR" \
-    IDEA_OUTPUT_PARENT="$IDEA_OUTPUT_PARENT" IDEA_OUTPUT="$IDEA_OUTPUT" MODULES="$*" $CONF_ARG || exit 1
+cd $TOP ; make idea-gen-config ALLOW=IDEA_OUTPUT,MODULES IDEA_OUTPUT=$IDEA_OUTPUT MODULES="$*" $CONF_ARG || exit 1
 cd $SCRIPT_DIR
 
 . $IDEA_OUTPUT/env.cfg
 
-# Expect MODULES, MODULE_NAMES, RELATIVE_PROJECT_DIR, RELATIVE_BUILD_DIR to be set
-if [ "xMODULES" = "x" ] ; then
-  echo "FATAL: MODULES is empty" >&2; exit 1
+# Expect MODULE_ROOTS, MODULE_NAMES, BOOT_JDK & SPEC to be set
+if [ "x$MODULE_ROOTS" = "x" ] ; then
+  echo "FATAL: MODULE_ROOTS is empty" >&2; exit 1
 fi
 
 if [ "x$MODULE_NAMES" = "x" ] ; then
   echo "FATAL: MODULE_NAMES is empty" >&2; exit 1
 fi
 
-if [ "x$RELATIVE_PROJECT_DIR" = "x" ] ; then
-  echo "FATAL: RELATIVE_PROJECT_DIR is empty" >&2; exit 1
+if [ "x$BOOT_JDK" = "x" ] ; then
+  echo "FATAL: BOOT_JDK is empty" >&2; exit 1
 fi
 
-if [ "x$RELATIVE_BUILD_DIR" = "x" ] ; then
-  echo "FATAL: RELATIVE_BUILD_DIR is empty" >&2; exit 1
+if [ "x$SPEC" = "x" ] ; then
+  echo "FATAL: SPEC is empty" >&2; exit 1
 fi
 
 if [ -d "$TOPLEVEL_DIR/.hg" ] ; then
@@ -158,43 +129,6 @@ if [ -d "$TOPLEVEL_DIR/.git" ] ; then
     VCS_TYPE="Git"
 fi
 
-if [ "$ABSOLUTE_PATHS" = true ] ; then
-  if [ "x$PATHTOOL" != "x" ]; then
-    PROJECT_DIR="`$PATHTOOL -am $OPENJDK_DIR`"
-    TOPLEVEL_PROJECT_DIR="`$PATHTOOL -am $TOPLEVEL_DIR`"
-  else
-    PROJECT_DIR="$OPENJDK_DIR"
-    TOPLEVEL_PROJECT_DIR="$TOPLEVEL_DIR"
-  fi
-  MODULE_DIR="$PROJECT_DIR"
-  TOPLEVEL_MODULE_DIR="$TOPLEVEL_PROJECT_DIR"
-  cd "$IDEA_OUTPUT_PARENT" && cd "$RELATIVE_BUILD_DIR" && BUILD_DIR="`pwd`"
-  CLION_SCRIPT_TOPDIR="$OPENJDK_DIR"
-  CLION_PROJECT_DIR="$PROJECT_DIR"
-else
-  if [ "$RELATIVE_PROJECT_DIR" = "." ] ; then
-    PROJECT_DIR=""
-  else
-    PROJECT_DIR="/$RELATIVE_PROJECT_DIR"
-  fi
-  if [ "$RELATIVE_TOPLEVEL_PROJECT_DIR" = "." ] ; then
-    TOPLEVEL_PROJECT_DIR=""
-  else
-    TOPLEVEL_PROJECT_DIR="/$RELATIVE_TOPLEVEL_PROJECT_DIR"
-  fi
-  MODULE_DIR="\$MODULE_DIR\$$PROJECT_DIR"
-  PROJECT_DIR="\$PROJECT_DIR\$$PROJECT_DIR"
-  TOPLEVEL_MODULE_DIR="\$MODULE_DIR\$$TOPLEVEL_PROJECT_DIR"
-  TOPLEVEL_PROJECT_DIR="\$PROJECT_DIR\$$TOPLEVEL_PROJECT_DIR"
-  BUILD_DIR="\$PROJECT_DIR\$/$RELATIVE_BUILD_DIR"
-  CLION_SCRIPT_TOPDIR="$CLION_RELATIVE_PROJECT_DIR"
-  CLION_PROJECT_DIR="\$PROJECT_DIR\$/$CLION_SCRIPT_TOPDIR"
-fi
-if [ "$VERBOSE" = true ] ; then
-  echo "Project root: $PROJECT_DIR"
-  echo "Generating IDEA project files..."
-fi
-
 ### Replace template variables
 
 NUM_REPLACEMENTS=0
@@ -218,106 +152,116 @@ add_replacement() {
     eval TO$NUM_REPLACEMENTS='$2'
 }
 
-add_replacement "###PATHTOOL###" "$PATHTOOL"
-add_replacement "###CLION_SCRIPT_TOPDIR###" "$CLION_SCRIPT_TOPDIR"
-add_replacement "###CLION_PROJECT_DIR###" "$CLION_PROJECT_DIR"
-add_replacement "###PROJECT_DIR###" "$PROJECT_DIR"
-add_replacement "###MODULE_DIR###" "$MODULE_DIR"
-add_replacement "###TOPLEVEL_PROJECT_DIR###" "$TOPLEVEL_PROJECT_DIR"
-add_replacement "###TOPLEVEL_MODULE_DIR###" "$TOPLEVEL_MODULE_DIR"
 add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
 add_replacement "###VCS_TYPE###" "$VCS_TYPE"
-add_replacement "###BUILD_DIR###" "$BUILD_DIR"
-add_replacement "###RELATIVE_BUILD_DIR###" "$RELATIVE_BUILD_DIR"
-if [ "x$PATHTOOL" != "x" ]; then
-  add_replacement "###BASH_RUNNER_PREFIX###" "\$PROJECT_DIR\$/.idea/bash.bat"
-else
-  add_replacement "###BASH_RUNNER_PREFIX###" ""
-fi
-if [ "x$PATHTOOL" != "x" ]; then
+SPEC_DIR=`dirname $SPEC`
+if [ "x$CYGPATH" != "x" ]; then
+    add_replacement "###BUILD_DIR###" "`$CYGPATH -am $SPEC_DIR`"
+    add_replacement "###IMAGES_DIR###" "`$CYGPATH -am $SPEC_DIR`/images/jdk"
+    add_replacement "###ROOT_DIR###" "`$CYGPATH -am $TOPLEVEL_DIR`"
+    add_replacement "###IDEA_DIR###" "`$CYGPATH -am $IDEA_OUTPUT`"
     if [ "x$JT_HOME" = "x" ]; then
       add_replacement "###JTREG_HOME###" ""
     else
-      add_replacement "###JTREG_HOME###" "`$PATHTOOL -am $JT_HOME`"
+      add_replacement "###JTREG_HOME###" "`$CYGPATH -am $JT_HOME`"
+    fi
+elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
+    add_replacement "###BUILD_DIR###" "`wslpath -am $SPEC_DIR`"
+    add_replacement "###IMAGES_DIR###" "`wslpath -am $SPEC_DIR`/images/jdk"
+    add_replacement "###ROOT_DIR###" "`wslpath -am $TOPLEVEL_DIR`"
+    add_replacement "###IDEA_DIR###" "`wslpath -am $IDEA_OUTPUT`"
+    if [ "x$JT_HOME" = "x" ]; then
+      add_replacement "###JTREG_HOME###" ""
+    else
+      add_replacement "###JTREG_HOME###" "`wslpath -am $JT_HOME`"
     fi
 else
+    add_replacement "###BUILD_DIR###" "$SPEC_DIR"
     add_replacement "###JTREG_HOME###" "$JT_HOME"
+    add_replacement "###IMAGES_DIR###" "$SPEC_DIR/images/jdk"
+    add_replacement "###ROOT_DIR###" "$TOPLEVEL_DIR"
+    add_replacement "###IDEA_DIR###" "$IDEA_OUTPUT"
 fi
 
-MODULE_IMLS=""
-TEST_MODULE_DEPENDENCIES=""
-for module in $MODULE_NAMES; do
-    MODULE_IMLS="$MODULE_IMLS<module fileurl=\"file://\$PROJECT_DIR$/.idea/$module.iml\" filepath=\"\$PROJECT_DIR$/.idea/$module.iml\" /> "
-    TEST_MODULE_DEPENDENCIES="$TEST_MODULE_DEPENDENCIES<orderEntry type=\"module\" module-name=\"$module\" scope=\"TEST\" /> "
+SOURCE_PREFIX="<sourceFolder url=\"file://"
+SOURCE_POSTFIX="\" isTestSource=\"false\" />"
+
+for root in $MODULE_ROOTS; do
+    if [ "x$CYGPATH" != "x" ]; then
+      root=`$CYGPATH -am $root`
+    elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
+      root=`wslpath -am $root`
+    fi
+
+    SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
 done
-add_replacement "###MODULE_IMLS###" "$MODULE_IMLS"
-add_replacement "###TEST_MODULE_DEPENDENCIES###" "$TEST_MODULE_DEPENDENCIES"
+
+add_replacement "###SOURCE_ROOTS###" "$SOURCES"
 
 replace_template_dir "$IDEA_OUTPUT"
 
-### Generate module project files
+### Compile the custom Logger
 
-if [ "$VERBOSE" = true ] ; then
-    echo "Generating project modules:"
-  fi
-(
-DEFAULT_IFS="$IFS"
-IFS='#'
-for value in $MODULES; do
-  (
-  eval "$value"
-  if [ "$VERBOSE" = true ] ; then
-    echo "    $module"
-  fi
-  MAIN_SOURCE_DIRS=""
-  CONTENT_ROOTS=""
-  IFS=' '
-  for dir in $moduleSrcDirs; do
-    case $dir in
-      "src/"*) MAIN_SOURCE_DIRS="$MAIN_SOURCE_DIRS <sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" />" ;;
-      *"/support/gensrc/$module") ;; # Exclude generated sources to avoid module-info conflicts, see https://youtrack.jetbrains.com/issue/IDEA-185108
-      *) CONTENT_ROOTS="$CONTENT_ROOTS <content url=\"file://$MODULE_DIR/$dir\">\
-      <sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" generated=\"true\" /></content>" ;;
-    esac
-  done
-  if [ "x$MAIN_SOURCE_DIRS" != "x" ] ; then
-    CONTENT_ROOTS="<content url=\"file://$MODULE_DIR/src/$module\">$MAIN_SOURCE_DIRS</content>$CONTENT_ROOTS"
-  fi
-  add_replacement "###MODULE_CONTENT_ROOTS###" "$CONTENT_ROOTS"
-  DEPENDENCIES=""
-  for dep in $moduleDependencies; do
-    case $MODULE_NAMES in # Exclude skipped modules from dependencies
-      *"$dep"*) DEPENDENCIES="$DEPENDENCIES<orderEntry type=\"module\" module-name=\"$dep\" /> "
-    esac
-  done
-  add_replacement "###DEPENDENCIES###" "$DEPENDENCIES"
-  cp "$IDEA_OUTPUT/module.iml" "$IDEA_OUTPUT/$module.iml"
-  IFS="$DEFAULT_IFS"
-  replace_template_file "$IDEA_OUTPUT/$module.iml"
-  )
-done
-)
-rm "$IDEA_OUTPUT/module.iml"
+CLASSES=$IDEA_OUTPUT/classes
 
-### Create shell script runner for Windows
-
-if [ "x$PATHTOOL" != "x" ]; then
-  echo "@echo off" > "$IDEA_OUTPUT/bash.bat"
-  if [ "x$WSL_DISTRO_NAME" != "x" ] ; then
-    echo "wsl -d $WSL_DISTRO_NAME --cd \"%cd%\" -e %*" >> "$IDEA_OUTPUT/bash.bat"
+if [ "x$ANT_HOME" = "x" ] ; then
+  # try some common locations
+  if [ -f "/usr/share/ant/lib/ant.jar" ] ; then
+    ANT_HOME="/usr/share/ant"
   else
-    echo "$WINENV_ROOT\bin\bash.exe -l -c \"cd %CD:\=/%/ && %*\"" >> "$IDEA_OUTPUT/bash.bat"
+    try_ant=$(ls /opt/homebrew/Cellar/ant/*/libexec/lib/ant.jar 2> /dev/null | sort -r | head -n 1)
+    if [ "x$try_ant" != "x" ] ; then
+      ANT_HOME=$(cd $(dirname $try_ant)/.. && pwd)
+    else
+      try_ant=$(ls /usr/local/Cellar/ant/*/libexec/lib/ant.jar 2> /dev/null | sort -r | head -n 1)
+      if [ "x$try_ant" != "x" ] ; then
+        ANT_HOME=$(cd $(dirname $try_ant)/.. && pwd)
+      fi
+    fi
+  fi
+else
+  if [ ! -f "$ANT_HOME/lib/ant.jar" ] ; then
+     echo "FATAL: ANT_HOME is incorrect. Try removing it and use autodetection, or fix the value" >&2; exit 1
   fi
 fi
 
+if [ "x$ANT_HOME" = "x" ] ; then
+   echo "FATAL: cannot find ant. Try setting ANT_HOME." >&2; exit 1
+fi
+CP=$ANT_HOME/lib/ant.jar
+rm -rf $CLASSES; mkdir $CLASSES
 
+# If we have a Windows boot JDK, we need a .exe suffix
+if [ -e "$BOOT_JDK/bin/java.exe" ] ; then
+  JAVAC=javac.exe
+else
+  JAVAC=javac
+fi
 
-if [ "$VERBOSE" = true ] ; then
-  IDEA_PROJECT_DIR="`dirname $IDEA_OUTPUT`"
-  if [ "x$PATHTOOL" != "x" ]; then
-    IDEA_PROJECT_DIR="`$PATHTOOL -am $IDEA_PROJECT_DIR`"
-  fi
-  echo "
-Now you can open \"$IDEA_PROJECT_DIR\" as IDEA project
-You can also run 'bash \"$IDEA_OUTPUT/jdk-clion/update-project.sh\"' to generate Clion project"
-fi
+# If we are on WSL, the boot JDK might be either Windows or Linux,
+# and we need to use realpath instead of CYGPATH to make javac work on both.
+# We need to handle this case first since CYGPATH might be set on WSL.
+if [ "x$WSL_DISTRO_NAME" != "x" ]; then
+  JAVAC_SOURCE_FILE=`realpath --relative-to=./ $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
+  JAVAC_SOURCE_PATH=`realpath --relative-to=./ $IDEA_OUTPUT/src`
+  JAVAC_CLASSES=`realpath --relative-to=./ $CLASSES`
+  ANT_TEMP=`mktemp -d -p ./`
+  cp $ANT_HOME/lib/ant.jar $ANT_TEMP/ant.jar
+  JAVAC_CP=$ANT_TEMP/ant.jar
+elif [ "x$CYGPATH" != "x" ] ; then ## CYGPATH may be set in env.cfg
+  JAVAC_SOURCE_FILE=`$CYGPATH -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
+  JAVAC_SOURCE_PATH=`$CYGPATH -am $IDEA_OUTPUT/src`
+  JAVAC_CLASSES=`$CYGPATH -am $CLASSES`
+  JAVAC_CP=`$CYGPATH -am $CP`
+else
+  JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java
+  JAVAC_SOURCE_PATH=$IDEA_OUTPUT/src
+  JAVAC_CLASSES=$CLASSES
+  JAVAC_CP=$CP
+fi
+
+$BOOT_JDK/bin/$JAVAC -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE
+
+if [ "x$WSL_DISTRO_NAME" != "x" ]; then
+  rm -rf $ANT_TEMP
+fi

jb/project/tools/common/modules.list

@@ -1,5 +1,4 @@
 java.base,
-java.compiler,
 java.datatransfer,
 java.desktop,
 java.instrument,
@@ -23,7 +22,6 @@ java.xml.crypto,
 jdk.accessibility,
 jdk.attach,
 jdk.charsets,
-jdk.compiler,
 jdk.crypto.cryptoki,
 jdk.crypto.ec,
 jdk.dynalink,

jb/project/tools/windows/scripts/mkimages_aarch64.sh

@@ -46,7 +46,6 @@ function do_configure {
     --with-toolchain-version=$TOOLCHAIN_VERSION \
     --with-boot-jdk=$BOOT_JDK \
     --with-build-jdk=$BUILD_JDK \
-    --with-nvdacontrollerclient=$NVDA_PATH \
     --disable-ccache \
     --enable-cds=yes \
     $DISABLE_WARNINGS_AS_ERRORS \

jb/project/tools/windows/scripts/mkimages_x64.sh

@@ -37,7 +37,6 @@ function do_configure {
     --with-version-opt=b${build_number} \
     --with-toolchain-version=$TOOLCHAIN_VERSION \
     --with-boot-jdk=$BOOT_JDK \
-    --with-nvdacontrollerclient=$NVDA_PATH \
     --disable-ccache \
     --enable-cds=yes \
     $DISABLE_WARNINGS_AS_ERRORS \

jb/project/tools/windows/scripts/mkimages_x86.sh

@@ -33,7 +33,6 @@ function do_configure {
     --with-version-opt=b${build_number} \
     --with-toolchain-version=$TOOLCHAIN_VERSION \
     --with-boot-jdk=$BOOT_JDK \
-    --with-nvdacontrollerclient=$NVDA_PATH \
     --disable-ccache \
     --enable-cds=yes \
     $DISABLE_WARNINGS_AS_ERRORS \

make/Bundles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, 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
@@ -23,9 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include MakeIO.gmk
@@ -42,6 +43,8 @@ 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
@@ -499,6 +502,11 @@ 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)
@@ -509,10 +517,6 @@ static-libs-bundles: $(STATIC_LIBS_TARGETS)
 static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_TARGETS)
 jcov-bundles: $(JCOV_TARGETS)
 
-.PHONY: product-bundles test-bundles \
+.PHONY: all default 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

make/CompileCommands.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, 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
@@ -23,9 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+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 @
@@ -49,6 +50,6 @@ $(OUTPUTDIR)/compile_commands.json: $(wildcard $(MAKESUPPORT_OUTPUTDIR)/compile-
 
 TARGETS += $(OUTPUTDIR)/compile_commands.json
 
-################################################################################
+all: $(TARGETS)
 
-include MakeFileEnd.gmk
+.PHONY: all

make/CompileDemos.gmk

@@ -23,17 +23,23 @@
 # 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
 
@@ -258,8 +264,11 @@ 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)
 
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: all

make/CompileInterimLangtools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,9 +23,11 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+# This must be the first rule
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include JavaCompilation.gmk
@@ -146,4 +148,5 @@ TARGETS += $(BUILD_JAVAC_SERVER)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+
+all: $(TARGETS)

make/CompileJavaModules.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,12 +23,13 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+# This must be the first rule
+default: all
 
-################################################################################
-
-include JavaCompilation.gmk
+include $(SPEC)
+include MakeBase.gmk
 include Modules.gmk
+include JavaCompilation.gmk
 
 ################################################################################
 # If this is an imported module that has prebuilt classes, only compile
@@ -85,15 +86,7 @@ CreateHkTargets = \
 ################################################################################
 # Include module specific build settings
 
-THIS_SNIPPET := modules/$(MODULE)/Java.gmk
-
-ifneq ($(wildcard $(THIS_SNIPPET)), )
-  include MakeSnippetStart.gmk
-
-  include $(THIS_SNIPPET)
-
-  include MakeSnippetEnd.gmk
-endif
+-include Java.gmk
 
 ################################################################################
 # Setup the main compilation
@@ -107,7 +100,6 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
     BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
     HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
     CREATE_API_DIGEST := true, \
-    PROCESS_JBR_API := true, \
     CLEAN := $(CLEAN), \
     CLEAN_FILES := $(CLEAN_FILES), \
     COPY := $(COPY), \
@@ -156,4 +148,6 @@ endif
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all

make/CompileModuleTools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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
@@ -23,12 +23,14 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
 
 ################################################################################
 
-include JavaCompilation.gmk
-
 TOOLS_CLASSES_DIR := $(BUILDTOOLS_OUTPUTDIR)/tools_jigsaw_classes
 
 # When using an external BUILDJDK, make it possible to shortcut building of
@@ -62,4 +64,4 @@ TARGETS += $(BUILD_JIGSAW_TOOLS)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)

make/CompileToolsHotspot.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, 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
@@ -23,12 +23,19 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+# This must be the first rule
+default: all
 
-################################################################################
+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
 
@@ -44,6 +51,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_HOTSPOT, \
 
 TARGETS += $(BUILD_TOOLS_HOTSPOT)
 
-################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all

make/CompileToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,14 +23,21 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+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 \
@@ -80,7 +87,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
     TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
     SRC := $(TOPDIR)/make/jdk/src/classes, \
     INCLUDES := build/tools/depend, \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/plugins, \
+    BIN := $(BUILDTOOLS_OUTPUTDIR)/depend, \
     DISABLED_WARNINGS := options, \
     JAVAC_FLAGS := \
         --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
@@ -93,21 +100,13 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
         --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim, \
 ))
 
-$(eval $(call SetupJavaCompilation, COMPILE_JBR_API_PLUGIN, \
-    TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
-    SRC := $(TOPDIR)/make/jdk/src/classes, \
-    INCLUDES := build/tools/jbrapi, \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/plugins, \
-))
+DEPEND_SERVICE_PROVIDER := $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services/com.sun.source.util.Plugin
 
-PLUGINS_SERVICE_PROVIDER := $(BUILDTOOLS_OUTPUTDIR)/plugins/META-INF/services/com.sun.source.util.Plugin
-
-$(PLUGINS_SERVICE_PROVIDER):
-	$(call MakeDir, $(BUILDTOOLS_OUTPUTDIR)/plugins/META-INF/services)
+$(DEPEND_SERVICE_PROVIDER):
+	$(call MakeDir, $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services)
 	$(ECHO) build.tools.depend.Depend > $@
-	$(ECHO) build.tools.jbrapi.JBRApiPlugin >> $@
 
-TARGETS += $(COMPILE_DEPEND) $(COMPILE_JBR_API_PLUGIN) $(PLUGINS_SERVICE_PROVIDER)
+TARGETS += $(COMPILE_DEPEND) $(DEPEND_SERVICE_PROVIDER)
 
 ################################################################################
 
@@ -161,6 +160,4 @@ ifeq ($(ENABLE_PANDOC), true)
   TARGETS += $(PANDOC_HTML_MANPAGE_FILTER_SETUP)
 endif
 
-################################################################################
-
-include MakeFileEnd.gmk
+all: $(TARGETS)

make/CopyImportModules.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -23,12 +23,13 @@
 # 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
 
@@ -102,6 +103,4 @@ ifneq ($(CONF_DIR), )
   TARGETS += $(COPY_CONF)
 endif
 
-################################################################################
-
-include MakeFileEnd.gmk
+all: $(TARGETS)

make/CopyInterimTZDB.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 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
@@ -23,12 +23,15 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 
+################################################################################
+
 ### TZDB tool needs files from java.time.zone package
 
 define tzdb_copyfiles
@@ -48,7 +51,3 @@ $(eval $(call SetupCopyFiles, COPY_INTERIM_TZDB, \
 ################################################################################
 
 all: $(COPY_INTERIM_TZDB)
-
-################################################################################
-
-include MakeFileEnd.gmk

make/Coverage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2019, 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
@@ -22,7 +22,8 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 
-include MakeFileStart.gmk
+include $(SPEC)
+include MakeBase.gmk
 
 ################################################################################
 
@@ -46,7 +47,6 @@ $(JCOV_IMAGE_DIR)/release: $(JCOV_INPUT_IMAGE_DIR)/release
 	    -t $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)/template.xml \
 	    -rt $(JCOV_HOME)/lib/jcov_network_saver.jar \
 	    -exclude 'java.lang.Object' \
-	    -exclude 'jdk.internal.org.objectweb.**' \
 	    -exclude jdk.test.Main -exclude '**\$Proxy*' \
 	    $(JCOV_FILTERS) \
 	    $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)
@@ -54,7 +54,3 @@ $(JCOV_IMAGE_DIR)/release: $(JCOV_INPUT_IMAGE_DIR)/release
 	$(RMDIR) $(JCOV_TEMP)
 
 jcov-image: $(JCOV_IMAGE_DIR)/release
-
-################################################################################
-
-include MakeFileEnd.gmk

make/CreateJmods.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,9 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include Execute.gmk
@@ -35,6 +36,8 @@ ifeq ($(MODULE), )
   $(error MODULE must be set when calling CreateJmods.gmk)
 endif
 
+$(eval $(call IncludeCustomExtension, CreateJmods.gmk))
+
 ################################################################################
 
 JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmods
@@ -184,15 +187,7 @@ endif
 ################################################################################
 # Include module specific build settings
 
-THIS_SNIPPET := modules/$(MODULE)/Jmod.gmk
-
-ifneq ($(wildcard $(THIS_SNIPPET)), )
-  include MakeSnippetStart.gmk
-
-  include $(THIS_SNIPPET)
-
-  include MakeSnippetEnd.gmk
-endif
+-include Jmod.gmk
 
 # Set main class
 ifneq ($(JMOD_FLAGS_main_class), )
@@ -271,4 +266,6 @@ TARGETS += $(create_$(JMOD_FILE))
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+################################################################################

make/Docs.gmk

@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -22,7 +22,26 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+include CopyFiles.gmk
+include Execute.gmk
+include Modules.gmk
+include ModuleTools.gmk
+include ProcessMarkdown.gmk
+include ToolsJdk.gmk
+include ZipArchive.gmk
+include TextFileProcessing.gmk
+
+# This is needed to properly setup DOCS_MODULES.
+$(eval $(call ReadImportMetaData))
+
+################################################################################
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Docs.gmk))
 
 ################################################################################
 # This file generates all documentation for OpenJDK.
@@ -35,19 +54,7 @@ include MakeFileStart.gmk
 #
 # We will also generate separate, free-standing specifications from either
 # markdown or existing html files.
-################################################################################
-
-include CopyFiles.gmk
-include Execute.gmk
-include Modules.gmk
-include ProcessMarkdown.gmk
-include TextFileProcessing.gmk
-include ZipArchive.gmk
-include $(TOPDIR)/make/ModuleTools.gmk
-include $(TOPDIR)/make/ToolsJdk.gmk
-
-# This is needed to properly setup DOCS_MODULES.
-$(eval $(call ReadImportMetaData))
+#
 
 ################################################################################
 # Javadoc settings
@@ -754,6 +761,10 @@ $(eval $(call SetupZipArchive, BUILD_JAVADOC_ZIP, \
 
 ZIP_TARGETS += $(BUILD_JAVADOC_ZIP)
 
+################################################################################
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Docs-post.gmk))
+
 ################################################################################
 # Bundles all generated specs into a zip archive, skipping javadocs.
 
@@ -795,11 +806,7 @@ all: docs-jdk-api-javadoc docs-jdk-api-graphs docs-javase-api-javadoc \
     docs-reference-api-graphs docs-jdk-specs docs-jdk-index docs-zip \
     docs-specs-zip
 
-.PHONY: docs-jdk-api-javadoc docs-jdk-api-graphs \
+.PHONY: default all docs-jdk-api-javadoc docs-jdk-api-graphs \
     docs-javase-api-javadoc docs-javase-api-graphs \
     docs-reference-api-javadoc docs-reference-api-graphs docs-jdk-specs \
     docs-jdk-index docs-zip docs-specs-zip
-
-################################################################################
-
-include MakeFileEnd.gmk

make/Doctor.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 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
@@ -23,11 +23,18 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Doctor.gmk))
 
 ################################################################################
+#
 # Help user diagnose possible errors and problems with the build environment.
-################################################################################
+#
 
 prologue:
 	$(ECHO)
@@ -138,8 +145,4 @@ doctor: $(TARGETS)
 
 all: doctor
 
-.PHONY: doctor $(TARGETS)
-
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: default all doctor $(TARGETS)

make/ExplodedImageOptimize.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, 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
@@ -23,15 +23,17 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
 # Runs a tool on the exploded image to improve performance
-################################################################################
 
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 include Execute.gmk
 include $(TOPDIR)/make/ModuleTools.gmk
 
+################################################################################
+
 ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module-info.class)
 
 $(eval $(call SetupExecute, optimize_image, \
@@ -45,4 +47,6 @@ TARGETS := $(optimize_image_TARGET)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all default

make/GenerateLinkOptData.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, 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
@@ -23,12 +23,15 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
 ################################################################################
 # Generate classlist
 ################################################################################
 
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
 include CopyFiles.gmk
 include JavaCompilation.gmk
 
@@ -145,4 +148,4 @@ TARGETS += $(COPY_JLI_TRACE)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)

make/GenerateModuleSummary.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2018, 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
@@ -23,11 +23,12 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+# Default target declared first
+default: all
 
-################################################################################
-
-include $(TOPDIR)/make/ModuleTools.gmk
+include $(SPEC)
+include MakeBase.gmk
+include ModuleTools.gmk
 
 GENGRAPHS_DIR := $(IMAGES_OUTPUTDIR)/gengraphs
 SPEC_DOTFILES_DIR := $(GENGRAPHS_DIR)/spec-dotfiles
@@ -49,7 +50,3 @@ $(GENGRAPHS_DIR)/module-summary.html: $(BUILD_JIGSAW_TOOLS) $(GENGRAPHS_DIR)/tec
 	$(TOOL_MODULESUMMARY) -o $@ --module-path $(IMAGES_OUTPUTDIR)/jmods
 
 all: $(GENGRAPHS_DIR)/jdk.dot $(GENGRAPHS_DIR)/module-summary.html $(SPEC_DOTFILES_DIR)/java.se.dot
-
-################################################################################
-
-include MakeFileEnd.gmk

make/Global.gmk

@@ -121,12 +121,12 @@ print-configurations:
 	@true
 
 test-prebuilt:
-	@( cd $(TOPDIR) && \
+	@( cd $(topdir) && \
 	    $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \
 	    test-prebuilt CUSTOM_MAKE_DIR=$(CUSTOM_MAKE_DIR) TEST="$(TEST)" )
 
 test-prebuilt-with-exit-code:
-	@( cd $(TOPDIR) && \
+	@( cd $(topdir) && \
 	    $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \
 	    test-prebuilt-with-exit-code CUSTOM_MAKE_DIR=$(CUSTOM_MAKE_DIR) TEST="$(TEST)" )
 

make/GraalBuilderImage.gmk

@@ -23,15 +23,20 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
 # This makefile creates a jdk image overlaid with statically linked core
 # libraries.
-################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 
+################################################################################
+
+TARGETS :=
+
 $(eval $(call SetupCopyFiles, COPY_JDK_IMG, \
       SRC := $(JDK_IMAGE_DIR)/, \
       DEST := $(GRAAL_BUILDER_IMAGE_DIR)/, \
@@ -49,4 +54,6 @@ TARGETS += $(COPY_STATIC_LIBS)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all

make/Hsdis.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -23,14 +23,17 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JdkNativeCompilation.gmk
 
 ################################################################################
 # This makefile compiles and installs the hsdis library
+#
 ################################################################################
 
-include JdkNativeCompilation.gmk
-
 HSDIS_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/hsdis
 REAL_HSDIS_NAME := hsdis-$(OPENJDK_TARGET_CPU_LEGACY_LIB)$(SHARED_LIBRARY_SUFFIX)
 BUILT_HSDIS_LIB := $(HSDIS_OUTPUT_DIR)/$(REAL_HSDIS_NAME)
@@ -198,8 +201,8 @@ endif
 
 TARGETS += install
 
-.PHONY: build install
-
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all default build install

make/Images.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,9 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include DebugInfoUtils.gmk
@@ -36,6 +37,9 @@ include Utils.gmk
 JDK_TARGETS :=
 JRE_TARGETS :=
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Images-pre.gmk))
+
 ################################################################################
 
 # All modules for the current target platform.
@@ -305,6 +309,12 @@ $(call SetupCopyDebuginfo,SYMBOLS)
 
 ################################################################################
 
+# 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))
+
+################################################################################
+
 $(JRE_TARGETS): $(JLINK_JRE_TARGETS)
 $(JDK_TARGETS): $(JLINK_JDK_TARGETS)
 
@@ -314,8 +324,4 @@ symbols: $(SYMBOLS_TARGETS)
 
 all: jdk jre symbols
 
-.PHONY: jdk jre symbols
-
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: default all jdk jre symbols

make/Init.gmk

@@ -23,8 +23,6 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
 ################################################################################
 # Init.gmk sits between PreInit.gmk and Main.gmk when bootstrapping the build.
 # It is called from PreInit.gmk, and its main responsibility is to launch
@@ -33,14 +31,28 @@ include MakeFileStart.gmk
 # value of $(MAKE) for all further make calls.
 ################################################################################
 
-# Our helper functions.
-include $(TOPDIR)/make/InitSupport.gmk
-include LogUtils.gmk
+# This must be the first rule
+default:
+.PHONY: default
 
 # Inclusion of this pseudo-target will cause make to execute this file
 # serially, regardless of -j.
 .NOTPARALLEL:
 
+include $(SPEC)
+
+include $(TOPDIR)/make/common/MakeBase.gmk
+
+# Our helper functions.
+include $(TOPDIR)/make/InitSupport.gmk
+include $(TOPDIR)/make/common/LogUtils.gmk
+
+# Force early generation of module-deps.gmk and find-tests.gmk
+GENERATE_MODULE_DEPS_FILE := true
+include $(TOPDIR)/make/common/Modules.gmk
+GENERATE_FIND_TESTS_FILE := true
+include $(TOPDIR)/make/common/FindTests.gmk
+
 # Parse COMPARE_BUILD (for makefile development)
 $(eval $(call ParseCompareBuild))
 
@@ -157,7 +169,7 @@ main: $(INIT_TARGETS)
 	        $(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \
 	            $(BUILD_LOG_PIPE_SIMPLE) && \
 	        cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk \
-	            on-failure ; \
+	            HAS_SPEC=true on-failure ; \
 	        exit $$exitcode ) )
 	    $(call CleanupJavacServer)
 	    $(call StopGlobalTimer)
@@ -193,7 +205,3 @@ post-compare-build:
 	$(call CompareBuildDoComparison)
 
 .PHONY: main on-failure pre-compare-build post-compare-build
-
-################################################################################
-
-include MakeFileEnd.gmk

make/InitSupport.gmk

@@ -23,9 +23,6 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
 ################################################################################
 # This file contains helper functions for Init.gmk.
 ################################################################################
@@ -39,6 +36,12 @@ BUILD_LOG_PIPE := > >($(TEE) -a $(BUILD_LOG)) 2> >($(TEE) -a $(BUILD_LOG) >&2) &
 # to stderr.
 BUILD_LOG_PIPE_SIMPLE := | $(TEE) -a $(BUILD_LOG)
 
+ifneq ($(CUSTOM_ROOT), )
+  topdir = $(CUSTOM_ROOT)
+else
+  topdir = $(TOPDIR)
+endif
+
 # Setup the build environment to match the requested specification on
 # level of reproducible builds
 define SetupReproducibleBuild
@@ -61,7 +64,7 @@ endef
 # FAIL can be set to false to have the return value of compare be ignored.
 define ParseCompareBuild
   ifneq ($$(COMPARE_BUILD), )
-    COMPARE_BUILD_OUTPUTDIR := $(WORKSPACE_ROOT)/build/compare-build/$(CONF_NAME)
+    COMPARE_BUILD_OUTPUTDIR := $(topdir)/build/compare-build/$(CONF_NAME)
     COMPARE_BUILD_FAIL := true
 
     ifneq ($$(findstring :, $$(COMPARE_BUILD)), )
@@ -103,14 +106,14 @@ define ParseCompareBuild
       endif
     endif
     ifneq ($$(COMPARE_BUILD_PATCH), )
-      ifneq ($$(wildcard $$(WORKSPACE_ROOT)/$$(COMPARE_BUILD_PATCH)), )
+      ifneq ($$(wildcard $$(topdir)/$$(COMPARE_BUILD_PATCH)), )
         # Assume relative path, if file exists
-        COMPARE_BUILD_PATCH := $$(wildcard $$(WORKSPACE_ROOT)/$$(COMPARE_BUILD_PATCH))
+        COMPARE_BUILD_PATCH := $$(wildcard $$(topdir)/$$(COMPARE_BUILD_PATCH))
       else ifeq ($$(wildcard $$(COMPARE_BUILD_PATCH)), )
         $$(error Patch file $$(COMPARE_BUILD_PATCH) does not exist)
       endif
       ifneq ($$(COMPARE_BUILD_NODRYRUN), true)
-        PATCH_DRY_RUN := $$(shell cd $$(WORKSPACE_ROOT) && $$(PATCH) --dry-run -p1 < $$(COMPARE_BUILD_PATCH) > /dev/null 2>&1 || $$(ECHO) FAILED)
+        PATCH_DRY_RUN := $$(shell cd $$(topdir) && $$(PATCH) --dry-run -p1 < $$(COMPARE_BUILD_PATCH) > /dev/null 2>&1 || $$(ECHO) FAILED)
         ifeq ($$(PATCH_DRY_RUN), FAILED)
           $$(error Patch file $$(COMPARE_BUILD_PATCH) does not apply cleanly)
         endif
@@ -126,11 +129,11 @@ endef
 define PrepareCompareBuild
 	$(ECHO) "Preparing for comparison rebuild"
         # Apply patch, if any
-	$(if $(COMPARE_BUILD_PATCH), cd $(WORKSPACE_ROOT) && $(PATCH) -p1 < $(COMPARE_BUILD_PATCH))
+	$(if $(COMPARE_BUILD_PATCH), cd $(topdir) && $(PATCH) -p1 < $(COMPARE_BUILD_PATCH))
         # Move the first build away temporarily
-	$(RM) -r $(WORKSPACE_ROOT)/build/.compare-build-temp
-	$(MKDIR) -p $(WORKSPACE_ROOT)/build/.compare-build-temp
-	$(MV) $(OUTPUTDIR) $(WORKSPACE_ROOT)/build/.compare-build-temp
+	$(RM) -r $(topdir)/build/.compare-build-temp
+	$(MKDIR) -p $(topdir)/build/.compare-build-temp
+	$(MV) $(OUTPUTDIR) $(topdir)/build/.compare-build-temp
         # Restore an old compare-build, or create a new compare-build directory.
 	if test -d $(COMPARE_BUILD_OUTPUTDIR); then \
 	  $(MV) $(COMPARE_BUILD_OUTPUTDIR) $(OUTPUTDIR); \
@@ -140,19 +143,19 @@ define PrepareCompareBuild
         # Re-run configure with the same arguments (and possibly some additional),
         # must be done after patching.
 	( cd $(CONFIGURE_START_DIR) && PATH="$(ORIGINAL_PATH)" \
-	    $(BASH) $(WORKSPACE_ROOT)/configure $(CONFIGURE_COMMAND_LINE) $(COMPARE_BUILD_CONF))
+	    $(BASH) $(topdir)/configure $(CONFIGURE_COMMAND_LINE) $(COMPARE_BUILD_CONF))
 endef
 
 # Cleanup after a compare build
 define CleanupCompareBuild
         # If running with a COMPARE_BUILD patch, reverse-apply it, but continue
         # even if that fails (can happen with removed files).
-	$(if $(COMPARE_BUILD_PATCH), cd $(WORKSPACE_ROOT) && $(PATCH) -R -p1 < $(COMPARE_BUILD_PATCH) || true)
+	$(if $(COMPARE_BUILD_PATCH), cd $(topdir) && $(PATCH) -R -p1 < $(COMPARE_BUILD_PATCH) || true)
         # Move this build away and restore the original build
-	$(MKDIR) -p $(WORKSPACE_ROOT)/build/compare-build
+	$(MKDIR) -p $(topdir)/build/compare-build
 	$(MV) $(OUTPUTDIR) $(COMPARE_BUILD_OUTPUTDIR)
-	$(MV) $(WORKSPACE_ROOT)/build/.compare-build-temp/$(CONF_NAME) $(OUTPUTDIR)
-	$(RM) -r $(WORKSPACE_ROOT)/build/.compare-build-temp
+	$(MV) $(topdir)/build/.compare-build-temp/$(CONF_NAME) $(OUTPUTDIR)
+	$(RM) -r $(topdir)/build/.compare-build-temp
 endef
 
 # Do the actual comparison of two builds
@@ -262,7 +265,7 @@ endif
 ##############################################################################
 
 # Store the build times in this directory.
-BUILDTIMESDIR := $(OUTPUTDIR)/make-support/build-times
+BUILDTIMESDIR = $(OUTPUTDIR)/make-support/build-times
 
 # Record starting time for build of a sub repository.
 define RecordStartTime
@@ -315,8 +318,3 @@ define ReportProfileTimes
     $(BUILD_LOG_PIPE_SIMPLE)
   )
 endef
-
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/InterimImage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, 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
@@ -23,9 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include Execute.gmk
 include Modules.gmk
@@ -57,4 +58,6 @@ TARGETS += $(jlink_interim_image)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all

make/JBRApi.gmk

@@ -1,73 +0,0 @@
-#
-# Copyright 2000-2023 JetBrains s.r.o.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include $(SPEC)
-include MakeBase.gmk
-include Utils.gmk
-
-JBR_API_ORIGIN := https://github.com/JetBrains/JetBrainsRuntimeApi.git
-JBR_API_DIR    := $(TOPDIR)/jbr-api
-
-ARTIFACT_NAME := jbr-api-SNAPSHOT
-ifeq ($(call isBuildOsEnv, windows.cygwin windows.msys2), true)
-    HOME    := $$USERPROFILE
-    M2_REPO := $(shell $(PATHTOOL) $(HOME))/.m2/repository
-else ifeq ($(call isBuildOsEnv, windows.wsl1 windows.wsl2), true)
-    HOME    := `cmd.exe /C "echo %USERPROFILE%" 2> /dev/null`
-    M2_REPO := $(shell $(PATHTOOL) $(HOME))/.m2/repository
-else
-    M2_REPO := $(HOME)/.m2/repository
-endif
-M2_ARTIFACT := $(M2_REPO)/com/jetbrains/jbr-api/SNAPSHOT
-M2_POM_CONTENT := \
-    <?xml version="1.0" encoding="UTF-8"?> \
-    <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" \
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> \
-      <modelVersion>4.0.0</modelVersion> \
-      <groupId>com.jetbrains</groupId> \
-      <artifactId>jbr-api</artifactId> \
-      <version>SNAPSHOT</version> \
-    </project> \
-
-jbr-api:
-	if [ -d "$(JBR_API_DIR)" ]; then \
-	    $(GIT) -C "$(JBR_API_DIR)" fetch; \
-	    $(GIT) -C "$(JBR_API_DIR)" merge-base --is-ancestor origin/main HEAD || \
-	        $(ECHO) "!!! Current JBR API revision is outdated, update the branch in $(JBR_API_DIR) !!!"; \
-	else \
-	    $(ECHO) "JBR API directory does not exist. Initializing..."; \
-	    $(GIT) clone "$(JBR_API_ORIGIN)" "$(JBR_API_DIR)" --config core.autocrlf=false; \
-	fi
-	$(BASH) "$(JBR_API_DIR)/tools/build.sh" dev "$(BOOT_JDK)"
-	if [ -d "$(M2_REPO)" ]; then \
-	    $(MKDIR) -p $(M2_ARTIFACT); \
-	    $(ECHO) "$(M2_POM_CONTENT)" > $(M2_ARTIFACT)/$(ARTIFACT_NAME).pom; \
-	    $(CP) "$(JBR_API_DIR)/out/$(ARTIFACT_NAME).jar" "$(M2_ARTIFACT)"; \
-	    $(ECHO) "Installed into local Maven repository as com.jetbrains:jbr-api:SNAPSHOT"; \
-	else \
-	    $(ECHO) "No Maven repository found at $(M2_REPO) - skipping local installation"; \
-	fi
-
-.PHONY: jbr-api

make/JrtfsJar.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,13 +23,14 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
-include JarArchive.gmk
 include JavaCompilation.gmk
+include JarArchive.gmk
 include TextFileProcessing.gmk
 
 # This rule will be depended on due to the MANIFEST line
@@ -77,7 +78,3 @@ $(eval $(call SetupJarArchive, BUILD_JRTFS_JAR, \
 ))
 
 all: $(BUILD_JRTFS_JAR)
-
-################################################################################
-
-include MakeFileEnd.gmk

make/MacBundles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,9 +23,8 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include TextFileProcessing.gmk
@@ -119,7 +118,3 @@ else # Not macosx
 endif # macosx
 
 .PHONY: jdk-bundle jre-bundle bundles
-
-################################################################################
-
-include MakeFileEnd.gmk

make/Main.gmk

@@ -24,35 +24,44 @@
 #
 
 ################################################################################
-# This is the main makefile containing most actual top level targets.
+# This is the main makefile containing most actual top level targets. It needs
+# to be called with a SPEC file defined.
 ################################################################################
 
-# Declare ALL_TARGETS as an immediate variable. This variable is a list of all
-# valid top level targets. It's used to declare them all as PHONY and to
-# generate the -only targets.
+# Declare default target
+default:
 
-ALL_TARGETS :=
+ifeq ($(wildcard $(SPEC)), )
+  $(error Main.gmk needs SPEC set to a proper spec.gmk)
+endif
 
-DEFAULT_TARGET := default-target
+# Now load the spec
+include $(SPEC)
 
-include MakeFileStart.gmk
-
-################################################################################
+# Load the vital tools for all the makefiles.
+include $(TOPDIR)/make/common/MakeBase.gmk
+include $(TOPDIR)/make/common/Modules.gmk
+include $(TOPDIR)/make/common/FindTests.gmk
 
 include $(TOPDIR)/make/MainSupport.gmk
 
-include FindTests.gmk
-include Modules.gmk
-
 # Are we requested to ignore dependencies?
 ifneq ($(findstring -only, $(MAKECMDGOALS)), )
   DEPS := none
 endif
 
+# Declare ALL_TARGETS as an immediate variable. This variable is a list of all
+# valid top level targets. It's used to declare them all as PHONY and to
+# generate the -only targets.
+ALL_TARGETS :=
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Main.gmk))
 
 # All modules for the current target platform.
 ALL_MODULES := $(call FindAllModules)
 
+################################################################################
 ################################################################################
 #
 # Recipes for all targets. Only recipes, dependencies are declared later.
@@ -352,7 +361,7 @@ $(eval $(call SetupTarget, vscode-project-ccls, \
 
 $(eval $(call SetupTarget, idea-gen-config, \
     MAKEFILE := ide/idea/jdk/IdeaGenConfig, \
-    ARGS := IDEA_OUTPUT="$(IDEA_OUTPUT)" MODULES="$(MODULES)" TOPLEVEL_DIR="$(TOPLEVEL_DIR)" IDEA_OUTPUT_PARENT="$(IDEA_OUTPUT_PARENT)", \
+    ARGS := IDEA_OUTPUT="$(IDEA_OUTPUT)" MODULES="$(MODULES)", \
 ))
 
 ################################################################################
@@ -1333,7 +1342,7 @@ ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-static-libs \
 # Traditional targets typically run by users.
 # These can be considered aliases for the targets now named by a more
 # "modern" naming scheme.
-default-target: $(DEFAULT_MAKE_TARGET)
+default: $(DEFAULT_MAKE_TARGET)
 jdk: exploded-image
 images: product-images
 docs: docs-image
@@ -1368,6 +1377,7 @@ ALL_TARGETS += $(RUN_TEST_TARGETS) run-test exploded-run-test check \
     test-hotspot-jtreg test-hotspot-jtreg-native test-hotspot-gtest \
     test-jdk-jtreg-native test-docs
 
+################################################################################
 ################################################################################
 #
 # Clean targets
@@ -1473,19 +1483,14 @@ print-tests:
 
 create-main-targets-include:
 	  $(call LogInfo, Generating main target list)
+	  $(call MakeDir, $(MAKESUPPORT_OUTPUTDIR))
 	  @$(ECHO) ALL_MAIN_TARGETS := $(sort $(ALL_TARGETS)) > \
 	      $(MAKESUPPORT_OUTPUTDIR)/main-targets.gmk
 
 ################################################################################
-# JBR API
-
-$(eval $(call SetupTarget, jbr-api, \
-    MAKEFILE := JBRApi, \
-    TARGET := jbr-api \
-))
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Main-post.gmk))
 
 .PHONY: $(ALL_TARGETS)
 
 FRC: # Force target
-
-include MakeFileEnd.gmk

make/MainSupport.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,13 +23,13 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
 ################################################################################
 # This file contains helper functions for Main.gmk.
 ################################################################################
 
+ifndef _MAINSUPPORT_GMK
+_MAINSUPPORT_GMK := 1
+
 # Setup make rules for creating a top-level target.
 # Parameter 1 is the name of the rule. This name is used as variable prefix.
 #
@@ -218,5 +218,4 @@ endef
 
 ################################################################################
 
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _MAINSUPPORT_GMK

make/ModuleTools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2020, 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
@@ -23,10 +23,8 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
+ifndef _MODULE_TOOLS_GMK
+_MODULE_TOOLS_GMK := 1
 
 include JavaCompilation.gmk
 
@@ -51,7 +49,4 @@ TOOL_ADD_PACKAGES_ATTRIBUTE := $(BUILD_JAVA) $(JAVA_FLAGS_SMALL_BUILDJDK) \
     --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
     build.tools.jigsaw.AddPackagesAttribute
 
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _MODULE_TOOLS_GMK

make/ModuleWrapper.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,29 +23,27 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
 ################################################################################
 # This makefile is called from Main.gmk, through a macro in MakeHelpers.gmk
 # and wraps calls to makefiles for specific modules and build phases. Having
 # this wrapper reduces the need for boilerplate code. It also provides
 # opportunity for automatic copying of files to an interim exploded runnable
 # image.
-################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 
 MODULE_SRC := $(TOPDIR)/src/$(MODULE)
 
-# Define the snippet for MakeSnippetStart/End
-THIS_SNIPPET := modules/$(MODULE)/$(MAKEFILE_PREFIX).gmk
-
-include MakeSnippetStart.gmk
+# All makefiles should add the targets to be built to this variable.
+TARGETS :=
 
 # Include the file being wrapped.
-include $(THIS_SNIPPET)
-
-include MakeSnippetEnd.gmk
+include $(MAKEFILE_PREFIX).gmk
 
 ifeq ($(MAKEFILE_PREFIX), Lib)
   # We need to keep track of what libraries are generated/needed by this
@@ -130,12 +128,8 @@ $(eval $(call SetupCopyFiles, COPY_CONF, \
 ))
 
 ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
-  TARGETS := $(filter $(MAKESUPPORT_OUTPUTDIR)/compile-commands/%, $(TARGETS))
+  all: $(filter $(MAKESUPPORT_OUTPUTDIR)/compile-commands/%, $(TARGETS))
 else
-  TARGETS += $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \
+  all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \
       $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_MAN) $(COPY_CONF) $(LINK_LIBS_TO_LIB)
 endif
-
-################################################################################
-
-include MakeFileEnd.gmk

make/PreInit.gmk

@@ -38,15 +38,13 @@ default:
 # serially, regardless of -j.
 .NOTPARALLEL:
 
-IS_PREINIT_ENV := true
-
 # Include our helper functions.
-include $(TOPDIR)/make/PreInitSupport.gmk
-include $(TOPDIR)/make/common/LogUtils.gmk
+include $(topdir)/make/PreInitSupport.gmk
+include $(topdir)/make/common/LogUtils.gmk
 
 # Here are "global" targets, i.e. targets that can be executed without having
 # a configuration. This will define ALL_GLOBAL_TARGETS.
-include $(TOPDIR)/make/Global.gmk
+include $(topdir)/make/Global.gmk
 
 # CALLED_TARGETS is the list of targets that the user provided,
 # or "default" if unspecified.
@@ -81,8 +79,7 @@ ifneq ($(SKIP_SPEC), true)
   # Check that CONF_CHECK is valid.
   $(eval $(call ParseConfCheckOption))
 
-  # Check that the LOG given is valid, and set LOG_LEVEL, LOG_NOFILE,
-  # MAKE_LOG_VARS and MAKE_LOG_FLAGS.
+  # Check that the LOG given is valid, and set LOG_LEVEL, LOG_NOFILE, MAKE_LOG_VARS and MAKE_LOG_FLAGS.
   $(eval $(call ParseLogLevel))
 
   # After this SPECS contain 1..N spec files (otherwise ParseConfAndSpec fails).
@@ -104,26 +101,25 @@ ifneq ($(SKIP_SPEC), true)
   SEQUENTIAL_TARGETS := $(filter dist-clean clean%, $(MAIN_TARGETS))
   PARALLEL_TARGETS := $(filter-out $(SEQUENTIAL_TARGETS), $(MAIN_TARGETS))
 
-  MAKE_INIT_ARGS := $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common
-
   # The spec files depend on the autoconf source code. This check makes sure
   # the configuration is up to date after changes to configure.
-  $(SPECS): $(wildcard $(TOPDIR)/make/autoconf/*) \
+  $(SPECS): $(wildcard $(topdir)/make/autoconf/*) \
           $(if $(CUSTOM_CONFIG_DIR), $(wildcard $(CUSTOM_CONFIG_DIR)/*)) \
-          $(addprefix $(TOPDIR)/make/conf/, version-numbers.conf branding.conf) \
+          $(addprefix $(topdir)/make/conf/, version-numbers.conf branding.conf) \
           $(if $(CUSTOM_CONF_DIR), $(wildcard $(addprefix $(CUSTOM_CONF_DIR)/, \
               version-numbers.conf branding.conf)))
       ifeq ($(CONF_CHECK), fail)
-	@echo Error: The configuration is not up to date for \
-	    "'$(lastword $(subst /, , $(dir $@)))'."
-	$(call PrintConfCheckFailed)
-	@exit 2
+	  @echo Error: The configuration is not up to date for \
+	      "'$(lastword $(subst /, , $(dir $@)))'."
+	  $(call PrintConfCheckFailed)
+	  @exit 2
       else ifeq ($(CONF_CHECK), auto)
-	@echo Note: The configuration is not up to date for \
-	    "'$(lastword $(subst /, , $(dir $@)))'."
-	@( cd $(TOPDIR) && \
-	    $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk SPEC=$@ \
-	    reconfigure )
+	  @echo Note: The configuration is not up to date for \
+	      "'$(lastword $(subst /, , $(dir $@)))'."
+	  @( cd $(topdir) && \
+	      $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
+	      SPEC=$@ HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
+	      reconfigure )
       else ifeq ($(CONF_CHECK), ignore)
         # Do nothing
       endif
@@ -143,7 +139,7 @@ ifneq ($(SKIP_SPEC), true)
 	      $(COMMAND_LINE_VARIABLES) $(MAKECMDGOALS))')
       endif
 
-  MAKE_INIT_MAIN_TARGET_ARGS := \
+  MAKE_INIT_WITH_SPEC_ARGUMENTS := ACTUAL_TOPDIR=$(topdir) \
       USER_MAKE_VARS="$(USER_MAKE_VARS)" MAKE_LOG_FLAGS=$(MAKE_LOG_FLAGS) \
       $(MAKE_LOG_VARS) \
       INIT_TARGETS="$(INIT_TARGETS)" \
@@ -159,24 +155,21 @@ ifneq ($(SKIP_SPEC), true)
 	@$(if $(TARGET_DONE), \
 	  true \
 	, \
-	  ( cd $(TOPDIR) && \
+	  ( cd $(topdir) && \
 	  $(foreach spec, $(SPECS), \
-	    $(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
-	        SPEC=$(spec) $(MAKE_INIT_MAIN_TARGET_ARGS) \
+	    $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/Init.gmk \
+	        SPEC=$(spec) HAS_SPEC=true $(MAKE_INIT_WITH_SPEC_ARGUMENTS) \
 	        main && \
 	    $(if $(and $(COMPARE_BUILD), $(PARALLEL_TARGETS)), \
-	      $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) \
-	          COMPARE_BUILD="$(COMPARE_BUILD)" \
-	          pre-compare-build && \
-	      $(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) $(MAKE_INIT_MAIN_TARGET_ARGS) \
-	          COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
-	          main && \
-	      $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) \
-	          COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
-	          post-compare-build && \
+	        $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
+	            SPEC=$(spec) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
+	            COMPARE_BUILD="$(COMPARE_BUILD)" pre-compare-build && \
+	        $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/Init.gmk \
+	            SPEC=$(spec) HAS_SPEC=true $(MAKE_INIT_WITH_SPEC_ARGUMENTS) \
+	            COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" main && \
+	        $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
+	            SPEC=$(spec) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
+	            COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" post-compare-build && \
 	    ) \
 	  ) true ) \
 	  $(eval TARGET_DONE=true) \
@@ -220,5 +213,3 @@ else # SKIP_SPEC=true
   .PHONY: $(ALL_TARGETS)
 
 endif # $(SKIP_SPEC)!=true
-
-################################################################################

make/PreInitSupport.gmk

@@ -23,20 +23,20 @@
 # questions.
 #
 
-################################################################################
+##############################################################################
 # Helper functions for PreInit.gmk, the initial part of initialization before
 # the SPEC file is loaded. Most of these functions provide parsing and setting
 # up make options from the command-line.
-################################################################################
-
-# Include the corresponding closed file, if present.
-ifneq ($(CUSTOM_MAKE_DIR), )
-  -include $(CUSTOM_MAKE_DIR)/PreInitSupport-pre.gmk
-endif
+##############################################################################
 
 # COMMA is defined in spec.gmk, but that is not included yet
 COMMA := ,
 
+# Include the corresponding closed file, if present.
+ifneq ($(CUSTOM_MAKE_DIR), )
+  -include $(CUSTOM_MAKE_DIR)/InitSupport.gmk
+endif
+
 # Essential control variables that are handled by PreInit.gmk or Init.gmk
 INIT_CONTROL_VARIABLES := LOG CONF CONF_NAME SPEC JOBS CONF_CHECK ALLOW \
     COMPARE_BUILD
@@ -68,13 +68,13 @@ USER_MAKE_VARS := $(subst §,\ , $(filter-out $(addsuffix =%, $(ALL_CONTROL_VARI
 
 # Setup information about available configurations, if any.
 ifneq ($(CUSTOM_ROOT), )
-  build_dir := $(CUSTOM_ROOT)/build
+  build_dir = $(CUSTOM_ROOT)/build
 else
-  build_dir := $(TOPDIR)/build
+  build_dir = $(topdir)/build
 endif
-all_spec_files := $(wildcard $(build_dir)/*/spec.gmk)
+all_spec_files = $(wildcard $(build_dir)/*/spec.gmk)
 # Extract the configuration names from the path
-all_confs := $(patsubst %/spec.gmk, %, $(patsubst $(build_dir)/%, %, $(all_spec_files)))
+all_confs = $(patsubst %/spec.gmk, %, $(patsubst $(build_dir)/%, %, $(all_spec_files)))
 
 # Check for unknown command-line variables
 define CheckControlVariables
@@ -110,7 +110,7 @@ endef
 define CheckInvalidMakeFlags
   # This is a trick to get this rule to execute before any other rules
   # MAKEFLAGS only indicate -j if read in a recipe (!)
-  $$(TOPDIR)/make/PreInit.gmk: .FORCE
+  $$(topdir)/make/PreInit.gmk: .FORCE
 	$$(if $$(findstring --jobserver, $$(MAKEFLAGS)), \
 	    $$(info Error: 'make -jN' is not supported, use 'make JOBS=N') \
 	    $$(error Cannot continue) \
@@ -162,7 +162,7 @@ define ParseConfAndSpec
       ifneq ($(CUSTOM_ROOT), )
         $$(info Error: No configurations found for $$(CUSTOM_ROOT).)
       else
-        $$(info Error: No configurations found for $$(TOPDIR).)
+        $$(info Error: No configurations found for $$(topdir).)
       endif
       $$(info Please run 'bash configure' to create a configuration.)
       $$(info )
@@ -278,9 +278,9 @@ define DefineMainTargets
   endif
 
   $$(main_targets_file):
-	@( cd $$(TOPDIR) && \
-	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/Main.gmk \
-	    -I $$(TOPDIR)/make/common SPEC=$(strip $2) NO_RECIPES=true \
+	@( cd $$(topdir) && \
+	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(topdir)/make/Main.gmk \
+	    -I $$(topdir)/make/common SPEC=$(strip $2) NO_RECIPES=true \
 	    $$(MAKE_LOG_VARS) \
 	    create-main-targets-include )
 
@@ -295,5 +295,3 @@ define PrintConfCheckFailed
 	@echo "This behavior may also be changed using CONF_CHECK=<ignore|auto>."
 	@echo ' '
 endef
-
-################################################################################

make/ReleaseFile.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, 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
@@ -23,12 +23,16 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 
 ################################################################################
 # This makefile generates the "release" file into the exploded image. Jlink is
 # then responsible for using this as the base for release files in each linked
 # image.
+#
 ################################################################################
 
 BASE_RELEASE_FILE := $(JDK_OUTPUTDIR)/release
@@ -81,4 +85,10 @@ TARGETS += $(BASE_RELEASE_FILE)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+$(eval $(call IncludeCustomExtension, ReleaseFile.gmk))
+
+################################################################################
+
+all: $(TARGETS)
+
+.PHONY: all default

make/RunTests.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, 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
@@ -23,10 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
+default: all
 
+include $(SPEC)
+include MakeBase.gmk
 include FindTests.gmk
 
 # We will always run multiple tests serially
@@ -71,6 +71,9 @@ ifeq ($(call isTargetOs, windows), true)
   endif
 endif
 
+################################################################################
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, RunTests.gmk))
 ################################################################################
 
 # This is the JDK that we will test
@@ -1354,8 +1357,4 @@ endif
 
 all: run-test
 
-.PHONY: $(TARGETS)
-
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: default all $(TARGETS)

make/RunTestsPrebuilt.gmk

@@ -27,8 +27,6 @@
 # Initial bootstrapping, copied and stripped down from Makefile and PreInit.gmk.
 ################################################################################
 
-IS_PREINIT_ENV := true
-
 # In Cygwin, the MAKE variable gets prepended with the current directory if the
 # make executable is called using a Windows mixed path (c:/cygwin/bin/make.exe).
 ifneq ($(findstring :, $(MAKE)), )
@@ -59,7 +57,7 @@ TOPDIR := $(strip $(patsubst %/make/, %, $(dir $(makefile_path))))
 define SetupVariable
   ifeq ($$($1), )
     ifeq ($2, )
-      $$(info Error: Prebuilt variable $1 is missing, needed for test-prebuilt)
+      $$(info Error: Prebuilt variable $1 is missing, needed for run-tests-prebuilt)
       $$(error Cannot continue.)
     else ifeq ($2, OPTIONAL)
       ifneq ($$(findstring $$(LOG), info debug trace), )
@@ -137,6 +135,7 @@ $(eval $(call SetupVariable,JIB_JAR,OPTIONAL))
 # can include the prebuilt spec file ourselves, without an ephemeral spec
 # wrapper. This is required so we can include MakeBase which is needed for
 # CreateNewSpec.
+HAS_SPEC :=
 include $(TOPDIR)/make/PreInitSupport.gmk
 include $(TOPDIR)/make/common/LogUtils.gmk
 
@@ -247,7 +246,7 @@ endif
 # Now we can include additional custom support.
 # This might define CUSTOM_NEW_SPEC_LINE
 ifneq ($(CUSTOM_MAKE_DIR), )
-  include $(CUSTOM_MAKE_DIR)/RunTestsPrebuilt-pre.gmk
+  include $(CUSTOM_MAKE_DIR)/RunTestsPrebuilt.gmk
 endif
 
 NEW_SPEC := $(OUTPUTDIR)/run-test-spec.gmk
@@ -297,10 +296,14 @@ test-prebuilt:
         # is unfortunately not available at this point.
 	$(call MakeDir, $(MAKESUPPORT_OUTPUTDIR)/failure-logs)
 	@$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error
-        # We need to fill the FindTest cache before entering RunTests.gmk.
-	@cd $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) SPEC=$(SPEC) \
-	    -f RunTestsPrebuiltFindTests.gmk
-	@cd $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
+        # The lazy initialization of the cache file in FindTests.gmk does not
+        # always work with RunTests.gmk. To guarantee that the jtreg test groups
+        # are always found and parsed, call FindTests.gmk stand alone once
+        # before calling RunTests.gmk.
+	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/common/FindTests.gmk \
+	    SPEC=$(SPEC) FINDTESTS_STAND_ALONE=true \
+	    GENERATE_FIND_TESTS_FILE=true
+	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \
 	    TEST="$(TEST)"
 
 test-prebuilt-with-exit-code: test-prebuilt

make/RunTestsPrebuiltFindTests.gmk

@@ -1,38 +0,0 @@
-#
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include MakeFileStart.gmk
-
-################################################################################
-# This makefile is a thin wrapper around FindTests.gmk, just to make FindTest
-# fill the cache.
-################################################################################
-
-GENERATE_FIND_TESTS_FILE := true
-include FindTests.gmk
-
-################################################################################
-
-include MakeFileEnd.gmk

make/SourceRevision.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, 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
@@ -23,7 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+include $(SPEC)
+include MakeBase.gmk
+
+$(eval $(call IncludeCustomExtension, SourceRevision-pre.gmk))
 
 ################################################################################
 # Keep track of what source revision is used to create the build, by creating
@@ -35,7 +38,6 @@ include MakeFileStart.gmk
 # bundle. As a part of creating this source bundle, the current SCM revisions of
 # all repos will be stored in a file in the top dir, which is then used when
 # creating the tracker file.
-################################################################################
 
 STORED_SOURCE_REVISION := $(TOPDIR)/.src-rev
 
@@ -154,6 +156,10 @@ endif
 
 ################################################################################
 
+$(eval $(call IncludeCustomExtension, SourceRevision-post.gmk))
+
+################################################################################
+
 store-source-revision: $(STORE_SOURCE_REVISION_TARGET)
 
 create-source-revision-tracker: $(CREATE_SOURCE_REVISION_TRACKER_TARGET)
@@ -161,7 +167,3 @@ create-source-revision-tracker: $(CREATE_SOURCE_REVISION_TRACKER_TARGET)
 FRC: # Force target
 
 .PHONY: store-source-revision create-source-revision-tracker
-
-################################################################################
-
-include MakeFileEnd.gmk

make/StaticLibs.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -23,9 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include DebugInfoUtils.gmk
@@ -184,8 +185,6 @@ static-jdk-image: $(copy-from-jdk-image) $(copy-static-launcher) $(copy-static-l
 
 TARGETS += static-jdk-image
 
-.PHONY: static-launcher static-jdk-image
+all: $(TARGETS)
 
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: all static-launcher static-jdk-image

make/StaticLibsImage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 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
@@ -23,12 +23,13 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
 # This makefile creates an image of the optional static versions of certain JDK
 # libraries.
-################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include Modules.gmk
@@ -37,6 +38,8 @@ ALL_MODULES = $(call FindAllModules)
 
 ################################################################################
 
+TARGETS :=
+
 ifneq ($(filter static-libs-image, $(MAKECMDGOALS)), )
   IMAGE_DEST_DIR = $(STATIC_LIBS_IMAGE_DIR)/lib
 else ifneq ($(filter static-libs-graal-image, $(MAKECMDGOALS)), )
@@ -69,9 +72,11 @@ ifneq ($(filter static-libs-image, $(MAKECMDGOALS)), )
   )
 endif
 
+################################################################################
+
 static-libs-image: $(HOTSPOT_VARIANT_STATIC_LIBS_TARGETS) $(STATIC_LIBS_TARGETS)
 static-libs-graal-image: $(STATIC_LIBS_TARGETS)
 
-################################################################################
+all: $(TARGETS)
 
-include MakeFileEnd.gmk
+.PHONY: all

make/TestImage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, 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
@@ -23,7 +23,13 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, TestImage-pre.gmk))
 
 ################################################################################
 
@@ -48,8 +54,4 @@ TARGETS += $(BUILD_INFO_PROPERTIES) $(README)
 prepare-test-image: $(TARGETS)
 all: prepare-test-image
 
-.PHONY: prepare-test-image
-
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: default all prepare-test-image

make/ToolsHotspot.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -23,10 +23,8 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
+ifndef _TOOLS_HOTSPOT_GMK
+_TOOLS_HOTSPOT_GMK := 1
 
 include JavaCompilation.gmk
 
@@ -46,5 +44,4 @@ TOOL_JFR_GEN := $(JAVA_SMALL) -cp $(HOTSPOT_TOOLS_OUTPUTDIR) \
 
 ################################################################################
 
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _TOOLS_HOTSPOT_GMK

make/ToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,13 +23,14 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
+ifndef _TOOLS_GMK
+_TOOLS_GMK := 1
 
 include JavaCompilation.gmk
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Tools.gmk))
+
 ################################################################################
 # To avoid reevaluating the compilation setup for the tools each time this file
 # is included, the actual compilation is handled by CompileTools.gmk. The
@@ -136,5 +137,7 @@ PANDOC_HTML_MANPAGE_FILTER := $(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-html-manpa
 
 ################################################################################
 
-endif # include guard
-include MakeIncludeEnd.gmk
+# Hook to include the corresponding custom post file, if present.
+$(eval $(call IncludeCustomExtension, ToolsJdk-post.gmk))
+
+endif # _TOOLS_GMK

make/ToolsLangtools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, 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
@@ -23,10 +23,11 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
+# This must be the first rule
+default: all
 
+include $(SPEC)
+include MakeBase.gmk
 include JavaCompilation.gmk
 
 ################################################################################
@@ -42,7 +43,3 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_LANGTOOLS, \
 ))
 
 all: $(BUILD_TOOLS_LANGTOOLS)
-
-################################################################################
-
-include MakeFileEnd.gmk

make/UpdateBuildDocs.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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
@@ -23,14 +23,17 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include ProcessMarkdown.gmk
 
 ################################################################################
 # This makefile updates the generated build html documentation.
+#
 ################################################################################
 
-include ProcessMarkdown.gmk
-
 ifeq ($(ENABLE_PANDOC), false)
   $(info No pandoc executable was detected by configure)
   $(error Cannot continue)
@@ -52,4 +55,10 @@ TARGETS += $(md_docs)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+$(eval $(call IncludeCustomExtension, UpdateBuildDocs.gmk))
+
+################################################################################
+
+all: $(TARGETS)
+
+.PHONY: all default

make/UpdateSleefSource.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -23,7 +23,15 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+include CopyFiles.gmk
+include Execute.gmk
 
 ################################################################################
 # This file is responsible for updating the generated sleef source code files
@@ -32,9 +40,6 @@ include MakeFileStart.gmk
 # updated from upstream.
 ################################################################################
 
-include CopyFiles.gmk
-include Execute.gmk
-
 ifneq ($(COMPILE_TYPE), cross)
   $(error Only cross-compilation of libsleef is currently supported)
 endif
@@ -143,4 +148,6 @@ TARGETS := $(copy_generated_sleef_source)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all default

make/UpdateX11Wrappers.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -23,7 +23,15 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include Execute.gmk
+include JdkNativeCompilation.gmk
+include ToolsJdk.gmk
 
 ################################################################################
 # This file is responsible for extracting the x11 native struct offsets to
@@ -35,10 +43,6 @@ include MakeFileStart.gmk
 # GensrcX11Wrappers.gmk to generate the Java code during the build.
 ################################################################################
 
-include Execute.gmk
-include JdkNativeCompilation.gmk
-include $(TOPDIR)/make/ToolsJdk.gmk
-
 ifeq ($(COMPILE_TYPE), cross)
   $(error It is not possible to update the x11wrappers when cross-compiling)
 endif
@@ -104,4 +108,6 @@ TARGETS += $(run_wrappergen) wrapper-information
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all default

make/ZipSecurity.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,10 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
+default: all
 
+include $(SPEC)
+include MakeBase.gmk
 include ZipArchive.gmk
 
 ################################################################################
@@ -100,4 +100,6 @@ endif
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: default all

make/ZipSource.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,16 +23,19 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
+default: all
 
+include $(SPEC)
+include MakeBase.gmk
 include Modules.gmk
 include ZipArchive.gmk
 
 SRC_ZIP_WORK_DIR := $(SUPPORT_OUTPUTDIR)/src
 $(if $(filter $(TOPDIR)/%, $(SUPPORT_OUTPUTDIR)), $(eval SRC_ZIP_BASE := $(TOPDIR)), $(eval SRC_ZIP_BASE := $(SUPPORT_OUTPUTDIR)))
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, ZipSource.gmk))
+
 ################################################################################
 # Create the directory structure for src.zip using symlinks.
 # <module>/<package>/<file>.java
@@ -92,8 +95,8 @@ zip: $(SRC_ZIP_SRCS)
 
 TARGETS += zip
 
-.PHONY: zip
-
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: default all zip

make/autoconf/basic_windows.m4

@@ -89,8 +89,8 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
   WINENV_TEMP_DIR=$($PATHTOOL -u $($CMD /q /c echo %TEMP% 2> /dev/null) | $TR -d '\r\n')
   AC_MSG_RESULT([$WINENV_TEMP_DIR])
 
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1" || test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
-    # Don't trust the current directory for WSL, but change to an OK temp dir
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
+    # Don't trust the current directory for WSL2, but change to an OK temp dir
     cd "$WINENV_TEMP_DIR"
     # Bring along confdefs.h or autoconf gets all confused
     cp "$CONFIGURE_START_DIR/confdefs.h" "$WINENV_TEMP_DIR"
@@ -228,7 +228,7 @@ AC_DEFUN([BASIC_WINDOWS_FINALIZE_FIXPATH],
 # Platform-specific finalization
 AC_DEFUN([BASIC_WINDOWS_FINALIZE],
 [
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1" || test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
     # Change back from temp dir
     cd $CONFIGURE_START_DIR
   fi

make/autoconf/flags-cflags.m4

@@ -347,7 +347,7 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
     C_O_FLAG_DEBUG="-Od"
     C_O_FLAG_DEBUG_JVM=""
     C_O_FLAG_NONE="-Od"
-    C_O_FLAG_SIZE="-O1"
+    C_O_FLAG_SIZE="-Os"
   fi
 
   # Now copy to C++ flags

make/autoconf/jdk-options.m4

@@ -244,31 +244,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   fi
   AC_SUBST(HOTSPOT_OVERRIDE_LIBPATH)
 
-  # Should we build the client for the JAWS screen reader?
-  if test "x$OPENJDK_TARGET_OS" = xwindows; then
-    AC_MSG_CHECKING([if JAWS client support is enabled])
-
-    A11Y_JAWS_ANNOUNCING_ENABLED=true
-    AC_ARG_ENABLE(
-      [jaws-client],
-      [AS_HELP_STRING([--disable-jaws-client], [Set to disable to exclude the client for the JAWS screen reader from the build])],
-      [
-        if test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
-          AC_MSG_WARN([--[enable|disable]-jaws-client[=*] flags are ignored for headless builds])
-        elif test "x$enableval" != xyes; then
-          A11Y_JAWS_ANNOUNCING_ENABLED=false
-        fi
-      ]
-    )
-    if test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
-      A11Y_JAWS_ANNOUNCING_ENABLED=false
-    fi
-
-    AC_MSG_RESULT([$A11Y_JAWS_ANNOUNCING_ENABLED])
-  else
-    A11Y_JAWS_ANNOUNCING_ENABLED=false
-  fi
-  AC_SUBST(A11Y_JAWS_ANNOUNCING_ENABLED)
 ])
 
 ################################################################################

make/autoconf/lib-dbus.m4

@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2024, JetBrains s.r.o.. 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# Check if a potential dbus library match is correct and usable
-################################################################################
-AC_DEFUN_ONCE([LIB_SETUP_DBUS],
-[
-  AC_ARG_WITH(dbus-includes, [AS_HELP_STRING([--with-dbus-includes],
-      [specify include directories for the dbus files as list separated by space])])
-
-  if test "x$NEEDS_LIB_DBUS" = xfalse; then
-    DBUS_CFLAGS=
-    DBUS_FOUND=false
-  else
-    if test "x${with_dbus_includes}" != x; then
-      DBUS_FOUND=true
-      DBUS_CFLAGS=""
-      for include in $with_dbus_includes; do
-        DBUS_CFLAGS="${DBUS_CFLAGS}-I${include} "
-      done
-    else
-      PKG_CHECK_MODULES(DBUS, dbus-1, [DBUS_FOUND=true], [
-        DBUS_FOUND=false
-        AC_MSG_NOTICE([Can't find dbus-1 library. This library is needed to use some features. You can install dbus-1 library or specify include directories manually by giving --with-dbus-includes option.])
-      ])
-    fi
-  fi
-
-  AC_SUBST(DBUS_CFLAGS)
-  AC_SUBST(DBUS_FOUND)
-])

make/autoconf/lib-nvdacontrollerclient.m4

@@ -1,121 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2022, JetBrains s.r.o.. 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# Setup nvdacontrollerclient (The library for communication with
-# NVDA - a screen reader for Microsoft Windows)
-################################################################################
-AC_DEFUN_ONCE([LIB_SETUP_NVDACONTROLLERCLIENT], [
-  # To enable NVDA, user specifies neither --with-nvdacontrollerclient or
-  # a pair (--with-nvdacontrollerclient-include, --with-nvdacontrollerclient-lib)
-  AC_ARG_WITH(nvdacontrollerclient, [AS_HELP_STRING([--with-nvdacontrollerclient],
-      [specify prefix directory for the NVDA Controller Client library package
-       (expecting headers and libs under PATH/<target-arch>/)])])
-  AC_ARG_WITH(nvdacontrollerclient-include, [AS_HELP_STRING([--with-nvdacontrollerclient-include],
-      [specify directory for the NVDA Controller Client include files])])
-  AC_ARG_WITH(nvdacontrollerclient-lib, [AS_HELP_STRING([--with-nvdacontrollerclient-lib],
-      [specify directory for the NVDA Controller Client library])])
-
-  NVDACONTROLLERCLIENT_FOUND=no
-  NVDACONTROLLERCLIENT_LIB=
-  NVDACONTROLLERCLIENT_DLL=
-  NVDACONTROLLERCLIENT_CFLAGS=
-
-  if test "x${NEEDS_LIB_NVDACONTROLLERCLIENT}" = "xtrue" ; then
-    if (test "x${with_nvdacontrollerclient_include}"  = "x" && test "x${with_nvdacontrollerclient_lib}" != "x") || \
-       (test "x${with_nvdacontrollerclient_include}" != "x" && test "x${with_nvdacontrollerclient_lib}"  = "x") ; then
-      AC_MSG_ERROR([Must specify both or neither of --with-nvdacontrollerclient-include and --with-nvdacontrollerclient-lib])
-    elif (test "x${with_nvdacontrollerclient}" != "x" && test "x${with_nvdacontrollerclient_include}" != "x") ; then
-      AC_MSG_ERROR([Must specify either --with-nvdacontrollerclient or a pair (--with-nvdacontrollerclient-include, --with-nvdacontrollerclient-lib)])
-    fi
-
-    if (test "x${with_nvdacontrollerclient}" != "x") || \
-       (test "x${with_nvdacontrollerclient_include}" != "x" && test "x${with_nvdacontrollerclient_lib}" != "x") ; then
-
-      AC_MSG_CHECKING([for nvdacontrollerclient])
-
-      if test "x${OPENJDK_TARGET_OS}" != "xwindows" ; then
-        AC_MSG_ERROR([--with-nvdacontrollerclient[-*] flags are applicable only to Windows builds])
-      fi
-
-      if test "x${OPENJDK_TARGET_CPU_ARCH}" = "xaarch64" ; then
-        NVDACONTROLLERCLIENT_BIN_BASENAME="nvdaControllerClient32"
-        NVDACONTROLLERCLIENT_ARCHDIR="arm64"
-      elif test "x${OPENJDK_TARGET_CPU_ARCH}" = "xx86" && test "x${OPENJDK_TARGET_CPU_BITS}" = "x64" ; then
-        NVDACONTROLLERCLIENT_BIN_BASENAME="nvdaControllerClient64"
-        NVDACONTROLLERCLIENT_ARCHDIR="x64"
-      elif test "x${OPENJDK_TARGET_CPU_ARCH}" = "xx86" && test "x${OPENJDK_TARGET_CPU_BITS}" = "x32" ; then
-        NVDACONTROLLERCLIENT_BIN_BASENAME="nvdaControllerClient32"
-        NVDACONTROLLERCLIENT_ARCHDIR="x86"
-      else
-        AC_MSG_ERROR([The nvdacontrollerclient library exists only for x86_32, x86_64, AArch64 architectures])
-      fi
-
-      if test "x${with_nvdacontrollerclient}" != "x" ; then
-        # NVDACONTROLLERCLIENT_ARCHDIR is used only here
-        NVDACONTROLLERCLIENT_INC_PATH="${with_nvdacontrollerclient}/${NVDACONTROLLERCLIENT_ARCHDIR}"
-        NVDACONTROLLERCLIENT_BIN_PATH="${with_nvdacontrollerclient}/${NVDACONTROLLERCLIENT_ARCHDIR}"
-      else
-        NVDACONTROLLERCLIENT_INC_PATH="${with_nvdacontrollerclient_include}"
-        NVDACONTROLLERCLIENT_BIN_PATH="${with_nvdacontrollerclient_lib}"
-      fi
-
-      POTENTIAL_NVDACONTROLLERCLIENT_DLL="${NVDACONTROLLERCLIENT_BIN_PATH}/${NVDACONTROLLERCLIENT_BIN_BASENAME}.dll"
-      POTENTIAL_NVDACONTROLLERCLIENT_LIB="${NVDACONTROLLERCLIENT_BIN_PATH}/${NVDACONTROLLERCLIENT_BIN_BASENAME}.lib"
-      POTENTIAL_NVDACONTROLLERCLIENT_EXP="${NVDACONTROLLERCLIENT_BIN_PATH}/${NVDACONTROLLERCLIENT_BIN_BASENAME}.exp"
-
-      if ! test -s "${POTENTIAL_NVDACONTROLLERCLIENT_DLL}" || \
-         ! test -s "${POTENTIAL_NVDACONTROLLERCLIENT_LIB}" || \
-         ! test -s "${POTENTIAL_NVDACONTROLLERCLIENT_EXP}" ; then
-          AC_MSG_ERROR([Could not find ${NVDACONTROLLERCLIENT_BIN_BASENAME}.dll and/or ${NVDACONTROLLERCLIENT_BIN_BASENAME}.lib and/or ${NVDACONTROLLERCLIENT_BIN_BASENAME}.exp inside ${NVDACONTROLLERCLIENT_BIN_PATH}])
-      fi
-      if ! test -s "${NVDACONTROLLERCLIENT_INC_PATH}/nvdaController.h" ; then
-        AC_MSG_ERROR([Could not find the header file nvdaController.h inside ${NVDACONTROLLERCLIENT_INC_PATH}])
-      fi
-
-      NVDACONTROLLERCLIENT_CFLAGS="-I${NVDACONTROLLERCLIENT_INC_PATH}"
-      NVDACONTROLLERCLIENT_DLL="${POTENTIAL_NVDACONTROLLERCLIENT_DLL}"
-      NVDACONTROLLERCLIENT_LIB="${POTENTIAL_NVDACONTROLLERCLIENT_LIB}"
-      NVDACONTROLLERCLIENT_FOUND=yes
-
-      AC_MSG_RESULT([includes at ${NVDACONTROLLERCLIENT_INC_PATH} ; binaries at ${NVDACONTROLLERCLIENT_BIN_PATH}])
-    fi
-  elif test "x${with_nvdacontrollerclient}" != "x" || \
-       test "x${with_nvdacontrollerclient_include}" != "x" || test "x${with_nvdacontrollerclient_lib}" != "x" ; then
-    AC_MSG_WARN([[nvdacontrollerclient is not used, so --with-nvdacontrollerclient[-*] is ignored]])
-  fi
-
-  if test "x${NVDACONTROLLERCLIENT_FOUND}" = "xyes" ; then
-    A11Y_NVDA_ANNOUNCING_ENABLED=true
-  else
-    A11Y_NVDA_ANNOUNCING_ENABLED=false
-  fi
-
-  AC_SUBST(A11Y_NVDA_ANNOUNCING_ENABLED)
-  AC_SUBST(NVDACONTROLLERCLIENT_CFLAGS)
-  AC_SUBST(NVDACONTROLLERCLIENT_DLL)
-  AC_SUBST(NVDACONTROLLERCLIENT_LIB)
-])

make/autoconf/lib-speechd.m4

@@ -1,92 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2022, JetBrains s.r.o.. 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# Setup speechd
-################################################################################
-AC_DEFUN_ONCE([LIB_SETUP_SPEECHD],
-[
-  AC_ARG_WITH(speechd, [AS_HELP_STRING([--with-speechd],
-      [specify prefix directory for the libspeechd package
-      (expecting the headers under PATH/include); required for AccessibleAnnouncer to work])])
-  AC_ARG_WITH(speechd-include, [AS_HELP_STRING([--with-speechd-include],
-      [specify directory for the speechd include files])])
-
-  if test "x$NEEDS_LIB_SPEECHD" = xfalse || test "x${with_speechd}" = xno || \
-      test "x${with_speechd_include}" = xno; then
-    if (test "x${with_speechd}" != x && test "x${with_speechd}" != xno) || \
-        (test "x${with_speechd_include}" != x && test "x${with_speechd_include}" != xno); then
-      AC_MSG_WARN([[speechd not used, so --with-speechd[-*] is ignored]])
-    fi
-    A11Y_SPEECHD_ANNOUNCING_ENABLED=false
-    SPEECHD_CFLAGS=
-    SPEECHD_LIBS=
-  else
-    SPEECHD_FOUND=no
-
-    if test "x${with_speechd}" != x && test "x${with_speechd}" != xyes; then
-      AC_MSG_CHECKING([for speechd header and library])
-      if test -s "${with_speechd}/include/libspeechd.h"; then
-        SPEECHD_CFLAGS="-I${with_speechd}/include"
-        SPEECHD_LIBS="-L${with_speechd}/lib -lspeechd"
-        SPEECHD_FOUND=yes
-        AC_MSG_RESULT([$SPEECHD_FOUND])
-      else
-        AC_MSG_ERROR([Can't find 'include/libspeechd.h' under ${with_speechd} given with the --with-speechd option.])
-      fi
-    fi
-    if test "x${with_speechd_include}" != x; then
-      AC_MSG_CHECKING([for speechd headers])
-      if test -s "${with_speechd_include}/libspeechd.h"; then
-        SPEECHD_CFLAGS="-I${with_speechd_include}"
-        SPEECHD_FOUND=yes
-        AC_MSG_RESULT([$SPEECHD_FOUND])
-      else
-        AC_MSG_ERROR([Can't find 'include/libspeechd.h' under ${with_speechd} given with the --with-speechd-include option.])
-      fi
-    fi
-    if test "x$SPEECHD_FOUND" = xno; then
-      # Are the libspeechd headers installed in the default /usr/include location?
-      AC_CHECK_HEADERS([libspeechd.h],
-          [ SPEECHD_FOUND=yes ],
-          [ SPEECHD_FOUND=no; break ]
-      )
-      if test "x$SPEECHD_FOUND" = xyes; then
-          SPEECHD_CFLAGS=
-          SPEECHD_LIBS="-lspeechd"
-      fi
-    fi
-    if test "x$SPEECHD_FOUND" = xno; then
-      A11Y_SPEECHD_ANNOUNCING_ENABLED=false
-    else
-      A11Y_SPEECHD_ANNOUNCING_ENABLED=true
-    fi
-  fi
-
-  AC_SUBST(A11Y_SPEECHD_ANNOUNCING_ENABLED)
-  AC_SUBST(SPEECHD_CFLAGS)
-  AC_SUBST(SPEECHD_LIBS)
-])

make/autoconf/lib-wayland.m4

@@ -1,216 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2023, JetBrains s.r.o.. 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# Setup wayland
-################################################################################
-AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
-[
-  AC_ARG_WITH(wayland, [AS_HELP_STRING([--with-wayland],
-      [specify prefix directory for the wayland package
-      (expecting the headers under PATH/include)])])
-  AC_ARG_WITH(wayland-include, [AS_HELP_STRING([--with-wayland-include],
-      [specify directory for the wayland include files])])
-  AC_ARG_WITH(wayland-lib, [AS_HELP_STRING([--with-wayland-lib],
-      [specify directory for the wayland library files])])
-  AC_ARG_WITH(wayland-protocols, [AS_HELP_STRING([--with-wayland-protocols],
-      [specify the root directory for the wayland protocols xml files])])
-  AC_ARG_WITH(gtk-shell1-protocol, [AS_HELP_STRING([--with-gtk-shell1-protocol],
-      [specify the path to the gtk-shell1 Wayland protocol xml file])])
-
-  if test "x$NEEDS_LIB_WAYLAND" = xfalse; then
-    if (test "x${with_wayland}" != x && test "x${with_wayland}" != xno) || \
-        (test "x${with_wayland_include}" != x && test "x${with_wayland_include}" != xno); then
-      AC_MSG_WARN([[wayland not used, so --with-wayland[-*] is ignored]])
-    fi
-    WAYLAND_CFLAGS=
-    WAYLAND_LIBS=
-    VULKAN_FLAGS=
-    VULKAN_ENABLED=false
-  else
-    WAYLAND_FOUND=no
-    WAYLAND_INCLUDES=
-    WAYLAND_DEFINES=
-    if test "x${with_wayland}" = xno || test "x${with_wayland_include}" = xno; then
-      AC_MSG_ERROR([It is not possible to disable the use of wayland. Remove the --without-wayland option.])
-    fi
-
-    if test "x${with_wayland}" != x; then
-      AC_MSG_CHECKING([for wayland headers])
-      if test -s "${with_wayland}/include/wayland-client.h" && test -s "${with_wayland}/include/wayland-cursor.h"; then
-        WAYLAND_INCLUDES="-I${with_wayland}/include"
-        WAYLAND_LIBS="-L${with_wayland}/lib -lwayland-client -lwayland-cursor"
-
-        WAYLAND_FOUND=yes
-        AC_MSG_RESULT([$WAYLAND_FOUND])
-      else
-        AC_MSG_ERROR([Can't find 'include/wayland-client.h' and 'include/wayland-cursor.h' under ${with_wayland} given with the --with-wayland option.])
-      fi
-    fi
-    if test "x${with_wayland_include}" != x; then
-      AC_MSG_CHECKING([for wayland headers])
-      if test -s "${with_wayland_include}/wayland-client.h" && test -s "${with_wayland_include}/wayland-cursor.h"; then
-        WAYLAND_INCLUDES="-I${with_wayland_include}"
-        WAYLAND_FOUND=yes
-        AC_MSG_RESULT([$WAYLAND_FOUND])
-      else
-        AC_MSG_ERROR([Can't find 'wayland-client.h' and 'wayland-cursor.h' under ${with_wayland_include} given with the --with-wayland-include option.])
-      fi
-    fi
-    UTIL_REQUIRE_PROGS(WAYLAND_SCANNER, wayland-scanner)
-    if test "x${with_wayland_protocols}" != x; then
-        WAYLAND_PROTOCOLS_ROOT=${with_wayland_protocols}
-    else
-        WAYLAND_PROTOCOLS_ROOT=/usr/share/wayland-protocols/
-    fi
-    GTK_SHELL1_PROTOCOL_PATH=
-    if test "x${with_gtk_shell1_protocol}" != x && test "x${with_gtk_shell1_protocol}" != xno; then
-      AC_MSG_CHECKING([for the gtk-shell1 Wayland protocol])
-      if test -s "${with_gtk_shell1_protocol}"; then
-        WAYLAND_DEFINES="${WAYLAND_DEFINES} -DHAVE_GTK_SHELL1"
-        GTK_SHELL1_PROTOCOL_PATH="${with_gtk_shell1_protocol}"
-        AC_MSG_RESULT([yes])
-      else
-        AC_MSG_ERROR([Can't find gtk-shell1 protocol in ${with_gtk_shell1_protocol} given with the --with-gtk-shell1-protocol option.])
-      fi
-    fi
-    if test "x${with_wayland_lib}" != x; then
-      WAYLAND_LIBS="-L${with_wayland_lib} -lwayland-client -lwayland-cursor"
-    fi
- 
-    if test "x$WAYLAND_FOUND" = xno; then
-      # Are the wayland headers installed in the default /usr/include location?
-      AC_CHECK_HEADERS([wayland-client.h wayland-cursor.h],
-          [ WAYLAND_FOUND=yes ],
-          [ WAYLAND_FOUND=no; break ]
-      )
-      if test "x$WAYLAND_FOUND" = xyes; then
-          WAYLAND_INCLUDES=
-          WAYLAND_LIBS="-lwayland-client -lwayland-cursor"
-          DEFAULT_WAYLAND=yes
-      fi
-    fi
-    if test "x$WAYLAND_FOUND" = xno; then
-      HELP_MSG_MISSING_DEPENDENCY([wayland])
-      AC_MSG_ERROR([Could not find wayland! $HELP_MSG ])
-    fi
-    WAYLAND_CFLAGS="${WAYLAND_INCLUDES} ${WAYLAND_DEFINES}"
-
-    # Checking for vulkan sdk
-
-    AC_ARG_WITH(vulkan, [AS_HELP_STRING([--with-vulkan],
-      [specify whether we use vulkan])])
-
-    AC_ARG_WITH(vulkan-include, [AS_HELP_STRING([--with-vulkan-include],
-      [specify directory for the vulkan include files ({with-vulkan-include}/vulkan/vulkan.h)])])
-
-    AC_ARG_WITH(vulkan-shader-compiler, [AS_HELP_STRING([--with-vulkan-shader-compiler],
-      [specify which shader compiler to use: glslc/glslangValidator])])
-
-    if test "x$SUPPORTS_LIB_VULKAN" = xfalse; then
-
-      if (test "x${with_vulkan}" != x && test "x${with_vulkan}" != xno) || \
-         (test "x${with_vulkan_include}" != x && test "x${with_vulkan_include}" != xno); then
-        AC_MSG_WARN([[vulkan not used, so --with-vulkan-include is ignored]])
-      fi
-      VULKAN_FLAGS=
-      VULKAN_ENABLED=false
-    else
-      # Do not build vulkan rendering pipeline by default
-      if (test "x${with_vulkan}" = x && test "x${with_vulkan_include}" = x) || \
-          test "x${with_vulkan}" = xno || test "x${with_vulkan_include}" = xno ; then
-        VULKAN_FLAGS=
-        VULKAN_ENABLED=false
-      else
-        VULKAN_FOUND=no
-
-        if test "x${with_vulkan_include}" != x; then
-          AC_MSG_CHECKING([for vulkan.h])
-          if test -s "${with_vulkan_include}/vulkan/vulkan.h"; then
-            VULKAN_FOUND=yes
-            VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -I${with_vulkan_include} -DVULKAN_ENABLED"
-            AC_MSG_RESULT([yes])
-          else
-            AC_MSG_RESULT([no])
-            AC_MSG_ERROR([Can't find 'vulkan/vulkan.h' under '${with_vulkan_include}'])
-          fi
-        fi
-
-        if test "x$VULKAN_FOUND" = xno; then
-          # Check vulkan sdk location
-          AC_CHECK_HEADERS([$VULKAN_SDK/include/vulkan/vulkan.h],
-            [ VULKAN_FOUND=yes
-              VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -I${VULKAN_SDK}/include -DVULKAN_ENABLED"
-            ],
-            [ VULKAN_FOUND=no; break ]
-          )
-        fi
-
-        if test "x$VULKAN_FOUND" = xno; then
-          # Check default /usr/include location
-          AC_CHECK_HEADERS([vulkan/vulkan.h],
-            [ VULKAN_FOUND=yes
-              VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -DVULKAN_ENABLED"
-            ],
-            [ VULKAN_FOUND=no; break ]
-          )
-        fi
-
-        if test "x$VULKAN_FOUND" = xno; then
-          HELP_MSG_MISSING_DEPENDENCY([vulkan])
-          AC_MSG_ERROR([Could not find vulkan! $HELP_MSG ])
-        else
-          # Find shader compiler - glslc or glslangValidator
-          if (test "x${with_vulkan_shader_compiler}" = x || test "x${with_vulkan_shader_compiler}" = xglslc); then
-            UTIL_LOOKUP_PROGS(GLSLC, glslc)
-            SHADER_COMPILER="$GLSLC"
-            VULKAN_SHADER_COMPILER="glslc --target-env=vulkan1.2 -mfmt=num -o"
-          fi
-
-          if (test "x${with_vulkan_shader_compiler}" = x || test "x${with_vulkan_shader_compiler}" = xglslangValidator) && \
-              test "x$SHADER_COMPILER" = x; then
-            UTIL_LOOKUP_PROGS(GLSLANG, glslangValidator)
-            SHADER_COMPILER="$GLSLANG"
-            VULKAN_SHADER_COMPILER="glslangValidator --target-env vulkan1.2 -x -o"
-          fi
-
-          if test "x$SHADER_COMPILER" != x; then
-            VULKAN_ENABLED=true
-          else
-            AC_MSG_ERROR([Can't find shader compiler])
-          fi
-        fi
-      fi
-    fi
-  fi
-  AC_SUBST(VULKAN_FLAGS)
-  AC_SUBST(VULKAN_SHADER_COMPILER)
-  AC_SUBST(VULKAN_ENABLED)
-  AC_SUBST(WAYLAND_CFLAGS)
-  AC_SUBST(WAYLAND_LIBS)
-  AC_SUBST(WAYLAND_PROTOCOLS_ROOT)
-  AC_SUBST(GTK_SHELL1_PROTOCOL_PATH)
-])

make/autoconf/libraries.m4

@@ -33,10 +33,7 @@ m4_include([lib-freetype.m4])
 m4_include([lib-hsdis.m4])
 m4_include([lib-std.m4])
 m4_include([lib-x11.m4])
-m4_include([lib-speechd.m4])
-m4_include([lib-nvdacontrollerclient.m4])
-m4_include([lib-dbus.m4])
-m4_include([lib-wayland.m4])
+
 m4_include([lib-tests.m4])
 
 ################################################################################
@@ -44,27 +41,14 @@ m4_include([lib-tests.m4])
 ################################################################################
 AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
 [
-  # Check if X11, wayland and vulkan is needed
+  # Check if X11 is needed
   if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    # No X11 and wayland support on windows or macosx
+    # No X11 support on windows or macosx
     NEEDS_LIB_X11=false
-    NEEDS_LIB_SPEECHD=false
-    NEEDS_LIB_WAYLAND=false
-    SUPPORTS_LIB_VULKAN=false
   else
     # All other instances need X11, even if building headless only, libawt still
     # needs X11 headers.
     NEEDS_LIB_X11=true
-
-    if test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
-      NEEDS_LIB_SPEECHD=false
-      NEEDS_LIB_WAYLAND=false
-      SUPPORTS_LIB_VULKAN=false
-    else
-      NEEDS_LIB_SPEECHD=true
-      NEEDS_LIB_WAYLAND=true
-      SUPPORTS_LIB_VULKAN=true
-    fi
   fi
 
   # Check if fontconfig is needed
@@ -90,13 +74,11 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
     NEEDS_LIB_FREETYPE=true
   fi
 
-  # Check if alsa and dbus is needed
+  # Check if alsa is needed
   if test "x$OPENJDK_TARGET_OS" = xlinux; then
     NEEDS_LIB_ALSA=true
-    NEEDS_LIB_DBUS=true
   else
     NEEDS_LIB_ALSA=false
-    NEEDS_LIB_DBUS=false
   fi
 
   # Check if ffi is needed
@@ -105,13 +87,6 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
   else
     NEEDS_LIB_FFI=false
   fi
-
-  # Check if nvdacontrollerclient is needed
-  if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$ENABLE_HEADLESS_ONLY" != xtrue; then
-    NEEDS_LIB_NVDACONTROLLERCLIENT=true
-  else
-    NEEDS_LIB_NVDACONTROLLERCLIENT=false
-  fi
 ])
 
 ################################################################################
@@ -151,10 +126,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   LIB_SETUP_LIBFFI
   LIB_SETUP_MISC_LIBS
   LIB_SETUP_X11
-  LIB_SETUP_SPEECHD
-  LIB_SETUP_NVDACONTROLLERCLIENT
-  LIB_SETUP_DBUS
-  LIB_SETUP_WAYLAND
+
   LIB_TESTS_SETUP_GTEST
 
   # Math library

make/autoconf/spec.gmk.template

@@ -466,33 +466,6 @@ UBSAN_LDFLAGS := @UBSAN_LDFLAGS@
 X_CFLAGS := @X_CFLAGS@
 X_LIBS := @X_LIBS@
 
-# Necessary additional compiler flags to compile dbus
-DBUS_CFLAGS := @DBUS_CFLAGS@
-DBUS_FOUND := @DBUS_FOUND@
-
-# Linux speechd a11y announcer
-A11Y_SPEECHD_ANNOUNCING_ENABLED:=@A11Y_SPEECHD_ANNOUNCING_ENABLED@
-SPEECHD_CFLAGS:=@SPEECHD_CFLAGS@
-SPEECHD_LIBS:=@SPEECHD_LIBS@
-
-# Windows NVDA a11y announcer
-A11Y_NVDA_ANNOUNCING_ENABLED:=@A11Y_NVDA_ANNOUNCING_ENABLED@
-NVDACONTROLLERCLIENT_CFLAGS:=@NVDACONTROLLERCLIENT_CFLAGS@
-NVDACONTROLLERCLIENT_DLL:=@NVDACONTROLLERCLIENT_DLL@
-NVDACONTROLLERCLIENT_LIB:=@NVDACONTROLLERCLIENT_LIB@
-
-# Windows the client for the JAWS screen reader
-A11Y_JAWS_ANNOUNCING_ENABLED:=@A11Y_JAWS_ANNOUNCING_ENABLED@
-
-WAYLAND_CFLAGS:=@WAYLAND_CFLAGS@
-WAYLAND_LIBS:=@WAYLAND_LIBS@
-WAYLAND_PROTOCOLS_ROOT:=@WAYLAND_PROTOCOLS_ROOT@
-WAYLAND_SCANNER:=@WAYLAND_SCANNER@
-GTK_SHELL1_PROTOCOL_PATH:=@GTK_SHELL1_PROTOCOL_PATH@
-VULKAN_FLAGS:=@VULKAN_FLAGS@
-VULKAN_SHADER_COMPILER:=@VULKAN_SHADER_COMPILER@
-VULKAN_ENABLED:=@VULKAN_ENABLED@
-
 # The lowest required version of macosx
 MACOSX_VERSION_MIN := @MACOSX_VERSION_MIN@
 # The highest allowed version of macosx

make/common/CopyFiles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,11 +23,14 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including CopyFiles.gmk)
+endif
 
 ################################################################################
+#
 # Code for handling the SetupCopyFiles macro.
+#
 ################################################################################
 
 define AddFileToCopy
@@ -107,8 +110,3 @@ define SetupCopyFilesBody
   )
 
 endef
-
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/common/DebugInfoUtils.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -23,11 +23,14 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including DebugInfoUtils.gmk)
+endif
 
 ################################################################################
+#
 # Common debuginfo utility functions
+#
 ################################################################################
 
 ################################################################################
@@ -53,6 +56,3 @@ else
         $(if $(wildcard $1), $(call containing, .dSYM/, $(call FindFiles, $1)))
   endif
 endif
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/common/Execute.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 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
@@ -23,13 +23,17 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including Execute.gmk)
+endif
 
 ################################################################################
+#
 # Code for handling the SetupExecute macro.
+#
 ################################################################################
 
+
 ################################################################################
 # Setup make rules for executing an arbitrary command.
 #
@@ -192,8 +196,3 @@ define SetupExecuteBody
   $1_TARGET := $$($1_FINAL_RESULT)
 
 endef
-
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/common/FileUtils.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,11 +23,14 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including FileUtils.gmk)
+endif
 
 ################################################################################
+#
 # Common file utility functions
+#
 ################################################################################
 
 ################################################################################
@@ -304,8 +307,3 @@ ifeq ($(DISABLE_CACHE_FIND), true)
 else
   FindFiles = $(CacheFindFiles)
 endif
-
-################################################################################
-
-include MakeIncludeEnd.gmk
-endif # include guard

make/common/FindTests.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, 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
@@ -23,10 +23,21 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifndef _FIND_TESTS_GMK
+_FIND_TESTS_GMK := 1
 
-################################################################################
+# This makefile can be called directly to just trigger generation of the cache
+# makefile. If so, SPEC and MakeBase.gmk need to be included.
+ifeq ($(FINDTESTS_STAND_ALONE), true)
+  include $(SPEC)
+  include MakeBase.gmk
+endif
+
+# Make sure this variable is not lazy evaled.
+ALL_NAMED_TESTS :=
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, common/FindTests.gmk))
 
 # TEST_BASEDIRS might have been set by a custom extension
 TEST_BASEDIRS += $(TOPDIR)/test $(TOPDIR)
@@ -51,10 +62,11 @@ $(foreach root, $(JTREG_TESTROOTS), \
 # Cache the expensive to calculate test names in a generated makefile.
 FIND_TESTS_CACHE_FILE := $(MAKESUPPORT_OUTPUTDIR)/find-tests.gmk
 
-# If this file is deemed outdated, it will automatically get regenerated
-# by this rule before being included below.
-$(FIND_TESTS_CACHE_FILE): $(JTREG_ROOT_FILES) $(JTREG_GROUP_FILES) \
-    $(TOPDIR)/test/make/TestMake.gmk
+ifeq ($(GENERATE_FIND_TESTS_FILE), true)
+  # If this file is deemed outdated, it will automatically get regenerated
+  # by this rule before being included below.
+  $(FIND_TESTS_CACHE_FILE): $(JTREG_ROOT_FILES) $(JTREG_GROUP_FILES) \
+      $(TOPDIR)/test/make/TestMake.gmk
 	$(call MakeTargetDir)
 	( $(foreach root, $(JTREG_TESTROOTS), \
 	    $(PRINTF) "\n$(root)_JTREG_TEST_GROUPS := " ; \
@@ -67,6 +79,7 @@ $(FIND_TESTS_CACHE_FILE): $(JTREG_ROOT_FILES) $(JTREG_GROUP_FILES) \
 	$(MAKE) -s --no-print-directory $(MAKE_ARGS) \
 	    SPEC=$(SPEC) -f $(TOPDIR)/test/make/TestMake.gmk print-targets \
 	    TARGETS_FILE=$@
+endif
 
 -include $(FIND_TESTS_CACHE_FILE)
 
@@ -92,5 +105,4 @@ ALL_NAMED_TESTS += failure-handler make
 
 ################################################################################
 
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _FIND_TESTS_GMK

make/common/JarArchive.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,10 +23,12 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifndef _JAR_ARCHIVE_GMK
+_JAR_ARCHIVE_GMK := 1
 
-################################################################################
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including JarArchive.gmk)
+endif
 
 include MakeIO.gmk
 
@@ -281,7 +283,4 @@ define SetupJarArchiveBody
   $1 += $$($1_JAR)
 endef
 
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _JAR_ARCHIVE_GMK

make/common/JavaCompilation.gmk

@@ -23,10 +23,12 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifndef _JAVA_COMPILATION_GMK
+_JAVA_COMPILATION_GMK := 1
 
-################################################################################
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
+endif
 
 include MakeIO.gmk
 
@@ -165,7 +167,6 @@ endef
 #   CREATE_API_DIGEST Set to true to use a javac plugin to generate a public API
 #        hash which can be used for down stream dependencies to only rebuild
 #        when the API changes.
-#   PROCESS_JBR_API Set to true to use an annotation processor to generate JBR API bindings.
 #   KEEP_ALL_TRANSLATIONS Set to true to skip translation filtering
 SetupJavaCompilation = $(NamedParamsMacroTemplate)
 define SetupJavaCompilationBody
@@ -289,20 +290,11 @@ define SetupJavaCompilationBody
         "-XDLOG_LEVEL=$(LOG_LEVEL)" \
         #
 
-    $1_EXTRA_DEPS := $$(BUILDTOOLS_OUTPUTDIR)/plugins/_the.COMPILE_DEPEND_batch
-  endif
-
-  ifeq ($$($1_PROCESS_JBR_API), true)
-    # Automatic path conversion doesn't work for two arguments, so call fixpath manually
-    $1_JBR_API_FLAGS := -Xplugin:"jbr-api $$(call FixPath, $$($1_BIN)/java.base/META-INF/jbrapi.registry) $$(call FixPath, $(TOPDIR)/jb/jbr-api.version)"
-    $1_EXTRA_DEPS := $$($1_EXTRA_DEPS) $$(BUILDTOOLS_OUTPUTDIR)/plugins/_the.COMPILE_JBR_API_PLUGIN_batch
-  endif
-
-  ifeq ($$(call Or, $$($1_CREATE_API_DIGEST) $$($1_PROCESS_JBR_API)), true)
+    $1_EXTRA_DEPS := $$(BUILDTOOLS_OUTPUTDIR)/depend/_the.COMPILE_DEPEND_batch
     # including the compilation output on the classpath, so that incremental
     # compilations in unnamed module can refer to other classes from the same
     # source root, which are not being recompiled in this compilation:
-    $1_AUGMENTED_CLASSPATH += $$(BUILDTOOLS_OUTPUTDIR)/plugins $$($1_BIN)
+    $1_AUGMENTED_CLASSPATH += $$(BUILDTOOLS_OUTPUTDIR)/depend $$($1_BIN)
   endif
 
   ifneq ($$($1_AUGMENTED_CLASSPATH), )
@@ -498,7 +490,7 @@ define SetupJavaCompilationBody
 		$$(call MakeDir, $$(@D))
 		$$(call ExecuteWithLog, $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$$($1_SAFE_NAME)_batch, \
 		    $$($1_JAVAC_CMD) $$($1_FLAGS) \
-		        $$($1_API_DIGEST_FLAGS) $$($1_JBR_API_FLAGS) \
+		        $$($1_API_DIGEST_FLAGS) \
 		        -XDmodifiedInputs=$$($1_MODFILELIST_FIXED) \
 		        -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_FILELIST)) && \
 		$(TOUCH) $$@
@@ -548,7 +540,4 @@ SetupJavaCompilationCompileTarget = \
 SetupJavaCompilationApiTarget = \
     $(strip $2)/_the.$(strip $1)_pubapi
 
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _JAVA_COMPILATION_GMK

make/common/JdkNativeCompilation.gmk

@@ -23,13 +23,18 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifndef _JDK_NATIVE_COMPILATION_GMK
+_JDK_NATIVE_COMPILATION_GMK := 1
 
-################################################################################
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including JdkNativeCompilation.gmk)
+endif
 
 include NativeCompilation.gmk
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, common/JdkNativeCompilation.gmk))
+
 FindSrcDirsForComponent += \
   $(call uniq, $(wildcard \
       $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/$(strip $2) \
@@ -494,7 +499,4 @@ define SetupJdkExecutableBody
   $$(eval $$(call SetupJdkNativeCompilation, $1))
 endef
 
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _JDK_NATIVE_COMPILATION_GMK

make/common/LogUtils.gmk

@@ -23,9 +23,6 @@
 # questions.
 #
 
-include $(TOPDIR)/make/common/MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
 ################################################################################
 # This file contains helper functions for logging.
 ################################################################################
@@ -97,9 +94,6 @@ define ParseLogLevel
   # Error: LOG contains unknown option or log level: debug-to-log.
   $$(eval $$(call ParseLogOption, profile, LOG_PROFILE_TIMES_FILE))
 
-  # If "flow" is present, log makefile execution flow
-  $$(eval $$(call ParseLogOption, flow, LOG_FLOW))
-
   # Treat LOG=profile-to-log as if it were LOG=profile,profile-to-log
   LOG_PROFILE_TIMES_FILE := $$(firstword $$(LOG_PROFILE_TIMES_FILE) $$(LOG_PROFILE_TIMES_LOG))
 
@@ -128,11 +122,6 @@ endef
 
 MAKE_LOG_VARS = $(foreach v, \
     LOG_LEVEL LOG_NOFILE LOG_CMDLINES LOG_REPORT LOG_PROFILE_TIMES_LOG \
-    LOG_PROFILE_TIMES_FILE LOG_FLOW, \
+    LOG_PROFILE_TIMES_FILE, \
     $v=$($v) \
 )
-
-################################################################################
-
-endif # include guard
-include $(TOPDIR)/make/common/MakeIncludeEnd.gmk

make/common/MakeBase.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,11 +23,6 @@
 # questions.
 #
 
-MAKEBASE_INCLUDED := true
-
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
 ################################################################################
 # MakeBase provides the core functionality needed and used by all makefiles. It
 # should be included by all makefiles. MakeBase provides essential
@@ -35,6 +30,13 @@ ifeq ($(INCLUDE), true)
 # execution, logging and fixpath functionality.
 ################################################################################
 
+ifndef _MAKEBASE_GMK
+_MAKEBASE_GMK := 1
+
+ifeq ($(wildcard $(SPEC)), )
+  $(error MakeBase.gmk needs SPEC set to a proper spec.gmk)
+endif
+
 # By defining this pseudo target, make will automatically remove targets
 # if their recipe fails so that a rebuild is automatically triggered on the
 # next make invocation.
@@ -310,5 +312,7 @@ ExecuteWithLog = \
 
 ################################################################################
 
-include MakeIncludeEnd.gmk
-endif # include guard
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, common/MakeBase.gmk))
+
+endif # _MAKEBASE_GMK

make/common/MakeFileEnd.gmk

@@ -1,42 +0,0 @@
-#
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# MakeFileEnd.gmk should be included last of all in all top-level makefiles
-################################################################################
-
-# Hook to include the corresponding custom file, if present.
-ifneq ($(NO_CUSTOM_EXTENSIONS), true)
-  CUSTOM_POST_NAME := $(subst .gmk,-post.gmk, $(THIS_MAKEFILE))
-  $(eval $(call IncludeCustomExtension, $(CUSTOM_POST_NAME)))
-endif
-
-all: $(TARGETS)
-
-ifeq ($(LOG_FLOW), true)
-  $(info :Leave $(THIS_MAKEFILE) [now executing rules])
-endif
-
-.PHONY: default all

make/common/MakeFileStart.gmk

@@ -1,68 +0,0 @@
-#
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# MakeFileStart.gmk should be included first of all in all top-level makefiles
-################################################################################
-
-# This must be the first rule
-default: $(if $(DEFAULT_TARGET), $(DEFAULT_TARGET), all)
-
-THIS_MAKEFILE_PATH := $(firstword $(MAKEFILE_LIST))
-
-ifeq ($(SPEC), )
-  $(error $(THIS_MAKEFILE_PATH): SPEC is not set)
-endif
-
-ifeq ($(wildcard $(SPEC)), )
-  $(error $(THIS_MAKEFILE_PATH): spec.gmk file $(SPEC) is missing)
-endif
-
-ifneq ($(filter $(MAKELEVEL), 1 2),)
-  ifneq ($(words $(MAKEFILE_LIST)), 2)
-    $(error $(THIS_MAKEFILE_PATH): This file is not supposed to be included)
-  endif
-endif
-
-# We need spec.gmk to get $(TOPDIR)
-include $(SPEC)
-
-THIS_MAKEFILE := $(patsubst make/%,%,$(patsubst $(TOPDIR)/%,%,$(THIS_MAKEFILE_PATH)))
-
-ifeq ($(LOG_FLOW), true)
-  $(info :Enter $(THIS_MAKEFILE))
-endif
-
-include $(TOPDIR)/make/common/MakeBase.gmk
-
-TARGETS :=
-
-all:
-
-# Hook to include the corresponding custom file, if present.
-ifneq ($(NO_CUSTOM_EXTENSIONS), true)
-  CUSTOM_PRE_NAME := $(subst .gmk,-pre.gmk, $(THIS_MAKEFILE))
-  $(eval $(call IncludeCustomExtension, $(CUSTOM_PRE_NAME)))
-endif

make/common/MakeIO.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,14 +23,18 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including MakeIO.gmk)
+endif
 
 ################################################################################
+#
 # Functions for dealing with reading and writing from makefiles. Prior to GNU
 # Make 4.0, this was tricky business.
+#
 ################################################################################
 
+
 ################################################################################
 # ListPathsSafely can be used to print command parameters to a file. This is
 # typically done if the command line length risk being too long for the
@@ -237,8 +241,3 @@ else # HAS_FILE_FUNCTION = false
     $$(call ListPathsSafely_IfPrintf,$1,$2,29751,30000)
   endef
 endif # HAS_FILE_FUNCTION
-
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/common/MakeIncludeEnd.gmk

@@ -1,45 +0,0 @@
-#
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# MakeIncludeEnd.gmk should be included last of all in all include files
-################################################################################
-
-# Hook to include the corresponding custom file, if present.
-ifneq ($(NO_CUSTOM_EXTENSIONS), true)
-  CUSTOM_POST_NAME := $(subst .gmk,-post.gmk, $(THIS_INCLUDE))
-  $(eval $(call IncludeCustomExtension, $(CUSTOM_POST_NAME)))
-endif
-
-# Pop our helper name off the stack
-HELPER_STACK := $(wordlist 2, $(words $(HELPER_STACK)), $(HELPER_STACK))
-
-# Print an indented message, also counting the top-level makefile as a level
-ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Leave $(THIS_INCLUDE))
-endif
-
-# Restore the previous helper name
-THIS_INCLUDE := $(firstword $(HELPER_STACK))

make/common/MakeIncludeStart.gmk

@@ -1,83 +0,0 @@
-#
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# MakeIncludeStart.gmk should be included first of all in all include files
-################################################################################
-
-# Get the next to last word (by prepending a padding element)
-THIS_INCLUDE_PATH := $(word $(words ${MAKEFILE_LIST}),padding ${MAKEFILE_LIST})
-THIS_INCLUDE := $(patsubst $(TOPDIR)/make/%,%,$(THIS_INCLUDE_PATH))
-
-# Print an indented message, also counting the top-level makefile as a level
-ifneq ($(INCLUDE_GUARD_$(THIS_INCLUDE)), true)
-  THIS_INCLUDE_MSG := include
-else
-  THIS_INCLUDE_MSG := included already
-endif
-
-ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Enter $(THIS_INCLUDE) [$(THIS_INCLUDE_MSG)])
-endif
-
-ifneq ($(filter $(THIS_INCLUDE), $(HELPER_STACK)), )
-  $(error Internal makefile error: Include loop detected: $(THIS_INCLUDE) $(HELPER_STACK))
-endif
-
-ifeq ($(words $(MAKEFILE_LIST)), 2)
-  $(error $(THIS_INCLUDE_PATH): This file is supposed to be included)
-endif
-
-# In a preinit environment, we do not have any SPEC
-ifneq ($(IS_PREINIT_ENV), true)
-  ifeq ($(SPEC), )
-    $(error $(THIS_INCLUDE_PATH): SPEC is not set)
-  endif
-
-  ifeq ($(wildcard $(SPEC)), )
-    $(error $(THIS_INCLUDE_PATH): spec.gmk file $(SPEC) is missing)
-  endif
-
-  ifneq ($(MAKEBASE_INCLUDED), true)
-    $(error $(THIS_INCLUDE_PATH): MakeBase.gmk is not included)
-  endif
-endif
-
-# Push our helper name onto the stack
-HELPER_STACK := $(THIS_INCLUDE) $(HELPER_STACK)
-
-# Setup an automatic include guard
-ifneq ($(INCLUDE_GUARD_$(THIS_INCLUDE)), true)
-  INCLUDE_GUARD_$(THIS_INCLUDE) := true
-  INCLUDE := true
-
-  # Hook to include the corresponding custom file, if present.
-  ifneq ($(NO_CUSTOM_EXTENSIONS), true)
-    CUSTOM_PRE_NAME := $(subst .gmk,-pre.gmk, $(THIS_INCLUDE))
-    $(eval $(call IncludeCustomExtension, $(CUSTOM_PRE_NAME)))
-  endif
-else
-  INCLUDE := false
-endif

make/common/MakeSnippetEnd.gmk

@@ -1,45 +0,0 @@
-#
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# MakeSnippetEnd.gmk should be included after including a makefile snippet
-################################################################################
-
-# Hook to include the corresponding custom file, if present.
-ifneq ($(NO_CUSTOM_EXTENSIONS), true)
-  CUSTOM_POST_NAME := $(subst .gmk,-post.gmk, $(THIS_SNIPPET))
-  $(eval $(call IncludeCustomExtension, $(CUSTOM_POST_NAME)))
-endif
-
-# Pop our helper name off the stack
-HELPER_STACK := $(wordlist 2, $(words $(HELPER_STACK)), $(HELPER_STACK))
-
-# Print an indented message, also counting the top-level makefile as a level
-ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Leave $(THIS_SNIPPET))
-endif
-
-# Restore the previous helper name
-THIS_SNIPPET := $(firstword $(HELPER_STACK))

make/common/MakeSnippetStart.gmk

@@ -1,46 +0,0 @@
-#
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# MakeSnippetStart.gmk should be included before including a makefile snippet
-################################################################################
-
-ifeq ($(THIS_SNIPPET), )
-  $(error Internal makefile error: THIS_SNIPPET is not defined)
-endif
-
-# Print an indented message, also counting the top-level makefile as a level
-ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Enter $(THIS_SNIPPET) [snippet])
-endif
-
-# Push our helper name onto the stack
-HELPER_STACK := $(THIS_SNIPPET) $(HELPER_STACK)
-
-# Hook to include the corresponding custom file, if present.
-ifneq ($(NO_CUSTOM_EXTENSIONS), true)
-  CUSTOM_PRE_NAME := $(subst .gmk,-pre.gmk, $(THIS_SNIPPET))
-  $(eval $(call IncludeCustomExtension, $(CUSTOM_PRE_NAME)))
-endif

make/common/Modules.gmk

@@ -23,8 +23,8 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifndef _MODULES_GMK
+_MODULES_GMK := 1
 
 ################################################################################
 # Setup module sets for classloaders
@@ -45,6 +45,11 @@ include $(TOPDIR)/make/conf/docs-modules.conf
 
 include $(TOPDIR)/make/conf/build-module-sets.conf
 
+################################################################################
+# Hook to include the corresponding custom file, if present.
+# Allowing MODULE list extensions setup above.
+$(eval $(call IncludeCustomExtension, common/Modules.gmk))
+
 ################################################################################
 # Depending on the configuration, we might need to filter out some modules that
 # normally should have been included
@@ -167,8 +172,9 @@ MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk
 
 MODULE_INFOS := $(call FindAllModuleInfos, *)
 
-$(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
-    $(call DependOnVariable, MODULE_INFOS, $(MAKESUPPORT_OUTPUTDIR)/MODULE_INFOS.vardeps)
+ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
+  $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
+      $(call DependOnVariable, MODULE_INFOS, $(MAKESUPPORT_OUTPUTDIR)/MODULE_INFOS.vardeps)
 	$(call MakeTargetDir)
 	$(RM) $@
 	$(foreach m, $(MODULE_INFOS), \
@@ -201,6 +207,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
 	                          printf(" %s", $$0) } \
 	          END           { printf("\n") }' $m \
 	    ) >> $@ $(NEWLINE))
+endif
 
 -include $(MODULE_DEPS_MAKEFILE)
 
@@ -309,5 +316,4 @@ endef
 
 ################################################################################
 
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _MODULES_GMK

make/common/NativeCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,15 +23,19 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
 ################################################################################
 # This is the top-level entry point for our native compilation and linking.
 # It contains the SetupNativeCompilation macro, but is supported by helper
 # macros in the make/common/native directory.
 ################################################################################
 
+ifndef _NATIVE_COMPILATION_GMK
+_NATIVE_COMPILATION_GMK := 1
+
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
+endif
+
 include MakeIO.gmk
 include native/CompileFile.gmk
 include native/DebugSymbols.gmk
@@ -219,7 +223,6 @@ define SetupNativeCompilationBody
   ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
     # Override all targets (this is a hack)
     $1 := $$($1_ALL_OBJS_JSON) $$($1_LDFLAGS_FILE)
-    TARGETS := $(filter $(MAKESUPPORT_OUTPUTDIR)/compile-commands/%, $(TARGETS))
   endif
 endef
 
@@ -406,7 +409,4 @@ define ImportDependencyFile
   endif
 endef
 
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _NATIVE_COMPILATION_GMK

make/common/ProcessMarkdown.gmk

@@ -1,4 +1,4 @@
-# Copyright (c) 2017, 2025, 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
@@ -22,10 +22,9 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including ProcessMarkdown.gmk)
+endif
 
 include TextFileProcessing.gmk
 
@@ -182,8 +181,3 @@ define SetupProcessMarkdownBody
     )
   endif
 endef
-
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/common/TestFilesCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -23,10 +23,13 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifndef _TEST_FILES_COMPILATION_GMK
+_TEST_FILES_COMPILATION_GMK := 1
+
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including TestFilesCompilation.gmk)
+endif
 
-################################################################################
 
 include JdkNativeCompilation.gmk
 
@@ -139,7 +142,4 @@ define SetupTestFilesCompilationBody
 
 endef
 
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _TEST_FILES_COMPILATION_GMK

make/common/TextFileProcessing.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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
@@ -23,10 +23,9 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including TextFileProcessing.gmk)
+endif
 
 # Helper function for SetupTextFileProcessing; adds a rule for a single file
 # to be processed.
@@ -223,8 +222,3 @@ define SetupTextFileProcessingBody
     endif
   endif
 endef
-
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/common/Utils.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,11 +23,14 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including Utils.gmk)
+endif
 
 ################################################################################
+#
 # Basic utility functions available to MakeBase.gmk itself
+#
 ################################################################################
 
 # String equals
@@ -395,8 +398,3 @@ FilterExcludedTranslations = \
     ), \
     $1 \
   ))
-
-################################################################################
-
-include MakeIncludeEnd.gmk
-endif # include guard

make/common/ZipArchive.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,13 +23,15 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
+ifndef _ZIP_ARCHIVE_GMK
+_ZIP_ARCHIVE_GMK := 1
 
 # Depends on build tools for MakeZipReproducible
-include $(TOPDIR)/make/ToolsJdk.gmk
+include ../ToolsJdk.gmk
+
+ifeq ($(_MAKEBASE_GMK), )
+  $(error You must include MakeBase.gmk prior to including ZipArchive.gmk)
+endif
 
 # Setup make rules for creating a zip archive.
 #
@@ -190,7 +192,4 @@ define SetupZipArchiveBody
   $1 += $$($1_ZIP)
 endef
 
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _ZIP_ARCHIVE_GMK

make/common/modules/CopyCommon.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,11 +23,6 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
-
 include CopyFiles.gmk
 
 LIB_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)
@@ -93,8 +88,3 @@ define SetupCopyLegalFilesBody
     ) \
   )
 endef
-
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/common/modules/GendataCommon.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -23,15 +23,6 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
-
 include JavaCompilation.gmk
-include $(TOPDIR)/make/ToolsJdk.gmk
+include ToolsJdk.gmk
 
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/common/modules/GensrcCommon.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, 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
@@ -23,14 +23,9 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
-
 include Execute.gmk
 include TextFileProcessing.gmk
-include $(TOPDIR)/make/ToolsJdk.gmk
+include ToolsJdk.gmk
 
 ################################################################################
 # Sets up a rule that creates a version.properties file in the gensrc output
@@ -46,8 +41,3 @@ define SetupVersionProperties
 
   $$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2)
 endef
-
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/common/modules/GensrcModuleInfo.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, 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
@@ -23,8 +23,6 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
 ################################################################################
 # This file makes modifications to module-info.java files based on the build
 # configuration.
@@ -43,8 +41,13 @@ include MakeFileStart.gmk
 #
 # The modified module-info.java files are put in the gensrc directory where
 # they will automatically override the static versions in the src tree.
+#
 ################################################################################
 
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 include Modules.gmk
 
 ################################################################################
@@ -98,4 +101,4 @@ endif
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)