Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21854
Modified Files:
Tag: GDK-2
HowToStart-SQL Makefile.ag configure.ag vertoo.config
Added Files:
Tag: GDK-2
RunMserver.in RunMserver5.in
Log Message:
propagated changes of Monday Aug 13 2007 - Thursday Aug 16 2007
from the development trunk to the GDK-2 branch
Index: HowToStart-SQL
===================================================================
RCS file: /cvsroot/monetdb/sql/HowToStart-SQL,v
retrieving revision 1.23
retrieving revision 1.23.6.1
diff -u -d -r1.23 -r1.23.6.1
--- HowToStart-SQL 9 Nov 2006 22:41:15 -0000 1.23
+++ HowToStart-SQL 15 Aug 2007 22:18:25 -0000 1.23.6.1
@@ -277,7 +277,7 @@
::
- mclient -lsql -umonetdb -Pmonetdb
+ MapiClient -lsql -umonetdb -Pmonetdb
Documentation
--- NEW FILE: RunMserver5.in ---
#!/bin/sh
# 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-2007 CWI.
# All Rights Reserved.
[EMAIL PROTECTED]@
mversion=5
# where compiled modules are to be found
MOD_PATH="${builddir}/src/backend/monet${mversion}/.libs:${builddir}/src/backend/monet${mversion}:`monetdb${mversion}-config
--modpath`"
case $mversion in
4) server=Mserver;;
5) server=mserver5;;
esac
exec $server --set monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
${1+"$@"}
--- NEW FILE: RunMserver.in ---
#!/bin/sh
# 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-2007 CWI.
# All Rights Reserved.
[EMAIL PROTECTED]@
mversion=4
# where compiled modules are to be found
MOD_PATH="${builddir}/src/backend/monet${mversion}/.libs:${builddir}/src/backend/monet${mversion}:`monetdb${mversion}-config
--modpath`"
case $mversion in
4) server=Mserver;;
5) server=mserver5;;
esac
exec $server --set monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
${1+"$@"}
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/configure.ag,v
retrieving revision 1.119
retrieving revision 1.119.2.1
diff -u -d -r1.119 -r1.119.2.1
--- configure.ag 15 Jul 2007 20:47:30 -0000 1.119
+++ configure.ag 15 Aug 2007 22:18:28 -0000 1.119.2.1
@@ -18,7 +18,10 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.53)
-AC_INIT(src/include/sql_catalog.h)
+AC_INIT([MonetDB SQL Server], [2.19.0], [EMAIL PROTECTED], [sql])
+# ^^^^^^
+# Maintained via vertoo. Please don't modify by hand!
+# Contact [EMAIL PROTECTED] for details and/or assistance.
AC_CONFIG_AUX_DIR(conf)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
@@ -26,14 +29,46 @@
AH_BOTTOM([#include "stddef.h"])
dnl ----------------------
-AM_INIT_AUTOMAKE("sql", 2.19.0)
-# ^^^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
+AM_INIT_AUTOMAKE([tar-ustar])
+AC_CONFIG_SRCDIR([src/include/sql_catalog.h])
AM_CONFIG_HEADER(sql_config.h:conf/config.h.in)
CONFIG_H=sql_config.h
AC_SUBST(CONFIG_H)
+# SQL_BUILD and SQL_SOURCE are *only* used for sql-config and RunMserver
+# SQL_SOURCE is the absolute path name of the source directory
+# (srcdir can be relative)
+
+# The Q versions of various variables are used in places where \'s
+# need to be escapes with an extra \. Configure does not support \'s
+# in path names, so there is no need to do anything special here
+# except set the variables. The command to set them in case we do
+# need to escape the \'s is Qvar=`echo "$var" | sed 's/\\\\/\\\\\\\\/g'`
+SQL_BUILD=[`pwd`]
+AC_SUBST(SQL_BUILD)
+
+SQL_SOURCE=[`(cd $srcdir && pwd)`]
+AC_SUBST(SQL_SOURCE)
+
+# if no --prefix option, we must set Qprefix to the default value
+# the problem is that prefix is set very late in the process if it
+# wasn't set by --prefix
+if test "${prefix}x" = "NONEx"; then
+ Qprefix="${ac_default_prefix}"
+else
+ Qprefix="${prefix}"
+fi
+Qprefix="`echo "$Qprefix" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qprefix)
+# exec_prefix is created very late, so let make do the expansion
+if test "${exec_prefix}x" = "NONEx"; then
+ Qexec_prefix='${prefix}'
+else
+ Qexec_prefix="`echo "$exec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
+fi
+AC_SUBST(Qexec_prefix)
+
+
dnl Check for Monet
req_monetdb_ver='1.18.0'
# ^^^^^^
@@ -83,6 +118,109 @@
fi
fi
+dnl provide different versions of the paths derived above
+if test "${prefix}x" = "NONEx"; then
+ Xprefix="`$translatepath "$Qprefix"`"
+ QXprefix="`echo "$Xprefix" | sed 's/\\\\/\\\\\\\\/g'`"
+else
+ Xprefix="`$translatepath "$prefix"`"
+ QXprefix="`echo "$Xprefix" | sed 's/\\\\/\\\\\\\\/g'`"
+fi
+if test "${exec_prefix}x" = "NONEx"; then
+ Xexec_prefix="`$translatepath "$Qexec_prefix"`"
+ QXexec_prefix="`echo "$Xexec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
+else
+ Xexec_prefix="`$translatepath "$exec_prefix"`"
+ QXexec_prefix="`echo "$Xexec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
+fi
+AC_SUBST(Xprefix)
+AC_SUBST(QXprefix)
+AC_DEFINE_UNQUOTED(SQL_PREFIX,"$QXprefix",[architecture-independent files])
+AC_SUBST(Xexec_prefix)
+AC_SUBST(QXexec_prefix)
+AC_DEFINE_UNQUOTED(SQL_EXEC_PREFIX,"$QXexec_prefix",[architecture-dependent
files])
+QSQL_BUILD="$SQL_BUILD"
+XSQL_BUILD="`$translatepath "$SQL_BUILD"`"
+QXSQL_BUILD="`echo "$XSQL_BUILD" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(QSQL_BUILD)
+AC_SUBST(XSQL_BUILD)
+AC_SUBST(QXSQL_BUILD)
+QSQL_SOURCE="$SQL_SOURCE"
+XSQL_SOURCE="`$translatepath "$SQL_SOURCE"`"
+QXSQL_SOURCE="`echo "$XSQL_SOURCE" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(QSQL_SOURCE)
+AC_SUBST(XSQL_SOURCE)
+AC_SUBST(QXSQL_SOURCE)
+Qsrcdir="$srcdir"
+Xsrcdir="`$translatepath "$srcdir"`"
+QXsrcdir="`echo "$Xsrcdir" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qsrcdir)
+AC_SUBST(Xsrcdir)
+AC_SUBST(QXsrcdir)
+Qlocalstatedir="$localstatedir"
+Xlocalstatedir="`$translatepath "$localstatedir"`"
+QXlocalstatedir="`echo "$Xlocalstatedir" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qlocalstatedir)
+AC_SUBST(Xlocalstatedir)
+AC_SUBST(QXlocalstatedir)
+Qlibdir="$libdir"
+Xlibdir="`$translatepath "$libdir"`"
+QXlibdir="`echo "$Xlibdir" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qlibdir)
+AC_SUBST(Xlibdir)
+AC_SUBST(QXlibdir)
+Qsysconfdir="$sysconfdir"
+Xsysconfdir="`$translatepath "$sysconfdir"`"
+QXsysconfdir="`echo "$Xsysconfdir" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qsysconfdir)
+AC_SUBST(Xsysconfdir)
+AC_SUBST(QXsysconfdir)
+Qbindir="$bindir"
+Xbindir="`$translatepath "$bindir"`"
+QXbindir="`echo "$Xbindir" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qbindir)
+AC_SUBST(Xbindir)
+AC_SUBST(QXbindir)
+Qlibexecdir="$libexecdir"
+Xlibexecdir="`$translatepath "$libexecdir"`"
+QXlibexecdir="`echo "$Xlibexecdir" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qlibexecdir)
+AC_SUBST(Xlibexecdir)
+AC_SUBST(QXlibexecdir)
+Qdatarootdir="$datarootdir"
+Xdatarootdir="`$translatepath "$datarootdir"`"
+QXdatarootdir="`echo "$Xdatarootdir" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qdatarootdir)
+AC_SUBST(Xdatarootdir)
+AC_SUBST(QXdatarootdir)
+if test "${datadir}" = '${datarootdir}'; then
+ datadir="${datarootdir}"
+fi
+Qdatadir="$datadir"
+Xdatadir="`$translatepath "$datadir"`"
+QXdatadir="`echo "$Xdatadir" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qdatadir)
+AC_SUBST(Xdatadir)
+AC_SUBST(QXdatadir)
+Qmandir="$mandir"
+Xmandir="`$translatepath "$mandir"`"
+QXmandir="`echo "$Xmandir" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qmandir)
+AC_SUBST(Xmandir)
+AC_SUBST(QXmandir)
+Qincludedir="$includedir"
+Xincludedir="`$translatepath "$includedir"`"
+QXincludedir="`echo "$Xincludedir" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qincludedir)
+AC_SUBST(Xincludedir)
+AC_SUBST(QXincludedir)
+Qinfodir="$infodir"
+Xinfodir="`$translatepath "$infodir"`"
+QXinfodir="`echo "$Xinfodir" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(Qinfodir)
+AC_SUBST(Xinfodir)
+AC_SUBST(QXinfodir)
+
dnl AC_CHECK_HEADERS(limits.h malloc.h pwd.h)
dnl CFLAGS for our code are stricter than what autoconf can cope with.
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/sql/vertoo.config,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- vertoo.config 24 Jul 2007 14:40:37 -0000 1.22
+++ vertoo.config 15 Aug 2007 22:18:28 -0000 1.22.2.1
@@ -15,7 +15,7 @@
main.setVersionFormat('@normal%[rc?%rc%build:]')
main.addAnchor("VERSION", "%v")
-main.addAnchor("configure.ag", '"sql", %v')
+main.addAnchor("configure.ag", "[MonetDB SQL Server], [%v]")
main.addAnchor("NT/rules.msc", "VERSION = %v")
main.addAnchors("NT/MonetDB4-SQL/MonetDB4-Installer.vdproj",
arguments(pattern = "MonetDB-SQL-%v",
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/Makefile.ag,v
retrieving revision 1.28
retrieving revision 1.28.6.1
diff -u -d -r1.28 -r1.28.6.1
--- Makefile.ag 4 Jan 2007 21:45:04 -0000 1.28
+++ Makefile.ag 15 Aug 2007 22:18:26 -0000 1.28.6.1
@@ -17,6 +17,8 @@
SUBDIRS = conf src
EXTRA_DIST = RunMtest.in RunMtest.bat.in \
RunMapprove.in RunMapprove.bat.in \
+ RunMserver.in RunMserver.bat.in \
+ RunMserver5.in RunMserver5.bat.in \
MonetDB-SQL.spec.in MonetDB-SQL.spec \
rpm.mk.in RunMserver.bat.in
EXTRA_DIST_DIR = NT
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
