Changeset: b0d6d853d9e6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b0d6d853d9e6
Modified Files:
Branch: Mar2011
Log Message:
merge
diffs (294 lines):
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -15,11 +15,14 @@
set PATH=%buildbase%\testing;%PATH%
+set PATH=%builddir%\examples\C;%PATH%
set PATH=%builddir%\mapiclient;%PATH%
set PATH=%builddir%\mapilib;%PATH%
set
PYTHONPATH=%srcdir%\python;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/clients/RunMtest.in b/clients/RunMtest.in
--- a/clients/RunMtest.in
+++ b/clients/RunMtest.in
@@ -33,12 +33,15 @@
done
# enhance various paths to find our stuff
-PATH="${builddir}/mapiclient:${buildbase}/testing:$PATH"
+PATH="${builddir}/mapiclient:${builddir}/examples/C:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${srcdir}/python:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
# execute Mtest.py in the source directory
cd "$srcdir"
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1088,8 +1088,9 @@
else
origCFLAGS="$CFLAGS"
dnl remove "-g" as some compilers don't like "-g -Ox" combinations
+ dnl remove "-O2" as we add "-Ox" and some compilers don't like "-Oy -Ox"
combinations
CFLAGS=" $CFLAGS "
- CFLAGS="`echo "$CFLAGS" | sed -e 's| -g | |g' -e 's|^ ||' -e 's| $||'`"
+ CFLAGS="`echo "$CFLAGS" | sed -e 's| -g | |g' -e 's| -O2 | |g' -e 's|^ ||'
-e 's| $||'`"
JAVACFLAGS=" $JAVACFLAGS "
JAVACFLAGS="`echo "$JAVACFLAGS" | sed -e 's| -g | |g' -e 's| -g:[[a-z]]* |
|g' -e 's|^ ||' -e 's| $||'`"
dnl Optimization flags
@@ -1124,7 +1125,7 @@
esac
;;
x86_64-*-*|i*86-*-*)
- CFLAGS="$CFLAGS -O6 -fomie-frame-pointer
-finline-functions -malign-loops=4 -malign-jumps=4 -malign-functions=4
-fexpensive-optimizations -funroll-all-loops -funroll-loops
-frerun-cse-after-loop -frerun-loop-opt"
+ CFLAGS="$CFLAGS -O6 -fomit-frame-pointer
-finline-functions -malign-loops=4 -malign-jumps=4 -malign-functions=4
-fexpensive-optimizations -funroll-all-loops -funroll-loops
-frerun-cse-after-loop -frerun-loop-opt"
case "$gcc_ver" in
4.*) CFLAGS="$CFLAGS -ftree-vectorize";;
dnl "-ftree-vectorize" is only available with
newer versions of gcc, only;
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -94,7 +94,7 @@
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
-set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
@@ -103,6 +103,8 @@
set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -90,12 +90,15 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
libpath="${MOD_PATH}"
-PATH="${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
+PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/monetdb4/RunMtest.bat.in b/monetdb4/RunMtest.bat.in
--- a/monetdb4/RunMtest.bat.in
+++ b/monetdb4/RunMtest.bat.in
@@ -25,7 +25,7 @@
set MOD_PATH=%MOD_PATH%;%builddir%\modules\mnetcdf
set MOD_PATH=%MOD_PATH%;%srcdir%\scripts\tools
-set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\monet;%PATH%
@@ -33,6 +33,8 @@
set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/monetdb4/RunMtest.in b/monetdb4/RunMtest.in
--- a/monetdb4/RunMtest.in
+++ b/monetdb4/RunMtest.in
@@ -33,7 +33,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/testing"
+binpath="${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/monet/.libs"
PATH="${binpath}:$PATH"
@@ -42,6 +42,9 @@
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -36,7 +36,7 @@
if not exist %builddir%\extras\xml\autoload mkdir
%builddir%\extras\xml\autoload
copy /y %srcdir%\extras\xml\??_*.mal %builddir%\extras\xml\autoload
-set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\mal;%PATH%
@@ -44,6 +44,8 @@
set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -35,7 +35,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/testing"
+binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/mal/.libs"
PATH="${binpath}:$PATH"
@@ -44,6 +44,9 @@
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/pathfinder/RunMtest.bat.in b/pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in
+++ b/pathfinder/RunMtest.bat.in
@@ -68,7 +68,7 @@
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
-set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\extras\compiler;%PATH%
@@ -76,6 +76,8 @@
set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/pathfinder/RunMtest.in b/pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in
+++ b/pathfinder/RunMtest.in
@@ -72,7 +72,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${builddir}/compiler:${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/testing"
+binpath="${builddir}/compiler:${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
libpath="${MOD_PATH}"
PATH="${binpath}:$PATH"
@@ -81,6 +81,9 @@
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -54,7 +54,7 @@
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
-set
PATH=%buildbase%\tools\mserver;%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\tools\mserver;%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\server;%PATH%
@@ -63,6 +63,8 @@
set
PYTHONPATH=%builddir%\backends\python\monet5;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -50,7 +50,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${builddir}/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/testing"
+binpath="${builddir}/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/server/.libs"
PATH="${binpath}:$PATH"
@@ -59,6 +59,9 @@
PYTHONPATH="${builddir}/backends/python/monet5/.libs:${builddir}/backends/python/monet5:${buildbase}/testing:${srcdir}/../testing:$PYTHONPATH"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/template/RunMtest.in b/template/RunMtest.in
--- a/template/RunMtest.in
+++ b/template/RunMtest.in
@@ -71,12 +71,15 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
libpath="${MOD_PATH}"
-PATH="${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
+PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
