Changeset: 587757e256b1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=587757e256b1
Modified Files:
MonetDB4/RunMapprove.bat.in
MonetDB4/RunMapprove.in
MonetDB4/RunMtest.bat.in
MonetDB4/RunMtest.in
MonetDB5/RunMapprove.bat.in
MonetDB5/RunMapprove.in
MonetDB5/RunMtest.bat.in
MonetDB5/RunMtest.in
clients/RunMapprove.bat.in
clients/RunMapprove.in
clients/RunMtest.bat.in
clients/RunMtest.in
geom/RunMapprove.bat.in
geom/RunMapprove.in
geom/RunMserver.bat.in
geom/RunMtest.bat.in
geom/RunMtest.in
java/RunMapprove.bat.in
java/RunMapprove.in
java/RunMtest.bat.in
java/RunMtest.in
pathfinder/RunMapprove.bat.in
pathfinder/RunMapprove.in
pathfinder/RunMserver.bat.in
pathfinder/RunMtest.bat.in
pathfinder/RunMtest.in
sql/RunMapprove.bat.in
sql/RunMapprove.in
sql/RunMserver.bat.in
sql/RunMtest.bat.in
sql/RunMtest.in
template/RunMapprove.in
template/RunMtest.in
Branch: default
Log Message:
remove obsolete treatment of */conf/monetdb*-config{,bat}.in
*/conf/monetdb*-config{,bat}.in are gone;
hence, no need to make them executeable or add <builddir>/conf/ to PATH
diffs (truncated from 484 to 300 lines):
diff -r 2f6b2b373775 -r 587757e256b1 MonetDB4/RunMapprove.bat.in
--- a/MonetDB4/RunMapprove.bat.in Sun Jan 09 16:31:29 2011 +0100
+++ b/MonetDB4/RunMapprove.bat.in Sun Jan 09 16:50:04 2011 +0100
@@ -13,8 +13,6 @@
set builddir=%buildbase%\MonetDB4
set srcd...@xsource@\MonetDB4
-set PATH=%builddir%\conf;%PATH%
-
set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
diff -r 2f6b2b373775 -r 587757e256b1 MonetDB4/RunMapprove.in
--- a/MonetDB4/RunMapprove.in Sun Jan 09 16:31:29 2011 +0100
+++ b/MonetDB4/RunMapprove.in Sun Jan 09 16:50:04 2011 +0100
@@ -23,10 +23,6 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-# enhance PATH to find ${pkg}-config
-PATH="${builddir}/conf:$PATH"
-export PATH
-
PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 2f6b2b373775 -r 587757e256b1 MonetDB4/RunMtest.bat.in
--- a/MonetDB4/RunMtest.bat.in Sun Jan 09 16:31:29 2011 +0100
+++ b/MonetDB4/RunMtest.bat.in Sun Jan 09 16:50:04 2011 +0100
@@ -28,7 +28,6 @@
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\src\monet;%PATH%
set PATH=%builddir%\src\tools;%PATH%
-set PATH=%builddir%\conf;%PATH%
set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
diff -r 2f6b2b373775 -r 587757e256b1 MonetDB4/RunMtest.in
--- a/MonetDB4/RunMtest.in Sun Jan 09 16:31:29 2011 +0100
+++ b/MonetDB4/RunMtest.in Sun Jan 09 16:50:04 2011 +0100
@@ -31,16 +31,8 @@
done
MOD_PATH="${MOD_PATH}${srcdir}/scripts/tools"
-# make sure scripts are executable
-for x in "${builddir}/conf/${pkg}-config"
-do
- if [ -s $x ] ; then
- chmod +x $x
- fi
-done
-
# enhance various paths to find our stuff
-binpath="${builddir}/conf:${builddir}/src/tools"
+binpath="${builddir}/src/tools"
libpath="${MOD_PATH}:${builddir}/src/monet/.libs"
PATH="${binpath}:$PATH"
diff -r 2f6b2b373775 -r 587757e256b1 MonetDB5/RunMapprove.bat.in
--- a/MonetDB5/RunMapprove.bat.in Sun Jan 09 16:31:29 2011 +0100
+++ b/MonetDB5/RunMapprove.bat.in Sun Jan 09 16:50:04 2011 +0100
@@ -13,8 +13,6 @@
set builddir=%buildbase%\MonetDB5
set srcd...@xsource@\MonetDB5
-set PATH=%builddir%\conf;%PATH%
-
set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
diff -r 2f6b2b373775 -r 587757e256b1 MonetDB5/RunMapprove.in
--- a/MonetDB5/RunMapprove.in Sun Jan 09 16:31:29 2011 +0100
+++ b/MonetDB5/RunMapprove.in Sun Jan 09 16:50:04 2011 +0100
@@ -23,10 +23,6 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-# enhance PATH to find ${pkg}-config
-PATH="${builddir}/conf:$PATH"
-export PATH
-
PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 2f6b2b373775 -r 587757e256b1 MonetDB5/RunMtest.bat.in
--- a/MonetDB5/RunMtest.bat.in Sun Jan 09 16:31:29 2011 +0100
+++ b/MonetDB5/RunMtest.bat.in Sun Jan 09 16:50:04 2011 +0100
@@ -39,7 +39,6 @@
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\src\mal;%PATH%
set PATH=%builddir%\src\tools;%PATH%
-set PATH=%builddir%\conf;%PATH%
set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
diff -r 2f6b2b373775 -r 587757e256b1 MonetDB5/RunMtest.in
--- a/MonetDB5/RunMtest.in Sun Jan 09 16:31:29 2011 +0100
+++ b/MonetDB5/RunMtest.in Sun Jan 09 16:50:04 2011 +0100
@@ -33,16 +33,8 @@
cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/ 2>/dev/null
done
-# make sure scripts are executable
-for x in "${builddir}/conf/${pkg}-config"
-do
- if [ -s $x ] ; then
- chmod +x $x
- fi
-done
-
# enhance various paths to find our stuff
-binpath="${builddir}/conf:${builddir}/src/tools:${srcdir}/src/tools"
+binpath="${builddir}/src/tools:${srcdir}/src/tools"
libpath="${MOD_PATH}:${builddir}/src/mal/.libs"
PATH="${binpath}:$PATH"
diff -r 2f6b2b373775 -r 587757e256b1 clients/RunMapprove.bat.in
--- a/clients/RunMapprove.bat.in Sun Jan 09 16:31:29 2011 +0100
+++ b/clients/RunMapprove.bat.in Sun Jan 09 16:50:04 2011 +0100
@@ -13,8 +13,6 @@
set builddir=%buildbase%\clients
set srcd...@xsource@\clients
-set PATH=%builddir%\conf;%PATH%
-
set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
diff -r 2f6b2b373775 -r 587757e256b1 clients/RunMapprove.in
--- a/clients/RunMapprove.in Sun Jan 09 16:31:29 2011 +0100
+++ b/clients/RunMapprove.in Sun Jan 09 16:50:04 2011 +0100
@@ -23,10 +23,6 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-# enhance PATH to find ${pkg}-config
-PATH="${builddir}/conf:$PATH"
-export PATH
-
PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 2f6b2b373775 -r 587757e256b1 clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in Sun Jan 09 16:31:29 2011 +0100
+++ b/clients/RunMtest.bat.in Sun Jan 09 16:50:04 2011 +0100
@@ -13,7 +13,6 @@
set builddir=%buildbase%\clients
set srcd...@xsource@\clients
-set PATH=%builddir%\conf;%PATH%
set PATH=%builddir%\src\mapiclient;%PATH%
set PATH=%builddir%\src\mapilib;%PATH%
set PATH=%builddir%\src\python;%PATH%
diff -r 2f6b2b373775 -r 587757e256b1 clients/RunMtest.in
--- a/clients/RunMtest.in Sun Jan 09 16:31:29 2011 +0100
+++ b/clients/RunMtest.in Sun Jan 09 16:50:04 2011 +0100
@@ -25,7 +25,7 @@
uname=`uname`
# make sure scripts are executable
-for x in "${builddir}/conf/${pkg}-config" "${builddir}/src/python/mclient.py"
+for x in "${builddir}/src/python/mclient.py"
do
if [ -s $x ] ; then
chmod +x $x
@@ -33,7 +33,7 @@
done
# enhance various paths to find our stuff
-PATH="${builddir}/conf:${builddir}/src/mapiclient:${builddir}/src/python:$PATH"
+PATH="${builddir}/src/mapiclient:${builddir}/src/python:$PATH"
export PATH
PYTHONPATH="${srcdir}/src/python:${buildbase}/testing/src:${PYTHONPATH}"
diff -r 2f6b2b373775 -r 587757e256b1 geom/RunMapprove.bat.in
--- a/geom/RunMapprove.bat.in Sun Jan 09 16:31:29 2011 +0100
+++ b/geom/RunMapprove.bat.in Sun Jan 09 16:50:04 2011 +0100
@@ -18,8 +18,6 @@
set builddir=%buildbase%\geom
set srcd...@xsource@\geom
-set PATH=%builddir%\conf;%PATH%
-
set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
diff -r 2f6b2b373775 -r 587757e256b1 geom/RunMapprove.in
--- a/geom/RunMapprove.in Sun Jan 09 16:31:29 2011 +0100
+++ b/geom/RunMapprove.in Sun Jan 09 16:50:04 2011 +0100
@@ -33,10 +33,6 @@
esac
done
-# enhance PATH to find ${pkg}-config
-PATH="${builddir}/conf:$PATH"
-export PATH
-
PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 2f6b2b373775 -r 587757e256b1 geom/RunMserver.bat.in
--- a/geom/RunMserver.bat.in Sun Jan 09 16:31:29 2011 +0100
+++ b/geom/RunMserver.bat.in Sun Jan 09 16:50:04 2011 +0100
@@ -30,7 +30,6 @@
set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
set PATH=%MOD_PATH%;%PATH%
-set PATH=%builddir%\conf;%PATH%
rem to find geos_c.dll
set PATH=%GEOS%\bin;%PATH%
diff -r 2f6b2b373775 -r 587757e256b1 geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in Sun Jan 09 16:31:29 2011 +0100
+++ b/geom/RunMtest.bat.in Sun Jan 09 16:50:04 2011 +0100
@@ -42,7 +42,6 @@
copy /y %srcdir%\src\monetdb%V%\??_*.mal %builddir%\src\monetdb%V%\autoload
set PATH=%MOD_PATH%;%PATH%
-set PATH=%builddir%\conf;%PATH%
rem to find geos_c.dll
set PATH=%GEOS%\bin;%PATH%
diff -r 2f6b2b373775 -r 587757e256b1 geom/RunMtest.in
--- a/geom/RunMtest.in Sun Jan 09 16:31:29 2011 +0100
+++ b/geom/RunMtest.in Sun Jan 09 16:50:04 2011 +0100
@@ -48,21 +48,9 @@
MOD_PATH="${MOD_PATH}`monetdb-sql-config --modpath$V`:"
MOD_PATH="${MOD_PATH}`monetdb$V-config --modpath`"
-# make sure scripts are executable
-for x in "${builddir}/conf/${pkg}-config"
-do
- if [ -s $x ] ; then
- chmod +x $x
- fi
-done
-
# enhance various paths to find our stuff
-binpath="${builddir}/conf"
libpath="${MOD_PATH}"
-PATH="${binpath}:$PATH"
-export PATH
-
PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 2f6b2b373775 -r 587757e256b1 java/RunMapprove.bat.in
--- a/java/RunMapprove.bat.in Sun Jan 09 16:31:29 2011 +0100
+++ b/java/RunMapprove.bat.in Sun Jan 09 16:50:04 2011 +0100
@@ -13,8 +13,6 @@
set builddir=%buildbase%\java
set srcd...@xsource@\java
-set PATH=%builddir%\conf;%PATH%
-
set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
diff -r 2f6b2b373775 -r 587757e256b1 java/RunMapprove.in
--- a/java/RunMapprove.in Sun Jan 09 16:31:29 2011 +0100
+++ b/java/RunMapprove.in Sun Jan 09 16:50:04 2011 +0100
@@ -23,10 +23,6 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-# enhance PATH to find ${pkg}-config
-PATH="${builddir}/conf:$PATH"
-export PATH
-
PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 2f6b2b373775 -r 587757e256b1 java/RunMtest.bat.in
--- a/java/RunMtest.bat.in Sun Jan 09 16:31:29 2011 +0100
+++ b/java/RunMtest.bat.in Sun Jan 09 16:50:04 2011 +0100
@@ -13,8 +13,6 @@
set builddir=%buildbase%\java
set srcd...@xsource@\java
-set PATH=%builddir%\conf;%PATH%
-
set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
REM execute Mtest.py in the source directory
diff -r 2f6b2b373775 -r 587757e256b1 java/RunMtest.in
--- a/java/RunMtest.in Sun Jan 09 16:31:29 2011 +0100
+++ b/java/RunMtest.in Sun Jan 09 16:50:04 2011 +0100
@@ -24,18 +24,6 @@
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
-# make sure scripts are executable
-for x in "${builddir}/conf/${pkg}-config"
-do
- if [ -s $x ] ; then
- chmod +x $x
- fi
-done
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
