Use BinaryBuilder-provided iconv

Fixes #36.

Author: ararslan

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.0'
+          - '1.3'
           - '1' # automatically expands to the latest stable 1.x release of Julia
           - 'nightly'
         os:

.gitignore

@@ -1,10 +1,4 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
-deps/builds
-deps/downloads
-deps/src
-deps/usr
-deps/deps.jl
-deps/build.log
-MANIFEST.TOML
+Manifest.toml

Project.toml

@@ -3,12 +3,11 @@ uuid = "69024149-9ee7-55f6-a4c4-859efe599b68"
 version = "0.3.3"
 
 [deps]
-BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
-Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+Libiconv_jll = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531"
 
 [compat]
-BinaryProvider = "0.4.1, 0.5"
-julia = "0.7, 1"
+Libiconv_jll = "1.16"
+julia = "1.3"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

README.md

@@ -3,7 +3,7 @@
 [![Build status](https://github.com/JuliaStrings/StringEncodings.jl/workflows/CI/badge.svg)](https://github.com/JuliaStrings/StringEncodings.jl/actions?query=workflow%3ACI+branch%3Amaster)
 [![Codecov Coverage Status](http://codecov.io/github/JuliaStrings/StringEncodings.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaStrings/StringEncodings.jl?branch=master)
 
-This Julia package provides support for decoding and encoding texts between multiple character encodings. It is currently based on the iconv interface, and supports all major platforms using either the native iconv support or [GNU libiconv](https://www.gnu.org/software/libiconv/). In the future, native Julia support for major encodings will be added.
+This Julia package provides support for decoding and encoding texts between multiple character encodings. It is currently based on the iconv interface, and supports all major platforms using [GNU libiconv](https://www.gnu.org/software/libiconv/). In the future, native Julia support for major encodings will be added.
 
 ## Encoding and Decoding Strings
 *Encoding* a refers to the process of converting a string (of any `AbstractString` type) to a sequence of bytes represented as a `Vector{UInt8}`. *Decoding* refers to the inverse process.
@@ -151,7 +151,3 @@ julia> read(s, String) # Decoding happens automatically here
 Do not forget to call `close` on `StringEncoder` and `StringDecoder` objects to finish the encoding process. For `StringEncoder`, this function calls `flush`, which writes any characters still in the buffer, and possibly some control sequences (for stateful encodings). For both `StringEncoder` and `StringDecoder`, `close` checks that there are no incomplete sequences left in the input stream, and raise an `IncompleteSequenceError` if that's the case. It will also free iconv resources immediately, instead of waiting for garbage collection.
 
 Conversion currently raises an error if an invalid byte sequence is encountered in the input, or if some characters cannot be represented in the target enconding. It is not yet possible to ignore such characters or to replace them with a placeholder.
-
-## Notes on Installation on Linux OS
-
-Most Linux distributions provide `iconv` functionalities as part of the base operating system library `glibc`. In normal circumstances, no additional installation of `libiconv` should be required. If you observe such a behavior on your operating system, file an issue with OS details.

deps/build.jl

@@ -2,20 +2,7 @@
 
 module StringEncodings
 
-using Libdl
-
-# Load in `deps.jl`, complaining if it does not exist
-const depsjl_path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
-if !isfile(depsjl_path)
-    error("iconv not installed properly, run Pkg.build(\"StringEncodings\"), restart Julia and try again")
-end
-include(depsjl_path)
-
-# Module initialization function
-function __init__()
-    # Always check dependencies from `deps.jl`
-    check_deps()
-end
+using Libiconv_jll
 
 using Base.Libc: errno, strerror, E2BIG, EINVAL, EILSEQ
 
@@ -75,13 +62,13 @@ show(io::IO, exc::T) where {T<:Union{IncompleteSequenceError,OutputBufferError}}
 
 function iconv_close(cd::Ptr{Nothing})
     if cd != C_NULL
-        ccall((iconv_close_s, libiconv), Cint, (Ptr{Nothing},), cd) == 0 ||
+        ccall((:libiconv_close, libiconv), Cint, (Ptr{Nothing},), cd) == 0 ||
             throw(IConvError("iconv_close"))
     end
 end
 
 function iconv_open(tocode::String, fromcode::String)
-    p = ccall((iconv_open_s, libiconv), Ptr{Nothing}, (Cstring, Cstring), tocode, fromcode)
+    p = ccall((:libiconv_open, libiconv), Ptr{Nothing}, (Cstring, Cstring), tocode, fromcode)
     if p != Ptr{Nothing}(-1)
         return p
     elseif errno() == EINVAL
@@ -144,7 +131,7 @@ function iconv!(cd::Ptr{Nothing}, inbuf::Vector{UInt8}, outbuf::Vector{UInt8},
     inbytesleft_orig = inbytesleft[]
     outbytesleft[] = BUFSIZE
 
-    ret = ccall((iconv_s, libiconv), Csize_t,
+    ret = ccall((:libiconv, libiconv), Csize_t,
                 (Ptr{Nothing}, Ptr{Ptr{UInt8}}, Ref{Csize_t}, Ptr{Ptr{UInt8}}, Ref{Csize_t}),
                 cd, inbufptr, inbytesleft, outbufptr, outbytesleft)
 
@@ -176,7 +163,7 @@ function iconv_reset!(s::Union{StringEncoder, StringDecoder})
 
     s.outbufptr[] = pointer(s.outbuf)
     s.outbytesleft[] = BUFSIZE
-    ret = ccall((iconv_s, libiconv), Csize_t,
+    ret = ccall((:libiconv, libiconv), Csize_t,
                 (Ptr{Nothing}, Ptr{Ptr{UInt8}}, Ref{Csize_t}, Ptr{Ptr{UInt8}}, Ref{Csize_t}),
                 s.cd, C_NULL, C_NULL, s.outbufptr, s.outbytesleft)
 
@@ -278,9 +265,6 @@ read from `stream` into text in the encoding `to`.  Calling `close` on the
 stream does not close `stream`.
 
 `to` and `from` can be specified either as a string or as an `Encoding` object.
-
-Note that some implementations may accept invalid sequences
-in the input data without raising an error.
 """
 function StringDecoder(stream::IO, from::Encoding, to::Encoding=enc"UTF-8")
     cd = iconv_open(String(to), String(from))
@@ -542,7 +526,7 @@ encode(s::AbstractString, enc::AbstractString) = encode(s, Encoding(enc))
 
 function test_encoding(enc::String)
     # We assume that an encoding is supported if it's possible to convert from it to UTF-8:
-    cd = ccall((iconv_open_s, libiconv), Ptr{Nothing}, (Cstring, Cstring), enc, "UTF-8")
+    cd = ccall((:libiconv_open, libiconv), Ptr{Nothing}, (Cstring, Cstring), enc, "UTF-8")
     if cd == Ptr{Nothing}(-1)
         return false
     else