diff options
author | Jonathon Fernyhough | 2019-01-06 20:52:35 +0000 |
---|---|---|
committer | Jonathon Fernyhough | 2019-01-06 20:52:35 +0000 |
commit | c115e12d5074ee5b1aff7477b50280405c47d8e3 (patch) | |
tree | 39783a44ccc8162fccd2ebeb687d48653eab6178 | |
parent | 7a703a330ea63fb8b40cc841e632510f90ca9925 (diff) | |
download | aur-c115e12d5074ee5b1aff7477b50280405c47d8e3.tar.gz |
Better version comparison logic
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 20 |
2 files changed, 16 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = julia-orderedcollections pkgdesc = Julia implementation of associative containers that preserve insertion order pkgver = 1.0.2 - pkgrel = 3 + pkgrel = 4 url = https://github.com/JuliaCollections/OrderedCollections.jl arch = any license = MIT @@ -3,7 +3,7 @@ pkgname=julia-orderedcollections _pkgname=OrderedCollections pkgver=1.0.2 -pkgrel=3 +pkgrel=4 pkgdesc='Julia implementation of associative containers that preserve insertion order ' arch=(any) url="https://github.com/JuliaCollections/OrderedCollections.jl" @@ -33,13 +33,23 @@ _deps() { 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 +77,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 } |