From d8ffd694a2b6bd1c929323066ba34aa5e66dcd8e Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Tue, 21 Jan 2020 22:58:14 +0100 Subject: [PATCH 1/4] use GEOS_jll for binary dependency --- .travis.yml | 2 +- Project.toml | 9 ++- appveyor.yml | 2 +- deps/build.jl | 119 ----------------------------------- deps/build_GEOS.v3.7.2.jl | 73 --------------------- deps/build_MbedTLS.v2.6.1.jl | 50 --------------- deps/build_PROJ.v6.1.0.jl | 70 --------------------- deps/build_SQLite.v3.28.0.jl | 48 -------------- deps/build_Zlib.v1.2.11.jl | 48 -------------- src/GDAL.jl | 17 ++--- 10 files changed, 10 insertions(+), 428 deletions(-) delete mode 100644 deps/build.jl delete mode 100644 deps/build_GEOS.v3.7.2.jl delete mode 100644 deps/build_MbedTLS.v2.6.1.jl delete mode 100644 deps/build_PROJ.v6.1.0.jl delete mode 100644 deps/build_SQLite.v3.28.0.jl delete mode 100644 deps/build_Zlib.v1.2.11.jl diff --git a/.travis.yml b/.travis.yml index 47cd561..ce0a0d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ os: - linux - osx julia: - - 1.0.4 # oldest supported in Project.toml + - 1.3 - 1 - nightly matrix: diff --git a/Project.toml b/Project.toml index b439f4b..c299376 100644 --- a/Project.toml +++ b/Project.toml @@ -3,17 +3,16 @@ uuid = "add2ef01-049f-52c4-9ee2-e494f65e021a" keywords = ["GDAL", "IO"] license = "MIT" desc = "Wrapper for GDAL - Geospatial Data Abstraction Library" -version = "1.0.2" +version = "2.0.0" [deps] -BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232" CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82" -Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +GDAL_jll = "a7073274-a066-55f0-b90d-d619367d196c" +PROJ_jll = "58948b4f-47e0-5654-a9ad-f609743f8632" [compat] -BinaryProvider = "0.5" CEnum = "0.2" -julia = "1" +julia = "1.3" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/appveyor.yml b/appveyor.yml index a03b937..42f10eb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ environment: matrix: - - julia_version: 1.0.4 # oldest supported in Project.toml + - julia_version: 1.3 - julia_version: 1 - julia_version: nightly diff --git a/deps/build.jl b/deps/build.jl deleted file mode 100644 index 718bd4a..0000000 --- a/deps/build.jl +++ /dev/null @@ -1,119 +0,0 @@ -using BinaryProvider # requires BinaryProvider 0.3.0 or later - -# Example taken from -# https://github.com/JuliaIO/ImageMagick.jl/blob/master/deps/build.jl -dependencies = [ - "build_Zlib.v1.2.11.jl", - "build_GEOS.v3.7.2.jl", - "build_SQLite.v3.28.0.jl", - "build_PROJ.v6.1.0.jl", - "build_MbedTLS.v2.6.1.jl" -] - -for elem in dependencies - # it's a bit faster to run the build in an anonymous module instead of - # starting a new julia process - m = Module(:__anon__) - Core.include(m, (joinpath(@__DIR__, elem))) -end - -# Parse some basic command-line arguments -const verbose = "--verbose" in ARGS -const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr"))) -products = [ - LibraryProduct(prefix, ["libgdal"], :libgdal), - LibraryProduct(prefix, ["libcurl"], :libcurl), - ExecutableProduct(prefix, "gdal_contour", :gdal_contour_path), - ExecutableProduct(prefix, "gdal_grid", :gdal_grid_path), - ExecutableProduct(prefix, "gdal_rasterize", :gdal_rasterize_path), - ExecutableProduct(prefix, "gdal_translate", :gdal_translate_path), - ExecutableProduct(prefix, "gdaladdo", :gdaladdo_path), - ExecutableProduct(prefix, "gdalbuildvrt", :gdalbuildvrt_path), - ExecutableProduct(prefix, "gdaldem", :gdaldem_path), - ExecutableProduct(prefix, "gdalinfo", :gdalinfo_path), - ExecutableProduct(prefix, "gdallocationinfo", :gdallocationinfo_path), - ExecutableProduct(prefix, "gdalmanage", :gdalmanage_path), - ExecutableProduct(prefix, "gdalsrsinfo", :gdalsrsinfo_path), - ExecutableProduct(prefix, "gdaltindex", :gdaltindex_path), - ExecutableProduct(prefix, "gdaltransform", :gdaltransform_path), - ExecutableProduct(prefix, "gdalwarp", :gdalwarp_path), - ExecutableProduct(prefix, "nearblack", :nearblack_path), - ExecutableProduct(prefix, "ogr2ogr", :ogr2ogr_path), - ExecutableProduct(prefix, "ogrinfo", :ogrinfo_path), - ExecutableProduct(prefix, "ogrlineref", :ogrlineref_path), - ExecutableProduct(prefix, "ogrtindex", :ogrtindex_path), -] - -# Download binaries from hosted location -bin_prefix = "https://github.com/JuliaGeo/GDALBuilder/releases/download/v3.0.2-1" - -# Listing of files generated by BinaryBuilder: -download_info = Dict( - Linux(:aarch64, libc=:glibc) => ("$bin_prefix/GDAL.v3.0.2.aarch64-linux-gnu-gcc7.tar.gz", "7be8cdfdb823424b0be778bd9675f2db8394f6cbe8a4407573f5ad24e047ef7a"), - Linux(:aarch64, libc=:musl) => ("$bin_prefix/GDAL.v3.0.2.aarch64-linux-musl-gcc7.tar.gz", "223c4b22dfd86037ac5d4fabf3ce9c21405f214447e6daf100aa67743c091457"), - Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/GDAL.v3.0.2.arm-linux-gnueabihf-gcc7.tar.gz", "61ea5557f91dd49efc0e3c23db52f894b07fe37fa9b451535995be7020cb3210"), - Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/GDAL.v3.0.2.arm-linux-musleabihf-gcc7.tar.gz", "947101abd918f21b302be0c0160fb9619acc36ed829fb9600c8065768f98fe08"), - Linux(:i686, libc=:glibc) => ("$bin_prefix/GDAL.v3.0.2.i686-linux-gnu-gcc7.tar.gz", "7dea2c01ec2d045f0e404f8622ec2779ecf37e04163be94833a1cf35dd131dea"), - Linux(:i686, libc=:musl) => ("$bin_prefix/GDAL.v3.0.2.i686-linux-musl-gcc7.tar.gz", "9354ee7a3e0db074fedba8904e14bca10bee88e59551eca4ed124cbec572ee2f"), - # removed compiler_abi as suggested in https://github.com/JuliaPackaging/BinaryBuilder.jl/issues/407#issuecomment-473688254 - # such that GCC4 platforms will also pick up this GCC7 build, ref https://github.com/JuliaPackaging/BinaryBuilder.jl/issues/407 - Windows(:i686) => ("$bin_prefix/GDAL.v3.0.2.i686-w64-mingw32-gcc7.tar.gz", "d09aa8b69bd5915ad797be86f1a04c01a1cf38407b6f48cc80d724284ede63ef"), - Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/GDAL.v3.0.2.powerpc64le-linux-gnu-gcc7.tar.gz", "f064d0bfd73e803876c43fd7ab4d33ecbc56cc4751a027eb5a3656a0edcb229d"), - MacOS(:x86_64) => ("$bin_prefix/GDAL.v3.0.2.x86_64-apple-darwin14.tar.gz", "4e58078594ce150612428d14fa494b41273362674ee46b4670f335f3c6d0f8e2"), - Linux(:x86_64, libc=:glibc) => ("$bin_prefix/GDAL.v3.0.2.x86_64-linux-gnu-gcc7.tar.gz", "956dd45cdb7b17d544fc4441e3d8b191482472b63d4bc313865a9076061aeb4a"), - Linux(:x86_64, libc=:musl) => ("$bin_prefix/GDAL.v3.0.2.x86_64-linux-musl-gcc7.tar.gz", "d75c4e4b434c0cf5601bca6d7d343902a0f0a962d98e93929c9f0bf15c97cce5"), - FreeBSD(:x86_64) => ("$bin_prefix/GDAL.v3.0.2.x86_64-unknown-freebsd11.1.tar.gz", "ebb4a0f340db48e62e36c81d9c092b93421a643ab2b90d6c06262ea363cd185c"), - # removed compiler_abi as suggested in https://github.com/JuliaPackaging/BinaryBuilder.jl/issues/407#issuecomment-473688254 - # such that GCC4 platforms will also pick up this GCC7 build, ref https://github.com/JuliaPackaging/BinaryBuilder.jl/issues/407 - Windows(:x86_64) => ("$bin_prefix/GDAL.v3.0.2.x86_64-w64-mingw32-gcc7.tar.gz", "75e35bab535edeb7588d8b695910bfb2f4827bfc35143c441eb74f7f79c7b591"), -) - -# Install unsatisfied or updated dependencies: -unsatisfied = any(!satisfied(p; verbose=verbose) for p in products) -dl_info = choose_download(download_info, platform_key_abi()) -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, - # build from source or something even more ambitious here. - error("Your platform (\"$(Sys.MACHINE)\", parsed as \"$(triplet(platform_key_abi()))\") is not supported by this package!") -end - -# If we have a download, and we are unsatisfied (or the version we're -# 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, ignore_platform=true, force=true, verbose=verbose) -end - -# Write out a deps.jl file that will contain mappings for our products -write_deps_file(joinpath(@__DIR__, "deps_gdal.jl"), products, verbose=verbose) - -function include_deps(name) - """ - module $name - import Libdl - path = joinpath(@__DIR__, $(repr(string("deps_", name, ".jl")))) - isfile(path) || error("$name wasn't build correctly. Please run Pkg.build(\\\"GDAL\\\")") - include(path) - end - using .$name - """ -end - -open("deps.jl", "w") do io - for dep in (:zlib, :geos, :sqlite, :proj, :mbedtls, :gdal) - println(io, include_deps(dep)) - end - println(io, """ - const libgdal = gdal.libgdal - const libproj = proj.libproj - function check_deps() - zlib.check_deps() - geos.check_deps() - sqlite.check_deps() - proj.check_deps() - mbedtls.check_deps() - gdal.check_deps() - end - """) -end diff --git a/deps/build_GEOS.v3.7.2.jl b/deps/build_GEOS.v3.7.2.jl deleted file mode 100644 index 93de1a4..0000000 --- a/deps/build_GEOS.v3.7.2.jl +++ /dev/null @@ -1,73 +0,0 @@ -using BinaryProvider # requires BinaryProvider 0.3.0 or later - -# Parse some basic command-line arguments -const verbose = "--verbose" in ARGS -const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr"))) -products = [ - LibraryProduct(prefix, ["libgeos_c"], :libgeos), - LibraryProduct(prefix, ["libgeos"], :libgeos_cpp), -] - -# Download binaries from hosted location -bin_prefix = "https://github.com/JuliaGeo/GEOSBuilder/releases/download/v3.7.2-0" - -# Listing of files generated by BinaryBuilder: -download_info = Dict( - Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/GEOS.v3.7.2.aarch64-linux-gnu-gcc4.tar.gz", "5787a09eb5f1de0e8328b3fdb482e4cc798fd6b5a4689111f9a6befe15bdbb80"), - Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.aarch64-linux-gnu-gcc7.tar.gz", "9b5ee2b297b10b296ea9c931a83bc3f299352e30a9ff696f0f8d402b3651f403"), - Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.aarch64-linux-gnu-gcc8.tar.gz", "e48d44177d7b5a836860f04959878365a941ace156cfff06e718c37fd55b9c49"), - Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/GEOS.v3.7.2.aarch64-linux-musl-gcc4.tar.gz", "90aec29158928a43a4e2bba4c3116a2d3fc5cc621c829146865d66a6c3cd888a"), - Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.aarch64-linux-musl-gcc7.tar.gz", "7c57861224750ecd3d068a7d7d7e89b1171f4ba49cde4c6762c735b5520fc0cc"), - Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.aarch64-linux-musl-gcc8.tar.gz", "0163dc3893c8ec3befae6227a564c0f26d4db15aab23783c17d70698aa78f29e"), - Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/GEOS.v3.7.2.arm-linux-gnueabihf-gcc4.tar.gz", "99a6816b5503d173ef7c4b9ed1645abb1dabd91a8a7e051a7900e671ac7b62c6"), - Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.arm-linux-gnueabihf-gcc7.tar.gz", "c0d893dd8ddc8fffed1979525eda0ad673f1a2db3cadbd1a05f14a20a8174ed6"), - Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.arm-linux-gnueabihf-gcc8.tar.gz", "e752016544692fa174f157fe63069479888a871f88926a87345b8fb13c48400d"), - Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/GEOS.v3.7.2.arm-linux-musleabihf-gcc4.tar.gz", "af0b3d62984c8bac1f0842124c6ac53a3476c963bdf1219c61215a326d60e7f1"), - Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.arm-linux-musleabihf-gcc7.tar.gz", "6690373e7fc7963ea2c3edbe893001f0856dac27bfcf0550f087116ddaaf7668"), - Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.arm-linux-musleabihf-gcc8.tar.gz", "fccda9b71fab947cefe9c900d383e15e7c4c08331b218a26fa5073b9b12f79ac"), - Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/GEOS.v3.7.2.i686-linux-gnu-gcc4.tar.gz", "4e0b9390d289ca68be601e70a588949602025a459a95479dda35f63c3f29cc3d"), - Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.i686-linux-gnu-gcc7.tar.gz", "82a71e47c60e6c25472519b1a09ef4aa6318a8bed9791f00d492507431e078f9"), - Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.i686-linux-gnu-gcc8.tar.gz", "6d8a73c951dc7e30ebd2f9b8597eeb427f758a2e16854fe58fedcd8b3c2bb1e3"), - Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/GEOS.v3.7.2.i686-linux-musl-gcc4.tar.gz", "aa03493edf4e4913da3d2b32b9237283f5fdc26e35b750deddfa2581f857e140"), - Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.i686-linux-musl-gcc7.tar.gz", "d10d2f8ba7728d45291848c6d7377cf02110b65472580cc372230007f04a82e1"), - Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.i686-linux-musl-gcc8.tar.gz", "ba1d6f8baabe5711f2e69c5076eeb6044595e6f6207524cd7542b23ca7ffa226"), - Windows(:i686, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/GEOS.v3.7.2.i686-w64-mingw32-gcc4.tar.gz", "dd98e9fc7fab8b8424f833731f06c40cacb43f1f3ba7036e1e3f79d8027a3453"), - Windows(:i686, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.i686-w64-mingw32-gcc7.tar.gz", "165770dbc66573d7a8e10030f7b8547107662cdd8cb7872b63db25d0e32de88c"), - Windows(:i686, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.i686-w64-mingw32-gcc8.tar.gz", "a01d8761434684c1f9123f4543467f0ad2d9920a9e659f80d6e5c9c6ddaffa79"), - Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/GEOS.v3.7.2.powerpc64le-linux-gnu-gcc4.tar.gz", "d2121b5fde6163d8cd6b45fb00bd656196629b3dd1d7743634e66ed3b021b7a5"), - Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.powerpc64le-linux-gnu-gcc7.tar.gz", "488df95ca419bbc527ef75a05a7d99a309c86304a42c0ed2313848d0ad2da843"), - Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.powerpc64le-linux-gnu-gcc8.tar.gz", "7ad7f4efa44d0106f36b2cbe9be1fdd6a0ee7133700bc7bd3067d908649484ef"), - MacOS(:x86_64, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-apple-darwin14-gcc4.tar.gz", "46d2873ffef747e278af36c429bd14c46ee133aeb454e1d34d4a4915c321ab12"), - MacOS(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-apple-darwin14-gcc7.tar.gz", "e8aebc603654e84d4c3327b21273146b897bfd1694411316c31cd345ebf7ee4d"), - MacOS(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-apple-darwin14-gcc8.tar.gz", "8f154d5c5422a7d39e5a5da0dad2f35b7669e0b49683e7fe0604b75f4203bba3"), - Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-linux-gnu-gcc4.tar.gz", "be0fd5b0ca50092b27d64be31140871c68898ac635b59fffa3c192c78dab5034"), - Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-linux-gnu-gcc7.tar.gz", "d98b1f02d3d9591630207d75bf12242a80b98b28a2eb2dfe080c396fc8291040"), - Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-linux-gnu-gcc8.tar.gz", "19a4159ee0eb19dd71fc1ab2cd671083846cb6a33a355d9e850d1ebfad7be5f2"), - Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-linux-musl-gcc7.tar.gz", "1032d637fad87e201da9b8418f15dac2d6c4d905bc98ec041cebef718d52bc93"), - Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-linux-musl-gcc8.tar.gz", "bf98e8f95b95d531e6b0a4a6f2ead3d3c07192bdc9c4f6c5adc436b41f1d9177"), - FreeBSD(:x86_64, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-unknown-freebsd11.1-gcc4.tar.gz", "a1b35b13701604012b5f783d0187408d3dfe9825bb5a50815017da9556dc07c1"), - FreeBSD(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-unknown-freebsd11.1-gcc7.tar.gz", "efc48c1a34a38718dcc70ac860ce88ca0ae2ec71b5139d614f19eee602b4f827"), - FreeBSD(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-unknown-freebsd11.1-gcc8.tar.gz", "aaf02142353c250c531625f943f2a11cf52983c6f0a5ae24a2cd5251d8a13bed"), - Windows(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-w64-mingw32-gcc7.tar.gz", "34ca72de29b79d9635fceed8764ec6428aa5c92f5ef4158fe70539b500db42c1"), - Windows(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/GEOS.v3.7.2.x86_64-w64-mingw32-gcc8.tar.gz", "e571095938420ec3422fc791040fc1970be5659cb54ab5b151bd81ef3d9c0077"), -) - -# Install unsatisfied or updated dependencies: -unsatisfied = any(!satisfied(p; verbose=verbose) for p in products) -dl_info = choose_download(download_info, platform_key_abi()) -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, - # build from source or something even more ambitious here. - error("Your platform (\"$(Sys.MACHINE)\", parsed as \"$(triplet(platform_key_abi()))\") is not supported by this package!") -end - -# If we have a download, and we are unsatisfied (or the version we're -# 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) -end - -# Write out a deps.jl file that will contain mappings for our products -write_deps_file(joinpath(@__DIR__, "deps_geos.jl"), products, verbose=verbose) diff --git a/deps/build_MbedTLS.v2.6.1.jl b/deps/build_MbedTLS.v2.6.1.jl deleted file mode 100644 index 2bfb577..0000000 --- a/deps/build_MbedTLS.v2.6.1.jl +++ /dev/null @@ -1,50 +0,0 @@ -using BinaryProvider # requires BinaryProvider 0.3.0 or later - -# Parse some basic command-line arguments -const verbose = "--verbose" in ARGS -const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr"))) -products = [ - LibraryProduct(prefix, ["libmbedx509"], :libmbedx509), - LibraryProduct(prefix, ["libmbedcrypto"], :libmbedcrypto), - LibraryProduct(prefix, ["libmbedtls"], :libmbedtls), -] - -# Download binaries from hosted location -bin_prefix = "https://github.com/JuliaWeb/MbedTLSBuilder/releases/download/v0.20.0" - -# Listing of files generated by BinaryBuilder: -download_info = Dict( - Linux(:aarch64, libc=:glibc) => ("$bin_prefix/MbedTLS.v2.6.1.aarch64-linux-gnu.tar.gz", "b5c6aa8f367f6d4a1d940381c30740e1daa9653104423412a078f2f41862bccc"), - Linux(:aarch64, libc=:musl) => ("$bin_prefix/MbedTLS.v2.6.1.aarch64-linux-musl.tar.gz", "56c22a9246c42baed29337049925ecb932b84fabfcd4904ba19e974579ef9c9c"), - Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/MbedTLS.v2.6.1.arm-linux-gnueabihf.tar.gz", "05755bc4a886e5b020776e23a3778db811312a284c42418924c94c2150288970"), - Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/MbedTLS.v2.6.1.arm-linux-musleabihf.tar.gz", "982ba365a4d8551b4629abbab428b3bec0a997823b834b59f867e3316b5e711c"), - Linux(:i686, libc=:glibc) => ("$bin_prefix/MbedTLS.v2.6.1.i686-linux-gnu.tar.gz", "97e7651ba4d162b5cd0ef53e0d364a7f6dc5e5b8d35fd89d7df9e10863de77b8"), - Linux(:i686, libc=:musl) => ("$bin_prefix/MbedTLS.v2.6.1.i686-linux-musl.tar.gz", "4430e4a32ddd6932057498d4f21e307c1d06ef4ddbbf0224ed68f5a617c16b08"), - Windows(:i686) => ("$bin_prefix/MbedTLS.v2.6.1.i686-w64-mingw32.tar.gz", "30cccba8debbf30d61002ca3fb6de325ff9919b4229329b7cb1a4f3b4175e555"), - Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/MbedTLS.v2.6.1.powerpc64le-linux-gnu.tar.gz", "b2dfc9887701376329f2a59cda0d813a2e412c934b7c233b1278c90b3fd7c7a5"), - MacOS(:x86_64) => ("$bin_prefix/MbedTLS.v2.6.1.x86_64-apple-darwin14.tar.gz", "245779d96eb8dc2c929f77210eab02d2ba4e7cd078f2f936c46339daae62e3a0"), - Linux(:x86_64, libc=:glibc) => ("$bin_prefix/MbedTLS.v2.6.1.x86_64-linux-gnu.tar.gz", "b667e285de1bb797882d0a253ba31869d22dc73250ad91da094bfe7ca220363c"), - Linux(:x86_64, libc=:musl) => ("$bin_prefix/MbedTLS.v2.6.1.x86_64-linux-musl.tar.gz", "9bf7484b274e3cd7c1dd93e6f7957c734b720ed77f2f8348e63f67bbcc016ae7"), - FreeBSD(:x86_64) => ("$bin_prefix/MbedTLS.v2.6.1.x86_64-unknown-freebsd11.1.tar.gz", "3d333991f9a72e9538b6b2915c87990028400ebdd5714ff6f21d2602135536c2"), - Windows(:x86_64) => ("$bin_prefix/MbedTLS.v2.6.1.x86_64-w64-mingw32.tar.gz", "371b01c03217caf5b021113df6807485d916553f983b9ebb21c0c601c270d22b"), -) - -# Install unsatisfied or updated dependencies: -unsatisfied = any(!satisfied(p; verbose=verbose) for p in products) -dl_info = choose_download(download_info, platform_key_abi()) -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, - # build from source or something even more ambitious here. - error("Your platform (\"$(Sys.MACHINE)\", parsed as \"$(triplet(platform_key_abi()))\") is not supported by this package!") -end - -# If we have a download, and we are unsatisfied (or the version we're -# 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) -end - -# Write out a deps.jl file that will contain mappings for our products -write_deps_file(joinpath(@__DIR__, "deps_mbedtls.jl"), products, verbose=verbose) diff --git a/deps/build_PROJ.v6.1.0.jl b/deps/build_PROJ.v6.1.0.jl deleted file mode 100644 index 68f7304..0000000 --- a/deps/build_PROJ.v6.1.0.jl +++ /dev/null @@ -1,70 +0,0 @@ -using BinaryProvider # requires BinaryProvider 0.3.0 or later - -# Parse some basic command-line arguments -const verbose = "--verbose" in ARGS -const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr"))) -products = [ - LibraryProduct(prefix, ["libproj"], :libproj), - ExecutableProduct(prefix, "cct", :cct_path), - ExecutableProduct(prefix, "cs2cs", :cs2cs_path), - ExecutableProduct(prefix, "geod", :geod_path), - ExecutableProduct(prefix, "gie", :gie_path), - ExecutableProduct(prefix, "proj", :proj_path), - ExecutableProduct(prefix, "projinfo", :projinfo_path), - FileProduct(prefix, "share/proj/CH", :ch_path), - FileProduct(prefix, "share/proj/GL27", :gl27_path), - FileProduct(prefix, "share/proj/ITRF2000", :itrf2000_path), - FileProduct(prefix, "share/proj/ITRF2008", :itrf2008_path), - FileProduct(prefix, "share/proj/ITRF2014", :itrf2014_path), - FileProduct(prefix, "share/proj/nad.lst", :nad_lst_path), - FileProduct(prefix, "share/proj/nad27", :nad27_path), - FileProduct(prefix, "share/proj/nad83", :nad83_path), - FileProduct(prefix, "share/proj/null", :null_path), - FileProduct(prefix, "share/proj/other.extra", :other_extra_path), - FileProduct(prefix, "share/proj/proj.db", :proj_db_path), - FileProduct(prefix, "share/proj/world", :world_path), - FileProduct(prefix, "share/proj/alaska", :alaska_path), - FileProduct(prefix, "share/proj/conus", :conus_path), - FileProduct(prefix, "share/proj/egm96_15.gtx", :egm96_15_path), - FileProduct(prefix, "share/proj/ntv1_can.dat", :ntv1_can_path), -] - -# Download binaries from hosted location -bin_prefix = "https://github.com/JuliaGeo/PROJBuilder/releases/download/v6.1.0-1" - -# Listing of files generated by BinaryBuilder: -download_info = Dict( - Linux(:aarch64, libc=:glibc) => ("$bin_prefix/PROJ.v6.1.0.aarch64-linux-gnu.tar.gz", "424e8a5e50ad0ea3458c4fa4245ee67570bb641887a3b7cab4c9fa0809bd0f22"), - Linux(:aarch64, libc=:musl) => ("$bin_prefix/PROJ.v6.1.0.aarch64-linux-musl.tar.gz", "0f4ca2cb518cb6d40a30ca47ac40447bfb6dd7496cc05944e704510d5ddcc9ef"), - Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/PROJ.v6.1.0.arm-linux-gnueabihf.tar.gz", "7d92b09644616e8ae354312beb8e33a751017806f38d5a1c98aee8df598c8304"), - Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/PROJ.v6.1.0.arm-linux-musleabihf.tar.gz", "867ceb4c28f5fd13761c01f15b6def155a45e181f5fa974827b8aca041284c37"), - Linux(:i686, libc=:glibc) => ("$bin_prefix/PROJ.v6.1.0.i686-linux-gnu.tar.gz", "aeb5e670b395e2f60e5f4f35c2a95c997bdbe1e4c4520e7e76dc10f2cc1072d3"), - Linux(:i686, libc=:musl) => ("$bin_prefix/PROJ.v6.1.0.i686-linux-musl.tar.gz", "5c8f003938f5ac0785afd41106f7b4e0d2500a1fa2ddf7369887498fd47a3cad"), - Windows(:i686, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/PROJ.v6.1.0.i686-w64-mingw32-gcc7.tar.gz", "9e1a042a74861263295a8be06630a7554bbc3de944bd73ec6bd15b3f00c107b9"), - Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/PROJ.v6.1.0.powerpc64le-linux-gnu.tar.gz", "912998fa0f459bf43ace29eca6efe30997136cb0b21cb84a3e42e62f9e2ac9eb"), - MacOS(:x86_64) => ("$bin_prefix/PROJ.v6.1.0.x86_64-apple-darwin14.tar.gz", "eb3252074d7513d203ce9b7d86d9370c5f6e2f183db5eb060418545147a07488"), - Linux(:x86_64, libc=:glibc) => ("$bin_prefix/PROJ.v6.1.0.x86_64-linux-gnu.tar.gz", "ecd78e16e613bd888e7b74371688f52da62140795a7e23088e8bc8009a53c90d"), - Linux(:x86_64, libc=:musl) => ("$bin_prefix/PROJ.v6.1.0.x86_64-linux-musl.tar.gz", "d725d227c8636a3a4ea389f5ae385f2fdf31d4cf966dc2cef077feb047f75bfa"), - FreeBSD(:x86_64) => ("$bin_prefix/PROJ.v6.1.0.x86_64-unknown-freebsd11.1.tar.gz", "146a3f7d91115d45fe00d79d53e701c27c5e7c241ba8a691b709274c39fdb9ab"), - Windows(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/PROJ.v6.1.0.x86_64-w64-mingw32-gcc7.tar.gz", "92b330c66647ac63870865546d717e095c34bb09dd11b81eb2ac0915aa49bc95"), -) - -# Install unsatisfied or updated dependencies: -unsatisfied = any(!satisfied(p; verbose=verbose) for p in products) -dl_info = choose_download(download_info, platform_key_abi()) -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, - # build from source or something even more ambitious here. - error("Your platform (\"$(Sys.MACHINE)\", parsed as \"$(triplet(platform_key_abi()))\") is not supported by this package!") -end - -# If we have a download, and we are unsatisfied (or the version we're -# 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) -end - -# Write out a deps.jl file that will contain mappings for our products -write_deps_file(joinpath(@__DIR__, "deps_proj.jl"), products, verbose=verbose) diff --git a/deps/build_SQLite.v3.28.0.jl b/deps/build_SQLite.v3.28.0.jl deleted file mode 100644 index c2576ac..0000000 --- a/deps/build_SQLite.v3.28.0.jl +++ /dev/null @@ -1,48 +0,0 @@ -using BinaryProvider # requires BinaryProvider 0.3.0 or later - -# Parse some basic command-line arguments -const verbose = "--verbose" in ARGS -const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr"))) -products = [ - LibraryProduct(prefix, ["libsqlite3"], :libsqlite), -] - -# Download binaries from hosted location -bin_prefix = "https://github.com/JuliaDatabases/SQLiteBuilder/releases/download/v0.10.0" - -# Listing of files generated by BinaryBuilder: -download_info = Dict( - Linux(:aarch64, libc=:glibc) => ("$bin_prefix/SQLite.v3.28.0.aarch64-linux-gnu.tar.gz", "e8bb76f8a86a943d59215b8ec8b2308b08a48c78df5238210e65657da86c67b4"), - Linux(:aarch64, libc=:musl) => ("$bin_prefix/SQLite.v3.28.0.aarch64-linux-musl.tar.gz", "41b396e4e3843daed5de52eb0b884de6815e1aeab686fa4742c15c37ffe2a255"), - Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/SQLite.v3.28.0.arm-linux-gnueabihf.tar.gz", "9810741a754f22320ac6cdb5e3723bcd5ba0fef301675282dcc616b1ab2b6a6e"), - Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/SQLite.v3.28.0.arm-linux-musleabihf.tar.gz", "c973b1187e2c8de468f0b19a4a5d04e3b276e21c59bee09811418ae15cb83d10"), - Linux(:i686, libc=:glibc) => ("$bin_prefix/SQLite.v3.28.0.i686-linux-gnu.tar.gz", "246e50c4412f69a8b127caa5e94d90f1e8674d365e64af42f02c29958fe2ea01"), - Linux(:i686, libc=:musl) => ("$bin_prefix/SQLite.v3.28.0.i686-linux-musl.tar.gz", "2028945661a8bd71dcf1b434b5743e9fe4a3e1f74f6ab6c3ae713d212d2670d1"), - Windows(:i686) => ("$bin_prefix/SQLite.v3.28.0.i686-w64-mingw32.tar.gz", "a098ed658fb5f3b1194bb880d03069461c98f4179962784de8ee52d406635d44"), - Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/SQLite.v3.28.0.powerpc64le-linux-gnu.tar.gz", "08b8c016d7acb22db0d884cf8c6e992a99158cd6749ef1dd37f0202a4c7e6ade"), - MacOS(:x86_64) => ("$bin_prefix/SQLite.v3.28.0.x86_64-apple-darwin14.tar.gz", "046f597b79c53cbfbfd94d6b36fc2e8f2ba77284f10e026464c753a895661b70"), - Linux(:x86_64, libc=:glibc) => ("$bin_prefix/SQLite.v3.28.0.x86_64-linux-gnu.tar.gz", "79e1a43df65ed22a3d3401b0607711a570f27f9caeb9d57d3e8ec90384461dd3"), - Linux(:x86_64, libc=:musl) => ("$bin_prefix/SQLite.v3.28.0.x86_64-linux-musl.tar.gz", "9267775482078afecde24aa894d165e04123ff47895a01f5047a7333505009a0"), - FreeBSD(:x86_64) => ("$bin_prefix/SQLite.v3.28.0.x86_64-unknown-freebsd11.1.tar.gz", "45268da994d260fb322b1e75d4c500c61dd4936de9964911fa98edbde3db08e0"), - Windows(:x86_64) => ("$bin_prefix/SQLite.v3.28.0.x86_64-w64-mingw32.tar.gz", "74cc63b003b85de0c0e8406b44310f6443f5f52f40ab61a28829a0e6dfbb4936"), -) - -# Install unsatisfied or updated dependencies: -unsatisfied = any(!satisfied(p; verbose=verbose) for p in products) -dl_info = choose_download(download_info, platform_key_abi()) -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, - # build from source or something even more ambitious here. - error("Your platform (\"$(Sys.MACHINE)\", parsed as \"$(triplet(platform_key_abi()))\") is not supported by this package!") -end - -# If we have a download, and we are unsatisfied (or the version we're -# 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) -end - -# Write out a deps.jl file that will contain mappings for our products -write_deps_file(joinpath(@__DIR__, "deps_sqlite.jl"), products, verbose=verbose) diff --git a/deps/build_Zlib.v1.2.11.jl b/deps/build_Zlib.v1.2.11.jl deleted file mode 100644 index f8930fa..0000000 --- a/deps/build_Zlib.v1.2.11.jl +++ /dev/null @@ -1,48 +0,0 @@ -using BinaryProvider # requires BinaryProvider 0.3.0 or later - -# Parse some basic command-line arguments -const verbose = "--verbose" in ARGS -const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr"))) -products = [ - LibraryProduct(prefix, ["libz"], :libz), -] - -# Download binaries from hosted location -bin_prefix = "https://github.com/bicycle1885/ZlibBuilder/releases/download/v1.0.4" - -# Listing of files generated by BinaryBuilder: -download_info = Dict( - Linux(:aarch64, libc=:glibc) => ("$bin_prefix/Zlib.v1.2.11.aarch64-linux-gnu.tar.gz", "3431c1a7d937cbad379ae5fe78c11dd0d425a6bce02b12c9d7c89e0a3173af97"), - Linux(:aarch64, libc=:musl) => ("$bin_prefix/Zlib.v1.2.11.aarch64-linux-musl.tar.gz", "7f89328d100f16ab75d37759cdb4df98d8f5b192146eacbe23fa859c6d7bca09"), - Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/Zlib.v1.2.11.arm-linux-gnueabihf.tar.gz", "04abd9100d2d24a56e50d536679c2df317d6c344b3ae06feb77681533377652f"), - Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/Zlib.v1.2.11.arm-linux-musleabihf.tar.gz", "fd4fd26462039de7135b5ad09f0c86ec441afd9bb7feb2689f705bc9b087931f"), - Linux(:i686, libc=:glibc) => ("$bin_prefix/Zlib.v1.2.11.i686-linux-gnu.tar.gz", "41495344e20619158a05561db8a7ccb9c57192dc5038744419bb9bd58eba7b7a"), - Linux(:i686, libc=:musl) => ("$bin_prefix/Zlib.v1.2.11.i686-linux-musl.tar.gz", "c5d101f21c440156fdc8616bbe9f13f437dfed634cb17dbc65ed83c6b180533c"), - Windows(:i686) => ("$bin_prefix/Zlib.v1.2.11.i686-w64-mingw32.tar.gz", "84d4d5037459ec706029c78a94c98b07760943662a4adbe21cd3d353ac3a0484"), - Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/Zlib.v1.2.11.powerpc64le-linux-gnu.tar.gz", "c485627191c75411eaa66088427813a182c7ca0549f0dc21971c9452c45d8167"), - MacOS(:x86_64) => ("$bin_prefix/Zlib.v1.2.11.x86_64-apple-darwin14.tar.gz", "a28fb652f94f1b1548197a3b3c9a71ec56fa50bb7d39454c5e12320335d30934"), - Linux(:x86_64, libc=:glibc) => ("$bin_prefix/Zlib.v1.2.11.x86_64-linux-gnu.tar.gz", "1c3b1c8520713f98d3f605ee1ca5e2e3656d92ddb6441abeeeff0ae12a11a620"), - Linux(:x86_64, libc=:musl) => ("$bin_prefix/Zlib.v1.2.11.x86_64-linux-musl.tar.gz", "17da1e44f7a815f5dc6eb66e3c7df8c80846c67d5212148a33fb68ea677e38dc"), - FreeBSD(:x86_64) => ("$bin_prefix/Zlib.v1.2.11.x86_64-unknown-freebsd11.1.tar.gz", "87522b29c8dfb7681209fea541dcc09bd5863f55df9cb1de1645ec8484aad7b8"), - Windows(:x86_64) => ("$bin_prefix/Zlib.v1.2.11.x86_64-w64-mingw32.tar.gz", "13934d974c5b1fd99897897b9af4ef7cce1025a1cdf1a57f14a9dd8e0258508a"), -) - -# Install unsatisfied or updated dependencies: -unsatisfied = any(!satisfied(p; verbose=verbose) for p in products) -dl_info = choose_download(download_info, platform_key_abi()) -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, - # build from source or something even more ambitious here. - error("Your platform (\"$(Sys.MACHINE)\", parsed as \"$(triplet(platform_key_abi()))\") is not supported by this package!") -end - -# If we have a download, and we are unsatisfied (or the version we're -# 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) -end - -# Write out a deps.jl file that will contain mappings for our products -write_deps_file(joinpath(@__DIR__, "deps_zlib.jl"), products, verbose=verbose) diff --git a/src/GDAL.jl b/src/GDAL.jl index 5e19e7f..7c911e9 100644 --- a/src/GDAL.jl +++ b/src/GDAL.jl @@ -1,15 +1,9 @@ module GDAL -using Libdl +using PROJ_jll +using GDAL_jll using CEnum -# Load in `deps.jl`, complaining if it does not exist -const depsjl_path = joinpath(@__DIR__, "..", "deps", "deps.jl") -if !isfile(depsjl_path) - error("GDAL not installed properly, run Pkg.build(\"GDAL\"), restart Julia and try again") -end -include(depsjl_path) - const Ctm = Base.Libc.TmStruct include("common.jl") @@ -38,9 +32,6 @@ const GDAL_DATA = Ref{String}() const PROJ_LIB = Ref{String}() function __init__() - # Always check your dependencies from `deps.jl` - check_deps() - # register custom error handler funcptr = @cfunction(gdaljl_errorhandler, Ptr{Cvoid}, (CPLErr, Cint, Cstring)) cplseterrorhandler(funcptr) @@ -50,11 +41,11 @@ function __init__() GDALVERSION[] = VersionNumber(versionstring) # set GDAL_DATA location, this overrides setting the environment variable - GDAL_DATA[] = abspath(@__DIR__, "..", "deps", "usr", "share", "gdal") + GDAL_DATA[] = joinpath(GDAL_jll.artifact_dir, "share", "gdal") cplsetconfigoption("GDAL_DATA", GDAL_DATA[]) # set PROJ_LIB location, this overrides setting the environment variable - PROJ_LIB[] = abspath(@__DIR__, "..", "deps", "usr", "share", "proj") + PROJ_LIB[] = joinpath(PROJ_jll.artifact_dir, "share", "proj") osrsetprojsearchpaths([PROJ_LIB[]]) end From 53f888ee939a86cbe1b3952aaaee5bd74b0de622 Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Fri, 31 Jan 2020 21:58:08 +0100 Subject: [PATCH 2/4] Travis CI on arm64 as well https://discourse.julialang.org/t/julia-aarch64-builds-are-now-available-on-travis-ci/29970 --- .travis.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.travis.yml b/.travis.yml index ce0a0d2..84c92b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,11 @@ language: julia os: - linux - osx + - windows +arch: + - x64 + - x86 + - arm64 julia: - 1.3 - 1 @@ -11,5 +16,14 @@ matrix: fast_finish: true allow_failures: - julia: nightly + exclude: + - os: osx + arch: x86 + - os: osx + arch: arm64 + - os: windows + arch: arm64 + - julia: nightly + arch: arm64 notifications: email: false From 549f9cbb77252dad31a0e6987fb2f50214ec3808 Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Fri, 14 Feb 2020 13:31:54 +0100 Subject: [PATCH 3/4] add compat entries for GDAL_jll and PROJ_jll --- Project.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Project.toml b/Project.toml index c299376..a118c4e 100644 --- a/Project.toml +++ b/Project.toml @@ -12,6 +12,8 @@ PROJ_jll = "58948b4f-47e0-5654-a9ad-f609743f8632" [compat] CEnum = "0.2" +GDAL_jll = "3.0.4" +PROJ_jll = "6.3.0" julia = "1.3" [extras] From 639641ed58aa4e45ef8c5daea5587d0c85f36a41 Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Fri, 14 Feb 2020 14:41:05 +0100 Subject: [PATCH 4/4] since it the API doesn't break We only bump the minimum julia version. Unsupported julia versions will not upgrade to it. Use a minor release to give room for patch releases on v1.0 for older julia versions. --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index a118c4e..f1b7b1d 100644 --- a/Project.toml +++ b/Project.toml @@ -3,7 +3,7 @@ uuid = "add2ef01-049f-52c4-9ee2-e494f65e021a" keywords = ["GDAL", "IO"] license = "MIT" desc = "Wrapper for GDAL - Geospatial Data Abstraction Library" -version = "2.0.0" +version = "1.1.0" [deps] CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"