diff --git a/.travis.yml b/.travis.yml index 9ce8867..f71f22b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,5 @@ matrix: include: -# - language: julia -# julia: 0.6 -# os: linux -# dist: trusty -# sudo: false -# - language: julia -# julia: 0.7 -# os: linux -# dist: trusty -# sudo: false -# - language: julia -# julia: 1.0 -# os: linux -# dist: trusty -# sudo: false - language: julia julia: 0.6 os: linux @@ -28,17 +13,16 @@ matrix: julia: nightly os: linux - - language: julia - julia: 0.6 - os: osx - language: julia julia: 0.7 os: osx - language: julia julia: 1.0 os: osx - allow_failures: - - julia: 1.0 + - language: julia + julia: 1.1 + os: osx + notifications: email: false after_success: diff --git a/deps/build.jl b/deps/build.jl index 2fd7d87..6b750f3 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -4,6 +4,17 @@ using Compat import Compat.Libdl import Compat.Sys +if Sys.isapple() + deps_file_str = open(joinpath(dirname(pathof(BinDeps)), "dependencies.jl")) do file + read(file, String) + end + if occursin("ZEval",pathof(BinDeps)) + patched_dlclose = replace(deps_file_str, "Libdl.dlclose(h)" => "println(\"ignored: dlclose()\")") + include_string(BinDeps,patched_dlclose) + end +end + + @BinDeps.setup # check for cairo version @@ -166,3 +177,9 @@ provides(BuildProcess, (:cairo, :_jl_libcairo), (:pango, :_jl_libpango), (:pangocairo, :_jl_libpangocairo)]) + + +if Sys.isapple() + import Pkg.Types.printpkgstyle + printpkgstyle(stdout, :Installed, "Patched install script, restarting Julia is recommended.") +end