Changeset: d0e8c79678ab for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0e8c79678ab Modified Files: MonetDB5/src/modules/mal/mal_init.mx MonetDB5/src/modules/mal/rdf/10_rdf.mal MonetDB5/src/modules/mal/rdf/Makefile.ag geom/src/monetdb5/50_geom.mal geom/src/monetdb5/Makefile.ag sql/src/backends/monet5/40_sql.mal sql/src/backends/monet5/Makefile.ag Branch: default Log Message:
Put start scripts in autoload directory for modules installed. For bug #2522, generate start scripts in the autoload directory of the MonetDB5 libdir that are loaded from mal_init. This way, only when a module is available, it will be attempted to be loaded, avoiding needless worrying warnings and allowing Testing to control which modules are loaded and which not. diffs (146 lines): diff -r 4464c60a81d5 -r d0e8c79678ab MonetDB5/src/modules/mal/mal_init.mx --- a/MonetDB5/src/modules/mal/mal_init.mx Wed May 12 16:22:44 2010 +0200 +++ b/MonetDB5/src/modules/mal/mal_init.mx Wed May 12 16:58:04 2010 +0200 @@ -255,22 +255,9 @@ include crackers; @- -Experimental code can be in various degrees of development. -Their ommission is not a show stopper for normal operation. +...@mal +# Any extensions (MAL scripts) that should be automatically loaded upon +# startup can be placed in the autoload directory. One typically finds +# the SQL module in here, but it can also be used to load custom scripts. +include autoload; @- -The RDF module stuff -...@mal -include tokenizer; -include rdf; -...@- -Functional enhancements to the MonetDB system are language -compilers, such as sql. We attempt to load them if they exist. -...@mal -include sql; -...@- -Similar, SQL may be extended with modules to refine it, e.g. -the geom module add GIS specific functionalty. Likewise, we attempt -to load it. -...@mal -include geom; -...@- diff -r 4464c60a81d5 -r d0e8c79678ab MonetDB5/src/modules/mal/rdf/10_rdf.mal --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MonetDB5/src/modules/mal/rdf/10_rdf.mal Wed May 12 16:58:04 2010 +0200 @@ -0,0 +1,20 @@ +# 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-2010 MonetDB B.V. +# All Rights Reserved. + +# This loads the MonetDB/RDF module +include tokenizer; +include rdf; diff -r 4464c60a81d5 -r d0e8c79678ab MonetDB5/src/modules/mal/rdf/Makefile.ag --- a/MonetDB5/src/modules/mal/rdf/Makefile.ag Wed May 12 16:22:44 2010 +0200 +++ b/MonetDB5/src/modules/mal/rdf/Makefile.ag Wed May 12 16:58:04 2010 +0200 @@ -44,4 +44,11 @@ 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 -r 4464c60a81d5 -r d0e8c79678ab geom/src/monetdb5/50_geom.mal --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/geom/src/monetdb5/50_geom.mal Wed May 12 16:58:04 2010 +0200 @@ -0,0 +1,19 @@ +# 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-2010 MonetDB B.V. +# All Rights Reserved. + +# This loads the MonetDB/GIS module +include geom; diff -r 4464c60a81d5 -r d0e8c79678ab geom/src/monetdb5/Makefile.ag --- a/geom/src/monetdb5/Makefile.ag Wed May 12 16:22:44 2010 +0200 +++ b/geom/src/monetdb5/Makefile.ag Wed May 12 16:58:04 2010 +0200 @@ -30,3 +30,11 @@ DIR = libdir/MonetDB5 SOURCES = geom.mx } + +headers_autoload = { + HEADERS = mal + DIR = libdir/MonetDB5/autoload + SOURCES = 50_geom.mal +} + +EXTRA_DIST = 50_geom.mal diff -r 4464c60a81d5 -r d0e8c79678ab sql/src/backends/monet5/40_sql.mal --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/backends/monet5/40_sql.mal Wed May 12 16:58:04 2010 +0200 @@ -0,0 +1,19 @@ +# 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-2010 MonetDB B.V. +# All Rights Reserved. + +# This loads the MonetDB/SQL module +include sql; diff -r 4464c60a81d5 -r d0e8c79678ab sql/src/backends/monet5/Makefile.ag --- a/sql/src/backends/monet5/Makefile.ag Wed May 12 16:22:44 2010 +0200 +++ b/sql/src/backends/monet5/Makefile.ag Wed May 12 16:58:04 2010 +0200 @@ -64,4 +64,11 @@ SOURCES = sql.mx sql_bpm.mx sql_emptyset.mx } +headers_autoload = { + HEADERS = mal + DIR = libdir/MonetDB5/autoload + SOURCES = 40_sql.mal +} + +EXTRA_DIST = 40_sql.mal EXTRA_DIST_DIR = Tests _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
