Skip to content

Commit

Permalink
Merge branch 'stable-1.3.0' into release/hirtos_separation_kernel-2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mosteo authored May 16, 2024
2 parents 24f6f06 + 473cc1d commit 0795e55
Show file tree
Hide file tree
Showing 15 changed files with 281 additions and 16 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
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
2 changes: 1 addition & 1 deletion .github/workflows/build-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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"

74 changes: 74 additions & 0 deletions index/gw/gwindows/gwindows-1.4.3.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name = "gwindows"
version = "1.4.3"
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 = """
&nbsp; <img src="https://a.fsdn.com/con/app/proj/gnavi/screenshots/elsch_2022_1000px-2eaf2d5e.jpg" alt="GWindows screenshot 1" width="auto" height="100">
&nbsp;&nbsp; <img src="https://a.fsdn.com/con/app/proj/gnavi/screenshots/pfm-c11ec1a6.png" alt="GWindows screenshot 2" width="auto" height="100">
&nbsp;&nbsp; <img src="https://a.fsdn.com/con/app/proj/gnavi/screenshots/krikos_win11-4baad1ca.png" alt="GWindows screenshot 3" width="auto" height="100">
**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)
* 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
* **Free**, Open-Source
"""

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

[environment.PATH]
prepend = "${CRATE_ROOT}/alire/build/gnatcom/tools"

[origin]
url = "https://sourceforge.net/projects/gnavi/files/GWindows%20Archive%2013-Apr-2024%20%28Root%20Dir%20and%20Zip%202.0%29.zip"
hashes = ["sha512:a13ac6e34ad5c278b5f8c341298edc748aa2ea0554fa38c3831765f2f58932fad373d583f76288a0e9acb9e1afa9463f85992a8d86ea7035e375125f77b035f3"]
27 changes: 27 additions & 0 deletions index/ha/hal/hal-0.3.1.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
description = "Hardware Abstraction Layer (HAL)"

long-description = '''# hal
Hardware Abstraction Layer: interfaces definitions to abstract access to common
hardware devices and protocols
This crate is a snapshot of the `hal` in [Ada Drivers
Library](https://github.com/AdaCore/Ada_Drivers_Library/tree/master/hal/src).
Any bug report, issue, contribution must be adressed to the [Ada Drivers
Library](https://github.com/AdaCore/Ada_Drivers_Library/) repo.
'''

name = "hal"
version = "0.3.1"
licenses = "BSD-3-Clause"
maintainers = ["[email protected]"]
maintainers-logins = ["Fabien-Chouteau"]
project-files = ["hal.gpr"]
tags = ["embedded", "hal", "nostd"]

[origin]
commit = "58bb6bd72fc276ba1128451e3b4784b6029be0a8"
url = "git+https://github.com/Fabien-Chouteau/hal.git"

15 changes: 15 additions & 0 deletions index/jo/journada/journada-1.0.0.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name = "journada"
description = "Simple and nice configurable logging"
version = "1.0.0"

authors = ["Léo Germond"]
maintainers = ["Léo Germond <[email protected]>"]
maintainers-logins = ["leogermond"]
licenses = "Apache-2.0"
website = "https://gitlab.com/leogermond/journada"
tags = ["log", "logging", "vt100"]

[origin]
commit = "e0bf321572520077b597bc70a8fe54e733e3f3ae"
url = "git+https://gitlab.com/leogermond/journada.git"

70 changes: 70 additions & 0 deletions index/le/lea/lea-0.90.0.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
description = "LEA is a Lightweight Editor for Ada "
name = "lea"
version = "0.90.0"

authors = ["Gautier de Montmollin"]
maintainers = ["[email protected]"]
maintainers-logins = ["zertovitch"]
website = "https://l-e-a.sourceforge.io/"
licenses = "MIT"
tags = ["lea", "editor"]
long-description = """
&nbsp; <a target="_blank" href="https://a.fsdn.com/con/app/proj/l-e-a/screenshots/sudo_new-0c7d4c58.png" ><img src="https://a.fsdn.com/con/app/proj/l-e-a/screenshots/sudo_new-0c7d4c58.png" alt="lea screenshot 1" width="auto" height="140"></a>
&nbsp; <a target="_blank" href="https://a.fsdn.com/con/app/proj/l-e-a/screenshots/mandel_new-f3219868.png" ><img src="https://a.fsdn.com/con/app/proj/l-e-a/screenshots/mandel_new-f3219868.png" alt="lea screenshot 2" width="auto" height="140"></a>
&nbsp; <a target="_blank" href="https://a.fsdn.com/con/app/proj/l-e-a/screenshots/lea_ubu-912c5456.png" ><img src="https://a.fsdn.com/con/app/proj/l-e-a/screenshots/lea_ubu-912c5456.png" alt="lea screenshot 3" width="auto" height="140"></a>
&nbsp; <a target="_blank" href="https://a.fsdn.com/con/app/proj/l-e-a/screenshots/ext_edit_new-28fcf374.png"><img src="https://a.fsdn.com/con/app/proj/l-e-a/screenshots/ext_edit_new-28fcf374.png" alt="lea screenshot 4" width="auto" height="140"></a>
**LEA**, a **Lightweight Editor for Ada**, aims to provide an easy, script-world-like, "look & feel" for developing Ada projects of any size and level, while enabling access to full-scale development tools like GNAT.
Features:
* Quick start and reactivity
* Uses the Scintilla editor widget (like Notepad++)
* Multi-document
* Multiple undo's & redo's
* Multi-line, multi-point editing; rectangular selections
* Duplication of lines and selections
* Color themes
* Syntax highlighting, parenthesis matching
* Bookmarks
* Smart editor features (auto-completion, navigation, mouse-hover infos)
* Includes HAC, the HAC Ada Compiler
* Includes numerous examples of Ada programs, ready to be run
* Single executable, runs without installation
* Programmed in Ada
* **Free**, Open-Source
"""

project-files = ["lea_project_tree.gpr"]
executables = ["lea"]

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

[gpr-externals]
LEA_Build_Mode = ["Debug", "Fast", "Small"]

[gpr-set-externals]
HAC_Build_Mode = "Small"
LEA_Build_Mode = "Small"
Zip_Build_Mode = "Small"

[[depends-on]]
ini_files = "^10.0.0"
[[depends-on]]
gwindows = "^1.4.3"
[[depends-on]]
zipada = "^58.0.0"
[[depends-on]]
gnat = "/=10.3.2"
[[depends-on]]
hac = "~0.30.0"

[[actions.'case(os)'.windows]]
type = "post-build"
command = ["cmd", "/c copy /B lea_without_data.exe + _lea_data.zip lea.exe"]

[origin]
url = "https://sourceforge.net/projects/l-e-a/files/lea-2024-04-14-v.0.90.zip"
hashes = ["sha512:397e4d89eb944c261007c548cdb3024eb30fc6e08099ea6dc3ee3de7329263acf7efc2b883142ebee8b1c2644d1d0b1d181b631ea428a166132dfb9b89f24f28"]
2 changes: 1 addition & 1 deletion index/li/libhello/libhello-1.0.1.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ url = "git+https://github.com/alire-project/libhello.git"

# We use this crate as a trigger to conveniently test minor changes to
# metaprocesses of the CI of the repository itself.
# Last touch: 2024-03-21 14:29:00 CET
# Last touch: 2024-05-16 13:40 CET
1 change: 1 addition & 0 deletions index/li/libhidapi/libhidapi-external.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ maintainers-logins = ["pmunts"]
[[external]]
kind = "system"
[external.origin."case(distribution)"]
"centos|fedora|rhel" = ["hidapi-devel"]
"debian|ubuntu" = ["libhidapi-dev"]
arch = ["hidapi"]
homebrew = ["hidapi"]
Expand Down
32 changes: 32 additions & 0 deletions index/li/libsimpleio/libsimpleio-2.22299.1.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name = "libsimpleio"
description = "Linux Simple I/O Library"
version = "2.22299.1"
licenses = "BSD-1-Clause"
website = "https://github.com/pmunts/libsimpleio"

authors = ["Philip Munts"]
maintainers = ["Philip Munts <[email protected]>"]
maintainers-logins = ["pmunts"]

project-files = ["libsimpleio.gpr"]

tags = ["embedded", "linux", "libsimpleio", "remoteio", "beaglebone",
"pocketbeagle", "raspberrypi", "raspberry", "pi", "adc", "dac", "gpio",
"hid", "i2c", "motor", "pwm", "sensor", "serial", "servo", "spi", "stepper",
"watchdog"]

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

[[actions."case(os)".linux]]
type = "post-fetch"
command = ["sh", "-c", "./src/scripts/postfetch.linux"]

[origin]
hashes = [
"sha256:e27435ce15f77bfcf7078b6b292948771a6086853a6fbe947d90bb24e5ad227f",
"sha512:ef31e6279b70c08f86f1a54e3de054217612eac88ecab0d6f0f50d88b4dff9b016059a54a3d0f3c87451a9b02e1671760f3981bb73e6616ca5f7aa61c7c26ef5",
]
url = "https://raw.githubusercontent.com/pmunts/alire-crates/001af5fec3ac58584467b2aef49a9a8efc0ec9d4/libsimpleio/libsimpleio-2.22299.1.tbz2"

7 changes: 4 additions & 3 deletions index/li/libusb/libusb-external.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ maintainers-logins = ["pmunts"]
[[external]]
kind = "system"
[external.origin."case(distribution)"]
"arch" = ["libusb"]
"centos|rhel" = ["libusbx-devel"]
"debian|ubuntu" = ["libusb-1.0-0-dev"]
arch = ["libusb"]
homebrew = ["libusb"]
macports = ["libusb"]
"fedora" = ["libusb1-devel"]
"homebrew|macports" = ["libusb"]
3 changes: 3 additions & 0 deletions index/li/libzmq/libzmq-external.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ kind = "system"
[external.origin."case(distribution)"]
"debian|ubuntu" = ["libzmq3-dev"]
msys2 = ["mingw-w64-x86_64-zeromq"]
arch = ["zeromq"]
homebrew = ["zeromq"]
macports = ["zmq"]
15 changes: 15 additions & 0 deletions index/st/st7789/st7789-0.1.0.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
description = "SPI based driver for the ST7789 TFT display"
name = "st7789"
version = "0.1.0"
licenses = "MIT"
maintainers = ["[email protected]"]
maintainers-logins = ["jklmnn"]
tags = ["embedded", "nostd", "framebuffer", "bitmap", "display", "driver", "drivers", "spi"]

[[depends-on]]
hal = "~0.3.0"
adl_middleware = "~0.2.0"

[origin]
url = "https://github.com/jklmnn/st7789-ada/archive/refs/tags/0.1.0.tar.gz"
hashes = ["sha512:59369e69a04701d4efafd34d233a7794322799a6e26320e68d8d6f26cbcdcd92655f11a675a0f5bf51e1552eb922b7a14a503917c507311e5727ceace6472fc6"]

0 comments on commit 0795e55

Please sign in to comment.