Use ZstdBuilder and drop Julia 0.6 (#9)

Author: bicycle1885

.travis.yml

@@ -1,20 +1,15 @@
-# Documentation: http://docs.travis-ci.com/user/languages/julia/
+# Documentation: https://docs.travis-ci.com/user/languages/julia/
 language: julia
 os:
   - linux
   - osx
 julia:
-  - 0.6
+  - 0.7
   - nightly
 matrix:
   allow_failures:
     - julia: nightly
 notifications:
   email: false
-# uncomment the following lines to override the default test script
-#script:
-#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-#  - julia -e 'Pkg.clone(pwd()); Pkg.build("CodecZstd"); Pkg.test("CodecZstd"; coverage=true)'
 after_success:
-  # push coverage results to Codecov
-  - julia -e 'cd(Pkg.dir("CodecZstd")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

REQUIRE

@@ -1,3 +1,3 @@
-julia 0.6
-BinDeps
-TranscodingStreams 0.3
+julia 0.7
+BinaryProvider 0.4
+TranscodingStreams 0.6

appveyor.yml

@@ -1,10 +1,17 @@
 environment:
   matrix:
+  - julia_version: 0.7
+#  - julia_version: 1
+  - julia_version: nightly
+
+platform:
+#  - x86 # 32-bit
+  - x64 # 64-bit
+
+matrix:
+  allow_failures:
+  - julia_version: latest
 
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 branches:
   only:
     - master
@@ -17,19 +24,12 @@ notifications:
     on_build_status_changed: false
 
 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
 
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
-      Pkg.clone(pwd(), \"CodecZstd\"); Pkg.build(\"CodecZstd\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test(\"CodecZstd\")"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

deps/build.jl

@@ -1,21 +1,45 @@
-using BinDeps
+using BinaryProvider # requires BinaryProvider 0.3.0 or later
 
-BinDeps.@setup
+# 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),
+]
 
-libzstd = library_dependency("libzstd")
-version = "1.3.4"
-source  = "https://github.com/facebook/zstd/archive/v$(version).tar.gz"
+# Download binaries from hosted location
+bin_prefix = "https://github.com/bicycle1885/ZstdBuilder/releases/download/v1.0.0"
 
-prefix = joinpath(dirname(@__FILE__), "usr")
-provides(Sources, URI(source), libzstd, unpacked_dir="zstd-$(version)")
-provides(
-    SimpleBuild,
-    (@build_steps begin
-        GetSources(libzstd)
-        @build_steps begin
-            ChangeDirectory(joinpath(BinDeps.depsdir(libzstd), "src", "zstd-$(version)"))
-            MakeTargets(["PREFIX=$(prefix)", "install"])
-        end
-    end), libzstd)
+# 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"),
+)
 
-@BinDeps.install Dict(:libzstd=>:libzstd)
+# 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!")
+end
+
+# Write out a deps.jl file that will contain mappings for our products
+write_deps_file(joinpath(@__DIR__, "deps.jl"), products)

src/CodecZstd.jl

@@ -1,5 +1,3 @@
-__precompile__()
-
 module CodecZstd
 
 export
@@ -14,30 +12,19 @@ import TranscodingStreams:
     Memory,
     Error,
     initialize,
-    finalize
-
-# TODO: This method will be added in the next version of TranscodingStreams.jl.
-function splitkwargs(kwargs, keys)
-    hits = []
-    others = []
-    for kwarg in kwargs
-        push!(kwarg[1] ∈ keys ? hits : others, kwarg)
-    end
-    return hits, others
-end
+    finalize,
+    splitkwargs
 
-if VERSION < v"0.7-"
-    const Cvoid = Void
+using Libdl
+const libzpath = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
+if !isfile(libzpath)
+    error("CodecZlib.jl is not installed properly, run Pkg.build(\"CodecZlib\") and restart Julia.")
 end
+include(libzpath)
+check_deps()
 
 include("libzstd.jl")
 include("compression.jl")
 include("decompression.jl")
 
-# Deprecations
-@deprecate ZstdCompression         ZstdCompressor
-@deprecate ZstdCompressionStream   ZstdCompressorStream
-@deprecate ZstdDecompression       ZstdDecompressor
-@deprecate ZstdDecompressionStream ZstdDecompressorStream
-
 end # module

src/libzstd.jl

@@ -1,9 +1,6 @@
 # Low-level Interfaces
 # ====================
 
-# load libzstd
-include("../deps/deps.jl")
-
 function iserror(code::Csize_t)
     return ccall((:ZSTD_isError, libzstd), Cuint, (Csize_t,), code) != 0
 end

test/runtests.jl

@@ -1,29 +1,17 @@
 using CodecZstd
-import TranscodingStreams
-if VERSION < v"0.7-"
-    using Base.Test
-else
-    using Test
-end
+using TranscodingStreams
+using Test
 
 @testset "Zstd Codec" begin
     codec = ZstdCompressor()
     @test codec isa ZstdCompressor
-    if VERSION < v"0.7-"
-        @test ismatch(r"^CodecZstd.ZstdCompressor\(level=\d+\)$", sprint(show, codec))
-    else
-        @test occursin(r"^ZstdCompressor\(level=\d+\)$", sprint(show, codec))
-    end
+    @test occursin(r"^ZstdCompressor\(level=\d+\)$", sprint(show, codec))
     @test CodecZstd.initialize(codec) === nothing
     @test CodecZstd.finalize(codec) === nothing
 
     codec = ZstdDecompressor()
     @test codec isa ZstdDecompressor
-    if VERSION < v"0.7-"
-        @test ismatch(r"^CodecZstd.ZstdDecompressor\(\)$", sprint(show, codec))
-    else
-        @test occursin(r"^ZstdDecompressor\(\)$", sprint(show, codec))
-    end
+    @test occursin(r"^ZstdDecompressor\(\)$", sprint(show, codec))
     @test CodecZstd.initialize(codec) === nothing
     @test CodecZstd.finalize(codec) === nothing