Update of /cvsroot/monetdb/clients/src/java
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31067
Modified Files:
Tag: Clients_1-18
Makefile.ag build.properties build.xml release.txt version.sh
Log Message:
Merged HEAD into Clients_1-18
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/Makefile.ag,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -d -r1.11.2.1 -r1.11.2.2
--- Makefile.ag 5 Jun 2007 11:31:45 -0000 1.11.2.1
+++ Makefile.ag 16 Aug 2007 10:52:19 -0000 1.11.2.2
@@ -23,34 +23,7 @@
lib \
example
-ant_jar_mcl = {
- DIR = datadir/MonetDB/lib
- FILES = monetdb-1.0-mcl.jar
-}
-
-ant_jar_jdbc = {
- DIR = datadir/MonetDB/lib
- FILES = monetdb-1.6-jdbc.jar
-}
-
-ant_jar_jdbcclient = {
- DIR = datadir/MonetDB/lib
- FILES = jdbcclient-1.6.jar
-}
-
-ant_jar_xrpcwrapper = {
+ant_distall = {
DIR = datadir/MonetDB/lib
- FILES = xrpcwrapper-0.1.jar
-}
-
-ant_create_mjclient = {
- COND = NOT_WIN32
- DIR = bindir
- FILES = mjclient
-}
-
-ant_create_mjclient_bat = {
- COND = NATIVE_WIN32
- DIR = bindir
- FILES = mjclient.bat
+ FILES = monetdb-1.0-mcl.jar monetdb-1.6-jdbc.jar jdbcclient.jar
xrpcwrapper-0.1.jar
}
Index: release.txt
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/release.txt,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- release.txt 5 Jun 2007 11:31:45 -0000 1.2.2.1
+++ release.txt 16 Aug 2007 10:52:32 -0000 1.2.2.2
@@ -1,8 +1,8 @@
RELEASE NOTES
-MonetDB JDBC driver version 1.5 (Steadfast/MCL-1.0)
+MonetDB JDBC driver version 1.6 (Steadfast_p6/MCL-1.0)
Fabian Groffen <[EMAIL PROTECTED]>
-Release date: 2007-06-05
+Release date: 2007-07-20
This JDBC driver is designed for use with MonetDB, a main-memory
Index: build.xml
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/build.xml,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -d -r1.18 -r1.18.2.1
--- build.xml 20 May 2007 14:10:13 -0000 1.18
+++ build.xml 16 Aug 2007 10:52:29 -0000 1.18.2.1
@@ -34,7 +34,6 @@
<property name="jardir" value="jars" />
<property name="builddir" value="build" />
<property name="docdir" value="doc" />
- <property name="scriptdir" value="${builddir}/scripts" />
<property name="jdbc-package" value="nl/cwi/monetdb/jdbc" />
<property name="xmldb-package" value="nl/cwi/monetdb/xmldb" />
<property name="mcl-package" value="nl/cwi/monetdb/mcl" />
@@ -48,7 +47,7 @@
<property name="jdbc-jar"
value="${jardir}/monetdb-${JDBC_MAJOR}.${JDBC_MINOR}-jdbc.jar" />
<property name="jdbcclient-jar"
- value="${jardir}/jdbcclient-${JDBC_MAJOR}.${JDBC_MINOR}.jar" />
+ value="${jardir}/jdbcclient.jar" />
<property name="mcl-jar"
value="${jardir}/monetdb-${MCL_MAJOR}.${MCL_MINOR}-mcl.jar" />
<property name="xmldb-jar"
@@ -68,6 +67,13 @@
<antcall target="doc" />
</target>
+ <target name="distall">
+ <antcall target="jar_mcl" />
+ <antcall target="jar_jdbc" />
+ <antcall target="jar_jdbcclient" />
+ <antcall target="jar_xrpcwrapper" />
+ </target>
+
<target name="default">
<antcall target="jar_jdbcclient" />
<antcall target="jar_xrpcwrapper" />
@@ -111,36 +117,15 @@
<target name="jar_xrpcwrapper"
depends="compile_util,compile_xrpcwrapper">
- <copy file="${srcdir}/${xrpcwrapper-package}/wrapper_functions.xq"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/wrapper_functions.xq"
- filtering="yes" />
- <copy file="${srcdir}/${xrpcwrapper-package}/Tests/auctions.xml"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/Tests/auctions.xml"
- filtering="yes" />
- <copy file="${srcdir}/${xrpcwrapper-package}/Tests/bib.xml"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/Tests/bib.xml"
- filtering="yes" />
- <copy file="${srcdir}/${xrpcwrapper-package}/Tests/persons.xml"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/Tests/persons.xml"
- filtering="yes" />
- <copy file="${srcdir}/${xrpcwrapper-package}/Tests/functions.xq"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/Tests/functions.xq"
- filtering="yes" />
- <copy file="${srcdir}/${xrpcwrapper-package}/Tests/test.xq"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/Tests/test.xq"
- filtering="yes" />
<jar jarfile="${xrpcwrapper-jar}">
<fileset dir="${builddir}">
<include name="${util-package}/**/*.class" />
<include name="${xrpcwrapper-package}/**/*.class" />
+ </fileset>
+ <fileset dir="${srcdir}">
<include name="${xrpcwrapper-package}/wrapper_functions.xq" />
- <include name="${xrpcwrapper-package}/Tests/bib.xml" />
+ <include name="${xrpcwrapper-package}/Tests/*.xml" />
+ <include name="${xrpcwrapper-package}/Tests/*.xq" />
</fileset>
<manifest>
<attribute name="Built-By" value="${user.name}" />
@@ -169,32 +154,6 @@
</jar>
</target>
- <!-- a convenience script mjclient which calls the jdbcclient -->
- <target name="create_mjclient">
- <echo message="Crafting an mjclient wrapper script" />
- <filter token="JDBCCLIENT_JAR"
- value="jdbcclient-${JDBC_MAJOR}.${JDBC_MINOR}.jar" />
-
- <!-- now copy and filter the file -->
- <copy file="${scriptdir}/mjclient"
- overwrite="true"
- tofile="${builddir}/mjclient"
- filtering="yes" />
- </target>
-
- <!-- a convenience script mjclient.bat which calls the jdbcclient -->
- <target name="create_mjclient_bat">
- <echo message="Crafting an mjclient.bat wrapper script" />
- <filter token="JDBCCLIENT_JAR"
- value="jdbcclient-${JDBC_MAJOR}.${JDBC_MINOR}.jar" />
-
- <!-- now copy and filter the file -->
- <copy file="${scriptdir}/mjclient.bat"
- overwrite="true"
- tofile="${builddir}/mjclient.bat"
- filtering="yes" />
- </target>
-
<!-- compile targets -->
<target name="compile_jdbc" depends="prepare,driver">
<echo message="Compiling JDBC driver" />
@@ -301,6 +260,8 @@
<!-- Some defaults -->
<filter token="JDBC_MAJOR" value="${JDBC_MAJOR}" />
<filter token="JDBC_MINOR" value="${JDBC_MINOR}" />
+ <filter token="MCL_MAJOR" value="${MCL_MAJOR}" />
+ <filter token="MCL_MINOR" value="${MCL_MINOR}" />
<filter token="JDBC_DEF_PORT" value="${JDBC_DEF_PORT}" />
<filter token="JDBC_DEF_PORT_XQUERY" value="${JDBC_DEF_PORT_XQUERY}" />
<filter token="JDBC_VER_SUFFIX" value="${JDBC_VER_SUFFIX} ${TODAY}" />
@@ -348,27 +309,28 @@
<uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
<srcfiles dir="${srcdir}">
<include name="${jdbc-package}/**/*.java" />
+ <include name="${mcl-package}/**/*.java" />
</srcfiles>
</uptodate>
- <uptodate targetfile="${jdbcclient-jar}"
- property="uptodate.jdbcclient-jar">
+ <uptodate targetfile="${jdbcclient-jar}"
property="uptodate.jdbcclient-jar">
<srcfiles dir="${srcdir}">
<include name="${client-package}/**/*.java" />
<include name="${jdbc-package}/**/*.java" />
+ <include name="${mcl-package}/**/*.java" />
</srcfiles>
</uptodate>
<condition property="uptodate.drivers">
<and>
- <uptodate targetfile="${jdbc-package}/MonetDriver.java">
+ <uptodate
targetfile="${builddir}/src/${jdbc-package}/MonetDriver.java">
<srcfiles dir="${srcdir}">
<include name="build.properties" />
<include name="build.local.properties" />
<include name="${jdbc-package}/MonetDriver.java.in" />
<include name="${jdbc-package}/**/*.java" />
- <include name="${client-package}/**/*.java" />
</srcfiles>
</uptodate>
- <uptodate targetfile="${xmldb-package}/base/MonetDBDatabase.java">
+ <uptodate
+
targetfile="${builddir}/src/${xmldb-package}/base/MonetDBDatabase.java">
<srcfiles dir="${srcdir}">
<include name="build.properties" />
<include name="build.local.properties" />
Index: version.sh
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/version.sh,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -d -r1.3.2.3 -r1.3.2.4
--- version.sh 6 Jun 2007 08:16:29 -0000 1.3.2.3
+++ version.sh 16 Aug 2007 10:52:41 -0000 1.3.2.4
@@ -30,7 +30,7 @@
}
escape_value() {
- echo "$*" | sed -e 's/\+/\\\\+/g' | sed -e 's/\*/\\\\*/g' | sed -e
's/\./\\\\./g'
+ echo "$*" | sed -e 's/\*/\\*/g' -e 's/\./\\./g'
}
patch="cat"
@@ -45,7 +45,7 @@
case $1 in
jdbc)
TYPE=JDBC
- FILES="monetdb-XXX-jdbc.jar jdbcclient-XXX.jar
monetdb-XXX-xmldb.jar"
+ FILES="monetdb-XXX-jdbc.jar monetdb-XXX-xmldb.jar"
;;
mcl)
TYPE=MCL
@@ -106,19 +106,18 @@
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}
for file in \
Makefile.ag \
+ ../../../*/src/jdbc/tests/Tests/Test.SQL.bat \
../../../*/NT/MonetDB4-SQL/MonetDB4-Installer.vdproj \
../../../*/NT/MonetDB5-SQL/MonetDB5-Installer.vdproj \
- ../../../*/src/jdbc/tests/Tests/Test_JdbcClient.SQL.bat \
- ../../../*/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 +137,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}
Index: build.properties
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/build.properties,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- build.properties 5 Jun 2007 11:31:45 -0000 1.4.2.1
+++ build.properties 16 Aug 2007 10:52:22 -0000 1.4.2.2
@@ -21,7 +21,7 @@
# minor release number
JDBC_MINOR=6
# an additional identifying string
-JDBC_VER_SUFFIX=Steadfast/MCL-1.0
+JDBC_VER_SUFFIX=Steadfast_p6
# the default port to connect on, if no port given when using SQL
JDBC_DEF_PORT=50000
# the default port to connect on, if no port given when using XML:DB
-------------------------------------------------------------------------
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
