Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to 1.3+, use Expat_jll to vendor libexpat #99

Merged
merged 3 commits into from
Sep 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@ os:
- osx
- linux
julia:
- 0.7
- 1.0
- 1.3
- nightly
notifications:
email: false
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia --check-bounds=yes -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("LibExpat"); Pkg.test("LibExpat"; coverage=true)'
after_success:
- julia -e 'using Pkg; cd(Pkg.dir("LibExpat")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
- julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'
16 changes: 16 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name = "LibExpat"
uuid = "522f3ed2-3f36-55e3-b6df-e94fee9b0c07"
version = "0.5.0"

[deps]
Expat_jll = "2e619515-83b5-522b-bb60-26c02a35a201"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

[compat]
julia = "1.3"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
2 changes: 0 additions & 2 deletions REQUIRE

This file was deleted.

3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
environment:
matrix:
- julia_version: 0.7
- julia_version: 1.0
- julia_version: 1.3
- julia_version: nightly

platform:
Expand Down
11 changes: 2 additions & 9 deletions src/LibExpat.jl
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
__precompile__()

module LibExpat

using Compat
using Compat.Unicode
using Pkg.Artifacts
using Expat_jll

import Base: getindex, show, parse

if Compat.Sys.iswindows()
const libexpat = "libexpat-1"
elseif Compat.Sys.isunix()
const libexpat = "libexpat"
end

include("lX_common_h.jl")
include("lX_defines_h.jl")
include("lX_expat_h.jl")
Expand Down
4 changes: 1 addition & 3 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using LibExpat
using Compat
using Compat.Test
using LibExpat, Test

const DATADIR = joinpath(@__DIR__, "data")

Expand Down