Update of /cvsroot/monetdb/MonetDB4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19710
Modified Files:
Tag: GDK-2
HowToStart-Win32.txt RunMapprove.bat.in RunMapprove.in
RunMserver.bat.in RunMtest.bat.in RunMtest.in
Log Message:
propagated changes of Friday Sep 28 2007 - Wednesday Oct 03 2007
from the development trunk to the GDK-2 branch
Index: RunMserver.bat.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/RunMserver.bat.in,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -d -r1.2 -r1.2.6.1
--- RunMserver.bat.in 4 Jan 2007 22:23:36 -0000 1.2
+++ RunMserver.bat.in 3 Oct 2007 14:36:30 -0000 1.2.6.1
@@ -4,8 +4,21 @@
set [EMAIL PROTECTED]@
-set
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;%builddir%\src\modules\mnetcdf\.libs;%builddir%\src\modules\mnetcdf
-set PATH=%MOD_PATH%;%builddir%\src\monet;%PATH%
+set MOD_PATH=%builddir%\src\modules\plain\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\plain
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\contrib\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\contrib
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\calibrator\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\calibrator
+set MOD_PATH=%MOD_PATH%;%builddir%\src\mapi\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\mapi
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mnetcdf\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mnetcdf
+set MOD_PATH=%MOD_PATH%;%builddir%\scripts
+set MOD_PATH=%MOD_PATH%;%builddir%\scripts\tools
+
+set PATH=%MOD_PATH%;%PATH%
+set PATH=%builddir%\src\monet;%PATH%
set PATH=%builddir%\src\tools;%PATH%
Mserver.exe "--config=%builddir%\conf\MonetDB.conf" --set
"monet_mod_path=%MOD_PATH%" %*
Index: RunMapprove.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/RunMapprove.in,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -d -r1.3.6.1 -r1.3.6.2
--- RunMapprove.in 10 Sep 2007 14:22:47 -0000 1.3.6.1
+++ RunMapprove.in 3 Oct 2007 14:36:28 -0000 1.3.6.2
@@ -22,7 +22,7 @@
srcdir=`cd '@srcdir@'; pwd`
# enhance PATH to find ${pkg}-config
-PATH="${builddir}/src/tools:$PATH"
+PATH="${builddir}/conf:$PATH"
export PATH
# execute Mapprove.py in the source directory
Index: HowToStart-Win32.txt
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/HowToStart-Win32.txt,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -d -r1.3.4.1 -r1.3.4.2
--- HowToStart-Win32.txt 23 Aug 2007 13:15:26 -0000 1.3.4.1
+++ HowToStart-Win32.txt 3 Oct 2007 14:36:25 -0000 1.3.4.2
@@ -124,27 +124,27 @@
Download the Windows binaries in a zip package (i.e. not the
Windows installer) and the source package of PHP 5 from
http://www.php.net/. Unzip the binaries into
- e.g. ``C:\php-5`` (for PHP-5, the zip file does not contain a
- top-level directory, so create a new directory,
- e.g. ``C:\php-5``, and unzip the files there--for PHP-4, the
+ e.g. ``C:\php-524`` (for PHP-5, the zip file does not contain
+ a top-level directory, so create a new directory,
+ e.g. ``C:\php-524``, and unzip the files there--for PHP-4, the
zip file does contain a top-level directory, so you can unzip
directly into ``C:\``). In any case, make sure there are no
spaces in the path chosen. Also extract the sources
- somewhere, e.g. in a directory parallel to MonetDB. If you
- don't use ``C:\php-5`` for the binaries or you don't extract
- the sources into ``php-5.1.4`` in the same directory where
- MonetDB is extracted, you will have to edit MonetDB's
- ``NT\rules.msc`` to change the cariables ``PHP_SRCDIR`` and
- ``PHP_INSTDIR`` to reflect this. Make sure there are no
- spaces in these two path names. Also note that the paths are
- only used from inside the ``NT\src\mapi\clients\php`` folder,
- so if they are relative, they have to be relative from there.
- In order to get MonetDB to compile with these sources, it was
- necessary to remove the line ``#include "arpa/inet.h"`` from
- the file ``main\php_network.h``. When compiling MonetDB, add
- the flag ``HAVE_PHP=1`` to the ``nmake`` command line. Note
- that only PHP versions 5.1.4 and 5.2.1 have been tried
- recently.
+ somewhere, e.g. inside the directory where you extracted the
+ binaries (so you get e.g. ``C:\php-524\php-5.2.4``). If you
+ don't use ``C:\php-524`` for the binaries or you don't extract
+ the sources into ``php-5.2.4`` there, you will have to edit
+ MonetDB's ``NT\winrules.msc`` to change the cariables
+ ``PHP_SRCDIR`` and ``PHP_INSTDIR`` to reflect this. Make sure
+ there are no spaces in these two path names. Also note that
+ the paths are only used from inside the
+ ``NT\src\mapi\clients\php`` folder, so if they are relative,
+ they have to be relative from there. In order to get MonetDB
+ to compile with these sources, it was necessary to remove the
+ line ``#include "arpa/inet.h"`` from the file
+ ``main\php_network.h``. When compiling MonetDB, add the flag
+ ``HAVE_PHP=1`` to the ``nmake`` command line. Note that only
+ PHP versions 5.1.4 and 5.2.1 have been tried recently.
Java:
The Java SDK (JDK) can be found at http://java.sun.com/.
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/RunMtest.bat.in,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -d -r1.6 -r1.6.4.1
--- RunMtest.bat.in 22 Feb 2007 11:28:28 -0000 1.6
+++ RunMtest.bat.in 3 Oct 2007 14:36:32 -0000 1.6.4.1
@@ -8,6 +8,8 @@
setlocal
+set pkg=monetdb4
+
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
@@ -24,20 +26,15 @@
set MOD_PATH=%MOD_PATH%;%builddir%\scripts
set MOD_PATH=%MOD_PATH%;%builddir%\scripts\tools
-set [EMAIL PROTECTED]@\lib\MonetDB\Tests;%PATH%
-set [EMAIL PROTECTED]@\bin;%PATH%
-set [EMAIL PROTECTED]@\bin;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\src\monet;%PATH%
set PATH=%builddir%\src\tools;%PATH%
-
-set [EMAIL PROTECTED]@\share\MonetDB\python;%PYTHONPATH%
-set [EMAIL PROTECTED]@\share\MonetDB\python;%PYTHONPATH%
+set PATH=%builddir%\conf;%PATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
-call Mtest.py "--config=%builddir%\conf\MonetDB.conf"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--sql_logdir=%builddir%\sql_logs" "--xquery_logdir=%builddir%\xquery_logs"
"--TSTSRCBASE=%srcdir%" "--TSTBLDBASE=%builddir%" "--TSTTRGBASE=%builddir%" %*
+call Mtest.py "--config=%builddir%\conf\MonetDB.conf" --package=%pkg%
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--sql_logdir=%builddir%\sql_logs" "--xquery_logdir=%builddir%\xquery_logs"
"--TSTTRGBASE=%builddir%" %*
popd
endlocal
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/RunMtest.in,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -d -r1.5.4.1 -r1.5.4.2
--- RunMtest.in 10 Sep 2007 14:22:48 -0000 1.5.4.1
+++ RunMtest.in 3 Oct 2007 14:36:34 -0000 1.5.4.2
@@ -30,7 +30,7 @@
MOD_PATH="${MOD_PATH}${srcdir}/scripts/tools"
# make sure scripts are executable
-for x in "${builddir}/src/tools/${pkg}-config"
+for x in "${builddir}/conf/${pkg}-config"
do
if [ -s $x ] ; then
chmod +x $x
@@ -38,7 +38,7 @@
done
# enhance various paths to find our stuff
-binpath="${builddir}/src/tools"
+binpath="${builddir}/conf:${builddir}/src/tools"
libpath="${MOD_PATH}:${builddir}/src/monet/.libs"
PATH="${binpath}:$PATH"
Index: RunMapprove.bat.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/RunMapprove.bat.in,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -d -r1.2 -r1.2.6.1
--- RunMapprove.bat.in 4 Jan 2007 17:30:50 -0000 1.2
+++ RunMapprove.bat.in 3 Oct 2007 14:36:26 -0000 1.2.6.1
@@ -8,15 +8,32 @@
setlocal
+set pkg=monetdb4
+
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
-REM set
PYTHONPATH=%builddir%\src\testing;%srcdir%\src\testing;%builddir%\src\common;%srcdir%\src\mapi\clients\python
+set MOD_PATH=%builddir%\src\modules\plain\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\plain
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\contrib\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\contrib
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\calibrator\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\calibrator
+set MOD_PATH=%MOD_PATH%;%builddir%\src\mapi\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\mapi
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mnetcdf\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mnetcdf
+set MOD_PATH=%MOD_PATH%;%builddir%\scripts
+set MOD_PATH=%MOD_PATH%;%builddir%\scripts\tools
+
+set PATH=%MOD_PATH%;%PATH%
+set PATH=%builddir%\src\monet;%PATH%
+set PATH=%builddir%\src\tools;%PATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call Mapprove.py "--config=%builddir%\conf\MonetDB.conf"
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %*
+call Mapprove.py "--config=%builddir%\conf\MonetDB.conf" --package=%pkg%
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--sql_logdir=%builddir%\sql_logs" "--xquery_logdir=%builddir%\xquery_logs"
"--TSTTRGBASE=%builddir%" %*
popd
endlocal
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
