On Mon, Jul 16, 2007 at 09:42:16AM +0000, Fabian wrote:
> Update of /cvsroot/monetdb/clients/src/java
> In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5504
>
> Modified Files:
> build.properties build.xml release.txt version.sh
> Log Message:
> Fix for bug #1754452
> Store the given connection in the SendThread instead of ignoring it.
>
> Since we changed the code after the release, tag the version suffix
>
[...]
> Index: version.sh
> ===================================================================
> RCS file: /cvsroot/monetdb/clients/src/java/version.sh,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -d -r1.5 -r1.6
> --- version.sh 6 Jun 2007 12:00:55 -0000 1.5
> +++ version.sh 16 Jul 2007 09:42:12 -0000 1.6
> @@ -106,10 +106,13 @@
>
> file="release.txt"
> sed \
> - -e "s|version ${ESC_MAJOR}\.${ESC_MINOR} (${ESC_SUFFIX})|version
> ${NEW_MAJOR}.${NEW_MINOR} \(${NEW_SUFFIX}\)|g" \
> + -e "s|version ${ESC_MAJOR}\.${ESC_MINOR} (${ESC_SUFFIX}|version
> ${NEW_MAJOR}.${NEW_MINOR} \(${NEW_SUFFIX}|g" \
> + -e
> "s|${TYPE}-${ESC_MAJOR}\.${ESC_MINOR}|${TYPE}-${NEW_MAJOR}.${NEW_MINOR}|g" \
> -e "s|Release date: 20[0-9][0-9]-[01][0-9]-[0-3][0-9]|Release date:
> `date +%F`|" \
> ${file} | ${diff} ${file} - | ${patch}
>
> +# not found:
> +# ../../../*/tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat \
========
$ l */tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat
--------
-rwxr-x--- 1 manegold ins1 376 Jun 6 14:16
pathfinder/tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat*
========
$ cat */tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat
--------
@echo off
set JAR="%CLIENTS_PREFIX%\share\MonetDB\lib\jdbcclient-1.6.jar"
echo user=monetdb> .monetdb
echo password=monetdb>> .monetdb
set LANG=en_US.UTF-8
call Mlog.bat -x java -jar "%JAR%" -h %HOST% -p %MAPIPORT% -d %TSTDB% -l xquery
-f "%TST%.250.xq"
call Mlog.bat -x java -jar "%JAR%" -h %HOST% -p %MAPIPORT% -d %TSTDB% -l xquery
-f "%TST%.251.xq"
del .monetdb
========
maybe, we should find some way to use the "latest" jdbcclient.jar on both
unix and windows platforms without knowing the exact version number ...
Stefan
> for file in \
> Makefile.ag \
> ../../../*/NT/MonetDB4-SQL/MonetDB4-Installer.vdproj \
> @@ -118,7 +121,6 @@
> ../../../*/src/jdbc/tests/Tests/Test.SQL.bat \
> ../../../*/NT/MonetDB-XQuery/MonetDB-XQuery.vdproj \
> ../../../*/NT/MonetDB4-XQuery/MonetDB4-Installer.vdproj \
> -
> ../../../*/tests/BugTracker/Tests/JDBC_250_results.SF-1730556.XQUERY.bat \
> ; do
> if [[ -f ${file} ]] ; then
> for f in $FILES ; do
> @@ -138,5 +140,4 @@
> -e "s|${TYPE}_MAJOR=${ESC_MAJOR}|${TYPE}_MAJOR=${NEW_MAJOR}|g" \
> -e "s|${TYPE}_MINOR=${ESC_MINOR}|${TYPE}_MINOR=${NEW_MINOR}|g" \
> -e
> "s|${TYPE}_VER_SUFFIX=${ESC_SUFFIX}|${TYPE}_VER_SUFFIX=${NEW_SUFFIX}|g" \
> - -e
> "s|${TYPE}-${ESC_MAJOR}\.${ESC_MINOR}|${TYPE}-${NEW_MAJOR}.${NEW_MINOR}|g" \
> ${file} | ${diff} ${file} - | ${patch}
>
[...]
--
| Dr. Stefan Manegold | mailto:[EMAIL PROTECTED] |
| CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ |
| 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 |
| The Netherlands | Fax : +31 (20) 592-4312 |
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-developers
