Update of /cvsroot/monetdb/clients/src/java/scripts
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2110/clients/src/java/scripts
Modified Files:
mjclient.bat.in mjclient.in
Log Message:
Moved "usage" tests of MAPI clients tools and scripts to where they belong:
the clients repository.
Split-up collective "usage" test into individual "*--help" tests.
Added test MonetDB4/src/tools/Tests/Mbeddedmil--help.
Stable output of the following tests need to be checked/fixed/provided by the
respective tools/script maintainer(s):
clients/src/java/scripts/Tests/mjclient--help
clients/src/mapiclient/Tests/MapiClient--help
MonetDB4/src/tools/Tests/Mbeddedmil--help
Index: mjclient.bat.in
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/scripts/mjclient.bat.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mjclient.bat.in 10 Aug 2007 12:34:13 -0000 1.2
+++ mjclient.bat.in 18 Aug 2007 23:30:58 -0000 1.3
@@ -21,4 +21,7 @@
@rem Future versions might inspect a database of eligible servers
@rem to direct the interaction to the proper ports.
-call java -jar @[EMAIL PROTECTED] %*
[EMAIL PROTECTED] jdbcclient_jar="@[EMAIL PROTECTED]"
[EMAIL PROTECTED] not exist @jdbcclient_jar@ set jdbcclient_jar="@[EMAIL
PROTECTED]"
+
+call java -jar @jdbcclient_jar@ %*
Index: mjclient.in
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/scripts/mjclient.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mjclient.in 10 Aug 2007 12:34:13 -0000 1.4
+++ mjclient.in 18 Aug 2007 23:30:58 -0000 1.5
@@ -22,5 +22,9 @@
# Future versions might inspect a database of eligible servers
# to direct the interaction to the proper ports.
[EMAIL PROTECTED]@
-exec java -jar @datadir@/MonetDB/lib/jdbcclient.jar $*
+jdbcclient_jar="@datadir@/MonetDB/lib/jdbcclient.jar"
+if [ ! -s "$jdbcclient_jar" ] ; then
+ jdbcclient_jar="@QCLIENTS_BUILD@/src/java/jdbcclient.jar"
+fi
+
+exec java -jar "$jdbcclient_jar" $*
-------------------------------------------------------------------------
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
