JBR-4621 Implemented key repeat

This includes basic mouse and keyboard support.

.github/actions/do-build/action.yml

@@ -1,80 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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: 'Do build'
-description: 'Build the JDK using make'
-inputs:
-  make-target:
-    description: 'Make target(s)'
-    required: true
-  platform:
-    description: 'Platform name'
-    required: true
-  debug-suffix:
-    description: 'File name suffix denoting debug level, possibly empty'
-    required: false
-
-runs:
-  using: composite
-  steps:
-    - name: 'Build'
-      id: build
-      run: >
-        make LOG=info ${{ inputs.make-target }}
-        || bash ./.github/scripts/gen-build-failure-report.sh "$GITHUB_STEP_SUMMARY"
-      shell: bash
-
-    - name: 'Check for failure'
-      id: check
-      run: |
-        # Check for failure marker file
-        build_dir="$(ls -d build/*)"
-        if [[ -e $build_dir/build-failure ]]; then
-          # Collect relevant log files
-          mkdir failure-logs
-          cp \
-              $build_dir/spec.gmk \
-              $build_dir/build.log \
-              $build_dir/configure.log \
-              $build_dir/make-support/failure-summary.log \
-              $build_dir/make-support/failure-logs/* \
-              failure-logs/ 2> /dev/null || true
-          echo '::set-output name=failure::true'
-        fi
-      shell: bash
-
-    - name: 'Upload build logs'
-      uses: actions/upload-artifact@v3
-      with:
-        name: failure-logs-${{ inputs.platform }}${{ inputs.debug-suffix }}
-        path: failure-logs
-      if: steps.check.outputs.failure == 'true'
-
-      # This is the best way I found to abort the job with an error message
-    - name: 'Notify about build failures'
-      uses: actions/github-script@v6
-      with:
-        script: core.setFailed('Build failed. See summary for details.')
-      if: steps.check.outputs.failure == 'true'

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

@@ -1,109 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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: 'Get BootJDK'
-description: 'Download the BootJDK from cache or source location'
-inputs:
-  platform:
-    description: 'Platform'
-    required: true
-outputs:
-  path:
-    description: 'Path to the installed BootJDK'
-    value: ${{ steps.path-name.outputs.path }}
-
-runs:
-  using: composite
-  steps:
-    - name: 'Determine platform prefix'
-      id: platform-prefix
-      run: |
-        # Convert platform name to upper case
-        platform_prefix="$(echo ${{ inputs.platform }} | tr [a-z-] [A-Z_])"
-        echo "::set-output name=value::$platform_prefix"
-      shell: bash
-
-    - name: 'Get URL configuration'
-      id: url
-      uses: ./.github/actions/config
-      with:
-        var: ${{ steps.platform-prefix.outputs.value}}_BOOT_JDK_URL
-
-    - name: 'Get SHA256 configuration'
-      id: sha256
-      uses: ./.github/actions/config
-      with:
-        var: ${{ steps.platform-prefix.outputs.value}}_BOOT_JDK_SHA256
-
-    - name: 'Get file extension configuration'
-      id: ext
-      uses: ./.github/actions/config
-      with:
-        var: ${{ steps.platform-prefix.outputs.value}}_BOOT_JDK_EXT
-
-    - name: 'Check cache for BootJDK'
-      id: get-cached-bootjdk
-      uses: actions/cache@v3
-      with:
-        path: bootjdk/jdk
-        key: boot-jdk-${{ inputs.platform }}-${{ steps.sha256.outputs.value }}
-
-      # macOS is missing sha256sum
-    - name: 'Install sha256sum'
-      run: |
-        # Run Homebrew installation
-        brew install coreutils
-      shell: bash
-      if: steps.get-cached-bootjdk.outputs.cache-hit != 'true' && runner.os == 'macOS'
-
-    - name: 'Download BootJDK'
-      run: |
-        # Download BootJDK and verify checksum
-        mkdir -p bootjdk/jdk
-        mkdir -p bootjdk/unpacked
-        wget --progress=dot:mega -O bootjdk/jdk.${{ steps.ext.outputs.value }} '${{ steps.url.outputs.value }}'
-        echo '${{ steps.sha256.outputs.value }} bootjdk/jdk.${{ steps.ext.outputs.value }}' | sha256sum -c >/dev/null -
-      shell: bash
-      if: steps.get-cached-bootjdk.outputs.cache-hit != 'true'
-
-    - name: 'Unpack BootJDK'
-      run: |
-        # Unpack the BootJDK and move files to a common location
-        if [[ '${{ steps.ext.outputs.value }}' == 'tar.gz' ]]; then
-          tar -xf bootjdk/jdk.${{ steps.ext.outputs.value }} -C bootjdk/unpacked
-        else
-          unzip -q bootjdk/jdk.${{ steps.ext.outputs.value }} -d bootjdk/unpacked
-        fi
-        jdk_root="$(dirname $(find bootjdk/unpacked -name bin -type d))"
-        mv "$jdk_root"/* bootjdk/jdk/
-      shell: bash
-      if: steps.get-cached-bootjdk.outputs.cache-hit != 'true'
-
-    - name: 'Export path to where BootJDK is installed'
-      id: path-name
-      run: |
-        # Export the path
-        echo '::set-output name=path::bootjdk/jdk'
-      shell: bash

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

@@ -1,109 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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: 'Get bundles'
-description: 'Download resulting JDK bundles'
-inputs:
-  platform:
-    description: 'Platform name'
-    required: true
-  debug-suffix:
-    description: 'File name suffix denoting debug level, possibly empty'
-    required: false
-outputs:
-  jdk-path:
-    description: 'Path to the installed JDK bundle'
-    value: ${{ steps.path-name.outputs.jdk }}
-  symbols-path:
-    description: 'Path to the installed symbols bundle'
-    value: ${{ steps.path-name.outputs.symbols }}
-  tests-path:
-    description: 'Path to the installed tests bundle'
-    value: ${{ steps.path-name.outputs.tests }}
-
-runs:
-  using: composite
-  steps:
-    - name: 'Download bundles artifact'
-      id: download-bundles
-      uses: actions/download-artifact@v3
-      with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
-        path: bundles
-      continue-on-error: true
-
-    - name: 'Download bundles artifact (retry)'
-      uses: actions/download-artifact@v3
-      with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
-        path: bundles
-      if: steps.download-bundles.outcome == 'failure'
-
-    - name: 'Unpack bundles'
-      run: |
-        if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip ]]; then
-          echo 'Unpacking jdk bundle...'
-          mkdir -p bundles/jdk
-          unzip -q bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip -d bundles/jdk
-        fi
-
-        if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
-          echo 'Unpacking jdk bundle...'
-          mkdir -p bundles/jdk
-          tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/jdk
-        fi
-
-        if [[ -e bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
-          echo 'Unpacking symbols bundle...'
-          mkdir -p bundles/symbols
-          tar -xf bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/symbols
-        fi
-
-        if [[ -e bundles/tests-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
-          echo 'Unpacking tests bundle...'
-          mkdir -p bundles/tests
-          tar -xf bundles/tests-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/tests
-        fi
-      shell: bash
-
-    - name: 'Export paths to where bundles are installed'
-      id: path-name
-      run: |
-        # Export the paths
-
-        jdk_dir="$GITHUB_WORKSPACE/$(dirname $(find bundles/jdk -name bin -type d))"
-        symbols_dir="$GITHUB_WORKSPACE/$(dirname $(find bundles/symbols -name bin -type d))"
-        tests_dir="$GITHUB_WORKSPACE/bundles/tests"
-
-        if [[ '${{ runner.os }}' == 'Windows' ]]; then
-          jdk_dir="$(cygpath $jdk_dir)"
-          symbols_dir="$(cygpath $symbols_dir)"
-          tests_dir="$(cygpath $tests_dir)"
-        fi
-
-        echo "::set-output name=jdk::$jdk_dir"
-        echo "::set-output name=symbols::$symbols_dir"
-        echo "::set-output name=tests::$tests_dir"
-      shell: bash

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

@@ -1,72 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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: 'Get JTReg'
-description: 'Download JTReg from cache or source location'
-outputs:
-  path:
-    description: 'Path to the installed JTReg'
-    value: ${{ steps.path-name.outputs.path }}
-
-runs:
-  using: composite
-  steps:
-    - name: 'Get JTReg version configuration'
-      id: version
-      uses: ./.github/actions/config
-      with:
-        var: JTREG_VERSION
-
-    - name: 'Check cache for JTReg'
-      id: get-cached-jtreg
-      uses: actions/cache@v3
-      with:
-        path: jtreg/installed
-        key: jtreg-${{ steps.version.outputs.value }}
-
-    - name: 'Checkout the JTReg source'
-      uses: actions/checkout@v3
-      with:
-        repository: openjdk/jtreg
-        ref: jtreg-${{ steps.version.outputs.value }}
-        path: jtreg/src
-      if: steps.get-cached-jtreg.outputs.cache-hit != 'true'
-
-    - name: 'Build JTReg'
-      run: |
-        # Build JTReg and move files to the proper locations
-        bash make/build.sh --jdk "$JAVA_HOME_11_X64"
-        mkdir ../installed
-        mv build/images/jtreg/* ../installed
-      working-directory: jtreg/src
-      shell: bash
-      if: steps.get-cached-jtreg.outputs.cache-hit != 'true'
-
-    - name: 'Export path to where JTReg is installed'
-      id: path-name
-      run: |
-        # Export the path
-        echo '::set-output name=path::jtreg/installed'
-      shell: bash

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

@@ -1,77 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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: 'Upload bundles'
-description: 'Upload resulting JDK bundles'
-inputs:
-  platform:
-    description: 'Platform name'
-    required: true
-  debug-suffix:
-    description: 'File name suffix denoting debug level, possibly empty'
-    required: false
-
-runs:
-  using: composite
-  steps:
-
-    - name: 'Determine bundle names'
-      id: bundles
-      run: |
-        # Rename bundles to consistent names
-        jdk_bundle_zip="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
-        jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
-        symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
-        tests_bundle="$(ls build/*/bundles/jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
-
-        mkdir bundles
-
-        if [[ "$jdk_bundle_zip" != "" ]]; then
-          mv "$jdk_bundle_zip" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip"
-        fi
-        if [[ "$jdk_bundle_tar_gz" != "" ]]; then
-          mv "$jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
-        fi
-        if [[ "$symbols_bundle" != "" ]]; then
-          mv "$symbols_bundle" "bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
-        fi
-        if [[ "$tests_bundle" != "" ]]; then
-          mv "$tests_bundle" "bundles/tests-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
-        fi
-
-        if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle" != "" ]]; then
-          echo '::set-output name=bundles-found::true'
-        else
-          echo '::set-output name=bundles-found::false'
-        fi
-      shell: bash
-
-    - name: 'Upload bundles artifact'
-      uses: actions/upload-artifact@v3
-      with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
-        path: bundles
-        retention-days: 1
-      if: steps.bundles.outputs.bundles-found == 'true'

.github/scripts/gen-test-results.sh

@@ -1,92 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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.
-#
-
-GITHUB_STEP_SUMMARY="$1"
-
-test_suite_name=$(cat build/run-test-prebuilt/test-support/test-last-ids.txt)
-results_dir=build/run-test-prebuilt/test-results/$test_suite_name/text
-report_dir=build/run-test-prebuilt/test-support/$test_suite_name
-
-failures=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/newfailures.txt 2> /dev/null || true)
-errors=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/other_errors.txt 2> /dev/null || true)
-
-if [[ "$failures" = "" && "$errors" = "" ]]; then
-  # If we have nothing to report, exit this step now
-  exit 0
-fi
-
-echo "### Test output for failed tests" >> $GITHUB_STEP_SUMMARY
-for test in $failures $errors; do
-  anchor="$(echo "$test" | tr [A-Z/] [a-z_])"
-  base_path="$(echo "$test" | tr '#' '_')"
-  report_file="$report_dir/$base_path.jtr"
-  hs_err_files=$(ls $report_dir/$base_path/hs_err*.log 2> /dev/null || true)
-  echo "####  <a id="$anchor">$test"
-
-  echo '<details><summary>View test results</summary>'
-  echo ''
-  echo '```'
-  if [[ -f "$report_file" ]]; then
-    cat "$report_file"
-  else
-    echo "Error: Result file $report_file not found"
-  fi
-  echo '```'
-  echo '</details>'
-  echo ''
-
-  if [[ "$hs_err_files" != "" ]]; then
-    echo '<details><summary>View HotSpot error log</summary>'
-    echo ''
-    for hs_err in $hs_err_files; do
-      echo '```'
-      echo "$hs_err:"
-      echo ''
-      cat "$hs_err"
-      echo '```'
-    done
-
-    echo '</details>'
-    echo ''
-  fi
-
-done >> $GITHUB_STEP_SUMMARY
-
-# With many failures, the summary can easily exceed 1024 kB, the limit set by Github
-# Trim it down if so.
-summary_size=$(wc -c < $GITHUB_STEP_SUMMARY)
-if [[ $summary_size -gt 1000000 ]]; then
-  # Trim to below 1024 kB, and cut off after the last detail group
-  head -c 1000000 $GITHUB_STEP_SUMMARY | tac | sed -n -e '/<\/details>/,$ p' | tac > $GITHUB_STEP_SUMMARY.tmp
-  mv $GITHUB_STEP_SUMMARY.tmp $GITHUB_STEP_SUMMARY
-  (
-    echo ''
-    echo ':x: **WARNING: Summary is too large and has been truncated.**'
-    echo ''
-  )  >> $GITHUB_STEP_SUMMARY
-fi
-
-echo ':arrow_right: To see the entire test log, click the job in the list to the left.'  >> $GITHUB_STEP_SUMMARY

.github/scripts/gen-test-summary.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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.
-#
-
-GITHUB_STEP_SUMMARY="$1"
-
-test_suite_name=$(cat build/run-test-prebuilt/test-support/test-last-ids.txt)
-results_dir=build/run-test-prebuilt/test-results/$test_suite_name/text
-
-if [[ ! -f build/run-test-prebuilt/make-support/exit-with-error ]]; then
-  # There were no failures, exit now
-  exit
-fi
-
-failures=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/newfailures.txt 2> /dev/null || true)
-errors=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/other_errors.txt 2> /dev/null || true)
-failure_count=$(echo $failures | wc -w || true)
-error_count=$(echo $errors | wc -w || true)
-
-if [[ "$failures" = "" && "$errors" = "" ]]; then
-  # We know something went wrong, but not what
-  echo '::set-output name=error-message::Unspecified test suite failure. Please see log for job for details.'
-  exit 0
-fi
-
-echo '::set-output name=failure::true'
-echo "::set-output name=error-message::Test run reported $failure_count test failure(s) and $error_count error(s). See summary for details."
-
-echo '### :boom: Test failures summary' >> $GITHUB_STEP_SUMMARY
-
-if [[ "$failures" != "" ]]; then
-  echo '' >> $GITHUB_STEP_SUMMARY
-  echo 'These tests reported failure:' >> $GITHUB_STEP_SUMMARY
-  for test in $failures; do
-    anchor="$(echo "$test" | tr [A-Z/] [a-z_])"
-    echo "* [$test](#user-content-$anchor)"
-  done >> $GITHUB_STEP_SUMMARY
-fi
-
-if [[ "$errors" != "" ]]; then
-  echo '' >> $GITHUB_STEP_SUMMARY
-  echo 'These tests reported errors:'  >> $GITHUB_STEP_SUMMARY
-  for test in $errors; do
-    anchor="$(echo "$test" | tr [A-Z/] [a-z_])"
-    echo "* [$test](#user-content-$anchor)"
-  done >> $GITHUB_STEP_SUMMARY
-fi

.github/workflows/build-cross-compile.yml

@@ -1,154 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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 (cross-compile)'
-
-on:
-  workflow_call:
-    inputs:
-      gcc-major-version:
-        required: false
-        type: string
-        default: '10'
-      apt-gcc-version:
-        required: false
-        type: string
-        default: '10.3.0-1ubuntu1~20.04'
-      apt-gcc-cross-suffix:
-        required: false
-        type: string
-        default: 'cross1'
-
-jobs:
-  build-cross-compile:
-    name: build
-    runs-on: ubuntu-20.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        target-cpu:
-          - aarch64
-          - arm
-          - s390x
-          - ppc64le
-        include:
-          - target-cpu: aarch64
-            debian-arch: arm64
-            gnu-arch: aarch64
-          - target-cpu: arm
-            debian-arch: armhf
-            gnu-arch: arm
-            gnu-abi: eabihf
-          - target-cpu: s390x
-            debian-arch: s390x
-            gnu-arch: s390x
-          - target-cpu: ppc64le
-            debian-arch: ppc64el
-            gnu-arch: powerpc64le
-
-    steps:
-      - name: 'Checkout the JDK source'
-        uses: actions/checkout@v3
-
-      - name: 'Get the BootJDK'
-        id: bootjdk
-        uses: ./.github/actions/get-bootjdk
-        with:
-          platform: linux-x64
-
-        # Use linux-x64 JDK bundle as build JDK
-      - name: 'Get build JDK'
-        id: buildjdk
-        uses: ./.github/actions/get-bundles
-        with:
-          platform: linux-x64
-
-        # Upgrading apt to solve libc6 installation bugs, see JDK-8260460.
-      - name: 'Install toolchain and dependencies'
-        run: |
-          # Install dependencies using apt-get
-          sudo apt-get update
-          sudo apt-get install --only-upgrade apt
-          sudo apt-get install \
-              gcc-${{ inputs.gcc-major-version }}=${{ inputs.apt-gcc-version }} \
-              g++-${{ inputs.gcc-major-version }}=${{ inputs.apt-gcc-version }} \
-              gcc-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=${{ inputs.apt-gcc-version }}${{ inputs.apt-gcc-cross-suffix }} \
-              g++-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=${{ inputs.apt-gcc-version }}${{ inputs.apt-gcc-cross-suffix }} \
-              libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
-
-      - name: 'Check cache for sysroot'
-        id: get-cached-sysroot
-        uses: actions/cache@v3
-        with:
-          path: sysroot
-          key: sysroot-${{ matrix.debian-arch }}-${{ hashFiles('./.github/workflows/build-cross-compile.yml') }}
-
-      - name: 'Install sysroot dependencies'
-        run: sudo apt-get install debootstrap qemu-user-static
-        if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
-
-      - name: 'Create sysroot'
-        run: >
-          sudo qemu-debootstrap
-          --arch=${{ matrix.debian-arch }}
-          --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
-          --resolve-deps
-          buster
-          sysroot
-          https://httpredir.debian.org/debian/
-        if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
-
-      - name: 'Prepare sysroot'
-        run: |
-          # Prepare sysroot and remove unused files to minimize cache
-          sudo chroot sysroot symlinks -cr .
-          sudo chown ${USER} -R sysroot
-          rm -rf sysroot/{dev,proc,run,sys}
-        if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
-
-      - name: 'Configure'
-        run: >
-          bash configure
-          --with-conf-name=linux-${{ matrix.target-cpu }}
-          --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
-          --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
-          --with-zlib=system
-          --enable-debug
-          --disable-precompiled-headers
-          --openjdk-target=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}
-          --with-sysroot=sysroot
-          --with-build-jdk=${{ steps.buildjdk.outputs.jdk-path }}
-          CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-10
-          CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-10
-
-      - name: 'Build'
-        id: build
-        uses: ./.github/actions/do-build
-        with:
-          make-target: 'hotspot'
-          platform: linux-${{ matrix.target-cpu }}

.github/workflows/build-linux.yml

@@ -1,132 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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 (linux)'
-
-on:
-  workflow_call:
-    inputs:
-      platform:
-        required: true
-        type: string
-      extra-conf-options:
-        required: false
-        type: string
-      make-target:
-        required: false
-        type: string
-        default: 'product-bundles test-bundles'
-      debug-levels:
-        required: false
-        type: string
-        default: '[ "debug", "release" ]'
-      apt-gcc-version:
-        required: true
-        type: string
-      apt-architecture:
-        required: false
-        type: string
-      apt-extra-packages:
-        required: false
-        type: string
-
-jobs:
-  build-linux:
-    name: build
-    runs-on: ubuntu-20.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug
-
-    steps:
-      - name: 'Checkout the JDK source'
-        uses: actions/checkout@v3
-
-      - name: 'Get the BootJDK'
-        id: bootjdk
-        uses: ./.github/actions/get-bootjdk
-        with:
-          platform: linux-x64
-
-      - name: 'Get JTReg'
-        id: jtreg
-        uses: ./.github/actions/get-jtreg
-
-      - name: 'Get GTest'
-        id: gtest
-        uses: ./.github/actions/get-gtest
-
-      - name: 'Set architecture'
-        id: arch
-        run: |
-          # Set a proper suffix for packages if using a different architecture
-          if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
-            echo '::set-output name=suffix:::${{ inputs.apt-architecture }}'
-          fi
-
-      # Upgrading apt to solve libc6 installation bugs, see JDK-8260460.
-      - name: 'Install toolchain and dependencies'
-        run: |
-          # Install dependencies using apt-get
-          if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
-            sudo dpkg --add-architecture ${{ inputs.apt-architecture }}
-          fi
-          sudo apt-get update
-          sudo apt-get install --only-upgrade apt
-          sudo apt-get install gcc-${{ inputs.apt-gcc-version }} g++-${{ inputs.apt-gcc-version }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
-
-      - name: 'Configure'
-        run: >
-          bash configure
-          --with-conf-name=${{ inputs.platform }}
-          ${{ matrix.flags }}
-          --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
-          --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
-          --with-jtreg=${{ steps.jtreg.outputs.path }}
-          --with-gtest=${{ steps.gtest.outputs.path }}
-          --enable-jtreg-failure-handler
-          --with-zlib=system
-          ${{ inputs.extra-conf-options }}
-
-      - name: 'Build'
-        id: build
-        uses: ./.github/actions/do-build
-        with:
-          make-target: '${{ inputs.make-target }}'
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
-
-      - name: 'Upload bundles'
-        uses: ./.github/actions/upload-bundles
-        with:
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'

.github/workflows/build-macos.yml

@@ -1,114 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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 (macos)'
-
-on:
-  workflow_call:
-    inputs:
-      platform:
-        required: true
-        type: string
-      extra-conf-options:
-        required: false
-        type: string
-      make-target:
-        required: false
-        type: string
-        default: 'product-bundles test-bundles'
-      debug-levels:
-        required: false
-        type: string
-        default: '[ "debug", "release" ]'
-      xcode-toolset-version:
-        required: true
-        type: string
-
-jobs:
-  build-macos:
-    name: build
-    runs-on: macos-11
-
-    strategy:
-      fail-fast: false
-      matrix:
-        debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug
-
-    steps:
-      - name: 'Checkout the JDK source'
-        uses: actions/checkout@v3
-
-      - name: 'Get the BootJDK'
-        id: bootjdk
-        uses: ./.github/actions/get-bootjdk
-        with:
-          platform: macos-x64
-
-      - name: 'Get JTReg'
-        id: jtreg
-        uses: ./.github/actions/get-jtreg
-
-      - name: 'Get GTest'
-        id: gtest
-        uses: ./.github/actions/get-gtest
-
-      - name: 'Install toolchain and dependencies'
-        run: |
-          # Run Homebrew installation and xcode-select
-          brew install make
-          sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
-          # This will make GNU make available as 'make' and not only as 'gmake'
-          echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
-
-      - name: 'Configure'
-        run: >
-          bash configure
-          --with-conf-name=${{ inputs.platform }}
-          ${{ matrix.flags }}
-          --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
-          --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
-          --with-jtreg=${{ steps.jtreg.outputs.path }}
-          --with-gtest=${{ steps.gtest.outputs.path }}
-          --enable-jtreg-failure-handler
-          --with-zlib=system
-          ${{ inputs.extra-conf-options }}
-
-      - name: 'Build'
-        id: build
-        uses: ./.github/actions/do-build
-        with:
-          make-target: '${{ inputs.make-target }}'
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
-
-      - name: 'Upload bundles'
-        uses: ./.github/actions/upload-bundles
-        with:
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'

.github/workflows/build-windows.yml

@@ -1,131 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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 (windows)'
-
-on:
-  workflow_call:
-    inputs:
-      platform:
-        required: true
-        type: string
-      extra-conf-options:
-        required: false
-        type: string
-      make-target:
-        required: false
-        type: string
-        default: 'product-bundles test-bundles'
-      debug-levels:
-        required: false
-        type: string
-        default: '[ "debug", "release" ]'
-      msvc-toolset-version:
-        required: true
-        type: string
-      msvc-toolset-architecture:
-        required: true
-        type: string
-
-env:
-  # These are needed to make the MSYS2 bash work properly
-  MSYS2_PATH_TYPE: minimal
-  CHERE_INVOKING: 1
-
-jobs:
-  build-windows:
-    name: build
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: bash
-
-    strategy:
-      fail-fast: false
-      matrix:
-        debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug
-
-    steps:
-      - name: 'Checkout the JDK source'
-        uses: actions/checkout@v3
-
-      - name: 'Get MSYS2'
-        uses: ./.github/actions/get-msys2
-
-      - name: 'Get the BootJDK'
-        id: bootjdk
-        uses: ./.github/actions/get-bootjdk
-        with:
-          platform: windows-x64
-
-      - name: 'Get JTReg'
-        id: jtreg
-        uses: ./.github/actions/get-jtreg
-
-      - name: 'Get GTest'
-        id: gtest
-        uses: ./.github/actions/get-gtest
-
-      - name: 'Install toolchain and dependencies'
-        run: |
-          # Run Visual Studio Installer
-          '/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
-            modify --quiet --installPath 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise' \
-            --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
-
-      - name: 'Configure'
-        run: >
-          bash configure
-          --with-conf-name=${{ inputs.platform }}
-          ${{ matrix.flags }}
-          --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
-          --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
-          --with-jtreg=${{ steps.jtreg.outputs.path }}
-          --with-gtest=${{ steps.gtest.outputs.path }}
-          --enable-jtreg-failure-handler
-          --with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
-          ${{ inputs.extra-conf-options }}
-        env:
-          # We need a minimal PATH on Windows
-          # Set PATH to "", so just GITHUB_PATH is included
-          PATH: ''
-
-      - name: 'Build'
-        id: build
-        uses: ./.github/actions/do-build
-        with:
-          make-target: '${{ inputs.make-target }}'
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
-
-      - name: 'Upload bundles'
-        uses: ./.github/actions/upload-bundles
-        with:
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'

.github/workflows/main.yml

@@ -1,331 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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: 'OpenJDK GHA Sanity Checks'
-
-on:
-  push:
-    branches-ignore:
-      - master
-      - pr/*
-  workflow_dispatch:
-    inputs:
-      platforms:
-        description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
-        required: true
-        default: 'linux-x64, linux-x86, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-
-  ###
-  ### Determine platforms to include
-  ###
-
-  select:
-    name: 'Select platforms'
-    runs-on: ubuntu-20.04
-    outputs:
-      linux-x64: ${{ steps.include.outputs.linux-x64 }}
-      linux-x86: ${{ steps.include.outputs.linux-x86 }}
-      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 }}
-      windows-x64: ${{ steps.include.outputs.windows-x64 }}
-      windows-aarch64: ${{ steps.include.outputs.windows-aarch64 }}
-
-    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 [[ '${{ !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
-              echo 'false'
-              return
-            fi
-
-            if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
-              input='${{ github.event.inputs.platforms }}'
-            elif [[ $GITHUB_EVENT_NAME == push ]]; then
-              input='${{ secrets.JDK_SUBMIT_PLATFORMS }}'
-            else
-              echo 'Internal error in GHA'
-              exit 1
-            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 "::set-output name=linux-x64::$(check_platform linux-x64 linux x64)"
-          echo "::set-output name=linux-x86::$(check_platform linux-x86 linux x86)"
-          echo "::set-output name=linux-x64-variants::$(check_platform linux-x64-variants variants)"
-          echo "::set-output name=linux-cross-compile::$(check_platform linux-cross-compile cross-compile)"
-          echo "::set-output name=macos-x64::$(check_platform macos-x64 macos x64)"
-          echo "::set-output name=macos-aarch64::$(check_platform macos-aarch64 macos aarch64)"
-          echo "::set-output name=windows-x64::$(check_platform windows-x64 windows x64)"
-          echo "::set-output name=windows-aarch64::$(check_platform windows-aarch64 windows aarch64)"
-
-  ###
-  ### Build jobs
-  ###
-
-  build-linux-x64:
-    name: linux-x64
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
-    # 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
-      apt-gcc-version: '10-multilib'
-      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'
-      extra-conf-options: '--with-target-bits=32'
-    if: needs.select.outputs.linux-x86 == 'true'
-
-  build-linux-x64-hs-nopch:
-    name: linux-x64-hs-nopch
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'hotspot'
-      debug-levels: '[ "debug" ]'
-      apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
-      extra-conf-options: '--disable-precompiled-headers'
-    if: needs.select.outputs.linux-x64-variants == 'true'
-
-  build-linux-x64-hs-zero:
-    name: linux-x64-hs-zero
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'hotspot'
-      debug-levels: '[ "debug" ]'
-      apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
-      extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
-    if: needs.select.outputs.linux-x64-variants == 'true'
-
-  build-linux-x64-hs-minimal:
-    name: linux-x64-hs-minimal
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'hotspot'
-      debug-levels: '[ "debug" ]'
-      apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
-      extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
-    if: needs.select.outputs.linux-x64-variants == 'true'
-
-  build-linux-x64-hs-optimized:
-    name: linux-x64-hs-optimized
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'hotspot'
-      # Technically this is not the "debug" level, but we can't inject a new matrix state for just this job
-      debug-levels: '[ "debug" ]'
-      apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
-      extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
-    if: needs.select.outputs.linux-x64-variants == 'true'
-
-  build-linux-cross-compile:
-    name: linux-cross-compile
-    needs:
-      - select
-      - build-linux-x64
-    uses: ./.github/workflows/build-cross-compile.yml
-    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: '11.7'
-    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.4'
-      extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
-    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.25'
-      msvc-toolset-architecture: 'x86.x64'
-    if: needs.select.outputs.windows-x64 == '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'
-    if: needs.select.outputs.windows-aarch64 == 'true'
-
-  ###
-  ### Test jobs
-  ###
-
-  test-linux-x64:
-    name: linux-x64
-    needs:
-      - build-linux-x64
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: linux-x64
-      bootjdk-platform: linux-x64
-      runs-on: ubuntu-20.04
-
-  test-linux-x86:
-    name: linux-x86
-    needs:
-      - build-linux-x86
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: linux-x86
-      bootjdk-platform: linux-x64
-      runs-on: ubuntu-20.04
-
-  test-macos-x64:
-    name: macos-x64
-    needs:
-      - build-macos-x64
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: macos-x64
-      bootjdk-platform: macos-x64
-      runs-on: macos-11
-
-  test-windows-x64:
-    name: windows-x64
-    needs:
-      - build-windows-x64
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: windows-x64
-      bootjdk-platform: windows-x64
-      runs-on: windows-2019
-
-  # Remove bundles so they are not misconstrued as binary distributions from the JDK project
-  remove-bundles:
-    name: 'Remove bundle artifacts'
-    runs-on: ubuntu-20.04
-    if: always()
-    needs:
-      - build-linux-x64
-      - build-linux-x86
-      - build-linux-x64-hs-nopch
-      - build-linux-x64-hs-zero
-      - build-linux-x64-hs-minimal
-      - build-linux-x64-hs-optimized
-      - build-linux-cross-compile
-      - build-macos-x64
-      - build-macos-aarch64
-      - build-windows-x64
-      - build-windows-aarch64
-      - test-linux-x64
-      - test-linux-x86
-      - test-macos-x64
-      - test-windows-x64
-
-    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

@@ -1,205 +0,0 @@
-#
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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: 'Run tests'
-
-on:
-  workflow_call:
-    inputs:
-      platform:
-        required: true
-        type: string
-      bootjdk-platform:
-        required: true
-        type: string
-      runs-on:
-        required: true
-        type: string
-
-env:
-  # These are needed to make the MSYS2 bash work properly
-  MSYS2_PATH_TYPE: minimal
-  CHERE_INVOKING: 1
-
-jobs:
-  test:
-    name: test
-    runs-on: ${{ inputs.runs-on }}
-    defaults:
-      run:
-        shell: bash
-
-    strategy:
-      fail-fast: false
-      matrix:
-        test-name:
-          - 'jdk/tier1 part 1'
-          - 'jdk/tier1 part 2'
-          - 'jdk/tier1 part 3'
-          - 'langtools/tier1'
-          - 'hs/tier1 common'
-          - 'hs/tier1 compiler'
-          - 'hs/tier1 gc'
-          - 'hs/tier1 runtime'
-          - 'hs/tier1 serviceability'
-
-        include:
-          - test-name: 'jdk/tier1 part 1'
-            test-suite: 'test/jdk/:tier1_part1'
-
-          - test-name: 'jdk/tier1 part 2'
-            test-suite: 'test/jdk/:tier1_part2'
-
-          - test-name: 'jdk/tier1 part 3'
-            test-suite: 'test/jdk/:tier1_part3'
-
-          - test-name: 'langtools/tier1'
-            test-suite: 'test/langtools/:tier1'
-
-          - test-name: 'hs/tier1 common'
-            test-suite: 'test/hotspot/jtreg/:tier1_common'
-            debug-suffix: -debug
-
-          - test-name: 'hs/tier1 compiler'
-            test-suite: 'test/hotspot/jtreg/:tier1_compiler'
-            debug-suffix: -debug
-
-          - test-name: 'hs/tier1 gc'
-            test-suite: 'test/hotspot/jtreg/:tier1_gc'
-            debug-suffix: -debug
-
-          - test-name: 'hs/tier1 runtime'
-            test-suite: 'test/hotspot/jtreg/:tier1_runtime'
-            debug-suffix: -debug
-
-          - test-name: 'hs/tier1 serviceability'
-            test-suite: 'test/hotspot/jtreg/:tier1_serviceability'
-            debug-suffix: -debug
-
-    steps:
-      - name: 'Checkout the JDK source'
-        uses: actions/checkout@v3
-
-      - name: 'Get MSYS2'
-        uses: ./.github/actions/get-msys2
-        if: runner.os == 'Windows'
-
-      - name: 'Get the BootJDK'
-        id: bootjdk
-        uses: ./.github/actions/get-bootjdk
-        with:
-          platform: ${{ inputs.bootjdk-platform }}
-
-      - name: 'Get JTReg'
-        id: jtreg
-        uses: ./.github/actions/get-jtreg
-
-      - name: 'Get bundles'
-        id: bundles
-        uses: ./.github/actions/get-bundles
-        with:
-          platform: ${{ inputs.platform }}
-          debug-suffix: ${{ matrix.debug-suffix }}
-
-      - name: 'Install dependencies'
-        run: |
-          # On macOS we need to install some dependencies for testing
-          brew install make
-          sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer
-          # This will make GNU make available as 'make' and not only as 'gmake'
-          echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
-        if: runner.os == 'macOS'
-
-      - name: 'Set PATH'
-        id: path
-        run: |
-          # We need a minimal PATH on Windows
-          # Set PATH to "", so just GITHUB_PATH is included
-          if [[ '${{ runner.os }}' == 'Windows' ]]; then
-            echo "::set-output name=value::"
-          else
-            echo "::set-output name=value::$PATH"
-          fi
-
-      - name: 'Run tests'
-        id: run-tests
-        run: >
-          make test-prebuilt
-          TEST='${{ matrix.test-suite }}'
-          BOOT_JDK=${{ steps.bootjdk.outputs.path }}
-          JT_HOME=${{ steps.jtreg.outputs.path }}
-          JDK_IMAGE_DIR=${{ steps.bundles.outputs.jdk-path }}
-          SYMBOLS_IMAGE_DIR=${{ steps.bundles.outputs.symbols-path }}
-          TEST_IMAGE_DIR=${{ steps.bundles.outputs.tests-path }}
-          JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
-          && bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY"
-        env:
-          PATH: ${{ steps.path.outputs.value }}
-
-        # This is a separate step, since if the markdown from a step gets bigger than
-        # 1024 kB it is skipped, but then the short summary above is still generated
-      - name: 'Generate test report'
-        run: bash ./.github/scripts/gen-test-results.sh "$GITHUB_STEP_SUMMARY"
-        if: always()
-
-      - name: 'Package test results'
-        id: package
-        run: |
-          # Package test-results and relevant parts of test-support
-          mkdir results
-
-          if [[ -d build/run-test-prebuilt/test-results ]]; then
-            cd build/run-test-prebuilt/test-results/
-            zip -r -9 "$GITHUB_WORKSPACE/results/test-results.zip" .
-            cd $GITHUB_WORKSPACE
-          else
-            echo '::warning ::Missing test-results directory'
-          fi
-
-          if [[ -d build/run-test-prebuilt/test-support ]]; then
-            cd build/run-test-prebuilt/test-support/
-            zip -r -9 "$GITHUB_WORKSPACE/results/test-support.zip" . -i *.jtr -i */hs_err*.log -i */replay*.log
-            cd $GITHUB_WORKSPACE
-          else
-            echo '::warning ::Missing test-support directory'
-          fi
-
-          artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }} | tr '/ ' '__')"
-          echo "::set-output name=artifact-name::$artifact_name"
-        if: always()
-
-      - name: 'Upload test results'
-        uses: actions/upload-artifact@v3
-        with:
-          path: results
-          name: ${{ steps.package.outputs.artifact-name }}
-        if: always()
-
-        # This is the best way I found to abort the job with an error message
-      - name: 'Notify about test failures'
-        uses: actions/github-script@v6
-        with:
-          script: core.setFailed('${{ steps.run-tests.outputs.error-message }}')
-        if: steps.run-tests.outputs.failure == 'true'

.gitignore

@@ -18,5 +18,3 @@ NashornProfile.txt
 /src/utils/LogCompilation/target/
 /.project/
 /.settings/
-*.class
-.idea/workspace.xml

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
-project=jdk-updates
+project=jdk
 jbs=JDK
-version=17.0.5
+version=19
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

README.md

@@ -1,179 +1,64 @@
-[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
+# Welcome to the JDK!
 
-# Welcome to JetBrains Runtime!
+## Wakefield
+This is a temporary section created to host information on the
+[Wakefield](https://wiki.openjdk.java.net/display/wakefield) project.
 
-JetBrains Runtime is a fork of [OpenJDK](https://github.com/openjdk/jdk) available for Windows, Mac OS X, and Linux.
-It includes a number enhancements in font rendering, HiDPI support, ligatures, performance improvements, and bugfixes.
-
-## Releases
-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).
-
-| IDE Version | Latest JBR | Date Released |
-|  ---        | ---        | ---           |
-| IDE Version | Latest JBR                                                                                   | Date Released |
-|-------------|----------------------------------------------------------------------------------------------|---------------|
-| 2022.3      | [17.0.5-b653.12](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.5b653.12)| 10-Nov-2022   |
-| 2022.2      | [17.0.5-b469.67](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.5b469.67)| 31-Oct-2022   |
-
-
-## Contents
-- [Welcome to JetBrains Runtime](#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)
-
-## 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.
-* [WebStorm](https://www.jetbrains.com/webstorm/). The JavaScript IDE from JetBrains.
-* [YourKit](https://www.yourkit.com/). Java and .NET profilers.
-
-## Getting Sources
-### macOS, Linux
+### Building
+There are two addition `configure` arguments:
 ```
-git config --global core.autocrlf input
-git clone git@github.com:JetBrains/JetBrainsRuntime.git
+  --with-wayland          specify prefix directory for the wayland package
+                          (expecting the headers under PATH/include)
+  --with-wayland-include  specify directory for the wayland include files
+```
+As usual, there should be no need to specify those explicitly unless you're doing
+something tricky.
+However, a variant of `libwayland-dev` needs to be installed on the build system.
+
+### Running
+Make sure your system is configured such that `libwayland` can find the socket to connect to;
+usually this means that the environment variable `WAYLAND_DISPLAY` is set to something
+sensible. Then add this argument to `java`
+```
+-Dawt.toolkit.name=WLToolkit
 ```
 
-### Windows
-<a name="sources-windows"></a>
+### Testing
+Testing that involves `Robot` is done inside a [Weston](https://gitlab.freedesktop.org/wayland/weston/)
+instance with a special module loaded called `libwakefield`
+that provides the necessary functionality. The Wayland-specific tests are therefore executed with a dedicated test driver
+`test/jdk/java/awt/wakefield/WakefieldTestDriver.java`. The driver also provides an easy
+way to run the test in several configurations with a different size and even number
+of "outputs" (monitors).
+
+To run the Wayland-specific tests, perform these steps:
+* Install Weston version 9 (earlier versions are known NOT to work).
+* Obtain `libwakefield.so` either by building from source (available under
+`src/java.desktop/share/native/libwakefield` and not integrated into the rest of the
+build infrastructure; see `README.md` there)
+or by fetching the latest pre-built `x64` binary
 ```
-git config --global core.autocrlf false
-git clone git@github.com:JetBrains/JetBrainsRuntime.git
+wget https://github.com/mkartashev/wakefield/raw/main/libwakefield.so
+```
+* Set `LIBWAKEFIELD` environment variable to the full path to `libwakefield.so`
+```
+export LIBWAKEFIELD=/tmp/wakefield-testing/libwakefield.so
+```
+* Run `jtreg` like so
+```
+jtreg -e:XDG_RUNTIME_DIR -e:LIBWAKEFIELD -testjdk:... test/jdk/java/awt/wakefield/
 ```
 
-## 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.
+This was verified to work in `Ubuntu 21.10`.
+This does NOT work in `Ubuntu 21.04` or `Fedora 34`.
 
-> **_TIP:_**  To get a preliminary report of what's missing, run `./configure` and check its output. 
-> It would usually have a meaningful advice on how to solve the problem.
+## Generic Info (not Wakefield-specific)
+For build instructions please see the
+[online documentation](https://openjdk.java.net/groups/build/doc/building.html),
+or either of these files:
 
-### 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
-# git checkout master17
-# sh ./configure
-# make images CONF=linux-x86_64-normal-server-release
-```
+- [doc/building.html](doc/building.html) (html version)
+- [doc/building.md](doc/building.md) (markdown version)
 
-### 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 \
-       java-16-amazon-corretto-jdk
-```
-Then run the following:
-```
-$ cd JetBrainsRuntime
-$ git checkout master17
-$ 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 16 (for instance, from [AdoptOpenJDK](https://adoptopenjdk.net/installation.html?variant=openjdk16&jvmVariant=hotspot#)).
-  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 master17
-$ 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](getDpiInfo).
-* Java 16 (for instance, from [AdoptOpenJDK](https://adoptopenjdk.net/installation.html?variant=openjdk16&jvmVariant=hotspot#)).
-
-From the command line:
-```
-$ cd JetBrainsRuntime
-$ git checkout master17
-$ 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/).
+See <https://openjdk.java.net/> for more information about
+the OpenJDK Community and the JDK.

bin/idea.sh

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

doc/building.html

@@ -279,7 +279,7 @@
 </tr>
 <tr class="odd">
 <td style="text-align: left;">Windows</td>
-<td style="text-align: left;">Microsoft Visual Studio 2022 update 17.1.0</td>
+<td style="text-align: left;">Microsoft Visual Studio 2019 update 16.7.2</td>
 </tr>
 </tbody>
 </table>
@@ -298,7 +298,7 @@
 <p>It is advisable to keep an older version of Xcode for building the JDK when updating Xcode. This <a href="http://iosdevelopertips.com/xcode/install-multiple-versions-of-xcode.html">blog page</a> has good suggestions on managing multiple Xcode versions. To use a specific version of Xcode, use <code>xcode-select -s</code> before running <code>configure</code>, or use <code>--with-toolchain-path</code> to point to the version of Xcode to use, e.g. <code>configure --with-toolchain-path=/Applications/Xcode8.app/Contents/Developer/usr/bin</code></p>
 <p>If you have recently (inadvertently) updated your OS and/or Xcode version, and the JDK can no longer be built, please see the section on <a href="#problems-with-the-build-environment">Problems with the Build Environment</a>, and <a href="#getting-help">Getting Help</a> to find out if there are any recent, non-merged patches available for this update.</p>
 <h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
-<p>For aarch64 machines running Windows the minimum accepted version is Visual Studio 2019 (16.8 or higher). For all other platforms the minimum accepted version of Visual Studio is 2017. Older versions will not be accepted by <code>configure</code> and will not work. For all platforms the maximum accepted version of Visual Studio is 2019.</p>
+<p>For aarch64 machines running Windows the minimum accepted version is Visual Studio 2019 (16.8 or higher). For all other platforms the minimum accepted version of Visual Studio is 2017. Older versions will not be accepted by <code>configure</code> and will not work. For all platforms the maximum accepted version of Visual Studio is 2022.</p>
 <p>If you have multiple versions of Visual Studio installed, <code>configure</code> will by default pick the latest. You can request a specific version to be used by setting <code>--with-toolchain-version</code>, e.g. <code>--with-toolchain-version=2017</code>.</p>
 <p>If you have Visual Studio installed but <code>configure</code> fails to detect it, it may be because of <a href="#spaces-in-path">spaces in path</a>.</p>
 <h3 id="ibm-xl-cc">IBM XL C/C++</h3>
@@ -489,7 +489,7 @@
 <li><code>CONF</code> and <code>CONF_NAME</code> - Selecting the configuration(s) to use. See <a href="#using-multiple-configurations">Using Multiple Configurations</a></li>
 </ul>
 <h4 id="test-make-control-variables">Test Make Control Variables</h4>
-<p>These make control variables only make sense when running tests. Please see <a href="testing.html">Testing the JDK</a> for details.</p>
+<p>These make control variables only make sense when running tests. Please see <strong>Testing the JDK</strong> (<a href="testing.html">html</a>, <a href="testing.md">markdown</a>) for details.</p>
 <ul>
 <li><code>TEST</code></li>
 <li><code>TEST_JOBS</code></li>
@@ -515,7 +515,7 @@
 </ul>
 <p>To execute the most basic tests (tier 1), use:</p>
 <pre><code>make run-test-tier1</code></pre>
-<p>For more details on how to run tests, please see the <a href="testing.html">Testing the JDK</a> document.</p>
+<p>For more details on how to run tests, please see <strong>Testing the JDK</strong> (<a href="testing.html">html</a>, <a href="testing.md">markdown</a>).</p>
 <h2 id="cross-compiling">Cross-compiling</h2>
 <p>Cross-compiling means using one platform (the <em>build</em> platform) to generate output that can ran on another platform (the <em>target</em> platform).</p>
 <p>The typical reason for cross-compiling is that the build is performed on a more powerful desktop computer, but the resulting binaries will be able to run on a different, typically low-performing system. Most of the complications that arise when building for embedded is due to this separation of <em>build</em> and <em>target</em> systems.</p>

doc/building.md

@@ -323,7 +323,7 @@ issues.
  ------------------ -------------------------------------------------------
  Linux              gcc 10.2.0
  macOS              Apple Xcode 10.1 (using clang 10.0.0)
- Windows            Microsoft Visual Studio 2022 update 17.1.0
+ Windows            Microsoft Visual Studio 2019 update 16.7.2
 
 All compilers are expected to be able to compile to the C99 language standard,
 as some C99 features are used in the source code. Microsoft Visual Studio
@@ -374,9 +374,10 @@ available for this update.
 
 ### Microsoft Visual Studio
 
-The minimum accepted version of Visual Studio is 2017. Older versions will not
-be accepted by `configure` and will not work. The maximum accepted
-version of Visual Studio is 2019.
+For aarch64 machines running Windows the minimum accepted version is Visual Studio 2019 
+(16.8 or higher). For all other platforms the minimum accepted version of 
+Visual Studio is 2017. Older versions will not be accepted by `configure` and will 
+not work. For all platforms the maximum accepted version of Visual Studio is 2022.
 
 If you have multiple versions of Visual Studio installed, `configure` will by
 default pick the latest. You can request a specific version to be used by
@@ -818,7 +819,7 @@ configuration, as opposed to the "configure time" configuration.
 #### Test Make Control Variables
 
 These make control variables only make sense when running tests. Please see
-[Testing the JDK](testing.html) for details.
+**Testing the JDK** ([html](testing.html), [markdown](testing.md)) for details.
 
   * `TEST`
   * `TEST_JOBS`
@@ -865,8 +866,8 @@ To execute the most basic tests (tier 1), use:
 make run-test-tier1
 ```
 
-For more details on how to run tests, please see the [Testing
-the JDK](testing.html) document.
+For more details on how to run tests, please see **Testing the JDK**
+([html](testing.html), [markdown](testing.md)).
 
 ## Cross-compiling
 

doc/hotspot-style.html

@@ -50,6 +50,7 @@
 <li><a href="#nullptr">nullptr</a></li>
 <li><a href="#atomic">&lt;atomic&gt;</a></li>
 <li><a href="#uniform-initialization">Uniform Initialization</a></li>
+<li><a href="#local-function-objects">Local Function Objects</a></li>
 <li><a href="#additional-permitted-features">Additional Permitted Features</a></li>
 <li><a href="#excluded-features">Excluded Features</a></li>
 <li><a href="#undecided-features">Undecided Features</a></li>
@@ -194,7 +195,7 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <p>Similar discussions for some other projects:</p>
 <ul>
 <li><p><a href="https://google.github.io/styleguide/cppguide.html">Google C++ Style Guide</a> — Currently (2020) targeting C++17.</p></li>
-<li><p><a href="https://chromium-cpp.appspot.com">C++11 and C++14 use in Chromium</a> — Categorizes features as allowed, banned, or to be discussed.</p></li>
+<li><p><a href="https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++-features.md">C++11 and C++14 use in Chromium</a> — Categorizes features as allowed, banned, or to be discussed.</p></li>
 <li><p><a href="https://llvm.org/docs/CodingStandards.html">llvm Coding Standards</a> — Currently (2020) targeting C++14.</p></li>
 <li><p><a href="https://firefox-source-docs.mozilla.org/code-quality/coding-style/using_cxx_in_firefox_code.html">Using C++ in Mozilla code</a> — C++17 support is required for recent versions (2020).</p></li>
 </ul>
@@ -254,8 +255,7 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <li><p>Function argument deduction. This is always permitted, and indeed encouraged. It is nearly always better to allow the type of a function template argument to be deduced rather than explicitly specified.</p></li>
 <li><p><code>auto</code> variable declarations (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1984.pdf">n1984</a>)<br> For local variables, this can be used to make the code clearer by eliminating type information that is obvious or irrelevant. Excessive use can make code much harder to understand.</p></li>
 <li><p>Function return type deduction (<a href="https://isocpp.org/files/papers/N3638.html">n3638</a>)<br> Only use if the function body has a very small number of <code>return</code> statements, and generally relatively little other code.</p></li>
-<li><p>Generic lambdas. Lambdas are not (yet) permitted.</p></li>
-<li><p>Lambda init captures. Lambdas are not (yet) permitted.</p></li>
+<li><p>Also see <a href="#lambdaexpressions">lambda expressions</a>.</p></li>
 </ul>
 <h3 id="expression-sfinae">Expression SFINAE</h3>
 <p><a href="https://en.cppreference.com/w/cpp/language/sfinae" title="Substitution Failure Is Not An Error">Substitution Failure Is Not An Error</a> (SFINAE) is a template metaprogramming technique that makes use of template parameter substitution failures to make compile-time decisions.</p>
@@ -288,6 +288,121 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <li><a href="https://en.cppreference.com/w/cpp/language/aggregate_initialization">aggregate initialization</a></li>
 </ul>
 <p>Although related, the use of <code>std::initializer_list</code> remains forbidden, as part of the avoidance of the C++ Standard Library in HotSpot code.</p>
+<h3 id="local-function-objects">Local Function Objects</h3>
+<ul>
+<li>Local function objects, including lambda expressions, may be used.</li>
+<li>Lambda expressions must only be used as a downward value.</li>
+<li>Prefer <code>[&amp;]</code> as the capture list of a lambda expression.</li>
+<li>Return type deduction for lambda expressions is permitted, and indeed encouraged.</li>
+<li>An empty parameter list for a lambda expression may be elided.</li>
+<li>A lambda expression must not be <code>mutable</code>.</li>
+<li>Generic lambda expressions are permitted.</li>
+<li>Lambda expressions should be relatively simple.</li>
+<li>Anonymous lambda expressions should not overly clutter the enclosing expression.</li>
+<li>An anonymous lambda expression must not be directly invoked.</li>
+<li>Bind expressions are forbidden.</li>
+</ul>
+<p>Single-use function objects can be defined locally within a function, directly at the point of use. This is an alternative to having a function or function object class defined at class or namespace scope.</p>
+<p>This usage was somewhat limited by C++03, which does not permit such a class to be used as a template parameter. That restriction was removed by C++11 (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm">n2657</a>). Use of this feature is permitted.</p>
+<p>Many HotSpot protocols involve &quot;function-like&quot; objects that involve some named member function rather than a call operator. For example, a function that performs some action on all threads might be written as</p>
+<pre><code>void do_something() {
+  struct DoSomething : public ThreadClosure {
+    virtual void do_thread(Thread* t) {
+      ... do something with t ...
+    }
+  } closure;
+  Threads::threads_do(&amp;closure);
+}</code></pre>
+<p>HotSpot code has historically usually placed the DoSomething class at namespace (or sometimes class) scope. This separates the function's code from its use, often to the detriment of readability. It requires giving the class a globally unique name (if at namespace scope). It also loses the information that the class is intended for use in exactly one place, and does not have any subclasses. (However, the latter can now be indicated by declaring it <code>final</code>.) Often, for simplicity, a local class will skip things like access control and accessor functions, giving the enclosing function direct access to the implementation and eliminating some boilerplate that might be provided if the class is in some outer (more accessible) scope. On the other hand, if there is a lot of surrounding code in the function body or the local class is of significant size, defining it locally can increase clutter and reduce readability.</p>
+<p><a name="lambdaexpressions"></a> C++11 added <em>lambda expressions</em> as a new way to write a function object. Simple lambda expressions can be significantly more concise than a function object, eliminating a lot of boiler-plate. On the other hand, a complex lambda expression may not provide much, if any, readability benefit compared to an ordinary function object. Also, while a lambda can encapsulate a call to a &quot;function-like&quot; object, it cannot be used in place of such.</p>
+<p>A common use for local functions is as one-use <a href="https://en.cppreference.com/w/cpp/language/raii" title="Resource Acquisition Is Initialization">RAII</a> objects. The amount of boilerplate for a function object class (local or not) makes such usage somewhat clumsy and verbose. But with the help of a small amount of supporting utility code, lambdas work particularly well for this use case.</p>
+<p>Another use for local functions is <a href="https://en.wikipedia.org/wiki/Partial_application" title="Partial Application">partial application</a>. Again here, lambdas are typically much simpler and less verbose than function object classes.</p>
+<p>Because of these benefits, lambda expressions are permitted in HotSpot code, with some restrictions and usage guidance. An anonymous lambda is one which is passed directly as an argument. A named lambda is the value of a variable, which is its name.</p>
+<p>Lambda expressions should only be passed downward. In particular, a lambda should not be returned from a function or stored in a global variable, whether directly or as the value of a member of some other object. Lambda capture is syntactically subtle (by design), and propagating a lambda in such ways can easily pass references to captured values to places where they are no longer valid. In particular, members of the enclosing <code>this</code> object are effectively captured by reference, even if the default capture is by-value. For such uses-cases a function object class should be used to make the desired value capturing and propagation explicit.</p>
+<p>Limiting the capture list to <code>[&amp;]</code> (implicitly capture by reference) is a simplifying restriction that still provides good support for HotSpot usage, while reducing the cases a reader must recognize and understand.</p>
+<ul>
+<li><p>Many common lambda uses require reference capture. Not permitting it would substantially reduce the utility of lambdas.</p></li>
+<li><p>Referential transparency. Implicit reference capture makes variable references in the lambda body have the same meaning they would have in the enclosing code. There isn't a semantic barrier across which the meaning of a variable changes.</p></li>
+<li><p>Explicit reference capture introduces significant clutter, especially when lambda expressions are relatively small and simple, as they should be in HotSpot code.</p></li>
+<li><p>There are a number of reasons why by-value capture might be used, but for the most part they don't apply to HotSpot code, given other usage restrictions.</p>
+<ul>
+<li><p>A primary use-case for by-value capture is to support escaping uses, where values captured by-reference might become invalid. That use-case doesn't apply if only downward lambdas are used.</p></li>
+<li><p>By-value capture can also make a lambda-local copy for mutation, which requires making the lambda <code>mutable</code>; see below.</p></li>
+<li><p>By-value capture might be viewed as an optimization, avoiding any overhead for reference capture of cheap to copy values. But the compiler can often eliminate any such overhead.</p></li>
+<li><p>By-value capture by a non-<code>mutable</code> lambda makes the captured values const, preventing any modification by the lambda and making the captured value unaffected by modifications to the outer variable. But this only applies to captured auto variables, not member variables, and is inconsistent with referential transparency.</p></li>
+</ul></li>
+<li><p>Non-capturing lambdas (with an empty capture list - <code>[]</code>) have limited utility. There are cases where no captures are required (pure functions, for example), but if the function is small and simple then that's obvious anyway.</p></li>
+<li><p>Capture initializers (a C++14 feature - <a href="https://isocpp.org/files/papers/N3649.html">N3649</a>) are not permitted. Capture initializers inherently increase the complexity of the capture list, and provide little benefit over an additional in-scope local variable.</p></li>
+</ul>
+<p>The use of <code>mutable</code> lambda expressions is forbidden because there don't seem to be many, if any, good use-cases for them in HotSpot. A lambda expression needs to be mutable in order to modify a by-value captured value. But with only downward lambdas, such usage seems likely to be rare and complicated. It is better to use a function object class in any such cases that arise, rather than requiring all HotSpot developers to understand this relatively obscure feature.</p>
+<p>While it is possible to directly invoke an anonymous lambda expression, that feature should not be used, as such a form can be confusing to readers. Instead, name the lambda and call it by name.</p>
+<p>Some reasons to prefer a named lambda instead of an anonymous lambda are</p>
+<ul>
+<li><p>The body contains non-trivial control flow or declarations or other nested constructs.</p></li>
+<li><p>Its role in an argument list is hard to guess without examining the function declaration. Give it a name that indicates its purpose.</p></li>
+<li><p>It has an unusual capture list.</p></li>
+<li><p>It has a complex explicit return type or parameter types.</p></li>
+</ul>
+<p>Lambda expressions, and particularly anonymous lambda expressions, should be simple and compact. One-liners are good. Anonymous lambdas should usually be limited to a couple lines of body code. More complex lambdas should be named. A named lambda should not clutter the enclosing function and make it long and complex; do continue to break up large functions via the use of separate helper functions.</p>
+<p>An anonymous lambda expression should either be a one-liner in a one-line expression, or isolated in its own set of lines. Don't place part of a lambda expression on the same line as other arguments to a function. The body of a multi-line lambda argument should be indented from the start of the capture list, as if that were the start of an ordinary function definition. The body of a multi-line named lambda should be indented one step from the variable's indentation.</p>
+<p>Some examples:</p>
+<ol type="1">
+<li><code>foo([&amp;] { ++counter; });</code></li>
+<li><code>foo(x, [&amp;] { ++counter; });</code></li>
+<li><code>foo([&amp;] { if (predicate) ++counter; });</code></li>
+<li><code>foo([&amp;] { auto tmp = process(x); tmp.f(); return tmp.g(); })</code></li>
+<li><p>Separate one-line lambda from other arguments:</p>
+<pre><code>foo(c.begin(), c.end(),
+    [&amp;] (const X&amp; x) { do_something(x); return x.value(); });</code></pre></li>
+<li><p>Indentation for multi-line lambda:</p>
+<pre><code>c.do_entries([&amp;] (const X&amp; x) {
+               do_something(x, a);
+               do_something1(x, b);
+               do_something2(x, c);
+             });</code></pre></li>
+<li><p>Separate multi-line lambda from other arguments:</p>
+<pre><code>foo(c.begin(), c.end(),
+    [&amp;] (const X&amp; x) {
+      do_something(x, a);
+      do_something1(x, b);
+      do_something2(x, c);
+    });</code></pre></li>
+<li><p>Multi-line named lambda:</p>
+<pre><code>auto do_entry = [&amp;] (const X&amp; x) {
+  do_something(x, a);
+  do_something1(x, b);
+  do_something2(x, c);
+};</code></pre></li>
+</ol>
+<p>Item 4, and especially items 6 and 7, are pushing the simplicity limits for anonymous lambdas. Item 6 might be better written using a named lambda:</p>
+<pre><code>c.do_entries(do_entry);</code></pre>
+<p>Note that C++11 also added <em>bind expressions</em> as a way to write a function object for partial application, using <code>std::bind</code> and related facilities from the Standard Library. <code>std::bind</code> generalizes and replaces some of the binders from C++03. Bind expressions are not permitted in HotSpot code. They don't provide enough benefit over lambdas or local function classes in the cases where bind expressions are applicable to warrant the introduction of yet another mechanism in this space into HotSpot code.</p>
+<p>References:</p>
+<ul>
+<li>Local and unnamed types as template parameters (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm">n2657</a>)</li>
+<li>New wording for C++0x lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2927.pdf">n2927</a>)</li>
+<li>Generalized lambda capture (init-capture) (<a href="https://isocpp.org/files/papers/N3648.html">N3648</a>)</li>
+<li>Generic (polymorphic) lambda expressions (<a href="https://isocpp.org/files/papers/N3649.html">N3649</a>)</li>
+</ul>
+<p>References from C++17</p>
+<ul>
+<li>Wording for constexpr lambda (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0170r1.pdf">p0170r1</a>)</li>
+<li>Lambda capture of *this by Value (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0018r3.html">p0018r3</a>)</li>
+</ul>
+<p>References from C++20</p>
+<ul>
+<li>Allow lambda capture [=, this] (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0409r2.html">p0409r2</a>)</li>
+<li>Familiar template syntax for generic lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0428r2.pdf">p0428r2</a>)</li>
+<li>Simplifying implicit lambda capture (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0588r1.html">p0588r1</a>)</li>
+<li>Default constructible and assignable stateless lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0624r2.pdf">p0624r2</a>)</li>
+<li>Lambdas in unevaluated contexts (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0315r4.pdf">p0315r4</a>)</li>
+<li>Allow pack expansion in lambda init-capture (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0780r2.html">p0780r2</a>) (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p2095r0.html">p2095r0</a>)</li>
+<li>Deprecate implicit capture of this via [=] (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0806r2.html">p0806r2</a>)</li>
+</ul>
+<p>References from C++23</p>
+<ul>
+<li>Make () more optional for lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p1102r2.html">p1102r2</a>)</li>
+</ul>
 <h3 id="additional-permitted-features">Additional Permitted Features</h3>
 <ul>
 <li><p><code>constexpr</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf">n2235</a>) (<a href="https://isocpp.org/files/papers/N3652.html">n3652</a>)</p></li>
@@ -305,7 +420,6 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <li><p>Dynamic initialization and destruction with concurrency (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2660.htm">n2660</a>)</p></li>
 <li><p><code>final</code> virtual specifiers for classes and virtual functions (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm">n2928</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm">n3206</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm">n3272</a>)</p></li>
 <li><p><code>override</code> virtual specifiers for virtual functions (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm">n2928</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm">n3206</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm">n3272</a>)</p></li>
-<li><p>Local and unnamed types as template parameters (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm">n2657</a>)</p></li>
 <li><p>Range-based <code>for</code> loops (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2930.html">n2930</a>) (<a href="https://en.cppreference.com/w/cpp/language/range-for">range-for</a>)</p></li>
 </ul>
 <h3 id="excluded-features">Excluded Features</h3>
@@ -337,7 +451,6 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <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>
-<li><p>Lambdas</p></li>
 </ul>
 </body>
 </html>

doc/hotspot-style.md

@@ -409,7 +409,7 @@ Similar discussions for some other projects:
 * [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html) —
 Currently (2020) targeting C++17.
 
-* [C++11 and C++14 use in Chromium](https://chromium-cpp.appspot.com) —
+* [C++11 and C++14 use in Chromium](https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++-features.md) —
 Categorizes features as allowed, banned, or to be discussed.
 
 * [llvm Coding Standards](https://llvm.org/docs/CodingStandards.html) —
@@ -596,9 +596,7 @@ use can make code much harder to understand.
 Only use if the function body has a very small number of `return`
 statements, and generally relatively little other code.
 
-* Generic lambdas.  Lambdas are not (yet) permitted.
-
-* Lambda init captures.  Lambdas are not (yet) permitted.
+* Also see [lambda expressions](#lambdaexpressions).
 
 ### Expression SFINAE
 
@@ -703,6 +701,273 @@ Some relevant sections from cppreference.com:
 Although related, the use of `std::initializer_list` remains forbidden, as
 part of the avoidance of the C++ Standard Library in HotSpot code.
 
+### Local Function Objects
+
+* Local function objects, including lambda expressions, may be used.
+* Lambda expressions must only be used as a downward value.
+* Prefer `[&]` as the capture list of a lambda expression.
+* Return type deduction for lambda expressions is permitted, and indeed encouraged.
+* An empty parameter list for a lambda expression may be elided.
+* A lambda expression must not be `mutable`.
+* Generic lambda expressions are permitted.
+* Lambda expressions should be relatively simple.
+* Anonymous lambda expressions should not overly clutter the enclosing expression.
+* An anonymous lambda expression must not be directly invoked.
+* Bind expressions are forbidden.
+
+Single-use function objects can be defined locally within a function,
+directly at the point of use.  This is an alternative to having a function
+or function object class defined at class or namespace scope.
+
+This usage was somewhat limited by C++03, which does not permit such a class
+to be used as a template parameter.  That restriction was removed by C++11
+([n2657]). Use of this feature is permitted.
+
+Many HotSpot protocols involve "function-like" objects that involve some
+named member function rather than a call operator.  For example, a function
+that performs some action on all threads might be written as
+
+```
+void do_something() {
+  struct DoSomething : public ThreadClosure {
+    virtual void do_thread(Thread* t) {
+      ... do something with t ...
+    }
+  } closure;
+  Threads::threads_do(&closure);
+}
+```
+
+HotSpot code has historically usually placed the DoSomething class at
+namespace (or sometimes class) scope.  This separates the function's code
+from its use, often to the detriment of readability.  It requires giving the
+class a globally unique name (if at namespace scope).  It also loses the
+information that the class is intended for use in exactly one place, and
+does not have any subclasses.  (However, the latter can now be indicated by
+declaring it `final`.)  Often, for simplicity, a local class will skip
+things like access control and accessor functions, giving the enclosing
+function direct access to the implementation and eliminating some
+boilerplate that might be provided if the class is in some outer (more
+accessible) scope.  On the other hand, if there is a lot of surrounding code
+in the function body or the local class is of significant size, defining it
+locally can increase clutter and reduce readability.
+
+<a name="lambdaexpressions"></a>
+C++11 added _lambda expressions_ as a new way to write a function object.
+Simple lambda expressions can be significantly more concise than a function
+object, eliminating a lot of boiler-plate.  On the other hand, a complex
+lambda expression may not provide much, if any, readability benefit compared
+to an ordinary function object.  Also, while a lambda can encapsulate a call
+to a "function-like" object, it cannot be used in place of such.
+
+A common use for local functions is as one-use [RAII] objects.  The amount
+of boilerplate for a function object class (local or not) makes such usage
+somewhat clumsy and verbose.  But with the help of a small amount of
+supporting utility code, lambdas work particularly well for this use case.
+
+Another use for local functions is [partial application][PARTIALAPP].  Again
+here, lambdas are typically much simpler and less verbose than function
+object classes.
+
+Because of these benefits, lambda expressions are permitted in HotSpot code,
+with some restrictions and usage guidance.  An anonymous lambda is one which
+is passed directly as an argument.  A named lambda is the value of a
+variable, which is its name.
+
+Lambda expressions should only be passed downward.  In particular, a lambda
+should not be returned from a function or stored in a global variable,
+whether directly or as the value of a member of some other object.  Lambda
+capture is syntactically subtle (by design), and propagating a lambda in
+such ways can easily pass references to captured values to places where they
+are no longer valid.  In particular, members of the enclosing `this` object
+are effectively captured by reference, even if the default capture is
+by-value.  For such uses-cases a function object class should be used to
+make the desired value capturing and propagation explicit.
+
+Limiting the capture list to `[&]` (implicitly capture by reference) is a
+simplifying restriction that still provides good support for HotSpot usage,
+while reducing the cases a reader must recognize and understand.
+
+* Many common lambda uses require reference capture.  Not permitting it
+would substantially reduce the utility of lambdas.
+
+* Referential transparency.  Implicit reference capture makes variable
+references in the lambda body have the same meaning they would have in the
+enclosing code.  There isn't a semantic barrier across which the meaning of
+a variable changes.
+
+* Explicit reference capture introduces significant clutter, especially when
+lambda expressions are relatively small and simple, as they should be in
+HotSpot code.
+
+* There are a number of reasons why by-value capture might be used, but for
+the most part they don't apply to HotSpot code, given other usage restrictions.
+
+    * A primary use-case for by-value capture is to support escaping uses,
+    where values captured by-reference might become invalid.  That use-case
+    doesn't apply if only downward lambdas are used.
+
+    * By-value capture can also make a lambda-local copy for mutation, which
+    requires making the lambda `mutable`; see below.
+
+    * By-value capture might be viewed as an optimization, avoiding any
+    overhead for reference capture of cheap to copy values.  But the
+    compiler can often eliminate any such overhead.
+
+    * By-value capture by a non-`mutable` lambda makes the captured values
+    const, preventing any modification by the lambda and making the captured
+    value unaffected by modifications to the outer variable.  But this only
+    applies to captured auto variables, not member variables, and is
+    inconsistent with referential transparency.
+
+* Non-capturing lambdas (with an empty capture list - `[]`) have limited
+utility.  There are cases where no captures are required (pure functions,
+for example), but if the function is small and simple then that's obvious
+anyway.
+
+* Capture initializers (a C++14 feature - [N3649]) are not permitted.
+Capture initializers inherently increase the complexity of the capture list,
+and provide little benefit over an additional in-scope local variable.
+
+The use of `mutable` lambda expressions is forbidden because there don't
+seem to be many, if any, good use-cases for them in HotSpot.  A lambda
+expression needs to be mutable in order to modify a by-value captured value.
+But with only downward lambdas, such usage seems likely to be rare and
+complicated.  It is better to use a function object class in any such cases
+that arise, rather than requiring all HotSpot developers to understand this
+relatively obscure feature.
+
+While it is possible to directly invoke an anonymous lambda expression, that
+feature should not be used, as such a form can be confusing to readers.
+Instead, name the lambda and call it by name.
+
+Some reasons to prefer a named lambda instead of an anonymous lambda are
+
+* The body contains non-trivial control flow or declarations or other nested
+constructs.
+
+* Its role in an argument list is hard to guess without examining the
+function declaration.  Give it a name that indicates its purpose.
+
+* It has an unusual capture list.
+
+* It has a complex explicit return type or parameter types.
+
+Lambda expressions, and particularly anonymous lambda expressions, should be
+simple and compact.  One-liners are good.  Anonymous lambdas should usually
+be limited to a couple lines of body code.  More complex lambdas should be
+named.  A named lambda should not clutter the enclosing function and make it
+long and complex; do continue to break up large functions via the use of
+separate helper functions.
+
+An anonymous lambda expression should either be a one-liner in a one-line
+expression, or isolated in its own set of lines.  Don't place part of a
+lambda expression on the same line as other arguments to a function.  The
+body of a multi-line lambda argument should be indented from the start of
+the capture list, as if that were the start of an ordinary function
+definition.  The body of a multi-line named lambda should be indented one
+step from the variable's indentation.
+
+Some examples:
+
+1. `foo([&] { ++counter; });`
+2. `foo(x, [&] { ++counter; });`
+3. `foo([&] { if (predicate) ++counter; });`
+4. `foo([&] { auto tmp = process(x); tmp.f(); return tmp.g(); })`
+5. Separate one-line lambda from other arguments:
+
+    ```
+    foo(c.begin(), c.end(),
+        [&] (const X& x) { do_something(x); return x.value(); });
+    ```
+6. Indentation for multi-line lambda:
+
+    ```
+    c.do_entries([&] (const X& x) {
+                   do_something(x, a);
+                   do_something1(x, b);
+                   do_something2(x, c);
+                 });
+    ```
+7. Separate multi-line lambda from other arguments:
+
+    ```
+    foo(c.begin(), c.end(),
+        [&] (const X& x) {
+          do_something(x, a);
+          do_something1(x, b);
+          do_something2(x, c);
+        });
+    ```
+8. Multi-line named lambda:
+
+    ```
+    auto do_entry = [&] (const X& x) {
+      do_something(x, a);
+      do_something1(x, b);
+      do_something2(x, c);
+    };
+    ```
+
+Item 4, and especially items 6 and 7, are pushing the simplicity limits for
+anonymous lambdas.  Item 6 might be better written using a named lambda:
+```
+c.do_entries(do_entry);
+```
+
+Note that C++11 also added _bind expressions_ as a way to write a function
+object for partial application, using `std::bind` and related facilities
+from the Standard Library.  `std::bind` generalizes and replaces some of the
+binders from C++03.  Bind expressions are not permitted in HotSpot code.
+They don't provide enough benefit over lambdas or local function classes in
+the cases where bind expressions are applicable to warrant the introduction
+of yet another mechanism in this space into HotSpot code.
+
+References:
+
+* Local and unnamed types as template parameters ([n2657])
+* New wording for C++0x lambdas ([n2927])
+* Generalized lambda capture (init-capture) ([N3648])
+* Generic (polymorphic) lambda expressions ([N3649])
+
+[n2657]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm 
+[n2927]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2927.pdf
+[N3648]: https://isocpp.org/files/papers/N3648.html
+[N3649]: https://isocpp.org/files/papers/N3649.html
+
+References from C++17
+
+* Wording for constexpr lambda ([p0170r1])
+* Lambda capture of *this by Value ([p0018r3])
+
+[p0170r1]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0170r1.pdf
+[p0018r3]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0018r3.html
+
+References from C++20
+
+* Allow lambda capture [=, this] ([p0409r2])
+* Familiar template syntax for generic lambdas ([p0428r2])
+* Simplifying implicit lambda capture ([p0588r1])
+* Default constructible and assignable stateless lambdas ([p0624r2])
+* Lambdas in unevaluated contexts ([p0315r4])
+* Allow pack expansion in lambda init-capture ([p0780r2]) ([p2095r0])
+* Deprecate implicit capture of this via [=] ([p0806r2])
+
+[p0409r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0409r2.html
+[p0428r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0428r2.pdf
+[p0588r1]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0588r1.html
+[p0624r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0624r2.pdf
+[p0315r4]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0315r4.pdf
+[p0780r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0780r2.html
+[p2095r0]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p2095r0.html
+[p0806r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0806r2.html
+
+References from C++23
+
+* Make () more optional for lambdas  ([p1102r2])
+
+[p1102r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p1102r2.html
+
 ### Additional Permitted Features
 
 * `constexpr`
@@ -757,9 +1022,6 @@ part of the avoidance of the C++ Standard Library in HotSpot code.
 ([n3206](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm)),
 ([n3272](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm))
 
-* Local and unnamed types as template parameters
-([n2657](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm))
-
 * Range-based `for` loops
 ([n2930](http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2930.html))
 ([range-for](https://en.cppreference.com/w/cpp/language/range-for))
@@ -837,9 +1099,6 @@ features that have not yet been discussed.
 
 * Rvalue references and move semantics
 
-* Lambdas
-
-
 [ADL]: https://en.cppreference.com/w/cpp/language/adl 
   "Argument Dependent Lookup"
 
@@ -854,3 +1113,6 @@ features that have not yet been discussed.
 
 [SFINAE]: https://en.cppreference.com/w/cpp/language/sfinae
   "Substitution Failure Is Not An Error"
+
+[PARTIALAPP]: https://en.wikipedia.org/wiki/Partial_application
+  "Partial Application"

doc/ide.html

@@ -41,14 +41,20 @@
 <pre class="shell"><code>make vscode-project-clangd</code></pre>
 <p>Additional instructions for configuring the given indexer will be displayed after the workspace has been generated.</p>
 <h4 id="visual-studio">Visual Studio</h4>
-<p>This section is a work in progress.</p>
-<pre class="shell"><code>make ide-project</code></pre>
+<p>The make system can generate a Visual Studio project for the Hotspot native source. After configuring, the project is generated using:</p>
+<pre class="shell"><code>make hotspot-ide-project</code></pre>
+<p>This creates a file named <code>jvm.vcxproj</code> in <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="compilation-database">Compilation Database</h4>
 <p>The make system can generate generic native code indexing support in the form of a <a href="https://clang.llvm.org/docs/JSONCompilationDatabase.html">Compilation Database</a> that can be used by many different IDEs and source code indexers.</p>
 <pre class="shell"><code>make compile-commands</code></pre>
 <p>It's also possible to generate the Compilation Database for the HotSpot source code only, which is a bit faster as it includes less information.</p>
 <pre class="shell"><code>make compile-commands-hotspot</code></pre>
 <h3 id="ide-support-for-java-code">IDE support for Java code</h3>
-<p>This section is a work in progress.</p>
+<h4 id="intellij-idea">IntelliJ IDEA</h4>
+<p>The JDK project has a script that can be used for indexing the project with IntelliJ. After configuring and building the JDK, an IntelliJ workspace can be generated by running the following command in the top-level folder of the cloned repository:</p>
+<pre class="shell"><code>bash bin/idea.sh</code></pre>
+<p>To use it, choose <code>File -&gt; Open...</code> in IntelliJ and select the folder where you ran the above script.</p>
+<p>Next, configure the project SDK in IntelliJ. Open <code>File -&gt; Project Structure -&gt; Project</code> and select <code>build/&lt;config&gt;/images/jdk</code> as the SDK to use.</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>
 </body>
 </html>

doc/ide.md

@@ -45,12 +45,17 @@ after the workspace has been generated.
 
 #### Visual Studio
 
-This section is a work in progress.
+The make system can generate a Visual Studio project for the Hotspot
+native source. After configuring, the project is generated using:
 
 ```shell
-make ide-project
+make hotspot-ide-project
 ```
 
+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`.
+
 #### Compilation Database
 
 The make system can generate generic native code indexing support in the form of
@@ -70,4 +75,24 @@ make compile-commands-hotspot
 
 ### IDE support for Java code
 
-This section is a work in progress.
+#### IntelliJ IDEA
+
+The JDK project has a script that can be used for indexing the project
+with IntelliJ. After configuring and building the JDK, an IntelliJ workspace
+can be generated by running the following command in the top-level folder
+of the cloned repository:
+
+```shell
+bash bin/idea.sh
+```
+
+To use it, choose `File -> Open...` in IntelliJ and select the folder where
+you ran the above script.
+
+Next, configure the project SDK in IntelliJ. Open
+`File -> Project Structure -> Project` and select `build/<config>/images/jdk`
+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).

doc/testing.html

@@ -231,7 +231,7 @@ TEST FAILURE</code></pre>
     JTREG=&quot;JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu
     -Djdk.test.docker.image.version=latest&quot;</code></pre>
 <h3 id="non-us-locale">Non-US locale</h3>
-<p>If your locale is non-US, some tests are likely to fail. To work around this you can set the locale to US. On Unix platforms simply setting <code>LANG=&quot;en_US&quot;</code> in the environment before running tests should work. On Windows, setting <code>JTREG=&quot;VM_OPTIONS=-Duser.language=en -Duser.country=US&quot;</code> helps for most, but not all test cases.</p>
+<p>If your locale is non-US, some tests are likely to fail. To work around this you can set the locale to US. On Unix platforms simply setting <code>LANG=&quot;en_US&quot;</code> in the environment before running tests should work. On Windows or MacOS, setting <code>JTREG=&quot;VM_OPTIONS=-Duser.language=en -Duser.country=US&quot;</code> helps for most, but not all test cases.</p>
 <p>For example:</p>
 <pre><code>$ export LANG=&quot;en_US&quot; &amp;&amp; make test TEST=...
 $ make test JTREG=&quot;VM_OPTIONS=-Duser.language=en -Duser.country=US&quot; TEST=...</code></pre>

doc/testing.md

@@ -514,7 +514,7 @@ $ make test TEST="jtreg:test/hotspot/jtreg/containers/docker" \
 
 If your locale is non-US, some tests are likely to fail. To work around this
 you can set the locale to US. On Unix platforms simply setting `LANG="en_US"`
-in the environment before running tests should work. On Windows, setting
+in the environment before running tests should work. On Windows or MacOS, setting
 `JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"` helps for most, but
 not all test cases.
 

jb/project/docker/Dockerfile

@@ -1,13 +0,0 @@
-# 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/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz \
-  -O - | tar xz -C /
-RUN mv /zulu16.28.11-ca-jdk16.0.0-linux_x64 /jdk16.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

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

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

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

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

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# This script creates a Docker image suitable for building AArch64 variant
-# of the JetBrains Runtime version 17.
-
-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 jbr17buildenv -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

@@ -1,29 +0,0 @@
-#!/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

@@ -1,29 +0,0 @@
-#!/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

@@ -1,26 +0,0 @@
-#!/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/copyright/JetBrains.xml

@@ -1,9 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright &amp;#36;originalComment.match(&quot;Copyright (\d+)&quot;, 1, &quot;-&quot;)&amp;#36;today.year JetBrains s.r.o.&#10;DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.&#10;&#10;This code is free software; you can redistribute it and/or modify it&#10;under the terms of the GNU General Public License version 2 only, as&#10;published by the Free Software Foundation.&#10;&#10;This code is distributed in the hope that it will be useful, but WITHOUT&#10;ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or&#10;FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License&#10;version 2 for more details (a copy is included in the LICENSE file that&#10;accompanied this code).&#10;&#10;You should have received a copy of the GNU General Public License version&#10;2 along with this work; if not, write to the Free Software Foundation,&#10;Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.&#10;&#10;Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA&#10;or visit www.oracle.com if you need additional information or have any&#10;questions." />
-    <option name="keyword" value="Copyright" />
-    <option name="allowReplaceKeyword" value="JetBrains" />
-    <option name="myName" value="JetBrains" />
-    <option name="myLocal" value="true" />
-  </copyright>
-</component>

jb/project/idea-project-files/copyright/profiles_settings.xml

@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="JetBrains" />
-</component>

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

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

jb/project/idea-project-files/jdk-clion/.idea/copyright/JetBrains.xml

@@ -1,9 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright 2000-&amp;#36;today.year JetBrains s.r.o.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
-    <option name="keyword" value="Copyright" />
-    <option name="allowReplaceKeyword" value="JetBrains" />
-    <option name="myName" value="JetBrains" />
-    <option name="myLocal" value="true" />
-  </copyright>
-</component>

jb/project/idea-project-files/jdk-clion/.idea/copyright/profiles_settings.xml

@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="JetBrains" />
-</component>

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

@@ -1,20 +0,0 @@
-<?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

@@ -1,13 +0,0 @@
-<?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

@@ -1,12 +0,0 @@
-<?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

@@ -1,20 +0,0 @@
-<?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

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

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

@@ -1,18 +0,0 @@
-#!/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

@@ -1,173 +0,0 @@
-#!/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="jbr-"
-OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "$tag_prefix" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d ",")
-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
-USER=builduser
-export USER
-
-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"
-
-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

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

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

@@ -1,163 +0,0 @@
-#!/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}"
-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 CONF=$RELEASE_NAME || do_exit $?
-    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

@@ -1,162 +0,0 @@
-#!/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}"
-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 CONF=$RELEASE_NAME || do_exit $?
-    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

@@ -1,143 +0,0 @@
-#!/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 CONF=$RELEASE_NAME || do_exit $?
-    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

@@ -1,16 +0,0 @@
-<?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

@@ -1,186 +0,0 @@
-#!/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
-#   MACOSX_VERSION_MAX - specifies value for the --with-macosx-version-max parameter. By default it is 10.12.00 for x64
-#               and 11.00.00 for aarch64
-
-source jb/project/tools/common/scripts/common.sh
-
-JCEF_PATH=${JCEF_PATH:=./jcef_mac}
-BOOT_JDK=${BOOT_JDK:=$(/usr/libexec/java_home -v 16)}
-
-function do_configure {
-  if [[ "${architecture}" == *aarch64* ]]; then
-
-    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" \
-      --with-macosx-version-max="${MACOSX_VERSION_MAX:="11.00.00"}" \
-      --disable-hotspot-gtest --disable-javac-server --disable-full-docs --disable-manpages \
-      --enable-cds=no \
-      $STATIC_CONF_ARGS \
-      $REPRODUCIBLE_BUILD_OPTS \
-      $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-      || do_exit $?
-  else
-    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" \
-      --with-macosx-version-max="${MACOSX_VERSION_MAX:="10.12.00"}" \
-      --enable-cds=yes \
-      $STATIC_CONF_ARGS \
-      $REPRODUCIBLE_BUILD_OPTS \
-      $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-      || do_exit $?
-  fi
-}
-
-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
-
-  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 CONF=$RELEASE_NAME || do_exit $?
-    [ -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

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

@@ -1,117 +0,0 @@
-#!/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

@@ -1,138 +0,0 @@
-#!/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

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

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

@@ -1,162 +0,0 @@
-#!/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

@@ -1,93 +0,0 @@
-#!/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

@@ -1,141 +0,0 @@
-#!/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}
-
-function do_configure {
-  sh ./configure \
-    --enable-option-checking=fatal \
-    --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 \
-    --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-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" >> $__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
-    cp $IMAGES_DIR/jdk/bin/*.pdb $__root_dir/bin
-    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 || 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 || 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_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}"
-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

@@ -1,132 +0,0 @@
-#!/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}
-
-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 \
-    --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
-    cp $IMAGES_DIR/jdk/bin/*.pdb $__root_dir/bin
-    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 || 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 || 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=$(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

@@ -1,126 +0,0 @@
-#!/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)
-
-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 \
-    --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
-    cp $IMAGES_DIR/jdk/bin/*.pdb $__root_dir/bin
-    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 || 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 || 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

@@ -1,56 +0,0 @@
-#!/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 ...
-  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-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
-  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

@@ -1,56 +0,0 @@
-#!/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
-  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

@@ -1,50 +0,0 @@
-#!/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
-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
-  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/CompileInterimLangtools.gmk

@@ -71,11 +71,11 @@ define SetupInterimModule
       SRC := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim \
           $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$1) \
           $(TOPDIR)/src/$1/share/classes, \
-      EXCLUDES := sun, \
+      EXCLUDES := sun javax/tools/snippet-files, \
       EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
           Standard.java, \
       EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java, \
-      COPY := .gif .png .xml .css .js .js.template .txt javax.tools.JavaCompilerTool, \
+      COPY := .gif .png .xml .css .svg .js .js.template .txt javax.tools.JavaCompilerTool, \
       BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/$1.interim, \
       DISABLED_WARNINGS := module options, \
       JAVAC_FLAGS := \

make/CreateJmods.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2021, 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
@@ -196,6 +196,11 @@ else # not java.base
   endif
 endif
 
+# Set main class of jdk.httpserver module
+ifeq ($(MODULE), jdk.httpserver)
+    JMOD_FLAGS += --main-class sun.net.httpserver.simpleserver.Main
+endif
+
 # Changes to the jmod tool itself should also trigger a rebuild of all jmods.
 # The variable JMOD_CMD could contain an environment variable assignment before
 # the actual command. Filter that out using wildcard before adding to DEPS.
@@ -228,23 +233,6 @@ else
   JMOD_SOURCE_DATE :=
 endif
 
-ifeq ($(ENABLE_REPRODUCIBLE_BUILD), true)
-  # If boot JDK's jar supported --date, jrt-fs.jar would've been built with
-  # that option already.
-  ifneq ($(BOOT_JDK_JAR_SUPPORTS_DATE), true)
-    ifeq ($(MODULE), java.base)
-      JAR_FILE_TO_FIX := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jrt-fs.jar
-      $(eval $(call SetupExecute, fixup_jrtfs_jar, \
-        WARN := Fixing timestamps in modules_libs/java.base/jrt-fs.jar, \
-        DEPS := $(JAR_FILE_TO_FIX) $(JDK_OUTPUTDIR)/bin/jar, \
-        OUTPUT_DIR := $(JMODS_SUPPORT_DIR), \
-        COMMAND := $(BUILD_JAR) --date $(SOURCE_DATE_ISO_8601) --update --file $(JAR_FILE_TO_FIX) @$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/_the.jrt-fs.jar_contents, \
-      ))
-      DEPS += $(fixup_jrtfs_jar_TARGET)
-    endif
-  endif
-endif
-
 # Create jmods in the support dir and then move them into place to keep the
 # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.
 $(eval $(call SetupExecute, create_$(JMOD_FILE), \

make/Hsdis.gmk

@@ -0,0 +1,146 @@
+#
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JdkNativeCompilation.gmk
+
+################################################################################
+# This makefile compiles and installs the hsdis library
+#
+################################################################################
+
+HSDIS_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/hsdis
+
+ifeq ($(call isTargetOs, windows), true)
+  INSTALLED_HSDIS_DIR := $(JDK_OUTPUTDIR)/bin
+
+  # On windows, we need to "fake" a completely different toolchain using gcc
+  # instead of the normal microsoft toolchain. This is quite hacky...
+
+  MINGW_BASE := x86_64-w64-mingw32
+
+  MINGW_SYSROOT = $(shell $(MINGW_BASE)-gcc -print-sysroot)
+  ifeq ($(wildcard $(MINGW_SYSROOT)), )
+    # Use fallback path
+    MINGW_SYSROOT := /usr/$(MINGW_BASE)
+    ifeq ($(wildcard $(MINGW_SYSROOT)), )
+      $(error mingw sysroot not found)
+    endif
+  endif
+
+  $(eval $(call DefineNativeToolchain, TOOLCHAIN_MINGW, \
+      CC := $(MINGW_BASE)-gcc, \
+      LD := $(MINGW_BASE)-ld, \
+      OBJCOPY := $(MINGW_BASE)-objcopy, \
+      RC := $(RC), \
+      SYSROOT_CFLAGS := --sysroot=$(MINGW_SYSROOT), \
+      SYSROOT_LDFLAGS := --sysroot=$(MINGW_SYSROOT), \
+  ))
+
+  MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/mingw/lib
+  ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
+    # Try without mingw
+    MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/lib
+    ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
+      $(error mingw sysroot lib path not found)
+    endif
+  endif
+
+  MINGW_VERSION = $(shell $(MINGW_BASE)-gcc -v 2>&1 | $(GREP) "gcc version" | $(CUT) -d " " -f 3)
+  MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION)
+  ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
+    # Try using only major version number
+    MINGW_VERSION_MAJOR := $(firstword $(subst ., , $(MINGW_VERSION)))
+    MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION_MAJOR)
+    ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
+      $(error mingw gcc lib path not found)
+    endif
+  endif
+
+  TOOLCHAIN_TYPE := gcc
+  OPENJDK_TARGET_OS := linux
+  CC_OUT_OPTION := -o$(SPACE)
+  LD_OUT_OPTION := -o$(SPACE)
+  GENDEPS_FLAGS := -MMD -MF
+  CFLAGS_DEBUG_SYMBOLS := -g
+  DISABLED_WARNINGS :=
+  DISABLE_WARNING_PREFIX := -Wno-
+  CFLAGS_WARNINGS_ARE_ERRORS := -Werror
+  SHARED_LIBRARY_FLAGS := -shared
+
+  HSDIS_TOOLCHAIN := TOOLCHAIN_MINGW
+  HSDIS_TOOLCHAIN_CFLAGS :=
+  HSDIS_TOOLCHAIN_LDFLAGS := -L$(MINGW_GCC_LIB_PATH) -L$(MINGW_SYSROOT_LIB_PATH)
+  MINGW_DLLCRT := $(MINGW_SYSROOT_LIB_PATH)/dllcrt2.o
+  HSDIS_TOOLCHAIN_LIBS := $(MINGW_DLLCRT) -lmingw32 -lgcc -lgcc_eh -lmoldname \
+      -lmingwex -lmsvcrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32
+else
+  INSTALLED_HSDIS_DIR := $(JDK_OUTPUTDIR)/lib
+
+  HSDIS_TOOLCHAIN := TOOLCHAIN_DEFAULT
+  HSDIS_TOOLCHAIN_CFLAGS := $(CFLAGS_JDKLIB)
+  HSDIS_TOOLCHAIN_LDFLAGS := $(LDFLAGS_JDKLIB)
+  HSDIS_TOOLCHAIN_LIBS := -ldl
+endif
+
+
+$(eval $(call SetupJdkLibrary, BUILD_HSDIS, \
+    NAME := hsdis, \
+    SRC := $(TOPDIR)/src/utils/hsdis, \
+    TOOLCHAIN := $(HSDIS_TOOLCHAIN), \
+    OUTPUT_DIR := $(HSDIS_OUTPUT_DIR), \
+    OBJECT_DIR := $(HSDIS_OUTPUT_DIR), \
+    DISABLED_WARNINGS_gcc := undef format-nonliteral sign-compare, \
+    DISABLED_WARNINGS_clang := undef format-nonliteral, \
+    CFLAGS := $(HSDIS_TOOLCHAIN_CFLAGS) $(HSDIS_CFLAGS), \
+    LDFLAGS := $(HSDIS_TOOLCHAIN_LDFLAGS) $(SHARED_LIBRARY_FLAGS), \
+    LIBS := $(HSDIS_LIBS) $(HSDIS_TOOLCHAIN_LIBS), \
+))
+
+build: $(BUILD_HSDIS)
+
+TARGETS += build
+
+INSTALLED_HSDIS_NAME := hsdis-$(OPENJDK_TARGET_CPU_LEGACY_LIB)$(SHARED_LIBRARY_SUFFIX)
+
+INSTALLED_HSDIS := $(INSTALLED_HSDIS_DIR)/$(INSTALLED_HSDIS_NAME)
+
+$(INSTALLED_HSDIS): $(BUILD_HSDIS_TARGET)
+	$(call LogWarn, NOTE: The resulting build might not be redistributable. Seek legal advice before distibuting.)
+	$(install-file)
+
+
+install: $(INSTALLED_HSDIS)
+
+TARGETS += install
+
+################################################################################
+
+all: $(TARGETS)
+
+.PHONY: all default build install

make/JBRApi.gmk

@@ -1,84 +0,0 @@
-#
-# Copyright 2000-2021 JetBrains s.r.o.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-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

@@ -526,6 +526,18 @@ $(eval $(call SetupTarget, update-x11wrappers, \
     DEPS := java.base-copy buildtools-jdk, \
 ))
 
+ifneq ($(HSDIS_BACKEND), none)
+  $(eval $(call SetupTarget, build-hsdis, \
+      MAKEFILE := Hsdis, \
+      TARGET := build, \
+  ))
+
+  $(eval $(call SetupTarget, install-hsdis, \
+      MAKEFILE := Hsdis, \
+      TARGET := install, \
+  ))
+endif
+
 ################################################################################
 # Cross compilation support
 
@@ -1325,14 +1337,6 @@ 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/RunTests.gmk

@@ -200,9 +200,10 @@ $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
 $(eval $(call ParseKeywordVariable, JTREG, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
         TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \
-        RETRY_COUNT REPEAT_COUNT MAX_OUTPUT, \
+        RETRY_COUNT REPEAT_COUNT MAX_OUTPUT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
-        EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS, \
+        EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
+        $(CUSTOM_JTREG_STRING_KEYWORDS), \
 ))
 
 ifneq ($(JTREG), )
@@ -798,15 +799,6 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += -ea -esa
   endif
 
-  ifeq ($$(ASAN_ENABLED), yes)
-    $1_JTREG_BASIC_OPTIONS += -e:ASAN_OPTIONS=handle_segv=0:handle_sigfpe=0:detect_leaks=false
-    $1_JTREG_BASIC_OPTIONS += -e:LD_PRELOAD=libasan.so.5
-  endif
-
-  ifeq ($$(USAN_ENABLED), yes)
-    $1_JTREG_BASIC_OPTIONS += -e:LD_PRELOAD=libubsan.so.1
-  endif
-
   ifneq ($$($1_JTREG_NATIVEPATH), )
     $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
   endif
@@ -850,6 +842,8 @@ define SetupRunJtregTestBody
     endif
   endif
 
+  $$(eval $$(call SetupRunJtregTestCustom, $1))
+
   clean-workdir-$1:
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
 

make/ToolsJdk.gmk

@@ -75,6 +75,8 @@ TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_clas
     build.tools.makejavasecurity.MakeJavaSecurity
 
 TOOL_GENERATECACERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    -Dkeystore.pkcs12.certProtectionAlgorithm=NONE \
+    -Dkeystore.pkcs12.macAlgorithm=NONE \
     build.tools.generatecacerts.GenerateCacerts
 
 TOOL_GENERATEEMOJIDATA = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \

make/autoconf/basic.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -438,7 +438,9 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
 AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
 [
   if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    file_to_test="$TOPDIR/LICENSE"
+    # The choice of file here is somewhat arbitrary, it just needs to be there
+    # in the source tree when configure runs
+    file_to_test="$TOPDIR/Makefile"
     if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
       AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
     fi

make/autoconf/basic_tools.m4

@@ -270,8 +270,6 @@ AC_DEFUN([BASIC_CHECK_TAR],
     TAR_TYPE="bsd"
   elif test "x$($TAR -v | $GREP "bsdtar")" != "x"; then
     TAR_TYPE="bsd"
-  elif test "x$($TAR --version | $GREP "busybox")" != "x"; then
-    TAR_TYPE="busybox"
   elif test "x$OPENJDK_BUILD_OS" = "xaix"; then
     TAR_TYPE="aix"
   fi
@@ -283,12 +281,9 @@ AC_DEFUN([BASIC_CHECK_TAR],
     TAR_SUPPORTS_TRANSFORM="true"
   elif test "x$TAR_TYPE" = "aix"; then
     # -L InputList of aix tar: name of file listing the files and directories
-    # that need to be archived or extracted
+    # that need to be   archived or extracted
     TAR_INCLUDE_PARAM="L"
     TAR_SUPPORTS_TRANSFORM="false"
-  elif test "x$TAR_TYPE" = "xbusybox"; then
-    TAR_INCLUDE_PARAM="T"
-    TAR_SUPPORTS_TRANSFORM="false"
   else
     TAR_INCLUDE_PARAM="I"
     TAR_SUPPORTS_TRANSFORM="false"

make/autoconf/basic_windows.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -34,9 +34,10 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
       OPENJDK_BUILD_OS_ENV=windows.wsl1
     else
       # This test is not guaranteed, but there is no documented way of
-      # distinguishing between WSL1 and WSL2. Assume only WSL2 has WSL_INTEROP
-      # in /run/WSL
-      if test -d "/run/WSL" ; then
+      # distinguishing between WSL1 and WSL2.
+      # Check whether "Hyper-V" appears in /proc/interrupts because WSL2 runs on Hyper-V.
+      $GREP -q Hyper-V /proc/interrupts
+      if test $? -eq 0; then
         OPENJDK_BUILD_OS_ENV=windows.wsl2
       else
         OPENJDK_BUILD_OS_ENV=windows.wsl1

make/autoconf/boot-jdk.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -126,18 +126,16 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
 AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS],
 [
   if test "x$with_boot_jdk" != x; then
-    BOOT_JDK_ARG="$with_boot_jdk"
-    UTIL_FIXUP_PATH(BOOT_JDK_ARG)
-    if test -d "$BOOT_JDK_ARG"; then
-      BOOT_JDK=$BOOT_JDK_ARG
+    if test -d "$with_boot_jdk"; then
+      BOOT_JDK=$with_boot_jdk
       BOOT_JDK_FOUND=maybe
-    elif test -f "$BOOT_JDK_ARG"; then
-      case "$BOOT_JDK_ARG" in
+    elif test -f "$with_boot_jdk"; then
+      case "$with_boot_jdk" in
         *.tar.gz )
             BOOT_JDK_SUPPORT_DIR=$CONFIGURESUPPORT_OUTPUTDIR/boot-jdk
             $RM -rf $BOOT_JDK_SUPPORT_DIR
             $MKDIR -p $BOOT_JDK_SUPPORT_DIR
-            $GUNZIP -c $BOOT_JDK_ARG | $TAR xf - -C $BOOT_JDK_SUPPORT_DIR
+            $GUNZIP -c $with_boot_jdk | $TAR xf - -C $BOOT_JDK_SUPPORT_DIR
 
             # Try to find javac to determine BOOT_JDK path
             BOOT_JDK_JAVAC_PATH=`$FIND $BOOT_JDK_SUPPORT_DIR | $GREP "/bin/javac"`
@@ -300,6 +298,28 @@ AC_DEFUN([BOOTJDK_CHECK_TOOL_IN_BOOTJDK],
     ])
 ])
 
+# Setup CLASSPATH environment variable
+AC_DEFUN([BOOTJDK_SETUP_CLASSPATH],
+[
+  AC_ARG_WITH([classpath], [AS_HELP_STRING([--with-classpath],
+      [Optional classpath to set as CLASSPATH to all Java invocations @<:@none@:>@])])
+
+  if test "x$CLASSPATH" != x; then
+    AC_MSG_WARN([CLASSPATH is set in the environment. This will be ignored. Use --with-classpath instead.])
+  fi
+
+  CLASSPATH=
+
+  if test "x$with_classpath" != x && test "x$with_classpath" != xyes &&
+      test "x$with_classpath" != xno ; then
+    CLASSPATH="$with_classpath"
+    AC_MSG_CHECKING([for classpath to use for all Java invocations])
+    AC_MSG_RESULT([$CLASSPATH])
+  fi
+
+  AC_SUBST(CLASSPATH)
+])
+
 ###############################################################################
 #
 # We need a Boot JDK to bootstrap the build.
@@ -406,6 +426,8 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
     BOOTJDK_USE_LOCAL_CDS=false
     AC_MSG_RESULT([no, -XX:SharedArchiveFile not supported])
   fi
+
+  BOOTJDK_SETUP_CLASSPATH
 ])
 
 AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],

make/autoconf/configure.ac

@@ -217,9 +217,6 @@ JDKOPT_SETUP_CODE_COVERAGE
 # AddressSanitizer
 JDKOPT_SETUP_ADDRESS_SANITIZER
 
-# UndefinedBehaviorSanitizer
-JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER
-
 ###############################################################################
 #
 # Check dependencies for external and internal libraries.
@@ -252,6 +249,7 @@ JDKOPT_EXCLUDE_TRANSLATIONS
 JDKOPT_ENABLE_DISABLE_MANPAGES
 JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE
 JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT
+JDKOPT_SETUP_HSDIS
 
 ###############################################################################
 #

make/autoconf/flags-cflags.m4

@@ -95,39 +95,11 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
   # info flags for toolchains unless we know they work.
   # See JDK-8207057.
   ASFLAGS_DEBUG_SYMBOLS=""
-
-  # Debug prefix mapping if supported by compiler
-  DEBUG_PREFIX_CFLAGS=
-
   # Debug symbols
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
-      # Check if compiler supports -fdebug-prefix-map. If so, use that to make
-      # the debug symbol paths resolve to paths relative to the workspace root.
-      workspace_root_trailing_slash="${WORKSPACE_ROOT%/}/"
-      DEBUG_PREFIX_CFLAGS="-fdebug-prefix-map=${workspace_root_trailing_slash}="
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${DEBUG_PREFIX_CFLAGS}],
-        IF_FALSE: [
-            DEBUG_PREFIX_CFLAGS=
-        ]
-      )
-    fi
-
     CFLAGS_DEBUG_SYMBOLS="-g"
     ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
-    if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
-      # Check if compiler supports -fdebug-prefix-map. If so, use that to make
-      # the debug symbol paths resolve to paths relative to the workspace root.
-      workspace_root_trailing_slash="${WORKSPACE_ROOT%/}/"
-      DEBUG_PREFIX_CFLAGS="-fdebug-prefix-map=${workspace_root_trailing_slash}="
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${DEBUG_PREFIX_CFLAGS}],
-        IF_FALSE: [
-            DEBUG_PREFIX_CFLAGS=
-        ]
-      )
-    fi
-
     CFLAGS_DEBUG_SYMBOLS="-g"
     ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
@@ -136,11 +108,6 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
     CFLAGS_DEBUG_SYMBOLS="-Z7"
   fi
 
-  if test "x$DEBUG_PREFIX_CFLAGS" != x; then
-    CFLAGS_DEBUG_SYMBOLS="$CFLAGS_DEBUG_SYMBOLS $DEBUG_PREFIX_CFLAGS"
-    ASFLAGS_DEBUG_SYMBOLS="$ASFLAGS_DEBUG_SYMBOLS $DEBUG_PREFIX_CFLAGS"
-  fi
-
   AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
   AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
 ])
@@ -170,7 +137,7 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       DISABLED_WARNINGS="4800"
       if test "x$TOOLCHAIN_VERSION" = x2017; then
         # VS2017 incorrectly triggers this warning for constexpr
-        DISABLED_WARNINGS+=" 4307"
+        DISABLED_WARNINGS="$DISABLED_WARNINGS 4307"
       fi
       ;;
 
@@ -192,7 +159,6 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
 
     clang)
       DISABLE_WARNING_PREFIX="-Wno-"
-      BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
 
       # Additional warnings that are not activated by -Wall and -Wextra
@@ -264,7 +230,7 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
       DISABLE_FORTIFY_CFLAGS="-U_FORTIFY_SOURCE"
       # ASan doesn't work well with _FORTIFY_SOURCE
       # See https://github.com/google/sanitizers/wiki/AddressSanitizer#faq
-      if test "x$ASAN_ENABLED" = xyes || test "x$USAN_ENABLED" = xyes; then
+      if test "x$ASAN_ENABLED" = xyes; then
         ENABLE_FORTIFY_CFLAGS="${DISABLE_FORTIFY_CFLAGS}"
       else
         ENABLE_FORTIFY_CFLAGS="-D_FORTIFY_SOURCE=2"
@@ -470,11 +436,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     ALWAYS_DEFINES_JVM="-D_REENTRANT"
     ALWAYS_DEFINES_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    # Access APIs for Windows 8 and above
-    # see https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170
-    ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 -D_CRT_SECURE_NO_DEPRECATE \
+    ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE \
         -D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DIAL"
-    ALWAYS_DEFINES_JVM="-DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602"
+    ALWAYS_DEFINES_JVM="-DNOMINMAX -DWIN32_LEAN_AND_MEAN"
   fi
 
   ###############################################################################

make/autoconf/flags-ldflags.m4

@@ -32,16 +32,10 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS],
 
   # Setup the target toolchain
 
+  # The target dir matches the name of VM variant
+  TARGET_JVM_VARIANT_PATH=$JVM_VARIANT_MAIN
+
   # On some platforms (mac) the linker warns about non existing -L dirs.
-  # For any of the variants server, client or minimal, the dir matches the
-  # variant name. The "main" variant should be used for linking. For the
-  # rest, the dir is just server.
-  if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) \
-      || HOTSPOT_CHECK_JVM_VARIANT(minimal); then
-    TARGET_JVM_VARIANT_PATH=$JVM_VARIANT_MAIN
-  else
-    TARGET_JVM_VARIANT_PATH=server
-  fi
   FLAGS_SETUP_LDFLAGS_CPU_DEP([TARGET])
 
   # Setup the build toolchain

make/autoconf/flags-other.m4

@@ -89,11 +89,12 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
 
     # Fix linker warning.
     # Code taken from make/autoconf/flags-cflags.m4 and adapted.
-    JVM_BASIC_ASFLAGS+=" -DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
+    JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS \
+        -DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
         -mmacosx-version-min=$MACOSX_VERSION_MIN"
 
     if test -n "$MACOSX_VERSION_MAX"; then
-        JVM_BASIC_ASFLAGS+=" $OS_CFLAGS \
+        JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS $OS_CFLAGS \
             -DMAC_OS_X_VERSION_MAX_ALLOWED=$MACOSX_VERSION_MAX_NODOTS"
     fi
   fi

make/autoconf/flags.m4

@@ -215,8 +215,21 @@ AC_DEFUN([FLAGS_SETUP_SYSROOT_FLAGS],
       $1SYSROOT_CFLAGS="--sysroot=[$]$1SYSROOT"
       $1SYSROOT_LDFLAGS="--sysroot=[$]$1SYSROOT"
     elif test "x$TOOLCHAIN_TYPE" = xclang; then
-      $1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT"
-      $1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT"
+      if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
+        # -isysroot has no effect on linux
+        # https://bugs.llvm.org/show_bug.cgi?id=11503
+        $1SYSROOT_CFLAGS="--sysroot=[$]$1SYSROOT"
+        $1SYSROOT_LDFLAGS="--sysroot=[$]$1SYSROOT"
+        if test -d "$DEVKIT_TOOLCHAIN_PATH"; then
+          # In devkits, gcc is not located in the sysroot.
+          # use --gcc-toolchain to let clang find the gcc installation.
+          $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS --gcc-toolchain=$DEVKIT_TOOLCHAIN_PATH/.."
+          $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS --gcc-toolchain=$DEVKIT_TOOLCHAIN_PATH/.."
+        fi
+      else
+        $1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT"
+        $1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT"
+      fi
     fi
   fi
 

make/autoconf/help.m4

@@ -82,6 +82,14 @@ cygwin_help() {
       PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P make )"
       HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
       ;;
+    i686-w64-mingw32-gcc)
+      PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P gcc-core i686-w64-mingw32-gcc-core mingw64-i686-glib2.0 )"
+      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+      ;;
+    x86_64-w64-mingw32-gcc)
+      PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P gcc-core x86_64-w64-mingw32-gcc-core mingw64-x86_64-glib2.0 )"
+      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+      ;;
   esac
 }
 
@@ -297,7 +305,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
 
   printf "\n"
   printf "Build performance summary:\n"
-  printf "* Cores to use:   $JOBS\n"
+  printf "* Build jobs:     $JOBS\n"
   printf "* Memory limit:   $MEMORY_SIZE MB\n"
   if test "x$CCACHE_STATUS" != "x"; then
     printf "* ccache status:  $CCACHE_STATUS\n"

make/autoconf/hotspot.m4

@@ -83,19 +83,10 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS],
     AC_MSG_ERROR([Cannot continue])
   fi
 
-  # All "special" variants share the same output directory ("server")
-  VALID_MULTIPLE_JVM_VARIANTS="server client minimal"
-  UTIL_GET_NON_MATCHING_VALUES(INVALID_MULTIPLE_VARIANTS, $JVM_VARIANTS, \
-      $VALID_MULTIPLE_JVM_VARIANTS)
-  if  test "x$INVALID_MULTIPLE_VARIANTS" != x && \
-      test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = xtrue; then
-    AC_MSG_ERROR([You can only build multiple variants using these variants: '$VALID_MULTIPLE_JVM_VARIANTS'])
-  fi
-
   # The "main" variant is the one used by other libs to link against during the
   # build.
   if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then
-    MAIN_VARIANT_PRIO_ORDER="server client minimal"
+    MAIN_VARIANT_PRIO_ORDER="server client minimal zero"
     for variant in $MAIN_VARIANT_PRIO_ORDER; do
       if HOTSPOT_CHECK_JVM_VARIANT($variant); then
         JVM_VARIANT_MAIN="$variant"

make/autoconf/jdk-options.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -459,45 +459,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
   AC_SUBST(ASAN_ENABLED)
 ])
 
-###############################################################################
-#
-# UndefinedBehaviorSanitizer
-#
-AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
-[
-  UTIL_ARG_ENABLE(NAME: usan, DEFAULT: false,
-      DESC: [enable UndefinedBehaviorSanitizer],
-      CHECK_AVAILABLE: [
-        AC_MSG_CHECKING([if UndefinedBehaviorSanitizer (usan) is available])
-        if test "x$TOOLCHAIN_TYPE" = "xgcc" ||
-            test "x$TOOLCHAIN_TYPE" = "xclang"; then
-          AC_MSG_RESULT([yes])
-        else
-          AC_MSG_RESULT([no])
-          AVAILABLE=false
-        fi
-      ],
-      IF_ENABLED: [
-        USAN_FLAGS="-fsanitize=undefined"
-        USAN_CFLAGS="$USAN_FLAGS -fno-omit-frame-pointer"
-        USAN_LDFLAGS="$USAN_FLAGS"
-        JVM_CFLAGS="$JVM_CFLAGS $USAN_CFLAGS"
-        JVM_LDFLAGS="$JVM_LDFLAGS $USAN_LDFLAGS"
-        CFLAGS_JDKLIB="$CFLAGS_JDKLIB $USAN_CFLAGS"
-        CFLAGS_JDKEXE="$CFLAGS_JDKEXE $USAN_CFLAGS"
-        CXXFLAGS_JDKLIB="$CXXFLAGS_JDKLIB $USAN_CFLAGS"
-        CXXFLAGS_JDKEXE="$CXXFLAGS_JDKEXE $USAN_CFLAGS"
-        LDFLAGS_JDKLIB="$LDFLAGS_JDKLIB $USAN_LDFLAGS"
-        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE $USAN_LDFLAGS"
-        USAN_ENABLED="yes"
-      ],
-      IF_DISABLED: [
-        USAN_ENABLED="no"
-      ])
-
-  AC_SUBST(USAN_ENABLED)
-])
-
 ################################################################################
 #
 # Static build support.  When enabled will generate static
@@ -766,3 +727,173 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD],
   AC_SUBST(SOURCE_DATE)
   AC_SUBST(ENABLE_REPRODUCIBLE_BUILD)
 ])
+
+################################################################################
+#
+# Helper function to build binutils from source.
+#
+AC_DEFUN([JDKOPT_BUILD_BINUTILS],
+[
+  BINUTILS_SRC="$with_binutils_src"
+  UTIL_FIXUP_PATH(BINUTILS_SRC)
+
+  if ! test -d $BINUTILS_SRC; then
+    AC_MSG_ERROR([--with-binutils-src is not pointing to a directory])
+  fi
+  if ! test -x $BINUTILS_SRC/configure; then
+    AC_MSG_ERROR([--with-binutils-src does not look like a binutils source directory])
+  fi
+
+  if test -e $BINUTILS_SRC/bfd/libbfd.a && \
+      test -e $BINUTILS_SRC/opcodes/libopcodes.a && \
+      test -e $BINUTILS_SRC/libiberty/libiberty.a && \
+      test -e $BINUTILS_SRC/zlib/libz.a; then
+    AC_MSG_NOTICE([Found binutils binaries in binutils source directory -- not building])
+  else
+    # On Windows, we cannot build with the normal Microsoft CL, but must instead use
+    # a separate mingw toolchain.
+    if test "x$OPENJDK_BUILD_OS" = xwindows; then
+      if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
+        target_base="i686-w64-mingw32"
+      else
+        target_base="$OPENJDK_TARGET_CPU-w64-mingw32"
+      fi
+      binutils_cc="$target_base-gcc"
+      binutils_target="--host=$target_base --target=$target_base"
+      # Somehow the uint typedef is not included when building with mingw
+      binutils_cflags="-Duint=unsigned"
+      compiler_version=`$binutils_cc --version 2>&1`
+      if ! [ [[ "$compiler_version" =~ GCC ]] ]; then
+        AC_MSG_NOTICE([Could not find correct mingw compiler $binutils_cc.])
+        HELP_MSG_MISSING_DEPENDENCY([$binutils_cc])
+        AC_MSG_ERROR([Cannot continue. $HELP_MSG])
+      else
+        AC_MSG_NOTICE([Using compiler $binutils_cc with version $compiler_version])
+      fi
+    elif test "x$OPENJDK_BUILD_OS" = xmacosx; then
+      if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+        binutils_target="--enable-targets=aarch64-darwin"
+      else
+        binutils_target=""
+      fi
+    else
+      binutils_cc="$CC $SYSROOT_CFLAGS"
+      binutils_target=""
+    fi
+    binutils_cflags="$binutils_cflags $MACHINE_FLAG $JVM_PICFLAG $C_O_FLAG_NORM"
+
+    AC_MSG_NOTICE([Running binutils configure])
+    AC_MSG_NOTICE([configure command line: ./configure --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" $binutils_target])
+    saved_dir=`pwd`
+    cd "$BINUTILS_SRC"
+    ./configure --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" $binutils_target
+    if test $? -ne 0 || ! test -e $BINUTILS_SRC/Makefile; then
+      AC_MSG_NOTICE([Automatic building of binutils failed on configure. Try building it manually])
+      AC_MSG_ERROR([Cannot continue])
+    fi
+    AC_MSG_NOTICE([Running binutils make])
+    $MAKE all-opcodes
+    if test $? -ne 0; then
+      AC_MSG_NOTICE([Automatic building of binutils failed on make. Try building it manually])
+      AC_MSG_ERROR([Cannot continue])
+    fi
+    cd $saved_dir
+    AC_MSG_NOTICE([Building of binutils done])
+  fi
+
+  BINUTILS_DIR="$BINUTILS_SRC"
+])
+
+################################################################################
+#
+# Determine if hsdis should be built, and if so, with which backend.
+#
+AC_DEFUN_ONCE([JDKOPT_SETUP_HSDIS],
+[
+  AC_ARG_WITH([hsdis], [AS_HELP_STRING([--with-hsdis],
+      [what hsdis backend to use ('none', 'binutils') @<:@none@:>@])])
+
+  AC_ARG_WITH([binutils], [AS_HELP_STRING([--with-binutils],
+      [where to find the binutils files needed for hsdis/binutils])])
+
+  AC_ARG_WITH([binutils-src], [AS_HELP_STRING([--with-binutils-src],
+      [where to find the binutils source for building])])
+
+  AC_MSG_CHECKING([what hsdis backend to use])
+
+  if test "x$with_hsdis" = xyes; then
+    AC_MSG_ERROR([--with-hsdis must have a value])
+  elif test "x$with_hsdis" = xnone || test "x$with_hsdis" = xno || test "x$with_hsdis" = x; then
+    HSDIS_BACKEND=none
+    AC_MSG_RESULT(['none', hsdis will not be built])
+  elif test "x$with_hsdis" = xbinutils; then
+    HSDIS_BACKEND=binutils
+    AC_MSG_RESULT(['binutils'])
+
+    # We need the binutils static libs and includes.
+    if test "x$with_binutils_src" != x; then
+      # Try building the source first. If it succeeds, it sets $BINUTILS_DIR.
+      JDKOPT_BUILD_BINUTILS
+    fi
+
+    if test "x$with_binutils" != x; then
+      BINUTILS_DIR="$with_binutils"
+    fi
+
+    binutils_system_error=""
+    HSDIS_LIBS=""
+    if test "x$BINUTILS_DIR" = xsystem; then
+      AC_CHECK_LIB(bfd, bfd_openr, [ HSDIS_LIBS="-lbfd" ], [ binutils_system_error="libbfd not found" ])
+      AC_CHECK_LIB(opcodes, disassembler, [ HSDIS_LIBS="$HSDIS_LIBS -lopcodes" ], [ binutils_system_error="libopcodes not found" ])
+      AC_CHECK_LIB(iberty, xmalloc, [ HSDIS_LIBS="$HSDIS_LIBS -liberty" ], [ binutils_system_error="libiberty not found" ])
+      AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], [ binutils_system_error="libz not found" ])
+      HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB"
+    elif test "x$BINUTILS_DIR" != x; then
+      if test -e $BINUTILS_DIR/bfd/libbfd.a && \
+          test -e $BINUTILS_DIR/opcodes/libopcodes.a && \
+          test -e $BINUTILS_DIR/libiberty/libiberty.a; then
+        HSDIS_CFLAGS="-I$BINUTILS_DIR/include -I$BINUTILS_DIR/bfd -DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB"
+        HSDIS_LIBS="$BINUTILS_DIR/bfd/libbfd.a $BINUTILS_DIR/opcodes/libopcodes.a $BINUTILS_DIR/libiberty/libiberty.a $BINUTILS_DIR/zlib/libz.a"
+      fi
+    fi
+
+    AC_MSG_CHECKING([for binutils to use with hsdis])
+    case "x$BINUTILS_DIR" in
+      xsystem)
+        if test "x$OPENJDK_TARGET_OS" != xlinux; then
+          AC_MSG_RESULT([invalid])
+          AC_MSG_ERROR([binutils on system is supported for Linux only])
+        elif test "x$binutils_system_error" = x; then
+          AC_MSG_RESULT([system])
+          HSDIS_CFLAGS="$HSDIS_CFLAGS -DSYSTEM_BINUTILS"
+        else
+          AC_MSG_RESULT([invalid])
+          AC_MSG_ERROR([$binutils_system_error])
+        fi
+        ;;
+      x)
+        AC_MSG_RESULT([missing])
+        AC_MSG_NOTICE([--with-hsdis=binutils requires specifying a binutils installation.])
+        AC_MSG_NOTICE([Download binutils from https://www.gnu.org/software/binutils and unpack it,])
+        AC_MSG_NOTICE([and point --with-binutils-src to the resulting directory, or use])
+        AC_MSG_NOTICE([--with-binutils to point to a pre-built binutils installation.])
+        AC_MSG_ERROR([Cannot continue])
+        ;;
+      *)
+        if test "x$HSDIS_LIBS" != x; then
+          AC_MSG_RESULT([$BINUTILS_DIR])
+        else
+          AC_MSG_RESULT([invalid])
+          AC_MSG_ERROR([$BINUTILS_DIR does not contain a proper binutils installation])
+        fi
+        ;;
+    esac
+  else
+    AC_MSG_RESULT([invalid])
+    AC_MSG_ERROR([Incorrect hsdis backend "$with_hsdis"])
+  fi
+
+  AC_SUBST(HSDIS_BACKEND)
+  AC_SUBST(HSDIS_CFLAGS)
+  AC_SUBST(HSDIS_LIBS)
+])

make/autoconf/jdk-version.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2021, 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
@@ -536,7 +536,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD"
     # If VERSION_OPT consists of only numbers and periods, add it.
     if [ [[ $VERSION_OPT =~ ^[0-9\.]+$ ]] ]; then
-      MACOSX_BUNDLE_BUILD_VERSION+=".$VERSION_OPT"
+      MACOSX_BUNDLE_BUILD_VERSION="$MACOSX_BUNDLE_BUILD_VERSION.$VERSION_OPT"
     fi
   fi
   AC_SUBST(MACOSX_BUNDLE_BUILD_VERSION)

make/autoconf/jvm-features.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@ m4_define(jvm_features_valid, m4_normalize( \
     ifdef([custom_jvm_features_valid], custom_jvm_features_valid) \
     \
     cds compiler1 compiler2 dtrace epsilongc g1gc jfr jni-check \
-    jvmci jvmti link-time-opt management minimal nmt opt-size parallelgc \
+    jvmci jvmti link-time-opt management minimal opt-size parallelgc \
     serialgc services shenandoahgc static-build vm-structs zero zgc \
 ))
 
@@ -68,7 +68,6 @@ m4_define(jvm_feature_desc_jvmti, [enable Java Virtual Machine Tool Interface (J
 m4_define(jvm_feature_desc_link_time_opt, [enable link time optimization])
 m4_define(jvm_feature_desc_management, [enable java.lang.management API support])
 m4_define(jvm_feature_desc_minimal, [support building variant 'minimal'])
-m4_define(jvm_feature_desc_nmt, [include native memory tracking (NMT)])
 m4_define(jvm_feature_desc_opt_size, [optimize the JVM library for size])
 m4_define(jvm_feature_desc_parallelgc, [include the parallel garbage collector])
 m4_define(jvm_feature_desc_serialgc, [include the serial garbage collector])
@@ -443,7 +442,7 @@ AC_DEFUN([JVM_FEATURES_PREPARE_VARIANT],
     JVM_FEATURES_VARIANT_FILTER="compiler2 jvmci link-time-opt opt-size"
   elif test "x$variant" = "xminimal"; then
     JVM_FEATURES_VARIANT_FILTER="cds compiler2 dtrace epsilongc g1gc \
-        jfr jni-check jvmci jvmti management nmt parallelgc services \
+        jfr jni-check jvmci jvmti management parallelgc services \
         shenandoahgc vm-structs zgc"
     if test "x$OPENJDK_TARGET_CPU" = xarm ; then
       JVM_FEATURES_VARIANT_FILTER="$JVM_FEATURES_VARIANT_FILTER opt-size"
@@ -538,10 +537,6 @@ AC_DEFUN([JVM_FEATURES_VERIFY],
     AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services' for variant '$variant'])
   fi
 
-  if JVM_FEATURES_IS_ACTIVE(management) && ! JVM_FEATURES_IS_ACTIVE(nmt); then
-    AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt' for variant '$variant'])
-  fi
-
   # For backwards compatibility, disable a feature "globally" if one variant
   # is missing the feature.
   if ! JVM_FEATURES_IS_ACTIVE(cds); then

make/autoconf/lib-bundled.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -217,9 +217,6 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
   LIBZ_LIBS=""
   if test "x$USE_EXTERNAL_LIBZ" = "xfalse"; then
     LIBZ_CFLAGS="$LIBZ_CFLAGS -I$TOPDIR/src/java.base/share/native/libzip/zlib"
-    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-        LIBZ_CFLAGS="$LIBZ_CFLAGS -DHAVE_UNISTD_H"
-    fi
   else
     LIBZ_LIBS="-lz"
   fi

make/autoconf/lib-ffi.m4

@@ -149,7 +149,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
           else
             AC_MSG_ERROR([Could not locate libffi.so.? for bundling])
           fi
-        elif test "x${OPENJDK_TARGET_CPU}" = "xx86_64"; then
+        elif test "x${OPENJDK_TARGET_CPU}" = "xx86_64" || test "x${OPENJDK_TARGET_CPU}" = "xaarch64"; then
           if test -e ${SYSROOT}/usr/lib64/libffi.so.? ; then
             LIBFFI_LIB_FILE="${SYSROOT}/usr/lib64/libffi.so.?"
           elif test -e ${SYSROOT}/usr/lib/x86_64-linux-gnu/libffi.so.? ; then

make/autoconf/lib-wayland.m4

@@ -0,0 +1,91 @@
+#
+# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2021, JetBrains s.r.o.. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################################
+# Setup wayland
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
+[
+  AC_ARG_WITH(wayland, [AS_HELP_STRING([--with-wayland],
+      [specify prefix directory for the wayland package
+      (expecting the headers under PATH/include)])])
+  AC_ARG_WITH(wayland-include, [AS_HELP_STRING([--with-wayland-include],
+      [specify directory for the wayland include files])])
+
+  if test "x$NEEDS_LIB_WAYLAND" = xfalse; then
+    if (test "x${with_wayland}" != x && test "x${with_wayland}" != xno) || \
+        (test "x${with_wayland_include}" != x && test "x${with_wayland_include}" != xno); then
+      AC_MSG_WARN([[wayland not used, so --with-wayland[-*] is ignored]])
+    fi
+    WAYLAND_CFLAGS=
+    WAYLAND_LIBS=
+  else
+    WAYLAND_FOUND=no
+
+    if test "x${with_wayland}" = xno || test "x${with_wayland_include}" = xno; then
+      AC_MSG_ERROR([It is not possible to disable the use of wayland. Remove the --without-wayland option.])
+    fi
+
+    if test "x${with_wayland}" != x; then
+      AC_MSG_CHECKING([for wayland headers])
+      if test -s "${with_wayland}/include/wayland-client.h"; then
+        WAYLAND_CFLAGS="-I${with_wayland}/include"
+        WAYLAND_LIBS="-L${with_wayland}/lib -lwayland-client"
+
+        WAYLAND_FOUND=yes
+        AC_MSG_RESULT([$WAYLAND_FOUND])
+      else
+        AC_MSG_ERROR([Can't find 'include/wayland-client.h' under ${with_wayland} given with the --with-wayland option.])
+      fi
+    fi
+    if test "x${with_wayland_include}" != x; then
+      AC_MSG_CHECKING([for wayland headers])
+      if test -s "${with_wayland_include}/wayland-client.h"; then
+        WAYLAND_CFLAGS="-I${with_wayland_include}"
+        WAYLAND_FOUND=yes
+        AC_MSG_RESULT([$WAYLAND_FOUND])
+      else
+        AC_MSG_ERROR([Can't find 'wayland-client.h' under ${with_wayland_include} given with the --with-wayland-include option.])
+      fi
+    fi
+    if test "x$WAYLAND_FOUND" = xno; then
+      # Are the wayland headers installed in the default /usr/include location?
+      AC_CHECK_HEADERS([wayland-client.h], [
+          WAYLAND_FOUND=yes
+          WAYLAND_CFLAGS=
+          WAYLAND_LIBS="-lwayland-client"
+          DEFAULT_WAYLAND=yes
+      ])
+    fi
+    if test "x$WAYLAND_FOUND" = xno; then
+      HELP_MSG_MISSING_DEPENDENCY([wayland])
+      AC_MSG_ERROR([Could not find wayland! $HELP_MSG ])
+    fi
+  fi
+
+  AC_SUBST(WAYLAND_CFLAGS)
+  AC_SUBST(WAYLAND_LIBS)
+])

make/autoconf/libraries.m4

@@ -33,22 +33,27 @@ m4_include([lib-std.m4])
 m4_include([lib-x11.m4])
 m4_include([lib-fontconfig.m4])
 m4_include([lib-tests.m4])
+m4_include([lib-wayland.m4])
 
 ################################################################################
 # Determine which libraries are needed for this configuration
 ################################################################################
 AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
 [
-  # Check if X11 is needed
+  # Check if X11 and wayland is needed
   if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    # No X11 support on windows or macosx
+    # No X11 and wayland support on windows or macosx
     NEEDS_LIB_X11=false
+    NEEDS_LIB_WAYLAND=false
   elif test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
     # No X11 support needed when building headless only
     NEEDS_LIB_X11=false
+    NEEDS_LIB_WAYLAND=false
   else
-    # All other instances need X11
+    # All other instances need X11 and wayland, even if building headless only, libawt still
+    # needs X11 headers.
     NEEDS_LIB_X11=true
+    NEEDS_LIB_WAYLAND=true
   fi
 
   # Check if fontconfig is needed
@@ -96,6 +101,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
 [
   LIB_SETUP_STD_LIBS
   LIB_SETUP_X11
+  LIB_SETUP_WAYLAND
   LIB_SETUP_CUPS
   LIB_SETUP_FONTCONFIG
   LIB_SETUP_FREETYPE

make/autoconf/platform.m4

@@ -212,7 +212,7 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_OS],
       VAR_OS=windows
       VAR_OS_ENV=windows.wsl
       ;;
-    *msys* | *mingw*)
+    *msys*)
       VAR_OS=windows
       VAR_OS_ENV=windows.msys2
       ;;

make/autoconf/spec.gmk.in

@@ -54,6 +54,9 @@ MAKE := @MAKE@
 # Make sure all shell commands are executed with the C locale
 export LC_ALL := C
 
+# Make sure we override any local CLASSPATH variable
+export CLASSPATH := @CLASSPATH@
+
 # The default make arguments
 MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
     MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" $(MAKE_LOG_VARS)
@@ -356,6 +359,10 @@ ENABLE_COMPATIBLE_CDS_ALIGNMENT := @ENABLE_COMPATIBLE_CDS_ALIGNMENT@
 
 ALLOW_ABSOLUTE_PATHS_IN_OUTPUT := @ALLOW_ABSOLUTE_PATHS_IN_OUTPUT@
 
+HSDIS_BACKEND := @HSDIS_BACKEND@
+HSDIS_CFLAGS := @HSDIS_CFLAGS@
+HSDIS_LIBS := @HSDIS_LIBS@
+
 # The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep
 # it in sync.
 BOOT_JDK:=@BOOT_JDK@
@@ -428,16 +435,7 @@ JCOV_FILTERS=@JCOV_FILTERS@
 export ASAN_ENABLED:=@ASAN_ENABLED@
 export DEVKIT_LIB_DIR:=@DEVKIT_LIB_DIR@
 ifeq ($(ASAN_ENABLED), yes)
-  export ASAN_OPTIONS=handle_segv=0:handle_sigfpe=0:detect_leaks=false
-  ifneq ($(DEVKIT_LIB_DIR),)
-    export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(DEVKIT_LIB_DIR)
-  endif
-endif
-
-# UndefinedBehaviorSanitizer
-export USAN_ENABLED:=@USAN_ENABLED@
-export DEVKIT_LIB_DIR:=@DEVKIT_LIB_DIR@
-ifeq ($(USAN_ENABLED), yes)
+  export ASAN_OPTIONS=handle_segv=0 detect_leaks=0
   ifneq ($(DEVKIT_LIB_DIR),)
     export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(DEVKIT_LIB_DIR)
   endif
@@ -446,7 +444,8 @@ endif
 # Necessary additional compiler flags to compile X11
 X_CFLAGS:=@X_CFLAGS@
 X_LIBS:=@X_LIBS@
-
+WAYLAND_CFLAGS:=@WAYLAND_CFLAGS@
+WAYLAND_LIBS:=@WAYLAND_LIBS@
 # The lowest required version of macosx
 MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
 # The highest allowed version of macosx

make/autoconf/toolchain.m4

@@ -51,7 +51,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
 
 # Minimum supported versions, empty means unspecified
 TOOLCHAIN_MINIMUM_VERSION_clang="3.5"
-TOOLCHAIN_MINIMUM_VERSION_gcc="5.0"
+TOOLCHAIN_MINIMUM_VERSION_gcc="6.0"
 TOOLCHAIN_MINIMUM_VERSION_microsoft="19.10.0.0" # VS2017
 TOOLCHAIN_MINIMUM_VERSION_xlc=""
 

make/autoconf/toolchain_microsoft.m4

@@ -103,6 +103,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
             vc/auxiliary/build/vcvarsx86_amd64.bat vc/auxiliary/build/vcvars64.bat"
       elif test "x$TARGET_CPU" = xaarch64; then
         # for host x86-64, target aarch64
+        # aarch64 requires Visual Studio 16.8 or higher
         VCVARSFILES="vc/auxiliary/build/vcvarsamd64_arm64.bat \
             vc/auxiliary/build/vcvarsx86_arm64.bat"
       fi

make/autoconf/util.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -230,6 +230,8 @@ AC_DEFUN([UTIL_GET_MATCHING_VALUES],
 # Converts an ISO-8601 date/time string to a unix epoch timestamp. If no
 # suitable conversion method was found, an empty string is returned.
 #
+# Sets the specified variable to the resulting list.
+#
 # $1: result variable name
 # $2: input date/time string
 AC_DEFUN([UTIL_GET_EPOCH_TIMESTAMP],
@@ -239,16 +241,11 @@ AC_DEFUN([UTIL_GET_EPOCH_TIMESTAMP],
     timestamp=$($DATE --utc --date=$2 +"%s" 2> /dev/null)
   else
     # BSD date
-    # ISO-8601 date&time in Zulu 'date'T'time'Z
-    timestamp=$($DATE -u -j -f "%FT%TZ" "$2" "+%s" 2> /dev/null)
+    timestamp=$($DATE -u -j -f "%F %T" "$2" "+%s" 2> /dev/null)
     if test "x$timestamp" = x; then
-      # BSD date cannot handle trailing milliseconds.
-      # Try again ignoring characters at end
-      timestamp=$($DATE -u -j -f "%Y-%m-%dT%H:%M:%S" "$2" "+%s" 2> /dev/null)
-    fi
-    if test "x$timestamp" = x; then
-      # Perhaps the time was missing.
-      timestamp=$($DATE -u -j -f "%FT%TZ" "$2""T00:00:00Z" "+%s" 2> /dev/null)
+      # Perhaps the time was missing
+      timestamp=$($DATE -u -j -f "%F %T" "$2 00:00:00" "+%s" 2> /dev/null)
+      # If this did not work, we give up and return the empty string
     fi
   fi
   $1=$timestamp

make/common/JarArchive.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -193,8 +193,7 @@ define SetupJarArchiveBody
   $1_UPDATE_CONTENTS=\
       if [ "`$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
         $(ECHO) "  updating" `$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
-        $(SORT) $$($1_BIN)/_the.$$($1_JARNAME)_contents > $$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted && \
-        $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted; \
+        $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents; \
       fi $$(NEWLINE)
   # The s-variants of the above macros are used when the jar is created from scratch.
   # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
@@ -213,9 +212,7 @@ define SetupJarArchiveBody
             | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
         $$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
   endif
-  $1_SUPDATE_CONTENTS=\
-      $(SORT) $$($1_BIN)/_the.$$($1_JARNAME)_contents > $$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted && \
-      $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted $$(NEWLINE)
+  $1_SUPDATE_CONTENTS=$$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)
 
   # Use a slightly shorter name for logging, but with enough path to identify this jar.
   $1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_JAR))

make/common/NativeCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -358,20 +358,6 @@ define SetupCompileNativeFileBody
       # Compile as preprocessed assembler file
       $1_FLAGS := $(BASIC_ASFLAGS) $$($1_BASE_ASFLAGS)
       $1_COMPILER := $(AS)
-
-      # gcc or clang assembly files must contain an appropriate relative .file
-      # path for reproducible builds.
-      ifneq ($(findstring $(TOOLCHAIN_TYPE), gcc clang), )
-        # If no absolute paths allowed, work out relative source file path
-        # for assembly .file substitution, otherwise use full file path
-        ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT), false)
-          $1_REL_ASM_SRC := $$(call RelativePath, $$($1_FILE), $(WORKSPACE_ROOT))
-        else
-          $1_REL_ASM_SRC := $$($1_FILE)
-        endif
-        $1_FLAGS := $$($1_FLAGS) -DASSEMBLY_SRC_FILE='"$$($1_REL_ASM_SRC)"' \
-            -include $(TOPDIR)/make/data/autoheaders/assemblyprefix.h
-      endif
     else ifneq ($$(filter %.cpp %.cc %.mm, $$($1_FILENAME)), )
       # Compile as a C++ or Objective-C++ file
       $1_FLAGS := $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) $$($1_BASE_CXXFLAGS) \
@@ -403,13 +389,6 @@ define SetupCompileNativeFileBody
     $1_OBJ_DEPS := $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \
         $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE)
     $1_COMPILE_OPTIONS := $$($1_FLAGS) $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)
-    # For reproducible builds with gcc and clang ensure random symbol generation is
-    # seeded deterministically
-    ifneq ($(findstring $(TOOLCHAIN_TYPE), gcc clang), )
-       ifeq ($$(ENABLE_REPRODUCIBLE_BUILD), true)
-         $1_COMPILE_OPTIONS += -frandom-seed="$$($1_FILENAME)"
-       endif
-    endif
 
     $$($1_OBJ_JSON): $$($1_OBJ_DEPS)
 	$$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$($1_SRC_FILE), \