Changeset: 1dcb796efcc8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1dcb796efcc8
Modified Files:
clients/RunMtest.bat.in
clients/RunMtest.in
geom/RunMtest.bat.in
geom/RunMtest.in
monetdb4/RunMtest.bat.in
monetdb4/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: Mar2011
Log Message:
RunMtest: set PYTHONPATH for Python MAPI library
diffs (156 lines):
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -19,7 +19,7 @@
set PATH=%builddir%\mapiclient;%PATH%
set PATH=%builddir%\mapilib;%PATH%
-set
PYTHONPATH=%srcdir%\python;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%builddir%\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
diff --git a/clients/RunMtest.in b/clients/RunMtest.in
--- a/clients/RunMtest.in
+++ b/clients/RunMtest.in
@@ -36,7 +36,7 @@
PATH="${builddir}/mapiclient:${builddir}/examples/C:${buildbase}/testing:$PATH"
export PATH
-PYTHONPATH="${srcdir}/python:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${builddir}/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -101,7 +101,7 @@
rem to find geos_c.dll
set PATH=%GEOS%\bin;%PATH%
-set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -93,7 +93,7 @@
PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
diff --git a/monetdb4/RunMtest.bat.in b/monetdb4/RunMtest.bat.in
--- a/monetdb4/RunMtest.bat.in
+++ b/monetdb4/RunMtest.bat.in
@@ -31,7 +31,7 @@
set PATH=%builddir%\monet;%PATH%
set PATH=%builddir%\tools;%PATH%
-set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
diff --git a/monetdb4/RunMtest.in b/monetdb4/RunMtest.in
--- a/monetdb4/RunMtest.in
+++ b/monetdb4/RunMtest.in
@@ -39,7 +39,7 @@
PATH="${binpath}:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -42,7 +42,7 @@
set PATH=%builddir%\mal;%PATH%
set PATH=%buildbase%\tools\mserver;%PATH%
-set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -41,7 +41,7 @@
PATH="${binpath}:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
diff --git a/pathfinder/RunMtest.bat.in b/pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in
+++ b/pathfinder/RunMtest.bat.in
@@ -74,7 +74,7 @@
set PATH=%builddir%\extras\compiler;%PATH%
set PATH=%builddir%\tools;%PATH%
-set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
diff --git a/pathfinder/RunMtest.in b/pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in
+++ b/pathfinder/RunMtest.in
@@ -78,7 +78,7 @@
PATH="${binpath}:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -61,7 +61,7 @@
set PATH=%builddir%\storage\bat;%PATH%
set PATH=%builddir%\common;%PATH%
-set
PYTHONPATH=%builddir%\backends\python\monet5;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%builddir%\backends\python\monet5;%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -56,7 +56,7 @@
PATH="${binpath}:$PATH"
export PATH
-PYTHONPATH="${builddir}/backends/python/monet5/.libs:${builddir}/backends/python/monet5:${buildbase}/testing:${srcdir}/../testing:$PYTHONPATH"
+PYTHONPATH="${builddir}/backends/python/monet5/.libs:${builddir}/backends/python/monet5:${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:$PYTHONPATH"
export PYTHONPATH
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
diff --git a/template/RunMtest.in b/template/RunMtest.in
--- a/template/RunMtest.in
+++ b/template/RunMtest.in
@@ -74,7 +74,7 @@
PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
