upgrade libsass version (#10)

* upgrade libsass version * try new build * update download instructions
piever · Mar 17, 2019 · 47497ed · 47497ed
1 parent afa7ff4
commit 47497ed
Showing 1 changed file with 25 additions and 16 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -8,28 +8,33 @@ products = [
 ]
 
 # Download binaries from hosted location
-bin_prefix = "https://github.com/piever/SassBuilder/releases/download/v3.5.4-0"
+bin_prefix = "https://github.com/piever/SassBuilder/releases/download/v3.5.5-1"
 
 # Listing of files generated by BinaryBuilder:
 download_info = Dict(
-    Linux(:aarch64, libc=:glibc) => ("$bin_prefix/libsass.v3.5.4.aarch64-linux-gnu.tar.gz", "5d61915b3a971ca4d70ff50650138ada8586ad6641c9efb2997eacca7b19af5a"),
-    Linux(:aarch64, libc=:musl) => ("$bin_prefix/libsass.v3.5.4.aarch64-linux-musl.tar.gz", "0264387f91122d58c402b15489c8bc47b940d58926edd9f8bda6d625867db64d"),
-    Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/libsass.v3.5.4.arm-linux-gnueabihf.tar.gz", "d07eaafb8c15c6cca3e9b2f9fd8ca1214d3dcce72b5fae9e7ab08a157aad71be"),
-    Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/libsass.v3.5.4.arm-linux-musleabihf.tar.gz", "ddb1701074e0204ceec342fafd86bd941624b7e68bea62ddad71dff85c49fcec"),
-    Linux(:i686, libc=:glibc) => ("$bin_prefix/libsass.v3.5.4.i686-linux-gnu.tar.gz", "0a2930af908786051b6cd019207478aa042d5df24c7beaeaf0e567d6bc3f329a"),
-    Linux(:i686, libc=:musl) => ("$bin_prefix/libsass.v3.5.4.i686-linux-musl.tar.gz", "2000a4bb442d5486ec8fb43bbf52b6dadf359d5543b4f91b9e339495463831c8"),
-    Windows(:i686) => ("$bin_prefix/libsass.v3.5.4.i686-w64-mingw32.tar.gz", "183e6a626fe5d290cbefb873d4597c0d2b8c84b18041e43cd065f8fdd1074a3e"),
-    Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/libsass.v3.5.4.powerpc64le-linux-gnu.tar.gz", "107af4805bc3030727fd36470f076c05e35e180226266fa5104036f4cfcfaab6"),
-    MacOS(:x86_64) => ("$bin_prefix/libsass.v3.5.4.x86_64-apple-darwin14.tar.gz", "2aa160b86fb06af0ffd7d9b49cb93c2dc55fa67ed65450827af9cacd829a3796"),
-    Linux(:x86_64, libc=:glibc) => ("$bin_prefix/libsass.v3.5.4.x86_64-linux-gnu.tar.gz", "84cccfbba2102935de0930f5329bac72d29e0b8a8c9b0aee09de37bc8d4110c5"),
-    Linux(:x86_64, libc=:musl) => ("$bin_prefix/libsass.v3.5.4.x86_64-linux-musl.tar.gz", "f9f99a43bdee6178072dacfc7f121e119064e121f9d31d0a1b3bb0dc5535fc00"),
-    FreeBSD(:x86_64) => ("$bin_prefix/libsass.v3.5.4.x86_64-unknown-freebsd11.1.tar.gz", "c0634699023fbf6fcdfd89a9be28b7ae46c9642371375d4e4e0eb96b7dbeee7f"),
-    Windows(:x86_64) => ("$bin_prefix/libsass.v3.5.4.x86_64-w64-mingw32.tar.gz", "c1a500824dc78aa57921e01c8ba98d5471133854ad9de701f99979ab19ff8c12"),
+    Linux(:aarch64, libc=:glibc) => ("$bin_prefix/libsass.v3.5.5.aarch64-linux-gnu.tar.gz", "6c04e15fe9485207cd7cc1327b87b883c85d9f0e0e5f8aafd81b5244f9db4a80"),
+    Linux(:aarch64, libc=:musl) => ("$bin_prefix/libsass.v3.5.5.aarch64-linux-musl.tar.gz", "60bc726ea57191c03acf8ac96c6f0f5630515b73ca0a7b86299909b328efa448"),
+    Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/libsass.v3.5.5.arm-linux-gnueabihf.tar.gz", "024822bbf15fc82c18966c0e16d17fab8792757328ceb44518752e52c02f6807"),
+    Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/libsass.v3.5.5.arm-linux-musleabihf.tar.gz", "7ead3aa331cd2082ef3e14f81101c4abebe2cd6d1ae4133813d1c01ab064d34c"),
+    Linux(:i686, libc=:glibc) => ("$bin_prefix/libsass.v3.5.5.i686-linux-gnu.tar.gz", "0afce3dced23efa55a7ddc762cb3064fabcea7fcd37ef3c72f2a290f38d24307"),
+    Linux(:i686, libc=:musl) => ("$bin_prefix/libsass.v3.5.5.i686-linux-musl.tar.gz", "b46d2f1c92dfa3ff4fc028380da00ac1d0b79b019d5694d6f79fa378e7208e92"),
+    Windows(:i686) => ("$bin_prefix/libsass.v3.5.5.i686-w64-mingw32.tar.gz", "bad6acf124d6649b8ec4b021cdfd88aecfc4151734f2c5ce1683fda07f6fb236"),
+    Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/libsass.v3.5.5.powerpc64le-linux-gnu.tar.gz", "fcfc2d96cbead84577cdf2d8e9810612037d8a67fc4861bb7e92d2009edee588"),
+    MacOS(:x86_64) => ("$bin_prefix/libsass.v3.5.5.x86_64-apple-darwin14.tar.gz", "a2f8768639f49a7444fd815b6a4e572c650495059272c70af73dec149fde7ee0"),
+    Linux(:x86_64, libc=:glibc) => ("$bin_prefix/libsass.v3.5.5.x86_64-linux-gnu.tar.gz", "28316732cbe46c1047db3068824468b8a620b750b311bcef1b430c00de81092e"),
+    Linux(:x86_64, libc=:musl) => ("$bin_prefix/libsass.v3.5.5.x86_64-linux-musl.tar.gz", "25c7925c9b57fce19a646c040484bd5f6a21603a27561469f319b96c462f8241"),
+    FreeBSD(:x86_64) => ("$bin_prefix/libsass.v3.5.5.x86_64-unknown-freebsd11.1.tar.gz", "12a2b5739b186a14189b369101fac2241790104697cc7480ded0783f757231a1"),
+    Windows(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/libsass.v3.5.5.x86_64-w64-mingw32-gcc7.tar.gz", "c24fb85e81b8e2329651592406b4d371bea1e24f9dc7157f1534660945582ec9"),
 )
 
 # Install unsatisfied or updated dependencies:
 unsatisfied = any(!satisfied(p; verbose=verbose) for p in products)
-dl_info = choose_download(download_info, platform_key_abi())
+const isWin64 = Sys.iswindows() && Sys.WORD_SIZE == 64
+@static if isWin64
+     dl_info = download_info[Windows(:x86_64, compiler_abi=CompilerABI(:gcc7))]
+else
+     dl_info = choose_download(download_info, platform_key_abi())
+end
 if dl_info === nothing && unsatisfied
     # If we don't have a compatible .tar.gz to download, complain.
     # Alternatively, you could attempt to install from a separate provider,
@@ -41,7 +46,11 @@ end
 # trying to install is not itself installed) then load it up!
 if unsatisfied || !isinstalled(dl_info...; prefix=prefix)
     # Download and install binaries
-    install(dl_info...; prefix=prefix, force=true, verbose=verbose)
+    @static if isWin64
+        install(dl_info...; prefix=prefix, force=true, verbose=verbose, ignore_platform=true)
+    else
+        install(dl_info...; prefix=prefix, force=true, verbose=verbose)
+    end
 end
 
 # Write out a deps.jl file that will contain mappings for our products