Changeset: 9a7f03ac5802 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a7f03ac5802
Modified Files:
MonetDB4/RunMserver.in
MonetDB4/RunMtest.in
MonetDB5/RunMserver.in
MonetDB5/RunMtest.in
geom/RunMserver.bat.in
geom/RunMtest.bat.in
geom/RunMtest.in
pathfinder/RunMserver.bat.in
pathfinder/RunMserver.in
pathfinder/RunMtest.bat.in
pathfinder/RunMtest.in
sql/RunMserver.bat.in
sql/RunMserver.in
sql/RunMtest.bat.in
sql/RunMtest.in
template/RunMtest.in
Branch: default
Log Message:
set proper monet_mod_path for `RunMtest` (`make check`) & `RunMserver`
to find MonetDB modules in the build tree;
also remove use of not longer exisiting monetdb*-config{,.bat} scripts
diffs (truncated from 562 to 300 lines):
diff -r 587757e256b1 -r 9a7f03ac5802 MonetDB4/RunMserver.in
--- a/MonetDB4/RunMserver.in Sun Jan 09 16:50:04 2011 +0100
+++ b/MonetDB4/RunMserver.in Mon Jan 10 08:33:27 2011 +0100
@@ -23,9 +23,9 @@
srcdir=`cd '@Xsrcdir@'; pwd`
uname=`uname`
-# where compiled modules are to be found
-MOD_PATH="${builddir}/src/modules/plain/.libs:${builddir}/src/modules/plain:${srcdir}/src/modules/plain:${builddir}/src/modules/contrib/.libs:${builddir}/src/modules/contrib:${srcdir}/src/modules/contrib:${builddir}/src/modules/calibrator/.libs:${builddir}/src/modules/calibrator:${srcdir}/src/modules/calibrator:${builddir}/src/mapi/.libs:${builddir}/src/mapi:${srcdir}/src/mapi"
-...@have_netcdf_true@
MOD_PATH="${MOD_PATH}:${builddir}/src/modules/mnetcdf/.libs:${builddir}/src/modules/mnetcdf:${srcdir}/src/modules/mnetcdf"
+# where compiled MonetDB4 modules are to be found
+MOD_PATH="${builddir}/src/modules/plain/.libs:${builddir}/src/modules/plain:${builddir}/src/modules/contrib/.libs:${builddir}/src/modules/contrib:${builddir}/src/modules/calibrator/.libs:${builddir}/src/modules/calibrator:${builddir}/src/mapi/.libs:${builddir}/src/mapi"
+...@have_netcdf_true@
MOD_PATH="${MOD_PATH}:${builddir}/src/modules/mnetcdf/.libs:${builddir}/src/modules/mnetcdf"
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
diff -r 587757e256b1 -r 9a7f03ac5802 MonetDB4/RunMtest.in
--- a/MonetDB4/RunMtest.in Sun Jan 09 16:50:04 2011 +0100
+++ b/MonetDB4/RunMtest.in Mon Jan 10 08:33:27 2011 +0100
@@ -24,7 +24,7 @@
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
-# where compiled modules are to be found
+# where compiled MonetDB4 modules are to be found
for d in src/modules/plain src/modules/contrib src/modules/calibrator src/mapi
@HAVE_NETCDF_TRUE@ src/modules/mnetcdf
do
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
diff -r 587757e256b1 -r 9a7f03ac5802 MonetDB5/RunMserver.in
--- a/MonetDB5/RunMserver.in Sun Jan 09 16:50:04 2011 +0100
+++ b/MonetDB5/RunMserver.in Mon Jan 10 08:33:27 2011 +0100
@@ -23,8 +23,8 @@
srcdir=`cd '@Xsrcdir@'; pwd`
uname=`uname`
-# where compiled modules are to be found
-MOD_PATH="${builddir}/src/compiler/.libs:${builddir}/src/compiler:${srcdir}/src/compiler:${builddir}/src/optimizer/.libs:${builddir}/src/optimizer:${srcdir}/src/optimizer:${builddir}/src/scheduler/.libs:${builddir}/src/scheduler:${srcdir}/src/scheduler:${builddir}/src/modules/atoms/.libs:${builddir}/src/modules/atoms:${srcdir}/src/modules/atoms:${builddir}/src/modules/kernel/.libs:${builddir}/src/modules/kernel:${srcdir}/src/modules/kernel:${builddir}/src/modules/mal/.libs:${builddir}/src/modules/mal:${srcdir}/src/modules/mal"
+# where compiled MonetDB5 modules are to be found
+MOD_PATH="${builddir}/src/compiler/.libs:${builddir}/src/compiler:${builddir}/src/optimizer/.libs:${builddir}/src/optimizer:${builddir}/src/scheduler/.libs:${builddir}/src/scheduler:${builddir}/src/modules/atoms/.libs:${builddir}/src/modules/atoms:${builddir}/src/modules/kernel/.libs:${builddir}/src/modules/kernel:${builddir}/src/modules/mal/.libs:${builddir}/src/modules/mal"
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
diff -r 587757e256b1 -r 9a7f03ac5802 MonetDB5/RunMtest.in
--- a/MonetDB5/RunMtest.in Sun Jan 09 16:50:04 2011 +0100
+++ b/MonetDB5/RunMtest.in Mon Jan 10 08:33:27 2011 +0100
@@ -24,7 +24,7 @@
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
-# where compiled modules are to be found
+# where compiled MonetDB5 modules are to be found
for d in src/compiler src/optimizer src/scheduler src/modules/atoms
src/modules/kernel src/modules/mal src/modules/mal/crackers src/modules/mal/rdf
do
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
diff -r 587757e256b1 -r 9a7f03ac5802 geom/RunMserver.bat.in
--- a/geom/RunMserver.bat.in Sun Jan 09 16:50:04 2011 +0100
+++ b/geom/RunMserver.bat.in Mon Jan 10 08:33:27 2011 +0100
@@ -14,20 +14,45 @@
set monetdb5_pref...@xmonetdb5_prefix@
set sql_pref...@xsql_prefix@
-if %V% == 4 call "%monetdb4_prefix%\bin\monetdb4-config.bat" --internal
-if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
-call "%sql_prefix%\bin\monetdb-sql-config.bat" --internal
-
set buildba...@build@
set builddir=%buildbase%\geom
-set MOD_PATH=%modpath%
-if %V% == 4 set MOD_PATH=%modpath4%;%MOD_PATH%
-if %V% == 5 set MOD_PATH=%modpath5%;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb%V%\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\monetdb%V%
+set MOD_PATH=%MOD_PATH%;%builddir%\src\sql
-set MOD_PATH=%builddir%\src\sql;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb%V%;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
+if not %V% == 4 goto skip_4
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\plain\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\plain
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\contrib\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\contrib
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\calibrator\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\calibrator
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\mapi\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\mapi
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\mnetcdf\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\mnetcdf
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\scripts
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\scripts\tools
+:skip_4
+
+if not %V == 5 goto skip_5
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\src\backends\monet5\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\src\backends\monet5\.libs
+
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\compiler\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\compiler
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\optimizer\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\optimizer
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\scheduler\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\scheduler
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\atoms\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\atoms
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\kernel\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\kernel
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\mal\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\mal
+:skip_5
set PATH=%MOD_PATH%;%PATH%
diff -r 587757e256b1 -r 9a7f03ac5802 geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in Sun Jan 09 16:50:04 2011 +0100
+++ b/geom/RunMtest.bat.in Mon Jan 10 08:33:27 2011 +0100
@@ -20,27 +20,66 @@
set monetdb5_pref...@xmonetdb5_prefix@
set sql_pref...@xsql_prefix@
-if %V% == 4 call "%monetdb4_prefix%\bin\monetdb4-config.bat" --internal
-if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
-call "%sql_prefix%\bin\monetdb-sql-config.bat" --internal
-
set pkg=monetdb-geom
set buildba...@xbuild@
set builddir=%buildbase%\geom
set srcd...@xsource@\geom
-set MOD_PATH=%modpath%
-if %V% == 4 set MOD_PATH=%modpath4%;%MOD_PATH%
-if %V% == 5 set MOD_PATH=%modpath5%;%MOD_PATH%
-
-set MOD_PATH=%builddir%\src\sql;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb%V%;%MOD_PATH%
-set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb%V%\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\monetdb%V%
+set MOD_PATH=%MOD_PATH%;%builddir%\src\sql
REM enable auto-loading of modules before `make install`
if not exist %builddir%\src\monetdb%V%\autoload mkdir
%builddir%\src\monetdb%V%\autoload
copy /y %srcdir%\src\monetdb%V%\??_*.mal %builddir%\src\monetdb%V%\autoload
+if not %V% == 4 goto skip_4
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\plain\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\plain
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\contrib\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\contrib
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\calibrator\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\calibrator
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\mapi\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\mapi
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\mnetcdf\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\mnetcdf
+set MOD_PATH=%MOD_PATH%;%srcdir%\..\MonetDB4\scripts\tools
+:skip_4
+
+if not %V% == 5 goto skip_5
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\src\backends\monet5\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\src\backends\monet5
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\src\sql
+
+REM enable auto-loading of modules before `make install`
+if not exist %buildbase%\sql\src\backends\monet5\autoload mkdir
%buildbase%\sql\src\backends\monet5\autoload
+copy /y %srcdir%\..\sql\src\backends\monet5\??_*.mal
%buildbase%\sql\src\backends\monet5\autoload
+
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\compiler\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\compiler
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\optimizer\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\optimizer
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\scheduler\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\scheduler
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\atoms\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\atoms
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\kernel\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\kernel
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\mal\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\mal
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\mal\crackers\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\mal\crackers
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\mal\rdf\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB5\src\modules\mal\rdf
+
+REM enable auto-loading of modules before `make install`
+if not exist %buildbase%\MonetDB5\src\modules\mal\rdf\autoload mkdir
%buildbase%\MonetDB5\src\modules\mal\rdf\autoload
+copy /y %srcdir%\..\MonetDB5\src\modules\mal\rdf\??_*.mal
%buildbase%\MonetDB5\src\modules\mal\rdf\autoload
+if not exist %buildbase%\MonetDB5\src\modules\atoms\autoload mkdir
%buildbase%\MonetDB5\src\modules\atoms\autoload
+copy /y %srcdir%\..\MonetDB5\src\modules\atoms\??_*.mal
%buildbase%\MonetDB5\src\modules\atoms\autoload
+:skip_5
+
set PATH=%MOD_PATH%;%PATH%
rem to find geos_c.dll
diff -r 587757e256b1 -r 9a7f03ac5802 geom/RunMtest.in
--- a/geom/RunMtest.in Sun Jan 09 16:50:04 2011 +0100
+++ b/geom/RunMtest.in Mon Jan 10 08:33:27 2011 +0100
@@ -37,7 +37,7 @@
esac
done
-# where compiled modules are to be found
+# where compiled Geom modules are to be found
for d in src/monetdb$V
do
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
@@ -45,8 +45,35 @@
mkdir -p ${builddir}/$d/autoload
cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/ 2>/dev/null
done
-MOD_PATH="${MOD_PATH}`monetdb-sql-config --modpath$V`:"
-MOD_PATH="${MOD_PATH}`monetdb$V-config --modpath`"
+
+case "$V" in
+4)
+# where compiled MonetDB4 modules are to be found
+for d in src/modules/plain src/modules/contrib src/modules/calibrator src/mapi
@HAVE_NETCDF_TRUE@ src/modules/mnetcdf
+do
+ MOD_PATH="${MOD_PATH}${buildbase}/MonetDB4/$d/.libs:${builddir}/$d:"
+done
+MOD_PATH="${MOD_PATH}${srcdir}/../MonetDB4/scripts/tools"
+;;
+5)
+# where compiled SQL modules are to be found
+for d in src/backends/monet5 src/sql
+do
+ MOD_PATH="${MOD_PATH}${buildbase}/sql/$d/.libs:${builddir}/$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
+done
+# where compiled MonetDB5 modules are to be found
+for d in src/compiler src/optimizer src/scheduler src/modules/atoms
src/modules/kernel src/modules/mal src/modules/mal/crackers src/modules/mal/rdf
+do
+ MOD_PATH="${MOD_PATH}${buildbase}/MonetDB5/$d/.libs:${builddir}/$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
+done
+;;
+esac
# enhance various paths to find our stuff
libpath="${MOD_PATH}"
diff -r 587757e256b1 -r 9a7f03ac5802 pathfinder/RunMserver.bat.in
--- a/pathfinder/RunMserver.bat.in Sun Jan 09 16:50:04 2011 +0100
+++ b/pathfinder/RunMserver.bat.in Mon Jan 10 08:33:27 2011 +0100
@@ -4,16 +4,26 @@
set monetdb4_pref...@xmonetdb4_prefix@
-call "%monetdb4_prefix%\bin\monetdb4-config.bat" --internal
-
set buildba...@xbuild@
set builddir=%buildbase%\pathfinder
-set MOD_PATH=%modpath%
-set MOD_PATH=%builddir%\modules\pftijah;%MOD_PATH%
-set MOD_PATH=%builddir%\modules\pftijah\.libs;%MOD_PATH%
-set MOD_PATH=%builddir%\runtime;%MOD_PATH%
-set MOD_PATH=%builddir%\runtime\.libs;%MOD_PATH%
+set MOD_PATH=%builddir%\runtime\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\runtime
+set MOD_PATH=%MOD_PATH%;%builddir%\modules\pftijah\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\modules\pftijah
+
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\plain\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\plain
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\contrib\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\contrib
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\calibrator\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\calibrator
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\mapi\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\mapi
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\mnetcdf\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\src\modules\mnetcdf
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\scripts
+set MOD_PATH=%MOD_PATH%;%buildbase%\MonetDB4\scripts\tools
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\compiler;%PATH%
diff -r 587757e256b1 -r 9a7f03ac5802 pathfinder/RunMserver.in
--- a/pathfinder/RunMserver.in Sun Jan 09 16:50:04 2011 +0100
+++ b/pathfinder/RunMserver.in Mon Jan 10 08:33:27 2011 +0100
@@ -19,7 +19,11 @@
buildba...@qxbuild@
builddir="${buildbase}/pathfinder"
-# where compiled modules are to be found
-MOD_PATH="${builddir}/runtime/.libs:${builddir}/runtime:${builddir}/modules/pftijah/.libs:${builddir}/modules/pftijah:`monetdb4-config
--modpath`"
+# where compiled Pathfinder modules are to be found
+MOD_PATH="${builddir}/runtime/.libs:${builddir}/runtime:${builddir}/modules/pftijah/.libs:${builddir}/modules/pftijah"
+
+# where compiled MonetDB4 modules are to be found
+MOD_PATH="${MOD_PATH}:${buildbase}/MonetDB4/src/modules/plain/.libs:${buildbase}/MonetDB4/src/modules/plain:${buildbase}/MonetDB4/src/modules/contrib/.libs:${buildbase}/MonetDB4/src/modules/contrib:${buildbase}/MonetDB4/src/modules/calibrator/.libs:${buildbase}/MonetDB4/src/modules/calibrator:${buildbase}/MonetDB4/src/mapi/.libs:${buildbase}/MonetDB4/src/mapi"
+...@have_netcdf_true@
MOD_PATH="${MOD_PATH}:${buildbase}/MonetDB4/src/modules/mnetcdf/.libs:${buildbase}/MonetDB4/src/modules/mnetcdf"
exec Mserver --set monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
${1+"$@"}
diff -r 587757e256b1 -r 9a7f03ac5802 pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in Sun Jan 09 16:50:04 2011 +0100
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
