Changeset: 4ae76a341924 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ae76a341924
Modified Files:
Branch: default
Log Message:
merged with Jun2010
diffs (58 lines):
diff -r a6d6b6c36101 -r 4ae76a341924 geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in Sat May 29 12:46:46 2010 +0200
+++ b/geom/RunMtest.bat.in Sat May 29 16:49:13 2010 +0200
@@ -36,6 +36,10 @@
set MOD_PATH=%builddir%\src\monetdb%V%;%MOD_PATH%
set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
+REM enable auto-loading of modules before `make install`
+if not exist %builddir%\src\monetdb%V%\autoload mkdir
%builddir%\src\monetdb%V%\autoload
+copy /y %srcdir%\src\monetdb%V%\??_*.mal %builddir%\src\monetdb%V%\autoload
+
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\conf;%PATH%
diff -r a6d6b6c36101 -r 4ae76a341924 geom/RunMtest.in
--- a/geom/RunMtest.in Sat May 29 12:46:46 2010 +0200
+++ b/geom/RunMtest.in Sat May 29 16:49:13 2010 +0200
@@ -40,9 +40,12 @@
for d in src/monetdb$V
do
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ # enable auto-loading of modules before `make install`
+ mkdir -p ${builddir}/d/autoload
+ cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/
done
+MOD_PATH="${MOD_PATH}`monetdb-sql-config --modpath$V`:"
MOD_PATH="${MOD_PATH}`monetdb$V-config --modpath`"
-MOD_PATH="${MOD_PATH}:`monetdb-sql-config --modpath$V`"
# make sure scripts are executable
for x in "${builddir}/conf/${pkg}-config"
diff -r a6d6b6c36101 -r 4ae76a341924 sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in Sat May 29 12:46:46 2010 +0200
+++ b/sql/RunMtest.bat.in Sat May 29 16:49:13 2010 +0200
@@ -20,6 +20,10 @@
set MOD_PATH=%builddir%\src\backends\monet5;%MOD_PATH%
set MOD_PATH=%builddir%\src\backends\monet5\.libs;%MOD_PATH%
+REM enable auto-loading of modules before `make install`
+if not exist %builddir%\src\backends\monet5\autoload mkdir
%builddir%\src\backends\monet5\autoload
+copy /y %srcdir%\src\backends\monet5\??_*.mal
%builddir%\src\backends\monet5\autoload
+
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\src\server;%PATH%
set PATH=%builddir%\src\storage\bat;%PATH%
diff -r a6d6b6c36101 -r 4ae76a341924 sql/RunMtest.in
--- a/sql/RunMtest.in Sat May 29 12:46:46 2010 +0200
+++ b/sql/RunMtest.in Sat May 29 16:49:13 2010 +0200
@@ -27,6 +27,9 @@
for d in src/backends/monet5
do
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ # enable auto-loading of modules before `make install`
+ mkdir -p ${builddir}/d/autoload
+ cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/
done
MOD_PATH="${MOD_PATH}`monetdb5-config --modpath`"
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
