Use Yggdrasil for zstd binaries, update zstd to 1.4.2 (#16)

* Switch to Yggradsil for zstd binaries

Also update zstd to v1.4.2.

* Update Travis and AppVeyor to run on 1.0 and 1.1

The Project.toml file declares the minimum supported Julia version to be
1.0, but CI is currently only testing on 0.7 and nightly. This commit
removes 0.7 from testing (as it's declared to be unsupported) and adds
1.0 and 1.1. It also adds 32-bit Windows testing to AppVeyor.

Author: ararslan

.travis.yml

@@ -4,7 +4,8 @@ os:
   - linux
   - osx
 julia:
-  - 0.7
+  - 1.0
+  - 1.1
   - nightly
 matrix:
   allow_failures:

appveyor.yml

@@ -1,11 +1,11 @@
 environment:
   matrix:
-  - julia_version: 0.7
-#  - julia_version: 1
+  - julia_version: 1.0
+  - julia_version: 1.1
   - julia_version: nightly
 
 platform:
-#  - x86 # 32-bit
+  - x86 # 32-bit
   - x64 # 64-bit
 
 matrix:

deps/build.jl

@@ -1,45 +1,62 @@
-using BinaryProvider # requires BinaryProvider 0.3.0 or later
+using BinaryProvider
 
-# Parse some basic command-line arguments
 const verbose = "--verbose" in ARGS
-const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr")))
-products = [
-    LibraryProduct(prefix, ["libzstd"], :libzstd),
-]
+const prefix = Prefix(get(filter(!isequal("--verbose"), ARGS), 1, joinpath(@__DIR__, "usr")))
+products = [LibraryProduct(prefix, ["libzstd"], :libzstd)]
 
-# Download binaries from hosted location
-bin_prefix = "https://github.com/bicycle1885/ZstdBuilder/releases/download/v1.0.0"
+bin_prefix = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Zstd-v1.4.2+0"
 
-# Listing of files generated by BinaryBuilder:
 download_info = Dict(
-    Linux(:aarch64, :glibc) => ("$bin_prefix/ZstdBuilder.v1.3.5.aarch64-linux-gnu.tar.gz", "97e67a71dc1b7a65229e5bec76fd088c77333943cf9724d4f3855229563de7f9"),
-    Linux(:aarch64, :musl) => ("$bin_prefix/ZstdBuilder.v1.3.5.aarch64-linux-musl.tar.gz", "ad601bba5ec35ae04ebb540ef397a8ab29fe09f7a3b6310bcf0ad90b5c05c3bf"),
-    Linux(:armv7l, :glibc, :eabihf) => ("$bin_prefix/ZstdBuilder.v1.3.5.arm-linux-gnueabihf.tar.gz", "9add827c7b4ad838081da79bde9813b11e5276780b590960cb457781feace7e2"),
-    Linux(:armv7l, :musl, :eabihf) => ("$bin_prefix/ZstdBuilder.v1.3.5.arm-linux-musleabihf.tar.gz", "2005bfa5cace0136d54aa613bb6391c4f0f634b1b443a4744bd6f9e31968b9fc"),
-    Linux(:i686, :glibc) => ("$bin_prefix/ZstdBuilder.v1.3.5.i686-linux-gnu.tar.gz", "96b6184006afa2368f3670953b222a26fb4a65ac8934eb5c12890c7394cd1203"),
-    Linux(:i686, :musl) => ("$bin_prefix/ZstdBuilder.v1.3.5.i686-linux-musl.tar.gz", "39e681a87cc6483bca042ac1ce3b04de894368a19dfd16a95ce26e6d5f3c37e3"),
-    Linux(:powerpc64le, :glibc) => ("$bin_prefix/ZstdBuilder.v1.3.5.powerpc64le-linux-gnu.tar.gz", "3b39026efa4cff3cb1c6ac286f7ae4d359d134f741cc9dfd5543df904ae1875d"),
-    MacOS(:x86_64) => ("$bin_prefix/ZstdBuilder.v1.3.5.x86_64-apple-darwin14.tar.gz", "43c7ded749de65bc422a99b890e493cddfa46d4b2415b9da09a504624dc7b904"),
-    Linux(:x86_64, :glibc) => ("$bin_prefix/ZstdBuilder.v1.3.5.x86_64-linux-gnu.tar.gz", "197bce9aae1403445ef6af443adf71461f7f5e6c451efc192be0b4280675c47e"),
-    Linux(:x86_64, :musl) => ("$bin_prefix/ZstdBuilder.v1.3.5.x86_64-linux-musl.tar.gz", "771cdb081f306f5e2e54b07478d68785f59c6970b77eabd454058a94ba2f67de"),
-    FreeBSD(:x86_64) => ("$bin_prefix/ZstdBuilder.v1.3.5.x86_64-unknown-freebsd11.1.tar.gz", "1316f654b6f74551968988db423568268a76a76d9b1f98d2aa12f561fa2bc0d1"),
-    Windows(:x86_64) => ("$bin_prefix/ZstdBuilder.v1.3.5.x86_64-w64-mingw32.tar.gz", "0967ebac58666f24dc3e0edcb07c29b27960a0d4af67591c10f374f65231e003"),
+    Linux(:aarch64, libc=:glibc) =>
+        ("$bin_prefix/Zstd.v1.4.2.aarch64-linux-gnu.tar.gz",
+         "fa5b1a0bbaf0d0c9b68b74f985609c16212288ad1822834a8bc973dc28de7b3b"),
+    Linux(:aarch64, libc=:musl) =>
+        ("$bin_prefix/Zstd.v1.4.2.aarch64-linux-musl.tar.gz",
+         "913f994d6c6005d2b574a1f7b00cef59fc0ad99ac1b6df91ac16ea0b7fee7f99"),
+    Linux(:armv7l, libc=:glibc, call_abi=:eabihf) =>
+        ("$bin_prefix/Zstd.v1.4.2.arm-linux-gnueabihf.tar.gz",
+         "bf474a692e013b0c6e74b9a738e04c6aa12b0c0f54269a6d94eed45eec05aabb"),
+    Linux(:armv7l, libc=:musl, call_abi=:eabihf) =>
+        ("$bin_prefix/Zstd.v1.4.2.arm-linux-musleabihf.tar.gz",
+         "489e8706c27b6277b3cd604f9bfc88c8f81d2ae9b76d34062f099fe31c024e5d"),
+    Linux(:i686, libc=:glibc) =>
+        ("$bin_prefix/Zstd.v1.4.2.i686-linux-gnu.tar.gz",
+         "ed8652f9509fd6cb6cd3cca9023326b698d1437f6d22026c7763a32658a8fca5"),
+    Linux(:i686, libc=:musl) =>
+        ("$bin_prefix/Zstd.v1.4.2.i686-linux-musl.tar.gz",
+         "b0de4b032efa9a0108c32a00e27367352e36304f3f62c3cfbe9cdae5ff48fa2f"),
+    Windows(:i686) =>
+        ("$bin_prefix/Zstd.v1.4.2.i686-w64-mingw32.tar.gz",
+         "785a2a97ba59fbe2529b4ded1e380d1385351b805f9d0b91df64802db36648d5"),
+    Linux(:powerpc64le, libc=:glibc) =>
+        ("$bin_prefix/Zstd.v1.4.2.powerpc64le-linux-gnu.tar.gz",
+         "8dbc6e14931d70f5b112f9f00534c80d2b5cde18dbb74ebae31b6ff97f7863dd"),
+    MacOS(:x86_64) =>
+        ("$bin_prefix/Zstd.v1.4.2.x86_64-apple-darwin14.tar.gz",
+         "5ff8c2b4719fd1b605413388608007e5bdeb92caa60619c32f1809dc6907fcfc"),
+    Linux(:x86_64, libc=:glibc) =>
+        ("$bin_prefix/Zstd.v1.4.2.x86_64-linux-gnu.tar.gz",
+         "a6806ca68680bf813ff326f65f4a478574a2a4e27b8ad72c8e9a8f180a89b816"),
+    Linux(:x86_64, libc=:musl) =>
+        ("$bin_prefix/Zstd.v1.4.2.x86_64-linux-musl.tar.gz",
+         "b00c751cfb61d160415c427a795fdc3521735c37c3c32164b8218f210e8a3d51"),
+    FreeBSD(:x86_64) =>
+        ("$bin_prefix/Zstd.v1.4.2.x86_64-unknown-freebsd11.1.tar.gz",
+         "d38e10e988a4b7229906c1f52f1b1a12589063d1d6ad90315fbc72532650f468"),
+    Windows(:x86_64) =>
+        ("$bin_prefix/Zstd.v1.4.2.x86_64-w64-mingw32.tar.gz",
+         "ab42350bf99389cd9118e1d10a310d6a572afcfe521e70abd42f7bfa340666bd"),
 )
 
-# Install unsatisfied or updated dependencies:
-unsatisfied = any(!satisfied(p; verbose=verbose) for p in products)
-if haskey(download_info, platform_key())
-    url, tarball_hash = download_info[platform_key()]
-    if unsatisfied || !isinstalled(url, tarball_hash; prefix=prefix)
-        # Download and install binaries
-        install(url, tarball_hash; prefix=prefix, force=true, verbose=verbose)
-    end
-elseif unsatisfied
-    # If we don't have a BinaryProvider-compatible .tar.gz to download, complain.
-    # Alternatively, you could attempt to install from a separate provider,
-    # build from source or something even more ambitious here.
-    error("Your platform $(triplet(platform_key())) is not supported by this package!")
+unsatisfied = any(p->!satisfied(p, verbose=verbose), products)
+dl_info = choose_download(download_info, platform_key_abi())
+if dl_info === nothing && unsatisfied
+    error("Your platform (\"$(Sys.MACHINE)\", parsed as ",
+          "\"$(triplet(platform_key_abi()))\") is not supported by this package!")
 end
 
-# Write out a deps.jl file that will contain mappings for our products
-write_deps_file(joinpath(@__DIR__, "deps.jl"), products)
+if unsatisfied || !isinstalled(dl_info..., prefix=prefix)
+    install(dl_info..., prefix=prefix, force=true, verbose=verbose)
+end
+
+write_deps_file(joinpath(@__DIR__, "deps.jl"), products, verbose=verbose)