Changeset: d77fb2ef5c0d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d77fb2ef5c0d
Modified Files:
buildtools/conf/MonetDB.m4
clients/src/mapiclient/mclient.mx
clients/src/mapiclient/msqldump.c
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (132 lines):
diff -r 4c233d85c9cf -r d77fb2ef5c0d MonetDB4/src/monet/monet.mx
--- a/MonetDB4/src/monet/monet.mx Wed Jul 21 14:20:10 2010 +0200
+++ b/MonetDB4/src/monet/monet.mx Wed Jul 21 14:50:45 2010 +0200
@@ -411,6 +411,10 @@
out = GDKout;
stream_printf(out, "# MonetDB Server v%s\n", monet_version);
stream_printf(out, "# based on GDK v%s\n", GDKversion());
+ if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
+ stream_printf(out, "# not released\n");
+ else
+ stream_printf(out, "# release %s\n", MONETDB_RELEASE);
stream_printf(out, "# Copyright (c) 1993-July 2008, CWI. "
"All rights reserved.\n");
stream_printf(out, "# Copyright (c) August 2008-2010, MonetDB
B.V.. "
diff -r 4c233d85c9cf -r d77fb2ef5c0d MonetDB4/src/tools/monet_version.c.in
--- a/MonetDB4/src/tools/monet_version.c.in Wed Jul 21 14:20:10 2010 +0200
+++ b/MonetDB4/src/tools/monet_version.c.in Wed Jul 21 14:50:45 2010 +0200
@@ -39,6 +39,10 @@
"based on kernel v%s (" SZFMT "-bit oids)\n",
(size_t) (sizeof(ptr) * 8), GDKversion(),
(size_t) (sizeof(oid) * 8));
+ if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
+ printf("Not released\n");
+ else
+ printf("Release %s\n", MONETDB_RELEASE);
printf("Copyright (c) 1993-July 2008 CWI\nCopyright (c) August
2008-2010 MonetDB B.V., all rights reserved\n");
printf("Visit http://monetdb.cwi.nl/ for further information\n");
printf("Configured for prefix: " MONETDB4_PREFIX "\n");
diff -r 4c233d85c9cf -r d77fb2ef5c0d MonetDB5/src/tools/monet_version.c.in
--- a/MonetDB5/src/tools/monet_version.c.in Wed Jul 21 14:20:10 2010 +0200
+++ b/MonetDB5/src/tools/monet_version.c.in Wed Jul 21 14:50:45 2010 +0200
@@ -46,6 +46,10 @@
"based on kernel v%s (" SZFMT "-bit oids)\n",
(size_t) (sizeof(ptr) * 8), GDKversion(),
(size_t) (sizeof(oid) * 8));
+ if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
+ printf("Not released\n");
+ else
+ printf("Release %s\n", MONETDB_RELEASE);
printf("Copyright (c) 1993-July 2008 CWI\n"
"Copyright (c) August 2008-2010 MonetDB B.V., all
rights reserved\n");
printf("Visit http://monetdb.cwi.nl/ for further information\n");
diff -r 4c233d85c9cf -r d77fb2ef5c0d MonetDB5/src/tools/mserver5.mx
--- a/MonetDB5/src/tools/mserver5.mx Wed Jul 21 14:20:10 2010 +0200
+++ b/MonetDB5/src/tools/mserver5.mx Wed Jul 21 14:50:45 2010 +0200
@@ -186,6 +186,12 @@
GDKversion());
size -= strlen(s);
s += strlen(s);
+ if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
+ snprintf(s, size, "# Not released\n");
+ else
+ snprintf(s, size, "# Release %s\n", MONETDB_RELEASE);
+ size -= strlen(s);
+ s += strlen(s);
snprintf(s,size,"# Serving database '%s', using %d thread%s\n",
GDKgetenv("gdk_dbname"),
GDKnr_threads, (GDKnr_threads != 1) ? "s" : "");
diff -r 4c233d85c9cf -r d77fb2ef5c0d buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Wed Jul 21 14:20:10 2010 +0200
+++ b/buildtools/conf/MonetDB.m4 Wed Jul 21 14:50:45 2010 +0200
@@ -54,6 +54,7 @@
;;
esac
+AC_DEFINE(MONETDB_RELEASE, "unreleased", [Release name or "unreleased"])
])
diff -r 4c233d85c9cf -r d77fb2ef5c0d buildtools/conf/winconfig.h
--- a/buildtools/conf/winconfig.h Wed Jul 21 14:20:10 2010 +0200
+++ b/buildtools/conf/winconfig.h Wed Jul 21 14:50:45 2010 +0200
@@ -55,6 +55,9 @@
#include <windows.h>
#include <stddef.h>
+/* Release name or "unreleased" */
+#define MONETDB_RELEASE "unreleased"
+
/* indicate to sqltypes.h that windows.h has already been included and
that it doesn't have to define Windows constants */
#define ALREADY_HAVE_WINDOWS_TYPE 1
diff -r 4c233d85c9cf -r d77fb2ef5c0d clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Jul 21 14:20:10 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Wed Jul 21 14:50:45 2010 +0200
@@ -2586,6 +2586,10 @@
stream_printf(toConsole,
"Welcome to mclient, the MonetDB%s "
"interactive terminal\n", lang);
+ if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
+ stream_printf(toConsole, "Not released\n");
+ else
+ stream_printf(toConsole, "Release %s\n",
MONETDB_RELEASE);
if (mode == SQL &&
(hdl = mapi_query(mid,
diff -r 4c233d85c9cf -r d77fb2ef5c0d clients/src/mapiclient/msqldump.c
--- a/clients/src/mapiclient/msqldump.c Wed Jul 21 14:20:10 2010 +0200
+++ b/clients/src/mapiclient/msqldump.c Wed Jul 21 14:50:45 2010 +0200
@@ -56,7 +56,7 @@
#endif
static void
-usage(const char *prog)
+usage(const char *prog, int xit)
{
fprintf(stderr, "Usage: %s [ options ]\n", prog);
fprintf(stderr, "\nOptions are:\n");
@@ -69,7 +69,7 @@
fprintf(stderr, " -q | --quiet don't print welcome
message\n");
fprintf(stderr, " -t | --trace trace mapi network
interaction\n");
fprintf(stderr, " -? | --help show this usage
message\n");
- exit(-1);
+ exit(xit);
}
/* hardwired defaults, only used if monet environment cannot be found */
@@ -195,9 +195,12 @@
trace = MAPI_TRACE;
break;
case '?':
- usage(argv[0]);
+ /* a bit of a hack: look at the option that the
+ current `c' is based on and see if we recognize
+ it: if -? or --help, exit with 0, else with -1 */
+ usage(argv[0], strcmp(argv[optind - 1], "-?") == 0 ||
strcmp(argv[optind - 1], "--help") == 0 ? 0 : -1);
default:
- usage(argv[0]);
+ usage(argv[0], -1);
}
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
