GNATprove 14.1

alire-project · May 30, 2024 · 195ae49 · 195ae49
1 parent 7da1df3
commit 195ae49
Show file tree

Hide file tree

Showing 16 changed files with 344 additions and 106 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -7,8 +7,8 @@ on:
 
 
 jobs:
-  gnat_gprbuild:
-    name: GNAT Linux and GPRbuild
+  gnat:
+    name: GNAT Linux
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout Project
@@ -38,14 +38,6 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
 
-    - name: Build GPRbuild
-      run: ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup
-
-    - name: Package GPRbuild
-      run: ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
-
     - uses: actions/upload-artifact@v2
       with:
         name: anod-artifacts
@@ -60,19 +52,13 @@ jobs:
 
 
 
-  gnatcov:
-    name: GNATcov
-    needs: gnat_gprbuild
+  gprbuild_gnatcov:
+    name: GPRbuild and GNATcov
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout Project
       uses: actions/checkout@v2
 
-    - uses: actions/download-artifact@v2
-      with:
-        name: anod-artifacts
-        path: in_artifacts/
-
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
@@ -83,6 +69,14 @@ jobs:
         python -m pip install --upgrade pip
         pip install e3-core==22.1.0
 
+    - name: Build GPRbuild
+      run: ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup
+
+    - name: Package GPRbuild
+      run: ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
+
     - name: Build GNATcov
       run: ./anod build gnatcov -v --loglevel DEBUG --enable-cleanup
 
@@ -104,7 +98,7 @@ jobs:
       matrix:
         target: ["arm-elf", "riscv64-elf", "avr-elf"]
     name: GNAT ${{ matrix.target }}-linux
-    needs: gnat_gprbuild
+    needs: gnat
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout Project
@@ -155,7 +149,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'adacore/why3'
-          ref: 'fsf-13'
+          ref: 'fsf-14'
 
       - name: Use Setup OCaml {{ matrix.ocaml-version }}
         uses: ocaml/setup-ocaml@v2
@@ -193,7 +187,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'adacore/alt-ergo'
-          ref: 'master'
+          ref: 'fsf-14'
 
       - name: Use Setup OCaml {{ matrix.ocaml-version }}
         uses: ocaml/setup-ocaml@v2

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -7,8 +7,8 @@ on:
 
 
 jobs:
-  gnat_gprbuild:
-    name: GNAT macOS and GPRbuild
+  gnat:
+    name: GNAT macOS
     runs-on: macos-12
     steps:
     - name: Checkout Project
@@ -35,14 +35,6 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
 
-    - name: Build GPRbuild
-      run: ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup
-
-    - name: Package GPRbuild
-      run: ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
-
     - uses: actions/upload-artifact@v2
       with:
         name: anod-artifacts
@@ -56,20 +48,13 @@ jobs:
         retention-days: 5
 
 
-
-  gnatcov:
-    name: GNATcov
-    needs: gnat_gprbuild
+  gprbuild_gnatcov:
+    name: GPRbuild and GNATcov
     runs-on: macos-12
     steps:
     - name: Checkout Project
       uses: actions/checkout@v2
 
-    - uses: actions/download-artifact@v2
-      with:
-        name: anod-artifacts
-        path: in_artifacts/
-
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
@@ -80,6 +65,15 @@ jobs:
         python -m pip install --upgrade pip
         pip install e3-core==22.1.0
 
+    - name: Build GPRbuild
+      run: ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup
+
+    - name: Package GPRbuild
+      run: ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
+
+
     - name: Build GNATcov
       run: ./anod build gnatcov -v --loglevel DEBUG --enable-cleanup
 
@@ -101,7 +95,7 @@ jobs:
       matrix:
         target: ["arm-elf", "riscv64-elf", "avr-elf"]
     name: GNAT ${{ matrix.target }}-darwin
-    needs: gnat_gprbuild
+    needs: gnat
     runs-on: macos-12
     steps:
     - name: Checkout Project
@@ -151,7 +145,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'adacore/why3'
-          ref: 'fsf-13'
+          ref: 'fsf-14'
 
       - name: Use Setup OCaml {{ matrix.ocaml-version }}
         uses: ocaml/setup-ocaml@v2
@@ -190,7 +184,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'adacore/alt-ergo'
-          ref: 'master'
+          ref: 'fsf-14'
 
       - name: Use Setup OCaml {{ matrix.ocaml-version }}
         uses: ocaml/setup-ocaml@v2

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -6,8 +6,8 @@ on:
   pull_request:
 
 jobs:
-  gnat_gprbuild:
-    name: GNAT Windows and gprbuild
+  gnat:
+    name: GNAT Windows
     runs-on: windows-2019
     env:
       CONFIG_SHELL: /bin/bash
@@ -49,14 +49,6 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
 
-    - name: Build GPRbuild
-      run: mount C:/aaa /aaa && cd /aaa/GNAT-FSF-builds && python3 ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup
-
-    - name: Package GPRbuild
-      run: mount C:/aaa /aaa && cd /aaa/GNAT-FSF-builds && python3 ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
-
     - uses: actions/upload-artifact@v2
       with:
         name: anod-artifacts
@@ -71,9 +63,8 @@ jobs:
 
 
 
-  gnatcov:
-    name: GNATcov
-    needs: gnat_gprbuild
+  gprbuild_gnatcov:
+    name: GPRbuild and GNATcov
     runs-on: windows-2019
     env:
       CONFIG_SHELL: /bin/bash
@@ -104,10 +95,14 @@ jobs:
       # We need a path that is compatible between Windows and Unix world
       run: df -h; mkdir /c/aaa; mount C:/aaa /aaa ; cd ..; cp -r GNAT-FSF-builds /c/aaa
 
-    - uses: actions/download-artifact@v2
-      with:
-        name: anod-artifacts
-        path: C:/aaa/GNAT-FSF-builds/in_artifacts/
+
+    - name: Build GPRbuild
+      run: mount C:/aaa /aaa && cd /aaa/GNAT-FSF-builds && python3 ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup
+
+    - name: Package GPRbuild
+      run: mount C:/aaa /aaa && cd /aaa/GNAT-FSF-builds && python3 ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool
 
 
     - name: Build GNATcov
@@ -134,7 +129,7 @@ jobs:
       matrix:
         target: ["arm-elf", "riscv64-elf", "avr-elf"]
     name: GNAT ${{ matrix.target }}-windows
-    needs: gnat_gprbuild
+    needs: gnat
     runs-on: windows-2019
     env:
       CONFIG_SHELL: /bin/bash
@@ -200,7 +195,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'adacore/why3'
-          ref: 'fsf-13'
+          ref: 'fsf-14'
 
       - name: Use Setup OCaml v1 ${{ matrix.ocaml-version }}
         uses: ocaml/setup-ocaml@v2
@@ -238,7 +233,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'adacore/alt-ergo'
-          ref: 'master'
+          ref: 'fsf-14'
 
       - name: Use Setup OCaml {{ matrix.ocaml-version }}
         uses: ocaml/setup-ocaml@v2

diff --git a/specs/adasat.anod b/specs/adasat.anod
@@ -0,0 +1,71 @@
+from e3.anod.spec import Anod
+from e3.anod.loader import spec
+
+import os
+
+
+class AdaSAT(spec("common")):
+    @property
+    def version(self):
+        return "24.0.0"
+
+    @property
+    def tarball(self):
+        return "adasat-%s.tar.gz" % self.version
+
+    @property
+    def source_pkg_build(self):
+        return [
+            self.HTTPSSourceBuilder(
+                name=self.tarball,
+                url="https://github.com/AdaCore/AdaSAT/archive/v%s.tar.gz"
+                % self.version,
+            )
+        ]
+
+    @property
+    def build_source_list(self):
+        return [Anod.Source(name=self.tarball, publish=True, dest="")]
+
+    @property
+    def build_deps(self):
+        return [
+            Anod.Dependency("base_gcc", track=True),
+            Anod.Dependency("gprbuild", track=True),
+        ]
+
+    @Anod.primitive()
+    def build(self):
+        for m in self.deps:
+            self.deps[m].setenv()
+
+        gpr_file = os.path.join(self["SRC_DIR"], "adasat.gpr")
+        build_mode = "prod"
+
+        for library_type in ["static"]:
+            self.shell(
+                "gprbuild",
+                "-p",
+                "-P",
+                gpr_file,
+                "-j" + str(self.jobs),
+                "--relocate-build-tree=" + library_type,
+                "-XADASAT_BUILD_MODE=" + build_mode,
+                "-XADASAT_LIBRARY_TYPE=" + library_type,
+            )
+
+            self.shell(
+                "gprinstall",
+                "-f",
+                "-p",
+                "-P",
+                gpr_file,
+                "--relocate-build-tree=" + library_type,
+                "--prefix=" + self["INSTALL_DIR"],
+                "-XADASAT_BUILD_MODE=" + build_mode,
+                "-XADASAT_LIBRARY_TYPE=" + library_type,
+                "--build-var=LIBRARY_TYPE",
+                "--build-name=" + library_type,
+            )
+
+        self.clean()
diff --git a/specs/base_gcc.anod b/specs/base_gcc.anod
@@ -8,7 +8,7 @@ from e3.anod.spec import Anod
 class base_gcc(spec("common")):
     @property
     def version(self):
-        return "13.2.0-2"
+        return "14.1.0-2"
 
     @property
     def tarball(self):

diff --git a/specs/binutils.anod b/specs/binutils.anod
@@ -39,16 +39,6 @@ class Binutils(spec("common")):
             Anod.Dependency("isl", target="host"),
         ]
 
-        if self.env.is_canadian:
-            deps.append(
-                Anod.Dependency(
-                    name="gcc",
-                    host="build",
-                    target="host",
-                    local_name="canadian-cross-compiler",
-                )
-            )
-
         return deps
 
     def merge(self, prefix):

diff --git a/specs/gnatcov.anod b/specs/gnatcov.anod
@@ -40,7 +40,7 @@ class GNATcov(spec("common")):
     @property
     def build_deps(self):
         deps = [
-            Anod.Dependency("gcc", track=True),
+            Anod.Dependency("base_gcc", track=True),
             Anod.Dependency("gprbuild", track=True),
             Anod.Dependency("libgpr", track=True),
             Anod.Dependency("gnatcoll", track=True),

diff --git a/specs/gnatutil.anod b/specs/gnatutil.anod
@@ -25,7 +25,7 @@ class GNATUTIL(spec("common")):
     @property
     def build_deps(self):
         return [
-            Anod.Dependency("gcc", track=True),
+            Anod.Dependency("base_gcc", track=True),
             Anod.Dependency("gprbuild", track=True),
         ]
 

diff --git a/specs/gprconfig_kb.anod b/specs/gprconfig_kb.anod
@@ -5,7 +5,7 @@ from e3.anod.loader import spec
 class GPRconfig_KB(spec("common")):
     @property
     def version(self):
-        return "23.0.0"
+        return "24.0.0"
 
     @property
     def tarball(self):

diff --git a/specs/langkit.anod b/specs/langkit.anod
@@ -30,7 +30,7 @@ class Langkit(spec("common")):
     @property
     def build_deps(self):
         return [
-            Anod.Dependency("gcc", track=True),
+            Anod.Dependency("base_gcc", track=True),
             Anod.Dependency("gprbuild", track=True),
             Anod.Dependency("libgpr", track=True),
             Anod.Dependency("gnatcoll", track=True),