Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8340/pathfinder
Modified Files:
MonetDB-XQuery.spec.in RunMtest.bat.in RunMtest.in
configure.ag
Log Message:
added minimal monetdb-{template,sql,pathfinder,xml,amdb}-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/pathfinder/RunMtest.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- RunMtest.in 22 Feb 2007 11:34:27 -0000 1.24
+++ RunMtest.in 18 Aug 2007 22:37:59 -0000 1.25
@@ -43,7 +43,10 @@
fi
# enhance PATH with Msql and MonetDB binaries
-PATH="${builddir}/compiler:${builddir}/src/tools:$PATH"
+if [ -s "${builddir}/conf/monetdb-xquery-config" ] ; then
+ chmod +x "${builddir}/conf/monetdb-xquery-config"
+fi
+PATH="${builddir}/conf:${builddir}/compiler:${builddir}/src/tools:$PATH"
libpath="${MOD_PATH}"
LD_LIBRARY_PATH="${libpath}${LD_LIBRARY_PATH}"
if [ "${uname}" = "Darwin" ] ; then
Index: MonetDB-XQuery.spec.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/MonetDB-XQuery.spec.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- MonetDB-XQuery.spec.in 25 Jul 2007 20:46:44 -0000 1.28
+++ MonetDB-XQuery.spec.in 18 Aug 2007 22:37:59 -0000 1.29
@@ -89,7 +89,9 @@
#find $RPM_BUILD_ROOT -name .incs.in | xargs rm
find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
+# cleanup stuff we don't want to install
rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB5
+rm -rf $RPM_BUILD_ROOT%{prefix}/bin/monetdb-xquery-config.bat
# Fixes monet config script
#perl -p -i -e "s|$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{prefix}/bin/monet_config
@@ -113,6 +115,7 @@
%defattr(-,root,root)
%{prefix}/include/pathfinder/*.h
%{_libdir}/libembeddedxq.so
+%{prefix}/bin/monetdb-xquery-config
%changelog
* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/RunMtest.bat.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- RunMtest.bat.in 22 Feb 2007 11:34:27 -0000 1.7
+++ RunMtest.bat.in 18 Aug 2007 22:37:59 -0000 1.8
@@ -27,6 +27,7 @@
set [EMAIL PROTECTED]@\bin;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\compiler;%PATH%
+set PATH=%builddir%\conf;%PATH%
set [EMAIL PROTECTED]@\share\MonetDB\python;%PYTHONPATH%
set [EMAIL PROTECTED]@\share\MonetDB\python;%PYTHONPATH%
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/configure.ag,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- configure.ag 15 Jul 2007 20:47:32 -0000 1.111
+++ configure.ag 18 Aug 2007 22:37:59 -0000 1.112
@@ -38,6 +38,40 @@
CONFIG_H=pf_config.h
AC_SUBST(CONFIG_H)
+# PATHFINDER_BUILD and PATHFINDER_SOURCE are *only* used for
monetdb-xquery-config and RunMserver
+# PATHFINDER_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'`
+PATHFINDER_BUILD=[`pwd`]
+AC_SUBST(PATHFINDER_BUILD)
+
+PATHFINDER_SOURCE=[`(cd $srcdir && pwd)`]
+AC_SUBST(PATHFINDER_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'
# ^^^^^^
@@ -134,12 +168,7 @@
AM_CONDITIONAL(HAVE_MONETDB4, test "x$have_monetdb4" = xyes)
AM_CONDITIONAL(HAVE_MONETDB5, test "x$have_monetdb5" = xyes)
-PATHFINDER_BUILD=[`pwd`]
-AC_SUBST(PATHFINDER_BUILD)
-
-PATHFINDER_SOURCE=[`(cd $srcdir && pwd)`]
-AC_SUBST(PATHFINDER_SOURCE)
-
+dnl provide different versions of the paths derived above
QPATHFINDER_BUILD="$PATHFINDER_BUILD"
XPATHFINDER_BUILD="`$translatepath "$PATHFINDER_BUILD"`"
QXPATHFINDER_BUILD="`echo "$XPATHFINDER_BUILD" | sed 's/\\\\/\\\\\\\\/g'`"
-------------------------------------------------------------------------
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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
