Skip to content

Commit

Permalink
Merge branch 'stable-1.3.0' into topic/cheddar
Browse files Browse the repository at this point in the history
  • Loading branch information
mosteo authored May 16, 2024
2 parents 9ebe6dd + 473cc1d commit fdbede1
Show file tree
Hide file tree
Showing 28 changed files with 657 additions and 26 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/authorship.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@ jobs:
ref: ${{github.base_ref}}
path: ${{env.CHECKS_REPO}}

- name: Set up nightly `alr`
uses: alire-project/setup-alire@v2
with:
version: nightly
toolchain: --disable-assistant
- name: Set up stable `alr`
uses: alire-project/setup-alire@v3

- name: Test authorship
run: ${{env.CHECKS_REPO}}/scripts/check-author.sh "${{ github.event.pull_request.user.login }}"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-distros.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Build Crate (Distro toolchain)
env:
CHECKS_ORG: alire-project
CHECKS_REPO: alire-index-checks
ALR_VERSION: 2.0.0
ALR_VERSION: 2.0.1

on:
pull_request:
Expand Down Expand Up @@ -50,14 +50,14 @@ jobs:

- name: Set up stable `alr`
if: contains(github.base_ref, 'stable-')
uses: alire-project/setup-alire@v2
uses: alire-project/setup-alire@v3
with:
toolchain: --disable-assistant # We want to use the external ones in this workflow
version: ${{env.ALR_VERSION}}

- name: Set up devel `alr`
if: contains(github.base_ref, 'devel-')
uses: alire-project/setup-alire@v2
uses: alire-project/setup-alire@v3
with:
toolchain: --disable-assistant # We want to use the external ones in this workflow
branch: master
Expand All @@ -67,4 +67,4 @@ 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
4 changes: 2 additions & 2 deletions .github/workflows/build-native-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fail-fast: false
matrix:
os:
- macos-latest
- macos-12
- ubuntu-latest
- windows-latest

Expand All @@ -50,7 +50,7 @@ jobs:
path: ${{env.CHECKS_REPO}}

- name: Set up devel `alr`
uses: alire-project/setup-alire@v2
uses: alire-project/setup-alire@v3
with:
branch: 'master'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Build Crate (Alire toolchain)
env:
CHECKS_ORG: alire-project
CHECKS_REPO: alire-index-checks
ALR_VERSION: 2.0.0
ALR_VERSION: 2.0.1
PACMAN: C:\Users\runneradmin\AppData\Local\alire\cache\msys64\usr\bin\pacman

on:
Expand All @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
os:
- macos-latest
- macos-12
- ubuntu-latest
- windows-latest

Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/build-ports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ name: Build Crate (MacPorts)
env:
CHECKS_ORG: alire-project
CHECKS_REPO: alire-index-checks
ALR_VERSION: 2.0.1

on:
pull_request:
Expand All @@ -26,7 +27,7 @@ jobs:
fail-fast: false
matrix:
os:
- macos-latest
- macos-12

steps:
- name: Check out alire-index
Expand All @@ -45,10 +46,10 @@ jobs:
ref: ${{github.base_ref}}
path: ${{env.CHECKS_REPO}}

- name: Set up devel `alr`
uses: alire-project/setup-alire@v2
- name: Set up stable `alr`
uses: alire-project/setup-alire@v3
with:
branch: 'master'
version: ${{env.ALR_VERSION}}

- name: Disable Homebrew
run: rm -f $(which brew)
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-index.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Check Index

env:
ALR_VERSION: 2.0.0
ALR_VERSION: 2.0.1

on: pull_request

Expand All @@ -13,13 +13,13 @@ jobs:

- name: Set up stable `alr`
if: contains(github.base_ref, 'stable-')
uses: alire-project/setup-alire@v2
uses: alire-project/setup-alire@v3
with:
version: ${{env.ALR_VERSION}}

- name: Set up devel `alr`
if: contains(github.base_ref, 'devel-')
uses: alire-project/setup-alire@v2
uses: alire-project/setup-alire@v3
with:
branch: master

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/diff-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: Diff release
env:
CHECKS_ORG: alire-project
CHECKS_REPO: alire-index-checks
ALR_VERSION: 2.0.0
ALR_VERSION: 2.0.1

on:
pull_request:
Expand Down Expand Up @@ -39,14 +39,14 @@ jobs:

- name: Set up stable `alr`
if: contains(github.base_ref, 'stable-')
uses: alire-project/setup-alire@v2
uses: alire-project/setup-alire@v3
with:
toolchain: --disable-assistant # We don't need the compiler
version: ${{env.ALR_VERSION}}

- name: Set up devel `alr`
if: contains(github.base_ref, 'devel-')
uses: alire-project/setup-alire@v2
uses: alire-project/setup-alire@v3
with:
toolchain: --disable-assistant # We don't need the compiler
branch: master
Expand Down
55 changes: 55 additions & 0 deletions index/al/alr2appimage/alr2appimage-0.9.3.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name = "alr2appimage"
description = "Tool to create an AppImage executable from an Alire crate"
version = "0.9.3"
website = "https://github.com/mgrojo/alr2appimage"
long-description = """
There are two prerequisites for your project to work with this tool:
- It has to be a crate with an `executables` field. Its first value
has to be the main application program.
- It must be installable using Alire, including all the needed resources.
`alr2appimage` will use the following command for installing it (this requires Alire 2.0):
```shell
alr install
```
Or it will run `gprinstall` inside `alr exec`, if the former fails (Alire 1.x).
If you simply run the tool inside an Alire crate, it will read the
metadata from your `alire.toml` file and create a default AppImage
from it.
NOTE: `alr2appimage` is an independent project; it is not
affiliated to, nor supported by, the Alire or AppImage projects.
"""
licenses = "GPL-3.0-only"

tags = ["utility", "appimage", "alire", "linux", "packaging"]

authors = ["Manuel Gomez"]
maintainers = ["Manuel Gomez <[email protected]>"]
maintainers-logins = ["mgrojo"]

executables = ["alr2appimage"]
[[depends-on]]
ada_toml = "^0.3.0"

[[depends-on]]
spoon = "^1.0.1"

[[depends-on]]
parse_args = "~0.9.0"

[[depends-on]]
resources = "~0.1.0"

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

[build-switches]
"*".style_checks = ["-gnaty3abBCrfklM99nptx"]
[origin]
commit = "fba60fa7465d49f08ca30eac5e9b121d1ae5e6a4"
url = "git+https://github.com/mgrojo/alr2appimage.git"

29 changes: 29 additions & 0 deletions index/el/elogs/elogs-1.2.0.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name = "elogs"
description = "Embedded logging, proven absent of runtime errors"
version = "1.2.0"

authors = ["Kevin Chadwick"]
maintainers = ["Kevin Chadwick <[email protected]>"]
maintainers-logins = ["kevlar700"]
licenses = "ISC OR BSD-2-Clause"
website = "https://github.com/kevlar700/elogs"
tags = ["spark", "embedded", "zfp", "logging", "log"]

[[depends-on]]
gnat = "(>=13 & <2000) | ^11 | >=2020"
# Ada 2022 was not supported until Gnat 11
# Version 12 chokes on Source_Code_Information visibility in Source_Code

[configuration.variables]
Max_Log_Count = {type = "Integer", default = 50}
Max_Message_Length = {type = "Integer", default = 200}
Device_ID_Length = {type = "Integer", default = 12}
Version_Length = {type = "Integer", default = 8}

[build-switches]
"*".ada_version = "Ada2022"

[origin]
commit = "42da537ea13971a33940a47590b39d37fc022d5c"
url = "git+https://github.com/kevlar700/elogs.git"

36 changes: 36 additions & 0 deletions index/gn/gnat_native/gnat_native-13.2.2.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@

name = "gnat_native"
version = "13.2.2"
provides = ["gnat=13.2.2"]
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]
PATH.prepend = "${CRATE_ROOT}/bin"

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

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

[origin."case(os)".macos."case(host-arch)".x86-64]
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-13.2.0-2/gnat-x86_64-darwin-13.2.0-2.tar.gz"
hashes = ["sha256:9be96041c0c280d5c78cf3e66ced84203354773f68240cc0f03b087ee109d2b0"]
binary = true

[origin."case(os)".macos."case(host-arch)".aarch64]
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-13.2.0-2/gnat-aarch64-darwin-13.2.0-2.tar.gz"
hashes = ["sha256:b2c113d5ac9301e1abc37a45e1f825fe4cb1cb16fbba606fdfe339012ad7a000"]
binary = true
67 changes: 67 additions & 0 deletions index/gw/gwindows/gwindows-1.4.2.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name = "gwindows"
version = "1.4.2"
description = "GWindows - Ada Framework for Windows Development"
authors = [
"David Botton",
"Gautier de Montmollin"
]
maintainers = [
"Felix Patschkowski <[email protected]>",
"[email protected]"
]
maintainers-logins = [
"patschkowski",
"zertovitch"
]

long-description = """
**GWindows** is a full Microsoft Windows Rapid Application Development
framework for programming GUIs (Graphical User Interfaces) with Ada.
Key features of GWindows:
* Complete Windows framework
* Pure Ada code, standalone
* Object-Oriented
* Code generator (GWenerator)
* **Free**, Open-Source
* License: GMGPL
* Builds to 32 bit and to 64 bit native Windows applications
* Works on both ANSI and Unicode character modes
* Includes GNATCOM, an ActiveX/COM framework
* Tests, demos, samples and tutorials included
"""

licenses = "LGPL-2.0-or-later"

project-files = [
"gnatcom/gnatcom.gpr",
"gnatcom/gnatcom_tools.gpr",
"gwindows/gwindows.gpr",
"gwindows/gwindows_contrib.gpr",
"gwindows/gwindows_samples.gpr"
]
executables = [
"game_of_life_interactive",
"mdi_example",
"sci_example",
"demo_exlv1",
"demo_exlv2",
"demo_exlv3",
"bindcom",
"comscope",
"createcom",
"makeguid"
]
tags = [
"gui", "rad", "windows"
]
website = "https://sourceforge.net/projects/gnavi/"

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

[origin]
commit = "407adc2e77bd3f3fc43522c5c73256495c29406d"
url = "git+https://github.com/zertovitch/gwindows.git"
Loading

0 comments on commit fdbede1

Please sign in to comment.