Changeset: e5bd3a25d54e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e5bd3a25d54e
Added Files:
sql/backends/monet5/vaults/fits/72_fits.mal
sql/backends/monet5/vaults/fits/72_fits.sql
sql/backends/monet5/vaults/fits/Makefile.ag
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/fits/fits.h
sql/backends/monet5/vaults/fits/fits.mal
sql/backends/monet5/vaults/lidar/75_lidar.mal
sql/backends/monet5/vaults/lidar/75_lidar.sql
sql/backends/monet5/vaults/lidar/Makefile.ag
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/vaults/lidar/lidar.h
sql/backends/monet5/vaults/lidar/lidar.mal
sql/backends/monet5/vaults/netcdf/74_netcdf.mal
sql/backends/monet5/vaults/netcdf/74_netcdf.sql
sql/backends/monet5/vaults/netcdf/Makefile.ag
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/backends/monet5/vaults/netcdf/netcdf.mal
sql/backends/monet5/vaults/netcdf/netcdf_vault.h
Removed Files:
sql/backends/monet5/vaults/72_fits.mal
sql/backends/monet5/vaults/72_fits.sql
sql/backends/monet5/vaults/74_netcdf.mal
sql/backends/monet5/vaults/74_netcdf.sql
sql/backends/monet5/vaults/75_lidar.mal
sql/backends/monet5/vaults/75_lidar.sql
sql/backends/monet5/vaults/fits.c
sql/backends/monet5/vaults/fits.h
sql/backends/monet5/vaults/fits.mal
sql/backends/monet5/vaults/lidar.c
sql/backends/monet5/vaults/lidar.h
sql/backends/monet5/vaults/lidar.mal
sql/backends/monet5/vaults/netcdf.c
sql/backends/monet5/vaults/netcdf.mal
sql/backends/monet5/vaults/netcdf_vault.h
Modified Files:
sql/backends/monet5/vaults/Makefile.ag
Branch: default
Log Message:
Re-organize fist, netcdf and lidar vaults
Move the implementations in separate directories
Adjust the make file
diffs (truncated from 341 to 300 lines):
diff --git a/sql/backends/monet5/vaults/Makefile.ag
b/sql/backends/monet5/vaults/Makefile.ag
--- a/sql/backends/monet5/vaults/Makefile.ag
+++ b/sql/backends/monet5/vaults/Makefile.ag
@@ -4,7 +4,7 @@
#
# Copyright 2008-2015 MonetDB B.V.
-SUBDIRS = HAVE_SAMTOOLS?bam
+SUBDIRS = HAVE_SAMTOOLS?bam HAVE_FITS?fits HAVE_LIDAR?lidar HAVE_NETCDF?netcdf
INCLUDES = ../../../include \
../../../common \
@@ -21,8 +21,7 @@ INCLUDES = ../../../include \
../../../../common/stream \
../../../../common/utils \
../../../../gdk \
- $(READLINE_INCS) $(cfitsio_CFLAGS) $(curl_CFLAGS) $(netcdf_CFLAGS) \
- $(LIBLAS_INCS)
+ $(READLINE_INCS)
lib__vault = {
MODULE
@@ -50,98 +49,5 @@ headers_autoload = {
SOURCES = 70_vault.mal
}
-lib__fits = {
- MODULE
- COND = HAVE_FITS
- DIR = libdir/monetdb5
- SOURCES = fits.c
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- $(cfitsio_LIBS)
-}
-
-headers_fitsmal = {
- COND = HAVE_FITS
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = fits.mal
-}
-
-headers_fitssql = {
- COND = HAVE_FITS
- HEADERS = sql
- DIR = libdir/monetdb5/createdb
- SOURCES = 72_fits.sql
-}
-
-headers_fitsautoload = {
- COND = HAVE_FITS
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 72_fits.mal
-}
-
-lib__netcdf = {
- MODULE
- COND = HAVE_NETCDF
- DIR = libdir/monetdb5
- SOURCES = netcdf.c
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- $(netcdf_LIBS)
-}
-
-headers_netcdfmal = {
- COND = HAVE_NETCDF
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = netcdf.mal
-}
-
-headers_netcdfsql = {
- COND = HAVE_NETCDF
- HEADERS = sql
- DIR = libdir/monetdb5/createdb
- SOURCES = 74_netcdf.sql
-}
-
-headers_netcdfautoload = {
- COND = HAVE_NETCDF
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 74_netcdf.mal
-}
-
-lib__lidar = {
- MODULE
- COND = HAVE_LIDAR
- DIR = libdir/monetdb5
- SOURCES = lidar.c
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- $(LIBLAS_LIBS)
-}
-
-headers_lidarmal = {
- COND = HAVE_LIDAR
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = lidar.mal
-}
-
-headers_lidarsql = {
- COND = HAVE_LIDAR
- HEADERS = sql
- DIR = libdir/monetdb5/createdb
- SOURCES = 75_lidar.sql
-}
-
-headers_lidarautoload = {
- COND = HAVE_LIDAR
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 75_lidar.mal
-}
-
EXTRA_DIST_DIR = Tests
-EXTRA_DIST = 70_vault.mal vault.mal vault.sql vault.h \
- 72_fits.mal fits.mal 72_fits.sql fits.h \
- 74_netcdf.mal netcdf.mal 74_netcdf.sql netcdf_vault.h \
- 75_lidar.mal lidar.mal 75_lidar.sql lidar.h
+EXTRA_DIST = 70_vault.mal vault.mal vault.sql vault.h
diff --git a/sql/backends/monet5/vaults/72_fits.mal
b/sql/backends/monet5/vaults/fits/72_fits.mal
rename from sql/backends/monet5/vaults/72_fits.mal
rename to sql/backends/monet5/vaults/fits/72_fits.mal
diff --git a/sql/backends/monet5/vaults/72_fits.sql
b/sql/backends/monet5/vaults/fits/72_fits.sql
rename from sql/backends/monet5/vaults/72_fits.sql
rename to sql/backends/monet5/vaults/fits/72_fits.sql
diff --git a/sql/backends/monet5/vaults/fits/Makefile.ag
b/sql/backends/monet5/vaults/fits/Makefile.ag
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/vaults/fits/Makefile.ag
@@ -0,0 +1,53 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 2008-2015 MonetDB B.V.
+
+INCLUDES = ../ \
+ ../../ \
+ ../../../../include \
+ ../../../../common \
+ ../../../../storage \
+ ../../../../server \
+ ../../../../../monetdb5/modules/atoms \
+ ../../../../../monetdb5/modules/kernel \
+ ../../../../../monetdb5/mal \
+ ../../../../../monetdb5/modules/mal \
+ ../../../../../monetdb5/optimizer \
+ ../../../../../monetdb5/scheduler \
+ ../../../../../clients/mapilib \
+ ../../../../../common/options \
+ ../../../../../common/stream \
+ ../../../../../common/utils \
+ ../../../../../gdk \
+ $(READLINE_INCS) \
+ $(cfitsio_CFLAGS)
+
+lib__fits = {
+ MODULE
+ DIR = libdir/monetdb5
+ SOURCES = fits.c
+ LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
+ $(cfitsio_LIBS)
+}
+
+headers_fitsmal = {
+ HEADERS = mal
+ DIR = libdir/monetdb5
+ SOURCES = fits.mal
+}
+
+headers_fitssql = {
+ HEADERS = sql
+ DIR = libdir/monetdb5/createdb
+ SOURCES = 72_fits.sql
+}
+
+headers_fitsautoload = {
+ HEADERS = mal
+ DIR = libdir/monetdb5/autoload
+ SOURCES = 72_fits.mal
+}
+
+EXTRA_DIST = 72_fits.mal fits.mal 72_fits.sql fits.h
diff --git a/sql/backends/monet5/vaults/fits.c
b/sql/backends/monet5/vaults/fits/fits.c
rename from sql/backends/monet5/vaults/fits.c
rename to sql/backends/monet5/vaults/fits/fits.c
diff --git a/sql/backends/monet5/vaults/fits.h
b/sql/backends/monet5/vaults/fits/fits.h
rename from sql/backends/monet5/vaults/fits.h
rename to sql/backends/monet5/vaults/fits/fits.h
diff --git a/sql/backends/monet5/vaults/fits.mal
b/sql/backends/monet5/vaults/fits/fits.mal
rename from sql/backends/monet5/vaults/fits.mal
rename to sql/backends/monet5/vaults/fits/fits.mal
diff --git a/sql/backends/monet5/vaults/75_lidar.mal
b/sql/backends/monet5/vaults/lidar/75_lidar.mal
rename from sql/backends/monet5/vaults/75_lidar.mal
rename to sql/backends/monet5/vaults/lidar/75_lidar.mal
diff --git a/sql/backends/monet5/vaults/75_lidar.sql
b/sql/backends/monet5/vaults/lidar/75_lidar.sql
rename from sql/backends/monet5/vaults/75_lidar.sql
rename to sql/backends/monet5/vaults/lidar/75_lidar.sql
diff --git a/sql/backends/monet5/vaults/lidar/Makefile.ag
b/sql/backends/monet5/vaults/lidar/Makefile.ag
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/vaults/lidar/Makefile.ag
@@ -0,0 +1,53 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 2008-2015 MonetDB B.V.
+
+INCLUDES = ../ \
+ ../../ \
+ ../../../../include \
+ ../../../../common \
+ ../../../../storage \
+ ../../../../server \
+ ../../../../../monetdb5/modules/atoms \
+ ../../../../../monetdb5/modules/kernel \
+ ../../../../../monetdb5/mal \
+ ../../../../../monetdb5/modules/mal \
+ ../../../../../monetdb5/optimizer \
+ ../../../../../monetdb5/scheduler \
+ ../../../../../clients/mapilib \
+ ../../../../../common/options \
+ ../../../../../common/stream \
+ ../../../../../common/utils \
+ ../../../../../gdk \
+ $(READLINE_INCS) \
+ $(LIBLAS_INCS)
+
+lib__lidar = {
+ MODULE
+ DIR = libdir/monetdb5
+ SOURCES = lidar.c
+ LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
+ $(LIBLAS_LIBS)
+}
+
+headers_lidarmal = {
+ HEADERS = mal
+ DIR = libdir/monetdb5
+ SOURCES = lidar.mal
+}
+
+headers_lidarsql = {
+ HEADERS = sql
+ DIR = libdir/monetdb5/createdb
+ SOURCES = 75_lidar.sql
+}
+
+headers_lidarautoload = {
+ HEADERS = mal
+ DIR = libdir/monetdb5/autoload
+ SOURCES = 75_lidar.mal
+}
+
+EXTRA_DIST = 75_lidar.mal lidar.mal 75_lidar.sql lidar.h
diff --git a/sql/backends/monet5/vaults/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
rename from sql/backends/monet5/vaults/lidar.c
rename to sql/backends/monet5/vaults/lidar/lidar.c
diff --git a/sql/backends/monet5/vaults/lidar.h
b/sql/backends/monet5/vaults/lidar/lidar.h
rename from sql/backends/monet5/vaults/lidar.h
rename to sql/backends/monet5/vaults/lidar/lidar.h
diff --git a/sql/backends/monet5/vaults/lidar.mal
b/sql/backends/monet5/vaults/lidar/lidar.mal
rename from sql/backends/monet5/vaults/lidar.mal
rename to sql/backends/monet5/vaults/lidar/lidar.mal
diff --git a/sql/backends/monet5/vaults/74_netcdf.mal
b/sql/backends/monet5/vaults/netcdf/74_netcdf.mal
rename from sql/backends/monet5/vaults/74_netcdf.mal
rename to sql/backends/monet5/vaults/netcdf/74_netcdf.mal
diff --git a/sql/backends/monet5/vaults/74_netcdf.sql
b/sql/backends/monet5/vaults/netcdf/74_netcdf.sql
rename from sql/backends/monet5/vaults/74_netcdf.sql
rename to sql/backends/monet5/vaults/netcdf/74_netcdf.sql
diff --git a/sql/backends/monet5/vaults/netcdf/Makefile.ag
b/sql/backends/monet5/vaults/netcdf/Makefile.ag
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/vaults/netcdf/Makefile.ag
@@ -0,0 +1,53 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 2008-2015 MonetDB B.V.
+
+INCLUDES = ../ \
+ ../../ \
+ ../../../../include \
+ ../../../../common \
+ ../../../../storage \
+ ../../../../server \
+ ../../../../../monetdb5/modules/atoms \
+ ../../../../../monetdb5/modules/kernel \
+ ../../../../../monetdb5/mal \
+ ../../../../../monetdb5/modules/mal \
+ ../../../../../monetdb5/optimizer \
+ ../../../../../monetdb5/scheduler \
+ ../../../../../clients/mapilib \
+ ../../../../../common/options \
+ ../../../../../common/stream \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
