diff options
author | Jonathon Fernyhough | 2019-01-06 20:52:31 +0000 |
---|---|---|
committer | Jonathon Fernyhough | 2019-01-06 20:52:31 +0000 |
commit | 5e229142758a0e9ca96732d579c92a9f40bccf59 (patch) | |
tree | 08771dfd3c108a2f4f6d64e97f9c59432ce73f55 | |
parent | d8f02b53759747e2067fdc9fbe09147f522ec288 (diff) | |
download | aur-5e229142758a0e9ca96732d579c92a9f40bccf59.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-datastructures pkgdesc = Julia implementation of Data structures pkgver = 0.14.0 - pkgrel = 3 + pkgrel = 4 url = https://github.com/JuliaCollections/DataStructures.jl arch = any license = MIT @@ -3,7 +3,7 @@ pkgname=julia-datastructures _pkgname=DataStructures pkgver=0.14.0 -pkgrel=3 +pkgrel=4 pkgdesc='Julia implementation of Data structures' arch=(any) url=https://github.com/JuliaCollections/DataStructures.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 @@ -68,5 +77,5 @@ package() { # Has circular dependency on julia-primes #check() { # cd $_pkgname.jl-$pkgver -# JULIA_LOAD_PATH=src: julia test/runtests.jl +# HOME="$srcdir" JULIA_LOAD_PATH=src:$JULIA_LOAD_PATH julia test/runtests.jl #} |