Update of /cvsroot/monetdb/clients/src/java
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2096
Modified Files:
Tag: Clients_1-18
Makefile.ag build.properties release.txt version.sh
Log Message:
We fixed some bugs, so let's bump the JDBC revision number.
Adapted version.sh to also deal with mcl and xrpc version numbers.
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/Makefile.ag,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- Makefile.ag 20 May 2007 14:10:12 -0000 1.11
+++ Makefile.ag 5 Jun 2007 11:31:45 -0000 1.11.2.1
@@ -30,12 +30,12 @@
ant_jar_jdbc = {
DIR = datadir/MonetDB/lib
- FILES = monetdb-1.5-jdbc.jar
+ FILES = monetdb-1.6-jdbc.jar
}
ant_jar_jdbcclient = {
DIR = datadir/MonetDB/lib
- FILES = jdbcclient-1.5.jar
+ FILES = jdbcclient-1.6.jar
}
ant_jar_xrpcwrapper = {
Index: release.txt
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/release.txt,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- release.txt 20 Apr 2007 13:41:25 -0000 1.2
+++ release.txt 5 Jun 2007 11:31:45 -0000 1.2.2.1
@@ -2,7 +2,7 @@
MonetDB JDBC driver version 1.5 (Steadfast/MCL-1.0)
Fabian Groffen <[EMAIL PROTECTED]>
-Release date: 2007-04-20
+Release date: 2007-06-05
This JDBC driver is designed for use with MonetDB, a main-memory
Index: version.sh
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/version.sh,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- version.sh 20 Apr 2007 13:41:25 -0000 1.3
+++ version.sh 5 Jun 2007 11:31:45 -0000 1.3.2.1
@@ -17,7 +17,7 @@
# All Rights Reserved.
if [[ -z $1 ]] ; then
- echo "Usage: $0 [-w] <(major|minor|suffix|mmajor|mminor)=newversion>
[...]"
+ echo "Usage: $0 [-w] <(jdbc|mcl|xrpc)>
<(major|minor|suffix)=newversion> [...]"
echo "where -w activates actual write of changes"
exit -1
fi
@@ -33,26 +33,47 @@
echo "$*" | sed -e 's/\+/\\\\+/g' | sed -e 's/\*/\\\\*/g' | sed -e
's/\./\\\\./g'
}
-MCL_MAJOR=$(get_value 'MCL_MAJOR')
-MCL_MINOR=$(get_value 'MCL_MINOR')
+patch="cat"
-CUR_MAJOR=$(get_value 'JDBC_MAJOR')
-CUR_MINOR=$(get_value 'JDBC_MINOR')
-CUR_SUFFIX=$(get_value 'JDBC_VER_SUFFIX')
+# get rid of the script name
+case $1 in
+ -w)
+ patch="patch -p0";
+ shift
+ ;;
+esac
+case $1 in
+ jdbc)
+ TYPE=JDBC
+ FILES="monetdb-XXX-jdbc.jar jdbcclient-XXX.jar
monetdb-XXX-xmldb.jar"
+ ;;
+ mcl)
+ TYPE=MCL
+ FILES="monetdb-XXX-mcl.jar"
+ ;;
+ xrpc)
+ TYPE=XRPC_WRAPPER
+ FILES="xrpcwrapper-XXX.jar"
+ ;;
+ *)
+ echo "invalid type: $1"
+ exit -1
+ ;;
+esac
+shift
+
+CUR_MAJOR=$(eval "get_value '${TYPE}_MAJOR'")
+CUR_MINOR=$(eval "get_value '${TYPE}_MINOR'")
+CUR_SUFFIX=$(eval "get_value '${TYPE}_VER_SUFFIX'")
NEW_MAJOR=${CUR_MAJOR}
NEW_MINOR=${CUR_MINOR}
NEW_SUFFIX=${CUR_SUFFIX}
-ESC_MMAJOR=$(escape_value ${MCL_MAJOR})
-ESC_MMINOR=$(escape_value ${MCL_MINOR})
-
ESC_MAJOR=$(escape_value ${CUR_MAJOR})
ESC_MINOR=$(escape_value ${CUR_MINOR})
ESC_SUFFIX=$(escape_value ${CUR_SUFFIX})
-patch="cat"
-
for param in $* ; do
arg=${param%%=*}
val=${param#*=}
@@ -72,32 +93,12 @@
fi
NEW_MINOR=${num}
;;
- mmajor)
- if [[ -z ${num} ]] ; then
- echo "mmajor needs a numeric argument!";
- exit -1
- fi
- MCL_MAJOR=${num}
- ;;
- mminor)
- if [[ -z ${num} ]] ; then
- echo "mminor needs a numeric argument!";
- exit -1
- fi
- MCL_MINOR=${num}
- ;;
suffix)
NEW_SUFFIX=${val}
;;
- -w)
- patch="patch -p0";
- ;;
esac
done
-[[ ${NEW_SUFFIX} == ${CUR_SUFFIX} ]] && \
- NEW_SUFFIX=${NEW_SUFFIX}/MCL-${MCL_MAJOR}.${MCL_MINOR}
-
echo "Current version: ${CUR_MAJOR}.${CUR_MINOR} (${CUR_SUFFIX})"
echo "New version: ${NEW_MAJOR}.${NEW_MINOR} (${NEW_SUFFIX})"
@@ -110,17 +111,19 @@
${file} | ${diff} ${file} - | ${patch}
file="Makefile.ag"
-sed \
- -e
"s|monetdb-${ESC_MMAJOR}\.${ESC_MMINOR}-jdbc\.jar|monetdb-${MCL_MAJOR}.${MCL_MINOR}-mcl.jar|g"
\
- -e
"s|monetdb-${ESC_MAJOR}\.${ESC_MINOR}-jdbc\.jar|monetdb-${NEW_MAJOR}.${NEW_MINOR}-jdbc.jar|g"
\
- -e
"s|jdbcclient-${ESC_MAJOR}\.${ESC_MINOR}\.jar|jdbcclient-${NEW_MAJOR}.${NEW_MINOR}.jar|g"
\
- ${file} | ${diff} ${file} - | ${patch}
+for f in $FILES ; do
+ fr=${f//XXX/${NEW_MAJOR}.${NEW_MINOR}}
+ fo=${f//XXX/${ESC_MAJOR}.${ESC_MINOR}}
+ fo=${fo//./\\.}
+ sed \
+ -e "s|${fo}|$fr|g" \
+ ${file} | ${diff} ${file} - | ${patch}
+done
file="build.properties"
sed \
- -e "s|MCL_MAJOR=${ESC_MMAJOR}|MCL_MAJOR=${MCL_MAJOR}|g" \
- -e "s|MCL_MINOR=${ESC_MMINOR}|MCL_MINOR=${MCL_MINOR}|g" \
- -e "s|JDBC_MAJOR=${ESC_MAJOR}|JDBC_MAJOR=${NEW_MAJOR}|g" \
- -e "s|JDBC_MINOR=${ESC_MINOR}|JDBC_MINOR=${NEW_MINOR}|g" \
- -e "s|JDBC_VER_SUFFIX=${ESC_SUFFIX}|JDBC_VER_SUFFIX=${NEW_SUFFIX}|g" \
+ -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
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- build.properties 20 May 2007 14:10:12 -0000 1.4
+++ build.properties 5 Jun 2007 11:31:45 -0000 1.4.2.1
@@ -19,7 +19,7 @@
# major release number
JDBC_MAJOR=1
# minor release number
-JDBC_MINOR=5
+JDBC_MINOR=6
# an additional identifying string
JDBC_VER_SUFFIX=Steadfast/MCL-1.0
# the default port to connect on, if no port given when using SQL
-------------------------------------------------------------------------
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-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
