Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29197
Modified Files:
Tag: SQL_2-18
MonetDB-SQL.pc.in VERSION configure.ag vertoo.config
vertoo.data
Log Message:
- created new release branches:
buildtools: MonetDB_1-18
MonetDB: MonetDB_1-18
clients: Clients_1-18
MonetDB4: MonetDB_4-18
MonetDB5: MonetDB_5-0
template: MonetDB_1-18
sql: SQL_2-18
pathfinder: XQuery_0-18
- updated version numbers in release branches and development trunks
As usually:
all bug-fixes go to the new release branches, only;
all new features go to the development trunks, only.
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/sql/vertoo.config,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- vertoo.config 21 Jan 2007 16:01:38 -0000 1.13
+++ vertoo.config 3 Jun 2007 20:19:09 -0000 1.13.2.1
@@ -17,6 +17,12 @@
main.addAnchor("VERSION", "%v")
main.addAnchor("configure.ag", '"sql", %v,')
main.addAnchor("NT/rules.msc", "VERSION = %v")
+main.addAnchors("NT/MonetDB4-SQL/MonetDB4-Installer.vdproj",
+ arguments(pattern = "MonetDB-SQL-%v",
+ format = '@normal'))
+main.addAnchors("NT/MonetDB5-SQL/MonetDB5-Installer.vdproj",
+ arguments(pattern = "MonetDB-SQL-%v",
+ format = '@normal'))
monetdb.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
@@ -33,6 +39,9 @@
monetdb5.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb5.addAnchor("configure.ag", "req_monetdb5_ver=%q")
+monetdb5.addAnchors("NT/MonetDB5-SQL/MonetDB5-Installer.vdproj",
+ arguments(pattern = "\"ProductVersion\" = \"8:%v\"",
+ format = '@normal'))
#jdbc.setVersionFormat('%major.%minor (%suffix)')
#jdbc.addAnchors("src/jdbc/build.properties",
Index: VERSION
===================================================================
RCS file: /cvsroot/monetdb/sql/VERSION,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- VERSION 28 Jan 2007 21:35:22 -0000 1.22
+++ VERSION 3 Jun 2007 20:19:08 -0000 1.22.2.1
@@ -1 +1 @@
-2.17.1
+2.18.0
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/sql/vertoo.data,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -d -r1.23 -r1.23.2.1
--- vertoo.data 28 Jan 2007 21:35:22 -0000 1.23
+++ vertoo.data 3 Jun 2007 20:19:09 -0000 1.23.2.1
@@ -1,5 +1,5 @@
-monetdb = major:1; minor:17; release:0; rc:x; build:1;
-monetdb4 = major:4; minor:17; release:0; rc:x; build:1;
-clients = major:1; minor:17; release:0; rc:x; build:1;
-monetdb5 = major:5; minor:0; release:0; rc:_beta; build:2;
-sql = major:2; minor:17; release:1; rc:x; build:1;
\ No newline at end of file
+monetdb = major:1; minor:18; release:0; rc:x; build:1;
+monetdb4 = major:4; minor:18; release:0; rc:x; build:1;
+clients = major:1; minor:18; release:0; rc:x; build:1;
+monetdb5 = major:5; minor:0; release:0; rc:x; build:1;
+sql = major:2; minor:18; release:0; rc:x; build:1;
\ No newline at end of file
Index: MonetDB-SQL.pc.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.pc.in,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -d -r1.28 -r1.28.2.1
--- MonetDB-SQL.pc.in 23 Mar 2007 18:25:58 -0000 1.28
+++ MonetDB-SQL.pc.in 3 Jun 2007 20:19:08 -0000 1.28.2.1
@@ -28,6 +28,6 @@
Name: ${pkg}
Description: A SQL/ODBC/JDBC interface to MonetDB.
Version: @VERSION@
-Requires: MonetDB >= 4.17.0
+Requires: MonetDB >= 4.18.0
Cflags: -I${includedir}/sql
Libs: -L${libdir} -lMonetODBC
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/configure.ag,v
retrieving revision 1.114
retrieving revision 1.114.2.1
diff -u -d -r1.114 -r1.114.2.1
--- configure.ag 29 Mar 2007 16:01:23 -0000 1.114
+++ configure.ag 3 Jun 2007 20:19:09 -0000 1.114.2.1
@@ -26,13 +26,13 @@
AH_BOTTOM([#include "stddef.h"])
dnl ----------------------
-AM_INIT_AUTOMAKE("sql", 2.17.1, [no-define])
+AM_INIT_AUTOMAKE("sql", 2.18.0, [no-define])
AM_CONFIG_HEADER(sql_config.h:conf/config.h.in)
CONFIG_H=sql_config.h
AC_SUBST(CONFIG_H)
dnl Check for Monet
-req_monetdb_ver='1.17.0'
+req_monetdb_ver='1.18.0'
AM_MONETDB_COMMON($req_monetdb_ver)
if test "x$have_monetdb" != xyes; then
if test "x$MONETDBVERS" = "x"; then
@@ -41,7 +41,7 @@
AC_MSG_ERROR([MonetDB/SQL requires at least version
$req_monetdb_ver of MonetDB, but only version $MONETDBVERS was found.])
fi
fi
-req_clients_ver='1.17.0'
+req_clients_ver='1.18.0'
AM_MONETDB_CLIENTS($req_clients_ver)
AM_MONETDB_DEFAULTS()
AM_MONETDB_COMPILER()
@@ -49,9 +49,9 @@
AM_MONETDB_OPTIONS()
AM_MONETDB_LIBS()
AM_MONETDB_UTILS()
-req_monetdb4_ver='4.17.0'
+req_monetdb4_ver='4.18.0'
AM_MONETDB4($req_monetdb4_ver)
-req_monetdb5_ver='5.0.0_beta2'
+req_monetdb5_ver='5.0.0'
AM_MONETDB5($req_monetdb5_ver)
if test "x$have_monetdb4" != xyes -a "x$have_monetdb5" != xyes; then
-------------------------------------------------------------------------
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-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
