Merge branch 'topic/alire-build' into 'master'

Improve ALS Alire-based build script

See merge request eng/ide/ada_language_server!1862

.github/workflows/build-binaries.yml

@@ -66,6 +66,9 @@ jobs:
             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 }}
@@ -79,8 +82,6 @@ jobs:
       - name: Build
         shell: bash
         run: |
-          alr settings --global --set dependencies.shared false
-          pip3 install e3-testsuite
           scripts/build_als.sh all "$TAG"
       - name: Build ALS with cross (Linux)
         if: ${{ runner.os == 'Linux' }}

.gitignore

@@ -110,3 +110,7 @@ testsuite/ada_lsp/project_symlinks/link
 # Temporary and output directories of e3-testsuite
 tmp/
 out/
+
+# Alire-generated directories
+alire/
+config/

Makefile

@@ -105,7 +105,7 @@ endif
 
 all: coverage-instrument
 ifeq ($(ALIRE),True)
-	alr build -- -XVERSION=$(VERSION) -XBUILD_DATE=$(BUILD_DATE) $(GPRBUILD_FLAGS)
+	alr build -- -XVERSION=$(VERSION) -XBUILD_DATE=$(BUILD_DATE) $(GPRBUILD_FLAGS) $(GPRBUILD_CARGS)
 else
 	# We have our own s-memory.adb which overwrites the default System.Memory implementation
         # For unclear reasons, this file is not recompiled when the version of GNAT was changed

gnat/lsp_common.gpr

@@ -85,7 +85,7 @@ abstract project LSP_Common is
 
    package Compiler is
       for Default_Switches ("Ada") use Common_Ada_Switches & Ada_Switches;
-      for Local_Configuration_Pragmas use "gnat.adc";
+      for Local_Configuration_Pragmas use "als-gnat.adc";
    end Compiler;
 
    package Pretty_Printer is

gnat/lsp_gen.gpr

@@ -77,7 +77,7 @@ project LSP_Gen is
 
    package Compiler is
       for Default_Switches ("Ada") use Common_Ada_Switches & Ada_Switches;
-      for Local_Configuration_Pragmas use "gnat.adc";
+      for Local_Configuration_Pragmas use "als-gnat.adc";
    end Compiler;
 
    package Binder is

gnat/lsp_server.gpr

@@ -63,7 +63,7 @@ project LSP_Server is
           & ("-gnateDVERSION=""" & VERSION & """",
              "-gnateDBUILD_DATE=""" & BUILD_DATE & """");
       for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg");
-      for Local_Configuration_Pragmas use "gnat.adc";
+      for Local_Configuration_Pragmas use "als-gnat.adc";
    end Compiler;
 
    package Linker is