Changeset: e415b6f6c712 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e415b6f6c712
Modified Files:
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
clients/RunMapprove.bat.in
clients/RunMapprove.in
clients/RunMtest.bat.in
clients/RunMtest.in
clients/Runmclient.bat.in
clients/src/mapiclient/Tests/mclient--help.stable.err
clients/src/mapiclient/Tests/msqldump--help.stable.err
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/RunMserver.in
pathfinder/RunMtest.bat.in
pathfinder/RunMtest.in
sql/RunMapprove.bat.in
sql/RunMapprove.in
sql/RunMserver.bat.in
sql/RunMserver.in
sql/RunMtest.bat.in
sql/RunMtest.in
template/RunMapprove.in
template/RunMtest.in
template/conf/monetdb-template-config.in
Branch: default
Log Message:
replace no longer existing "@[QX]*<PKG>_(SOURCE|BUILD)@" by
"@[QX]*(SOURCE|BUILD)@[/\\]<pkg>"
TODO:
what about "@[QX]*<PKG>_PREFIX@" ?
diffs (truncated from 584 to 300 lines):
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB4/RunMapprove.bat.in
--- a/MonetDB4/RunMapprove.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB4/RunMapprove.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -9,8 +9,9 @@
setlocal
set pkg=monetdb4
-set buildd...@xmonetdb4_build@
-set srcd...@xmonetdb4_source@
+set buildba...@xbuild@
+set builddir=%buildbase%\MonetDB4
+set srcd...@xsource@\MonetDB4
set PATH=%builddir%\conf;%PATH%
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB4/RunMapprove.in
--- a/MonetDB4/RunMapprove.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB4/RunMapprove.in Sun Jan 09 15:27:25 2011 +0100
@@ -18,7 +18,8 @@
# All Rights Reserved.
pkg=monetdb4
-buildd...@qmonetdb4_build@
+buildba...@qbuild@
+builddir="${buildbase}/MonetDB4"
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB4/RunMserver.bat.in
--- a/MonetDB4/RunMserver.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB4/RunMserver.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -2,7 +2,8 @@
setlocal
-set buildd...@xmonetdb4_build@
+set buildba...@xbuild@
+set builddir=%buildbase%\MonetDB4
set MOD_PATH=%builddir%\src\modules\plain\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\plain
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB4/RunMserver.in
--- a/MonetDB4/RunMserver.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB4/RunMserver.in Sun Jan 09 15:27:25 2011 +0100
@@ -17,7 +17,8 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-buildd...@qxmonetdb4_build@
+buildba...@qxbuild@
+builddir="${buildbase}/MonetDB4"
# make sure srcdir contains absolute path name
srcdir=`cd '@Xsrcdir@'; pwd`
uname=`uname`
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB4/RunMtest.bat.in
--- a/MonetDB4/RunMtest.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB4/RunMtest.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -9,8 +9,9 @@
setlocal
set pkg=monetdb4
-set buildd...@xmonetdb4_build@
-set srcd...@xmonetdb4_source@
+set buildba...@xbuild@
+set builddir=%buildbase%\MonetDB4
+set srcd...@xsource@\MonetDB4
set MOD_PATH=%builddir%\src\modules\plain\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\plain
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB4/RunMtest.in
--- a/MonetDB4/RunMtest.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB4/RunMtest.in Sun Jan 09 15:27:25 2011 +0100
@@ -18,7 +18,8 @@
# All Rights Reserved.
pkg=monetdb4
-buildd...@qmonetdb4_build@
+buildba...@qbuild@
+builddir="${buildbase}/MonetDB4"
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB5/RunMapprove.bat.in
--- a/MonetDB5/RunMapprove.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB5/RunMapprove.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -9,8 +9,9 @@
setlocal
set pkg=monetdb5
-set buildd...@xmonetdb5_build@
-set srcd...@xmonetdb5_source@
+set buildba...@xbuild@
+set builddir=%buildbase%\MonetDB5
+set srcd...@xsource@\MonetDB5
set PATH=%builddir%\conf;%PATH%
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB5/RunMapprove.in
--- a/MonetDB5/RunMapprove.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB5/RunMapprove.in Sun Jan 09 15:27:25 2011 +0100
@@ -18,7 +18,8 @@
# All Rights Reserved.
pkg=monetdb5
-buildd...@qmonetdb5_build@
+buildba...@qbuild@
+builddir="${buildbase}/MonetDB5"
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB5/RunMserver.bat.in
--- a/MonetDB5/RunMserver.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB5/RunMserver.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -2,7 +2,8 @@
setlocal
-set buildd...@xmonetdb5_build@
+set buildba...@xbuild@
+set builddir=%buildbase%\MonetDB5
set MOD_PATH=%builddir%\src\compiler\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\src\compiler
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB5/RunMserver.in
--- a/MonetDB5/RunMserver.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB5/RunMserver.in Sun Jan 09 15:27:25 2011 +0100
@@ -17,7 +17,8 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-buildd...@qxmonetdb5_build@
+buildba...@qxbuild@
+builddir="${buildbase}/MonetDB5"
# make sure srcdir contains absolute path name
srcdir=`cd '@Xsrcdir@'; pwd`
uname=`uname`
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB5/RunMtest.bat.in
--- a/MonetDB5/RunMtest.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB5/RunMtest.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -9,8 +9,9 @@
setlocal
set pkg=monetdb5
-set buildd...@xmonetdb5_build@
-set srcd...@xmonetdb5_source@
+set buildba...@xbuild@
+set builddir=%buildbase%\MonetDB5
+set srcd...@xsource@\MonetDB5
set MOD_PATH=%builddir%\src\compiler\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\src\compiler
diff -r bcfe117e5d73 -r e415b6f6c712 MonetDB5/RunMtest.in
--- a/MonetDB5/RunMtest.in Sun Jan 09 14:56:38 2011 +0100
+++ b/MonetDB5/RunMtest.in Sun Jan 09 15:27:25 2011 +0100
@@ -18,7 +18,8 @@
# All Rights Reserved.
pkg=monetdb5
-buildd...@qmonetdb5_build@
+buildba...@qbuild@
+builddir="${buildbase}/MonetDB5"
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
diff -r bcfe117e5d73 -r e415b6f6c712 clients/RunMapprove.bat.in
--- a/clients/RunMapprove.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/clients/RunMapprove.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -9,8 +9,9 @@
setlocal
set pkg=monetdb-clients
-set buildd...@xclients_build@
-set srcd...@xclients_source@
+set buildba...@xbuild@
+set builddir=%buildbase%\clients
+set srcd...@xsource@\clients
set PATH=%builddir%\conf;%PATH%
diff -r bcfe117e5d73 -r e415b6f6c712 clients/RunMapprove.in
--- a/clients/RunMapprove.in Sun Jan 09 14:56:38 2011 +0100
+++ b/clients/RunMapprove.in Sun Jan 09 15:27:25 2011 +0100
@@ -18,7 +18,8 @@
# All Rights Reserved.
pkg=monetdb-clients
-buildd...@qclients_build@
+buildba...@qbuild@
+builddir="${buildbase}/clients"
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
diff -r bcfe117e5d73 -r e415b6f6c712 clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/clients/RunMtest.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -9,8 +9,9 @@
setlocal
set pkg=monetdb-clients
-set buildd...@xclients_build@
-set srcd...@xclients_source@
+set buildba...@xbuild@
+set builddir=%buildbase%\clients
+set srcd...@xsource@\clients
set PATH=%builddir%\conf;%PATH%
set PATH=%builddir%\src\mapiclient;%PATH%
diff -r bcfe117e5d73 -r e415b6f6c712 clients/RunMtest.in
--- a/clients/RunMtest.in Sun Jan 09 14:56:38 2011 +0100
+++ b/clients/RunMtest.in Sun Jan 09 15:27:25 2011 +0100
@@ -18,7 +18,8 @@
# All Rights Reserved.
pkg=monetdb-clients
-buildd...@qclients_build@
+buildba...@qbuild@
+builddir="${buildbase}/clients"
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
diff -r bcfe117e5d73 -r e415b6f6c712 clients/Runmclient.bat.in
--- a/clients/Runmclient.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/clients/Runmclient.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -2,7 +2,8 @@
setlocal
-set buildd...@xclients_build@
+set buildba...@xbuild@
+set builddir=%buildbase%\clients
set PATH=%builddir%\src\mapiclient;%builddir%\src\mapilib;%PATH%
diff -r bcfe117e5d73 -r e415b6f6c712
clients/src/mapiclient/Tests/mclient--help.stable.err
--- a/clients/src/mapiclient/Tests/mclient--help.stable.err Sun Jan 09
14:56:38 2011 +0100
+++ b/clients/src/mapiclient/Tests/mclient--help.stable.err Sun Jan 09
15:27:25 2011 +0100
@@ -35,6 +35,7 @@
-r nr | --rows=nr for pagination
-w nr | --width=nr for pagination
-D | --dump create an SQL dump
+ -N | --inserts use INSERT INTO statements when dumping
XQuery specific options
-C colname | --collection=colname collection name
diff -r bcfe117e5d73 -r e415b6f6c712
clients/src/mapiclient/Tests/msqldump--help.stable.err
--- a/clients/src/mapiclient/Tests/msqldump--help.stable.err Sun Jan 09
14:56:38 2011 +0100
+++ b/clients/src/mapiclient/Tests/msqldump--help.stable.err Sun Jan 09
15:27:25 2011 +0100
@@ -18,6 +18,7 @@
-d database | --database=database database to connect to
-f | --functions dump functions
-D | --describe describe database
+ -N | --inserts use INSERT INTO statements
-q | --quiet don't print welcome message
-t | --trace trace mapi network interaction
-? | --help show this usage message
diff -r bcfe117e5d73 -r e415b6f6c712 geom/RunMapprove.bat.in
--- a/geom/RunMapprove.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/geom/RunMapprove.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -14,8 +14,9 @@
if "%1" == "-5" set V=5& shift
set pkg=monetdb-sql
-set buildd...@xgeom_build@
-set srcd...@xgeom_source@
+set buildba...@xbuild@
+set builddir=%buildbase%\geom
+set srcd...@xsource@\geom
set PATH=%builddir%\conf;%PATH%
diff -r bcfe117e5d73 -r e415b6f6c712 geom/RunMapprove.in
--- a/geom/RunMapprove.in Sun Jan 09 14:56:38 2011 +0100
+++ b/geom/RunMapprove.in Sun Jan 09 15:27:25 2011 +0100
@@ -18,7 +18,8 @@
# All Rights Reserved.
pkg=monetdb-geom
-buildd...@qgeom_build@
+buildba...@qbuild@
+builddir="${buildbase}/geom"
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
diff -r bcfe117e5d73 -r e415b6f6c712 geom/RunMserver.bat.in
--- a/geom/RunMserver.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/geom/RunMserver.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -18,7 +18,8 @@
if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
call "%sql_prefix%\bin\monetdb-sql-config.bat" --internal
-set buildd...@geom_build@
+set buildba...@build@
+set builddir=%buildbase%\geom
set MOD_PATH=%modpath%
if %V% == 4 set MOD_PATH=%modpath4%;%MOD_PATH%
diff -r bcfe117e5d73 -r e415b6f6c712 geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in Sun Jan 09 14:56:38 2011 +0100
+++ b/geom/RunMtest.bat.in Sun Jan 09 15:27:25 2011 +0100
@@ -25,8 +25,9 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
