Changeset: 5aee7ac57321 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5aee7ac57321
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:
monetdb5/tools has been moved to tools/mserver; update PATHs in RunMtest*in
accordingly
diffs (176 lines):
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -46,6 +46,7 @@
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mnetcdf
set MOD_PATH=%MOD_PATH%;%srcdir%\..\monetdb4\scripts\tools
+set PATH=%buildbase%\monetdb4\tools;%PATH%
set cfg=%buildbase%\monetdb4\conf\MonetDB.conf
:skip_4
@@ -89,10 +90,11 @@
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 PATH=%buildbase%\tools\mserver;%PATH%
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
-set
PATH=%buildbase%\monetdb%V%\tools;%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -58,6 +58,7 @@
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
done
MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
+PATH="${buildbase}/monetdb4/tools:$PATH"
cfg="${buildbase}/monetdb4/conf/MonetDB.conf"
;;
5)
@@ -80,13 +81,14 @@
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
done
+PATH="${buildbase}/tools/mserver:$PATH"
cfg="${buildbase}/monetdb5/misc/monetdb5.conf"
;;
esac
# enhance various paths to find our stuff
libpath="${MOD_PATH}"
-PATH="${buildbase}/monetdb$V/tools:${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
+PATH="${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -40,7 +40,7 @@
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\mal;%PATH%
-set PATH=%builddir%\tools;%PATH%
+set PATH=%buildbase%\tools\mserver;%PATH%
set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -34,7 +34,7 @@
done
# enhance various paths to find our stuff
-binpath="${builddir}/tools:${srcdir}/tools:${buildbase}/clients/mapiclient:${buildbase}/testing"
+binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/mal/.libs"
PATH="${binpath}:$PATH"
diff --git a/pathfinder/RunMtest.bat.in b/pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in
+++ b/pathfinder/RunMtest.bat.in
@@ -36,6 +36,7 @@
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mnetcdf
set MOD_PATH=%MOD_PATH%;%srcdir%\..\monetdb4\scripts\tools
+set PATH=%buildbase%\monetdb4\tools;%PATH%
set cfg=%buildbase%\monetdb4\conf\MonetDB.conf
:skip_4
@@ -63,10 +64,11 @@
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 PATH=%buildbase%\tools\mserver;%PATH%
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
-set
PATH=%buildbase%\monetdb%V%\tools;%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\extras\compiler;%PATH%
diff --git a/pathfinder/RunMtest.in b/pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in
+++ b/pathfinder/RunMtest.in
@@ -53,6 +53,7 @@
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
done
MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
+PATH="${buildbase}/monetdb4/tools:$PATH"
cfg="${buildbase}/monetdb4/conf/MonetDB.conf"
;;
5)
@@ -64,12 +65,13 @@
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
done
+PATH="${buildbase}/tools/mserver:$PATH"
cfg="${buildbase}/monetdb5/misc/monetdb5.conf"
;;
esac
# enhance various paths to find our stuff
-binpath="${builddir}/compiler:${builddir}/tools:${buildbase}/monetdb$V/tools:${buildbase}/clients/mapiclient:${buildbase}/testing"
+binpath="${builddir}/compiler:${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/testing"
libpath="${MOD_PATH}"
PATH="${binpath}:$PATH"
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -54,7 +54,7 @@
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
-set
PATH=%buildbase%\monetdb5\tools;%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\tools\mserver;%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\server;%PATH%
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -49,7 +49,7 @@
cfg="${buildbase}/monetdb5/misc/monetdb5.conf"
# enhance various paths to find our stuff
-binpath="${builddir}/backends/monet5:${buildbase}/monetdb5/tools:${buildbase}/clients/mapiclient:${buildbase}/testing"
+binpath="${builddir}/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/server/.libs"
PATH="${binpath}:$PATH"
diff --git a/template/RunMtest.in b/template/RunMtest.in
--- a/template/RunMtest.in
+++ b/template/RunMtest.in
@@ -51,6 +51,7 @@
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
done
MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
+PATH="${buildbase}/monetdb4/tools:$PATH"
cfg="${buildbase}/monetdb4/conf/MonetDB.conf"
;;
5)
@@ -62,13 +63,14 @@
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
done
+PATH="${buildbase}/tools/mserver:$PATH"
cfg="${buildbase}/monetdb5/misc/monetdb5.conf"
;;
esac
# enhance various paths to find our stuff
libpath="${MOD_PATH}"
-PATH="${buildbase}/monetdb$V/tools:${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
+PATH="${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
