Update of /cvsroot/monetdb/MonetDB5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6644
Modified Files:
Tag: GDK-2
MonetDB-server.spec.in RunMapprove.in RunMtest.in
Log Message:
propagated changes of Thursday Sep 06 2007 - Monday Sep 10 2007
from the development trunk to the GDK-2 branch
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/RunMtest.in,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -u -d -r1.28.2.2 -r1.28.2.3
--- RunMtest.in 3 Sep 2007 13:08:00 -0000 1.28.2.2
+++ RunMtest.in 10 Sep 2007 14:26:48 -0000 1.28.2.3
@@ -16,50 +16,60 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
[EMAIL PROTECTED]@
+pkg=monetdb5
[EMAIL PROTECTED]@
# make sure srcdir contains absolute path name
-srcdir=`cd '@Xsrcdir@'; pwd`
+srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
# where compiled modules are to be found
-MOD_PATH="${builddir}/src/compiler/.libs:${builddir}/src/compiler:${srcdir}/src/compiler:${builddir}/src/optimizer/.libs:${builddir}/src/optimizer:${srcdir}/src/optimizer:${builddir}/src/scheduler/.libs:${builddir}/src/scheduler:${srcdir}/src/scheduler:${builddir}/src/modules/atoms/.libs:${builddir}/src/modules/atoms:${srcdir}/src/modules/atoms:${builddir}/src/modules/kernel/.libs:${builddir}/src/modules/kernel:${srcdir}/src/modules/kernel:${builddir}/src/modules/mal/.libs:${builddir}/src/modules/mal:${srcdir}/src/modules/mal:${builddir}/src/modules/mal/crackers/.libs:${builddir}/src/modules/mal/crackers:${srcdir}/src/modules/mal/crackers"
-
-if [ "${LD_LIBRARY_PATH}" ] ; then
- LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
-fi
-if [ "${uname}" = "Darwin" -a "${DYLD_LIBRARY_PATH}" ] ; then
- DYLD_LIBRARY_PATH=":${DYLD_LIBRARY_PATH}"
-fi
-if [ "${uname}" = "AIX" -a "${LIBPATH}" ] ; then
- LIBPATH=":${LIBPATH}"
-fi
+for d in src/compiler src/optimizer src/scheduler src/modules/atoms
src/modules/kernel src/modules/mal src/modules/mal/crackers
+do
+ MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:${srcdir}/$d:"
+done
-# enhance various paths to find our stuff
-for x in "${builddir}/src/tools/monetdb5-config"
"${srcdir}/src/tools/mcheckpoint" "${srcdir}/src/tools/mrecover" ; do
+# make sure scripts are executable
+for x in "${builddir}/src/tools/${pkg}-config"
"${srcdir}/src/tools/mcheckpoint" "${srcdir}/src/tools/mrecover"
+do
if [ -s $x ] ; then
chmod +x $x
fi
done
-PATH="${builddir}/src/tools:${srcdir}/src/tools:$PATH"
+
+# enhance various paths to find our stuff
+binpath="${builddir}/src/tools:${srcdir}/src/tools"
libpath="${MOD_PATH}:${builddir}/src/mal/.libs"
+
+PATH="${binpath}:$PATH"
+export PATH
+
+if [ "${LD_LIBRARY_PATH}" ] ; then
+ LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
+fi
LD_LIBRARY_PATH="${libpath}${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH
+
if [ "${uname}" = "Darwin" ] ; then
+ if [ "${DYLD_LIBRARY_PATH}" ] ; then
+ DYLD_LIBRARY_PATH=":${DYLD_LIBRARY_PATH}"
+ fi
DYLD_LIBRARY_PATH="${libpath}${DYLD_LIBRARY_PATH}"
export DYLD_LIBRARY_PATH
fi
if [ "${uname}" = "AIX" ] ; then
+ if [ "${LIBPATH}" ] ; then
+ LIBPATH=":${LIBPATH}"
+ fi
LIBPATH="${libpath}${LIBPATH}"
export LIBPATH
fi
-export PATH LD_LIBRARY_PATH
# execute Mtest.py in the source directory
cd "$srcdir"
-# check python version
-type -a @PYTHON@
[EMAIL PROTECTED]@ -V
-
-# execute the script
-# if no arguments, do a recursive test (Mtest.py -r), else pass on the
arguments
-exec Mtest.py -5 --config="${builddir}/conf/monetdb5.conf"
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--sql_logdir="${builddir}/sql_logs" --xquery_logdir="${builddir}/xquery_logs"
--TSTSRCBASE="$srcdir" --TSTBLDBASE="$builddir" --TSTTRGBASE="${builddir}"
${MTEST_AT+--at} "[EMAIL PROTECTED]"
+# execute the script.
+# if no arguments, do a recursive test (Mtest.py -r), else pass on the
+# arguments.
+# if the environment variable MTEST_AT is set (value does not matter), pass
+# the --at flag to Mtest.py so that it uses the at command as a watchdog.
+exec Mtest.py --config="${builddir}/conf/monetdb5.conf" --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--sql_logdir="${builddir}/sql_logs" --xquery_logdir="${builddir}/xquery_logs"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "[EMAIL PROTECTED]"
Index: MonetDB-server.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/MonetDB-server.spec.in,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -u -d -r1.15.2.6 -r1.15.2.7
--- MonetDB-server.spec.in 6 Sep 2007 13:52:34 -0000 1.15.2.6
+++ MonetDB-server.spec.in 10 Sep 2007 14:26:46 -0000 1.15.2.7
@@ -28,10 +28,17 @@
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(pre): shadow-utils
-# Requires(post): chkconfig
BuildRequires: python
BuildRequires: pcre-devel
+# when we want MonetDB to run as system daemon, we need this
+# also see the scriptlets below
+# the init script should implement start, stop, restart, condrestart, status
+# Requires(post): /sbin/chkconfig
+# Requires(preun): /sbin/chkconfig
+# Requires(preun): /sbin/service
+# Requires(postun): /sbin/service
+
%{!?_with_python: %{!?_without_python: %define _with_python --with-python}}
%define builddoc 0
@@ -113,12 +120,26 @@
-c "MonetDB Server" monetdb
exit 0
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
-#create monetdb init script
-#/sbin/chkconfig --add monetdb
+# when we want MonetDB to run as system daemon, we need this
+# # This adds the proper /etc/rc*.d links for the script
+# /sbin/chkconfig --add monetdb5
-%postun -p /sbin/ldconfig
+# %preun
+# if [ $1 = 0 ]; then
+# /sbin/service monetdb5 stop >/dev/null 2>&1
+# /sbin/chkconfig --del monetdb5
+# fi
+
+%postun
+/sbin/ldconfig
+
+# when we want MonetDB to run as system daemon, we need this
+# if [ "$1" -ge "1" ]; then
+# /sbin/service monetdb5 condrestart >/dev/null 2>&1 || :
+# fi
%clean
rm -fr $RPM_BUILD_ROOT
Index: RunMapprove.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/RunMapprove.in,v
retrieving revision 1.9
retrieving revision 1.9.6.1
diff -u -d -r1.9 -r1.9.6.1
--- RunMapprove.in 4 Jan 2007 22:10:48 -0000 1.9
+++ RunMapprove.in 10 Sep 2007 14:26:47 -0000 1.9.6.1
@@ -16,22 +16,19 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
[EMAIL PROTECTED]@
+pkg=monetdb5
[EMAIL PROTECTED]@
# make sure srcdir contains absolute path name
-srcdir=`cd '@Xsrcdir@'; pwd`
+srcdir=`cd '@srcdir@'; pwd`
-# enhance various paths to find our stuff
-#PYTHONPATH="${builddir}/src/testing:${srcdir}/src/testing:${builddir}/src/common:${srcdir}/src/mapi/clients/python"
-#export PYTHONPATH
+# enhance PATH to find ${pkg}-config
+PATH="${builddir}/src/tools:$PATH"
+export PATH
# execute Mapprove.py in the source directory
cd "$srcdir"
-# check python version
-type -a @PYTHON@
[EMAIL PROTECTED]@ -V
-
-# execute the script
+# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec Mapprove.py -5 --config="${builddir}/conf/monetdb5.conf"
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" "[EMAIL PROTECTED]"
+exec Mapprove.py --config="${builddir}/conf/monetdb5.conf" --package=${pkg}
--TSTTRGBASE="${builddir}" "[EMAIL PROTECTED]"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
