Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15634
Modified Files:
Tag: PF_ROX
INSTALL MonetDB-XQuery.spec.in VERSION configure.ag
vertoo.config vertoo.data
Log Message:
propagated changes of Saturday May 24 2008
from the development trunk to the PF_ROX branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/05/24 - stmane: INSTALL,1.29 MonetDB-XQuery.spec.in,1.53 VERSION,1.19
configure.ag,1.131 vertoo.config,1.22 vertoo.data,1.27
NT/rules.msc,1.32 NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj,1.4
NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj,1.2
runtime/pathfinder.mx,1.417 runtime/xrpc/admin/title.html.in,1.6
- Created "Stable" branches for the upcoming "Jun2008" release:
package branch-name
-----------------------
(on SourceForge)
buildtools MonetDB_1-24
MonetDB MonetDB_1-24
clients Clients_1-24
MonetDB5 MonetDB_5-6
sql SQL_2-24
geom Geom_0-4
MonetDB4 MonetDB_4-24
pathfinder XQuery_0-24
template MonetDB_1-24
(java has an independent release schema, and hence does not have/need
a CVS branch (yet?))
(CWI internally)
TestTools MonetDB_1-24
monetweb Stable_Jun2008
- Increased version numbers and set configure defaults
- Fixed vertoo.config
IMPORTANT NOTES:
1)
As usually, once I have officially released the check-in lock,
a) ALL bug fixes (and ONLY those)
MUST be checked in to the above release branches (and ONLY there)!
b) ALL new features (and ONLY those)
MUST be checked in to the development trunk (HEAD) (and ONLY there)!
(In case you need assistance please feel free to contact
[EMAIL PROTECTED] .)
Until different notice, any propagation of bug-fixes from the new release
branches to the respective development trunks will be done / controlled by
Sjoerd and me, only, i.e., no one else is supposed to do any propagation,
unless Sjoerd or I explicitly allow such propagation. Obviously, Sjoerd or I
may ask for assistance.
Propagation from the development trunks to the release branches does not
exist.
2)
At CWI, all changes for the web site that are supposed to be put online with
the upcoming "Jun2008" release must be checked in to the "Stable_Jun2008"
branch of "monetweb".
As of tomorrow morning (once nightly Stable testing has finished) this
branch will be used to build the pre-view web site on koala.
(Until the actual release, the life web site will remain being built from
the "Stable_2008-02-03" branch of "monetweb".)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/vertoo.data,v
retrieving revision 1.22.4.3
retrieving revision 1.22.4.4
diff -u -d -r1.22.4.3 -r1.22.4.4
--- vertoo.data 19 May 2008 13:53:17 -0000 1.22.4.3
+++ vertoo.data 24 May 2008 20:41:16 -0000 1.22.4.4
@@ -1,6 +1,6 @@
-pathfinder = major:0; minor:23; release:1; rc:x; build:1;
+pathfinder = major:0; minor:25; release:0; rc:x; build:1;
java = major:1; minor:7; release:0; rc:x; build:1;
-clients = major:1; minor:22; release:0; rc:x; build:1;
-monetdb = major:1; minor:23; release:1; rc:x; build:1;
-monetdb5 = major:5; minor:5; release:1; rc:x; build:1;
-monetdb4 = major:4; minor:23; release:1; rc:x; build:1;
\ No newline at end of file
+clients = major:1; minor:24; release:0; rc:x; build:1;
+monetdb = major:1; minor:24; release:0; rc:x; build:1;
+monetdb5 = major:5; minor:6; release:0; rc:x; build:1;
+monetdb4 = major:4; minor:24; release:0; rc:x; build:1;
\ No newline at end of file
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/configure.ag,v
retrieving revision 1.124.4.5
retrieving revision 1.124.4.6
diff -u -d -r1.124.4.5 -r1.124.4.6
--- configure.ag 19 May 2008 13:53:16 -0000 1.124.4.5
+++ configure.ag 24 May 2008 20:41:15 -0000 1.124.4.6
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.53)
-AC_INIT([MonetDB XQuery], [0.23.1], [EMAIL PROTECTED], [MonetDB-XQuery])
+AC_INIT([MonetDB XQuery], [0.25.0], [EMAIL PROTECTED], [MonetDB-XQuery])
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
@@ -58,7 +58,7 @@
dnl Check for Monet
-req_monetdb_ver='1.23.1'
+req_monetdb_ver='1.24.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
@@ -83,7 +83,7 @@
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
AM_MONETDB_JAVA($req_monetdb_java_ver)
-req_clients_ver='1.22.0'
+req_clients_ver='1.24.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
@@ -103,13 +103,13 @@
dnl since they use AM_CONDITIONAL. So we do both tests, but
dnl ignore their outcome if we haven't found MonetDB common before.
-req_monetdb4_ver='4.23.1'
+req_monetdb4_ver='4.24.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
AM_MONETDB4($req_monetdb4_ver)
-req_monetdb5_ver='5.5.1'
+req_monetdb5_ver='5.6.0'
# ^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
Index: VERSION
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/VERSION,v
retrieving revision 1.16.4.2
retrieving revision 1.16.4.3
diff -u -d -r1.16.4.2 -r1.16.4.3
--- VERSION 19 May 2008 13:53:15 -0000 1.16.4.2
+++ VERSION 24 May 2008 20:41:15 -0000 1.16.4.3
@@ -1 +1 @@
-0.23.1
+0.25.0
U INSTALL
Index: INSTALL
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/INSTALL,v
retrieving revision 1.26.4.2
retrieving revision 1.26.4.3
diff -u -d -r1.26.4.2 -r1.26.4.3
--- INSTALL 19 May 2008 13:53:12 -0000 1.26.4.2
+++ INSTALL 24 May 2008 20:41:15 -0000 1.26.4.3
@@ -27,7 +27,7 @@
-- MonetDB (the MonetDB main-memory database system)
Pathfinder is quite tightly coupled to the MonetDB database system.
- It depends on a version that is at least 4.23.1.
+ It depends on a version that is at least 4.24.0.
Some libraries are used or even required by the Pathfinder compiler:
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/vertoo.config,v
retrieving revision 1.21
retrieving revision 1.21.4.1
diff -u -d -r1.21 -r1.21.4.1
--- vertoo.config 3 Dec 2007 08:24:54 -0000 1.21
+++ vertoo.config 24 May 2008 20:41:15 -0000 1.21.4.1
@@ -18,6 +18,12 @@
main.addAnchor("NT/rules.msc", "VERSION = %v")
main.addAnchor("runtime/xrpc/admin/title.html.in", "MonetDB/XQuery %v")
main.addAnchor("runtime/pathfinder.mx", "MonetDB/XQuery module v%v")
+main.addAnchors("NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj",
+ arguments(pattern = '"ProductVersion" = "8:%v"',
+ format = "@normal"))
+main.addAnchors("NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj",
+ arguments(pattern = '"ProductVersion" = "8:%v"',
+ format = "@normal"))
monetdb.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
@@ -26,6 +32,14 @@
format = "%major.%minor"),
arguments(pattern = "\nRequires: MonetDB-devel >= %v",
format = "%major.%minor"))
+monetdb.addAnchors("NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj",
+ # yes: use MinVesion, not MinVersion (Microsoft typo)
+ arguments(pattern = '"FileName" = "8:libbat.dll"\n
"MinVesion" = "8:%v.0"',
+ format = "@normal"))
+monetdb.addAnchors("NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj",
+ # yes: use MinVesion, not MinVersion (Microsoft typo)
+ arguments(pattern = '"FileName" = "8:libbat.dll"\n
"MinVesion" = "8:%v.0"',
+ format = "@normal"))
java.setVersionFormat('@normal%[rc?%rc%build:]')
java.addAnchor("configure.ag", "req_monetdb_java_ver=%q")
@@ -43,6 +57,14 @@
format = "%major.%minor"),
arguments(pattern = "\nRequires: MonetDB4-server-devel >=
%v",
format = "%major.%minor"))
+monetdb4.addAnchors("NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj",
+ # yes: use MinVesion, not MinVersion (Microsoft typo)
+ arguments(pattern = '"FileName" = "8:libmonet.dll"\n
"MinVesion" = "8:%v.0"',
+ format = "@normal"))
+monetdb4.addAnchors("NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj",
+ # yes: use MinVesion, not MinVersion (Microsoft typo)
+ arguments(pattern = '"FileName" = "8:libmonet.dll"\n
"MinVesion" = "8:%v.0"',
+ format = "@normal"))
monetdb5.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb5.addAnchor("configure.ag", "req_monetdb5_ver=%q")
Index: MonetDB-XQuery.spec.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/MonetDB-XQuery.spec.in,v
retrieving revision 1.48.4.4
retrieving revision 1.48.4.5
diff -u -d -r1.48.4.4 -r1.48.4.5
--- MonetDB-XQuery.spec.in 19 May 2008 13:53:14 -0000 1.48.4.4
+++ MonetDB-XQuery.spec.in 24 May 2008 20:41:15 -0000 1.48.4.5
@@ -22,18 +22,18 @@
Source:
http://downloads.sourceforge.net/monetdb/MonetDB-XQuery-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: MonetDB4-server >= 4.23
+Requires: MonetDB4-server >= 4.24
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
%{!?buildsystem: %define buildsystem 0}
%if !%{?buildsystem}
-BuildRequires: MonetDB-devel >= 1.23
+BuildRequires: MonetDB-devel >= 1.24
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
-BuildRequires: MonetDB4-server-devel >= 4.23
+BuildRequires: MonetDB4-server-devel >= 4.24
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
@@ -52,11 +52,11 @@
Summary: MonetDB XQuery development package
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
-Requires: MonetDB-devel >= 1.23
+Requires: MonetDB-devel >= 1.24
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
-Requires: MonetDB4-server-devel >= 4.23
+Requires: MonetDB4-server-devel >= 4.24
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
