Changeset: b9dc0e28582d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b9dc0e28582d Modified Files: monetdb5/extras/rdf/10_rdf.mal monetdb5/extras/rdf/Makefile.ag monetdb5/extras/rdf/rdf.mx sql/backends/monet5/Makefile.ag Branch: Mar2011 Log Message:
Remove RDF as a monetdb5 module. The RDF shredder can still be used, but only as an SQL extension. This fixes bug 2770. The problem in the bug is that the M5 RDF module was also used as a library to support the SQL extension. By now turning the module into a proper (NOINST) library and linking against that, the problem of linking against a module is solved. The consequence is though that we can't then use this as an M5 module. If it's really necessary (which I doubt), a new RDF module for M5 could be created that links against this same library. diffs (98 lines): diff --git a/monetdb5/extras/rdf/10_rdf.mal b/monetdb5/extras/rdf/10_rdf.mal deleted file mode 100644 --- a/monetdb5/extras/rdf/10_rdf.mal +++ /dev/null @@ -1,20 +0,0 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2011 MonetDB B.V. -# All Rights Reserved. - -# This loads the MonetDB/RDF module -include tokenizer; -include rdf; diff --git a/monetdb5/extras/rdf/Makefile.ag b/monetdb5/extras/rdf/Makefile.ag --- a/monetdb5/extras/rdf/Makefile.ag +++ b/monetdb5/extras/rdf/Makefile.ag @@ -24,26 +24,8 @@ MTSAFE -lib__rdf = { - MODULE +lib_rdf = { + NOINST DIR = libdir/monetdb5 SOURCES = rdf.mx rdf_shredder.mx - LIBS = ../../tools/libmonetdb5 \ - ../../../gdk/libbat \ - $(MALLOC_LIBS) $(raptor_LIBS) } - -headers_mal = { - HEADERS = mal - DIR = libdir/monetdb5 - SOURCES = rdf.mx -} - -headers_autoload = { - HEADERS = mal - DIR = libdir/monetdb5/autoload - SOURCES = 10_rdf.mal -} - -#EXTRA_DIST_DIR = Tests -EXTRA_DIST = 10_rdf.mal diff --git a/monetdb5/extras/rdf/rdf.mx b/monetdb5/extras/rdf/rdf.mx --- a/monetdb5/extras/rdf/rdf.mx +++ b/monetdb5/extras/rdf/rdf.mx @@ -22,13 +22,6 @@ @* The RDF module For MonetDB5 (aka. MonetDB/RDF) -@mal -module rdf; - -command shred(location:str, graphname:str, schema:str):bat[:void, :bat] -address RDFParser -comment "Shred the given document." - @h #ifndef _RDF_H_ #define _RDF_H_ @@ -75,5 +68,3 @@ #define N_GRAPH_BAT (MAP_LEX+1) #endif /* _RDF_H_ */ - -@c diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag --- a/sql/backends/monet5/Makefile.ag +++ b/sql/backends/monet5/Makefile.ag @@ -55,11 +55,12 @@ ../../storage/restrict/librestrictstore \ ../../storage/bpm/libbpmstore \ ../../common/libsqlcommon \ - HAVE_RAPTOR?../../../monetdb5/extras/rdf/lib_rdf \ + HAVE_RAPTOR?../../../monetdb5/extras/rdf/librdf \ ../../../monetdb5/tools/libmonetdb5 \ ../../../gdk/libbat \ ../../../common/stream/libstream \ - $(READLINE_LIBS) $(PTHREAD_LIBS) + $(READLINE_LIBS) $(PTHREAD_LIBS) \ + $(raptor_LIBS) } _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
