Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29765/pathfinder
Modified Files:
configure.ag vertoo.config vertoo.data
Log Message:
Summary:
--------
Separated MonetDB-releated Java code from "MonetDB Clients"
clients/src/java
into its own "MonetDB Java" CVS module
java
(For time being?) "MonetDB Java" compiles just like the remaining
MonetDB-related code, and required buildtools only when compiled from CVS
source.
"MonetDB Java" does not require an other MonetDB package.
No other MonetDB package requires "MonetDB Java".
Hence, "MonetDB Java" cn be built independently of the other MonetDB
packages.
Details & Background:
---------------------
To allow implementation of versioning-, packaging-, & release-schemes for
MonetDB's Java/JDBC Support & Interface that are decoupled from the
respective schemes used for the (mainly C-based) remainder of the MonetDB
product family,
I implemented a move of the code from "clients/src/java/" into "java/", a
new separate CVS module for "MonetDB Java".
(For now?) it comes with all the infrastructure of the usual MonetDB
building process (stripped-down, though, to the limited requirements),
including `./bootstrap`, `configure`, `make`, `make check`, `sh RunMtest`,
`make dist`, `make rpm`, `make install`, & .`Mtest.py -rq`.
Version number maintenance within "java/" is done exclusively by
java/version.sh, no vertoo involved, here.
To build. the new "MonetDB Java" requires only the buildtools (and that only
when building straight from CVS).
To run `make check` and/or `Mtest.py -rq`, Mtest.py from MonetDB Common must
be available in the PATH, though.
sql and pathfinder now check for the availability of MonetDB Java before
running their Java/JDBC tests.
On the live web site, the related Current-TestWeb pages have been updated.
Updating the build documentation in the development web site still has to be
done.
Caveat:
-------
`make rpm` requesting "noarch" does not work, yet.
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/vertoo.config,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- vertoo.config 22 Oct 2007 12:30:14 -0000 1.19
+++ vertoo.config 28 Nov 2007 16:24:00 -0000 1.20
@@ -3,6 +3,7 @@
main = addModule('pathfinder')
monetdb = addModule('MonetDB')
+java = addModule('java')
clients = addModule('clients')
monetdb4 = addModule('MonetDB4')
monetdb5 = addModule('MonetDB5')
@@ -26,6 +27,9 @@
arguments(pattern = "\nRequires: MonetDB-devel >= %v",
format = "%major.%minor"))
+java.setVersionFormat('@normal%[rc?%rc%build:]')
+java.addAnchor("configure.ag", "req_monetdb_java_ver=%q")
+
clients.setVersionFormat('@normal%[rc?%rc%build:]')
clients.addAnchor("configure.ag", "req_clients_ver=%q")
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/vertoo.data,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- vertoo.data 8 Oct 2007 23:49:49 -0000 1.21
+++ vertoo.data 28 Nov 2007 16:24:00 -0000 1.22
@@ -1,5 +1,6 @@
-monetdb = major:1; minor:21; release:0; rc:x; build:1;
-monetdb4 = major:4; minor:21; release:0; rc:x; build:1;
+pathfinder = major:0; minor:21; release:0; rc:x; build:1;
+java = major:1; minor:7; release:0; rc:x; build:1;
clients = major:1; minor:20; release:0; rc:x; build:1;
+monetdb = major:1; minor:21; release:0; rc:x; build:1;
monetdb5 = major:5; minor:3; release:0; rc:x; build:1;
-pathfinder = major:0; minor:21; release:0; rc:x; build:1;
\ No newline at end of file
+monetdb4 = major:4; minor:21; 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.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- configure.ag 24 Oct 2007 08:03:44 -0000 1.120
+++ configure.ag 28 Nov 2007 16:24:00 -0000 1.121
@@ -72,12 +72,18 @@
dnl must check for compiler before checking for MonetDB4
AM_MONETDB_DEFAULTS()
-req_java_ver_min=1.5 # >= $req_java_ver_min required
-AM_MONETDB_COMPILER($req_java_ver_min)
+AM_MONETDB_COMPILER()
if test "x$have_c99" != xyes; then
AC_MSG_ERROR([Pathfinder requires a C99 compliant C compiler, but your
C compiler does not seem to be C99 compliant.])
fi
+req_java_ver_min=1.5 # >= $req_java_ver_min required
+AM_MONETDB_ANT_JAVA($req_java_ver_min)
+req_monetdb_java_ver='1.7.0'
+# ^^^^^^
+# 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.20.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
