Skip to content

Commit

Permalink
update install instructions and more visr to JuliaGeo renames
Browse files Browse the repository at this point in the history
  • Loading branch information
visr committed Jun 24, 2018
1 parent 62cf848 commit 4143704
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
# GDAL.jl
[![Build Status](https://travis-ci.org/JuliaGeo/GDAL.jl.svg?branch=master)](https://travis-ci.org/JuliaGeo/GDAL.jl)
[![Build status](https://ci.appveyor.com/api/projects/status/github/visr/GDAL.jl?svg=true&branch=master)](https://ci.appveyor.com/project/visr/gdal-jl/branch/master)
[![Build status](https://ci.appveyor.com/api/projects/status/github/JuliaGeo/GDAL.jl?svg=true&branch=master)](https://ci.appveyor.com/project/JuliaGeo/gdal-jl/branch/master)

Julia wrapper for [GDAL - Geospatial Data Abstraction Library](http://gdal.org/).
This package is a binding to the C API of GDAL/OGR. It provides only a C style usage, where resources must be closed manually, and datasets are pointers.

Other packages can build on top of this to provide a more Julian user experience. See for example [ArchGDAL.jl](https://github.com/yeesian/ArchGDAL.jl).

## Installation
This package is currently unregistered, so add it using `Pkg.clone`, then find or get the GDAL dependencies using `Pkg.build`.
This package is registered, so add it using `Pkg.add`. This will also download GDAL binaries created by [GDALBuilder](https://github.com/JuliaGeo/GDALBuilder).
```julia
Pkg.clone("https://github.com/visr/GDAL.jl.git")
Pkg.build("GDAL")
Pkg.add("GDAL")
```
`Pkg.build` downloads GDAL binaries created by [GDALBuilder](https://github.com/visr/GDALBuilder). To test if it is installed correctly, use:
`Pkg.build` To test if it is installed correctly, use:
```julia
Pkg.test("GDAL")
```
Expand Down
2 changes: 1 addition & 1 deletion deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ products = [
]

# Download binaries from hosted location
bin_prefix = "https://github.com/visr/GDALBuilder/releases/download/v2.2.4-1"
bin_prefix = "https://github.com/JuliaGeo/GDALBuilder/releases/download/v2.2.4-1"

# Listing of files generated by BinaryBuilder:
download_info = Dict(
Expand Down
4 changes: 2 additions & 2 deletions gen/wrap_gdal.jl
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ function minimal_rewriter(ex::Expr)
elseif ex.head == :type
# detect singletons: "mutable struct A end"
# and rewrite them to "const A = Ptr{Void}"
# without this rewrite they are note usable:
# without this rewrite they are not usable:
# ERROR: ccall: the type of argument 1 doesn't correspond to a C type
# see https://github.com/visr/GDAL.jl/pull/41#discussion_r143345433
# see https://github.com/JuliaGeo/GDAL.jl/pull/41#discussion_r143345433
# these singletons are meant to be opaque types, but in C are not of
# type `typedef void *` but instead something like
# `typedef struct OGRGeomFieldDefnHS *` (for OGRGeomFieldDefnH)
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ xmlnode.pszValue = Base.unsafe_convert(Cstring, "c") # rename "a" to "c"
@test unsafe_string(GDAL.C.CPLSerializeXMLTree(Ref(xmlnode))) == "<c>\n <b>hi</b>\n</c>\n"
GDAL.C.CPLDestroyXMLNode(xmlnode_pointer)

# ref https://github.com/visr/GDAL.jl/pull/41#discussion_r143345433
# ref https://github.com/JuliaGeo/GDAL.jl/pull/41#discussion_r143345433
gfld = GDAL.gfld_create("name-a", GDAL.wkbPoint)
@test gfld isa Ptr{GDAL.OGRGeomFieldDefnH}
@test GDAL.getnameref(gfld) == "name-a"
Expand Down

0 comments on commit 4143704

Please sign in to comment.