Changeset: 65ba7a5676fc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65ba7a5676fc
Modified Files:
geom/RunMapprove.bat.in
geom/RunMapprove.in
geom/RunMserver.bat.in
geom/RunMtest.bat.in
geom/RunMtest.in
monetdb4/RunMapprove.bat.in
monetdb4/RunMapprove.in
monetdb4/RunMserver.bat.in
monetdb4/RunMserver.in
monetdb4/RunMtest.bat.in
monetdb4/RunMtest.in
monetdb5/RunMapprove.bat.in
monetdb5/RunMapprove.in
monetdb5/RunMserver.bat.in
monetdb5/RunMserver.in
monetdb5/RunMtest.bat.in
monetdb5/RunMtest.in
pathfinder/RunMapprove.bat.in
pathfinder/RunMapprove.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/RunMapprove.in
template/RunMtest.in
Branch: default
Log Message:
Run*.in: try to fix locations of things
diffs (truncated from 1119 to 300 lines):
diff -r 41cfe1835833 -r 65ba7a5676fc geom/RunMapprove.bat.in
--- a/geom/RunMapprove.bat.in Sat Jan 15 21:58:21 2011 +0100
+++ b/geom/RunMapprove.bat.in Sat Jan 15 22:32:21 2011 +0100
@@ -8,7 +8,7 @@
setlocal
-rem default back end is MonetDB5
+rem default back end is monetdb5
set V=5
if "%1" == "-4" set V=4& shift
if "%1" == "-5" set V=5& shift
diff -r 41cfe1835833 -r 65ba7a5676fc geom/RunMapprove.in
--- a/geom/RunMapprove.in Sat Jan 15 21:58:21 2011 +0100
+++ b/geom/RunMapprove.in Sat Jan 15 22:32:21 2011 +0100
@@ -23,7 +23,7 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-# default back-end is MonetDB5
+# default back-end is monetdb5
V=5
for arg
do
diff -r 41cfe1835833 -r 65ba7a5676fc geom/RunMserver.bat.in
--- a/geom/RunMserver.bat.in Sat Jan 15 21:58:21 2011 +0100
+++ b/geom/RunMserver.bat.in Sat Jan 15 22:32:21 2011 +0100
@@ -13,41 +13,41 @@
set buildbase=@BUILD@
set builddir=%buildbase%\geom
-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%\monetdb%V%\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\monetdb%V%
+set MOD_PATH=%MOD_PATH%;%builddir%\sql
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
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\plain\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\plain
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\contrib\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\contrib
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\calibrator\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\calibrator
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mapi\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mapi
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mnetcdf\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\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%\sql\backends\monet5\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\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
+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
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\scheduler
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\atoms\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\atoms
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\kernel\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\kernel
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\mal\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\mal
:skip_5
set PATH=%MOD_PATH%;%PATH%
diff -r 41cfe1835833 -r 65ba7a5676fc geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in Sat Jan 15 21:58:21 2011 +0100
+++ b/geom/RunMtest.bat.in Sat Jan 15 22:32:21 2011 +0100
@@ -21,62 +21,62 @@
set builddir=%buildbase%\geom
set srcdir=@XSOURCE@\geom
-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%\monetdb%V%\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\monetdb%V%
+set MOD_PATH=%MOD_PATH%;%builddir%\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 exist %builddir%\monetdb%V%\autoload mkdir
%builddir%\monetdb%V%\autoload
+copy /y %srcdir%\monetdb%V%\??_*.mal %builddir%\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
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\plain\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\plain
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\contrib\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\contrib
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\calibrator\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\calibrator
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mapi\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mapi
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mnetcdf\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\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
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\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
+if not exist %buildbase%\sql\backends\monet5\autoload mkdir
%buildbase%\sql\backends\monet5\autoload
+copy /y %srcdir%\..\sql\backends\monet5\??_*.mal
%buildbase%\sql\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
+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
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\scheduler
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\atoms\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\atoms
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\kernel\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\kernel
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\mal\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\mal
+set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\crackers\.libs
+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
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
+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
:skip_5
-set PATH=%buildbase%\MonetDB%V%\src\tools;%buildbase%\testing\src;%PATH%
+set PATH=%buildbase%\monetdb%V%\tools;%buildbase%\testing\src;%PATH%
set PATH=%MOD_PATH%;%PATH%
diff -r 41cfe1835833 -r 65ba7a5676fc geom/RunMtest.in
--- a/geom/RunMtest.in Sat Jan 15 21:58:21 2011 +0100
+++ b/geom/RunMtest.in Sat Jan 15 22:32:21 2011 +0100
@@ -38,7 +38,7 @@
done
# where compiled Geom modules are to be found
-for d in src/monetdb$V
+for d in monetdb$V
do
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
# enable auto-loading of modules before `make install`
@@ -48,36 +48,36 @@
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
+# where compiled monetdb4 modules are to be found
+for d in modules/plain modules/contrib modules/calibrator modules/mapi
@HAVE_NETCDF_TRUE@ modules/mnetcdf
do
- MOD_PATH="${MOD_PATH}${buildbase}/MonetDB4/$d/.libs:${builddir}/$d:"
+ MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${builddir}/$d:"
done
-MOD_PATH="${MOD_PATH}${srcdir}/../MonetDB4/scripts/tools"
+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
+for d in backends/monet5 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
+# 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
do
- MOD_PATH="${MOD_PATH}${buildbase}/MonetDB5/$d/.libs:${builddir}/$d:"
+ 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
+ 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}"
-PATH="${buildbase}/MonetDB$V/src/tools:${buildbase}/testing/src:$PATH"
+PATH="${buildbase}/monetdb$V/tools:${buildbase}/testing/src:$PATH"
export PATH
PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
diff -r 41cfe1835833 -r 65ba7a5676fc monetdb4/RunMapprove.bat.in
--- a/monetdb4/RunMapprove.bat.in Sat Jan 15 21:58:21 2011 +0100
+++ b/monetdb4/RunMapprove.bat.in Sat Jan 15 22:32:21 2011 +0100
@@ -8,10 +8,10 @@
setlocal
-set pkg=MonetDB4
+set pkg=monetdb4
set buildbase=@XBUILD@
-set builddir=%buildbase%\MonetDB4
-set srcdir=@XSOURCE@\MonetDB4
+set builddir=%buildbase%\monetdb4
+set srcdir=@XSOURCE@\monetdb4
set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
diff -r 41cfe1835833 -r 65ba7a5676fc monetdb4/RunMapprove.in
--- a/monetdb4/RunMapprove.in Sat Jan 15 21:58:21 2011 +0100
+++ b/monetdb4/RunMapprove.in Sat Jan 15 22:32:21 2011 +0100
@@ -17,9 +17,9 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-pkg=MonetDB4
+pkg=monetdb4
buildbase=@QBUILD@
-builddir="${buildbase}/MonetDB4"
+builddir="${buildbase}/monetdb4"
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
diff -r 41cfe1835833 -r 65ba7a5676fc monetdb4/RunMserver.bat.in
--- a/monetdb4/RunMserver.bat.in Sat Jan 15 21:58:21 2011 +0100
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
