gprbuild and gnatcov 23.0

.github/workflows/linux.yml

@@ -7,8 +7,8 @@ on:
 
 
 jobs:
-  gnat_gprbuild:
-    name: GNAT Linux and GPRbuild
+  gnat:
+    name: GNAT Linux
     runs-on: ubuntu-18.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,14 @@ jobs:
 
 
 
-  gnatcov:
-    name: GNATcov
-    needs: gnat_gprbuild
+  gprbuild_gnatcov:
+    name: GPRbuild and GNATcov
+    needs: gnat
     runs-on: ubuntu-18.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:
@@ -81,7 +68,15 @@ jobs:
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install e3-core==22.1.0
+        pip install e3-core==22.1.0 funcy docutils mako
+
+    - 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 +99,7 @@ jobs:
       matrix:
         target: ["arm-elf", "riscv64-elf", "avr-elf"]
     name: GNAT ${{ matrix.target }}-linux
-    needs: gnat_gprbuild
+    needs: gnat
     runs-on: ubuntu-18.04
     steps:
     - name: Checkout Project
@@ -220,7 +215,7 @@ jobs:
 
   spark:
     name: spark
-    needs: [gnat_gprbuild, why3, alt_ergo]
+    needs: [gnat, why3, alt_ergo]
     runs-on: ubuntu-18.04
     steps:
     - name: Checkout Project
@@ -269,7 +264,7 @@ jobs:
 
   sanity_checking:
     name: Sanity Checking
-    needs: [gnat_gprbuild, gnatcov, spark]
+    needs: [gnat, gprbuild_gnatcov, spark]
     runs-on: ubuntu-18.04
     steps:
     - name: Checkout Project

.github/workflows/macos.yml

@@ -7,8 +7,8 @@ on:
 
 
 jobs:
-  gnat_gprbuild:
-    name: GNAT macOS and GPRbuild
+  gnat:
+    name: GNAT macOS
     runs-on: macos-10.15
     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
@@ -57,19 +49,13 @@ jobs:
 
 
 
-  gnatcov:
-    name: GNATcov
-    needs: gnat_gprbuild
+  gprbuild_gnatcov:
+    name: GPRbuild and GNATcov
     runs-on: macos-10.15
     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:
@@ -78,7 +64,16 @@ jobs:
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install e3-core==22.1.0
+        pip install e3-core==22.1.0 funcy docutils mako
+
+    - 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 +96,7 @@ jobs:
       matrix:
         target: ["arm-elf", "riscv64-elf", "avr-elf"]
     name: GNAT ${{ matrix.target }}-darwin
-    needs: gnat_gprbuild
+    needs: gnat
     runs-on: macos-10.15
     steps:
     - name: Checkout Project
@@ -218,7 +213,7 @@ jobs:
 
   spark:
     name: SPARK
-    needs: [gnat_gprbuild, why3, alt_ergo]
+    needs: [gnat, why3, alt_ergo]
     runs-on: macos-10.15
     steps:
     - name: Checkout Project
@@ -268,7 +263,7 @@ jobs:
 
   sanity_checking:
     name: Sanity Checking
-    needs: [gnat_gprbuild, gnatcov, spark]
+    needs: [gnat, gprbuild_gnatcov, spark]
     runs-on: macos-10.15
     steps:
     - name: Checkout Project

.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
@@ -98,16 +89,20 @@ jobs:
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install e3-core==22.1.0
+        pip install e3-core==22.1.0 funcy docutils mako
 
     - name: Prepare msys2 build setup
       # 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
@@ -266,7 +261,7 @@ jobs:
 
   spark:
     name: spark
-    needs: [gnat_gprbuild, why3, alt_ergo]
+    needs: [gnat, why3, alt_ergo]
     runs-on: windows-2019
     env:
       CONFIG_SHELL: /bin/bash
@@ -330,7 +325,7 @@ jobs:
 
   sanity_checking:
     name: Sanity Checking
-    needs: [gnat_gprbuild, gnatcov, spark]
+    needs: [gnat, gprbuild_gnatcov, spark]
     runs-on: windows-2019
     env:
       CONFIG_SHELL: /bin/bash

specs/base_gcc.anod

@@ -8,7 +8,7 @@ from e3.anod.spec import Anod
 class base_gcc(spec("common")):
     @property
     def version(self):
-        return "12.1.0-2"
+        return "12.2.0-1"
 
     @property
     def tarball(self):

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):

specs/gnatcoll-bindings.anod

@@ -8,7 +8,7 @@ import os
 class GNATcollBindings(spec("common")):
     @property
     def version(self):
-        return "22.0.0"
+        return "23.0.0"
 
     @property
     def tarball(self):
@@ -31,7 +31,7 @@ class GNATcollBindings(spec("common")):
     @property
     def build_deps(self):
         deps = [
-            Anod.Dependency("gcc"),
+            Anod.Dependency("base_gcc"),
             Anod.Dependency("gprbuild"),
             Anod.Dependency("gnatcoll"),
             Anod.Dependency("libgpr"),

specs/gnatcoll.anod

@@ -9,7 +9,7 @@ import os
 class GNATcoll(spec("common")):
     @property
     def version(self):
-        return "22.0.0"
+        return "23.0.0"
 
     @property
     def tarball(self):
@@ -32,7 +32,7 @@ class GNATcoll(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("xmlada", track=True),
             Anod.Dependency("libgpr", track=True),

specs/gnatcov.anod

@@ -7,13 +7,13 @@ from e3.diff import patch
 
 import os
 
-patch_name = "gnatcov.patch"
+patch_name = "gnatcov-23.0.patch"
 
 
 class GNATcov(spec("common")):
     @property
     def version(self):
-        return "22.0"
+        return "23.0"
 
     @property
     def tarball(self):
@@ -35,23 +35,24 @@ class GNATcov(spec("common")):
         return [
             Anod.Source(name=self.tarball, publish=True, dest=""),
             self.Source(name=patch_name, publish=True, unpack_cmd=cp, dest="patches"),
-        ]
+    ]
 
     @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),
             Anod.Dependency("gnatcoll-bindings", track=True),
-            Anod.Dependency("langkit", track=True),
+            Anod.Dependency("langkit_support", track=True),
             Anod.Dependency("libadalang", track=True),
             Anod.Dependency("binutils", track=True),
             Anod.Dependency("gnatutil", track=True),
             Anod.Dependency("xmlada", track=True),
             Anod.Dependency("zlib", track=True),
-            Anod.Dependency("gmp", track=True)
+            Anod.Dependency("gmp", track=True),
+            Anod.Dependency("libgpr2", track=True)
         ]
         if self.env.target.os.name == "windows":
             deps.append(Anod.Dependency("libiconv"))
@@ -86,6 +87,7 @@ class GNATcov(spec("common")):
         make_distrib.set_default_target("distrib-without-doc")
 
         for m in (make_all, make_distrib):
+            m.set_var("C_SUPPORT", "False")
             m.set_var("BITS_ARCH", str(self.env.target.cpu.bits))
             m.set_var("DISTRIB_ARCH", self.env.build.cpu.name)
             m.set_var("BUILD_MODE", build_mode)