fix of http://bugs.librdf.org/mantis/view.php?id=626 build bug

.gitignore

@@ -26,3 +26,16 @@ old
 redland-bindings.spec
 releases
 stamp*
+dlang/source/rdf/config.d
+**/.Rproj.user
+**/.Rhistory
+**/*.RData
+**/*.Rproj
+**/*.o
+**/*.so
+**/.Rproj.user
+**/redland-stamp
+**/test-out.rdf
+.Rproj.user
+Makevars
+ltmain.sh

Makefile.am

@@ -4,28 +4,28 @@
 #
 # Copyright (C) 2000-2007, David Beckett http://www.dajobe.org/
 # Copyright (C) 2000-2005  University of Bristol, UK http://www.bristol.ac.uk/
-# 
+#
 # This package is Free Software and part of Redland http://librdf.org/
-# 
+#
 # It is licensed under the following three licenses as alternatives:
 #   1. GNU Lesser General Public License (LGPL) V2.1 or any newer version
 #   2. GNU General Public License (GPL) V2 or any newer version
 #   3. Apache License, V2.0 or any newer version
-# 
+#
 # You may not use this file except in compliance with at least one of
 # the above three licenses.
-# 
+#
 # See LICENSE.html or LICENSE.txt at the top of this package for the
 # complete terms and further detail along with the license texts for
 # the licenses in COPYING.LIB, COPYING and LICENSE-2.0.txt respectively.
-# 
-# 
+#
+#
 
 # Subdirectories to build/install etc.
 SUBDIRS=@SD@ data
 # Subdirectories to use for distribution
 DIST_SUBDIRS=data docs \
-lua perl php python ruby
+lua perl php python R ruby ada dlang
 
 EXTRA_DIST=\
 ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 ChangeLog.5 \

R/Dockerfile

@@ -0,0 +1,27 @@
+FROM debian:testing
+
+RUN apt-get update && apt-get install -y \
+    autoconf \
+    libtool \
+    python-dev \
+    librdf0-dev \
+    librdf0 \
+    libraptor2-dev \
+    librasqal3-dev \
+    librasqal3 \
+    swig3.0 \
+    git \
+    make \
+    vim \
+    r-recommended
+RUN R --no-save -e 'options(repos = c(CRAN = "http://cran.rstudio.com")); install.packages(c("devtools", "testthat", "roxygen2", "knitr"))' 
+RUN cd /usr/bin && ln -s swig3.0 swig && cd /
+RUN git clone https://github.com/ropensci/redland-bindings.git
+RUN cd /redland-bindings && \
+    ./autogen.sh --with-R && \
+    make
+RUN echo "NEXT STEPS:" && \
+    echo "Build & run the container interactively and make should work:" && \
+    echo "$ docker build -t redland-bindings ." && \
+    echo "$ docker run --rm -it redland-bindings /bin/bash" && \
+    echo "cd /redland-bindings/R && make check-local"

R/Makefile.am

@@ -0,0 +1,83 @@
+# -*- Mode: Makefile -*-
+#
+# Makefile.am - automake file for R interface to Redland
+#
+# Copyright (C) 2014 Matthew Jones
+# Derived from code that was originally copyrighted:
+# Copyright (C) 2010 David Beckett - http://www.dajobe.org/
+# And used under the terms of the Apache V2.0 license.
+# 
+# This package is Free Software and part of Redland http://librdf.org/
+# 
+# It is licensed under the following three licenses as alternatives:
+#   1. GNU Lesser General Public License (LGPL) V2.1 or any newer version
+#   2. GNU General Public License (GPL) V2 or any newer version
+#   3. Apache License, V2.0 or any newer version
+# 
+# You may not use this file except in compliance with at least one of
+# the above three licenses.
+# 
+# See LICENSE.html or LICENSE.txt at the top of this package for the
+# full license terms.
+#
+
+AM_CPPFLAGS=@CPPFLAGS@ @LIBRDF_CPPFLAGS@ -DREDLAND_BINDINGS_VERSION=\"@VERSION@\"
+AM_CFLAGS=@STANDARD_CFLAGS@ @LIBRDF_CPPFLAGS@
+
+AM_LDFLAGS=@LIBRDF_LDFLAGS@
+
+R=R
+
+R_PACKAGE=redland
+R_PACKAGE_SRC=redland/src
+R_PACKAGE_BUILD=redland/tools
+# If you are rebuilding the wrapper .Rd files for functions defined in
+# the SWIG geneated R/redland.R script, you need to have the redland
+# source dowloaded and built. Currently the source is available from
+# https://github.com/dajobe/librdf. The source dir, for example could
+# be "/home/smith/git/redland-1.0.17"
+REDLAND_SRC=<enter-your-redland-source-dir-here>
+
+R_CFLAGS=@R_CFLAGS@
+R_LDFLAGS=@R_LDFLAGS@
+R_SO_SUFFIX=so
+
+SWIG_OUTPUTS=$(R_PACKAGE_SRC)/$(R_PACKAGE).c
+SWIG_CRUFT=
+
+TEST_CRUFT=redland/tools/test-out.rdf
+
+EXTRA_DIST= $(SWIG_OUTPUTS)
+
+CLEANFILES=$(R_PACKAGE_SRC)/$(R_PACKAGE).o $(R_PACKAGE)-stamp \
+$(R_PACKAGE_SRC)/$(R_PACKAGE).$(R_SO_SUFFIX) $(R_PACKAGE_SRC)/util.o \
+$(R_PACKAGE).bundle $(TEST_CRUFT)
+MAINTAINERCLEANFILES=$(SWIG_OUTPUTS) $(SWIG_CRUFT) $(R_PACKAGE).c.orig
+
+RUN=@REDLAND_RUN@
+
+SWIG_OPTS=-I$(srcdir)
+
+$(R_PACKAGE_SRC)/redland.c: @REDLAND_SWIG@
+	swig -r -namespace -v $(SWIG_OPTS) -module $(R_PACKAGE) -outdir $(R_PACKAGE)/R -o redland/src/redland.c Redland.i
+	cat Redland.R.in >> redland/R/redland.R
+	cat redland/R/redland.R | sed 's/RSWIG_createNewRef/SWIG_createNewRef/' > redland/R/redland.R.fix
+	mv redland/R/redland.R.fix redland/R/redland.R
+	cd $(R_PACKAGE) && $(R) --no-save -e 'library(devtools); library(roxygen2); document()'
+	cp ../data/dc.rdf $(R_PACKAGE)/inst/extdata
+	chmod 755 $(R_PACKAGE)/inst/extdata/dc.rdf
+
+$(R_PACKAGE_SRC)/redland.so: 
+	R CMD INSTALL --no-multiarch --with-keep.source $(R_PACKAGE)
+
+test-R:
+	pwd
+	cd $(R_PACKAGE) && $(R) --no-save -e 'library(devtools); library(testthat); library(roxygen2); load_all(); test()'
+
+librdfDocs:
+	$(R) --no-save -e 'source("createLibrdfDocs.R") ; mkDocs(redlandDocDir="$(REDLAND_SRC)/docs", verbose=FALSE, librdfDocsURL="http://librdf.org/docs")'
+
+check-local: test-R
+
+all: $(R_PACKAGE_SRC)/redland.c $(R_PACKAGE_SRC)/redland.so
+

R/README.md

@@ -0,0 +1,60 @@
+R bindings for Redland
+======================
+
+Bind the [Redland librdf library](http://librdf.org) into the R environment, and 
+expose the librdf API for R. This is accomplished through the use of SWIG to generate
+wrapper code in R that links to the underlying C code from librdf and provides
+R functions to call that code.  This creates surrogate functions in R for all
+of the librdf* functions.  In addition, there is a higher-level API written 
+as a series of S4 classes in R that provide a simpler mechanism to access common
+functions from librdf.  This API mirrors the python class structure for 
+librdf-bindings.
+
+The main R package is in the `redland` subdirectory, and is all that is required
+to build and install the R package.  This current directory contains the supporting
+build infrastructure to build the SWIG bindings and prepare the `redland` package.
+Most users will simply follow the build instruction in the `redland/README.md` file.
+
+## Build notes
+
+To build the package and generate new interfaces to librdf using SWIG, follow the instructions
+below. Again, this is typically not needed by most R users, and is mainly available for
+regenerating the R interface when new versions of librdf are released.
+
+1. (Optional) Install docker and load the Dockerfile into a container and run it
+    ```bash
+    docker build -t redland-bindings .
+    docker run --rm -it redland-bindings /bin/bash
+    ```
+
+2. Run `autoconf` and `make` to generate the shared libraries and compile the R package code, and startup R
+    ```bash
+    cd /redland-bindings
+    ./autogen.sh --with-R
+	make
+    cd R/redland
+    ```
+
+3. Load devtools in R and load the package
+    ```r
+    > install.packages("devtools")
+    > library(devtools)
+    > load_all()
+    ```
+
+4. Run a redland command
+    ```r
+    > library(redland)
+    > world <- librdf_new_world()
+    > world
+    An object of class "_p_librdf_world_s"
+    Slot "ref":
+    <pointer: 0x38bd290>
+    ```
+
+5. Run the existing test suite
+    ```r
+    > install.packages("testthat")
+    > library(testthat)
+    > test()
+    ```

R/Redland.R.in

@@ -0,0 +1,3 @@
+setClass('_p_librdf_query', contains = 'ExternalReference')
+setClass('_p_librdf_query_results', contains = 'ExternalReference')
+