Changeset: 27d3c3db2e2c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27d3c3db2e2c
Modified Files:
common/options/Makefile.ag
common/options/monet_options.c
common/options/monet_options.h
common/options/monet_options.mx
geom/lib/Makefile.ag
geom/lib/libgeom.c
geom/lib/libgeom.h
geom/lib/libgeom.mx
monetdb5/extras/crackers/Makefile.ag
monetdb5/extras/crackers/crackers_pq.c
monetdb5/extras/crackers/crackers_pq.h
monetdb5/extras/crackers/crackers_pq.mx
monetdb5/extras/rdf/Makefile.ag
monetdb5/extras/rdf/rdf.c
monetdb5/extras/rdf/rdf.h
monetdb5/extras/rdf/rdf.mal
monetdb5/extras/rdf/rdf.mx
monetdb5/mal/Makefile.ag
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal.mx
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_builder.h
monetdb5/mal/mal_builder.mx
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_client.mx
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_exception.h
monetdb5/mal/mal_exception.mx
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_factory.h
monetdb5/mal/mal_factory.mx
monetdb5/mal/mal_import.c
monetdb5/mal/mal_import.h
monetdb5/mal/mal_import.mx
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_linker.h
monetdb5/mal/mal_linker.mx
monetdb5/mal/mal_module.c
monetdb5/mal/mal_module.h
monetdb5/mal/mal_module.mx
monetdb5/mal/mal_sabaoth.c
monetdb5/mal/mal_sabaoth.h
monetdb5/mal/mal_sabaoth.mx
monetdb5/mal/mal_session.c
monetdb5/mal/mal_session.h
monetdb5/mal/mal_session.mx
monetdb5/mal/mal_stack.c
monetdb5/mal/mal_stack.h
monetdb5/mal/mal_stack.mx
monetdb5/mal/mal_type.c
monetdb5/mal/mal_type.h
monetdb5/mal/mal_type.mx
monetdb5/mal/mal_utils.c
monetdb5/mal/mal_utils.h
monetdb5/mal/mal_utils.mx
monetdb5/mal/mal_xml.c
monetdb5/mal/mal_xml.h
monetdb5/mal/mal_xml.mx
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/blob.h
monetdb5/modules/atoms/blob.mal
monetdb5/modules/atoms/blob.mx
monetdb5/modules/atoms/color.c
monetdb5/modules/atoms/color.h
monetdb5/modules/atoms/color.mal
monetdb5/modules/atoms/color.mx
monetdb5/modules/atoms/identifier.c
monetdb5/modules/atoms/identifier.h
monetdb5/modules/atoms/identifier.mal
monetdb5/modules/atoms/identifier.mx
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/inet.h
monetdb5/modules/atoms/inet.mal
monetdb5/modules/atoms/inet.mx
monetdb5/modules/atoms/xml.c
monetdb5/modules/atoms/xml.h
monetdb5/modules/atoms/xml.mal
monetdb5/modules/atoms/xml.mx
monetdb5/modules/atoms/xml.sql
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/kernel/lock.c
monetdb5/modules/kernel/lock.h
monetdb5/modules/kernel/lock.mal
monetdb5/modules/kernel/lock.mx
monetdb5/modules/kernel/sema.c
monetdb5/modules/kernel/sema.mal
monetdb5/modules/kernel/sema.mx
monetdb5/modules/kernel/unix.c
monetdb5/modules/kernel/unix.mal
monetdb5/modules/kernel/unix.mx
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/histogram.c
monetdb5/modules/mal/histogram.h
monetdb5/modules/mal/histogram.mal
monetdb5/modules/mal/histogram.mx
monetdb5/modules/mal/mal_init.mal
monetdb5/modules/mal/mal_init.mx
monetdb5/modules/mal/manual.c
monetdb5/modules/mal/manual.h
monetdb5/modules/mal/manual.mal
monetdb5/modules/mal/manual.mx
monetdb5/modules/mal/recycle.c
monetdb5/modules/mal/recycle.h
monetdb5/modules/mal/recycle.mal
monetdb5/modules/mal/recycle.mx
monetdb5/modules/mal/sabaoth.c
monetdb5/modules/mal/sabaoth.h
monetdb5/modules/mal/sabaoth.mal
monetdb5/modules/mal/sabaoth.mx
monetdb5/modules/mal/trader.c
monetdb5/modules/mal/trader.h
monetdb5/modules/mal/trader.mal
monetdb5/modules/mal/trader.mx
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_prelude.mx
monetdb5/scheduler/Makefile.ag
monetdb5/scheduler/run_adder.c
monetdb5/scheduler/run_adder.h
monetdb5/scheduler/run_adder.mal
monetdb5/scheduler/run_adder.mx
monetdb5/scheduler/run_isolate.c
monetdb5/scheduler/run_isolate.h
monetdb5/scheduler/run_isolate.mal
monetdb5/scheduler/run_isolate.mx
monetdb5/scheduler/run_tarantula.c
monetdb5/scheduler/run_tarantula.h
monetdb5/scheduler/run_tarantula.mal
monetdb5/scheduler/run_tarantula.mx
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
sql/backends/monet5/sql_scenario.mx
template/src/monetdb5/Makefile.ag
template/src/monetdb5/example.c
template/src/monetdb5/example.h
template/src/monetdb5/example.mal
template/src/monetdb5/example.mx
Branch: headless
Log Message:
Converted files from .mx to their constituent parts.
These are the easy targets: no MX macros and no BATs.
diffs (truncated from 12750 to 300 lines):
diff --git a/common/options/Makefile.ag b/common/options/Makefile.ag
--- a/common/options/Makefile.ag
+++ b/common/options/Makefile.ag
@@ -19,10 +19,10 @@
MTSAFE
-EXTRA_DIST = monet_getopt.h getopt.c getopt1.c
+EXTRA_DIST = monet_getopt.h getopt.c getopt1.c monet_options.h
lib_moptions = {
NOINST
NAME = moptions
- SOURCES = monet_options.mx monet_getopt.h
+ SOURCES = monet_options.c monet_getopt.h
}
diff --git a/common/options/monet_options.mx b/common/options/monet_options.c
rename from common/options/monet_options.mx
rename to common/options/monet_options.c
--- a/common/options/monet_options.mx
+++ b/common/options/monet_options.c
@@ -1,92 +1,34 @@
-@/
-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
+/*
+ * 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.
+ */
-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.
-@
-
-@f monet_options
-@a N.J. Nes
-@* A simple option handling library
-@T
-The monet server and clients make use of command line options and a (possibly)
-shared config file. With this library a set (represented by set,setlen) of
-options is created. An option is stored as name and value strings with a
-special flag indicating the origin of the options, (builtin, system config
-file, special config file or command line option).
-
-@h
-#ifndef _MO_H_
-#define _MO_H_
-
-typedef enum opt_kind {
- opt_builtin = 0,
- opt_config = 1,
- opt_cmdline = 2
-} opt_kind;
-
-typedef struct opt {
- opt_kind kind;
- char *name;
- char *value;
-} opt;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef moptions_export
-/* avoid using "#ifdef WIN32" so that this file does not need our config.h */
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if !defined(LIBMOPTIONS) && !defined(LIBGDK) && !defined(LIBMAPI)
-#define moptions_export extern __declspec(dllimport)
-#else
-#define moptions_export extern __declspec(dllexport)
-#endif
-#else
-#define moptions_export extern
-#endif
-#endif
-
-/* mo_print_options will print the option set on stderr */
-moptions_export void mo_print_options(opt *set, int setlen);
-
-/* mo_find_option, finds the option with the given name in the option set
- (set,setlen). */
-moptions_export char *mo_find_option(opt *set, int setlen, const char *name);
-
-/* mo_system_config will add the options from the system config file
- (returns the new setlen) */
-moptions_export int mo_system_config(opt **Set, int setlen);
-
-/* mo_builtin_settings, will place the builtin settings into a new
- option set (returns the length of this set). */
-moptions_export int mo_builtin_settings(opt **Set);
-
-/* mo_add_option will add a single option to the option set
- (returns new length) */
-moptions_export int mo_add_option(opt **Set, int setlen, opt_kind kind, const
char *name, const char *value);
-
-/* mo_free_options will free the resouces take by the options set */
-moptions_export void mo_free_options(opt *set, int setlen);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-@c
+/*
+ * @f monet_options
+ * @a N.J. Nes
+ * @* A simple option handling library
+ * @T
+ * The monet server and clients make use of command line options and a
(possibly)
+ * shared config file. With this library a set (represented by set,setlen) of
+ * options is created. An option is stored as name and value strings with a
+ * special flag indicating the origin of the options, (builtin, system config
+ * file, special config file or command line option).
+ *
+ */
#include "monetdb_config.h"
#include "monet_options.h"
#ifndef HAVE_GETOPT_LONG
diff --git a/common/options/monet_options.h b/common/options/monet_options.h
new file mode 100644
--- /dev/null
+++ b/common/options/monet_options.h
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+#ifndef _MO_H_
+#define _MO_H_
+
+typedef enum opt_kind {
+ opt_builtin = 0,
+ opt_config = 1,
+ opt_cmdline = 2
+} opt_kind;
+
+typedef struct opt {
+ opt_kind kind;
+ char *name;
+ char *value;
+} opt;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef moptions_export
+/* avoid using "#ifdef WIN32" so that this file does not need our config.h */
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if !defined(LIBMOPTIONS) && !defined(LIBGDK) && !defined(LIBMAPI)
+#define moptions_export extern __declspec(dllimport)
+#else
+#define moptions_export extern __declspec(dllexport)
+#endif
+#else
+#define moptions_export extern
+#endif
+#endif
+
+/* mo_print_options will print the option set on stderr */
+moptions_export void mo_print_options(opt *set, int setlen);
+
+/* mo_find_option, finds the option with the given name in the option set
+ (set,setlen). */
+moptions_export char *mo_find_option(opt *set, int setlen, const char *name);
+
+/* mo_system_config will add the options from the system config file
+ (returns the new setlen) */
+moptions_export int mo_system_config(opt **Set, int setlen);
+
+/* mo_builtin_settings, will place the builtin settings into a new
+ option set (returns the length of this set). */
+moptions_export int mo_builtin_settings(opt **Set);
+
+/* mo_add_option will add a single option to the option set
+ (returns new length) */
+moptions_export int mo_add_option(opt **Set, int setlen, opt_kind kind, const
char *name, const char *value);
+
+/* mo_free_options will free the resouces take by the options set */
+moptions_export void mo_free_options(opt *set, int setlen);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/geom/lib/Makefile.ag b/geom/lib/Makefile.ag
--- a/geom/lib/Makefile.ag
+++ b/geom/lib/Makefile.ag
@@ -21,5 +21,7 @@
lib_geom = {
NOINST
DIR = libdir/MonetDB
- SOURCES = libgeom.mx
+ SOURCES = libgeom.c
}
+
+EXTRA_DIST = libgeom.h
diff --git a/geom/lib/libgeom.mx b/geom/lib/libgeom.c
rename from geom/lib/libgeom.mx
rename to geom/lib/libgeom.c
--- a/geom/lib/libgeom.mx
+++ b/geom/lib/libgeom.c
@@ -1,141 +1,28 @@
-@/
-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
+/*
+ * 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.
+ */
-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.
-@
-
-@f libgeom
-@a Niels Nes
-
-@* The simple geom library
-@h
-#ifndef LIBGEOM_H
-#define LIBGEOM_H
-
-#include <gdk.h>
-
-@+ Geos
-The geom library is based on the geos (Geometry Engine Open Source) library.
-@h
-
-#ifdef WIN32
-#ifndef LIBGEOM
-#define libgeom_export extern __declspec(dllimport)
-#else
-#define libgeom_export extern __declspec(dllexport)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
