Update of /cvsroot/monetdb/MonetDB4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2717
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/MonetDB4/RunMtest.in,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- RunMtest.in 21 Feb 2007 13:48:10 -0000 1.5
+++ RunMtest.in 10 Sep 2007 14:22:48 -0000 1.5.4.1
@@ -16,61 +16,61 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
[EMAIL PROTECTED]@
+pkg=monetdb4
[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/modules/plain/.libs:${builddir}/src/modules/plain:${srcdir}/src/modules/plain:${builddir}/src/modules/contrib/.libs:${builddir}/src/modules/contrib:${srcdir}/src/modules/contrib:${builddir}/src/modules/calibrator/.libs:${builddir}/src/modules/calibrator:${srcdir}/src/modules/calibrator:${builddir}/src/mapi/.libs:${builddir}/src/mapi:${srcdir}/src/mapi:${srcdir}/scripts:${srcdir}/scripts/tools"
[EMAIL PROTECTED]@
MOD_PATH="${MOD_PATH}:${builddir}/src/modules/mnetcdf/.libs:${builddir}/src/modules/mnetcdf:${srcdir}/src/modules/mnetcdf"
+for d in src/modules/plain src/modules/contrib src/modules/calibrator src/mapi
@HAVE_NETCDF_TRUE@ src/modules/mnetcdf
+do
+ MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:${srcdir}/$d:"
+done
+MOD_PATH="${MOD_PATH}${srcdir}/scripts/tools"
-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
+# make sure scripts are executable
+for x in "${builddir}/src/tools/${pkg}-config"
+do
+ if [ -s $x ] ; then
+ chmod +x $x
+ fi
+done
# enhance various paths to find our stuff
-if [ -s "${builddir}/src/tools/monetdb4-config" ] ; then
- chmod +x "${builddir}/src/tools/monetdb4-config"
-fi
-PATH="${builddir}/src/tools:$PATH"
-if [ "${uname}" = "IRIX64" ] ; then
- # on IRIX64 (at least when compiled with the MIPS compiler),
- # running Mserver via the wrapper-script ${builddir}/src/tools/Mserver
- # results in a bus error;
- # hence, we directly run the binary ${builddir}/src/tools/.libs/Mserver
- PATH="${builddir}/src/tools/.libs:$PATH"
-fi
-#PYTHONPATH="${builddir}/src/testing:${srcdir}/src/testing:${builddir}/src/common:${srcdir}/src/mapi/clients/python"
+binpath="${builddir}/src/tools"
libpath="${MOD_PATH}:${builddir}/src/monet/.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 #PYTHONPATH
# execute Mtest.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 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/MonetDB.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]"
+# 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/MonetDB.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/MonetDB4/MonetDB-server.spec.in,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -d -r1.11.2.4 -r1.11.2.5
--- MonetDB-server.spec.in 6 Sep 2007 13:50:21 -0000 1.11.2.4
+++ MonetDB-server.spec.in 10 Sep 2007 14:22:43 -0000 1.11.2.5
@@ -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
@@ -119,12 +126,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 monetdb4
-%postun -p /sbin/ldconfig
+# %preun
+# if [ $1 = 0 ]; then
+# /sbin/service monetdb4 stop >/dev/null 2>&1
+# /sbin/chkconfig --del monetdb4
+# fi
+
+%postun
+/sbin/ldconfig
+
+# when we want MonetDB to run as system daemon, we need this
+# if [ "$1" -ge "1" ]; then
+# /sbin/service monetdb4 condrestart >/dev/null 2>&1 || :
+# fi
%clean
rm -fr $RPM_BUILD_ROOT
Index: RunMapprove.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/RunMapprove.in,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -d -r1.3 -r1.3.6.1
--- RunMapprove.in 4 Jan 2007 17:30:50 -0000 1.3
+++ RunMapprove.in 10 Sep 2007 14:22:47 -0000 1.3.6.1
@@ -16,22 +16,19 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
[EMAIL PROTECTED]@
+pkg=monetdb4
[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 --config="${builddir}/conf/MonetDB.conf"
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" "[EMAIL PROTECTED]"
+exec Mapprove.py --config="${builddir}/conf/MonetDB.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
