rewrap using new Clang.jl (#61)

* rewrap using new Clang.jl

And include the used `wrap_geos.jl`, such that we can more easily wrap
it again in the future.

As far as I can tell this is breaking, but not too badly,
mainly because of some `const` that are now wrapped as a `@cenum`.
This also adds the CEnum dependency, Clang.jl uses this instead of the normal
julia `@enum` for C compatibility.

* simplify Travis yaml

This should work according to https://docs.travis-ci.com/user/languages/julia/

Author: visr

.travis.yml

@@ -10,8 +10,4 @@ matrix:
     - julia: nightly
 notifications:
     email: false
-script:
-    - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-    - julia -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("LibGEOS"); Pkg.test("LibGEOS"; coverage=true)'
-after_success:
-    - julia -e 'using Pkg; cd(Pkg.dir("LibGEOS")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(Codecov.process_folder())';
+coveralls: true

Project.toml

@@ -0,0 +1,14 @@
+name = "LibGEOS"
+uuid = "a90b1aa1-3769-5649-ba7e-abc5a9d163eb"
+
+[deps]
+BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
+CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
+GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
+Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[compat]
+BinaryProvider = "≥ 0.5.3"
+GeoInterface = "≥ 0.4.0"
+julia = "≥ 0.7.0"

REQUIRE

@@ -0,0 +1,29 @@
+#=
+Run this file to regenerate `geos_c.jl` and `geos_common.jl`.
+
+It expects a GEOS install in the deps folder, run `build LibGEOS` in Pkg mode
+if these are not in place.
+
+The wrapped GEOS version and provided GEOS version should be kept in sync.
+So when updating the GEOSBuilder provided version, also rerun this wrapper.
+This way we ensure that the provided library has the same functions available
+as the wrapped one. Furthermore this makes sure constants in `geos_common.jl`
+like `GEOS_VERSION`, which are just strings, are correct.
+=#
+
+using Clang
+
+includedir = normpath(joinpath(@__DIR__, "..", "deps", "usr", "include"))
+headerfiles = [joinpath(includedir, "geos_c.h")]
+
+wc = init(; headers = headerfiles,
+            output_file = joinpath(@__DIR__, "geos_c.jl"),
+            common_file = joinpath(@__DIR__, "geos_common.jl"),
+            clang_includes = [includedir, CLANG_INCLUDE],
+            clang_args = ["-I", includedir],
+            header_wrapped = (root, current) -> root == current,
+            header_library = x -> "libgeos",
+            clang_diagnostics = true,
+            )
+
+run(wc)

gen/wrap_geos.jl

@@ -9,6 +9,7 @@ module LibGEOS
 
     using GeoInterface
     using Libdl
+    using CEnum
 
     export  Point, MultiPoint, LineString, MultiLineString, LinearRing, Polygon, MultiPolygon, GeometryCollection,
             parseWKT, geomFromWKT, geomToWKT, readgeom, writegeom,
@@ -23,6 +24,7 @@ module LibGEOS
             isEmpty, isSimple, isRing, hasZ, isClosed, isValid, interiorRings, exteriorRing,
             numPoints, startPoint, endPoint, area, geomLength, distance, hausdorffdistance, nearestPoints
 
+    include("geos_common.jl")
     include("geos_c.jl")
 
     mutable struct GEOSError <: Exception

src/LibGEOS.jl

@@ -1,3 +1,10 @@
 @Base.deprecate parseWKT(geom::String) readgeom(geom)
 @Base.deprecate geomFromWKT(geom::String) _readgeom(geom)
 @Base.deprecate geomToWKT(geom::Ptr{GEOSGeometry}) writegeom(geom)
+
+@Base.deprecate_binding CAP_ROUND GEOSBUF_CAP_ROUND
+@Base.deprecate_binding CAP_FLAT GEOSBUF_CAP_FLAT
+@Base.deprecate_binding CAP_SQUARE GEOSBUF_CAP_SQUARE
+@Base.deprecate_binding JOIN_ROUND GEOSBUF_JOIN_ROUND
+@Base.deprecate_binding JOIN_MITRE GEOSBUF_JOIN_MITRE
+@Base.deprecate_binding JOIN_BEVEL GEOSBUF_JOIN_BEVEL