use XML2_jll (#131)

bicycle1885 · web-flow · commit 96c6fb741efe · 2020-01-12T19:20:16.000+09:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,6 +1,5 @@
 environment:
   matrix:
-  - julia_version: 1.0
   - julia_version: 1.3
   - julia_version: latest
 
diff --git a/.gitignore b/.gitignore
@@ -4,9 +4,6 @@ Manifest.toml
 *.jl.mem
 /.envrc
 /libxml2*
-/deps/build.log
-/deps/deps.jl
-/deps/usr/
 /docs/out.xml
 /docs/build/
 /docs/site/
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ os:
   - linux
   - osx
 julia:
-  - 1.0
   - 1.3
   - nightly
 matrix:
diff --git a/Project.toml b/Project.toml
@@ -4,13 +4,11 @@ authors = ["Kenta Sato <bicycle1885@gmail.com>"]
 version = "1.0.0"
 
 [deps]
-BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
-Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+XML2_jll = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"
 
 [compat]
-BinaryProvider = "0.5"
-julia = "1"
+julia = "1.3"
 
 [extras]
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
diff --git a/README.md b/README.md
@@ -29,11 +29,8 @@ Install EzXML.jl as follows:
 julia -e 'using Pkg; Pkg.add("EzXML")'
 ```
 
-This package depends on [libxml2](http://xmlsoft.org/) 2.9.9, which will be
-installed automatically from
-[Yggdrasil](https://github.com/JuliaPackaging/Yggdrasil/releases/tag/XML2-v2.9.9%2B0)
-via [BinaryProvider.jl](https://github.com/JuliaPackaging/BinaryProvider.jl).
-Windows, Linux, macOS, and FreeBSD are now supported.
+This package depends on [libxml2](http://xmlsoft.org/) 2.9.9, which will be automatically installed as an artifact via [XML2_jll.jl](https://github.com/JuliaBinaryWrappers/XML2_jll.jl) if you use Julia 1.3 or later.
+Currently, Windows, Linux, macOS, and FreeBSD are now supported.
 
 Usage
 -----
diff --git a/deps/build.jl b/deps/build.jl
diff --git a/deps/build_XML2.v2.9.9.jl b/deps/build_XML2.v2.9.9.jl
diff --git a/deps/build_Zlib.v1.2.11.jl b/deps/build_Zlib.v1.2.11.jl
diff --git a/src/EzXML.jl b/src/EzXML.jl
@@ -102,16 +102,8 @@ export
     hasnodeattributes,
     nodeattributes
 
-using Libdl
 using Printf: @printf
-
-# Load libxml2.
-const libxml2path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
-if !isfile(libxml2path)
-    error("EzXML.jl is not installed properly, run Pkg.build(\"EzXML\") and restart Julia.")
-end
-include(libxml2path)
-check_deps()
+using XML2_jll: libxml2
 
 include("error.jl")
 include("node.jl")

-Original file line number
+Diff line change
   - linux
   - osx
 julia:
 -  - 1.0
   - 1.3
   - nightly
 matrix: