diff options
author | Jonathon Fernyhough | 2019-01-06 20:52:36 +0000 |
---|---|---|
committer | Jonathon Fernyhough | 2019-01-06 20:52:36 +0000 |
commit | 3c8d182536d1c21a1127544d132aa0540b3512ab (patch) | |
tree | 0a5c707618984b6b49c631f91ba6f0beca2b78d8 | |
parent | dcb11c246f2fcc0bf4d7fa0b61b4cdbc7bc8af76 (diff) | |
download | aur-3c8d182536d1c21a1127544d132aa0540b3512ab.tar.gz |
Better version comparison logic
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 21 |
2 files changed, 16 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = julia-primes pkgdesc = Prime numbers in Julia pkgver = 0.4.0 - pkgrel = 3 + pkgrel = 4 url = https://github.com/JuliaMath/Primes.jl arch = any license = MIT @@ -3,7 +3,7 @@ pkgname=julia-primes _pkgname=Primes pkgver=0.4.0 -pkgrel=3 +pkgrel=4 pkgdesc='Prime numbers in Julia' arch=(any) url=https://github.com/JuliaMath/Primes.jl @@ -32,14 +32,23 @@ _deps() { julia -e "using Pkg alldeps = Pkg.TOML.parsefile(\"$srcdir/$pkgname-Deps.toml\") - version = join(split(\"$pkgver\", \".\")[1:2],\".\") + version = VersionNumber(\"$pkgver\") + majmin = VersionNumber(\"${pkgver%.*}\") deps = Dict{String,Any}() for (key, value) in alldeps vers = split(key, \"-\") - - if version == vers[1] || (version > vers[1] && length(vers) == 2 && version <= vers[2]) - merge!(deps, value) + lower = VersionNumber(vers[1]) + if length(vers) == 2 + upper = VersionNumber(vers[2]) + if (majmin >= lower && majmin <= upper) || + (version >= lower && version <= upper) + merge!(deps, value) + end + elseif length(vers) == 1 + if majmin == lower || version == lower + merge!(deps, value) + end end end @@ -67,5 +76,5 @@ package() { check() { cd $_pkgname.jl-$pkgver - JULIA_LOAD_PATH=src:$JULIA_LOAD_PATH julia test/runtests.jl + HOME="$srcdir" JULIA_LOAD_PATH=src:$JULIA_LOAD_PATH julia test/runtests.jl } |