From 253b667ad3f3aeae83f9d354d32e3ded1ecc999a Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Tue, 31 Oct 2023 23:40:41 +0100 Subject: [PATCH] Initial bump for Preserves 0.991 --- packaging/packages/preserves-schemas/APKBUILD | 2 +- packaging/packages/py3-preserves/APKBUILD | 2 +- packaging/packages/py3-syndicate/APKBUILD | 2 +- packaging/packages/syndicate-schemas/APKBUILD | 2 +- packaging/packages/synit-config/APKBUILD | 2 +- .../files/etc/syndicate/boot/010-exec.pr | 8 ++--- .../files/etc/syndicate/boot/010-milestone.pr | 8 ++--- .../syndicate/boot/010-service-state-up.pr | 4 +-- .../etc/syndicate/boot/020-load-core-layer.pr | 22 ++++++------- .../etc/syndicate/boot/030-load-services.pr | 18 +++++------ .../files/etc/syndicate/services/modem.pr | 32 +++++++++---------- .../files/etc/syndicate/services/network.pr | 2 +- protocols/schemas/audio.prs | 28 ++++++++-------- protocols/schemas/hayes.prs | 14 ++++---- protocols/schemas/network.prs | 22 ++++++------- protocols/schemas/samsungGalaxyS7.prs | 12 +++---- protocols/schemas/soundEffects.prs | 8 ++--- protocols/schemas/telephony.prs | 22 ++++++------- protocols/schemas/ui.prs | 22 ++++++------- protocols/schemas/userSettings.prs | 6 ++-- synit-pid1/Cargo.lock | 16 +++++----- synit-pid1/Cargo.toml | 6 ++-- 22 files changed, 130 insertions(+), 130 deletions(-) diff --git a/packaging/packages/preserves-schemas/APKBUILD b/packaging/packages/preserves-schemas/APKBUILD index 26cbdfd..ef3ac09 100644 --- a/packaging/packages/preserves-schemas/APKBUILD +++ b/packaging/packages/preserves-schemas/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Tony Garnock-Jones pkgname=preserves-schemas -pkgver=0.990.0-r20231015 +pkgver=0.991.0-r20231031 pkgrel=0 pkgdesc="Shared Preserves Schema definitions" url="https://preserves.dev/" diff --git a/packaging/packages/py3-preserves/APKBUILD b/packaging/packages/py3-preserves/APKBUILD index aa45071..badda87 100644 --- a/packaging/packages/py3-preserves/APKBUILD +++ b/packaging/packages/py3-preserves/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Tony Garnock-Jones pkgname=py3-preserves _pyname=preserves -pkgver=0.990.0 +pkgver=0.991.0 pkgrel=0 pkgdesc="Preserves serialization format" url="https://preserves.dev/" diff --git a/packaging/packages/py3-syndicate/APKBUILD b/packaging/packages/py3-syndicate/APKBUILD index d6e37c4..8f88d35 100644 --- a/packaging/packages/py3-syndicate/APKBUILD +++ b/packaging/packages/py3-syndicate/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Tony Garnock-Jones pkgname=py3-syndicate _pyname=syndicate-py -pkgver=0.14.0 +pkgver=0.15.0 pkgrel=0 pkgdesc="Syndicated Actor model for Python" url="https://syndicate-lang.org/" diff --git a/packaging/packages/syndicate-schemas/APKBUILD b/packaging/packages/syndicate-schemas/APKBUILD index 938770c..8fde7a5 100644 --- a/packaging/packages/syndicate-schemas/APKBUILD +++ b/packaging/packages/syndicate-schemas/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Tony Garnock-Jones pkgname=syndicate-schemas -pkgver=0.2.0-r20231018 +pkgver=0.3.0-r20231031 pkgrel=1 pkgdesc="Shared Syndicate Preserves Schema definitions" url="https://syndicate-lang.org/" diff --git a/packaging/packages/synit-config/APKBUILD b/packaging/packages/synit-config/APKBUILD index 2ab3797..c490654 100644 --- a/packaging/packages/synit-config/APKBUILD +++ b/packaging/packages/synit-config/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Tony Garnock-Jones # Maintainer: Tony Garnock-Jones pkgname=synit-config -pkgver=0.0.6$(cat GITVERSION) +pkgver=0.0.7$(cat GITVERSION) pkgrel=0 pkgdesc="synit system layer configuration" url="https://synit.org/" diff --git a/packaging/packages/synit-config/files/etc/syndicate/boot/010-exec.pr b/packaging/packages/synit-config/files/etc/syndicate/boot/010-exec.pr index 589d16c..c1a1735 100644 --- a/packaging/packages/synit-config/files/etc/syndicate/boot/010-exec.pr +++ b/packaging/packages/synit-config/files/etc/syndicate/boot/010-exec.pr @@ -1,5 +1,5 @@ -; Sending causes the command to be run. -; +# Sending causes the command to be run. +# ?? [ let ?id = timestamp let ?facet = facet @@ -14,6 +14,6 @@ ? failed> [$facet ! stop] ] -; If the restart policy is not specified, it is defaulted to `on-error`. -; +# If the restart policy is not specified, it is defaulted to `on-error`. +# ?? ! diff --git a/packaging/packages/synit-config/files/etc/syndicate/boot/010-milestone.pr b/packaging/packages/synit-config/files/etc/syndicate/boot/010-milestone.pr index 9e512c3..3d84e06 100644 --- a/packaging/packages/synit-config/files/etc/syndicate/boot/010-milestone.pr +++ b/packaging/packages/synit-config/files/etc/syndicate/boot/010-milestone.pr @@ -1,7 +1,7 @@ -; To "run" a milestone service, -; - assert that it is both started and ready -; - that's it! -; +# To "run" a milestone service, +# - assert that it is both started and ready +# - that's it! +# ? > [ started> ready> diff --git a/packaging/packages/synit-config/files/etc/syndicate/boot/010-service-state-up.pr b/packaging/packages/synit-config/files/etc/syndicate/boot/010-service-state-up.pr index e9fd2b2..4f2caa9 100644 --- a/packaging/packages/synit-config/files/etc/syndicate/boot/010-service-state-up.pr +++ b/packaging/packages/synit-config/files/etc/syndicate/boot/010-service-state-up.pr @@ -1,4 +1,4 @@ -; To the usual suite of service states we add `up`, meaning "either `ready` or `complete`". -; +# To the usual suite of service states we add `up`, meaning "either `ready` or `complete`". +# ? ? diff --git a/packaging/packages/synit-config/files/etc/syndicate/boot/020-load-core-layer.pr b/packaging/packages/synit-config/files/etc/syndicate/boot/020-load-core-layer.pr index 4f0c4df..54e9382 100644 --- a/packaging/packages/synit-config/files/etc/syndicate/boot/020-load-core-layer.pr +++ b/packaging/packages/synit-config/files/etc/syndicate/boot/020-load-core-layer.pr @@ -1,28 +1,28 @@ -; Attenuate `$config` by rewriting plain `require-service` assertions to `require-core-service` -; assertions. Allow all other assertions through. -; +# Attenuate `$config` by rewriting plain `require-service` assertions to `require-core-service` +# assertions. Allow all other assertions through. +# let ?sys = <* $config [ > ]>]> -; Give meaning to `require-core-service`: it is an ordinary `require-service`, plus a -; declaration that the `core` milestone depends on the service. -; +# Give meaning to `require-core-service`: it is an ordinary `require-service`, plus a +# declaration that the `core` milestone depends on the service. +# ? [ > ] -; Load config in the `core` directory, using the wrapped `config` so that all plain services -; required are changed to be *core* services. -; +# Load config in the `core` directory, using the wrapped `config` so that all plain services +# required are changed to be *core* services. +# > -; In addition, require the `core` milestone explicitly. -; +# In addition, require the `core` milestone explicitly. +# > diff --git a/packaging/packages/synit-config/files/etc/syndicate/boot/030-load-services.pr b/packaging/packages/synit-config/files/etc/syndicate/boot/030-load-services.pr index d46be75..ed15e2d 100644 --- a/packaging/packages/synit-config/files/etc/syndicate/boot/030-load-services.pr +++ b/packaging/packages/synit-config/files/etc/syndicate/boot/030-load-services.pr @@ -1,22 +1,22 @@ -; Attenuate `$config` by rewriting plain `require-service` assertions to -; `require-basic-service` assertions. Allow all other assertions through. -; +# Attenuate `$config` by rewriting plain `require-service` assertions to +# `require-basic-service` assertions. Allow all other assertions through. +# let ?basic = <* $config [ > ]>]> -; Give meaning to `require-basic-service`: it is an ordinary `require-service`, plus a -; declaration that the service depends on the `core` milestone. -; +# Give meaning to `require-basic-service`: it is an ordinary `require-service`, plus a +# declaration that the service depends on the `core` milestone. +# ? [ up>> ] -; Once we see that the `core` milestone is ready, start processing the `services` -; directory. -; +# Once we see that the `core` milestone is ready, start processing the `services` +# directory. +# ? up> [ > up>> @@ -7,7 +7,7 @@ up>> -; More generally: +# More generally: ? > [ ? > [ @@ -20,25 +20,25 @@ ? >> [ ["/usr/lib/synit/qmi-wwan-manager" $dev $apn]> - ; Occasionally qmi-wwan-manager complains on stderr about the link going away, but doesn't - ; terminate. Fortunately it doesn't seem to talk on stderr at all unless the link goes away, - ; so we interpret any stderr activity (!) as indication of a problem here. + # Occasionally qmi-wwan-manager complains on stderr about the link going away, but doesn't + # terminate. Fortunately it doesn't seem to talk on stderr at all unless the link goes away, + # so we interpret any stderr activity (!) as indication of a problem here. $log ?? > stream: stderr pid: ?pid }> [ - ; We used to just do this: - ; - ; $config ! >> - ; - ; ... but it immediately restarts the service, causing lots of pointless load and log spam. - ; TODO: make it so you can include an exit status in the restart request; something like - ; "restart immediately" vs "simulated normal termination" vs "simulated error termination", - ; triggering the appropriate supervisor behaviours. - ; - ; So instead we kill the qmicli program with a signal, which *does* trigger the supervisor - ; in the right way. + # We used to just do this: + # + # $config ! >> + # + # ... but it immediately restarts the service, causing lots of pointless load and log spam. + # TODO: make it so you can include an exit status in the restart request; something like + # "restart immediately" vs "simulated normal termination" vs "simulated error termination", + # triggering the appropriate supervisor behaviours. + # + # So instead we kill the qmicli program with a signal, which *does* trigger the supervisor + # in the right way. let ?pid = stringify $pid $config ! ] diff --git a/packaging/packages/synit-config/files/etc/syndicate/services/network.pr b/packaging/packages/synit-config/files/etc/syndicate/services/network.pr index 7924c34..0f5e8d8 100644 --- a/packaging/packages/synit-config/files/etc/syndicate/services/network.pr +++ b/packaging/packages/synit-config/files/etc/syndicate/services/network.pr @@ -15,7 +15,7 @@ ] ? >> [ - ; We use a custom script that gives mobile-data devices a sensible routing metric + # We use a custom script that gives mobile-data devices a sensible routing metric ["udhcpc" "-i" $ifname "-fR" "-s" "/usr/lib/synit/udhcpc.script"]> ] diff --git a/protocols/schemas/audio.prs b/protocols/schemas/audio.prs index f1f30e8..2c29d60 100644 --- a/protocols/schemas/audio.prs +++ b/protocols/schemas/audio.prs @@ -1,19 +1,19 @@ version 1 . -; If headset present: -; - ringing: speaker & headset -; - notification: speaker & headset -; - non-speakerphone call: headset -; - speakerphone call: speaker -; - music: headset -; -; If headset absent: -; - ringing: speaker -; - notification: speaker -; - non-speakerphone call: earpiece -; - speakerphone call: speaker -; - music: speaker -; +# If headset present: +# - ringing: speaker & headset +# - notification: speaker & headset +# - non-speakerphone call: headset +# - speakerphone call: speaker +# - music: headset +# +# If headset absent: +# - ringing: speaker +# - notification: speaker +# - non-speakerphone call: earpiece +# - speakerphone call: speaker +# - music: speaker +# . Mapping = . diff --git a/protocols/schemas/hayes.prs b/protocols/schemas/hayes.prs index 7a185f6..c092e4f 100644 --- a/protocols/schemas/hayes.prs +++ b/protocols/schemas/hayes.prs @@ -1,21 +1,21 @@ version 1 . -; Definitions for the internal workings of the Hayes modem driver. +# Definitions for the internal workings of the Hayes modem driver. -; Assertion. Declares presence of a Hayes modem. +# Assertion. Declares presence of a Hayes modem. ModemPresent = . -; TODO not yet properly specified +# TODO not yet properly specified InternalProtocol = any . -; Message. Sent when the modem sends us a "URC", an Unsolicited Result Code. +# Message. Sent when the modem sends us a "URC", an Unsolicited Result Code. UnsolicitedResultCode = . -; Assertion. Asks the modem to execute the given command. +# Assertion. Asks the modem to execute the given command. CommandRPC = . -; Message. Asks the modem to execute the given command, but not to send back the reply. +# Message. Asks the modem to execute the given command, but not to send back the reply. CommandEvent = . -; Assertion. Describes the result of a command execution. +# Assertion. Describes the result of a command execution. CommandResult = . @ . -; This is synthetic information, based on somewhat ad-hoc heuristics. It'd be nice if there was -; a better way to do this! Maybe someone can point me in the right direction! -; +# This is synthetic information, based on somewhat ad-hoc heuristics. It'd be nice if there was +# a better way to do this! Maybe someone can point me in the right direction! +# InterfaceType = -/ ; `lo` and friends +/ # `lo` and friends =loopback -/ ; `eth0`, bridges, anything that isn't loopback and isn't wireless +/ # `eth0`, bridges, anything that isn't loopback and isn't wireless =normal -/ ; 'wlan0' and friends +/ # 'wlan0' and friends =wireless . @@ -78,8 +78,8 @@ WifiAssociationState = @inProgress =in-progress / =ready . HotspotState = . -;--------------------------------------------------------------------------- -; User settings +# --------------------------------------------------------------------------- +# User settings MobileDataApn = . @@ -90,11 +90,11 @@ SavedWifiNetwork = . WifiAuthentication = -/ ; No authentication necessary: open network +/ # No authentication necessary: open network =open -/ ; Pre-shared key (WPA2-PSK etc) +/ # Pre-shared key (WPA2-PSK etc) -/ ; Other, not-yet-implemented +/ # Other, not-yet-implemented @other any . diff --git a/protocols/schemas/samsungGalaxyS7.prs b/protocols/schemas/samsungGalaxyS7.prs index 201fa6b..ea61e3a 100644 --- a/protocols/schemas/samsungGalaxyS7.prs +++ b/protocols/schemas/samsungGalaxyS7.prs @@ -1,19 +1,19 @@ version 1 . -; Definitions for the internal workings of the Samsung Galaxy S7 modem driver. +# Definitions for the internal workings of the Samsung Galaxy S7 modem driver. -; Assertion. Declares presence of a Hayes modem. +# Assertion. Declares presence of a Hayes modem. ModemPresent = . -; TODO not yet properly specified +# TODO not yet properly specified InternalProtocol = any . ModemPacket = @in / @out . -; The bodies are instances of SamsungFmtMessage and SamsungRfsMessage, respectively. +# The bodies are instances of SamsungFmtMessage and SamsungRfsMessage, respectively. FmtPacket = . RfsPacket = . -; Assertion. Asks the modem to execute the given command. +# Assertion. Asks the modem to execute the given command. CommandRPC = . -; Message. Asks the modem to execute the given command, but not to send back the reply. +# Message. Asks the modem to execute the given command, but not to send back the reply. CommandEvent = . diff --git a/protocols/schemas/soundEffects.prs b/protocols/schemas/soundEffects.prs index 0c1bcd1..0898e7c 100644 --- a/protocols/schemas/soundEffects.prs +++ b/protocols/schemas/soundEffects.prs @@ -1,11 +1,11 @@ version 1 . -; Assertion. +# Assertion. ContinuousSound = . -; Assertion. +# Assertion. ContinuousSoundPlaying = . -; Message. +# Message. AlertSound = . -; Assertion. +# Assertion. AlertSoundPlaying = . diff --git a/protocols/schemas/telephony.prs b/protocols/schemas/telephony.prs index 306dc93..423813f 100644 --- a/protocols/schemas/telephony.prs +++ b/protocols/schemas/telephony.prs @@ -1,22 +1,22 @@ version 1 . -; Definitions for non-modem-hardware-specific telephony interactions. +# Definitions for non-modem-hardware-specific telephony interactions. ModemPresent = . Address =
. NumberType = =unknown / =international / =national / =gsm0338 . -; Assertion. Describes an ongoing call. +# Assertion. Describes an ongoing call. ActiveCall = . CallId = int . CallDirection = =mo / =mt . CallType = =voice / =data / =fax . CallState = =hold / =original / =connect / =incoming / =waiting / =end / =alerting . -; Message. Triggers call answering. +# Message. Triggers call answering. AnswerCall = . -; Message. Triggers call rejection or disconnection. +# Message. Triggers call rejection or disconnection. DisconnectCall = . CallIdSelector = @specificCall int / @allCalls =all . ReleaseCause = @@ -30,23 +30,23 @@ ReleaseCause = / =incompatibleDestination . -; Message. Starts an outgoing call. +# Message. Starts an outgoing call. PlaceCall = . -; Assertion. Some call is active - be it alerting, connected, ringing, etc. +# Assertion. Some call is active - be it alerting, connected, ringing, etc. CallInProgress = . -; Assertion. An incoming call is signalling the user, asking for a decision about answer/reject/ignore. +# Assertion. An incoming call is signalling the user, asking for a decision about answer/reject/ignore. PhoneRinging = . -; Assertion. A remote party's phone should be ringing. +# Assertion. A remote party's phone should be ringing. PeerRinging = . -; Message. An incoming SMS has been received. +# Message. An incoming SMS has been received. SmsDelivery = . -; Assertion. An outgoing SMS should be transmitted. +# Assertion. An outgoing SMS should be transmitted. SmsTransmission = . -; Assertion. Enable speakerphone mode, if available. +# Assertion. Enable speakerphone mode, if available. Speakerphone = . diff --git a/protocols/schemas/ui.prs b/protocols/schemas/ui.prs index 7fcaa91..2f52ea9 100644 --- a/protocols/schemas/ui.prs +++ b/protocols/schemas/ui.prs @@ -1,33 +1,33 @@ version 1 . -; Assertion. Creates a space for Widget/Parent/Attribute assertions etc. +# Assertion. Creates a space for Widget/Parent/Attribute assertions etc. Window = . -; Assertions, within the space created as part of a Window assertion. +# Assertions, within the space created as part of a Window assertion. Widget = . Parent = . Root = . Attribute = . -; Assertion +# Assertion WidgetInstance = . -; Assertion +# Assertion Touch = . -; Message +# Message Click = . -; Assertion +# Assertion State = . -; Assertion. Marks the window as closeable. +# Assertion. Marks the window as closeable. WindowCloseable = . -; Assertion. +# Assertion. WindowTitle = . -; Data types +# Data types WidgetId = any . SortKey = @double double / @string string . @@ -49,12 +49,12 @@ LeafType = Color = . -; Box-and-glue layout +# Box-and-glue layout Fill = @fixed double / . Sizing = . BoxSize = . -; Scrollable panels +# Scrollable panels VisibleScrollRange = / =none / @visibleScrollRange . -; Message. +# Message. CommandEvent = . CommandReply = =done . Action = / . -; Assertion. +# Assertion. Value = . diff --git a/synit-pid1/Cargo.lock b/synit-pid1/Cargo.lock index a04d647..6b9be47 100644 --- a/synit-pid1/Cargo.lock +++ b/synit-pid1/Cargo.lock @@ -715,9 +715,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "preserves" -version = "3.990.0" +version = "4.991.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9dcce38db440a6d301aaf73f6692d1ca1a6cea5c2e5b2f5ac29fabbeb3dab15" +checksum = "b4a244356924e0324af5205b20c03a203f4364640f816787bea3792b71eb4fd1" dependencies = [ "base64", "dtoa", @@ -730,9 +730,9 @@ dependencies = [ [[package]] name = "preserves-schema" -version = "3.990.0" +version = "4.991.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830a3c2c01f2c2420ad5df48cf48fdb20bcfce797fb75e6294d3378d2a100e92" +checksum = "12225b6104827dc6d513f7f418cbe1fa9399a54f699c34d03eec706fb8fb41c0" dependencies = [ "convert_case", "glob", @@ -995,9 +995,9 @@ dependencies = [ [[package]] name = "syndicate" -version = "0.29.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a57767eb60240d45d7a63e705023e24f25071a14610139fed99941e1fc32495" +checksum = "63e69640b34eb33f1a8a0a8c2f0de420f885009919756e5a819a63715e006039" dependencies = [ "blake2", "bytes", @@ -1017,9 +1017,9 @@ dependencies = [ [[package]] name = "syndicate-macros" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93cb75027de417102690c9bb95f1dcf0f1c91c5273c3fc530f36c5aab7e0f710" +checksum = "980f2739f04394fe45c608dc76abe555690201938d4faa1fd3024cf452cfe958" dependencies = [ "proc-macro2", "quote", diff --git a/synit-pid1/Cargo.toml b/synit-pid1/Cargo.toml index df4b8f9..aeea4e1 100644 --- a/synit-pid1/Cargo.toml +++ b/synit-pid1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "synit-pid1" -version = "0.0.3" +version = "0.0.4" authors = ["Tony Garnock-Jones "] edition = "2018" @@ -23,8 +23,8 @@ strip = true # syndicate-macros = { path = "localdev/syndicate-rs/syndicate-macros" } [dependencies] -syndicate = "0.29" -syndicate-macros = "0.24" +syndicate = "0.30" +syndicate-macros = "0.25" clap = "=3.0.0-beta.2" clap_generate = "=3.0.0-beta.2"