chore: update PKGBUILD to use git submodule

dev
Jef Roosens 2023-01-28 14:36:46 +01:00
parent 6ca53ce534
commit 8d14d5c3fd
Signed by untrusted user: Jef Roosens
GPG Key ID: B75D4F293C7052DB
3 changed files with 23 additions and 11 deletions

View File

@ -11,27 +11,37 @@ makedepends=('git' 'vlang')
arch=('x86_64' 'aarch64') arch=('x86_64' 'aarch64')
url='https://git.rustybever.be/vieter-v/vieter' url='https://git.rustybever.be/vieter-v/vieter'
license=('AGPL3') license=('AGPL3')
source=("$pkgname::git+https://git.rustybever.be/vieter-v/vieter#branch=dev") source=(
"${pkgname}::git+https://git.rustybever.be/vieter-v/vieter#branch=dev"
"libvieter::git+https://git.rustybever.be/vieter-v/libvieter"
)
md5sums=('SKIP') md5sums=('SKIP')
provides=('vieter') provides=('vieter')
conflicts=('vieter') conflicts=('vieter')
pkgver() { pkgver() {
cd "$pkgname" cd "${pkgname}"
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
} }
prepare() { prepare() {
export VMODULES="$srcdir/.vmodules" cd "${pkgname}"
cd "$pkgname/src" && v install # Add the libvieter submodule
git submodule init
git config submodules.src/libvieter.url "${srcdir}/libvieter"
git -c protocol.file.allow=always submodule update
export VMODULES="${srcdir}/.vmodules"
cd "${pkgname}/src" && v install
} }
build() { build() {
export VMODULES="$srcdir/.vmodules" export VMODULES="${srcdir}/.vmodules"
cd "$pkgname" cd "${pkgname}"
make prod make prod
@ -42,9 +52,9 @@ build() {
} }
package() { package() {
install -dm755 "$pkgdir/usr/bin" install -dm755 "${pkgdir}/usr/bin"
install -Dm755 "$pkgname/pvieter" "$pkgdir/usr/bin/vieter" install -Dm755 "${pkgname}/pvieter" "${pkgdir}/usr/bin/vieter"
install -dm755 "$pkgdir/usr/share/man/man1" install -dm755 "${pkgdir}/usr/share/man/man1"
install -Dm644 "$pkgname/man"/*.1 "$pkgdir/usr/share/man/man1" install -Dm644 "${pkgname}/man"/*.1 "${pkgdir}/usr/share/man/man1"
} }

View File

@ -5,6 +5,7 @@ module cron
#flag -lvieter #flag -lvieter
#include "vieter_cron.h" #include "vieter_cron.h"
[typedef]
pub struct C.vieter_cron_expression { pub struct C.vieter_cron_expression {
minutes &u8 minutes &u8
hours &u8 hours &u8
@ -57,6 +58,7 @@ fn (ce1 Expression) == (ce2 Expression) bool {
return true return true
} }
[typeef]
struct C.vieter_cron_simple_time { struct C.vieter_cron_simple_time {
year int year int
month int month int

@ -1 +1 @@
Subproject commit 379a05a7b6b604c107360e0a679fb3ea5400e02c Subproject commit 11709cc611c02a4e9140409a0e81d639522c06f1