Changeset: 26317c6b8498 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26317c6b8498
Modified Files:
geom/RunMtest.bat.in
geom/RunMtest.in
monetdb5/RunMtest.bat.in
monetdb5/RunMtest.in
pathfinder/RunMtest.bat.in
pathfinder/RunMtest.in
sql/RunMtest.bat.in
sql/RunMtest.in
template/RunMtest.in
Branch: default
Log Message:
even more MOD_PATH clean-up in RunMtest to match the new situation
diffs (180 lines):
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -62,8 +62,6 @@
if not exist %buildbase%\sql\sql\createdb mkdir %buildbase%\sql\sql\createdb
copy /y %srcdir%\..\sql\sql\??_*.sql %buildbase%\sql\sql\createdb
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\compiler\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\compiler
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\scheduler\.libs
@@ -78,12 +76,14 @@
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\crackers
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\rdf\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\rdf
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\xml\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\xml
REM enable auto-loading of modules before `make install`
-if not exist %buildbase%\monetdb5\modules\mal\rdf\autoload mkdir
%buildbase%\monetdb5\modules\mal\rdf\autoload
-copy /y %srcdir%\..\monetdb5\modules\mal\rdf\??_*.mal
%buildbase%\monetdb5\modules\mal\rdf\autoload
-if not exist %buildbase%\monetdb5\modules\atoms\autoload mkdir
%buildbase%\monetdb5\modules\atoms\autoload
-copy /y %srcdir%\..\monetdb5\modules\atoms\??_*.mal
%buildbase%\monetdb5\modules\atoms\autoload
+if not exist %buildbase%\monetdb5\extras\rdf\autoload mkdir
%buildbase%\monetdb5\extras\rdf\autoload
+copy /y %srcdir%\..\monetdb5\extras\rdf\??_*.mal
%buildbase%\monetdb5\extras\rdf\autoload
+if not exist %buildbase%\monetdb5\extras\xml\autoload mkdir
%buildbase%\monetdb5\extras\xml\autoload
+copy /y %srcdir%\..\monetdb5\extras\xml\??_*.mal
%buildbase%\monetdb5\extras\xml\autoload
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -73,7 +73,7 @@
mkdir -p ${buildbase}/sql/sql/createdb
cp -f ${srcdir}/../sql/sql/[0-9][0-9]_*.sql ${buildbase}/sql/sql/createdb/
2>/dev/null
# where compiled monetdb5 modules are to be found
-for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
modules/mal/crackers modules/mal/rdf
+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:"
# enable auto-loading of modules before `make install`
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -13,9 +13,7 @@
set builddir=%buildbase%\monetdb5
set srcdir=@XSOURCE@\monetdb5
-set MOD_PATH=%builddir%\compiler\.libs
-set MOD_PATH=%MOD_PATH%;%builddir%\compiler
-set MOD_PATH=%MOD_PATH%;%builddir%\optimizer\.libs
+set MOD_PATH=%builddir%\optimizer\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\optimizer
set MOD_PATH=%MOD_PATH%;%builddir%\scheduler\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\scheduler
@@ -29,12 +27,14 @@
set MOD_PATH=%MOD_PATH%;%builddir%\extras\crackers
set MOD_PATH=%MOD_PATH%;%builddir%\extras\rdf\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\extras\rdf
+set MOD_PATH=%MOD_PATH%;%builddir%\extras\xml\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\extras\xml
REM enable auto-loading of modules before `make install`
if not exist %builddir%\extras\rdf\autoload mkdir
%builddir%\extras\rdf\autoload
copy /y %srcdir%\extras\rdf\??_*.mal %builddir%\extras\rdf\autoload
-if not exist %builddir%\modules\atoms\autoload mkdir
%builddir%\modules\atoms\autoload
-copy /y %srcdir%\modules\atoms\??_*.mal %builddir%\modules\atoms\autoload
+if not exist %builddir%\extras\xml\autoload mkdir
%builddir%\extras\xml\autoload
+copy /y %srcdir%\extras\xml\??_*.mal %builddir%\extras\xml\autoload
set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -25,7 +25,7 @@
uname=`uname`
# where compiled monetdb5 modules are to be found
-for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf
+for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extra/xml
do
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
# enable auto-loading of modules before `make install`
diff --git a/pathfinder/RunMtest.bat.in b/pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in
+++ b/pathfinder/RunMtest.bat.in
@@ -40,8 +40,6 @@
:skip_4
if not %V% == 5 goto skip_5
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\compiler\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\compiler
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\scheduler\.libs
@@ -56,12 +54,14 @@
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\crackers
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\rdf\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\rdf
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\xml\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\xml
REM enable auto-loading of modules before `make install`
if not exist %buildbase%\monetdb5\extras\rdf\autoload mkdir
%buildbase%\monetdb5\extras\rdf\autoload
copy /y %srcdir%\..\monetdb5\extras\rdf\??_*.mal
%buildbase%\monetdb5\extras\rdf\autoload
-if not exist %buildbase%\monetdb5\modules\atoms\autoload mkdir
%buildbase%\monetdb5\modules\atoms\autoload
-copy /y %srcdir%\..\monetdb5\modules\atoms\??_*.mal
%buildbase%\monetdb5\modules\atoms\autoload
+if not exist %buildbase%\monetdb5\extras\xml\autoload mkdir
%buildbase%\monetdb5\extras\xml\autoload
+copy /y %srcdir%\..\monetdb5\extras\xml\??_*.mal
%buildbase%\monetdb5\extras\xml\autoload
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
diff --git a/pathfinder/RunMtest.in b/pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in
+++ b/pathfinder/RunMtest.in
@@ -57,7 +57,7 @@
;;
5)
# where compiled monetdb5 modules are to be found
-for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf
+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:"
# enable auto-loading of modules before `make install`
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -25,8 +25,6 @@
if not exist %builddir%\sql\createdb mkdir %builddir%\sql\createdb
copy /y %srcdir%\sql\??_*.sql %builddir%\sql\createdb
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\compiler\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\compiler
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\scheduler\.libs
@@ -41,12 +39,14 @@
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\crackers
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\rdf\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\rdf
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\xml\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\xml
REM enable auto-loading of modules before `make install`
if not exist %buildbase%\monetdb5\extras\rdf\autoload mkdir
%buildbase%\monetdb5\extras\rdf\autoload
copy /y %srcdir%\..\monetdb5\extras\rdf\??_*.mal
%buildbase%\monetdb5\extras\rdf\autoload
-if not exist %buildbase%\monetdb5\modules\atoms\autoload mkdir
%buildbase%\monetdb5\modules\atoms\autoload
-copy /y %srcdir%\..\monetdb5\modules\atoms\??_*.mal
%buildbase%\monetdb5\modules\atoms\autoload
+if not exist %buildbase%\monetdb5\extras\xml\autoload mkdir
%buildbase%\monetdb5\extras\xml\autoload
+copy /y %srcdir%\..\monetdb5\extras\xml\??_*.mal
%buildbase%\monetdb5\extras\xml\autoload
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -38,7 +38,7 @@
cp -f ${srcdir}/sql/[0-9][0-9]_*.sql ${builddir}/sql/createdb/ 2>/dev/null
# where compiled monetdb5 modules are to be found
-for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf
+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:"
# enable auto-loading of modules before `make install`
diff --git a/template/RunMtest.in b/template/RunMtest.in
--- a/template/RunMtest.in
+++ b/template/RunMtest.in
@@ -55,7 +55,7 @@
;;
5)
# where compiled monetdb5 modules are to be found
-for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf
+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:"
# enable auto-loading of modules before `make install`
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
