diff --git a/packaging/packages/syndicate-server/.gitignore b/packaging/packages/syndicate-server/.gitignore index 12fb65c..b226ba7 100644 --- a/packaging/packages/syndicate-server/.gitignore +++ b/packaging/packages/syndicate-server/.gitignore @@ -1 +1,7 @@ +VERSION buildlog.* +protocols/ +syndicate-rs/ +syndicate-server.aarch64 +syndicate-server.armv7 +syndicate-server.x86_64 diff --git a/packaging/packages/syndicate-server/APKBUILD b/packaging/packages/syndicate-server/APKBUILD deleted file mode 120000 index 03734c8..0000000 --- a/packaging/packages/syndicate-server/APKBUILD +++ /dev/null @@ -1 +0,0 @@ -APKBUILD.released \ No newline at end of file diff --git a/packaging/packages/syndicate-server/APKBUILD b/packaging/packages/syndicate-server/APKBUILD new file mode 100644 index 0000000..d03ffa7 --- /dev/null +++ b/packaging/packages/syndicate-server/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Tony Garnock-Jones +# Maintainer: Tony Garnock-Jones +pkgname=syndicate-server +pkgver=$(cat VERSION) +pkgrel=$(date '+%Y%m%d%H%M%S') +pkgdesc="Syndicate server" +url="https://syndicate-lang.org/" +arch="all" +license="GPLv3" +depends="" +makedepends="" +source="" +builddir="$srcdir/" +options="!check" + +build() { + : +} + +package() { + mkdir -p "$pkgdir/usr/bin" + cp -p "$startdir/syndicate-server.${CARCH}" "$pkgdir/usr/bin/syndicate-server" + + mkdir -p "$pkgdir/usr/share/syndicate-server/schemas" + cp "$startdir/protocols/schema-bundle.bin" "$pkgdir/usr/share/syndicate-server/schemas/schema-bundle.prb" + cp "$startdir/protocols/schemas"/*.prs "$pkgdir/usr/share/syndicate-server/schemas/." +} diff --git a/packaging/packages/syndicate-server/APKBUILD.adhoc b/packaging/packages/syndicate-server/APKBUILD.adhoc deleted file mode 100644 index 33c706f..0000000 --- a/packaging/packages/syndicate-server/APKBUILD.adhoc +++ /dev/null @@ -1,27 +0,0 @@ -# Contributor: Tony Garnock-Jones -# Maintainer: Tony Garnock-Jones -pkgname=syndicate-server -pkgver=0.0.0 -pkgrel=$(date '+%Y%m%d%H%M%S') -pkgdesc="Syndicate server" -url="https://syndicate-lang.org/" -arch="all" -license="GPLv3" -depends="" -makedepends="" -source="" -builddir="$srcdir/" -options="!check" - -build() { - : -} - -package() { - mkdir -p "$pkgdir/usr/bin" - cp -p ../syndicate-server.${CARCH} "$pkgdir/usr/bin/syndicate-server" - - mkdir -p "$pkgdir/usr/share/syndicate-server/schemas" - cp ../protocols/schema-bundle.bin "$pkgdir/usr/share/syndicate-server/schemas/schema-bundle.prb" - cp ../protocols/schemas/*.prs "$pkgdir/usr/share/syndicate-server/schemas/." -} diff --git a/packaging/packages/syndicate-server/APKBUILD.released b/packaging/packages/syndicate-server/APKBUILD.released deleted file mode 100644 index 45782ff..0000000 --- a/packaging/packages/syndicate-server/APKBUILD.released +++ /dev/null @@ -1,30 +0,0 @@ -# Contributor: Tony Garnock-Jones -# Maintainer: Tony Garnock-Jones -pkgname=syndicate-server -pkgver=0.26.0 -pkgrel=0 -pkgdesc="Syndicate server" -url="https://syndicate-lang.org/" -arch="all" -license="GPLv3" -depends="" -makedepends="openssl-dev" -source="$pkgname-$pkgver.tar.gz::https://git.syndicate-lang.org/syndicate-lang/syndicate-rs/archive/syndicate-server-v$pkgver.tar.gz" -builddir="$srcdir/syndicate-rs/syndicate-server" -options="!check" - -build() { - cargo build --release -} - -package() { - install -Dm755 "../target/release/syndicate-server" "$pkgdir/usr/bin/syndicate-server" - - mkdir -p "$pkgdir/usr/share/syndicate-server/schemas" - cp protocols/schema-bundle.bin "$pkgdir/usr/share/syndicate-server/schemas/schema-bundle.prb" - cp protocols/schemas/*.prs "$pkgdir/usr/share/syndicate-server/schemas/." -} - -sha512sums=" -dcbaf2d964f3d32341b500cd4fb63a04b7990c4409b7c5be79d5510bcc15878cb4e34cfc2b279272e10db328f0187ac81aa3e1a752e1bf88d58d8aaf00862f17 syndicate-server-0.26.0.tar.gz -" diff --git a/packaging/packages/syndicate-server/Makefile.external b/packaging/packages/syndicate-server/Makefile.external new file mode 100644 index 0000000..da05a9e --- /dev/null +++ b/packaging/packages/syndicate-server/Makefile.external @@ -0,0 +1,14 @@ +# -*- makefile -*- + +prepare: syndicate-rs + rm -f syndicate-server.$(ARCH) + $(MAKE) -C syndicate-rs $(ARCH)-binary-release + cp -p syndicate-rs/target/$(ARCH)-*/release/syndicate-server syndicate-server.$(ARCH) + (cd syndicate-rs/syndicate-server && cargo metadata --format-version 1) \ + | preserves-tool convert --output-format unquoted \ + --select '. "packages" / [. "name" = "syndicate-server"] . "version"' \ + > VERSION + rsync -a syndicate-rs/syndicate-server/protocols . + +syndicate-rs: + git clone https://git.syndicate-lang.org/syndicate-lang/syndicate-rs diff --git a/packaging/packages/syndicate-server/protocols/Makefile b/packaging/packages/syndicate-server/protocols/Makefile deleted file mode 100644 index a738837..0000000 --- a/packaging/packages/syndicate-server/protocols/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -all: schema-bundle.bin - -clean: - rm -f schema-bundle.bin - -schema-bundle.bin: schemas/*.prs - preserves-schemac schemas > $@.tmp - mv $@.tmp $@ diff --git a/packaging/packages/syndicate-server/protocols/schema-bundle.bin b/packaging/packages/syndicate-server/protocols/schema-bundle.bin deleted file mode 100644 index 3b263de..0000000 --- a/packaging/packages/syndicate-server/protocols/schema-bundle.bin +++ /dev/null @@ -1,10 +0,0 @@ -´³bundle·µ³ documentation„´³schema·³version‘³ definitions·³Url´³orµµ±present´³dict·³url´³named³url´³atom³String„„„„„µ±invalid´³dict·³url´³named³url³any„„„„µ±absent´³dict·„„„„„³IOList´³orµµ±bytes´³atom³ -ByteString„„µ±string´³atom³String„„µ±nested´³seqof´³refµ„³IOList„„„„„³Metadata´³rec´³lit³metadata„´³tupleµ´³named³object³any„´³named³info´³dictof´³atom³Symbol„³any„„„„„³ Description´³orµµ±present´³dict·³ description´³named³ description´³refµ„³IOList„„„„„µ±invalid´³dict·³ description´³named³ description³any„„„„µ±absent´³dict·„„„„„„³ embeddedType€„„µ³externalServices„´³schema·³version‘³ definitions·³Process´³orµµ±simple´³refµ„³ CommandLine„„µ±full´³refµ„³ FullProcess„„„„³Service´³refµ„³ DaemonService„³ClearEnv´³orµµ±present´³dict·³clearEnv´³named³clearEnv´³atom³Boolean„„„„„µ±invalid´³dict·³clearEnv´³named³clearEnv³any„„„„µ±absent´³dict·„„„„„³EnvValue´³orµµ±set´³atom³String„„µ±remove´³lit€„„µ±invalid³any„„„³Protocol´³orµµ±none´³lit³none„„µ±binarySyndicate´³lit³application/syndicate„„µ± textSyndicate´³lit³text/syndicate„„„„³ -ProcessDir´³orµµ±present´³dict·³dir´³named³dir´³atom³String„„„„„µ±invalid´³dict·³dir´³named³dir³any„„„„µ±absent´³dict·„„„„„³ -ProcessEnv´³orµµ±present´³dict·³env´³named³env´³dictof´³refµ„³ EnvVariable„´³refµ„³EnvValue„„„„„„µ±invalid´³dict·³env´³named³env³any„„„„µ±absent´³dict·„„„„„³ CommandLine´³orµµ±shell´³atom³String„„µ±full´³refµ„³FullCommandLine„„„„³ EnvVariable´³orµµ±string´³atom³String„„µ±symbol´³atom³Symbol„„µ±invalid³any„„„³ FullProcess´³andµ´³dict·³argv´³named³argv´³refµ„³ CommandLine„„„„´³named³env´³refµ„³ -ProcessEnv„„´³named³dir´³refµ„³ -ProcessDir„„´³named³clearEnv´³refµ„³ClearEnv„„„„³ ReadyOnStart´³orµµ±present´³dict·³ readyOnStart´³named³ readyOnStart´³atom³Boolean„„„„„µ±invalid´³dict·³ readyOnStart´³named³ readyOnStart³any„„„„µ±absent´³dict·„„„„„³ RestartField´³orµµ±present´³dict·³restart´³named³restart´³refµ„³ RestartPolicy„„„„„µ±invalid´³dict·³restart´³named³restart³any„„„„µ±absent´³dict·„„„„„³ DaemonProcess´³rec´³lit³daemon„´³tupleµ´³named³id³any„´³named³config´³refµ„³DaemonProcessSpec„„„„„³ DaemonService´³rec´³lit³daemon„´³tupleµ´³named³id³any„„„„³ ProtocolField´³orµµ±present´³dict·³protocol´³named³protocol´³refµ„³Protocol„„„„„µ±invalid´³dict·³protocol´³named³protocol³any„„„„µ±absent´³dict·„„„„„³ RestartPolicy´³orµµ±always´³lit³always„„µ±onError´³lit³on-error„„µ±all´³lit³all„„µ±never´³lit³never„„„„³FullCommandLine´³ tuplePrefixµ´³named³program´³atom³String„„„´³named³args´³seqof´³atom³String„„„„³DaemonProcessSpec´³orµµ±simple´³refµ„³ CommandLine„„µ±oneShot´³rec´³lit³one-shot„´³tupleµ´³named³setup´³refµ„³ CommandLine„„„„„„µ±full´³refµ„³FullDaemonProcess„„„„³FullDaemonProcess´³andµ´³named³process´³refµ„³ FullProcess„„´³named³ readyOnStart´³refµ„³ ReadyOnStart„„´³named³restart´³refµ„³ RestartField„„´³named³protocol´³refµ„³ ProtocolField„„„„„³ embeddedType´³refµ³ EntityRef„³Cap„„„µ³internalServices„´³schema·³version‘³ definitions·³ ConfigEnv´³dictof´³atom³Symbol„³any„³ DebtReporter´³rec´³lit³ debt-reporter„´³tupleµ´³named³intervalSeconds´³atom³Double„„„„„³ ConfigWatcher´³rec´³lit³config-watcher„´³tupleµ´³named³path´³atom³String„„´³named³env´³refµ„³ ConfigEnv„„„„„³TcpRelayListener´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Tcp„„´³named³ -gatekeeper´³embedded´³refµ³ -gatekeeper„³Resolve„„„„„„³UnixRelayListener´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Unix„„´³named³ -gatekeeper´³embedded´³refµ³ -gatekeeper„³Resolve„„„„„„„³ embeddedType´³refµ³ EntityRef„³Cap„„„„„ \ No newline at end of file diff --git a/packaging/packages/syndicate-server/protocols/schemas/documentation.prs b/packaging/packages/syndicate-server/protocols/schemas/documentation.prs deleted file mode 100644 index 2369728..0000000 --- a/packaging/packages/syndicate-server/protocols/schemas/documentation.prs +++ /dev/null @@ -1,11 +0,0 @@ -version 1 . - -; Assertion. Describes `object`. -Metadata = . - -; Projections of the `info` in a `Metadata` record. -Description = @present { description: IOList } / @invalid { description: any } / @absent {} . -Url = @present { url: string } / @invalid { url: any } / @absent {} . - -; Data type. From preserves' `conventions.md`. -IOList = @bytes bytes / @string string / @nested [IOList ...] . diff --git a/packaging/packages/syndicate-server/protocols/schemas/externalServices.prs b/packaging/packages/syndicate-server/protocols/schemas/externalServices.prs deleted file mode 100644 index dcfde99..0000000 --- a/packaging/packages/syndicate-server/protocols/schemas/externalServices.prs +++ /dev/null @@ -1,55 +0,0 @@ -version 1 . -embeddedType EntityRef.Cap . - -Service = DaemonService . - -DaemonService = . -DaemonProcess = . - -DaemonProcessSpec = @simple CommandLine / @oneShot / @full FullDaemonProcess . -FullDaemonProcess = @process FullProcess & @readyOnStart ReadyOnStart & @restart RestartField & @protocol ProtocolField . -ReadyOnStart = @present { readyOnStart: bool } / @invalid { readyOnStart: any } / @absent {} . -RestartField = @present { restart: RestartPolicy } / @invalid { restart: any } / @absent {} . -ProtocolField = @present { protocol: Protocol } / @invalid { protocol: any } / @absent {} . - -Process = @simple CommandLine / @full FullProcess . -FullProcess = - & { argv: CommandLine } - & @env ProcessEnv - & @dir ProcessDir - & @clearEnv ClearEnv -. -ProcessEnv = @present { env: { EnvVariable: EnvValue ...:... } } / @invalid { env: any } / @absent {} . -ProcessDir = @present { dir: string } / @invalid { dir: any } / @absent {} . -ClearEnv = @present { clearEnv: bool } / @invalid { clearEnv: any } / @absent {} . - -CommandLine = @shell string / @full FullCommandLine . -FullCommandLine = [@program string, @args string ...] . - -EnvVariable = @string string / @symbol symbol / @invalid any . -EnvValue = @set string / @remove #f / @invalid any . - -RestartPolicy = -/ ; Whether the process terminates normally or abnormally, restart it - ; without affecting any peer processes within the service. - =always -/ ; If the process terminates normally, leave everything alone; if it - ; terminates abnormally, restart it without affecting peers. - @onError =on-error -/ ; If the process terminates normally, leave everything alone; if it - ; terminates abnormally, restart the whole daemon (all processes - ; within the daemon). - =all -/ ; Treat both normal and abnormal termination as normal termination; that is, never restart, - ; and enter state "complete" even if the process fails. - =never -. - -Protocol = -/ ; stdin is /dev/null, output and error are logged - =none -/ ; stdin and stdout are *binary* Syndicate-protocol channels - @binarySyndicate =application/syndicate -/ ; stdin and stdout are *text* Syndicate-protocol channels - @textSyndicate =text/syndicate -. diff --git a/packaging/packages/syndicate-server/protocols/schemas/internalServices.prs b/packaging/packages/syndicate-server/protocols/schemas/internalServices.prs deleted file mode 100644 index d98cca8..0000000 --- a/packaging/packages/syndicate-server/protocols/schemas/internalServices.prs +++ /dev/null @@ -1,10 +0,0 @@ -version 1 . -embeddedType EntityRef.Cap . - -DebtReporter = . - -TcpRelayListener = . -UnixRelayListener = . -ConfigWatcher = . - -ConfigEnv = { symbol: any ...:... }. diff --git a/packaging/packages/syndicate-server/sync-binaries-debug.sh b/packaging/packages/syndicate-server/sync-binaries-debug.sh deleted file mode 100755 index d4dd342..0000000 --- a/packaging/packages/syndicate-server/sync-binaries-debug.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -cd "$(dirname "$0")" - -set -e - -build() { - make -C ~/src/syndicate-rs $1-binary-debug 2>&1 | tee buildlog.$1 - cp -p ~/src/syndicate-rs/target/$1-*/debug/syndicate-server syndicate-server.$1 -} - -cp -r ~/src/syndicate-rs/syndicate-server/protocols . -build x86_64 & -#build armv7 & -#build aarch64 & -wait diff --git a/packaging/packages/syndicate-server/sync-binaries.sh b/packaging/packages/syndicate-server/sync-binaries.sh deleted file mode 100755 index 0d7d710..0000000 --- a/packaging/packages/syndicate-server/sync-binaries.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -cd "$(dirname "$0")" - -set -e - -build() { - make -C ~/src/syndicate-rs $1-binary-release 2>&1 | tee buildlog.$1 - cp -p ~/src/syndicate-rs/target/$1-*/release/syndicate-server syndicate-server.$1 -} - -cp -r ~/src/syndicate-rs/syndicate-server/protocols . -build x86_64 & -build armv7 & -build aarch64 & -wait diff --git a/packaging/packages/synit-pid1/.gitignore b/packaging/packages/synit-pid1/.gitignore index 77a3d04..2087df3 100644 --- a/packaging/packages/synit-pid1/.gitignore +++ b/packaging/packages/synit-pid1/.gitignore @@ -1,5 +1,5 @@ -buildlog.* -synit-pid1.x86_64 -synit-pid1.armv7 -synit-pid1.aarch64 VERSION +buildlog.* +synit-pid1.aarch64 +synit-pid1.armv7 +synit-pid1.x86_64 diff --git a/packaging/packages/synit-pid1/sync-binaries.sh b/packaging/packages/synit-pid1/sync-binaries.sh deleted file mode 100755 index 7b060cd..0000000 --- a/packaging/packages/synit-pid1/sync-binaries.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -cd "$(dirname "$0")" - -set -e - -build() { - make -C ../../../synit-pid1 $1-binary-release 2>&1 | tee buildlog.$1 - cp -p ../../../synit-pid1/target/$1-*/release/synit-pid1 synit-pid1.$1 -} - -build x86_64 & -build armv7 & -build aarch64 & -wait