Merge remote branch 'origin/master' into edge

Author: automatic-merge

.github/workflows/build-binaries.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14, ubuntu-20.04, windows-latest]
+        os: [macos-13, macos-14, ubuntu-20.04, ubuntu-22.04-arm, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Setup Python
@@ -55,7 +55,10 @@ jobs:
         shell: bash
         run: |
           # alire-project/setup-alire works for ARM64 Mac OS X now. Shall we use it?
-          if [[ "$RUNNER_ARCH" == ARM64 ]] ; then
+          if [[ ${{ matrix.os }} == ubuntu-22.04-arm ]] ; then
+            # Alire 2.1.0 was built for ubuntu 24.04, doesn't work on 22.04
+            ZIP=nightly/alr-nightly-bin-aarch64-linux.zip
+          elif [[ "$RUNNER_ARCH" == ARM64 ]] ; then
             ZIP=v2.0.2/alr-2.0.2-bin-aarch64-${RUNNER_OS}.zip
           else
             ZIP=v2.0.2/alr-2.0.2-bin-x86_64-${RUNNER_OS}.zip
@@ -65,21 +68,6 @@ jobs:
           bin/alr index --reset-community
           bin/alr toolchain --select gnat_native gprbuild
           echo $PWD/bin >> $GITHUB_PATH
-      - name: Get cross GNAT toolchain (Linux)
-        if: ${{ runner.os == 'Linux' }}
-        env:
-          AWS_ACCESS_KEY_ID: ${{secrets.GHA_CACHE_ACCESS_KEY_ID}}
-          AWS_SECRET_ACCESS_KEY: ${{secrets.GHA_CACHE_SECRET}}
-          AWS_DEFAULT_REGION: eu-west-1
-        run: |
-            sudo apt install -y libc6-dev-arm64-cross linux-libc-dev-arm64-cross binutils-aarch64-linux-gnu
-            aws s3 cp s3://adacore-gha-tray-eu-west-1/toolchain/aarch64-Linux-gcc-14.2.tar.bz2 . --sse=AES256
-            aws s3 cp s3://adacore-gha-tray-eu-west-1/toolchain/aarch64-Linux-gmp-6.2.1.tar.bz2 . --sse=AES256
-            sudo tar xjf aarch64-Linux-gcc-14.2.tar.bz2  -C /
-            sudo tar xjf aarch64-Linux-gmp-6.2.1.tar.bz2 -C /
-        # This step can fail on personal forks that don't have credentials for
-        # AWS. Allow failure so that the non-cross build still gets performed.
-        continue-on-error: true
       - name: Fetch dependency commits numbers
         shell: bash
         if: ${{ env.TAG != env.DEFAULT_TAG }}
@@ -94,20 +82,6 @@ jobs:
         shell: bash
         run: |
           scripts/build_als.sh all "$TAG"
-      - name: Build ALS with cross (Linux)
-        if: ${{ runner.os == 'Linux' }}
-        run: |
-          if alr exec -- gprconfig --show-targets | grep aarch64-linux; then
-            export GPRBUILD_EXTRA=--target=aarch64-linux
-            export NODE_ARCH_PLATFORM=arm64/linux
-            find . -name '*.ali' -delete
-            find . -name '*.[ao]' -delete
-            scripts/build_als.sh build_als   "$TAG" arm64/linux
-            scripts/build_als.sh strip_debug "$TAG" arm64/linux
-          else
-            echo "No AArch64 cross compiler found:"
-            alr exec -- gprconfig --show-targets || true
-          fi
       - name: Test
         shell: bash
         run: |
@@ -134,9 +108,6 @@ jobs:
         if: ${{ env.TAG != env.DEFAULT_TAG }}
         run: |
           .github/workflows/release.sh "${{ secrets.GITHUB_TOKEN }}" $TAG ""
-          if [ -f integration/vscode/ada/arm64/linux/ada_language_server ] ; then
-            .github/workflows/release.sh "${{ secrets.GITHUB_TOKEN }}" $TAG arm64/linux
-          fi
       - name: Package
         shell: bash
         run: |

Makefile

@@ -14,12 +14,13 @@ PROCESSORS ?= 0
 ifeq ($(OS),Windows_NT)
    PYTHON=python.exe
    EXE=.exe
+   LSP_OS=$(OS)
 else
    UNAME_S := $(shell uname -s)
    ifeq ($(UNAME_S),Linux)
-      OS=unix
+      LSP_OS=unix
    else ifeq ($(UNAME_S),Darwin)
-      OS=osx
+      LSP_OS=osx
    endif
    PYTHON=python3
    EXE=
@@ -77,7 +78,7 @@ endif
 VSCE=npx vsce
 
 LIBRARY_FLAGS=-XBUILD_MODE=$(BUILD_MODE)	\
-              -XOS=$(OS)			\
+              -XLSP_OS=$(LSP_OS)		\
               -XLIBRARY_TYPE=$(LIBRARY_TYPE)	\
               -XXMLADA_BUILD=$(LIBRARY_TYPE)	\
 	      -XGPR_BUILD=$(LIBRARY_TYPE)

gnat/lsp_server.gpr

@@ -26,8 +26,7 @@ project LSP_Server is
    Library_Type : Library_Kind := external("ALS_LIBRARY_TYPE",
                                   external("LIBRARY_TYPE", "relocatable"));
 
-   type OS_KIND is ("Windows_NT", "unix", "osx");
-   OS : OS_KIND := external("OS", "unix");
+   OS : LSP_Common.OS_API_KIND := LSP_Common.OS_API;
 
    for Source_Dirs use
      ("../source/server",

subprojects/als.toml

@@ -13,11 +13,11 @@ tags = ["lsp", "vscode"]
 ADA_PROJECT_PATH.set= "${CRATE_ROOT}/subprojects/stubs"
 
 [gpr-set-externals."case(os)".linux]
-OS = "unix"
+LSP_OS = "unix"
 [gpr-set-externals."case(os)".macos]
-OS = "osx"
+LSP_OS = "osx"
 [gpr-set-externals."case(os)".windows]
-OS = "Windows_NT"
+LSP_OS = "Windows_NT"
 
 [[depends-on]]
 gnatcoll         = "^24.0.0"

subprojects/spawn.toml

@@ -14,9 +14,9 @@ tags = ["process", "launch", "pipe"]
 disabled = true
 
 [gpr-externals]
-OS = ["unix", "osx", "Windows_NT"]
+SPAWN_OS = ["unix", "osx", "Windows_NT"]
 
 [gpr-set-externals.'case(os)']
-linux   = { OS = "unix" } # Compact table syntax is convenient in this case
-windows = { OS = "Windows_NT" }  # to see all enumeration values, one per row.
-macos   = { OS = "osx" }
+linux   = { SPAWN_OS = "unix" } # Compact table syntax is convenient in this case
+windows = { SPAWN_OS = "Windows_NT" }  # to see all enumeration values, one per row.
+macos   = { SPAWN_OS = "osx" }