Skip to content

Commit

Permalink
Merge branch 'stable-1.3.0' into release/emdee-0.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
SMerrony authored Jun 27, 2024
2 parents d116c8b + 22bb311 commit 58c37d9
Show file tree
Hide file tree
Showing 20 changed files with 441 additions and 4 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/build-distros.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:

build:
name: ${{ matrix.tag }}
env:
JOB_NAME: ${{ matrix.tag }}

runs-on: ubuntu-latest

Expand Down Expand Up @@ -67,4 +69,9 @@ jobs:
with:
image: ghcr.io/alire-project/docker/gnat:${{matrix.tag}}
command: ${{env.CHECKS_REPO}}/scripts/gh-build-crate.sh
params: -v ${{ github.workspace }}/alire_install/bin/alr:/usr/bin/alr
params: >
-v ${{ github.workspace }}/alire_install/bin/alr:/usr/bin/alr
-v ${{ github.event_path}}:/etc/event.json
-e GITHUB_EVENT_PATH=/etc/event.json
-e GITHUB_REPOSITORY=${{ github.repository }}
-e GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
6 changes: 6 additions & 0 deletions .github/workflows/build-native-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:

build:
name: ${{ matrix.os }}
env:
JOB_NAME: ${{ matrix.os }}

runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -61,3 +63,7 @@ jobs:
- name: Test crate
run: ${{env.CHECKS_REPO}}/scripts/gh-build-crate.sh
shell: bash
env:
GITHUB_EVENT_PATH: ${{ github.event_path }}
GITHUB_REPOSITORY: ${{ github.repository }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to apply labels/comment
6 changes: 6 additions & 0 deletions .github/workflows/build-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:

build:
name: ${{ matrix.os }}
env:
JOB_NAME: ${{ matrix.os }}

runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -67,3 +69,7 @@ jobs:
- name: Test crate
run: ${{env.CHECKS_REPO}}/scripts/gh-build-crate.sh
shell: bash
env:
GITHUB_EVENT_PATH: ${{ github.event_path }}
GITHUB_REPOSITORY: ${{ github.repository }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to apply labels/comment
6 changes: 6 additions & 0 deletions .github/workflows/build-ports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:

build:
name: ${{ matrix.os }}
env:
JOB_NAME: ${{ matrix.os }}

runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -65,3 +67,7 @@ jobs:
- name: Test crate
run: ${{env.CHECKS_REPO}}/scripts/gh-build-crate.sh
shell: bash
env:
GITHUB_EVENT_PATH: ${{ github.event_path }}
GITHUB_REPOSITORY: ${{ github.repository }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to apply labels/comment
25 changes: 25 additions & 0 deletions index/a0/a0b_atsam3x8e/a0b_atsam3x8e-0.1.0.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name = "a0b_atsam3x8e"
description = "A0B ATSAM3X8E MCU Support"
version = "0.1.0"

authors = ["Vadim Godunko"]
maintainers = ["Vadim Godunko <[email protected]>"]
maintainers-logins = ["godunko"]
licenses = "Apache-2.0 WITH LLVM-exception"
tags = ["a0b", "embedded", "atsam3x8e", "sam3x8e", "arduino", "due", "svd"]

project-files = ["gnat/a0b_atsam3x8e.gpr"]

[configuration]
generate_ada = false
generate_c = false
generate_gpr = true

[[depends-on]]
a0b_base = "*"
gnat_arm_elf = "*"

[origin]
commit = "31363204286f8f5f5215a021c6a86ebd87ba6056"
url = "git+https://github.com/godunko/a0b-atsam3x8e.git"

19 changes: 19 additions & 0 deletions index/a0/a0b_base/a0b_base-0.1.0.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name = "a0b_base"
description = "A0B: Base components"
version = "0.1.0"

authors = ["Vadim Godunko"]
maintainers = ["Vadim Godunko <[email protected]>"]
maintainers-logins = ["godunko"]
licenses = "Apache-2.0 WITH LLVM-exception"
tags = ["a0b", "types", "builtins"]

project-files=["gnat/a0b_base.gpr"]

[configuration]
disabled = true

[origin]
commit = "ae3e56f0be698970859a91eaa88855595b2f777e"
url = "git+https://github.com/godunko/a0b-base.git"

91 changes: 91 additions & 0 deletions index/ar/are/are-1.5.0.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
description = "Advanced Resource Embedder"
name = "are"
version = "1.5.0"
authors = ["[email protected]"]
licenses = "Apache-2.0"
maintainers = ["[email protected]"]
maintainers-logins = ["stcarrez"]
project-files = ["are_tool.gpr"]
tags = ["resource", "embedder", "generator"]
website = "https://gitlab.com/stcarrez/resource-embedder"
executables = ["are"]
long-description = """
[![Build Status](https://img.shields.io/endpoint?url=https://porion.vacs.fr/porion/api/v1/projects/resource-embedder/badges/build.json)](https://porion.vacs.fr/porion/projects/view/resource-embedder)
[![Test Status](https://img.shields.io/endpoint?url=https://porion.vacs.fr/porion/api/v1/projects/resource-embedder/badges/tests.json)](https://porion.vacs.fr/porion/projects/view/resource-embedder)
[![Coverage](https://img.shields.io/endpoint?url=https://porion.vacs.fr/porion/api/v1/projects/resource-embedder/badges/coverage.json)](https://porion.vacs.fr/porion/projects/view/resource-embedder)
[![Documentation Status](https://readthedocs.org/projects/resource-embedder/badge/?version=latest)](https://resource-embedder.readthedocs.io/en/latest/?badge=latest)
The resource embedder allows to embed files in binaries by producing C, Ada or Go source
files that contain the original files.
To generate a `config.ads` and `config.adb` Ada package with the resources, you may use:
```
are --lang=Ada -o src --resource=config --name-access --fileset='**/*.conf' config
```
Complex resource integrations are best described with and XML and are generated with:
```
are --lang=Ada -o src --rule=package.xml --name-access .
```
For Ada, it generates the following package declaration with the `Get_Content` function
that gives access to the files. The Ada body contains the content of each embedded file.
```Ada
package Config is
function Get_Content (Name : in String)
return access constant String;
end Config;
```
"""

[available.'case(os)']
linux = true
windows = true
macos = true
'...' = false

[[depends-on]]
xmlada = "~23.0.0"
utilada = "^2.6.0"
elada = "^1.8.6"

[gpr-externals]
ARE_BUILD = ["distrib", "debug", "optimize", "profile", "coverage"]
ARE_SWITCH = ["NO_CALLBACK", "HAS_CALLBACK"]
UTIL_OS = ["win32", "win64", "linux32", "linux64", "macos64", "netbsd32", "netbsd64", "freebsd32", "freebsd64"]

[gpr-set-externals]
ARE_BUILD = "distrib"
ARE_SWITCH = "HAS_CALLBACK"

[gpr-set-externals."case(os)".linux."case(word-size)".bits-32]
UTIL_OS = "linux32"

[gpr-set-externals."case(os)".linux."case(word-size)".bits-64]
UTIL_OS = "linux64"

[gpr-set-externals."case(os)".macos]
UTIL_OS = "macos64"

[gpr-set-externals."case(os)".windows."case(word-size)".bits-32]
UTIL_OS = "win32"

[gpr-set-externals."case(os)".windows."case(word-size)".bits-64]
UTIL_OS = "win64"

[configuration]
disabled = true

[environment]
PATH.prepend = "${CRATE_ROOT}/bin"
MANPATH.prepend = "${CRATE_ROOT}/man"

[origin]
commit = "492468e6cc293a393949ac800ce0ba76d6e899b0"
url = "git+https://gitlab.com/stcarrez/resource-embedder.git"

31 changes: 31 additions & 0 deletions index/ge/getada/getada-1.0.1.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name = "getada"
description = "The unofficial mac and linux installer for Alire."
version = "1.0.1"
licenses = "GPL-3.0-only"

website = "https://www.getada.dev/"
tags = [ "ada", "alire", "tool", "utility" ]

authors = ["A.J. Ianozi"]
maintainers = ["A.J. Ianozi <[email protected]>"]
maintainers-logins = ["AJ-Ianozi"]

executables = ["getada"]

# getada is only available on linux and macos right now.
# In case os is unknown getada will hope it's unix-like and give it a try.
[available.'case(os)']
linux = true
macos = true
os-unknown = true
'...' = false

[[depends-on]]
gnatcoll = "^24.0.0"
zipada = "^58.0.0"
gnat = ">=12 & <2000"

[origin]
commit = "e3e93ee60e9e1dec530952a89a7bc570ee99e062"
url = "git+https://github.com/AJ-Ianozi/getada.git"

31 changes: 31 additions & 0 deletions index/gn/gnat_arm_elf/gnat_arm_elf-14.1.3.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

name = "gnat_arm_elf"
version = "14.1.3"
provides = ["gnat=14.1.3"]
description = "The GNAT Ada compiler - ARM cross-compiler"
maintainers = ["[email protected]"]
maintainers-logins = ["Fabien-Chouteau"]
licenses = "GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1"

auto-gpr-with = false

[configuration]
disabled = true

[environment]
PATH.prepend = "${CRATE_ROOT}/bin"

[origin."case(os)".linux."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-arm-elf-linux64-14.1.0-3.tar.gz"
hashes = ["sha256:f019f928ab210097e6fbfda48efdbdc35f4a5d81af027ca47e0123801e89cd1b"]

[origin."case(os)".windows."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-arm-elf-windows64-14.1.0-3.tar.gz"
hashes = ["sha256:184f9b28565f0c6f849cf87b6268e65702821bea68b942f381fe4a517f806851"]

[origin."case(os)".macos."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-arm-elf-darwin-14.1.0-3.tar.gz"
hashes = ["sha256:daafae6dea9220d22d2b11ea8300ba001a4a8f26b8a471e6adcb04864de41861"]
31 changes: 31 additions & 0 deletions index/gn/gnat_avr_elf/gnat_avr_elf-14.1.3.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

name = "gnat_avr_elf"
version = "14.1.3"
provides = ["gnat=14.1.3"]
description = "The GNAT Ada compiler - RISC-V cross-compiler"
maintainers = ["[email protected]"]
maintainers-logins = ["Fabien-Chouteau"]
licenses = "GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1"

auto-gpr-with = false

[configuration]
disabled = true

[environment]
PATH.prepend = "${CRATE_ROOT}/bin"

[origin."case(os)".linux."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-avr-elf-linux64-14.1.0-3.tar.gz"
hashes = ["sha256:0722154e7f73b650ea9a6c9ebc4872b3cb2af4974adda9fde263b280a7ceef62"]

[origin."case(os)".windows."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-avr-elf-windows64-14.1.0-3.tar.gz"
hashes = ["sha256:e96aec3848717c4589f568cef6293d20c57ff1780a4078b01deea881ff0fe889"]

[origin."case(os)".macos."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-avr-elf-darwin-14.1.0-3.tar.gz"
hashes = ["sha256:36ddcda3dd7b60d38076a33fba5f1790ab7bb27666ccedf803a21e18deac299e"]
46 changes: 46 additions & 0 deletions index/gn/gnat_native/gnat_native-14.1.3.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

name = "gnat_native"
version = "14.1.3"
provides = ["gnat=14.1.3"]
description = "The GNAT Ada compiler - Native"
maintainers = ["[email protected]"]
maintainers-logins = ["Fabien-Chouteau"]
licenses = "GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1"

auto-gpr-with = false

[configuration]
disabled = true

[environment."case(os)".linux."case(host-arch)".x86-64]
PATH.prepend = "${CRATE_ROOT}/bin"
LIBRARY_PATH.prepend = "${CRATE_ROOT}/lib64"
LD_LIBRARY_PATH.prepend = "${CRATE_ROOT}/lib64"
LD_RUN_PATH.prepend = "${CRATE_ROOT}/lib64"

[environment."case(os)".windows."case(host-arch)".x86-64]
PATH.prepend = "${CRATE_ROOT}/bin"
LIBRARY_PATH.prepend = "${CRATE_ROOT}/lib"
LD_LIBRARY_PATH.prepend = "${CRATE_ROOT}/lib"
LD_RUN_PATH.prepend = "${CRATE_ROOT}/lib"

[environment."case(os)".macos."case(host-arch)".x86-64]
PATH.prepend = "${CRATE_ROOT}/bin"
LIBRARY_PATH.prepend = "${CRATE_ROOT}/lib"
LD_LIBRARY_PATH.prepend = "${CRATE_ROOT}/lib"
LD_RUN_PATH.prepend = "${CRATE_ROOT}/lib"

[origin."case(os)".linux."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-x86_64-linux-14.1.0-3.tar.gz"
hashes = ["sha256:965c1e0ebb3b78462557921122a2f7abba5af214fec4a22d072d1c9121a07015"]

[origin."case(os)".windows."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-x86_64-windows64-14.1.0-3.tar.gz"
hashes = ["sha256:6c25884a6d3d02b18f465116b4569820e6e5fbad70aa4c48676d36f73c0ebe1f"]

[origin."case(os)".macos."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-x86_64-darwin-14.1.0-3.tar.gz"
hashes = ["sha256:ece13bc531681252b89863fc557e963d0fccbf490b0e6e672b2876bd888d09f8"]
31 changes: 31 additions & 0 deletions index/gn/gnat_riscv64_elf/gnat_riscv64_elf-14.1.3.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

name = "gnat_riscv64_elf"
version = "14.1.3"
provides = ["gnat=14.1.3"]
description = "The GNAT Ada compiler - AVR cross-compiler"
maintainers = ["[email protected]"]
maintainers-logins = ["Fabien-Chouteau"]
licenses = "GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1"

auto-gpr-with = false

[configuration]
disabled = true

[environment]
PATH.prepend = "${CRATE_ROOT}/bin"

[origin."case(os)".linux."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-riscv64-elf-linux64-14.1.0-3.tar.gz"
hashes = ["sha256:9a6b9043a35db78d1ed901488eb45392495d14f51cc06f8e4ad7f06d68479e98"]

[origin."case(os)".windows."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-riscv64-elf-windows64-14.1.0-3.tar.gz"
hashes = ["sha256:88ba186a2630b52f297324a3316d7eb7a7cb68be4fe21a29e11420b25e287fe1"]

[origin."case(os)".macos."case(host-arch)".x86-64]
binary = true
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-14.1.0-3/gnat-riscv64-elf-darwin-14.1.0-3.tar.gz"
hashes = ["sha256:cff3a81e6e8d21bc00ab9428219822ebd14515995a87cb34a56449896cc1fe77"]
Loading

0 comments on commit 58c37d9

Please sign in to comment.