Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16931/buildtools/conf
Modified Files:
conf.bash
Log Message:
enabling also M5 testing for new "geom" module
Index: conf.bash
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/conf.bash,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- conf.bash 19 Aug 2007 10:01:31 -0000 1.42
+++ conf.bash 23 Aug 2007 22:55:08 -0000 1.43
@@ -715,6 +715,16 @@
fi
fi
+if [ "${what}" = "GEOM" ] ; then
+ if [ -x ${SQL_PREFIX}/bin/monetdb-sql-config ] ; then
+ sql_cfg="${SQL_PREFIX}/bin/monetdb-sql-config"
+ elif type -p monetdb-sql-config >/dev/null ; then
+ sql_cfg="monetdb-sql-config"
+ else
+ sql_cfg=""
+ fi
+fi
+
# for convenience: store the complete configure-call in ${what}_CONFIGURE
WHAT_CONFIGURE="${base}/configure ${conf_opts} --prefix=${WHAT_PREFIX}"
if [ "${os}${BITS}" = "Linux64" ] ; then
@@ -726,12 +736,18 @@
case "${what}" in
BUILDTOOLS|MONETDB) ;;
*) MTEST_WHAT="Mtest.py ${mtest_config} --TSTSRCBASE=${base}
--TSTBLDBASE=${WHAT_BUILD} --TSTTRGBASE=${WHAT_PREFIX} ${mtest_modpath}"
+ if [ "${what}" = "GEOM" -a "${sql_cfg}" ] ; then
+ MTEST_WHAT="${MTEST_WHAT}:`${sql_cfg} --modpath4`"
+ fi
echo " MTEST_${what}=${MTEST_WHAT}"
eval "MTEST_${what}='${MTEST_WHAT}'; export MTEST_${what}"
eval "alias Mtest_${wh_t}='${MTEST_WHAT}'"
eval "alias Mtest_${wh_t}"
- if [ "${what}" = "SQL" -a "${MONETDB5_PREFIX}" ] ; then
+ if [ \( "${what}" = "SQL" -o "${what}" = "GEOM" \) -a
"${MONETDB5_PREFIX}" ] ; then
MTEST_WHAT="Mtest.py ${monet5_config} --TSTSRCBASE=${base}
--TSTBLDBASE=${WHAT_BUILD} --TSTTRGBASE=${WHAT_PREFIX}
--monet_mod_path=${WHAT_PREFIX}/${libdir}/MonetDB5:${WHAT_PREFIX}/${libdir}/MonetDB5/lib:`${MONETDB5_PREFIX}/bin/monetdb5-config
--modpath`"
+ if [ "${what}" = "GEOM" -a "${sql_cfg}" ] ; then
+ MTEST_WHAT="${MTEST_WHAT}:`${sql_cfg} --modpath5`"
+ fi
echo " MTEST_${what}5=${MTEST_WHAT}"
eval "MTEST_${what}5='${MTEST_WHAT}'; export MTEST_${what}5"
eval "alias Mtest_${wh_t}5='${MTEST_WHAT}'"
@@ -740,7 +756,7 @@
MTEST_WHAT='' ; unset MTEST_WHAT
eval "alias Mapprove_${wh_t}='Mapprove.py ${mtest_config}
--TSTSRCBASE=${base} --TSTBLDBASE=${WHAT_BUILD} --TSTTRGBASE=${WHAT_PREFIX}'"
eval "alias Mapprove_${wh_t}"
- if [ "${what}" = "SQL" -a "${MONETDB5_PREFIX}" ] ; then
+ if [ \( "${what}" = "SQL" -o "${what}" = "GEOM" \) -a
"${MONETDB5_PREFIX}" ] ; then
eval "alias Mapprove_${wh_t}5='Mapprove.py ${monet5_config}
--TSTSRCBASE=${base} --TSTBLDBASE=${WHAT_BUILD} --TSTTRGBASE=${WHAT_PREFIX}'"
eval "alias Mapprove_${wh_t}5"
fi
-------------------------------------------------------------------------
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-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
