Changeset: 9526bb377520 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9526bb377520
Modified Files:
geom/RunMtest.bat.in
geom/RunMtest.in
template/RunMtest.in
Branch: default
Log Message:
Merge with Mar2011 branch.
diffs (140 lines):
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -20,13 +20,13 @@
set MOD_PATH=%builddir%\monetdb%V%\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\monetdb%V%
-set MOD_PATH=%MOD_PATH%;%builddir%\sql
REM enable auto-loading of modules before `make install`
if not exist %builddir%\monetdb%V%\autoload mkdir
%builddir%\monetdb%V%\autoload
copy /y %srcdir%\monetdb%V%\??_*.mal %builddir%\monetdb%V%\autoload
REM enable auto-loading of SQL createdb scripts before `make install`
+set MOD_PATH=%MOD_PATH%;%builddir%\sql
if not exist %builddir%\sql\createdb mkdir %builddir%\sql\createdb
copy /y %srcdir%\sql\??_*.sql %builddir%\sql\createdb
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -37,13 +37,14 @@
# where compiled Geom modules are to be found
for d in monetdb$V
do
- MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ 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/ 2>/dev/null
done
# enable auto-loading of SQL createdb scripts before `make install`
+MOD_PATH="${MOD_PATH}:${builddir}/sql"
mkdir -p ${builddir}/sql/createdb
cp -f ${srcdir}/sql/[0-9][0-9]_*.sql ${builddir}/sql/createdb/ 2>/dev/null
@@ -52,7 +53,7 @@
# where compiled SQL modules are to be found
for d in backends/monet5 backends/monet5/vaults sql
do
- MOD_PATH="${MOD_PATH}${buildbase}/sql/$d/.libs:${buildbase}/sql/$d:"
+ MOD_PATH="${MOD_PATH}:${buildbase}/sql/$d/.libs:${buildbase}/sql/$d"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/sql/$d/autoload
cp -f ${srcdir}/../sql/$d/[0-9][0-9]_*.mal
${buildbase}/sql/$d/autoload/ 2>/dev/null
@@ -63,7 +64,7 @@
# where compiled monetdb5 modules are to be found
for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extras/xml
do
-
MOD_PATH="${MOD_PATH}${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d:"
+
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
@@ -74,6 +75,7 @@
esac
# enhance various paths to find our stuff
+MOD_PATH="${MOD_PATH#:}"
libpath="${MOD_PATH}"
PATH="${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
export PATH
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -27,13 +27,14 @@
# where compiled monetdb5 modules are to be found
for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extras/xml
do
- MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ 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/ 2>/dev/null
done
# enhance various paths to find our stuff
+MOD_PATH="${MOD_PATH#:}"
binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/mal/.libs"
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -27,7 +27,7 @@
# where compiled SQL modules are to be found
for d in backends/monet5 backends/monet5/vaults sql
do
- MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ 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/ 2>/dev/null
@@ -40,7 +40,7 @@
# where compiled monetdb5 modules are to be found
for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extras/xml
do
-
MOD_PATH="${MOD_PATH}${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d:"
+
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
@@ -49,6 +49,7 @@
cfg="${buildbase}/monetdb5/misc/monetdb5.conf"
# enhance various paths to find our stuff
+MOD_PATH="${MOD_PATH#:}"
binpath="${builddir}/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/server/.libs"
diff --git a/template/RunMtest.in b/template/RunMtest.in
--- a/template/RunMtest.in
+++ b/template/RunMtest.in
@@ -37,7 +37,7 @@
# where compiled Pathfinder modules are to be found
for d in src/monetdb$V
do
- MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ MOD_PATH="${MOD_PATH}:${builddir}/$d/.libs:${builddir}/$d"
done
case "$V" in
@@ -45,7 +45,7 @@
# where compiled monetdb5 modules are to be found
for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extras/xml
do
-
MOD_PATH="${MOD_PATH}${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d:"
+
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
@@ -56,6 +56,7 @@
esac
# enhance various paths to find our stuff
+MOD_PATH="${MOD_PATH#:}"
libpath="${MOD_PATH}"
PATH="${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
export PATH
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
