Changeset: 6eff598d2b37 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6eff598d2b37
Modified Files:
NT/monetdb_config.h.in
clients/mapiclient/Makefile.ag
clients/mapiclient/tomograph.c
configure.ag
monetdb5/optimizer/opt_remap.c
tools/mserver/Makefile.ag
Branch: default
Log Message:
merged with Jul2015
diffs (96 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -60,6 +60,9 @@
/* location where binaries are installed */
/* #undef BINDIR */
+/* read-only architecture-independent data */
+#define DATA_DIR PREFIX "\\share"
+
/* Directory separator */
#define DIR_SEP '\\'
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1184,6 +1184,23 @@ updatecolormap(int idx)
/* gnuplot defaults */
static int height = 160;
+static char *
+findlogo(void)
+{
+#ifdef _MSC_VER
+ static char buf[512];
+ int i;
+
+ snprintf(buf, sizeof(buf), "%s", DATA_DIR
"\\doc\\MonetDB\\monetdblogo.png");
+ for (i = 0; buf[i]; i++)
+ if (buf[i] == '\\')
+ buf[i] = '/';
+ return buf;
+#else
+ return DATA_DIR "/doc/MonetDB/monetdblogo.png";
+#endif
+}
+
static void
gnuplotheader(char *filename)
{
@@ -1204,8 +1221,7 @@ gnuplotheader(char *filename)
fprintf(gnudata,"unset border\n");
fprintf(gnudata,"unset xtics\n");
fprintf(gnudata,"unset ytics\n");
- // REPLACE THE HARDCODED NAME
- fprintf(gnudata,"plot \"/ufs/mk/monetdb-final.png\" binary filetype=png
dx=0.5 dy=0.5 notitle with rgbimage\n");
+ fprintf(gnudata,"plot \"%s\" binary filetype=png dx=0.5 dy=0.5 notitle
with rgbimage\n", findlogo());
fprintf(gnudata,"unset title\n");
}
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -3034,6 +3034,8 @@ fi
Qdatadir="$datadir"
Xdatadir="`$translatepath "$datadir"`"
QXdatadir="`echo "$Xdatadir" | sed 's/\\\\/\\\\\\\\/g'`"
+eval "Edatadir=${Xdatadir}"
+QEdatadir="`echo "$Edatadir" | sed 's/\\\\/\\\\\\\\/g'`"
AC_SUBST(Qdatadir)
AC_SUBST(Xdatadir)
AC_SUBST(QXdatadir)
@@ -3069,6 +3071,7 @@ AC_SUBST(QSOURCE)
AC_SUBST(XSOURCE)
AC_SUBST(QXSOURCE)
AC_DEFINE_UNQUOTED(LOCALSTATEDIR,"$QElocalstatedir",[modifiable single-machine
data])
+AC_DEFINE_UNQUOTED(DATA_DIR,"$QEdatadir",[read-only architecture-independent
data])
AC_DEFINE_UNQUOTED(BINDIR,"$QEbindir",[location where binaries are installed])
dnl On Solaris, libxml2 enables threading only when _REENTRANT, __MT__
diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -38,7 +38,10 @@ OPTremapDirect(Client cntxt, MalBlkPtr m
setFunctionId(p,putName(fcn, strlen(fcn)));
for(i=0; i<pci->retc; i++)
- getArg(p,i)= getArg(pci,i);
+ if (i<1)
+ getArg(p,i) = getArg(pci,i);
+ else
+ p = pushReturn(mb, p, getArg(pci,i));
p->retc= p->argc= pci->retc;
for(i= pci->retc+2; i<pci->argc; i++)
p= pushArgument(mb,p,getArg(pci,i));
diff --git a/tools/mserver/Makefile.ag b/tools/mserver/Makefile.ag
--- a/tools/mserver/Makefile.ag
+++ b/tools/mserver/Makefile.ag
@@ -29,6 +29,7 @@ headers_pdf = {
DIR = datadir/doc/MonetDB-client-tools
}
+# see clients/mapiclient/Makefile.ag for use of logo file
headers_png = {
HEADERS = png
SOURCES = monetdblogo.png
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
