JBR-1430 (8195129) Windows: use UTF16 version of Win32 API to load DLL

Also correct library name encoding in exception messages.

with fix for JBR-5300 Change source code and test files to use GPL license

.github/README.md

@@ -0,0 +1,212 @@
+[![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)
+ 
+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 17
+
+| IDE Version | Latest JBR                                                                                             | Date Released |
+|-------------|--------------------------------------------------------------------------------------------------------|---------------|
+| 2023.1      | [17.0.6-b829.9](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b829.9)   | 10-Apr-2023   |
+| 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)
+Create a container:
+```
+$ cd jb/project/docker
+$ docker build .
+...
+Successfully built 942ea9900054
+```
+Run these commands in the new container:
+```
+$ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
+# cd /JetBrainsRuntime
+# sh ./configure
+# make images CONF=linux-x86_64-normal-server-release
+```
+
+### 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
+```
+Get Java 18 (for instance, [Azul Zulu Builds of OpenJDK 18](https://www.azul.com/downloads/?version=java-18-sts&os=linux&package=jdk)).
+
+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 18 (for instance, [Azul Zulu Builds of OpenJDK 18](https://www.azul.com/downloads/?version=java-18-sts&os=windows&package=jdk)).
+  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/`.
+
+### macOS
+Install the following:
+* Xcode command line developer tools and `autoconf` via [Homebrew](https://brew.sh/).
+* Java 18 (for instance, [Azul Zulu Builds of OpenJDK 18](https://www.azul.com/downloads/?version=java-18-sts&os=macos&package=jdk)).
+
+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/workflows/main.yml

@@ -26,10 +26,6 @@
 name: 'OpenJDK GHA Sanity Checks'
 
 on:
-  push:
-    branches-ignore:
-      - master
-      - pr/*
   workflow_dispatch:
     inputs:
       platforms:
@@ -59,7 +55,8 @@ jobs:
     outputs:
       linux-x64: ${{ steps.include.outputs.linux-x64 }}
       linux-x86: ${{ steps.include.outputs.linux-x86 }}
-      linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
+      # additional build options for linux-x64 are disabled
+      # linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
       linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
       macos-x64: ${{ steps.include.outputs.macos-x64 }}
       macos-aarch64: ${{ steps.include.outputs.macos-aarch64 }}

.github/workflows/pr.yml

@@ -0,0 +1,270 @@
+#
+# 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

.github/workflows/test.yml

@@ -64,6 +64,7 @@ jobs:
           - 'hs/tier1 gc'
           - 'hs/tier1 runtime'
           - 'hs/tier1 serviceability'
+          - 'lib-test/tier1'
 
         include:
           - test-name: 'jdk/tier1 part 1'
@@ -98,6 +99,10 @@ jobs:
             test-suite: 'test/hotspot/jtreg/:tier1_serviceability'
             debug-suffix: -debug
 
+          - test-name: 'lib-test/tier1'
+            test-suite: 'test/lib-test/:tier1'
+            debug-suffix: -debug
+
     steps:
       - name: 'Checkout the JDK source'
         uses: actions/checkout@v3

.gitignore

@@ -18,3 +18,8 @@ NashornProfile.txt
 /src/utils/LogCompilation/target/
 /.project/
 /.settings/
+/.project
+/.classpath
+/.cproject
+/compile_commands.json
+/.cache

README.md

@@ -1,3 +1,5 @@
+[![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,7 +25,26 @@
 # Shell script for generating an IDEA project from a given list of modules
 
 usage() {
-      echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [-c|--conf <conf_name>] [modules]+"
+      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.*)"
       exit 1
 }
 
@@ -33,10 +52,13 @@ 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;
 
-IDEA_OUTPUT=$TOP/.idea
-VERBOSE="false"
+VERBOSE=true
+ABSOLUTE_PATHS=false
 CONF_ARG=
 while [ $# -gt 0 ]
 do
@@ -45,14 +67,24 @@ do
       usage
       ;;
 
-    -v | --vebose )
-      VERBOSE="true"
+    -q | --quiet )
+      VERBOSE=false
+      ;;
+
+    -a | --absolute-paths )
+      ABSOLUTE_PATHS=true
+      ;;
+
+    -r | --root )
+      TOPLEVEL_DIR="$2"
+      shift
       ;;
 
     -o | --output )
-      IDEA_OUTPUT=$2/.idea
+      IDEA_OUTPUT="$2/.idea"
       shift
       ;;
+
     -c | --conf )
       CONF_ARG="CONF_NAME=$2"
       shift
@@ -69,20 +101,17 @@ do
   shift
 done
 
-if [ -e $IDEA_OUTPUT ] ; then
-    rm -r $IDEA_OUTPUT
+if [ "x$IDEA_OUTPUT" = "x" ] ; then
+  IDEA_OUTPUT="$TOPLEVEL_DIR/.idea"
 fi
+
 mkdir -p $IDEA_OUTPUT || exit 1
-cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
+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`
 
-if [ "x$TOPLEVEL_DIR" = "x" ] ; then
-    cd $SCRIPT_DIR/..
-    TOPLEVEL_DIR=`pwd`
-    cd $IDEA_OUTPUT
-fi
-
-MAKE_DIR="$SCRIPT_DIR/../make"
-IDEA_MAKE="$MAKE_DIR/ide/idea/jdk"
+IDEA_MAKE="$OPENJDK_DIR/make/ide/idea/jdk"
 IDEA_TEMPLATE="$IDEA_MAKE/template"
 
 cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
@@ -94,31 +123,31 @@ if [ -d "$TEMPLATES_OVERRIDE" ] ; then
     done
 fi
 
-if [ "$VERBOSE" = "true" ] ; then
-  echo "output dir: $IDEA_OUTPUT"
-  echo "idea template dir: $IDEA_TEMPLATE"
+if [ "$VERBOSE" = true ] ; then
+  echo "Will generate IDEA project files in \"$IDEA_OUTPUT\" for project \"$TOPLEVEL_DIR\""
 fi
 
-cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I $MAKE_DIR/.. idea MAKEOVERRIDES= OUT=$IDEA_OUTPUT/env.cfg MODULES="$*" $CONF_ARG || exit 1
+cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I "$OPENJDK_DIR" idea TOPLEVEL_DIR="$TOPLEVEL_DIR" \
+    MAKEOVERRIDES= IDEA_OUTPUT_PARENT="$IDEA_OUTPUT_PARENT" OUT="$IDEA_OUTPUT/env.cfg" MODULES="$*" $CONF_ARG || exit 1
 cd $SCRIPT_DIR
 
 . $IDEA_OUTPUT/env.cfg
 
-# 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
+# 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
 fi
 
 if [ "x$MODULE_NAMES" = "x" ] ; then
   echo "FATAL: MODULE_NAMES is empty" >&2; exit 1
 fi
 
-if [ "x$BOOT_JDK" = "x" ] ; then
-  echo "FATAL: BOOT_JDK is empty" >&2; exit 1
+if [ "x$RELATIVE_PROJECT_DIR" = "x" ] ; then
+  echo "FATAL: RELATIVE_PROJECT_DIR is empty" >&2; exit 1
 fi
 
-if [ "x$SPEC" = "x" ] ; then
-  echo "FATAL: SPEC is empty" >&2; exit 1
+if [ "x$RELATIVE_BUILD_DIR" = "x" ] ; then
+  echo "FATAL: RELATIVE_BUILD_DIR is empty" >&2; exit 1
 fi
 
 if [ -d "$TOPLEVEL_DIR/.hg" ] ; then
@@ -129,6 +158,43 @@ 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
@@ -152,126 +218,106 @@ 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"
-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`"
+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
     if [ "x$JT_HOME" = "x" ]; then
       add_replacement "###JTREG_HOME###" ""
     else
-      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`"
+      add_replacement "###JTREG_HOME###" "`$PATHTOOL -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
 
-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
-
-    VM_CI="jdk.internal.vm.ci/share/classes"
-    VM_COMPILER="src/jdk.internal.vm.compiler/share/classes"
-    if test "${root#*$VM_CI}" != "$root" || test "${root#*$VM_COMPILER}" != "$root"; then
-        for subdir in "$root"/*; do
-            if [ -d "$subdir" ]; then
-                SOURCES=$SOURCES" $SOURCE_PREFIX""$subdir"/src"$SOURCE_POSTFIX"
-            fi
-        done
-    else
-        SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
-    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\" /> "
 done
-
-add_replacement "###SOURCE_ROOTS###" "$SOURCES"
+add_replacement "###MODULE_IMLS###" "$MODULE_IMLS"
+add_replacement "###TEST_MODULE_DEPENDENCIES###" "$TEST_MODULE_DEPENDENCIES"
 
 replace_template_dir "$IDEA_OUTPUT"
 
-### Compile the custom Logger
+### Generate module project files
 
-CLASSES=$IDEA_OUTPUT/classes
+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"
 
-if [ "x$ANT_HOME" = "x" ] ; then
-  # try some common locations
-  if [ -f "/usr/share/ant/lib/ant.jar" ] ; then
-    ANT_HOME="/usr/share/ant"
+### 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"
   else
-    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
+    echo "$WINENV_ROOT\bin\bash.exe -l -c \"cd %CD:\=/%/ && %*\"" >> "$IDEA_OUTPUT/bash.bat"
   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 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
+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

bin/jib.sh

@@ -130,7 +130,7 @@ install_jib() {
     fi
     # Want to check the filetype using file, to see if we got served a HTML error page.
     # This is sensitive to the filename containing a specific string, but good enough.
-    file ${installed_jib_script}.gz | grep "gzip compressed data" > /dev/null
+    file "${installed_jib_script}.gz" | grep "gzip compressed data" > /dev/null
     if [ $? -ne 0 ]; then 
         echo "Warning: ${installed_jib_script}.gz is not a gzip file."
         echo "If you are behind a proxy you may need to configure exceptions using no_proxy."

doc/building.html

@@ -134,6 +134,8 @@ id="toc-cross-compiling-with-debian-sysroots">Cross compiling with
 Debian sysroots</a></li>
 <li><a href="#building-for-armaarch64"
 id="toc-building-for-armaarch64">Building for ARM/aarch64</a></li>
+<li><a href="#building-for-risc-v" id="toc-building-for-risc-v">Building
+for RISC-V</a></li>
 <li><a href="#building-for-musl" id="toc-building-for-musl">Building for
 musl</a></li>
 <li><a href="#verifying-the-build"
@@ -1087,7 +1089,7 @@ home, i.e. the top directory, containing <code>lib/jtreg.jar</code>
 etc.</p>
 <p>The <a href="https://wiki.openjdk.org/display/Adoption">Adoption
 Group</a> provides recent builds of jtreg <a
-href="https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/">here</a>.
+href="https://ci.adoptium.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/">here</a>.
 Download the latest <code>.tar.gz</code> file, unpack it, and point
 <code>--with-jtreg</code> to the <code>jtreg</code> directory that you
 just unpacked.</p>
@@ -1376,10 +1378,10 @@ No such file or directory cp: cannot stat
 Debian sysroots</h3>
 <p>Fortunately, you can create sysroots for foreign architectures with
 tools provided by your OS. On Debian/Ubuntu systems, one could use
-<code>qemu-deboostrap</code> to create the <em>target</em> system
-chroot, which would have the native libraries and headers specific to
-that <em>target</em> system. After that, we can use the cross-compiler
-on the <em>build</em> system, pointing into chroot to get the build
+<code>debootstrap</code> to create the <em>target</em> system chroot,
+which would have the native libraries and headers specific to that
+<em>target</em> system. After that, we can use the cross-compiler on the
+<em>build</em> system, pointing into chroot to get the build
 dependencies right. This allows building for foreign architectures with
 native compilation speed.</p>
 <p>For example, cross-compiling to AArch64 from x86_64 could be done
@@ -1389,7 +1391,7 @@ like this:</p>
 <code>apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu</code></p></li>
 <li><p>Create chroot on the <em>build</em> system, configuring it for
 <em>target</em> system:
-<code>sudo qemu-debootstrap \       --arch=arm64 \       --verbose \       --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev,libffi-dev \       --resolve-deps \       buster \       ~/sysroot-arm64 \       http://httpredir.debian.org/debian/</code></p></li>
+<code>sudo debootstrap \       --arch=arm64 \       --verbose \       --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev,libffi-dev \       --resolve-deps \       buster \       ~/sysroot-arm64 \       http://httpredir.debian.org/debian/     # If the target architecture is `riscv64`,     # the path should be `debian-ports` instead of `debian`.</code></p></li>
 <li><p>Make sure the symlinks inside the newly created chroot point to
 proper locations:
 <code>sudo chroot ~/sysroot-arm64 symlinks -cr .</code></p></li>
@@ -1516,6 +1518,13 @@ are:</p>
 <td style="text-align: left;">sh4-linux-gnu</td>
 <td>zero</td>
 </tr>
+<tr class="even">
+<td style="text-align: left;">riscv64</td>
+<td style="text-align: left;">sid</td>
+<td style="text-align: left;">riscv64</td>
+<td style="text-align: left;">riscv64-linux-gnu</td>
+<td>(all)</td>
+</tr>
 </tbody>
 </table>
 <h3 id="building-for-armaarch64">Building for ARM/aarch64</h3>
@@ -1525,6 +1534,21 @@ profiles are available using <code>--with-abi-profile</code>:
 arm-vfp-sflt, arm-vfp-hflt, arm-sflt, armv5-vfp-sflt, armv6-vfp-hflt.
 Note that soft-float ABIs are no longer properly supported by the
 JDK.</p>
+<h3 id="building-for-risc-v">Building for RISC-V</h3>
+<p>The RISC-V community provides a basic <a
+href="https://github.com/riscv-collab/riscv-gnu-toolchain">GNU compiler
+toolchain</a>, but the <a href="#External-Library-Requirements">external
+libraries</a> required by OpenJDK complicate the building process. The
+placeholder <code>&lt;toolchain-installed-path&gt;</code> shown below is
+the path where you want to install the toolchain.</p>
+<ul>
+<li><p>Install the RISC-V GNU compiler toolchain:
+<code>git clone --recursive https://github.com/riscv-collab/riscv-gnu-toolchain     cd riscv-gnu-toolchain     ./configure --prefix=&lt;toolchain-installed-path&gt;     make linux     export PATH=&lt;toolchain-installed-path&gt;/bin:$PATH</code></p></li>
+<li><p>Cross-compile all the required libraries:
+<code># An example for libffi     git clone https://github.com/libffi/libffi     cd libffi     ./configure --host=riscv64-unknown-linux-gnu --prefix=&lt;toolchain-installed-path&gt;/sysroot/usr     make     make install</code></p></li>
+<li><p>Configure and build OpenJDK:
+<code>bash configure \       --with-boot-jdk=$BOOT_JDK \       --openjdk-target=riscv64-linux-gnu \       --with-sysroot=&lt;toolchain-installed-path&gt;/sysroot \       --with-toolchain-path=&lt;toolchain-installed-path&gt;/bin \       --with-extra-path=&lt;toolchain-installed-path&gt;/bin     make images</code></p></li>
+</ul>
 <h3 id="building-for-musl">Building for musl</h3>
 <p>Just like it's possible to cross-compile for a different CPU, it's
 possible to cross-compile for musl libc on a glibc-based <em>build</em>

doc/building.md

@@ -860,7 +860,7 @@ containing `lib/jtreg.jar` etc.
 
 The [Adoption Group](https://wiki.openjdk.org/display/Adoption) provides
 recent builds of jtreg [here](
-https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/).
+https://ci.adoptium.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/).
 Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
 `jtreg` directory that you just unpacked.
 
@@ -1147,7 +1147,7 @@ Note that X11 is needed even if you only want to build a headless JDK.
 ### Cross compiling with Debian sysroots
 
 Fortunately, you can create sysroots for foreign architectures with tools
-provided by your OS. On Debian/Ubuntu systems, one could use `qemu-deboostrap` to
+provided by your OS. On Debian/Ubuntu systems, one could use `debootstrap` to
 create the *target* system chroot, which would have the native libraries and headers
 specific to that *target* system. After that, we can use the cross-compiler on the *build*
 system, pointing into chroot to get the build dependencies right. This allows building
@@ -1162,7 +1162,7 @@ For example, cross-compiling to AArch64 from x86_64 could be done like this:
 
   * Create chroot on the *build* system, configuring it for *target* system:
     ```
-    sudo qemu-debootstrap \
+    sudo debootstrap \
       --arch=arm64 \
       --verbose \
       --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev,libffi-dev \
@@ -1170,6 +1170,8 @@ For example, cross-compiling to AArch64 from x86_64 could be done like this:
       buster \
       ~/sysroot-arm64 \
       http://httpredir.debian.org/debian/
+    # If the target architecture is `riscv64`,
+    # the path should be `debian-ports` instead of `debian`.
     ```
 
   * Make sure the symlinks inside the newly created chroot point to proper locations:
@@ -1217,6 +1219,7 @@ Architectures that are known to successfully cross-compile like this are:
   m68k          sid          m68k          m68k-linux-gnu           zero
   alpha         sid          alpha         alpha-linux-gnu          zero
   sh4           sid          sh4           sh4-linux-gnu            zero
+  riscv64       sid          riscv64       riscv64-linux-gnu        (all)
 
 ### Building for ARM/aarch64
 
@@ -1226,6 +1229,44 @@ available using `--with-abi-profile`: arm-vfp-sflt, arm-vfp-hflt, arm-sflt,
 armv5-vfp-sflt, armv6-vfp-hflt. Note that soft-float ABIs are no longer
 properly supported by the JDK.
 
+### Building for RISC-V
+
+The RISC-V community provides a basic
+[GNU compiler toolchain](https://github.com/riscv-collab/riscv-gnu-toolchain),
+but the [external libraries](#External-Library-Requirements) required by OpenJDK
+complicate the building process. The placeholder `<toolchain-installed-path>`
+shown below is the path where you want to install the toolchain.
+
+  * Install the RISC-V GNU compiler toolchain:
+    ```
+    git clone --recursive https://github.com/riscv-collab/riscv-gnu-toolchain
+    cd riscv-gnu-toolchain
+    ./configure --prefix=<toolchain-installed-path>
+    make linux
+    export PATH=<toolchain-installed-path>/bin:$PATH
+    ```
+
+  * Cross-compile all the required libraries:
+    ```
+    # An example for libffi
+    git clone https://github.com/libffi/libffi
+    cd libffi
+    ./configure --host=riscv64-unknown-linux-gnu --prefix=<toolchain-installed-path>/sysroot/usr
+    make
+    make install
+    ```
+
+  * Configure and build OpenJDK:
+    ```
+    bash configure \
+      --with-boot-jdk=$BOOT_JDK \
+      --openjdk-target=riscv64-linux-gnu \
+      --with-sysroot=<toolchain-installed-path>/sysroot \
+      --with-toolchain-path=<toolchain-installed-path>/bin \
+      --with-extra-path=<toolchain-installed-path>/bin
+    make images
+    ```
+
 ### Building for musl
 
 Just like it's possible to cross-compile for a different CPU, it's possible to

doc/hotspot-style.html

@@ -82,6 +82,7 @@ id="toc-uniform-initialization">Uniform Initialization</a></li>
 id="toc-local-function-objects">Local Function Objects</a></li>
 <li><a href="#inheriting-constructors"
 id="toc-inheriting-constructors">Inheriting constructors</a></li>
+<li><a href="#attributes" id="toc-attributes">Attributes</a></li>
 <li><a href="#additional-permitted-features"
 id="toc-additional-permitted-features">Additional Permitted
 Features</a></li>
@@ -597,10 +598,17 @@ conventions might appear jarring and reduce readability.</p></li>
 <code>std::nothrow</code>, and <code>std::nothrow_t</code>.</li>
 <li><code>#include &lt;limits&gt;</code> to use
 <code>std::numeric_limits</code>.</li>
-<li><code>#include &lt;type_traits&gt;</code>.</li>
+<li><code>#include &lt;type_traits&gt;</code> with some restrictions,
+listed below.</li>
 <li><code>#include &lt;cstddef&gt;</code> to use
 <code>std::nullptr_t</code> and <code>std::max_align_t</code>.</li>
 </ul>
+<p>Certain restrictions apply to the declarations provided by
+<code>&lt;type_traits&gt;</code>.</p>
+<ul>
+<li>The <code>alignof</code> operator should be used rather than
+<code>std::alignment_of&lt;&gt;</code>.</li>
+</ul>
 <p>TODO: Rather than directly #including (permitted) Standard Library
 headers, use a convention of #including wrapper headers (in some
 location like hotspot/shared/stdcpp). This provides a single place for
@@ -1057,9 +1065,36 @@ using C++17 or later. It is also enabled by default for
 C++11/14, as the change is considered a Defect Report that applies to
 those versions. Earlier versions of gcc don't have that option, and
 other supported compilers may not have anything similar.</p>
+<h3 id="attributes">Attributes</h3>
+<p>The use of some attributes (<a
+href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2761.pdf">n2761</a>)
+(listed below) is permitted. (Note that some of the attributes defined
+in that paper didn't make it into the final specification.)</p>
+<p>Attributes are syntactically permitted in a broad set of locations,
+but specific attributes are only permitted in a subset of those
+locations. In some cases an attribute that appertains to a given element
+may be placed in any of several locations with the same meaning. In
+those cases HotSpot has a preferred location.</p>
+<ul>
+<li>An attribute that appertains to a function is placed at the
+beginning of the function's declaration, rather than between the
+function name and the parameter list.</li>
+</ul>
+<p>Only the following attributes are permitted:</p>
+<ul>
+<li><code>[[noreturn]]</code></li>
+</ul>
+<p>The following attributes are expressly forbidden:</p>
+<ul>
+<li><code>[[carries_dependency]]</code> - Related to
+<code>memory_order_consume</code>.</li>
+<li><code>[[deprecated]]</code> - Not relevant in HotSpot code.</li>
+</ul>
 <h3 id="additional-permitted-features">Additional Permitted
 Features</h3>
 <ul>
+<li><p><code>alignof</code> (<a
+href="https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2341.pdf">n2341</a>)</p></li>
 <li><p><code>constexpr</code> (<a
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf">n2235</a>)
 (<a
@@ -1149,9 +1184,6 @@ initialization or destruction. Initialization order problems can be
 difficult to deal with and lead to surprises, as can destruction
 ordering. HotSpot doesn't generally try to cleanup on exit, and running
 destructors at exit can also lead to problems.</p></li>
-<li><p><code>[[deprecated]]</code> attribute (<a
-href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3760.html">n3760</a>)
-— Not relevant in HotSpot code.</p></li>
 <li><p>Avoid most operator overloading, preferring named functions. When
 operator overloading is used, ensure the semantics conform to the normal
 expected behavior of the operation.</p></li>
@@ -1171,8 +1203,6 @@ href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm">n2541</
 href="https://isocpp.org/files/papers/N3651.pdf">n3651</a>)</p></li>
 <li><p>Member initializers and aggregates (<a
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3653.html">n3653</a>)</p></li>
-<li><p><code>[[noreturn]]</code> attribute (<a
-href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2761.pdf">n2761</a>)</p></li>
 <li><p>Rvalue references and move semantics</p></li>
 </ul>
 </body>

doc/hotspot-style.md

@@ -572,9 +572,13 @@ There are a few exceptions to this rule.
 
 * `#include <new>` to use placement `new`, `std::nothrow`, and `std::nothrow_t`.
 * `#include <limits>` to use `std::numeric_limits`.
-* `#include <type_traits>`.
+* `#include <type_traits>` with some restrictions, listed below.
 * `#include <cstddef>` to use `std::nullptr_t` and `std::max_align_t`.
 
+Certain restrictions apply to the declarations provided by `<type_traits>`.
+
+* The `alignof` operator should be used rather than `std::alignment_of<>`.
+
 TODO: Rather than directly \#including (permitted) Standard Library
 headers, use a convention of \#including wrapper headers (in some
 location like hotspot/shared/stdcpp).  This provides a single place
@@ -1054,8 +1058,37 @@ and other supported compilers may not have anything similar.
 [p0136r1]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0136r1.html
   "p0136r1"
 
+### Attributes
+
+The use of some attributes
+([n2761](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2761.pdf))
+(listed below) is permitted.  (Note that some of the attributes defined in
+that paper didn't make it into the final specification.)
+
+Attributes are syntactically permitted in a broad set of locations, but
+specific attributes are only permitted in a subset of those locations.  In
+some cases an attribute that appertains to a given element may be placed in
+any of several locations with the same meaning.  In those cases HotSpot has a
+preferred location.
+
+* An attribute that appertains to a function is placed at the beginning of the
+function's declaration, rather than between the function name and the parameter
+list.
+
+Only the following attributes are permitted:
+
+* `[[noreturn]]`
+
+The following attributes are expressly forbidden:
+
+* `[[carries_dependency]]` - Related to `memory_order_consume`.
+* `[[deprecated]]` - Not relevant in HotSpot code.
+
 ### Additional Permitted Features
 
+* `alignof`
+([n2341](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2341.pdf))
+
 * `constexpr`
 ([n2235](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf))
 ([n3652](https://isocpp.org/files/papers/N3652.html))
@@ -1153,10 +1186,6 @@ difficult to deal with and lead to surprises, as can destruction
 ordering.  HotSpot doesn't generally try to cleanup on exit, and
 running destructors at exit can also lead to problems.
 
-* `[[deprecated]]` attribute
-([n3760](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3760.html)) &mdash;
-Not relevant in HotSpot code.
-
 * Avoid most operator overloading, preferring named functions.  When
 operator overloading is used, ensure the semantics conform to the
 normal expected behavior of the operation.
@@ -1181,9 +1210,6 @@ features that have not yet been discussed.
 * Member initializers and aggregates
 ([n3653](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3653.html))
 
-* `[[noreturn]]` attribute
-([n2761](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2761.pdf))
-
 * Rvalue references and move semantics
 
 [ADL]: https://en.cppreference.com/w/cpp/language/adl

doc/ide.html

@@ -79,6 +79,45 @@ native source. After configuring, the project is generated using:</p>
 <code>ide\hotspot-visualstudio</code> subfolder of the build output
 folder. The file can be opened in Visual Studio via
 <code>File -&gt; Open -&gt; Project/Solution</code>.</p>
+<h4 id="eclipse-cdt">Eclipse CDT</h4>
+<p>The make system can generate an Eclipse CDT Workspace that enables
+Eclipse indexing for the C and C++ sources throughout the entire
+codebase, as well as registering all common make targets to be runnable
+from the Eclipse explorer. This can be done after configuring by
+running:</p>
+<pre><code>make eclipse-native-env</code></pre>
+<p>After this is run, simply open and import the workspace in Eclipse
+through
+<code>File -&gt; Import -&gt; Projects from Folder or Archive</code> and
+at <code>Import source</code> click on the directory
+<code>ide\eclipse</code>, which can be found in the build output
+folder.</p>
+<p>If this doesn't work, you can also try
+<code>File -&gt; Import -&gt; Existing Projects into Workspace</code>
+instead.</p>
+<p>Setting up an Eclipse Workspace is relatively lightweight compared to
+other supported IDEs, but requires that your CDT installation has Cross
+GCC support enabled at the moment, even if you aren't cross compiling.
+The Visual C++ compiler is, at present, not supported as an indexer.</p>
+<p>If desired, you can instead request make to only include indexing
+support for just the Java Virtual Machine instead of the entire native
+codebase, by running:</p>
+<pre><code>make eclipse-hotspot-env</code></pre>
+<p>If you think your particular Eclipse installation can handle the
+strain, the make system also supports generating a combined Java and
+C/C++ Workspace for Eclipse which can then conveniently switch between
+Java and C/C++ natures during development by running:</p>
+<pre><code>make eclipse-mixed-env</code></pre>
+<p>Do note that this generates all features that come with both Java and
+C/C++ natures.</p>
+<p>By default, the Eclipse Workspace is located in the ide subdirectory
+in the build output. To share the JDK's source directory with the
+Eclipse Workspace, you can instead run:</p>
+<pre><code>make eclipse-shared-&lt;ENV&gt;-env</code></pre>
+<p>Eclipse support in the JDK is relatively new, so do keep in mind that
+not everything may work at the moment. As such, the resulting Workspace
+also has compilation database parsing support enabled, so you can pass
+Eclipse the compile commands file (see below) if all else fails.</p>
 <h4 id="compilation-database">Compilation Database</h4>
 <p>The make system can generate generic native code indexing support in
 the form of a <a
@@ -105,5 +144,28 @@ select the folder where you ran the above script.</p>
 <p>In order to run the tests from the IDE, you can use the JTReg plugin.
 Instructions for building and using the plugin can be found <a
 href="https://github.com/openjdk/jtreg/tree/master/plugins/idea">here</a>.</p>
+<h4 id="eclipse">Eclipse</h4>
+<p>Eclipse JDT is a widely used Java IDE and has been for a very long
+time, being a popular choice alongside IntelliJ IDEA for Java
+development. Likewise, the JDK now includes support for developing its
+Java sources with Eclipse, which can be achieved by setting up a Java
+Workspace by running:</p>
+<pre><code>make eclipse-java-env</code></pre>
+<p>After the workspace has been generated you can import it in the same
+way as you would with Eclipse CDT:</p>
+<p>Follow
+<code>File -&gt; Import -&gt; Projects from Folder or Archive</code> and
+select the <code>ide\eclipse</code> directory in the build output folder
+to import the newly created Java Workspace.</p>
+<p>If doing so results in an error, you can also import the JDK via
+<code>File -&gt; Import -&gt; Existing Projects into Workspace</code> as
+a last resort.</p>
+<p>Alternatively, if you want a Java Workspace inside the JDK's source
+directory, you can instead run:</p>
+<pre><code>make eclipse-shared-java-env</code></pre>
+<p>As mentioned above for Eclipse CDT, you can create a combined Java
+and C/C++ Workspace which can conveniently switch between Java and C/C++
+natures during development by running:</p>
+<pre><code>make eclipse-mixed-env</code></pre>
 </body>
 </html>

doc/ide.md

@@ -56,6 +56,63 @@ This creates a file named `jvm.vcxproj` in `ide\hotspot-visualstudio`
 subfolder of the build output folder. The file can be opened in Visual Studio
 via `File -> Open -> Project/Solution`.
 
+#### Eclipse CDT
+
+The make system can generate an Eclipse CDT Workspace that enables Eclipse
+indexing for the C and C++ sources throughout the entire codebase, as well as
+registering all common make targets to be runnable from the Eclipse explorer.
+This can be done after configuring by running:
+
+```
+make eclipse-native-env
+```
+
+After this is run, simply open and import the workspace in Eclipse through
+`File -> Import -> Projects from Folder or Archive` and at
+`Import source` click on the directory `ide\eclipse`, which can be
+found in the build output folder.
+
+If this doesn't work, you can also try
+`File -> Import -> Existing Projects into Workspace`
+instead.
+
+Setting up an Eclipse Workspace is relatively lightweight compared to other
+supported IDEs, but requires that your CDT installation has Cross GCC support
+enabled at the moment, even if you aren't cross compiling. The Visual C++
+compiler is, at present, not supported as an indexer.
+
+If desired, you can instead request make to only include indexing support for
+just the Java Virtual Machine instead of the entire native codebase, by running:
+
+```
+make eclipse-hotspot-env
+```
+
+If you think your particular Eclipse installation can handle the strain, the
+make system also supports generating a combined Java and C/C++ Workspace for
+Eclipse which can then conveniently switch between Java and C/C++ natures
+during development by running:
+
+```
+make eclipse-mixed-env
+```
+
+Do note that this generates all features that come with both Java and C/C++
+natures.
+
+By default, the Eclipse Workspace is located in the ide subdirectory in the
+build output. To share the JDK's source directory with the Eclipse Workspace,
+you can instead run:
+
+```
+make eclipse-shared-<ENV>-env
+```
+
+Eclipse support in the JDK is relatively new, so do keep in mind that not
+everything may work at the moment. As such, the resulting Workspace also
+has compilation database parsing support enabled, so you can pass Eclipse
+the compile commands file (see below) if all else fails.
+
 #### Compilation Database
 
 The make system can generate generic native code indexing support in the form of
@@ -96,3 +153,40 @@ as the SDK to use.
 In order to run the tests from the IDE, you can use the JTReg plugin.
 Instructions for building and using the plugin can be found
 [here](https://github.com/openjdk/jtreg/tree/master/plugins/idea).
+
+#### Eclipse
+
+Eclipse JDT is a widely used Java IDE and has been for a very long time, being
+a popular choice alongside IntelliJ IDEA for Java development. Likewise, the
+JDK now includes support for developing its Java sources with Eclipse, which
+can be achieved by setting up a Java Workspace by running:
+
+```
+make eclipse-java-env
+```
+
+After the workspace has been generated you can import it in the same way as
+you would with Eclipse CDT:
+
+Follow `File -> Import -> Projects from Folder or Archive` and select the
+`ide\eclipse` directory in the build output folder to import the newly created
+Java Workspace.
+
+If doing so results in an error, you can also import the JDK via
+`File -> Import -> Existing Projects into Workspace`
+as a last resort.
+
+Alternatively, if you want a Java Workspace inside the JDK's source directory,
+you can instead run:
+
+```
+make eclipse-shared-java-env
+```
+
+As mentioned above for Eclipse CDT, you can create a combined Java and C/C++
+Workspace which can conveniently switch between Java and C/C++ natures during
+development by running:
+
+```
+make eclipse-mixed-env
+```

doc/testing.html

@@ -578,12 +578,13 @@ directories.</p>
 <p>For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.</p>
 <h3 id="client-ui-tests">Client UI Tests</h3>
+<h4 id="system-key-shortcuts">System key shortcuts</h4>
 <p>Some Client UI tests use key sequences which may be reserved by the
 operating system. Usually that causes the test failure. So it is highly
 recommended to disable system key shortcuts prior testing. The steps to
 access and disable system key shortcuts for various platforms are
 provided below.</p>
-<h4 id="macos">MacOS</h4>
+<h5 id="macos">macOS</h5>
 <p>Choose Apple menu; System Preferences, click Keyboard, then click
 Shortcuts; select or deselect desired shortcut.</p>
 <p>For example,
@@ -594,17 +595,41 @@ operating system. To run the test correctly the default global key
 shortcut should be disabled using the steps described above, and then
 deselect "Turn keyboard access on or off" option which is responsible
 for <code>CTRL + F1</code> combination.</p>
-<h4 id="linux">Linux</h4>
+<h5 id="linux">Linux</h5>
 <p>Open the Activities overview and start typing Settings; Choose
 Settings, click Devices, then click Keyboard; set or override desired
 shortcut.</p>
-<h4 id="windows">Windows</h4>
+<h5 id="windows">Windows</h5>
 <p>Type <code>gpedit</code> in the Search and then click Edit group
 policy; navigate to User Configuration -&gt; Administrative Templates
 -&gt; Windows Components -&gt; File Explorer; in the right-side pane
 look for "Turn off Windows key hotkeys" and double click on it; enable
 or disable hotkeys.</p>
 <p>Note: restart is required to make the settings take effect.</p>
+<h4 id="robot-api">Robot API</h4>
+<p>Most automated Client UI tests use <code>Robot</code> API to control
+the UI. Usually, the default operating system settings need to be
+adjusted for Robot to work correctly. The detailed steps how to access
+and update these settings for different platforms are provided
+below.</p>
+<h5 id="macos-1">macOS</h5>
+<p><code>Robot</code> is not permitted to control your Mac by default
+since macOS 10.15. To allow it, choose Apple menu -&gt; System Settings,
+click Privacy &amp; Security; then click Accessibility and ensure the
+following apps are allowed to control your computer: <em>Java</em> and
+<em>Terminal</em>. If the tests are run from an IDE, the IDE should be
+granted this permission too.</p>
+<h5 id="windows-1">Windows</h5>
+<p>On Windows if Cygwin terminal is used to run the tests, there is a
+delay in focus transfer. Usually it causes automated UI test failure. To
+disable the delay, type <code>regedit</code> in the Search and then
+select Registry Editor; navigate to the following key:
+<code>HKEY_CURRENT_USER\Control Panel\Desktop</code>; make sure the
+<code>ForegroundLockTimeout</code> value is set to 0.</p>
+<p>Additional information about Client UI tests configuration for
+various operating systems can be obtained at <a
+href="https://wiki.openjdk.org/display/ClientLibs/Automated+client+GUI+testing+system+set+up+requirements">Automated
+client GUI testing system set up requirements</a></p>
 <h2 id="editing-this-document">Editing this document</h2>
 <p>If you want to contribute changes to this document, edit
 <code>doc/testing.md</code> and then run

doc/testing.md

@@ -606,12 +606,14 @@ test/jdk/sun/security/pkcs11/README.
 
 ### Client UI Tests
 
+#### System key shortcuts
+
 Some Client UI tests use key sequences which may be reserved by the operating
 system. Usually that causes the test failure. So it is highly recommended to
 disable system key shortcuts prior testing. The steps to access and disable
 system key shortcuts for various platforms are provided below.
 
-#### MacOS
+##### macOS
 
 Choose Apple menu; System Preferences, click Keyboard, then click Shortcuts;
 select or deselect desired shortcut.
@@ -624,12 +626,12 @@ test correctly the default global key shortcut should be disabled using the
 steps described above, and then deselect "Turn keyboard access on or off"
 option which is responsible for `CTRL + F1` combination.
 
-#### Linux
+##### Linux
 
 Open the Activities overview and start typing Settings; Choose Settings, click
 Devices, then click Keyboard; set or override desired shortcut.
 
-#### Windows
+##### Windows
 
 Type `gpedit` in the Search and then click Edit group policy; navigate to User
 Configuration -> Administrative Templates -> Windows Components -> File
@@ -638,6 +640,33 @@ double click on it; enable or disable hotkeys.
 
 Note: restart is required to make the settings take effect.
 
+#### Robot API
+
+Most automated Client UI tests use `Robot` API to control the UI. Usually,
+the default operating system settings need to be adjusted for Robot
+to work correctly. The detailed steps how to access and update these settings
+for different platforms are provided below.
+
+##### macOS
+
+`Robot` is not permitted to control your Mac by default since
+macOS 10.15. To allow it, choose Apple menu -> System Settings, click
+Privacy & Security; then click Accessibility and ensure the following apps are
+allowed to control your computer: *Java* and *Terminal*. If the tests are run
+from an IDE, the IDE should be granted this permission too.
+
+##### Windows
+
+On Windows if Cygwin terminal is used to run the tests, there is a delay in
+focus transfer. Usually it causes automated UI test failure. To disable the
+delay, type `regedit` in the Search and then select Registry Editor; navigate
+to the following key: `HKEY_CURRENT_USER\Control Panel\Desktop`; make sure
+the `ForegroundLockTimeout` value is set to 0.
+
+Additional information about Client UI tests configuration for various operating
+systems can be obtained at [Automated client GUI testing system set up
+requirements](https://wiki.openjdk.org/display/ClientLibs/Automated+client+GUI+testing+system+set+up+requirements)
+
 ## Editing this document
 
 If you want to contribute changes to this document, edit `doc/testing.md` and

jb/branchdiff.py

@@ -0,0 +1,274 @@
+#!/usr/bin/env python3
+
+import argparse
+import os.path
+import sys
+import subprocess
+
+errors_count = 0
+
+
+def fatal(msg):
+    sys.stderr.write(f"[fatal] {msg}\n")
+    sys.exit(1)
+
+
+def error(msg):
+    global errors_count
+    errors_count += 1
+    sys.stderr.write(f"[error] {msg}\n")
+
+
+def verbose(options, *msg):
+    if options.verbose:
+        sys.stderr.write(f"[verbose] ")
+        sys.stderr.write(*msg)
+        sys.stderr.write('\n')
+
+
+def first_line(str):
+    return "" if not str else str.splitlines()[0]
+
+
+class Options:
+    def __init__(self):
+        ap = argparse.ArgumentParser(description="Show commit differences between branches of JBR git repos",
+                                     epilog="Example: %(prog)s  --from origin/jbr17 --to jbr17.b469 --path "
+                                            "src/hotspot --limit 200")
+        ap.add_argument('--jbr', dest='jbrpath', help='path to JBR git root', required=True)
+        ap.add_argument('--from', dest='frombranch', help='branch to take commits from', required=True)
+        ap.add_argument('--to', dest='tobranch', help='branch to apply new commits to', required=True)
+        ap.add_argument('--path', dest='path', help='limit to changes in this path (relative to git root)')
+        ap.add_argument('--limit', dest='limit', help='limit to this many log entries in --jdk repo', type=int,
+                        default=-1)
+        ap.add_argument('--html', dest="ishtml", help="print out HTML rather than plain text", action='store_true')
+        ap.add_argument('-o', dest="output", help="print the list of missing commits to this file"
+                                                  " to be used as exclude list later")
+        ap.add_argument('--exclude', dest='exclude', help='exclude commits listed in the given file '
+                                                          '(can use edited -o output file as input here)')
+        ap.add_argument('-v', dest='verbose', help="verbose output", default=False, action='store_true')
+        args = ap.parse_args()
+
+        if not os.path.isdir(args.jbrpath):
+            fatal(f"{args.jbrpath} not a directory")
+
+        if not git_is_available():
+            fatal("can't run git commands; make sure git is in PATH")
+
+        self.frombranch = args.frombranch
+        self.tobranch = args.tobranch
+        self.jbrpath = args.jbrpath
+        self.path = args.path
+        self.limit = args.limit
+        self.exclude = args.exclude
+        self.output = args.output
+        self.ishtml = args.ishtml
+        self.verbose = args.verbose
+
+
+class GitRepo:
+    def __init__(self, rootpath):
+        self.rootpath = rootpath
+
+    def run_git_cmd(self, git_args):
+        args = ["git", "-C", self.rootpath]
+        args.extend(git_args)
+        # print(f"Runnig git cmd '{' '.join(args)}'")
+        p = subprocess.run(args, capture_output=True, text=True)
+        if p.returncode != 0:
+            fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
+        return p.stdout
+
+    def save_git_cmd(self, fname, git_args):
+        args = ["git", "-C", self.rootpath]
+        args.extend(git_args)
+        # print(f"Runnig git cmd '{' '.join(args)}'")
+        with open(fname, "w") as stdout_file:
+            p = subprocess.run(args, stdout=stdout_file)
+            if p.returncode != 0:
+                fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
+
+    def current_branch(self):
+        branch_name = self.run_git_cmd(["branch", "--show-current"]).strip()
+        return branch_name
+
+    def log(self, branch, path=None, limit=None):
+        cmds = ["log", "--no-decorate", branch]
+        if limit:
+            cmds.extend(["-n", str(limit)])
+        if path:
+            cmds.append(path)
+        full_log = self.run_git_cmd(cmds)
+        return full_log
+
+
+class Commit:
+    def __init__(self, lines):
+        self.sha = lines[0].split()[1]
+        self.message = ""
+        self.fullmessage = ""
+        self.bugid = ""
+
+        # Commit message starts after one blank line
+        read_message = False
+        for l in lines:
+            if read_message:
+                self.fullmessage += l.strip() + "\n"
+            if not read_message and l == "":
+                read_message = True
+
+        if len(self.fullmessage) > 0:
+            self.message = first_line(self.fullmessage).strip()
+            t = self.message.split(' ')
+            if len(t) > 1:
+                bugid = t[0]
+                if bugid.startswith("fixup"):
+                    bugid = t[1]
+                bugid = bugid.strip(":")
+                if bugid.startswith("JBR-") or bugid.isnumeric():
+                    self.bugid = bugid
+
+
+class History:
+    def __init__(self, log):
+        log_itr = iter(log.splitlines())
+        self.commits = []
+        self.unique_fullmessages = set()
+        self.duplicates = set()
+        commit_lines = []
+        for line in log_itr:
+            if line.startswith("commit ") and len(commit_lines) > 0:
+                commit = Commit(commit_lines)
+                self.add_commit(commit)
+                commit_lines = []
+            commit_lines.append(line)
+
+        if len(commit_lines) > 0:
+            commit = Commit(commit_lines)
+            self.add_commit(commit)
+
+    def add_commit(self, commit):
+        self.commits.append(commit)
+        if commit.fullmessage in self.unique_fullmessages:
+            self.duplicates.add(commit.fullmessage)
+        else:
+            self.unique_fullmessages.add(commit.fullmessage)
+
+    def appears_more_than_once(self, commit):
+        return commit.fullmessage in self.duplicates
+
+    def contains(self, commit):
+        return commit.fullmessage in self.unique_fullmessages
+
+    def size(self):
+        return len(self.commits)
+
+
+def print_explanation(options, jbr):
+    verbose(options, f"Reading history from '{jbr.rootpath}'")
+    if options.path:
+        verbose(options, f"\t(only under '{options.path}')")
+    if options.limit > 0:
+        verbose(options, f"\t(up to '{options.limit}' commits)")
+    verbose(options, f"Searching for missing fixes in '{options.tobranch}' compared with '{options.frombranch}'")
+
+
+def git_is_available():
+    p = None
+    try:
+        p = subprocess.run(["git", "--help"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    except:
+        pass
+    return p is not None and p.returncode == 0
+
+
+def main():
+    check_python_min_requirements()
+    options = Options()
+    jbr = GitRepo(options.jbrpath)
+    print_explanation(options, jbr)
+
+    commits_to_save = []
+    try:
+        log_from = jbr.log(options.frombranch, options.path, options.limit)
+        log_to = jbr.log(options.tobranch, options.path, options.limit)
+        history_from = History(log_from)
+        history_to = History(log_to)
+
+        verbose(options,
+                f"Read {history_from.size()} commits from '{options.frombranch}', {history_to.size()} from {options.tobranch}")
+
+        exclude_list = []
+        if options.exclude:
+            with open(options.exclude, "r") as exclude_file:
+                l = exclude_file.read().split('\n')
+                exclude_list = list(filter(lambda line: not line.startswith("#"), l))
+
+        warned = set()
+        for c in history_from.commits:
+            if c.message:
+                verbose(options, f"Looking for commit '{c.message}'")
+                if c.message in exclude_list:
+                    verbose(options, "...nope, in exclude list")
+                    continue
+
+                if not history_to.contains(c):
+                    commits_to_save.append(c)
+                else:
+                    if history_from.appears_more_than_once(c) and c.fullmessage not in warned:
+                        # Not sure which of those seemingly identical commits are present in the target branch
+                        error(f"Commit '{c.message}' appears more than once in branch '{options.frombranch}'. ")
+                        warned.add(c.fullmessage)
+    except KeyboardInterrupt:
+        fatal("Interrupted")
+
+    print_out_commits(options, commits_to_save)
+    save_commits_to_file(commits_to_save, options)
+    if errors_count > 0:
+        error(f"{errors_count} error(s) generated to stderr. MANUAL CHECK OF COMMITS IS REQUIRED.")
+
+
+def save_commits_to_file(commits_to_save, options):
+    if len(commits_to_save) > 0 and options.output:
+        print()
+        with open(options.output, "w") as out:
+            for i, c in enumerate(reversed(commits_to_save)):
+                print(f"# {c.sha}", file=out)
+                print(c.message, file=out)
+
+
+def print_out_commits(options, commits_to_save):
+    if options.ishtml:
+        print("<html><body>")
+        print(f"<p><b>Commits on <code>{options.frombranch}</code>"
+              f" missing from <code>{options.tobranch}</code></b></p></h1>")
+    if len(commits_to_save) > 0:
+        for c in sorted(commits_to_save, key=lambda commit: commit.bugid):
+            if options.ishtml:
+                msg = c.message
+                bugurl = ""
+                if c.bugid:
+                    if c.bugid.isnumeric():
+                        bugurl = f"https://bugs.openjdk.org/browse/JDK-{c.bugid}"
+                    elif c.bugid.startswith("JBR-"):
+                        bugurl = f"https://youtrack.jetbrains.com/issue/{c.bugid}"
+
+                if len(bugurl) > 0:
+                    msg = msg.replace(c.bugid, f"<a href='{bugurl}'>{c.bugid}</a>")
+
+                sha = f"<a href='https://jetbrains.team/p/jbre/repositories/jbr/commits?commits={c.sha}'>" \
+                      f"{c.sha[0:8]}</a>"
+                print(f"<li>{msg} ({sha})</li>")
+            else:
+                print(f"{c.message} ({c.sha[0:8]})")
+    if options.ishtml:
+        print("</body></html>")
+
+
+def check_python_min_requirements():
+    if sys.version_info < (3, 6):
+        fatal("Minimum version 3.6 is required to run this script")
+
+
+if __name__ == '__main__':
+    main()

jb/jdkdiff.py

@@ -0,0 +1,230 @@
+#!/usr/bin/env python3
+
+import argparse
+import math
+import os.path
+import sys
+import subprocess
+
+
+def fatal(msg):
+    sys.stderr.write(f"[fatal] {msg}\n")
+    sys.exit(1)
+
+
+def verbose(options, *msg):
+    if options.verbose:
+        sys.stdout.write(f"[verbose] ")
+        sys.stdout.write(*msg)
+        sys.stdout.write('\n')
+
+
+def first_line(str):
+    return "" if not str else str.splitlines()[0]
+
+
+class Options:
+    def __init__(self):
+        ap = argparse.ArgumentParser(description="Show bugfixes differences between JBR and OpenJDK git repos",
+                                     epilog="Example: %(prog)s  --jdk ./jdk11u/ --jbr ./JetBrainsRuntime/ --path src/hotspot --limit 200")
+        ap.add_argument('--jdk', dest='jdkpath', help='path to OpenJDK git repo', required=True)
+        ap.add_argument('--jbr', dest='jbrpath', help='path to JBR git repo', required=True)
+        ap.add_argument('--path', dest='path', help='limit to changes in this path (relative to git root)')
+        ap.add_argument('--limit', dest='limit', help='limit to this many log entries in --jdk repo', type=int, default=-1)
+        ap.add_argument('-o', dest="output_dir", help="save patches to this directory (created if necessary)")
+        ap.add_argument('-v', dest='verbose', help="verbose output", default=False, action='store_true')
+        args = ap.parse_args()
+
+        if not os.path.isdir(args.jdkpath):
+            fatal(f"{args.jdkpath} not a directory")
+
+        if not os.path.isdir(args.jbrpath):
+            fatal(f"{args.jbrpath} not a directory")
+
+        if not git_is_available():
+            fatal("can't run git commands; make sure git is in PATH")
+
+        self.jdkpath = args.jdkpath
+        self.jbrpath = args.jbrpath
+        self.path = args.path
+        self.limit = args.limit
+        self.output_dir = args.output_dir
+        self.verbose = args.verbose
+
+
+class GitRepo:
+    def __init__(self, rootpath):
+        self.rootpath = rootpath
+
+    def run_git_cmd(self, git_args):
+        args = ["git", "-C", self.rootpath]
+        args.extend(git_args)
+        # print(f"Runnig git cmd '{' '.join(args)}'")
+        p = subprocess.run(args, capture_output=True, text=True)
+        if p.returncode != 0:
+            fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
+        return p.stdout
+
+    def save_git_cmd(self, fname, git_args):
+        args = ["git", "-C", self.rootpath]
+        args.extend(git_args)
+        # print(f"Runnig git cmd '{' '.join(args)}'")
+        with open(fname, "w") as stdout_file:
+            p = subprocess.run(args, stdout=stdout_file)
+            if p.returncode != 0:
+                fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
+
+    def current_branch(self):
+        branch_name = self.run_git_cmd(["branch", "--show-current"]).strip()
+        return branch_name
+
+    def log(self, path=None, limit=None):
+        cmds = ["log", "--no-decorate"]
+        if limit:
+            cmds.extend(["-n", str(limit)])
+        if path:
+            cmds.append(path)
+        full_log = self.run_git_cmd(cmds)
+        return full_log
+
+
+class Commit:
+    def __init__(self, lines):
+        self.sha = lines[0].split()[1]
+        self.message = ""
+        self.bugid = None
+
+        # Commit message starts after one blank line
+        read_message = False
+        for l in lines:
+            if read_message:
+                self.message += l + "\n"
+            if not read_message and l == "":
+                read_message = True
+
+        if self.message and self.message != "" and ":" in self.message:
+            maybe_bugid = self.message.split(":")[0].strip()
+            if 10 >= len(maybe_bugid) >= 4:
+                self.bugid = maybe_bugid
+
+
+class History:
+    def __init__(self, log):
+        log_itr = iter(log.splitlines())
+        self.commits = []
+        commit_lines = []
+        for line in log_itr:
+            if line.startswith("commit ") and len(commit_lines) > 0:
+                commit = Commit(commit_lines)
+                self.commits.append(commit)
+                commit_lines = []
+            commit_lines.append(line)
+
+        if len(commit_lines) > 0:
+            commit = Commit(commit_lines)
+            self.commits.append(commit)
+
+    def contains(self, str):
+        return any(str in commit.message for commit in self.commits)
+
+    def size(self):
+        return len(self.commits)
+
+
+def print_explanation(options, jdk, jbr):
+    verbose(options, f"Reading history from '{jdk.rootpath}' on branch '{jdk.current_branch()}'")
+    if options.path:
+        verbose(options, f"\t(only under '{options.path}')")
+    verbose(options, f"Searching for same fixes in '{jbr.rootpath}' on branch '{jbr.current_branch()}'")
+
+
+def git_is_available():
+    p = None
+    try:
+        p = subprocess.run(["git", "--help"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    except:
+        pass
+    return p is not None and p.returncode == 0
+
+
+def main():
+    check_python_min_requirements()
+
+    options = Options()
+
+    jdk = GitRepo(options.jdkpath)
+    jbr = GitRepo(options.jbrpath)
+
+    print_explanation(options, jdk, jbr)
+
+    commits_to_save = []
+    try:
+        jdk_log = jdk.log(options.path, options.limit)
+        jdk_history = History(jdk_log)
+
+        jbr_log = jbr.log(options.path)
+        jbr_history = History(jbr_log)
+
+        verbose(options, f"Read {jdk_history.size()} commits in JDK, {jbr_history.size()} in JBR")
+
+        for c in jdk_history.commits:
+            if c.bugid:
+                verbose(options, f"Looking for bugfix for {c.bugid}")
+                if not jbr_history.contains(c.bugid):
+                    commits_to_save.append(c)
+                    print(f"[note] Fix for {c.bugid} not found in JBR ({jbr.rootpath})")
+                    print(f"    commit {c.sha}")
+                    print(f"    {first_line(c.message).strip()}")
+    except KeyboardInterrupt:
+        fatal("Interrupted")
+
+    if len(commits_to_save) > 0 and options.output_dir:
+        print()
+        if not os.path.exists(options.output_dir):
+            verbose(options, f"Creating output directory {options.output_dir}")
+            os.makedirs(options.output_dir)
+        nzeroes = len(str(len(commits_to_save)))
+        for i, c in enumerate(reversed(commits_to_save)):
+            fname = os.path.join(options.output_dir, f"{str(i).zfill(nzeroes)}-{c.bugid}.patch")
+            print(f"[note] {c.bugid} saved as {fname}")
+            fname = os.path.abspath(fname)
+            jdk.save_git_cmd(fname, ["format-patch", "-1", c.sha, "--stdout"])
+
+        script_fname = os.path.join(options.output_dir, "apply.sh")
+        with open(script_fname, "w") as script_file:
+            print(apply_script_code.format(os.path.abspath(jbr.rootpath), os.path.abspath(options.output_dir)),
+                  file=script_file)
+            print(f"[note] Execute 'bash {script_fname}' to apply patches to {jbr.rootpath}")
+
+
+def check_python_min_requirements():
+    if sys.version_info < (3, 6):
+        fatal("Minimum version 3.6 is required to run this script")
+
+
+apply_script_code = """
+#!/bin/bash
+
+GITROOT={0}
+PATCHROOT={1}
+
+cd $PATCHROOT || exit 1
+PATCHES=$(find $PATCHROOT -name '*.patch' | sort -n)
+
+for P in $PATCHES; do
+    git -C $GITROOT am $P
+    if [ $? != 0 ]; then
+        mv "$P" "$P.failed"
+        echo "[ERROR] Patch $P did not apply cleanly. Try applying it manually."
+        echo "[NOTE]  Execute this script to apply the remaining patches."
+        exit 1
+    else
+        mv "$P" "$P.done"
+    fi
+done
+
+echo "[NOTE] Done applying patches; check $PATCHROOT for .patch and .patch.failed to see if all have been applied."
+"""
+
+if __name__ == '__main__':
+    main()

jb/project/docker/Dockerfile

@@ -0,0 +1,13 @@
+# jetbrains/runtime:jbr15env
+FROM centos:7
+RUN yum -y install centos-release-scl
+RUN yum -y install devtoolset-8
+RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool gcc gcc-c++ libstdc++-devel alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel git
+# Install Java 16
+RUN wget https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz \
+  -O - | tar xz -C /
+RUN mv /zulu17.28.13-ca-jdk17.0.0-linux_x64 /jdk17.0.0
+ENV PATH /opt/rh/devtoolset-8/root/usr/bin:$PATH
+RUN mkdir .git
+RUN git config user.email "teamcity@jetbrains.com"
+RUN git config user.name "builduser"

jb/project/docker/Dockerfile.aarch64

@@ -0,0 +1,48 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_aarch64.sh script.
+
+# Pull a concrete version of Linux that does NOT recieve updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+FROM arm64v8/ubuntu:focal-20211006
+
+# Install the necessary build tools
+RUN export DEBIAN_FRONTEND=noninteractive \
+    export DEBCONF_NONINTERACTIVE_SEEN=true && \
+    echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections; \
+    echo 'tzdata tzdata/Zones/Etc select UTC' | debconf-set-selections; \
+    apt-get update -qy && \
+    apt-get install -qy \
+        autoconf \
+        build-essential \
+        bzip2 \
+        file \
+        g++-10=10.3.0-1ubuntu1~20.04 \
+        gcc-10=10.3.0-1ubuntu1~20.04 \
+        git \
+        libasound2-dev \
+        libcups2-dev \
+        libfontconfig1-dev \
+        libx11-dev \
+        libxext-dev \
+        libxrandr-dev \
+        libxrender-dev \
+        libxt-dev \
+        libxtst-dev \
+        make \
+        rsync \
+        tar \
+        unzip \
+        zip && \
+   update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 && \
+   apt-get clean -qy && \
+   rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Set up boot JDK for building
+COPY boot_jdk.tar.gz /jdk17/
+RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk.tar.gz && rm /jdk17/boot_jdk.tar.gz
+ENV BOOT_JDK=/jdk17
+
+RUN git config --global user.email "teamcity@jetbrains.com" && \
+    git config --global user.name "builduser"

jb/project/docker/Dockerfile.musl_aarch64

@@ -0,0 +1,22 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_aarch64.sh script.
+
+# Pull a concrete version of Linux that does NOT recieve updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+FROM arm64v8/alpine:3.12
+
+# Install the necessary build tools
+RUN     apk --no-cache add --update bash grep tar zip bzip2 rsync fontconfig build-base \
+	    git libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev \
+	    libxtst-dev autoconf freetype-dev cups-dev alsa-lib-dev file \
+	    fontconfig fontconfig-dev linux-headers
+
+# Set up boot JDK for building
+COPY boot_jdk_musl_aarch64.tar.gz /jdk17/
+RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_musl_aarch64.tar.gz && rm /jdk17/boot_jdk_musl_aarch64.tar.gz
+ENV BOOT_JDK=/jdk17
+
+RUN git config --global user.email "teamcity@jetbrains.com" && \
+    git config --global user.name "builduser"

jb/project/docker/Dockerfile.musl_x64

@@ -0,0 +1,22 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_x64.sh script.
+
+# Pull a concrete version of Linux that does NOT recieve updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+FROM alpine:3.14
+
+# Install the necessary build tools
+RUN     apk --no-cache add --update bash grep tar zip bzip2 rsync fontconfig build-base \
+	    git libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev \
+	    libxtst-dev autoconf freetype-dev cups-dev alsa-lib-dev file \
+	    fontconfig fontconfig-dev linux-headers
+
+# Set up boot JDK for building
+COPY boot_jdk_musl_amd64.tar.gz /jdk17/
+RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_musl_amd64.tar.gz && rm /jdk17/boot_jdk_musl_amd64.tar.gz
+ENV BOOT_JDK=/jdk17
+
+RUN git config --global user.email "teamcity@jetbrains.com" && \
+    git config --global user.name "builduser"

jb/project/docker/Dockerfile.x86

@@ -0,0 +1,55 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_x86.sh script.
+
+# Pull a concrete version of Linux that does NOT receive updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+#FROM i386/ubuntu:xenial
+#FROM i386/ubuntu:bionic
+FROM i386/ubuntu:focal
+
+RUN linux32 \
+    apt-get update && apt-get install -y --no-install-recommends apt-utils
+RUN export DEBIAN_FRONTEND=noninteractive \
+    export DEBCONF_NONINTERACTIVE_SEEN=true && \
+    echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections; \
+    echo 'tzdata tzdata/Zones/Etc select UTC' | debconf-set-selections; \
+    linux32 \
+    apt-get -y install \
+        autoconf \
+        build-essential \
+        curl \
+        file \
+        git \
+        libx11-dev \
+        libxext-dev \
+        libxrender-dev \
+        libxrandr-dev \
+        libxtst-dev \
+        libxt-dev \
+        libcups2-dev \
+        libasound2-data \
+#        libpng12-0 \
+        libasound2 \
+        libfreetype6 \
+        libfontconfig1-dev \
+        libasound2-dev \
+        rsync \
+        unzip \
+        zip
+RUN linux32 \
+    apt-get -y install \
+        g++-10 \
+        gcc-10 && \
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 && \
+    apt-get clean -qy && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Set up boot JDK for building
+COPY boot_jdk_x86.tar.gz /jdk17/
+RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_x86.tar.gz && rm /jdk17/boot_jdk_x86.tar.gz
+ENV BOOT_JDK=/jdk17
+
+RUN git config --global user.email "teamcity@jetbrains.com" && \
+    git config --global user.name "builduser"

jb/project/docker/mkdocker_aarch64.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# This script creates a Docker image suitable for building AArch64 variant
+# of the JetBrains Runtime "dev" version.
+
+BOOT_JDK_REMOTE_FILE=zulu17.30.15-ca-jdk17.0.1-linux_aarch64.tar.gz
+BOOT_JDK_SHA=4d9c9116eb0cdd2d7fb220d6d27059f4bf1b7e95cc93d5512bd8ce3791af86c7
+BOOT_JDK_LOCAL_FILE=boot_jdk.tar.gz
+
+if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
+    # Obtain "boot JDK" from outside of the container.
+    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
+else
+    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
+fi
+
+# Verify that what we've downloaded can be trusted.
+sha256sum -c - <<EOF
+$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
+EOF
+
+docker build -t jbrdevenv_arm64v8 -f Dockerfile.aarch64 .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/docker/mkdocker_musl_aarch64.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# This script creates a Docker image suitable for building musl AArch64 variant
+# of the JetBrains Runtime version 17.
+
+BOOT_JDK_REMOTE_FILE=zulu17.32.13-ca-jdk17.0.2-linux_musl_aarch64.tar.gz
+BOOT_JDK_SHA=6b920559abafbe9bdef386a20ecf3a2f318bc1f0d8359eb1f95aee26606bbc70
+BOOT_JDK_LOCAL_FILE=boot_jdk_musl_aarch64.tar.gz
+
+if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
+    # Obtain "boot JDK" from outside of the container.
+    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
+else
+    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
+fi
+
+# Verify that what we've downloaded can be trusted.
+sha256sum -c - <<EOF
+$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
+EOF
+
+docker build -t jbr17buildenv -f Dockerfile.musl_aarch64 .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/docker/mkdocker_musl_x64.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# This script creates a Docker image suitable for building musl-x64 variant
+# of the JetBrains Runtime version 17.
+
+BOOT_JDK_REMOTE_FILE=zulu17.32.13-ca-jdk17.0.2-linux_musl_x64.tar.gz
+BOOT_JDK_SHA=bcc5342011bd9f3643372aadbdfa68d47463ff0d8621668a0bdf2910614d95c6
+BOOT_JDK_LOCAL_FILE=boot_jdk_musl_amd64.tar.gz
+
+if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
+    # Obtain "boot JDK" from outside of the container.
+    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
+else
+    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
+fi
+
+# Verify that what we've downloaded can be trusted.
+sha256sum -c - <<EOF
+$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
+EOF
+
+docker build -t jbr17buildenv -f Dockerfile.musl_x64 .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/docker/mkdocker_x86.sh

@@ -0,0 +1,26 @@
+#!/bin/bash -x
+
+# This script creates a Docker image suitable for building x86 variant
+# of the JetBrains Runtime version 17.
+
+BOOT_JDK_REMOTE_FILE=zulu17.34.19-ca-jdk17.0.3-linux_i686.tar.gz
+BOOT_JDK_SHA=1c35c374ba0001e675d6e80819d5be900c4e141636d5e484992a8c550be14481
+BOOT_JDK_LOCAL_FILE=boot_jdk_x86.tar.gz
+
+if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
+    # Obtain "boot JDK" from outside of the container.
+    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
+else
+    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
+fi
+
+# Verify that what we've downloaded can be trusted.
+sha256sum -c - <<EOF
+$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
+EOF
+
+docker build -t jetbrains/runtime:jbr17env_x86 -f Dockerfile.x86 .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/idea-project-files/jdk-clion/.idea/.name

@@ -0,0 +1 @@
+JetBrainsRuntime

jb/project/idea-project-files/jdk-clion/.idea/vcs.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="(?:^|\s|\p{Punct})([A-Z]+\-\d+)(?=$|\s|\p{Punct})" />
+          <option name="linkRegexp" value="https://youtrack.jetbrains.com/issue/$1" />
+        </IssueNavigationLink>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="(?:^|\s|\p{Punct})(?:JDK-)?(\d{7})(?=$|\s|\p{Punct})" />
+          <option name="linkRegexp" value="https://bugs.openjdk.java.net/browse/JDK-$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>

jb/project/idea-project-files/jetbrains.api.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/src/jetbrains.api">
+      <sourceFolder url="file://$MODULE_DIR$/src/jetbrains.api/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jetbrains.api/templates" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+  </component>
+</module>
+

jb/project/idea-project-files/modules.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jdk.iml" filepath="$PROJECT_DIR$/.idea/jdk.iml" />
+      ###MODULE_IMLS###
+      <module fileurl="file://$PROJECT_DIR$/.idea/jetbrains.api.iml" filepath="$PROJECT_DIR$/.idea/jetbrains.api.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/test.iml" filepath="$PROJECT_DIR$/.idea/test.iml" />
+    </modules>
+  </component>
+</project>
+

jb/project/idea-project-files/vcs.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="(?:^|\s|\p{Punct})([A-Z]+\-\d+)(?=$|\s|\p{Punct})" />
+          <option name="linkRegexp" value="https://youtrack.jetbrains.com/issue/$1" />
+        </IssueNavigationLink>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="(?:^|\s|\p{Punct})(?:JDK-)?(\d{7})(?=$|\s|\p{Punct})" />
+          <option name="linkRegexp" value="https://bugs.openjdk.java.net/browse/JDK-$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

jb/project/java-gradle/build.gradle

@@ -0,0 +1,135 @@
+apply plugin: 'java'
+import org.gradle.internal.os.OperatingSystem
+
+repositories {
+    mavenCentral()
+}
+
+def test_jvm = {
+    if (project.hasProperty('jbsdkhome')) {
+        file(jbsdkhome + (OperatingSystem.current().isWindows()?"/bin/java.exe" : "/bin/java")).absolutePath
+    } else {
+        if (OperatingSystem.current().isMacOsX()) {
+            file('../../../build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-11.0.4.jdk/Contents/Home/bin/java').absolutePath
+        } else if (OperatingSystem.current().isLinux()) {
+            file('../../../build/linux-x86_64-normal-server-release/images/jdk/bin/java').absolutePath
+        } else {
+            file('../../../build/windows-x86_64-normal-server-release/images/jdk/bin/java.exe').absolutePath
+        }
+    }
+}
+
+dependencies {
+    testCompile('junit:junit:4.12'){
+        exclude group: 'org.hamcrest'
+    }
+    testCompile 'org.hamcrest:hamcrest-library:1.3'
+    testCompile 'net.java.dev.jna:jna:4.4.0'
+    testCompile 'com.twelvemonkeys.imageio:imageio-tiff:3.3.2'
+    testCompile 'org.apache.commons:commons-lang3:3.0'
+}
+
+def jdk_modules = ["java.base", "java.logging", "java.prefs",
+               "java.se.ee", "java.sql", "java.datatransfer",
+               "java.management", "java.rmi", "java.security.jgss",
+               "java.sql.rowset", "java.desktop", "java.management.rmi",
+               "java.scripting", "java.security.sasl", "java.transaction",
+               "java.instrument", "java.naming", "java.se",
+               "java.smartcardio", "java.xml.crypto"]
+
+def jdk_class_dirs = []
+
+jdk_modules.collect(jdk_class_dirs) {
+    new File("../../../src/" + it + "/share/classes")
+}
+
+if (OperatingSystem.current().isMacOsX())
+    jdk_modules.collect(jdk_class_dirs) {
+        "../../../src/" + it + "/macosx/classes"
+    }
+else if (OperatingSystem.current().isLinux()) {
+    jdk_modules.collect(jdk_class_dirs) {
+        "../../../src/" + it + "/solaris/classes"
+    }
+    jdk_modules.collect(jdk_class_dirs) {
+        "../../../src/" + it + "/unix/classes"
+    }
+} else
+    jdk_modules.collect(jdk_class_dirs) {
+        "../../../src/" + it + "/windows/classes"
+    }
+
+sourceSets.main.java.srcDirs = jdk_class_dirs
+
+sourceSets {
+    test {
+        java {
+            srcDir "../../../test/jdk/jbu"
+        }
+    }
+}
+
+test.dependsOn.clear()
+
+test.dependsOn tasks.compileTestJava
+
+test {
+    systemProperty "jb.java2d.metal", "true"
+    systemProperty "testdata", file('../../../test/jdk/jbu/testdata').absolutePath
+
+//  Generate golden images for DroidFontTest and MixedTextTest
+//    systemProperty "gentestdata", ""
+
+//  Enable Java2D logging (https://confluence.jetbrains.com/display/JRE/Java2D+Rendering+Logging)
+//  systemProperty "sun.java2d.trace", "log"
+//  systemProperty "sun.java2d.trace", "log,pimpl"
+
+    outputs.upToDateWhen { false }
+    executable = test_jvm()
+
+//  Enable async/dtrace profiler
+    jvmArgs  "-XX:+PreserveFramePointer"
+//  Enable native J2D logging (only in debug build)
+//  Can be turned on for J2D by adding "#define DEBUG 1" into jdk/src/share/native/sun/java2d/Trace.h
+
+//    environment 'J2D_TRACE_LEVEL', '4'
+}
+
+def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile.parentFile
+
+def make_cmd = "make"
+if (OperatingSystem.current().isWindows()) {
+    def cyg_make_cmd = new File("c:/cygwin64/bin/make.exe")
+    if (cyg_make_cmd.exists()) make_cmd = cyg_make_cmd.absolutePath
+}
+def test_run = false
+task make_images {
+    doLast {
+        if (!test_run) {
+            def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "images")
+            def proc = pb.redirectErrorStream(true).start()
+            proc.inputStream.eachLine { println it }
+            assert proc.waitFor() == 0
+        }
+    }
+}
+
+task make_clean {
+    doLast {
+        def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "clean")
+        def proc = pb.redirectErrorStream(true).start()
+        proc.inputStream.eachLine { println it }
+        assert proc.waitFor() == 0
+    }
+}
+
+task run_test {
+    doLast {
+        test_run = true
+    }
+}
+
+tasks.cleanTest.dependsOn tasks.run_test
+classes.dependsOn.clear()
+classes.dependsOn tasks.make_images
+tasks.cleanClasses.dependsOn tasks.make_clean

jb/project/tools/common/modules.list

@@ -0,0 +1,54 @@
+java.base,
+java.compiler,
+java.datatransfer,
+java.desktop,
+java.instrument,
+java.logging,
+java.management,
+java.management.rmi,
+java.naming,
+java.net.http,
+java.prefs,
+java.rmi,
+java.scripting,
+java.se,
+java.security.jgss,
+java.security.sasl,
+java.smartcardio,
+java.sql,
+java.sql.rowset,
+java.transaction.xa,
+java.xml,
+java.xml.crypto,
+jdk.accessibility,
+jdk.attach,
+jdk.charsets,
+jdk.compiler,
+jdk.crypto.cryptoki,
+jdk.crypto.ec,
+jdk.dynalink,
+jdk.httpserver,
+jdk.internal.ed,
+jdk.internal.le,
+jdk.internal.vm.ci,
+jdk.javadoc,
+jdk.jdi,
+jdk.jdwp.agent,
+jdk.jfr,
+jdk.jsobject,
+jdk.localedata,
+jdk.management,
+jdk.management.agent,
+jdk.management.jfr,
+jdk.naming.dns,
+jdk.naming.rmi,
+jdk.net,
+jdk.sctp,
+jdk.security.auth,
+jdk.security.jgss,
+jdk.unsupported,
+jdk.unsupported.desktop,
+jdk.xml.dom,
+jdk.zipfs,
+jdk.hotspot.agent,
+jdk.jcmd

jb/project/tools/common/scripts/build-jbr-api.sh

@@ -0,0 +1,18 @@
+#!/bin//bash
+
+set -euo pipefail
+
+# $1 - Boot JDK
+# $2 - JBR part of API version
+
+cd "`dirname "$0"`/../../../../.."
+PWD="`pwd`"
+CONF="$PWD/build/jbr-api.conf"
+./configure --with-debug-level=release --with-boot-jdk=$1 || exit $?
+make jbr-api CONF=release MAKEOVERRIDES= "JBR_API_CONF_FILE=$CONF" JBR_API_JBR_VERSION=$2 || exit $?
+. $CONF || exit $?
+echo "##teamcity[buildNumber '$VERSION']"
+cp "$JAR" ./jbr-api-${VERSION}.jar || exit $?
+cp "$SOURCES_JAR" ./jbr-api-${VERSION}-sources.jar || exit $?
+echo "##teamcity[publishArtifacts '$PWD/jbr-api-${VERSION}.jar']"
+echo "##teamcity[publishArtifacts '$PWD/jbr-api-${VERSION}-sources.jar']"

jb/project/tools/common/scripts/common.sh

@@ -0,0 +1,176 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+function check_bundle_type_maketest() {
+  # check whether last char is 't', if so remove it
+  if [ "${bundle_type: -1}" == "t" ]; then
+    bundle_type="${bundle_type%?}"
+    do_maketest=1
+  else
+    do_maketest=0
+  fi
+}
+
+function getVersionProp() {
+  grep "^${1}" make/conf/version-numbers.conf | cut -d'=' -f2
+}
+
+while getopts ":i?" o; do
+    case "${o}" in
+        i) INC_BUILD=1 ;;
+    esac
+done
+shift $((OPTIND-1))
+
+if [[ $# -lt 2 ]]; then
+  echo "Required at least two arguments: build_number bundle_type"
+  exit 1
+fi
+
+build_number=$1
+bundle_type=$2
+# shellcheck disable=SC2034
+architecture=${3:-x64} # aarch64 or x64
+
+check_bundle_type_maketest
+
+tag_prefix="jdk-"
+OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "$tag_prefix" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | tr -d ',' | sort -t "-" -k 2 -g | tail -n 1)
+VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
+VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
+VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")
+VERSION_PATCH=$(getVersionProp "DEFAULT_VERSION_PATCH")
+[[ $VERSION_UPDATE = 0 ]] && JBSDK_VERSION="$VERSION_FEATURE" || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}"
+[[ $VERSION_PATCH = 0 ]] || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}.${VERSION_PATCH}"
+echo "##teamcity[setParameter name='env.JBSDK_VERSION' value='${JBSDK_VERSION}']"
+JDK_BUILD_NUMBER=${JDK_BUILD_NUMBER:=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')}
+[ -z $JDK_BUILD_NUMBER ] && JDK_BUILD_NUMBER=1
+echo "##teamcity[setParameter name='env.JDK_UPDATE_NUMBER' value='${JDK_BUILD_NUMBER}']"
+
+VENDOR_NAME="JetBrains s.r.o."
+VENDOR_VERSION_STRING="JBR-${JBSDK_VERSION}+${JDK_BUILD_NUMBER}-${build_number}"
+[ -z "$bundle_type" ] || VENDOR_VERSION_STRING="${VENDOR_VERSION_STRING}-${bundle_type}"
+
+do_reset_changes=0
+do_reset_dcevm=0
+HEAD_REVISION=0
+
+STATIC_CONF_ARGS=""
+common_conf_props_file="jb/project/tools/common/static_conf_args.txt"
+if [[ -f "$common_conf_props_file" ]]; then
+    STATIC_CONF_ARGS=$(<$common_conf_props_file)
+fi
+OS_NAME=$(uname -s)
+# Enable reproducible builds
+TZ=UTC
+export TZ
+SOURCE_DATE_EPOCH="$(git log -1 --pretty=%ct)"
+export SOURCE_DATE_EPOCH
+
+COPYRIGHT_YEAR=""
+BUILD_TIME=""
+TOUCH_TIME=""
+REPRODUCIBLE_TAR_OPTS=""
+case "$OS_NAME" in
+    Linux)
+        COPYRIGHT_YEAR="$(date --utc --date=@$SOURCE_DATE_EPOCH +%Y)"
+        BUILD_TIME="$(date --utc --date=@$SOURCE_DATE_EPOCH +%F)"
+        REPRODUCIBLE_TAR_OPTS="--mtime=@$SOURCE_DATE_EPOCH --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
+        ;;
+    CYGWIN*)
+        COPYRIGHT_YEAR="$(date --utc --date=@$SOURCE_DATE_EPOCH +%Y)"
+        BUILD_TIME="$(date --utc --date=@$SOURCE_DATE_EPOCH +%F)"
+        REPRODUCIBLE_TAR_OPTS="--mtime=@$SOURCE_DATE_EPOCH --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
+        ;;
+    Darwin)
+        COPYRIGHT_YEAR="$(date -u -r $SOURCE_DATE_EPOCH +%Y)"
+        BUILD_TIME="$(date -u -r $SOURCE_DATE_EPOCH +%F)"
+        TOUCH_TIME="$(date -u -r $SOURCE_DATE_EPOCH +%Y%m%d%H%M.%S)"
+        REPRODUCIBLE_TAR_OPTS="--uid 0 --gid 0 --numeric-owner"
+        ;;
+esac
+
+WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS="--with-native-debug-symbols=zipped"
+
+REPRODUCIBLE_BUILD_OPTS="--enable-reproducible-build
+  --with-source-date=$SOURCE_DATE_EPOCH
+  --with-hotspot-build-time=$BUILD_TIME
+  --with-copyright-year=$COPYRIGHT_YEAR
+  --disable-absolute-paths-in-output
+  --with-build-user=builduser"
+
+function zip_native_debug_symbols() {
+  image_bundle_path=$(echo $1 | cut -d"/" -f-4)
+  jdk_name=$(echo $1 | cut -d"/" -f5)
+  jbr_diz_name=$2
+
+  [ -d "dizfiles" ] && rm -rf dizfiles
+  mkdir dizfiles
+
+  rsync_target="../../../../dizfiles"
+  [ -z "$jdk_name" ] && rsync_target=$rsync_target"/"$jbr_diz_name
+  (cd $image_bundle_path && find . -name '*.diz' -exec rsync -R {} $rsync_target \;)
+  [ ! -z "$jdk_name" ] && mv dizfiles/$jdk_name dizfiles/$jbr_diz_name
+
+  (cd dizfiles && find $jbr_diz_name -print0 | COPYFILE_DISABLE=1 \
+    tar --no-recursion --null -T - -czf ../"$jbr_diz_name".tar.gz) || do_exit $?
+}
+
+function do_exit() {
+  exit_code=$1
+  [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+  if [ $do_reset_dcevm -eq 1 ]; then
+    [ ! -z $HEAD_REVISION ] && git reset --hard $HEAD_REVISION
+  fi
+  exit "$exit_code"
+}
+
+function update_jsdk_mods() {
+  __jsdk=$1
+  __jcef_mods=$2
+  __orig_jsdk_mods=$3
+  __updated_jsdk_mods=$4
+  
+  # re-create java.desktop.jmod with updated module-info.class
+  tmp=.java.desktop.$$.tmp
+  mkdir "$tmp" || exit $?
+  "$__jsdk"/bin/jmod extract --dir "$tmp" "$__orig_jsdk_mods"/java.desktop.jmod || exit $?
+  "$__jsdk"/bin/javac \
+      --patch-module java.desktop="$__orig_jsdk_mods"/java.desktop.jmod \
+      --module-path "$__jcef_mods" -d "$tmp"/classes src/java.desktop/share/classes/module-info.java || exit $?
+  "$__jsdk"/bin/jmod \
+      create --class-path "$tmp"/classes --config "$tmp"/conf --header-files "$tmp"/include --legal-notice "$tmp"/legal --libs "$tmp"/lib \
+      java.desktop.jmod || exit $?
+  mv java.desktop.jmod "$__updated_jsdk_mods" || exit $?
+  rm -rf "$tmp"
+  
+  # re-create java.base.jmod with updated hashes
+  tmp=.java.base.$$.tmp
+  mkdir "$tmp" || exit $?
+  hash_modules=$("$__jsdk"/bin/jmod describe "$__orig_jsdk_mods"/java.base.jmod | grep hashes | awk '{print $2}' | tr '\n' '|' | sed s/\|$//) || exit $?
+  "$__jsdk"/bin/jmod extract --dir "$tmp" "$__orig_jsdk_mods"/java.base.jmod || exit $?
+  rm "$__updated_jsdk_mods"/java.base.jmod || exit $? # temp exclude from path
+  "$__jsdk"/bin/jmod \
+      create --module-path "$__updated_jsdk_mods" --hash-modules "$hash_modules" \
+      --class-path "$tmp"/classes --cmds "$tmp"/bin --config "$tmp"/conf --header-files "$tmp"/include --legal-notice "$tmp"/legal --libs "$tmp"/lib \
+      java.base.jmod || exit $?
+  mv java.base.jmod "$__updated_jsdk_mods" || exit $?
+  rm -rf "$tmp"
+}
+
+function get_mods_list() {
+  __mods=$1
+  echo $(ls $__mods) | sed s/\.jmod/,/g | sed s/,$//g | sed s/' '//g
+}
+
+function copy_jmods() {
+  __mods_list=$1
+  __jmods_from=$2
+  __jmods_to=$3
+
+  mkdir -p $__jmods_to
+
+  echo "${__mods_list}," | while read -d, mod; do cp $__jmods_from/$mod.jmod $__jmods_to/; done
+}

jb/project/tools/common/static_conf_args.txt

@@ -0,0 +1 @@
+--with-vendor-vm-bug-url=https://youtrack.jetbrains.com/issues/JBR

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

@@ -0,0 +1,166 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script makes test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+# Environment variables:
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
+#               to configure
+#               By default JDK_BUILD_NUMBER is set zero
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_linux_aarch64
+
+source jb/project/tools/common/scripts/common.sh
+
+JCEF_PATH=${JCEF_PATH:=./jcef_linux_aarch64}
+
+function do_configure {
+  sh configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build="$JDK_BUILD_NUMBER" \
+    --with-version-opt=b"$build_number" \
+    --with-boot-jdk="$BOOT_JDK" \
+    --enable-cds=yes \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
+    || do_exit $?
+}
+
+function is_musl {
+  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
+  if [ -z $libc ]; then
+    # This is not Musl, return 1 == false
+    return 1
+  fi
+  return 0
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  libc_type_suffix=''
+  fastdebug_infix=''
+
+  if is_musl; then libc_type_suffix='musl-' ; fi
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix:-}b${build_number}
+
+
+  echo Running jlink....
+  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+  $JSDK/bin/jlink \
+    --module-path "$__modules_path" --no-man-pages --compress=2 \
+    --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
+    mv release "$IMAGES_DIR"/"$__root_dir"/release
+    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
+    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
+    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
+  fi
+
+  # jmod does not preserve file permissions (JDK-8173610)
+  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
+
+  echo Creating "$JBR".tar.gz ...
+
+  (cd "$IMAGES_DIR" &&
+    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
+    tar $REPRODUCIBLE_TAR_OPTS \
+      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
+  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
+  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
+  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
+  gzip "$JBR".tar || do_exit $?
+  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=linux-aarch64-server-release
+
+case "$bundle_type" in
+  "jcef")
+    do_reset_changes=1
+    do_maketest=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=1
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=linux-aarch64-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  make clean CONF=$RELEASE_NAME || do_exit $?
+fi
+make images CONF=$RELEASE_NAME || do_exit $?
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+echo Fixing permissions
+chmod -R a+r $JSDK
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
+  update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
+  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+
+  jbr_name_postfix="_${bundle_type}"
+
+  cat $JCEF_PATH/jcef.version >> $JSDK/release
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
+
+if [ $do_maketest -eq 1 ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-aarch64-b${build_number}
+    echo Creating "$JBRSDK_TEST" ...
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
+    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
+    gzip "$JBRSDK_TEST".tar || do_exit $?
+fi
+
+do_exit 0

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

@@ -0,0 +1,165 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script makes test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+# Environment variables:
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
+#               to configure
+#               By default JDK_BUILD_NUMBER is set zero
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_linux_x64
+
+source jb/project/tools/common/scripts/common.sh
+
+JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
+
+function do_configure {
+  sh configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build="$JDK_BUILD_NUMBER" \
+    --with-version-opt=b"$build_number" \
+    --with-boot-jdk="$BOOT_JDK" \
+    --enable-cds=yes \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
+    || do_exit $?
+}
+
+function is_musl {
+  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
+  if [ -z $libc ]; then
+    # This is not Musl, return 1 == false
+    return 1
+  fi
+  return 0
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  libc_type_suffix=''
+  fastdebug_infix=''
+
+  if is_musl; then libc_type_suffix='musl-' ; fi
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix:-}b${build_number}
+
+  echo Running jlink....
+  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+  $JSDK/bin/jlink \
+    --module-path "$__modules_path" --no-man-pages --compress=2 \
+    --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
+    mv release "$IMAGES_DIR"/"$__root_dir"/release
+    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
+    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
+    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
+  fi
+
+  # jmod does not preserve file permissions (JDK-8173610)
+  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
+
+  echo Creating "$JBR".tar.gz ...
+
+  (cd "$IMAGES_DIR" &&
+    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
+    tar $REPRODUCIBLE_TAR_OPTS \
+      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
+  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
+  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
+  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
+  gzip "$JBR".tar || do_exit $?
+  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=linux-x86_64-server-release
+
+case "$bundle_type" in
+  "jcef")
+    do_reset_changes=1
+    do_maketest=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=1
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=linux-x86_64-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  make clean CONF=$RELEASE_NAME || do_exit $?
+fi
+make images CONF=$RELEASE_NAME || do_exit $?
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+echo Fixing permissions
+chmod -R a+r $JSDK
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+  update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
+  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+
+  jbr_name_postfix="_${bundle_type}"
+  [ "$bundle_type" != "fd" ] && jbrsdk_name_postfix="_${bundle_type}"
+  cat $JCEF_PATH/jcef.version >> $JSDK/release
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
+
+if [ $do_maketest -eq 1 ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x64-b${build_number}
+    echo Creating "$JBRSDK_TEST" ...
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
+    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
+    gzip "$JBRSDK_TEST".tar || do_exit $?
+fi
+
+do_exit 0

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

@@ -0,0 +1,144 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+
+source jb/project/tools/common/scripts/common.sh
+
+function do_configure {
+  linux32 bash configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build="$JDK_BUILD_NUMBER" \
+    --with-version-opt=b"$build_number" \
+    --with-boot-jdk="$BOOT_JDK" \
+    $STATIC_CONF_ARGS \
+    --enable-cds=yes \
+    $REPRODUCIBLE_BUILD_OPTS \
+    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
+    || do_exit $?
+}
+
+function is_musl {
+  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
+  if [ -z $libc ]; then
+    # This is not Musl, return 1 == false
+    return 1
+  fi
+  return 0
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  libc_type_suffix=''
+  fastdebug_infix=''
+
+  if is_musl; then libc_type_suffix='musl-' ; fi
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix:-}b${build_number}
+
+  echo Running jlink....
+  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+  $JSDK/bin/jlink \
+    --module-path "$__modules_path" --no-man-pages --compress=2 \
+    --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
+    mv release "$IMAGES_DIR"/"$__root_dir"/release
+    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
+    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
+    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
+  fi
+
+  # jmod does not preserve file permissions (JDK-8173610)
+  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
+
+  echo Creating "$JBR".tar.gz ...
+
+  (cd "$IMAGES_DIR" &&
+    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
+    tar $REPRODUCIBLE_TAR_OPTS \
+      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
+  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
+  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
+  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
+  gzip "$JBR".tar || do_exit $?
+  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=linux-x86-server-release
+
+case "$bundle_type" in
+  "jcef")
+    echo "not implemented" && do_exit 1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=1
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=linux-x86-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  make clean CONF=$RELEASE_NAME || do_exit $?
+fi
+make images CONF=$RELEASE_NAME || do_exit $?
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+echo Fixing permissions
+chmod -R a+r $JSDK
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(grep -v "jdk.internal.vm" jb/project/tools/common/modules.list | xargs | sed s/" "//g) || do_exit $?
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
+
+if [ $do_maketest -eq 1 ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x86-b${build_number}
+    echo Creating "$JBRSDK_TEST" ...
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
+    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
+    gzip "$JBRSDK_TEST".tar || do_exit $?
+fi
+
+do_exit 0

jb/project/tools/mac/scripts/entitlements.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>com.apple.security.cs.allow-jit</key>
+        <true/>
+        <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+        <true/>
+        <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+        <true/>
+        <key>com.apple.security.cs.disable-library-validation</key>
+        <true/>
+        <key>com.apple.security.cs.disable-executable-page-protection</key>
+        <true/>
+    </dict>
+</plist>

jb/project/tools/mac/scripts/mkimages.sh

@@ -0,0 +1,171 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script makes test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+# Environment variables:
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
+#               to configure
+#               By default JDK_BUILD_NUMBER is set zero
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_mac
+
+source jb/project/tools/common/scripts/common.sh
+
+JCEF_PATH=${JCEF_PATH:=./jcef_mac}
+BOOT_JDK=${BOOT_JDK:=$(/usr/libexec/java_home -v 17)}
+
+function do_configure {
+  if [[ "${architecture}" == *aarch64* ]]; then
+    ENABLE_CDS="--enable-cds=no"
+  else
+    ENABLE_CDS="--enable-cds=yes"
+  fi
+  sh configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-macosx-bundle-name-base=${VENDOR_VERSION_STRING} \
+    --with-macosx-bundle-id-base="com.jetbrains.jbr" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build="$JDK_BUILD_NUMBER" \
+    --with-version-opt=b"$build_number" \
+    --with-boot-jdk="$BOOT_JDK" \
+    --enable-cds=yes \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
+    || do_exit $?
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  fastdebug_infix=''
+
+  tmp=.bundle.$$.tmp
+  mkdir "$tmp" || do_exit $?
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
+
+  JRE_CONTENTS=$tmp/$__root_dir/Contents
+  mkdir -p "$JRE_CONTENTS" || do_exit $?
+
+  echo Running jlink...
+  "$JSDK"/bin/jlink \
+    --module-path "$__modules_path" --no-man-pages --compress=2 \
+    --add-modules "$__modules" --output "$JRE_CONTENTS/Home" || do_exit $?
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$JRE_CONTENTS/Home/release"
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
+    mv release $JRE_CONTENTS/Home/release
+    cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/src.zip $JRE_CONTENTS/Home/lib
+    copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
+    zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
+  fi
+
+  if [ "$bundle_type" == "jcef" ]; then
+    cat $JCEF_PATH/jcef.version >> "$JRE_CONTENTS/Home/release"
+  fi
+
+  cp -R "$JSDK"/../MacOS "$JRE_CONTENTS"
+  cp "$JSDK"/../Info.plist "$JRE_CONTENTS"
+
+  [ -n "$bundle_type" ] && (cp -a $JCEF_PATH/Frameworks "$JRE_CONTENTS" || do_exit $?)
+
+  echo Creating "$JBR".tar.gz ...
+  # Normalize timestamp
+  find "$tmp"/"$__root_dir" -print0 | xargs -0 touch -c -h -t "$TOUCH_TIME"
+
+  (cd "$tmp" &&
+      find "$__root_dir" -print0 | LC_ALL=C sort -z | \
+      COPYFILE_DISABLE=1 tar $REPRODUCIBLE_TAR_OPTS  --no-recursion --null -T - \
+                             -czf "$JBR".tar.gz --exclude='*.dSYM' --exclude='man') || do_exit $?
+  mv "$tmp"/"$JBR".tar.gz  "$JBR".tar.gz
+  rm -rf "$tmp"
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+CONF_ARCHITECTURE=x86_64
+if [[ "${architecture}" == *aarch64* ]]; then
+  CONF_ARCHITECTURE=aarch64
+fi
+RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-release
+
+case "$bundle_type" in
+  "jcef")
+    do_reset_changes=1
+    do_maketest=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=1
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-fastdebug
+    JBSDK=macosx-${architecture}-server-release
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  make clean CONF=$RELEASE_NAME || do_exit $?
+fi
+make images CONF=$RELEASE_NAME || do_exit $?
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+
+JSDK=$IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat "$JSDK"/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
+
+if [ $do_maketest -eq 1 ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-osx-test-${architecture}-b${build_number}
+    echo Creating "$JBRSDK_TEST" ...
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
+    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
+    COPYFILE_DISABLE=1 tar -pczf "$JBRSDK_TEST".tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+fi
+
+do_exit 0

jb/project/tools/mac/scripts/notarize.sh

@@ -0,0 +1,121 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+APP_DIRECTORY=$1
+APPL_USER=$2
+APPL_PASSWORD=$3
+APP_NAME=$4
+BUNDLE_ID=$5
+FAKE_ROOT="${6:-fake-root}"
+
+if [[ -z "$APP_DIRECTORY" ]] || [[ -z "$APPL_USER" ]] || [[ -z "$APPL_PASSWORD" ]]; then
+  echo "Usage: $0 AppDirectory Username Password"
+  exit 1
+fi
+if [[ ! -d "$APP_DIRECTORY" ]]; then
+  echo "AppDirectory '$APP_DIRECTORY' does not exist or not a directory"
+  exit 1
+fi
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+function publish-log() {
+  id=$1
+  file=$2
+  curl -T "$file" "$ARTIFACTORY_URL/$id" || true
+}
+
+function altool-upload() {
+  # Since altool uses same file for upload token we have to trick it into using different folders for token file location
+  # Also it copies zip into TMPDIR so we override it too, to simplify cleanup
+  OLD_HOME="$HOME"
+  export HOME="$FAKE_ROOT/home"
+  export TMPDIR="$FAKE_ROOT/tmp"
+  mkdir -p "$HOME"
+  mkdir -p "$TMPDIR"
+  export _JAVA_OPTIONS="-Duser.home=$HOME -Djava.io.tmpdir=$TMPDIR"
+  # Reduce amount of downloads, cache transporter libraries
+  shared_itmstransporter="$OLD_HOME/shared-itmstransporter"
+  if [[ -f "$shared_itmstransporter" ]]; then
+    cp -r "$shared_itmstransporter" "$HOME/.itmstransporter"
+  fi
+  # For some reason altool prints everything to stderr, not stdout
+  set +e
+  xcrun altool --notarize-app \
+    --username "$APPL_USER" --password "$APPL_PASSWORD" \
+    --primary-bundle-id "$BUNDLE_ID" \
+    --asc-provider JetBrainssro --file "$1" 2>&1 | tee "altool.init.out"
+  unset TMPDIR
+  export HOME="$OLD_HOME"
+  set -e
+}
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+
+#file="$APP_NAME.zip"
+
+#log "Zipping $file..."
+#rm -rf "$file"
+#ditto -c -k --sequesterRsrc --keepParent "$APP_DIRECTORY" "$file"
+
+log "Notarizing $APP_NAME..."
+rm -rf "altool.init.out" "altool.check.out"
+altool-upload "$APP_NAME"
+
+notarization_info="$(grep -e "RequestUUID" "altool.init.out" | grep -oE '([0-9a-f-]{36})')"
+
+if [ -z "$notarization_info" ]; then
+  log "Faile to read RequestUUID from altool.init.out"
+  exit 10
+fi
+
+PATH="$PATH:/usr/local/bin/"
+
+log "Notarization request sent, awaiting response"
+spent=0
+
+while true; do
+  # For some reason altool prints everything to stderr, not stdout
+  xcrun altool --username "$APPL_USER" --notarization-info "$notarization_info" --password "$APPL_PASSWORD" >"altool.check.out" 2>&1 || true
+  status="$(grep -oe 'Status: .*' "altool.check.out" | cut -c 9- || true)"
+  log "Current status: $status"
+  if [ "$status" = "invalid" ]; then
+    log "Notarization failed"
+    ec=1
+  elif [ "$status" = "success" ]; then
+    log "Notarization succeeded"
+    ec=0
+  else
+    if [ "$status" != "in progress" ]; then
+      log "Unknown notarization status, waiting more, altool output:"
+      cat "altool.check.out"
+    fi
+    if [[ $spent -gt 60 ]]; then
+      log "Waiting time out (apx 60 minutes)"
+      ec=2
+      break
+    fi
+    sleep 60
+    ((spent += 1))
+    continue
+  fi
+  developer_log="developer_log.json"
+  log "Fetching $developer_log"
+  # TODO: Replace cut with trim or something better
+  url="$(grep -oe 'LogFileURL: .*' "altool.check.out" | cut -c 13-)"
+  wget "$url" -O "$developer_log" && cat "$developer_log" || true
+  if [ $ec != 0 ]; then
+    log "Publishing $developer_log"
+    publish-log "$notarization_info" "$developer_log"
+  fi
+  break
+done
+cat "altool.check.out"
+
+rm -rf "altool.init.out" "altool.check.out"
+exit $ec

jb/project/tools/mac/scripts/sign.sh

@@ -0,0 +1,117 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+APPLICATION_PATH=$1
+APP_NAME=$2
+BUNDLE_ID=$3
+JB_DEVELOPER_CERT=$4
+JB_INSTALLER_CERT=$5
+
+if [[ -z "$APPLICATION_PATH" ]] || [[ -z "$JB_DEVELOPER_CERT" ]]; then
+  echo "Usage: $0 AppDirectory CertificateID"
+  exit 1
+fi
+if [[ ! -d "$APPLICATION_PATH" ]]; then
+  echo "AppDirectory '$APPLICATION_PATH' does not exist or not a directory"
+  exit 1
+fi
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+
+# Cleanup files left from previous sign attempt (if any)
+find "$APPLICATION_PATH" -name '*.cstemp' -exec rm '{}' \;
+
+log "Signing libraries and executables..."
+# -perm +111 searches for executables
+for f in \
+  "Contents/Home/lib" "Contents/MacOS" \
+  "Contents/Home/Frameworks" \
+  "Contents/Frameworks"; do
+  if [ -d "$APPLICATION_PATH/$f" ]; then
+    find "$APPLICATION_PATH/$f" \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -name "*.node" -o -perm +111 \) \
+      -exec codesign --timestamp \
+      -v -s "$JB_DEVELOPER_CERT" --options=runtime --force \
+      --entitlements entitlements.xml {} \;
+  fi
+done
+
+log "Signing libraries in jars in $PWD"
+
+# todo: add set -euo pipefail; into the inner sh -c
+# `-e` prevents `grep -q && printf` loginc
+# with `-o pipefail` there's no input for 'while' loop
+find "$APPLICATION_PATH" -name '*.jar' \
+  -exec sh -c "set -u; unzip -l \"\$0\" | grep -q -e '\.dylib\$' -e '\.jnilib\$' -e '\.so\$' -e '\.tbd\$' -e '^jattach\$' && printf \"\$0\0\" " {} \; |
+  while IFS= read -r -d $'\0' file; do
+    log "Processing libraries in $file"
+
+    rm -rf jarfolder jar.jar
+    mkdir jarfolder
+    filename="${file##*/}"
+    log "Filename: $filename"
+    cp "$file" jarfolder && (cd jarfolder && jar xf "$filename" && rm "$filename")
+
+    find jarfolder \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -name "jattach" \) \
+      -exec codesign --timestamp \
+      --force \
+      -v -s "$JB_DEVELOPER_CERT" --options=runtime \
+      --entitlements entitlements.xml {} \;
+
+    (cd jarfolder; zip -q -r -o -0 ../jar.jar .)
+    mv jar.jar "$file"
+  done
+
+rm -rf jarfolder jar.jar
+
+log "Signing other files..."
+for f in \
+  "Contents/Home/bin"; do
+  if [ -d "$APPLICATION_PATH/$f" ]; then
+    find "$APPLICATION_PATH/$f" \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -perm +111 \) \
+      -exec codesign --timestamp \
+      -v -s "$JB_DEVELOPER_CERT" --options=runtime --force \
+      --entitlements entitlements.xml {} \;
+  fi
+done
+
+#log "Signing executable..."
+#codesign --timestamp \
+#    -v -s "$JB_DEVELOPER_CERT" --options=runtime \
+#    --force \
+#    --entitlements entitlements.xml "$APPLICATION_PATH/Contents/MacOS/idea"
+
+log "Signing whole app..."
+codesign --timestamp \
+  -v -s "$JB_DEVELOPER_CERT" --options=runtime \
+  --force \
+  --entitlements entitlements.xml "$APPLICATION_PATH"
+
+BUILD_NAME=$(echo $APPLICATION_PATH | awk -F"/" '{ print $2 }')
+
+log "Creating $APP_NAME.pkg..."
+rm -rf "$APP_NAME.pkg"
+
+mkdir -p unsigned
+pkgbuild --identifier $BUNDLE_ID --root $APPLICATION_PATH \
+    --install-location /Library/Java/JavaVirtualMachines/${BUILD_NAME} unsigned/${APP_NAME}.pkg
+productsign --timestamp --sign "$JB_INSTALLER_CERT" unsigned/${APP_NAME}.pkg ${APP_NAME}.pkg
+
+#log "Signing whole app..."
+#codesign --timestamp \
+#  -v -s "$JB_DEVELOPER_CERT" --options=runtime \
+#  --force \
+#  --entitlements entitlements.xml $APP_NAME.pkg
+
+log "Verifying java is not broken"
+find "$APPLICATION_PATH" \
+  -type f -name 'java' -perm +111 -exec {} -version \;

jb/project/tools/mac/scripts/signapp.sh

@@ -0,0 +1,138 @@
+#!/bin/bash
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+set -x
+
+export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
+export COPYFILE_DISABLE=true
+
+INPUT_FILE=$1
+EXPLODED=$2.exploded
+BACKUP_JMODS=$2.backup
+USERNAME=$3
+PASSWORD=$4
+CODESIGN_STRING=$5
+JB_INSTALLER_CERT=$6
+NOTARIZE=$7
+BUNDLE_ID=$8
+
+cd "$(dirname "$0")"
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+log "Deleting $EXPLODED ..."
+if test -d "$EXPLODED"; then
+  find "$EXPLODED" -mindepth 1 -maxdepth 1 -exec chmod -R u+wx '{}' \;
+fi
+rm -rf "$EXPLODED"
+mkdir "$EXPLODED"
+rm -rf "$BACKUP_JMODS"
+mkdir "$BACKUP_JMODS"
+
+log "Unzipping $INPUT_FILE to $EXPLODED ..."
+tar -xzvf "$INPUT_FILE" --directory $EXPLODED
+BUILD_NAME="$(ls "$EXPLODED")"
+#sed -i '' s/BNDL/APPL/ $EXPLODED/$BUILD_NAME/Contents/Info.plist
+rm -f $EXPLODED/$BUILD_NAME/Contents/CodeResources
+rm "$INPUT_FILE"
+if test -d $EXPLODED/$BUILD_NAME/Contents/Home/jmods; then
+  mv $EXPLODED/$BUILD_NAME/Contents/Home/jmods $BACKUP_JMODS
+fi
+
+log "$INPUT_FILE extracted and removed"
+
+APP_NAME=$(echo ${INPUT_FILE} | awk -F".tar" '{ print $1 }')
+APPLICATION_PATH=$EXPLODED/$(ls $EXPLODED)
+
+find "$APPLICATION_PATH/Contents/Home/bin" \
+  -maxdepth 1 -type f -name '*.jnilib' -print0 |
+  while IFS= read -r -d $'\0' file; do
+    if [ -f "$file" ]; then
+      log "Linking $file"
+      b="$(basename "$file" .jnilib)"
+      ln -sf "$b.jnilib" "$(dirname "$file")/$b.dylib"
+    fi
+  done
+
+find "$APPLICATION_PATH/Contents/" \
+  -maxdepth 1 -type f -name '*.txt' -print0 |
+  while IFS= read -r -d $'\0' file; do
+    if [ -f "$file" ]; then
+      log "Moving $file"
+      mv "$file" "$APPLICATION_PATH/Contents/Resources"
+    fi
+  done
+
+non_plist=$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist' | wc -l)
+if [[ $non_plist -gt 0 ]]; then
+  log "Only Info.plist file is allowed in Contents directory but found $non_plist file(s):"
+  log "$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist')"
+  exit 1
+fi
+
+log "Unlocking keychain..."
+# Make sure *.p12 is imported into local KeyChain
+security unlock-keychain -p "$PASSWORD" "/Users/$USERNAME/Library/Keychains/login.keychain"
+
+attempt=1
+limit=3
+set +e
+while [[ $attempt -le $limit ]]; do
+  log "Signing (attempt $attempt) $APPLICATION_PATH ..."
+  ./sign.sh "$APPLICATION_PATH" "$APP_NAME" "$BUNDLE_ID" "$CODESIGN_STRING" "$JB_INSTALLER_CERT"
+  ec=$?
+  if [[ $ec -ne 0 ]]; then
+    ((attempt += 1))
+    if [ $attempt -eq $limit ]; then
+      set -e
+    fi
+    log "Signing failed, wait for 30 sec and try to sign again"
+    sleep 30
+  else
+    log "Signing done"
+    codesign -v "$APPLICATION_PATH" -vvvvv
+    log "Check sign done"
+    spctl -a -v $APPLICATION_PATH
+    ((attempt += limit))
+  fi
+done
+
+set -e
+
+if [ "$NOTARIZE" = "yes" ]; then
+  log "Notarizing..."
+  # shellcheck disable=SC1090
+  source "$HOME/.notarize_token"
+  # Since notarization tool uses same file for upload token we have to trick it into using different folders, hence fake root
+  # Also it leaves copy of zip file in TMPDIR, so notarize.sh overrides it and uses FAKE_ROOT as location for temp TMPDIR
+  FAKE_ROOT="$(pwd)/fake-root"
+  mkdir -p "$FAKE_ROOT"
+  echo "Notarization will use fake root: $FAKE_ROOT"
+  ./notarize.sh "$APPLICATION_PATH" "$APPLE_USERNAME" "$APPLE_PASSWORD" "$APP_NAME.pkg" "$BUNDLE_ID" "$FAKE_ROOT"
+  rm -rf "$FAKE_ROOT"
+
+  set +e
+  log "Stapling..."
+  xcrun stapler staple "$APPLICATION_PATH"
+else
+  log "Notarization disabled"
+  log "Stapling disabled"
+fi
+
+log "Zipping $BUILD_NAME to $INPUT_FILE ..."
+(
+  #cd "$EXPLODED"
+  #ditto -c -k --sequesterRsrc --keepParent "$BUILD_NAME" "../$INPUT_FILE"
+  if test -d $BACKUP_JMODS/jmods; then
+    mv $BACKUP_JMODS/jmods $APPLICATION_PATH/Contents/Home
+  fi
+  mv $APPLICATION_PATH $EXPLODED/$BUILD_NAME
+
+  tar -pczvf $INPUT_FILE --exclude='man' -C $EXPLODED $BUILD_NAME
+  log "Finished zipping"
+)
+rm -rf "$EXPLODED"
+log "Done"

jb/project/tools/patches/add_jcef_module.patch

@@ -0,0 +1,30 @@
+diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
+index 522acb7cb43..c40e689d5de 100644
+--- jb/project/tools/common/modules.list
++++ jb/project/tools/common/modules.list
+@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
+ jdk.xml.dom,
+ jdk.zipfs,
+ jdk.hotspot.agent,
+-jdk.jcmd
++jdk.jcmd,
++jcef,
++gluegen.rt,
++jogl.all
+diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
+index 897647ee368..781d1809493 100644
+--- src/java.desktop/share/classes/module-info.java
++++ src/java.desktop/share/classes/module-info.java
+@@ -116,7 +116,11 @@ module java.desktop {
+     // see make/GensrcModuleInfo.gmk
+     exports sun.awt to
+         jdk.accessibility,
+-        jdk.unsupported.desktop;
++        jdk.unsupported.desktop,
++        jcef,
++        jogl.all;
++
++    exports java.awt.peer to jcef;
+ 
+     exports java.awt.dnd.peer to jdk.unsupported.desktop;
+     exports sun.awt.dnd to jdk.unsupported.desktop;

jb/project/tools/patches/add_jcef_module_aarch64.patch

@@ -0,0 +1,30 @@
+diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
+index 522acb7..c40e689 100644
+--- jb/project/tools/common/modules.list
++++ jb/project/tools/common/modules.list
+@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
+ jdk.xml.dom,
+ jdk.zipfs,
+ jdk.hotspot.agent,
+-jdk.jcmd
++jdk.jcmd,
++jcef,
++gluegen.rt,
++jogl.all
+diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
+index 897647e..781d180 100644
+--- src/java.desktop/share/classes/module-info.java
++++ src/java.desktop/share/classes/module-info.java
+@@ -116,7 +116,11 @@ module java.desktop {
+     // see make/GensrcModuleInfo.gmk
+     exports sun.awt to
+         jdk.accessibility,
+-        jdk.unsupported.desktop;
++        jdk.unsupported.desktop,
++        jcef,
++        jogl.all;
++
++    exports java.awt.peer to jcef;
+
+     exports java.awt.dnd.peer to jdk.unsupported.desktop;
+     exports sun.awt.dnd to jdk.unsupported.desktop;

jb/project/tools/test/check_jbr_size.sh

@@ -0,0 +1,162 @@
+#!/bin/bash
+
+set -euo pipefail
+
+TC_PRINT=0
+# Always print TeamCity service messages if running under TeamCity
+[[ -n "${TEAMCITY_VERSION:-}" ]] && TC_PRINT=1
+
+while getopts ":t" o; do
+    case "${o}" in
+        t) TC_PRINT=1 ;;
+        *);;
+    esac
+done
+shift $((OPTIND-1))
+
+NEWFILEPATH="$1"
+CONFIGID="$2"
+BUILDID="$3"
+TOKEN="$4"
+
+if [ ! -f "$NEWFILEPATH" ]; then
+  echo "File not found: $NEWFILEPATH"
+  exit 1
+fi
+#
+# Get the size of new artifact
+#
+
+unameOut="$(uname -s)"
+case "${unameOut}" in
+    Linux*)
+      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
+      ;;
+    Darwin*)
+      NEWFILESIZE=$(stat -f%z "$NEWFILEPATH")
+      ;;
+    CYGWIN*)
+      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
+      ;;
+    MINGW*)
+      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
+      ;;
+    *)
+      echo "Unknown machine: ${unameOut}"
+      exit 1
+esac
+FILENAME=$(basename "${NEWFILEPATH}")
+
+#
+# Get pattern of artifact name
+# Base filename pattern: <BUNDLE_TYPE>-<JDK_VERSION>-<OS>-<ARCH>-b<BUILD>.tar.gz: jbr_dcevm-17.0.2-osx-x64-b1234.tar.gz
+# BUNDLE_TYPE: jbr, jbrsdk, jbr_dcevm, jbrsdk_jcef etc.
+# OS_ARCH_PATTERN - <os_architecture>: osx-x64, linux-aarch64, linux-musl-x64, windows-x64 etc.
+
+BUNDLE_TYPE=jbrsdk
+OS_ARCH_PATTERN=""
+FILE_EXTENSION=tar.gz
+
+re='(jbr[a-z_]*).*-[0-9_\.]+-(.+)-b[0-9]+(.+)'
+if [[ $FILENAME =~ $re ]]; then
+  BUNDLE_TYPE=${BASH_REMATCH[1]}
+  OS_ARCH_PATTERN=${BASH_REMATCH[2]}
+  FILE_EXTENSION=${BASH_REMATCH[3]}
+else
+  echo "File name $FILENAME does not match regex $re"
+  exit 1
+fi
+
+function test_started_msg() {
+  if [ $TC_PRINT -eq 1 ]; then
+    echo "##teamcity[testStarted name='$1']"
+  fi
+}
+
+function test_failed_msg() {
+  if [ $TC_PRINT -eq 1 ]; then
+    echo "##teamcity[testFailed name='$1' message='$2']"
+  fi
+}
+
+function test_finished_msg() {
+  if [ $TC_PRINT -eq 1 ]; then
+    echo "##teamcity[testFinished name='$1']"
+  fi
+}
+
+test_name="${BUNDLE_TYPE}_${OS_ARCH_PATTERN//\-/_}${FILE_EXTENSION//\./_}"
+test_started_msg "$test_name"
+
+echo "BUNDLE_TYPE: $BUNDLE_TYPE"
+echo "OS_ARCH_PATTERN: $OS_ARCH_PATTERN"
+echo "FILE_EXTENSION: $FILE_EXTENSION"
+echo "Size of $FILENAME is $NEWFILESIZE bytes"
+
+#
+# Get previous successful build ID
+# Example:
+# CONFIGID=IntellijCustomJdk_Jdk17_Master_LinuxX64jcef
+# BUILDID=12345678
+#
+# expected return value
+# id="123".number="567"
+#
+CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/?locator=buildType:(id:$CONFIGID),status:success,count:1,finishDate:(build:$BUILDID,condition:before)")
+re='id=\"([0-9]+)\".+number=\"([0-9\.]+)\"'
+
+# ID: Previous successful build id
+ID=0
+if [[ $CURL_RESPONSE =~ $re ]]; then
+  ID=${BASH_REMATCH[1]}
+  echo "Previous build ID: $ID"
+  echo "Previous build number: ${BASH_REMATCH[2]}"
+else
+  msg="ERROR: cannot find previous build"
+  echo "$msg"
+  echo "$CURL_RESPONSE"
+  test_failed_msg "$test_name" "$msg"
+  test_finished_msg "$test_name"
+  exit 1
+fi
+
+#
+# Get artifacts from previous successful build
+#
+# expected return value
+# name="jbrsdk_jcef*.tar.gz size="123'
+#
+CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/$ID?fields=id,number,artifacts(file(name,size))")
+echo "Artifacts of the previous build:"
+echo "$CURL_RESPONSE"
+
+# Find binary size (in response) with reg exp
+re="name=\"(${BUNDLE_TYPE}[^\"]+${OS_ARCH_PATTERN}[^\"]+${FILE_EXTENSION})\" size=\"([0-9]+)\""
+
+if [[ $CURL_RESPONSE =~ $re ]]; then
+  prevFileName=${BASH_REMATCH[1]}
+  echo "Previous artifact name: $prevFileName"
+  prevFileSize=${BASH_REMATCH[2]}
+  echo "Previous artifact size: $prevFileSize"
+
+  ((allowedSize=prevFileSize+prevFileSize/20)) # use 5% threshold
+  echo "Allowed size: $allowedSize"
+  if [[ "$NEWFILESIZE" -gt "$allowedSize" ]]; then
+    msg="ERROR: new size is significantly greater than previous size (need to investigate)"
+    echo "$msg"
+    test_failed_msg "$test_name" "$msg"
+    test_finished_msg "$test_name"
+    exit 1
+  else
+    echo "PASSED"
+    test_finished_msg "$test_name"
+  fi
+else
+  msg="ERROR: cannot find string with size in xml response:"
+  echo "Regex: $re"
+  echo "$msg"
+  echo "$CURL_RESPONSE"
+  test_failed_msg "$test_name" "$msg"
+  test_finished_msg "$test_name"
+  exit 1
+fi

jb/project/tools/test/perfcmp.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+usage ()
+{
+echo "Usage: perfcmp.sh [options] <test_results_cur> <test_results_ref> <results> <test_prefix> <noHeaders>"
+echo "Options:"
+echo -e " -h, --help\tdisplay this help"
+echo -e " -tc\tprint teacmity statistic"
+echo -e "test_results_cur - the file with  metrics values for the current measuring"
+echo -e "test_results_ref - the file with metrics values for the reference measuring"
+echo -e "results - results of comaprison"
+echo -e "test_prefix - specifys measuring type, makes sense for enabled -tc, by default no prefixes"
+echo -e "noHeaders - by default 1-st line contains headers"
+echo -e ""
+echo -e "test_results_* files content should be in csv format with header and tab separator:"
+echo -e "The 1-st column is the test name"
+echo -e "The 2-st column is the test value"
+echo -e ""
+echo -e "Example:"
+echo -e "Test           Value"
+echo -e "Testname       51.54"
+}
+
+while [ -n "$1" ]
+do
+case "$1" in
+-h | --help) usage
+exit 1 ;;
+-tc) tc=1
+  shift
+  break  ;;
+*) break;;
+esac
+done
+
+if [[ "$#" < "3" ]]; then
+    echo "Error: Invalid arguments"
+    usage
+    exit 1
+fi
+
+curFile=$1
+refFile=$2
+resFile=$3
+testNamePrefix=$4
+noHeaders=$5
+echo $curFile
+echo $refFile
+echo $resFile
+
+curValues=`cat "$curFile" | cut -f 2 | tr -d '\t'`
+if [ -z $noHeaders ]; then
+  curValuesHeader=`echo "$curValues" | head -n +1`_cur
+  header=`cat "$refFile" | head -n +1 | awk -F'\t' -v x=$curValuesHeader '{print "  "$1"\t"$2"_ref\t"x"\tratio"}'`
+  testContent=`paste -d '\t' $refFile <(echo "$curValues") | tail -n +2`
+else
+  testContent=`paste -d '\t' $refFile <(echo "$curValues") | tail -n +1`
+fi
+
+testContent=`echo "$testContent" | tr "," "." | awk -F'\t' '{
+  if ($3>$2+$2*0.1) {
+    print "* "$1"\t"$2"\t"$3"\t"(($2>0)?$3/$2:"-")
+  } else {
+    print "  "$1"\t"$2"\t"$3"\t"(($2>0)?$3/$2:"-")
+  }
+}'`
+if [ -z $noHeaders ]; then
+  echo "$header" > $resFile
+fi
+echo "$testContent" >> $resFile
+cat "$resFile" | tr '\t' ';' | column -t -s ';' | tee $resFile
+
+if [ -z $tc ]; then
+exit 0
+fi
+
+failed=0
+echo "$testContent" 2>&1 | (
+    while read -r s; do
+        testname=`echo "$s" | cut -f 1 | tr -d "[:space:]" |  tr -d "*"`
+        duration=`echo "$s" | cut -f 3`
+        echo "$s" | cut -c1 | grep -c "*" && failed=1
+        echo \#\#teamcity[testStarted name=\'$testNamePrefix$testname\']
+        echo "===>$s"
+        echo \#\#teamcity[buildStatisticValue key=\'$testNamePrefix$testname\' value=\'$duration\']
+        [ $failed -eq 1 ] && echo \#\#teamcity[testFailed name=\'$testNamePrefix$testname\' message=\'$s\']
+        echo \#\#teamcity[testFinished name=\'$testNamePrefix$testname\' duration=\'$duration\']
+        failed=0
+    done
+)

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

@@ -0,0 +1,149 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script makes test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+# Environment variables:
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
+#               to configure
+#               By default JDK_BUILD_NUMBER is set zero
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_win_aarch64
+
+if [ -z "$BUILD_JDK" ]; then
+  echo "BUILD_JDK environment variable must be specified and point to a JDK built from the current sources" \
+       " and is able to run on the build system. See OpenJDK documentation for --with-build-jdk for more info."
+  exit 1
+fi
+
+source jb/project/tools/common/scripts/common.sh
+
+WORK_DIR=$(pwd)
+JCEF_PATH=${JCEF_PATH:=$WORK_DIR/jcef_win_aarch64}
+NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
+
+function do_configure {
+  sh ./configure \
+    --openjdk-target=aarch64-unknown-cygwin \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build=$JDK_BUILD_NUMBER \
+    --with-version-opt=b${build_number} \
+    --with-toolchain-version=$TOOLCHAIN_VERSION \
+    --with-boot-jdk=$BOOT_JDK \
+    --with-build-jdk=$BUILD_JDK \
+    --with-nvdacontrollerclient=$NVDA_PATH \
+    --disable-ccache \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    --enable-cds=yes || do_exit $?
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
+
+  echo Running jlink ...
+  ${BUILD_JDK}/bin/jlink \
+    --module-path $__modules_path --no-man-pages --compress=2 \
+    --add-modules $__modules --output $__root_dir || do_exit $?
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__arch_name/release
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
+    mv release $__root_dir/release
+    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
+    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
+      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
+    done
+    copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
+  fi
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=windows-aarch64-server-release
+
+case "$bundle_type" in
+  "jcef")
+    do_reset_changes=0
+    do_maketest=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=0
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=windows-aarch64-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME clean images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
+  fi
+else
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
+  fi
+fi
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+where cygpath
+if [ $? -eq 0 ]; then
+  JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
+fi
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
+  update_jsdk_mods "$BUILD_JDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not unchanged
+
+  jbr_name_postfix="_${bundle_type}"
+  cat $JCEF_PATH/jcef.version >> $JSDK/release
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+modules+=",jdk.crypto.mscapi"
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g) || do_exit $?
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
+
+do_exit 0

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

@@ -0,0 +1,142 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script makes test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+# Environment variables:
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
+#               to configure
+#               By default JDK_BUILD_NUMBER is set zero
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_win_x64
+
+source jb/project/tools/common/scripts/common.sh
+
+WORK_DIR=$(pwd)
+JCEF_PATH=${JCEF_PATH:=$WORK_DIR/jcef_win_x64}
+NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
+
+function do_configure {
+  sh ./configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build=$JDK_BUILD_NUMBER \
+    --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 \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    || do_exit $?
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
+
+  echo Running jlink ...
+  ${JSDK}/bin/jlink \
+    --module-path $__modules_path --no-man-pages --compress=2 \
+    --add-modules $__modules --output $__root_dir || do_exit $?
+
+    grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
+    if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
+    mv release $__root_dir/release
+    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
+    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
+      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
+    done
+    copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
+  fi
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=windows-x86_64-server-release
+
+case "$bundle_type" in
+  "jcef")
+    do_reset_changes=0
+    do_maketest=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=0
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=windows-x86_64-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME clean images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
+  fi
+else
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
+  fi
+fi
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+where cygpath
+if [ $? -eq 0 ]; then
+  JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
+fi
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+  cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
+
+  jbr_name_postfix="_${bundle_type}"
+  cat $JCEF_PATH/jcef.version >> $JSDK/release
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+modules+=",jdk.crypto.mscapi"
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g)
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
+
+do_exit 0

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

@@ -0,0 +1,131 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+source jb/project/tools/common/scripts/common.sh
+
+WORK_DIR=$(pwd)
+NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
+
+
+function do_configure {
+  sh ./configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build=$JDK_BUILD_NUMBER \
+    --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 \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    || do_exit $?
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
+
+  echo Running jlink ...
+  ${JSDK}/bin/jlink \
+    --module-path $__modules_path --no-man-pages --compress=2 \
+    --add-modules $__modules --output $__root_dir || do_exit $?
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
+    mv release $__root_dir/release
+    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
+    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
+      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
+    done
+    copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
+  fi
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=windows-x86_64-server-release
+
+case "$bundle_type" in
+  "jcef")
+    echo "not implemented" && do_exit 1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=0
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=windows-x86_64-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME clean images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
+  fi
+else
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
+  fi
+fi
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+  cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
+
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(grep -v "jdk.internal.vm" jb/project/tools/common/modules.list | xargs | sed s/" "//g) || do_exit $?
+modules+=",jdk.crypto.mscapi"
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g)
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
+
+do_exit 0

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

@@ -0,0 +1,57 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script packs test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+
+source jb/project/tools/common/scripts/common.sh
+
+[ "$bundle_type" == "jcef" ] && do_maketest=1
+
+function pack_jbr {
+  __bundle_name=$1
+  __arch_name=$2
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
+
+  echo Creating $JBR.tar.gz ...
+
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
+}
+
+[ "$bundle_type" == "nomod" ] && bundle_type=""
+
+JBRSDK_BUNDLE=jbrsdk
+RELEASE_NAME=windows-aarch64-server-release
+IMAGES_DIR=build/$RELEASE_NAME/images
+BASE_DIR=.
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+pack_jbr jbr${jbr_name_postfix} jbr
+pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
+
+if [ $do_maketest -eq 1 ]; then
+  JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-aarch64-b$build_number
+  cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test" || do_exit $?
+  echo Creating $JBRSDK_TEST.tar.gz ...
+  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+fi

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

@@ -0,0 +1,57 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script packs test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+
+source jb/project/tools/common/scripts/common.sh
+
+[ "$bundle_type" == "jcef" ] && do_maketest=1
+
+function pack_jbr {
+  __bundle_name=$1
+  __arch_name=$2
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
+
+  echo Creating $JBR.tar.gz ...
+  chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
+}
+
+[ "$bundle_type" == "nomod" ] && bundle_type=""
+
+JBRSDK_BUNDLE=jbrsdk
+RELEASE_NAME=windows-x86_64-server-release
+IMAGES_DIR=build/$RELEASE_NAME/images
+BASE_DIR=.
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+pack_jbr jbr${jbr_name_postfix} jbr
+pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
+
+if [ $do_maketest -eq 1 ]; then
+  JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-x64-b$build_number
+  cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test" || do_exit $?
+  echo Creating $JBRSDK_TEST.tar.gz ...
+  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+fi

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

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               fd - the fastdebug bundles which also include the jcef module
+#
+
+source jb/project/tools/common/scripts/common.sh
+
+[ "$bundle_type" == "jcef" ] && echo "not implemented" && do_exit 1
+
+function pack_jbr {
+  __bundle_name=$1
+  __arch_name=$2
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
+
+  echo Creating $JBR.tar.gz ...
+  chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
+}
+
+[ "$bundle_type" == "nomod" ] && bundle_type=""
+
+JBRSDK_BUNDLE=jbrsdk
+RELEASE_NAME=windows-x86_64-server-release
+IMAGES_DIR=build/$RELEASE_NAME/images
+BASE_DIR=.
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+pack_jbr jbr${jbr_name_postfix} jbr
+pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
+
+if [ $do_maketest -eq 1 ]; then
+  JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-x86-b$build_number
+  cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test" || do_exit $?
+  echo Creating $JBRSDK_TEST.tar.gz ...
+  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $BASE_DIR --exclude='test/jdk/demos' test || do_exit $?
+fi

make/Bundles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2020, 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
@@ -449,7 +449,7 @@ ifneq ($(filter jcov-bundles, $(MAKECMDGOALS)), )
       BUNDLE_NAME := $(JCOV_BUNDLE_NAME), \
       FILES := $(JCOV_BUNDLE_FILES), \
       BASE_DIRS := $(JCOV_IMAGE_DIR), \
-      SUBDIR := $(JDK_BUNDLE_SUBDIR), \
+      SUBDIR := jdk-$(VERSION_NUMBER), \
   ))
 
   JCOV_TARGETS += $(BUILD_JCOV_BUNDLE)

make/CompileDemos.gmk

@@ -171,41 +171,41 @@ $(BUILD_DEMO_CodePointIM_JAR): $(CODEPOINT_METAINF_SERVICE_FILE)
 
 $(eval $(call SetupBuildDemo, FileChooserDemo, \
     DEMO_SUBDIR := jfc, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked this-escape, \
 ))
 
 $(eval $(call SetupBuildDemo, SwingSet2, \
     DEMO_SUBDIR := jfc, \
     EXTRA_COPY_TO_JAR := .java, \
     EXTRA_MANIFEST_ATTR := SplashScreen-Image: resources/images/splash.png, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked static serial cast, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked static serial cast this-escape, \
 ))
 
 $(eval $(call SetupBuildDemo, Font2DTest, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast this-escape, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, J2Ddemo, \
     DEMO_SUBDIR := jfc, \
     MAIN_CLASS := java2d.J2Ddemo, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked cast lossy-conversions, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked cast lossy-conversions this-escape, \
     JAR_NAME := J2Ddemo, \
 ))
 
 $(eval $(call SetupBuildDemo, Metalworks, \
-    DISABLED_WARNINGS := rawtypes unchecked, \
+    DISABLED_WARNINGS := rawtypes unchecked this-escape, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, Notepad, \
-    DISABLED_WARNINGS := rawtypes, \
+    DISABLED_WARNINGS := rawtypes this-escape, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, Stylepad, \
     DEMO_SUBDIR := jfc, \
-    DISABLED_WARNINGS := rawtypes unchecked, \
+    DISABLED_WARNINGS := rawtypes unchecked this-escape, \
     EXTRA_SRC_DIR := $(DEMO_SHARE_SRC)/jfc/Notepad, \
     EXCLUDE_FILES := $(DEMO_SHARE_SRC)/jfc/Notepad/README.txt, \
 ))
@@ -215,11 +215,12 @@ $(eval $(call SetupBuildDemo, SampleTree, \
 ))
 
 $(eval $(call SetupBuildDemo, TableExample, \
-    DISABLED_WARNINGS := rawtypes unchecked deprecation, \
+    DISABLED_WARNINGS := rawtypes unchecked deprecation this-escape, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, TransparentRuler, \
+    DISABLED_WARNINGS := this-escape, \
     DEMO_SUBDIR := jfc, \
     MAIN_CLASS := transparentruler.Ruler, \
 ))

make/CompileModuleTools.gmk

@@ -53,7 +53,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JIGSAW_TOOLS, \
                 build/tools/jigsaw, \
     COPY := .properties .html, \
     BIN := $(TOOLS_CLASSES_DIR), \
-    DISABLED_WARNINGS := fallthrough, \
+    DISABLED_WARNINGS := fallthrough this-escape, \
     JAVAC_FLAGS := \
         --add-modules jdk.jdeps \
         --add-exports java.base/jdk.internal.module=ALL-UNNAMED \

make/CompileToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -69,6 +69,13 @@ $(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \
 
 TARGETS += $(COPY_NIMBUS_TEMPLATES)
 
+$(eval $(call SetupCopyFiles,COPY_CLDRCONVERTER_PROPERTIES, \
+    SRC := $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter, \
+    DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/cldrconverter, \
+    FILES := $(wildcard $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter/*.properties)))
+
+TARGETS += $(COPY_CLDRCONVERTER_PROPERTIES)
+
 ################################################################################
 
 $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \

make/Docs.gmk

@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -110,13 +110,17 @@ JAVA_WARNINGS_ARE_ERRORS ?= -Werror
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
     -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
-    --override-methods=summary
+    --enable-preview -source $(JDK_SOURCE_TARGET_VERSION) \
+    --override-methods=summary \
+    --no-external-specs-page
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
     -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
-    -html5 -javafx --expand-requires transitive
+    --enable-preview -source $(JDK_SOURCE_TARGET_VERSION) \
+    -html5 -javafx --expand-requires transitive \
+    --no-external-specs-page
 
 # Should we add DRAFT stamps to the generated javadoc?
 ifeq ($(VERSION_IS_GA), true)

make/JBRApi.gmk

@@ -0,0 +1,93 @@
+#
+# 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 JavaCompilation.gmk
+
+JBR_API_ROOT_DIR   := $(TOPDIR)/src/jetbrains.api
+JBR_API_TOOLS_DIR  := $(JBR_API_ROOT_DIR)/tools
+JBR_API_SRC_DIR    := $(JBR_API_ROOT_DIR)/src
+JBR_API_OUTPUT_DIR := $(OUTPUTDIR)/jbr-api
+JBR_API_GENSRC_DIR := $(JBR_API_OUTPUT_DIR)/gensrc
+JBR_API_BIN_DIR    := $(JBR_API_OUTPUT_DIR)/bin
+JBR_API_VERSION_PROPERTIES := $(JBR_API_ROOT_DIR)/version.properties
+JBR_API_VERSION_GENSRC     := $(JBR_API_OUTPUT_DIR)/jbr-api.version
+JBR_API_GENSRC_BATCH       := $(JBR_API_VERSION_GENSRC)
+
+JBR_API_SRC_FILES := $(call FindFiles, $(JBR_API_SRC_DIR))
+JBR_API_GENSRC_FILES := $(foreach f, $(call FindFiles, $(JBR_API_SRC_DIR)), \
+    $(JBR_API_GENSRC_DIR)/$(call RelativePath, $f, $(JBR_API_SRC_DIR)))
+
+ifeq ($(JBR_API_JBR_VERSION),)
+  JBR_API_JBR_VERSION := DEVELOPMENT
+  JBR_API_FAIL_ON_HASH_MISMATCH := false
+else
+  .PHONY: $(JBR_API_VERSION_PROPERTIES)
+  JBR_API_FAIL_ON_HASH_MISMATCH := true
+endif
+
+ARCHIVE_BUILD_JBR_API_BIN := $(JBR_API_BIN_DIR)
+$(eval $(call SetupJavaCompilation, BUILD_JBR_API, \
+    SMALL_JAVA := true, \
+    COMPILER := bootjdk, \
+    SRC := $(JBR_API_GENSRC_DIR), \
+    EXTRA_FILES := $(JBR_API_GENSRC_FILES), \
+    BIN := $(JBR_API_BIN_DIR), \
+    JAR := $(JBR_API_OUTPUT_DIR)/jbr-api.jar, \
+))
+
+$(eval $(call SetupJarArchive, BUILD_JBR_API_SOURCES_JAR, \
+    DEPENDENCIES := $(JBR_API_GENSRC_FILES), \
+    SRCS := $(JBR_API_GENSRC_DIR), \
+    JAR := $(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar, \
+    SUFFIXES := .java, \
+    BIN := $(JBR_API_BIN_DIR), \
+))
+
+# Grouped targets may not be supported, so hack dependencies: sources -> version file -> generated sources
+$(JBR_API_VERSION_GENSRC): $(JBR_API_SRC_FILES) $(JBR_API_VERSION_PROPERTIES) $(JBR_API_TOOLS_DIR)/Gensrc.java
+	$(ECHO) Generating sources for JBR API
+	$(JAVA_CMD) $(JAVA_FLAGS_SMALL) "$(JBR_API_TOOLS_DIR)/Gensrc.java" \
+	    "$(TOPDIR)/src" "$(JBR_API_OUTPUT_DIR)" "$(JBR_API_JBR_VERSION)"
+$(JBR_API_GENSRC_FILES): $(JBR_API_VERSION_GENSRC)
+	$(TOUCH) $@
+
+jbr-api-check-version: $(JBR_API_GENSRC_FILES) $(JBR_API_VERSION_PROPERTIES)
+	$(JAVA_CMD) $(JAVA_FLAGS_SMALL) "$(JBR_API_TOOLS_DIR)/CheckVersion.java" \
+	    "$(JBR_API_ROOT_DIR)" "$(JBR_API_GENSRC_DIR)" "$(JBR_API_FAIL_ON_HASH_MISMATCH)"
+
+jbr-api: $(BUILD_JBR_API) $(BUILD_JBR_API_SOURCES_JAR) jbr-api-check-version
+
+.PHONY: jbr-api jbr-api-check-version
+
+ifneq ($(JBR_API_CONF_FILE),)
+  $(JBR_API_CONF_FILE): $(JBR_API_GENSRC_FILES)
+	$(ECHO) "VERSION=`$(CAT) $(JBR_API_VERSION_GENSRC)`" > $(JBR_API_CONF_FILE)
+	$(ECHO) "JAR=$(JBR_API_OUTPUT_DIR)/jbr-api.jar" >> $(JBR_API_CONF_FILE)
+	$(ECHO) "SOURCES_JAR=$(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar" >> $(JBR_API_CONF_FILE)
+  jbr-api: $(JBR_API_CONF_FILE)
+  .PHONY: $(JBR_API_CONF_FILE)
+endif

make/Main.gmk

@@ -257,6 +257,46 @@ $(eval $(call SetupTarget, hotspot-ide-project, \
     ARGS := -I$(TOPDIR)/make/hotspot, \
 ))
 
+$(eval $(call SetupTarget, eclipse-java-env, \
+    MAKEFILE := ide/eclipse/CreateWorkspace, \
+    ARGS := --always-make WORKSPACE=java SHARED=false, \
+))
+
+$(eval $(call SetupTarget, eclipse-hotspot-env, \
+    MAKEFILE := ide/eclipse/CreateWorkspace, \
+    ARGS := --always-make WORKSPACE=hotspot SHARED=false, \
+))
+
+$(eval $(call SetupTarget, eclipse-native-env, \
+    MAKEFILE := ide/eclipse/CreateWorkspace, \
+    ARGS := --always-make WORKSPACE=native SHARED=false, \
+))
+
+$(eval $(call SetupTarget, eclipse-mixed-env, \
+    MAKEFILE := ide/eclipse/CreateWorkspace, \
+    ARGS := --always-make SHARED=false, \
+))
+
+$(eval $(call SetupTarget, eclipse-shared-java-env, \
+    MAKEFILE := ide/eclipse/CreateWorkspace, \
+    ARGS := --always-make WORKSPACE=java SHARED=true, \
+))
+
+$(eval $(call SetupTarget, eclipse-shared-hotspot-env, \
+    MAKEFILE := ide/eclipse/CreateWorkspace, \
+    ARGS := --always-make WORKSPACE=hotspot SHARED=true, \
+))
+
+$(eval $(call SetupTarget, eclipse-shared-native-env, \
+    MAKEFILE := ide/eclipse/CreateWorkspace, \
+    ARGS := --always-make WORKSPACE=native SHARED=true, \
+))
+
+$(eval $(call SetupTarget, eclipse-shared-mixed-env, \
+    MAKEFILE := ide/eclipse/CreateWorkspace, \
+    ARGS := --always-make SHARED=true, \
+))
+
 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
     $(HOTSPOT_VARIANT_LIBS_TARGETS)
 
@@ -1354,6 +1394,14 @@ create-main-targets-include:
 	  @$(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))

make/ReleaseFile.gmk

@@ -51,6 +51,7 @@ define create-info-file
   $(if $(VENDOR_VERSION_STRING), \
     $(call info-file-item, "IMPLEMENTOR_VERSION", "$(VENDOR_VERSION_STRING)"))
   $(call info-file-item, "JAVA_VERSION_DATE", "$(VERSION_DATE)")
+  $(call info-file-item, "JAVA_RUNTIME_VERSION", "$(VERSION_STRING)")
   $(call info-file-item, "OS_NAME", "$(RELEASE_FILE_OS_NAME)")
   $(call info-file-item, "OS_ARCH", "$(RELEASE_FILE_OS_ARCH)")
   $(call info-file-item, "LIBC", "$(RELEASE_FILE_LIBC)")

make/RunTests.gmk

@@ -592,7 +592,16 @@ define SetupRunMicroTestBody
   endif
 
   # Set library path for native dependencies
-  $1_JMH_JVM_ARGS := -Djava.library.path=$$(TEST_IMAGE_DIR)/micro/native
+  $1_JMH_JVM_ARGS := -Djava.library.path=$$(TEST_IMAGE_DIR)/micro/native \
+        --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.classfile.instruction=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.classfile.java.lang.constant=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.classfile.components=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.classfile.impl=ALL-UNNAMED
 
   ifneq ($$(MICRO_VM_OPTIONS)$$(MICRO_JAVA_OPTIONS), )
     $1_JMH_JVM_ARGS += $$(MICRO_VM_OPTIONS) $$(MICRO_JAVA_OPTIONS)

make/autoconf/basic.m4

@@ -477,7 +477,11 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
     # df on AIX does not understand -l. On modern AIXes it understands "-T local" which
     # is the same. On older AIXes we just continue to live with a "not local build" warning.
     if test "x$OPENJDK_TARGET_OS" = xaix; then
-      DF_LOCAL_ONLY_OPTION='-T local'
+      if "$DF -T local > /dev/null 2>&1"; then
+        DF_LOCAL_ONLY_OPTION='-T local'
+      else # AIX may use GNU-utils instead
+        DF_LOCAL_ONLY_OPTION='-l'
+      fi
     elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1"; then
       # In WSL1, we can only build on a drvfs file system (that is, a mounted real Windows drive)
       DF_LOCAL_ONLY_OPTION='-t drvfs'

make/autoconf/basic_tools.m4

@@ -434,7 +434,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_PANDOC],
 
   if test "x$PANDOC" != x; then
     AC_MSG_CHECKING([for pandoc version])
-    PANDOC_VERSION=`$PANDOC --version 2>&1 | $HEAD -1 | $CUT -d " " -f 2`
+    PANDOC_VERSION=`$PANDOC --version 2>&1 | $TR -d '\r' | $HEAD -1 | $CUT -d " " -f 2`
     AC_MSG_RESULT([$PANDOC_VERSION])
 
     if test "x$PANDOC_VERSION" != x$RECOMMENDED_PANDOC_VERSION; then
@@ -443,7 +443,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_PANDOC],
 
     PANDOC_MARKDOWN_FLAG="markdown"
     AC_MSG_CHECKING([if the pandoc smart extension needs to be disabled for markdown])
-    if $PANDOC --list-extensions | $GREP -q '\+smart'; then
+    if $PANDOC --list-extensions | $GREP -q '+smart'; then
       AC_MSG_RESULT([yes])
       PANDOC_MARKDOWN_FLAG="markdown-smart"
     else

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.wsl2"; then
-    # Don't trust the current directory for WSL2, but change to an OK 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
     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.wsl2"; then
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1" || test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
     # Change back from temp dir
     cd $CONFIGURE_START_DIR
   fi

make/autoconf/boot-jdk.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -382,7 +382,7 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
   # Finally, set some other options...
 
   # Determine if the boot jdk jar supports the --date option
-  if $JAR --help 2>&1 | $GREP -q "\-\-date=TIMESTAMP"; then
+  if $JAR --help 2>&1 | $GREP -q -e "--date=TIMESTAMP"; then
     BOOT_JDK_JAR_SUPPORTS_DATE=true
   else
     BOOT_JDK_JAR_SUPPORTS_DATE=false

make/autoconf/flags-cflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -189,6 +189,10 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       WARNINGS_ENABLE_ALL_CXXFLAGS="$WARNINGS_ENABLE_ALL_CFLAGS $WARNINGS_ENABLE_ADDITIONAL_CXX"
 
       DISABLED_WARNINGS="unused-parameter unused"
+      # gcc10/11 on ppc generate lots of abi warnings about layout of aggregates containing vectors
+      if test "x$OPENJDK_TARGET_CPU_ARCH" = "xppc"; then
+        DISABLED_WARNINGS="$DISABLED_WARNINGS psabi"
+      fi
       ;;
 
     clang)
@@ -476,8 +480,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
         -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DIAL"
     ALWAYS_DEFINES_JVM="-DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
-        -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE \
-        -D_WINSOCK_DEPRECATED_NO_WARNINGS"
+        -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE"
   fi
 
   ###############################################################################
@@ -634,7 +637,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   STATIC_LIBS_CFLAGS="-DSTATIC_BUILD=1"
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -ffunction-sections -fdata-sections \
-      -DJNIEXPORT='__attribute__((visibility(\"hidden\")))'"
+      -DJNIEXPORT='__attribute__((visibility(\"default\")))'"
   else
     STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -DJNIEXPORT="
   fi

make/autoconf/flags-ldflags.m4

@@ -70,7 +70,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
       fi
     fi
 
-    BASIC_LDFLAGS_JVM_ONLY="-Wl,-O1"
+    BASIC_LDFLAGS_JVM_ONLY=""
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 \

make/autoconf/jdk-options.m4

@@ -234,6 +234,31 @@ 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)
 ])
 
 ###############################################################################
@@ -415,7 +440,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
       CHECK_AVAILABLE: [
         AC_MSG_CHECKING([if AddressSanitizer (asan) is available])
         if test "x$TOOLCHAIN_TYPE" = "xgcc" ||
-            test "x$TOOLCHAIN_TYPE" = "xclang"; then
+           test "x$TOOLCHAIN_TYPE" = "xclang" ||
+           test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
           AC_MSG_RESULT([yes])
         else
           AC_MSG_RESULT([no])
@@ -423,11 +449,20 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
         fi
       ],
       IF_ENABLED: [
-        # ASan is simply incompatible with gcc -Wstringop-truncation. See
-        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85650
-        # It's harmless to be suppressed in clang as well.
-        ASAN_CFLAGS="-fsanitize=address -Wno-stringop-truncation -fno-omit-frame-pointer -fno-common -DADDRESS_SANITIZER"
-        ASAN_LDFLAGS="-fsanitize=address"
+        if test "x$TOOLCHAIN_TYPE" = "xgcc" ||
+           test "x$TOOLCHAIN_TYPE" = "xclang"; then
+          # ASan is simply incompatible with gcc -Wstringop-truncation. See
+          # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85650
+          # It's harmless to be suppressed in clang as well.
+          ASAN_CFLAGS="-fsanitize=address -Wno-stringop-truncation -fno-omit-frame-pointer -fno-common -DADDRESS_SANITIZER"
+          ASAN_LDFLAGS="-fsanitize=address"
+        elif test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
+          # -Oy- is equivalent to -fno-omit-frame-pointer in GCC/Clang.
+          ASAN_CFLAGS="-fsanitize=address -Oy- -DADDRESS_SANITIZER"
+          # MSVC produces a warning if you pass -fsanitize=address to the linker. It also complains
+          $ if -DEBUG is not passed to the linker when building with ASan.
+          ASAN_LDFLAGS="-debug"
+        fi
         JVM_CFLAGS="$JVM_CFLAGS $ASAN_CFLAGS"
         JVM_LDFLAGS="$JVM_LDFLAGS $ASAN_LDFLAGS"
         CFLAGS_JDKLIB="$CFLAGS_JDKLIB $ASAN_CFLAGS"

make/autoconf/jvm-features.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -247,8 +247,14 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_CDS],
 AC_DEFUN_ONCE([JVM_FEATURES_CHECK_DTRACE],
 [
   JVM_FEATURES_CHECK_AVAILABILITY(dtrace, [
-    AC_MSG_CHECKING([for dtrace tool])
-    if test "x$DTRACE" != "x" && test -x "$DTRACE"; then
+    AC_MSG_CHECKING([for dtrace tool and platform support])
+    if test "x$OPENJDK_TARGET_CPU_ARCH" = "xppc"; then
+      AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU_ARCH])
+      AVAILABLE=false
+    elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xs390"; then
+      AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU_ARCH])
+      AVAILABLE=false
+    elif test "x$DTRACE" != "x" && test -x "$DTRACE"; then
       AC_MSG_RESULT([$DTRACE])
     else
       AC_MSG_RESULT([no])

make/autoconf/lib-nvdacontrollerclient.m4

@@ -0,0 +1,121 @@
+#
+# 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

@@ -0,0 +1,92 @@
+#
+# 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-tests.m4

@@ -61,7 +61,7 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_GTEST],
 
         # Verify that the version is the required one.
         # This is a simplified version of TOOLCHAIN_CHECK_COMPILER_VERSION
-        gtest_version="`$GREP GOOGLETEST_VERSION $GTEST_FRAMEWORK_SRC/CMakeLists.txt | $SED -E -e 's/set\(GOOGLETEST_VERSION (.*)\)/\1/'`"
+        gtest_version="`$GREP GOOGLETEST_VERSION $GTEST_FRAMEWORK_SRC/CMakeLists.txt | $SED -e 's/set(GOOGLETEST_VERSION \(.*\))/\1/'`"
         comparable_actual_version=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$gtest_version"`
         comparable_minimum_version=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$GTEST_MINIMUM_VERSION"`
         if test $comparable_actual_version -lt $comparable_minimum_version ; then

make/autoconf/libraries.m4

@@ -33,7 +33,9 @@ m4_include([lib-freetype.m4])
 m4_include([lib-hsdis.m4])
 m4_include([lib-std.m4])
 m4_include([lib-x11.m4])
-
+m4_include([lib-fontconfig.m4])
+m4_include([lib-speechd.m4])
+m4_include([lib-nvdacontrollerclient.m4])
 m4_include([lib-tests.m4])
 
 ################################################################################
@@ -45,10 +47,16 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
   if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
     # No X11 support on windows or macosx
     NEEDS_LIB_X11=false
+    NEEDS_LIB_SPEECHD=false
+  elif test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
+    # No X11 support needed when building headless only
+    NEEDS_LIB_X11=false
+    NEEDS_LIB_SPEECHD=false
   else
     # All other instances need X11, even if building headless only, libawt still
     # needs X11 headers.
     NEEDS_LIB_X11=true
+    NEEDS_LIB_SPEECHD=true
   fi
 
   # Check if fontconfig is needed
@@ -87,6 +95,13 @@ 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
 ])
 
 ################################################################################
@@ -132,7 +147,8 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   LIB_SETUP_LIBFFI
   LIB_SETUP_MISC_LIBS
   LIB_SETUP_X11
-
+  LIB_SETUP_SPEECHD
+  LIB_SETUP_NVDACONTROLLERCLIENT
   LIB_TESTS_SETUP_GTEST
 
   BASIC_JDKLIB_LIBS=""
@@ -170,8 +186,8 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
 
   if test "x$OPENJDK_TARGET_OS" = xwindows; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \
-        comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
-        wsock32.lib winmm.lib version.lib psapi.lib"
+        comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib powrprof.lib uuid.lib \
+        ws2_32.lib winmm.lib version.lib psapi.lib"
   fi
   LIB_SETUP_JVM_LIBS(BUILD)
   LIB_SETUP_JVM_LIBS(TARGET)

make/autoconf/spec.gmk.in

@@ -460,6 +460,20 @@ UBSAN_LDFLAGS:=@UBSAN_LDFLAGS@
 X_CFLAGS:=@X_CFLAGS@
 X_LIBS:=@X_LIBS@
 
+# 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@
+
 # The lowest required version of macosx
 MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
 # The highest allowed version of macosx

make/autoconf/util_paths.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -521,7 +521,7 @@ AC_DEFUN([UTIL_REMOVE_SYMBOLIC_LINKS],
       sym_link_dir=`pwd -P`
       # Resolve file symlinks
       while test $COUNTER -lt 20; do
-        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP -e '->' | $SED -e 's/.*-> \(.*\)/\1/'`
         if test "x$ISLINK" == x; then
           # This is not a symbolic link! We are done!
           break

make/common/MakeIO.gmk

@@ -257,7 +257,7 @@ ifeq ($(HAS_FILE_FUNCTION), true)
 else
   # Use printf to get consistent behavior on all platforms.
   WriteFile = \
-      $(shell $(PRINTF) "%s" $(call ShellQuote, $1) > $2)
+      $(shell $(PRINTF) "%s\n" $(strip $(call ShellQuote, $1)) > $2)
 endif
 
 # Param 1 - Text to write
@@ -268,5 +268,5 @@ ifeq ($(HAS_FILE_FUNCTION), true)
 else
   # Use printf to get consistent behavior on all platforms.
   AppendFile = \
-      $(shell $(PRINTF) "%s" $(call ShellQuote, $1) >> $2)
+      $(shell $(PRINTF) "%s\n" $(strip $(call ShellQuote, $1)) >> $2)
 endif

make/common/ProcessMarkdown.gmk

@@ -84,7 +84,7 @@ define ProcessMarkdown
 	$$(call MakeDir, $$(SUPPORT_OUTPUTDIR)/markdown $$(dir $$($1_$2_PANDOC_OUTPUT)))
 	$$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER), \
 	    $$(PANDOC) $$($1_OPTIONS) -f $$(PANDOC_MARKDOWN_FLAG) \
-	    -t $$($1_FORMAT) --standalone \
+	    -t $$($1_FORMAT) --eol=lf --standalone \
 	    $$($1_$2_CSS_OPTION) $$($1_$2_OPTIONS_FROM_SRC) $$($1_$2_OPTIONS) \
 	    '$$($1_$2_PANDOC_INPUT)' -o '$$($1_$2_PANDOC_OUTPUT)')
         ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)

make/common/modules/LauncherCommon.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -130,7 +130,6 @@ define SetupBuildLauncherBody
           $$(shell $(FIND) $(SUPPORT_OUTPUTDIR)/modules_libs/java.base -name "*.a") \
           $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.jdwp.agent/libdt_socket.a \
           $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.jdwp.agent/libjdwp.a \
-          $(SUPPORT_OUTPUTDIR)/native/java.base/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) \
           -framework CoreFoundation \
           -framework Foundation \
           -framework SystemConfiguration \

make/conf/jib-profiles.js

@@ -851,7 +851,7 @@ var getJibProfilesProfiles = function (input, common, data) {
     [ "linux-aarch64", "linux-x64", "macosx-x64", "macosx-aarch64", "windows-x64" ]
         .forEach(function (name) {
             var o = artifactData[name]
-            var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
+            var jdk_subdir = "jdk-" + data.version;
             var jdk_suffix = (o.jdk_suffix != null ? o.jdk_suffix : "tar.gz");
             var pf = o.platform
             var jcovName = name + "-jcov";
@@ -1048,7 +1048,7 @@ var getJibProfilesDependencies = function (input, common) {
         linux_x64: "gcc11.2.0-OL6.4+1.0",
         macosx: "Xcode12.4+1.1",
         windows_x64: "VS2022-17.1.0+1.1",
-        linux_aarch64: "gcc11.2.0-OL7.6+1.0",
+        linux_aarch64: input.build_cpu == "x64" ? "gcc11.2.0-OL7.6+1.1" : "gcc11.2.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",
         linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
         linux_s390x: "gcc8.2.0-Fedora27+1.0",

make/data/asan/asan_default_options.c

@@ -33,6 +33,8 @@
 
 #if (defined(__GNUC__) && !defined(__clang__)) || __has_attribute(visibility)
 #define ATTRIBUTE_DEFAULT_VISIBILITY __attribute__((visibility("default")))
+#elif defined(_MSC_VER)
+#define ATTRIBUTE_DEFAULT_VISIBILITY __declspec(dllexport)
 #else
 #define ATTRIBUTE_DEFAULT_VISIBILITY
 #endif
@@ -43,12 +45,18 @@
 #define ATTRIBUTE_USED
 #endif
 
+#if defined(_MSC_VER)
+#define CDECL __cdecl
+#else
+#define CDECL
+#endif
+
 // Override weak symbol exposed by ASan to override default options. This is called by ASan
 // extremely early during library loading, before main is called. We need to override the default
 // options because LSan is enabled by default and Hotspot is not yet compatible with it.
 // Additionally we need to prevent ASan from handling SIGSEGV, so that Hotspot's crash handler is
 // used. You can override these options by setting the environment variable ASAN_OPTIONS.
-ATTRIBUTE_DEFAULT_VISIBILITY ATTRIBUTE_USED const char* __asan_default_options() {
+ATTRIBUTE_DEFAULT_VISIBILITY ATTRIBUTE_USED const char* CDECL __asan_default_options() {
   return
 #ifdef LEAK_SANITIZER
     "leak_check_at_exit=0,"

make/data/charsetmapping/charsets

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
@@ -476,6 +476,11 @@ charset x-IBM874 IBM874
     alias   ibm-874
     alias   874
 
+# alias for GB18030 is generated at runtime
+charset GB18030 GB18030
+    package sun.nio.cs
+    type    source
+
 ########################################################
 #
 # charsets provided by ExtendedCharsets provider.
@@ -563,11 +568,6 @@ charset GBK GBK                  # Simplified Chinese
     alias   windows-936
     alias   CP936
 
-charset GB18030 GB18030
-    package sun.nio.cs.ext
-    type    template
-    alias   gb18030-2000
-
 charset GB2312 EUC_CN
     package sun.nio.cs.ext
     type    dbcs

make/data/charsetmapping/stdcs-aix

@@ -7,7 +7,6 @@ Big5_HKSCS
 EUC_CN
 EUC_KR
 GBK
-GB18030
 IBM856
 IBM921
 IBM922

make/data/charsetmapping/stdcs-linux

@@ -11,7 +11,6 @@ EUC_JP_LINUX
 EUC_JP_Open
 EUC_TW
 GBK
-GB18030
 ISO_8859_11
 ISO_8859_3
 ISO_8859_6

make/data/charsetmapping/stdcs-solaris

@@ -1,26 +0,0 @@
-#
-#   generate these charsets into sun.nio.cs
-#
-Big5
-Big5_Solaris
-Big5_HKSCS        # always together with Big5
-EUC_CN
-EUC_KR
-EUC_JP
-EUC_JP_LINUX
-EUC_JP_Open
-EUC_TW
-GBK
-GB18030
-ISO_8859_11
-ISO_8859_3
-ISO_8859_6
-ISO_8859_8
-Johab
-PCK
-TIS_620
-JIS_X_0201
-JIS_X_0208
-JIS_X_0212
-JIS_X_0208_Solaris
-JIS_X_0212_Solaris

make/data/charsetmapping/stdcs-windows

@@ -2,7 +2,6 @@
 #   generate these charsets into sun.nio.cs
 #
 GBK
-GB18030
 Johab
 MS1255
 MS1256

make/data/cldr/README

@@ -1,4 +1,4 @@
 CLDR - Unicode Common Locale Data Repository
 http://cldr.unicode.org
 
-CLDR version installed: 42
+CLDR version installed: 43

make/data/cldr/common/bcp47/currency.xml

@@ -67,9 +67,9 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="btn" description="Bhutanese Ngultrum"/>
             <type name="buk" description="Burmese Kyat" since="1.9"/>
             <type name="bwp" description="Botswanan Pula"/>
-            <type name="byb" description="Belarusian New Ruble (1994-1999)" since="1.9"/>
+            <type name="byb" description="Belarusian Ruble (1994-1999)" since="1.9"/>
             <type name="byn" description="Belarusian Ruble" since="31"/>
-            <type name="byr" description="Belarusian Ruble (2000–2016)" since="1.9"/>
+            <type name="byr" description="Belarusian Ruble (2000-2016)" since="1.9"/>
             <type name="bzd" description="Belize Dollar"/>
             <type name="cad" description="Canadian Dollar"/>
             <type name="cdf" description="Congolese Franc"/>
@@ -112,7 +112,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="fjd" description="Fijian Dollar"/>
             <type name="fkp" description="Falkland Islands Pound"/>
             <type name="frf" description="French Franc"/>
-            <type name="gbp" description="British Pound Sterling"/>
+            <type name="gbp" description="British Pound"/>
             <type name="gek" description="Georgian Kupon Larit" since="1.9"/>
             <type name="gel" description="Georgian Lari" since="1.9"/>
             <type name="ghc" description="Ghanaian Cedi (1979-2007)"/>
@@ -136,8 +136,8 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="idr" description="Indonesian Rupiah"/>
             <type name="iep" description="Irish Pound"/>
             <type name="ilp" description="Israeli Pound"/>
-            <type name="ilr" description="Israeli Sheqel (1980-1985)" since="1.9"/>
-            <type name="ils" description="Israeli New Sheqel"/>
+            <type name="ilr" description="Israeli Shekel (1980-1985)" since="1.9"/>
+            <type name="ils" description="Israeli New Shekel"/>
             <type name="inr" description="Indian Rupee"/>
             <type name="iqd" description="Iraqi Dinar" since="1.9"/>
             <type name="irr" description="Iranian Rial" since="1.9"/>
@@ -181,7 +181,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="mkd" description="Macedonian Denar" since="1.9"/>
             <type name="mkn" description="Macedonian Denar (1992-1993)" since="1.9"/>
             <type name="mlf" description="Malian Franc" since="1.9"/>
-            <type name="mmk" description="Myanma Kyat"/>
+            <type name="mmk" description="Myanmar Kyat"/>
             <type name="mnt" description="Mongolian Tugrik"/>
             <type name="mop" description="Macanese Pataca"/>
             <type name="mro" description="Mauritanian Ouguiya (1973-2017)"/>
@@ -189,7 +189,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="mtl" description="Maltese Lira"/>
             <type name="mtp" description="Maltese Pound"/>
             <type name="mur" description="Mauritian Rupee"/>
-            <type name="mvp" description="Maldivian Rupee" since="1.9"/>
+            <type name="mvp" description="Maldivian Rupee (1947-1981)" since="1.9"/>
             <type name="mvr" description="Maldivian Rufiyaa" since="1.9"/>
             <type name="mwk" description="Malawian Kwacha" since="1.9"/>
             <type name="mxn" description="Mexican Peso" since="1.9"/>
@@ -210,7 +210,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="omr" description="Omani Rial" since="1.9"/>
             <type name="pab" description="Panamanian Balboa"/>
             <type name="pei" description="Peruvian Inti"/>
-            <type name="pen" description="Peruvian Nuevo Sol"/>
+            <type name="pen" description="Peruvian Sol"/>
             <type name="pes" description="Peruvian Sol (1863-1965)" since="1.9"/>
             <type name="pgk" description="Papua New Guinean Kina"/>
             <type name="php" description="Philippine Peso"/>
@@ -219,7 +219,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="plz" description="Polish Zloty (1950-1995)" since="1.9"/>
             <type name="pte" description="Portuguese Escudo"/>
             <type name="pyg" description="Paraguayan Guarani"/>
-            <type name="qar" description="Qatari Rial"/>
+            <type name="qar" description="Qatari Riyal"/>
             <type name="rhd" description="Rhodesian Dollar"/>
             <type name="rol" description="Romanian Leu (1952-2006)" since="1.9"/>
             <type name="ron" description="Romanian Leu"/>
@@ -235,11 +235,11 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="sdp" description="Sudanese Pound (1957-1998)" since="1.9"/>
             <type name="sek" description="Swedish Krona"/>
             <type name="sgd" description="Singapore Dollar"/>
-            <type name="shp" description="Saint Helena Pound"/>
+            <type name="shp" description="St. Helena Pound"/>
             <type name="sit" description="Slovenian Tolar" since="1.9"/>
             <type name="skk" description="Slovak Koruna"/>
-            <type name="sle" description="Sierra Leonean New Leone"/>
-            <type name="sll" description="Sierra Leonean Leone"/>
+            <type name="sle" description="Sierra Leonean Leone" since="41"/>
+            <type name="sll" description="Sierra Leonean Leone (1964—2022)"/>
             <type name="sos" description="Somali Shilling"/>
             <type name="srd" description="Surinamese Dollar"/>
             <type name="srg" description="Surinamese Guilder"/>
@@ -274,28 +274,28 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="uyp" description="Uruguayan Peso (1975-1993)" since="1.9"/>
             <type name="uyu" description="Uruguayan Peso"/>
             <type name="uyw" description="Uruguayan Nominal Wage Index Unit" since="34"/>
-            <type name="uzs" description="Uzbekistan Som" since="1.9"/>
+            <type name="uzs" description="Uzbekistani Som" since="1.9"/>
             <type name="veb" description="Venezuelan Bolívar (1871-2008)" since="1.9"/>
+            <type name="ved" description="Bolívar Soberano" since="41"/>
             <type name="vef" description="Venezuelan Bolívar (2008-2018)"/>
             <type name="ves" description="Venezuelan Bolívar" since="34"/>
-            <type name="ved" description="Bolívar Soberano" since="41"/>
             <type name="vnd" description="Vietnamese Dong"/>
             <type name="vnn" description="Vietnamese Dong (1978-1985)" since="1.9"/>
             <type name="vuv" description="Vanuatu Vatu"/>
             <type name="wst" description="Samoan Tala"/>
-            <type name="xaf" description="CFA Franc BEAC"/>
+            <type name="xaf" description="Central African CFA Franc"/>
             <type name="xag" description="Silver" since="1.9"/>
             <type name="xau" description="Gold" since="1.9"/>
             <type name="xba" description="European Composite Unit" since="1.9"/>
             <type name="xbb" description="European Monetary Unit" since="1.9"/>
-            <type name="xbc" description="European Unit of Account 9" since="1.9"/>
-            <type name="xbd" description="European Unit of Account 17" since="1.9"/>
+            <type name="xbc" description="European Unit of Account (XBC)" since="1.9"/>
+            <type name="xbd" description="European Unit of Account (XBD)" since="1.9"/>
             <type name="xcd" description="East Caribbean Dollar"/>
             <type name="xdr" description="Special Drawing Rights" since="1.9"/>
             <type name="xeu" description="European Currency Unit" since="1.9"/>
             <type name="xfo" description="French Gold Franc" since="1.9"/>
             <type name="xfu" description="French UIC-Franc" since="1.9"/>
-            <type name="xof" description="CFA Franc BCEAO"/>
+            <type name="xof" description="West African CFA Franc"/>
             <type name="xpd" description="Palladium" since="1.9"/>
             <type name="xpf" description="CFP Franc"/>
             <type name="xpt" description="Platinum" since="1.9"/>

make/data/cldr/common/bcp47/segmentation.xml

@@ -10,25 +10,25 @@ For terms of use, see http://www.unicode.org/copyright.html
     <version number="$Revision$"/>
     <keyword>
         <key name="dx" description="Scripts to exclude from dictionary break" valueType="multiple" since="38">
-            <type name="SCRIPT_CODE" description="ISO 15924 script code"/>
+            <type name="SCRIPT_CODE" description="ISO 15924 script code" since="38"/>
         </key>
 
         <key name="lb" description="Line break type key" since="27">
-            <type name="strict" description="CSS level 3 line-break=strict, e.g. treat CJ as NS"/>
-            <type name="normal" description="CSS level 3 line-break=normal, e.g. treat CJ as ID, break before hyphens for ja,zh"/>
-            <type name="loose" description="CSS lev 3 line-break=loose"/>
+            <type name="strict" description="CSS level 3 line-break=strict, e.g. treat CJ as NS" since="27"/>
+            <type name="normal" description="CSS level 3 line-break=normal, e.g. treat CJ as ID, break before hyphens for ja,zh" since="27"/>
+            <type name="loose" description="CSS lev 3 line-break=loose" since="27"/>
         </key>
 
         <key name="lw" description="Line break key for CSS lev 3 word-break options" since="28">
-            <type name="normal" description="CSS lev 3 word-break=normal, normal script/language behavior for midword breaks"/>
-            <type name="breakall" description="CSS lev 3 word-break=break-all, allow midword breaks unless forbidden by lb setting"/>
-            <type name="keepall" description="CSS lev 3 word-break=keep-all, prohibit midword breaks except for dictionary breaks"/>
-            <type name="phrase" description="Prioritize keeping natural phrases (of multiple words) together when breaking, used in short text like title and headline"/>
+            <type name="normal" description="CSS lev 3 word-break=normal, normal script/language behavior for midword breaks" since="28"/>
+            <type name="breakall" description="CSS lev 3 word-break=break-all, allow midword breaks unless forbidden by lb setting" since="28"/>
+            <type name="keepall" description="CSS lev 3 word-break=keep-all, prohibit midword breaks except for dictionary breaks" since="28"/>
+            <type name="phrase" description="Prioritize keeping natural phrases (of multiple words) together when breaking, used in short text like title and headline" since="41"/>
         </key>
 
         <key name="ss" description="Sentence break parameter key to control use of suppressions data" since="28">
-            <type name="none" description="Don't use segmentation suppressions data"/>
-            <type name="standard" description="Use segmentation suppressions data of type standard"/>
+            <type name="none" description="Don't use segmentation suppressions data" since="28"/>
+            <type name="standard" description="Use segmentation suppressions data of type standard" since="28"/>
         </key>
 
     </keyword>

make/data/cldr/common/bcp47/timezone.xml

@@ -96,20 +96,20 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="cacfq" description="Creston, Canada" alias="America/Creston" since="21.0.1"/>
             <type name="caedm" description="Edmonton, Canada" alias="America/Edmonton Canada/Mountain"/>
             <type name="caffs" description="Rainy River, Canada" alias="America/Rainy_River"/>
-            <type name="cafne" description="Fort Nelson, Canada" alias="America/Fort_Nelson"/>
+            <type name="cafne" description="Fort Nelson, Canada" alias="America/Fort_Nelson" since="29"/>
             <type name="caglb" description="Glace Bay, Canada" alias="America/Glace_Bay"/>
             <type name="cagoo" description="Goose Bay, Canada" alias="America/Goose_Bay"/>
             <type name="cahal" description="Halifax, Canada" alias="America/Halifax Canada/Atlantic"/>
             <type name="caiql" description="Iqaluit, Canada" alias="America/Iqaluit"/>
             <type name="camon" description="Moncton, Canada" alias="America/Moncton"/>
-            <type name="camtr" description="Montreal, Canada" deprecated="true" alias="America/Montreal"/>
+            <type name="camtr" description="Montreal, Canada" deprecated="true" preferred="cator"/>
             <type name="capnt" description="Pangnirtung, Canada" alias="America/Pangnirtung"/>
             <type name="careb" description="Resolute, Canada" alias="America/Resolute"/>
             <type name="careg" description="Regina, Canada" alias="America/Regina Canada/East-Saskatchewan Canada/Saskatchewan"/>
             <type name="casjf" description="St. John's, Canada" alias="America/St_Johns Canada/Newfoundland"/>
             <type name="canpg" description="Nipigon, Canada" alias="America/Nipigon"/>
             <type name="cathu" description="Thunder Bay, Canada" alias="America/Thunder_Bay"/>
-            <type name="cator" description="Toronto, Canada" alias="America/Toronto Canada/Eastern"/>
+            <type name="cator" description="Toronto, Canada" alias="America/Toronto America/Montreal Canada/Eastern"/>
             <type name="cavan" description="Vancouver, Canada" alias="America/Vancouver Canada/Pacific"/>
             <type name="cawnp" description="Winnipeg, Canada" alias="America/Winnipeg Canada/Central"/>
             <type name="caybx" description="Blanc-Sablon, Canada" alias="America/Blanc-Sablon"/>
@@ -177,7 +177,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="frpar" description="Paris, France" alias="Europe/Paris"/>
             <type name="galbv" description="Libreville, Gabon" alias="Africa/Libreville"/>
             <type name="gaza" description="Gaza Strip, Palestinian Territories" deprecated="true" preferred="gazastrp"/>
-            <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza"/>
+            <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40"/>
             <type name="gblon" description="London, United Kingdom" alias="Europe/London Europe/Belfast GB GB-Eire"/>
             <type name="gdgnd" description="Grenada" alias="America/Grenada"/>
             <type name="getbs" description="Tbilisi, Georgia" alias="Asia/Tbilisi"/>
@@ -190,7 +190,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="globy" description="Ittoqqortoormiit (Scoresbysund), Greenland" alias="America/Scoresbysund"/>
             <type name="glthu" description="Qaanaaq (Thule), Greenland" alias="America/Thule"/>
             <type name="gmbjl" description="Banjul, Gambia" alias="Africa/Banjul"/>
-            <type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich"/>
+            <type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich" since="31"/>
             <type name="gncky" description="Conakry, Guinea" alias="Africa/Conakry"/>
             <type name="gpbbr" description="Guadeloupe" alias="America/Guadeloupe"/>
             <type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot"/>
@@ -280,7 +280,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="mwblz" description="Blantyre, Malawi" alias="Africa/Blantyre"/>
             <type name="mxchi" description="Chihuahua, Mexico" alias="America/Chihuahua"/>
             <type name="mxcun" description="Cancún, Mexico" alias="America/Cancun"/>
-            <type name="mxcjs" description="Ciudad Juárez, Mexico" alias="America/Ciudad_Juarez"/>
+            <type name="mxcjs" description="Ciudad Juárez, Mexico" alias="America/Ciudad_Juarez" since="43"/>
             <type name="mxhmo" description="Hermosillo, Mexico" alias="America/Hermosillo"/>
             <type name="mxmam" description="Matamoros, Mexico" alias="America/Matamoros"/>
             <type name="mxmex" description="Mexico City, Mexico" alias="America/Mexico_City Mexico/General"/>
@@ -390,7 +390,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="tmasb" description="Ashgabat, Turkmenistan" alias="Asia/Ashgabat Asia/Ashkhabad"/>
             <type name="tntun" description="Tunis, Tunisia" alias="Africa/Tunis"/>
             <type name="totbu" description="Tongatapu, Tonga" alias="Pacific/Tongatapu"/>
-            <type name="trist" description="Istanbul, Turkey" alias="Europe/Istanbul Asia/Istanbul Turkey"/>
+            <type name="trist" description="Istanbul, Türkiye" alias="Europe/Istanbul Asia/Istanbul Turkey"/>
             <type name="ttpos" description="Port of Spain, Trinidad and Tobago" alias="America/Port_of_Spain"/>
             <type name="tvfun" description="Funafuti, Tuvalu" alias="Pacific/Funafuti"/>
             <type name="twtpe" description="Taipei, Taiwan" alias="Asia/Taipei ROC"/>

make/data/cldr/common/bcp47/variant.xml

@@ -7,18 +7,18 @@
 	<version number="$Revision$" />
 	<keyword>
 		<key name="em" description="Emoji presentation style request" since="29">
-			<type name="emoji" description="use an emoji presentation for emoji characters if possible"/>
-			<type name="text" description="use a text presentation for emoji characters if possible"/>
-			<type name="default" description="use the default presentation as specified in UTR #51"/>
+			<type name="emoji" description="use an emoji presentation for emoji characters if possible" since="29"/>
+			<type name="text" description="use a text presentation for emoji characters if possible" since="29"/>
+			<type name="default" description="use the default presentation as specified in UTR #51" since="29"/>
 		</key>
 
 		<key name="rg" description="Alternate region for determining certain data values (e.g. default currency and units) specified by rgScope" since="29">
-			<type name="RG_KEY_VALUE" description="A region code from idValidity/id[type='region'][idStatus='regular'], suffixed with 'ZZZZ'" />
+			<type name="RG_KEY_VALUE" description="A region code from idValidity/id[type='region'][idStatus='regular'], suffixed with 'ZZZZ'" since="29"/>
 		</key>
 
 		<key name="sd" description="Region subdivision" since="28">
 			<type name="SUBDIVISION_CODE"
-				description="Valid unicode_subdivision_subtag for the region subtag as specified in LDML, based on subdivisionContainment data in supplementalData, prefixed by the associated unicode_region_subtag" />
+				description="Valid unicode_subdivision_subtag for the region subtag as specified in LDML, based on subdivisionContainment data in supplementalData, prefixed by the associated unicode_region_subtag" since="28"/>
 		</key>
 
 		<key name="va" description="Common locale variant type key">

make/data/cldr/common/dtd/ldml.dtd

@@ -1,5 +1,5 @@
 <!--
-Copyright © 1991-2022 Unicode, Inc.
+Copyright © 1991-2023 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "42" >
+<!ATTLIST version cldrVersion CDATA #FIXED "43" >
     <!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -68,6 +68,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST language references CDATA #IMPLIED >
+    <!--@MATCH:any-->
     <!--@METADATA-->
 
 <!ELEMENT script ( #PCDATA ) >
@@ -465,6 +466,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST exemplarCharacters references CDATA #IMPLIED >
+    <!--@MATCH:any-->
     <!--@METADATA-->
 <!ATTLIST exemplarCharacters validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
@@ -2825,10 +2827,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT cr ( #PCDATA ) >
 <!ATTLIST cr alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
+    <!--@MATCH:literal/variant, proposed, short-->
 <!ATTLIST cr draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST cr references CDATA #IMPLIED >
+    <!--@MATCH:any-->
     <!--@METADATA-->
 
 <!-- # Use the cr element instead, with ICU syntax. -->
@@ -3123,7 +3126,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:or/range/-1.0E20~1.0E20||literal/-x, 0, 0.x, NaN, -Inf, Inf, x,x, x.x-->
     <!--@VALUE-->
 <!ATTLIST rbnfrule radix CDATA #IMPLIED >
-    <!--@MATCH:literal/1,000, 100, 1000, 100000, 20-->
+    <!--@MATCH:literal/1,000, 100, 1000, 100000, 5, 20, 400, 8000, 160,000, 3,200,000, 64,000,000-->
     <!--@VALUE-->
 <!ATTLIST rbnfrule decexp CDATA #IMPLIED >
     <!--@VALUE-->
@@ -3159,10 +3162,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
 
 <!ELEMENT personNames ( alias | ( nameOrderLocales*, foreignSpaceReplacement*, initialPattern*, personName*, sampleName*, special* ) ) >
-    <!--@TECHPREVIEW-->
 
 <!ELEMENT nameOrderLocales ( #PCDATA ) >
-    <!--@TECHPREVIEW-->
 <!ATTLIST nameOrderLocales order (givenFirst | surnameFirst) #REQUIRED >
 <!ATTLIST nameOrderLocales alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
@@ -3172,7 +3173,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
 
 <!ELEMENT foreignSpaceReplacement ( #PCDATA ) >
-    <!--@TECHPREVIEW-->
 <!ATTLIST foreignSpaceReplacement xml:space (default | preserve) "preserve" >
     <!--@METADATA-->
 <!ATTLIST foreignSpaceReplacement alt NMTOKENS #IMPLIED >
@@ -3183,7 +3183,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
 
 <!ELEMENT initialPattern ( #PCDATA ) >
-    <!--@TECHPREVIEW-->
 <!ATTLIST initialPattern type (initial | initialSequence) #REQUIRED >
 <!ATTLIST initialPattern alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
@@ -3193,18 +3192,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
 
 <!ELEMENT personName ( alias | ( namePattern+, special* ) ) >
-    <!--@TECHPREVIEW-->
 <!ATTLIST personName order NMTOKENS #IMPLIED >
-    <!--@MATCH:set/literal/givenFirst, surnameFirst, sorting-->
+    <!--@MATCH:literal/givenFirst, surnameFirst, sorting-->
 <!ATTLIST personName length NMTOKENS #IMPLIED >
-    <!--@MATCH:set/literal/long, medium, short-->
+    <!--@MATCH:literal/long, medium, short-->
 <!ATTLIST personName usage NMTOKENS #IMPLIED >
-    <!--@MATCH:set/literal/referring, addressing, monogram-->
+    <!--@MATCH:literal/referring, addressing, monogram-->
 <!ATTLIST personName formality NMTOKENS #IMPLIED >
-    <!--@MATCH:set/literal/formal, informal-->
+    <!--@MATCH:literal/formal, informal-->
 
 <!ELEMENT namePattern ( #PCDATA ) >
-    <!--@TECHPREVIEW-->
 <!ATTLIST namePattern alt (1 | 2) #IMPLIED >
 <!ATTLIST namePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -3212,14 +3209,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
 
 <!ELEMENT sampleName ( alias | ( nameField+, special* ) ) >
-    <!--@TECHPREVIEW-->
 <!ATTLIST sampleName item NMTOKENS #REQUIRED >
-    <!--@MATCH:literal/givenOnly, givenSurnameOnly, given12Surname, full-->
+    <!--@MATCH:literal/nativeG, nativeGS, nativeGGS, nativeFull, foreignG, foreignGS, foreignGGS, foreignFull-->
 
 <!ELEMENT nameField ( #PCDATA ) >
-    <!--@TECHPREVIEW-->
 <!ATTLIST nameField type CDATA #REQUIRED >
-    <!--@MATCH:literal/prefix, given, given-informal, given2, surname, surname-prefix, surname-core, surname2, suffix-->
+    <!--@MATCH:literal/title, given, given-informal, given2, surname, surname-prefix, surname-core, surname2, generation, credentials-->
 <!ATTLIST nameField alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
 <!ATTLIST nameField draft (approved | contributed | provisional | unconfirmed) #IMPLIED >

make/data/cldr/common/dtd/ldmlBCP47.dtd

@@ -1,5 +1,5 @@
 <!--
-Copyright © 1991-2022 Unicode, Inc.
+Copyright © 1991-2023 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "42" >
+<!ATTLIST version cldrVersion CDATA #FIXED "43" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 

make/data/cldr/common/dtd/ldmlSupplemental.dtd

@@ -1,18 +1,18 @@
 <!--
-Copyright © 1991-2022 Unicode, Inc.
+Copyright © 1991-2023 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
-<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitIdComponents?, unitConstants*, unitQuantities*, convertUnits*, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales?, personNamesDefaults?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups?, grammaticalData? ) >
+<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitIdComponents?, unitConstants*, unitQuantities*, convertUnits*, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales*, personNamesDefaults?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups?, grammaticalData? ) >
 
 <!ELEMENT version EMPTY >
     <!--@METADATA-->
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:any-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "42" >
+<!ATTLIST version cldrVersion CDATA #FIXED "43" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 <!ATTLIST version unicodeVersion CDATA #FIXED "15.0.0" >
@@ -216,7 +216,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT calendarData ( calendar* ) >
 
-<!ELEMENT calendar ( calendarSystem?, eras? ) >
+<!ELEMENT calendar ( calendarSystem?, inheritEras?, eras? ) >
 <!ATTLIST calendar type NMTOKEN #REQUIRED >
     <!--@MATCH:bcp47/ca-->
 <!ATTLIST calendar territories NMTOKENS #IMPLIED >
@@ -237,6 +237,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST calendarSystem references CDATA #IMPLIED >
     <!--@METADATA-->
 
+<!ELEMENT inheritEras EMPTY >
+<!ATTLIST inheritEras calendar NMTOKEN #REQUIRED >
+    <!--@MATCH:bcp47/ca-->
+    <!--@VALUE-->
+
 <!ELEMENT eras ( era* ) >
 <!ATTLIST eras references CDATA #IMPLIED >
     <!--@METADATA-->
@@ -250,6 +255,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST era end CDATA #IMPLIED >
     <!--@MATCH:time/yyyy-MM-dd-->
     <!--@VALUE-->
+<!ATTLIST era code NMTOKEN #IMPLIED >
+    <!--@MATCH:regex/[a-z0-9]{3,8}(\-[a-z0-9]{3,8})*-->
+    <!--@VALUE-->
+<!ATTLIST era aliases NMTOKENS #IMPLIED >
+    <!--@MATCH:set/regex/[a-z0-9]{2,8}(\-[a-z0-9]{3,8})*-->
+    <!--@VALUE-->
 <!ATTLIST era named (true | false) #IMPLIED >
     <!--@VALUE-->
 
@@ -439,7 +450,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@DEPRECATED-->
 <!ATTLIST unitPreferences draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
-    <!--@DEPRECATED-->
 
 <!ELEMENT unitPreference ( #PCDATA ) >
     <!--@ORDERED-->
@@ -900,6 +910,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!-- # Parent locales -->
 
 <!ELEMENT parentLocales ( parentLocale* ) >
+<!ATTLIST parentLocales component NMTOKEN #IMPLIED >
+    <!--@MATCH:literal/segmentations, collations-->
 
 <!ELEMENT parentLocale EMPTY >
 <!ATTLIST parentLocale parent NMTOKEN #REQUIRED >
@@ -923,6 +935,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST likelySubtag to NMTOKEN #REQUIRED >
     <!--@MATCH:validity/locale-->
     <!--@VALUE-->
+<!ATTLIST likelySubtag origin NMTOKENS #IMPLIED >
+    <!--@MATCH:set/literal/sil1, wikidata, special-->
+    <!--@METADATA-->
 
 <!ELEMENT metazoneInfo ( timezone* ) >
 

make/data/cldr/common/main/aa.xml

@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2023 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-DFS-2016
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="aa"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="aa" draft="unconfirmed">Qafar</language>
+		</languages>
+		<territories>
+			<territory type="DJ" draft="unconfirmed">Yabuuti</territory>
+			<territory type="ER" draft="unconfirmed">Eretria</territory>
+			<territory type="ET" draft="unconfirmed">Otobbia</territory>
+		</territories>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[a b t s e c k x i d q r f g o l m n u w h y]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[j p v z]</exemplarCharacters>
+		<exemplarCharacters type="index">[A B T S E C K X I D Q R F G O L M N U W H Y]</exemplarCharacters>
+	</characters>
+	<dates>
+		<calendars>
+			<calendar type="generic">
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">EEEE, MMMM dd, y G</pattern>
+							<datetimeSkeleton draft="unconfirmed">GyMMMMEEEEdd</datetimeSkeleton>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd MMMM y G</pattern>
+							<datetimeSkeleton draft="unconfirmed">GyMMMMdd</datetimeSkeleton>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd-MMM-y G</pattern>
+							<datetimeSkeleton draft="unconfirmed">GyMMMdd</datetimeSkeleton>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd/MM/yy GGGGG</pattern>
+							<datetimeSkeleton draft="unconfirmed">GGGGGyyMMdd</datetimeSkeleton>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<month type="1" draft="unconfirmed">Qun</month>
+							<month type="2" draft="unconfirmed">Nah</month>
+							<month type="3" draft="unconfirmed">Cig</month>
+							<month type="4" draft="unconfirmed">Agd</month>
+							<month type="5" draft="unconfirmed">Cax</month>
+							<month type="6" draft="unconfirmed">Qas</month>
+							<month type="7" draft="unconfirmed">Qad</month>
+							<month type="8" draft="unconfirmed">Leq</month>
+							<month type="9" draft="unconfirmed">Way</month>
+							<month type="10" draft="unconfirmed">Dit</month>
+							<month type="11" draft="unconfirmed">Xim</month>
+							<month type="12" draft="unconfirmed">Kax</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">Qunxa Garablu</month>
+							<month type="2" draft="unconfirmed">Kudo</month>
+							<month type="3" draft="unconfirmed">Ciggilta Kudo</month>
+							<month type="4" draft="unconfirmed">Agda Baxis</month>
+							<month type="5" draft="unconfirmed">Caxah Alsa</month>
+							<month type="6" draft="unconfirmed">Qasa Dirri</month>
+							<month type="7" draft="unconfirmed">Qado Dirri</month>
+							<month type="8" draft="unconfirmed">Liiqen</month>
+							<month type="9" draft="unconfirmed">Waysu</month>
+							<month type="10" draft="unconfirmed">Diteli</month>
+							<month type="11" draft="unconfirmed">Ximoli</month>
+							<month type="12" draft="unconfirmed">Kaxxa Garablu</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="narrow">
+							<month type="1" draft="unconfirmed">Q</month>
+							<month type="2" draft="unconfirmed">N</month>
+							<month type="3" draft="unconfirmed">C</month>
+							<month type="4" draft="unconfirmed">A</month>
+							<month type="5" draft="unconfirmed">C</month>
+							<month type="6" draft="unconfirmed">Q</month>
+							<month type="7" draft="unconfirmed">Q</month>
+							<month type="8" draft="unconfirmed">L</month>
+							<month type="9" draft="unconfirmed">W</month>
+							<month type="10" draft="unconfirmed">D</month>
+							<month type="11" draft="unconfirmed">X</month>
+							<month type="12" draft="unconfirmed">K</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="abbreviated">
+							<day type="sun" draft="unconfirmed">Aca</day>
+							<day type="mon" draft="unconfirmed">Etl</day>
+							<day type="tue" draft="unconfirmed">Tal</day>
+							<day type="wed" draft="unconfirmed">Arb</day>
+							<day type="thu" draft="unconfirmed">Kam</day>
+							<day type="fri" draft="unconfirmed">Gum</day>
+							<day type="sat" draft="unconfirmed">Sab</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">Acaada</day>
+							<day type="mon" draft="unconfirmed">Etleeni</day>
+							<day type="tue" draft="unconfirmed">Talaata</day>
+							<day type="wed" draft="unconfirmed">Arbaqa</day>
+							<day type="thu" draft="unconfirmed">Kamiisi</day>
+							<day type="fri" draft="unconfirmed">Gumqata</day>
+							<day type="sat" draft="unconfirmed">Sabti</day>
+						</dayWidth>
+					</dayContext>
+					<dayContext type="stand-alone">
+						<dayWidth type="narrow">
+							<day type="sun" draft="unconfirmed">A</day>
+							<day type="mon" draft="unconfirmed">E</day>
+							<day type="tue" draft="unconfirmed">T</day>
+							<day type="wed" draft="unconfirmed">A</day>
+							<day type="thu" draft="unconfirmed">K</day>
+							<day type="fri" draft="unconfirmed">G</day>
+							<day type="sat" draft="unconfirmed">S</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="am" draft="unconfirmed">saaku</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">carra</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="unconfirmed">saaku</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">carra</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<era type="0" draft="unconfirmed">Yaasuusuk Duma</era>
+						<era type="1" draft="unconfirmed">Yaasuusuk Wadir</era>
+					</eraNames>
+					<eraAbbr>
+						<era type="0" draft="unconfirmed">YD</era>
+						<era type="1" draft="unconfirmed">YW</era>
+					</eraAbbr>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern draft="unconfirmed">EEEE, MMMM dd, y</pattern>
+							<datetimeSkeleton draft="unconfirmed">yMMMMEEEEdd</datetimeSkeleton>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd MMMM y</pattern>
+							<datetimeSkeleton draft="unconfirmed">yMMMMdd</datetimeSkeleton>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd-MMM-y</pattern>
+							<datetimeSkeleton draft="unconfirmed">yMMMdd</datetimeSkeleton>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern draft="unconfirmed">dd/MM/yy</pattern>
+							<datetimeSkeleton draft="unconfirmed">yyMMdd</datetimeSkeleton>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>h:mm:ss a zzzz</pattern>
+							<datetimeSkeleton>ahmmsszzzz</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>h:mm:ss a z</pattern>
+							<datetimeSkeleton>ahmmssz</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>h:mm:ss a</pattern>
+							<datetimeSkeleton>ahmmss</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>h:mm a</pattern>
+							<datetimeSkeleton>ahmm</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern draft="unconfirmed">¤#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencies>
+			<currency type="ETB">
+				<symbol>Br</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>

make/data/cldr/common/main/aa_DJ.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2023 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-DFS-2016
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="aa"/>
+		<territory type="DJ"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">Qunxa Garablu</month>
+							<month type="2" draft="unconfirmed">Kudo</month>
+							<month type="3" draft="unconfirmed">Ciggilta Kudo</month>
+							<month type="4" draft="unconfirmed">Agda Baxis</month>
+							<month type="5" draft="unconfirmed">Caxah Alsa</month>
+							<month type="6" draft="unconfirmed">Qasa Dirri</month>
+							<month type="7" draft="unconfirmed">Qado Dirri</month>
+							<month type="8" draft="unconfirmed">Leqeeni</month>
+							<month type="9" draft="unconfirmed">Waysu</month>
+							<month type="10" draft="unconfirmed">Diteli</month>
+							<month type="11" draft="unconfirmed">Ximoli</month>
+							<month type="12" draft="unconfirmed">Kaxxa Garablu</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="DJF">
+				<symbol>Fdj</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>