Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8340/sql
Modified Files:
MonetDB-SQL.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/sql/RunMtest.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- RunMtest.in 22 Feb 2007 11:30:47 -0000 1.27
+++ RunMtest.in 18 Aug 2007 22:38:02 -0000 1.28
@@ -51,7 +51,10 @@
fi
# enhance PATH with Msql and MonetDB binaries
-PATH="${builddir}/src/tools:$PATH"
+if [ -s "${builddir}/conf/monetdb-sql-config" ] ; then
+ chmod +x "${builddir}/conf/monetdb-sql-config"
+fi
+PATH="${builddir}/conf:${builddir}/src/tools:$PATH"
libpath="${MOD_PATH}:${builddir}/src/server/.libs"
LD_LIBRARY_PATH="${libpath}${LD_LIBRARY_PATH}"
if [ "${uname}" = "Darwin" ] ; then
Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- MonetDB-SQL.spec.in 26 Jul 2007 14:27:34 -0000 1.48
+++ MonetDB-SQL.spec.in 18 Aug 2007 22:38:01 -0000 1.49
@@ -133,10 +133,14 @@
#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}/MonetDB4/Tests/*
rm -rf $RPM_BUILD_ROOT%{prefix}/lib*/python*/site-packages
rm -rf $RPM_BUILD_ROOT%{prefix}/include/sql
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/MonetDB-SQL.pc
+rm -rf $RPM_BUILD_ROOT%{prefix}/bin/monetdb-sql-config.bat
+# remove the following line, once we add it to %files devel, below
+rm -rf $RPM_BUILD_ROOT%{prefix}/bin/monetdb-sql-config
# Fixes monet config script
#perl -p -i -e "s|$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{prefix}/bin/monet_config
@@ -173,6 +177,8 @@
# %files devel
# %defattr(-,root,root)
# %{_libdir}/pkgconfig/MonetDB-SQL.pc
+# # when activating the following line, don't remove the file during cleanup
above
+# %{prefix}/bin/monetdb-sql-config
%changelog
* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/sql/RunMtest.bat.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- RunMtest.bat.in 22 Feb 2007 11:30:47 -0000 1.19
+++ RunMtest.bat.in 18 Aug 2007 22:38:01 -0000 1.20
@@ -28,6 +28,7 @@
set PATH=%builddir%\src\storage\bat;%PATH%
set PATH=%builddir%\src\common;%PATH%
set PATH=%builddir%\src\tools;%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/sql/configure.ag,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- configure.ag 14 Aug 2007 12:12:46 -0000 1.120
+++ configure.ag 18 Aug 2007 22:38:02 -0000 1.121
@@ -35,7 +35,7 @@
CONFIG_H=sql_config.h
AC_SUBST(CONFIG_H)
-# SQL_BUILD and SQL_SOURCE are *only* used for sql-config and RunMserver
+# SQL_BUILD and SQL_SOURCE are *only* used for monetdb-sql-config and
RunMserver
# SQL_SOURCE is the absolute path name of the source directory
# (srcdir can be relative)
-------------------------------------------------------------------------
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
