Update of /cvsroot/monetdb/geom
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29316
Modified Files:
RunMtest.in configure.ag
Log Message:
added minimal monetdb-geom-config scripts
that (for now) only support --source, --build, --prefix options
as used by the next version of Mtest.py
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMtest.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- RunMtest.in 22 Aug 2007 15:45:40 -0000 1.2
+++ RunMtest.in 22 Aug 2007 16:23:14 -0000 1.3
@@ -21,16 +21,8 @@
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
[EMAIL PROTECTED]@
-
-if [ ! -x "${MONETDB_PREFIX}/bin/Mtest.py" ]
-then
- echo "Mtest.py not found, install MonetDB first" >&2
- exit 1
-fi
-
# where compiled modules are to be found
-MOD_PATH="${builddir}/src/.libs:${builddir}/src:${srcdir}/src:`${MONETDB_PREFIX}/bin/monetdb-config
--modpath`"
+MOD_PATH="${builddir}/src/monetdb4/.libs:${builddir}/src/monetdb4:${srcdir}/src/monetdb4:`monetdb4-config
--modpath`"
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
@@ -43,7 +35,10 @@
fi
# enhance PATH with Msql and MonetDB binaries
-PATH="${MONETDB_PREFIX}/bin:$PATH"
+if [ -s "${builddir}/conf/monetdb-geom-config" ] ; then
+ chmod +x "${builddir}/conf/monetdb-geom-config"
+fi
+PATH="${builddir}/conf:$PATH"
libpath="${MOD_PATH}"
LD_LIBRARY_PATH="${libpath}${LD_LIBRARY_PATH}"
if [ "${uname}" = "Darwin" ] ; then
@@ -61,4 +56,7 @@
# execute the script
# if no arguments, do a recursive test (Mtest.py -r), else pass on the
arguments
-exec Mtest.py --monet_mod_path="$MOD_PATH" --TSTSRCBASE="$srcdir"
--TSTBLDBASE="$builddir" --TSTTRGBASE="${builddir}"
--dbfarm="${builddir}/dbfarm" "[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="`monetdb4-config --sysconfdir`/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]"
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/geom/configure.ag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ag 22 Aug 2007 15:47:23 -0000 1.3
+++ configure.ag 22 Aug 2007 16:23:15 -0000 1.4
@@ -33,6 +33,40 @@
CONFIG_H=geom_config.h
AC_SUBST(CONFIG_H)
+# GEOM_BUILD and GEOM_SOURCE are *only* used for monetdb-geom-config and
RunMserver
+# GEOM_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'`
+GEOM_BUILD=[`pwd`]
+AC_SUBST(GEOM_BUILD)
+
+GEOM_SOURCE=[`(cd $srcdir && pwd)`]
+AC_SUBST(GEOM_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'
# ^^^^^^
@@ -108,6 +142,12 @@
AC_SUBST(GEOS_INCS)
AC_SUBST(GEOS_LIBS)
+dnl provide different versions of (some of) the paths derived above
+QGEOM_BUILD="$GEOM_BUILD"
+AC_SUBST(QGEOM_BUILD)
+QGEOM_SOURCE="$GEOM_SOURCE"
+AC_SUBST(QGEOM_SOURCE)
+
dnl CFLAGS for our code are stricter than what autoconf can cope with.
CFLAGS="$CFLAGS \$(X_CFLAGS)"
-------------------------------------------------------------------------
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
