diff options
| -rwxr-xr-x | build.sh | 9 | ||||
| -rw-r--r-- | env.sh | 48 | ||||
| -rw-r--r-- | hat-syslog/PKGBUILD | 6 | ||||
| -rw-r--r-- | opcut/PKGBUILD | 6 | ||||
| -rw-r--r-- | python-hat-doit/PKGBUILD | 9 | ||||
| -rw-r--r-- | python-hat-json/PKGBUILD | 7 | ||||
| -rw-r--r-- | python-hat-juggler/PKGBUILD | 6 | ||||
| -rw-r--r-- | python-hat-util/PKGBUILD | 4 | ||||
| -rwxr-xr-x | sync.sh | 17 |
9 files changed, 58 insertions, 54 deletions
@@ -2,6 +2,9 @@ set -e +ROOT_DIR=$(dirname "$(realpath "$0")") +. $ROOT_DIR/env.sh + makepkg_opts="-C" while getopts g flag; do @@ -12,11 +15,9 @@ while getopts g flag; do done shift $((OPTIND - 1)) -. "$(dirname -- "$0")/env.sh" - -for package in $packages; do +for package in $(get_packages "$@"); do echo ">>" $package set_makepkg_envs $package - (cd "$root_dir/$package"; makepkg $makepkg_opts) + (cd "$ROOT_DIR/$package"; makepkg $makepkg_opts) done @@ -1,30 +1,32 @@ -root_dir="$(cd "$(dirname -- "$0")"; pwd)" -build_dir="$root_dir/build" -aur_dir="$root_dir/aur" +: ${ROOT_DIR:?} -if [ $# -gt 0 ]; then - packages="$*" -else - packages="$(find "$root_dir" -mindepth 2 -maxdepth 2 -type f -name PKGBUILD | \ - xargs -I {} dirname {} | \ - xargs -I {} basename {})" -fi - -for package in $packages; do - if [ ! -f "$root_dir/$package/PKGBUILD" ]; then - echo "invalid package $package" 1>&2 - exit 1 - fi -done +BUILD_DIR="$ROOT_DIR/build" +AUR_DIR="$ROOT_DIR/aur" export PATH="/usr/bin:$PATH" +get_packages() ( + if [ $# -gt 0 ]; then + for package in "$@"; do + if [ ! -f "$ROOT_DIR/$package/PKGBUILD" ]; then + echo "invalid package $package" 1>&2 + exit 1 + fi + echo $package + done + else + find "$ROOT_DIR" -mindepth 2 -maxdepth 2 -type f -name PKGBUILD | \ + xargs -I {} dirname {} | \ + xargs -I {} basename {} + fi +) + + set_makepkg_envs() { - package=$1 - export PKGDEST="$build_dir/$package" - export SRCDEST="$build_dir/$package" - export SRCPKGDEST="$build_dir" - export LOGDEST="$build_dir" - export BUILDDIR="$build_dir" + export PKGDEST="$BUILD_DIR/$1" + export SRCDEST="$BUILD_DIR/$1" + export SRCPKGDEST="$BUILD_DIR" + export LOGDEST="$BUILD_DIR" + export BUILDDIR="$BUILD_DIR" } diff --git a/hat-syslog/PKGBUILD b/hat-syslog/PKGBUILD index 0ddd919..f66701c 100644 --- a/hat-syslog/PKGBUILD +++ b/hat-syslog/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Bozo Kopic <bozo@kopic.xyz> pkgname=hat-syslog -pkgver=0.7.8 +pkgver=0.7.15 pkgrel=1 pkgdesc="Syslog server and clients" url="https://github.com/hat-open/hat-syslog" @@ -9,9 +9,9 @@ license=('Apache') arch=('any') depends=('python-appdirs' 'python-hat-aio' 'python-hat-json' 'python-hat-juggler' 'python-hat-util') -makedepends=('python-build' 'python-hat-doit' 'python-installer' 'yarn') +makedepends=('python-build' 'python-hat-doit' 'python-installer' 'npm') source=("https://github.com/hat-open/hat-syslog/archive/refs/tags/v$pkgver.tar.gz") -sha256sums=('9c9202e4c06f48c809c35a9f5703d046890248a264e7d08bd1515e33aba9b1d1') +sha256sums=('7773429edae4a0cb2136884f5fbe5a7aaf4d765fa4f9cba00e1d9708853aaa7f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/opcut/PKGBUILD b/opcut/PKGBUILD index 6d63ad6..04d6570 100644 --- a/opcut/PKGBUILD +++ b/opcut/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Bozo Kopic <bozo@kopic.xyz> pkgname=opcut -pkgver=0.4.11 +pkgver=0.4.14 pkgrel=1 pkgdesc="Cutting stock problem optimizer" url="https://github.com/bozokopic/opcut" license=('GPL3') arch=('x86_64' 'armv7l' 'aarch64') depends=('python-aiohttp' 'python-hat-aio' 'python-hat-json' 'python-cairo') -makedepends=('python-build' 'python-hat-doit' 'python-installer' 'yarn') +makedepends=('python-build' 'python-hat-doit' 'python-installer' 'npm') source=("https://github.com/bozokopic/opcut/archive/refs/tags/v$pkgver.tar.gz") -sha256sums=('0e6493610e0f3165cb0125f373ba26253848b4a4dbcb8e675ef285ef8f9f77b9') +sha256sums=('9b94498c0f49bcd1ccad8bb890c8de14ab9c42ef4b7211fc7203bbd8fbaa6792') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/python-hat-doit/PKGBUILD b/python-hat-doit/PKGBUILD index 1b7e4c1..19a119e 100644 --- a/python-hat-doit/PKGBUILD +++ b/python-hat-doit/PKGBUILD @@ -2,8 +2,8 @@ _name=hat-doit pkgname=python-$_name -pkgver=0.15.7 -pkgrel=2 +pkgver=0.15.13 +pkgrel=1 pkgdesc="Hat build utility functions" url="https://github.com/hat-open/hat-doit" license=('Apache') @@ -11,14 +11,15 @@ arch=('any') depends=('python-doit' 'flake8' 'python-sphinx-furo' 'mkwhl' 'python-packaging' 'python-pdoc' 'python-pytest' 'python-pytest-asyncio' 'python-pytest-cov' 'python-pytest-timeout' - 'python-sphinx' 'python-tomli') + 'python-sphinx' 'python-tomli' 'python-watchdog') makedepends=('python-build' 'python-installer') source=("https://github.com/hat-open/hat-doit/archive/refs/tags/v$pkgver.tar.gz") -sha256sums=('7f8e49f14ed0ebe2628bdba7e4f6917bc8078a540edd1cedcab2c48ca4d41eec') +sha256sums=('121e316d8c8b096aab7bc5e8c2eb5babfbf8e66acd8fd2cb52a93bfa1216f400') build() { cd "$srcdir/$_name-$pkgver" sed -i -e 's/"pdoc >=14.2.0"/"pdoc >=14.1.0"/' pyproject.toml + sed -i -e 's/"watchdog >=4.0.0"/"watchdog >=2.3.0"/' pyproject.toml python -m build --wheel --no-isolation } diff --git a/python-hat-json/PKGBUILD b/python-hat-json/PKGBUILD index 57066e3..9067789 100644 --- a/python-hat-json/PKGBUILD +++ b/python-hat-json/PKGBUILD @@ -2,21 +2,20 @@ _name=hat-json pkgname=python-$_name -pkgver=0.5.21 +pkgver=0.5.27 pkgrel=1 pkgdesc="Hat JSON library" url="https://github.com/hat-open/hat-json" license=('Apache') arch=('any') depends=('python-hat-util' 'python-jsonpatch' 'python-jsonschema' - 'python-yaml' 'python-tomli' 'python-tomli-w') + 'python-yaml' 'python-referencing' 'python-tomli' 'python-tomli-w') makedepends=('python-build' 'python-hat-doit' 'python-installer') source=("https://github.com/hat-open/hat-json/archive/refs/tags/v$pkgver.tar.gz") -sha256sums=('9a416325b6bbef3d90d86193794e203373b2e365c209d51558430dd9c9164e7d') +sha256sums=('574b1399acf2371b8d8ebe6c6e8d896c6320623b51ec7b3cfe566988c6b2aaea') build() { cd "$srcdir/$_name-$pkgver" - sed -i -e 's/"jsonschema ~=4.17.3"/"jsonschema >=4.17.3"/' pyproject.toml python -m build --wheel --no-isolation } diff --git a/python-hat-juggler/PKGBUILD b/python-hat-juggler/PKGBUILD index 6703936..466567a 100644 --- a/python-hat-juggler/PKGBUILD +++ b/python-hat-juggler/PKGBUILD @@ -2,7 +2,7 @@ _name=hat-juggler pkgname=python-$_name -pkgver=0.6.12 +pkgver=0.6.14 pkgrel=1 pkgdesc="Juggler communication protocol" url="https://github.com/hat-open/hat-juggler" @@ -11,11 +11,11 @@ arch=('any') depends=('python-aiohttp' 'python-hat-aio' 'python-hat-json' 'python-hat-util') makedepends=('python-build' 'python-hat-doit' 'python-installer') source=("https://github.com/hat-open/hat-juggler/archive/refs/tags/v$pkgver.tar.gz") -sha256sums=('a06a1a8410f5cc0455596325d43263ebb8c510b320c11441b7ba20ad96726d35') +sha256sums=('dea73a69189a85b583263e64e9bf25219b688710b0d0e96b89ea9fd1fca17876') build() { cd "$srcdir/$_name-$pkgver" - sed -i -e 's/"aiohttp ~= 3.8.4"/"jsonschema >=3.8.4"/' pyproject.toml + sed -i -e 's/"aiohttp ~=3.8.4"/"aiohttp >=3.8.4"/' pyproject.toml python -m build --wheel --no-isolation } diff --git a/python-hat-util/PKGBUILD b/python-hat-util/PKGBUILD index d95fb85..ac2708a 100644 --- a/python-hat-util/PKGBUILD +++ b/python-hat-util/PKGBUILD @@ -2,7 +2,7 @@ _name=hat-util pkgname=python-$_name -pkgver=0.6.11 +pkgver=0.6.14 pkgrel=1 pkgdesc="Hat utility library" url="https://github.com/hat-open/hat-util" @@ -11,7 +11,7 @@ arch=('any') depends=('python') makedepends=('python-build' 'python-hat-doit' 'python-installer') source=("https://github.com/hat-open/hat-util/archive/refs/tags/v$pkgver.tar.gz") -sha256sums=('d848dfb256c3886d667bcf2d3192887f5ffcca29160f1544e4b61ebbec750e36') +sha256sums=('49ffaa1aba6848ce675569e2bcea60e8de7bd457eaef8d4f17f5996894037882') build() { cd "$srcdir/$_name-$pkgver" @@ -2,24 +2,25 @@ set -e -. "$(dirname -- "$0")/env.sh" +ROOT_DIR=$(dirname "$(realpath "$0")") +. $ROOT_DIR/env.sh -mkdir -p "$aur_dir" +mkdir -p "$AUR_DIR" -for package in $packages; do +for package in $(get_packages "$@"); do echo ">>" $package - if [ -d "$aur_dir/$package" ]; then - git -C "$aur_dir/$package" pull -q + if [ -d "$AUR_DIR/$package" ]; then + git -C "$AUR_DIR/$package" pull -q else git -C aur clone -q ssh://aur@aur.archlinux.org/$package.git fi - cp -p -r -t "$aur_dir/$package" "$root_dir/$package/"* + cp -p -r -t "$AUR_DIR/$package" "$ROOT_DIR/$package/"* - (cd "$aur_dir/$package"; makepkg --printsrcinfo > .SRCINFO) + (cd "$AUR_DIR/$package"; makepkg --printsrcinfo > .SRCINFO) - if git -C "$aur_dir/$package" diff --quiet; then + if git -C "$AUR_DIR/$package" diff --quiet; then echo "OK" else echo "CHANGED" |