Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14066/sql
Modified Files:
Tag: SQL_2-24
configure.ag vertoo.config vertoo.data
Log Message:
Clean-up of buildtools-, configure-, and testing-legacy in MonetDB-Java.
(
Considered as "bug-fix" by Sjoerd and me.
Has no impact on binary distributions and/or packaging.
Wrapped in tags "JavaTestingCleanUp1_before" & "JavaTestingCleanUp1_after".
Will fix or undo tomorrow in case unexpected problems occur.
)
- Removed "mjclient" as is was not packaged/distributed, anyway.
- Changed test that used "mjclient" to use "jdbcclient.jar" directly.
(Note: "jdbcclient.jar" is not packaged and/or distributed, either, but
only used internally for testing and "convenience".)
- Removed "monetdb-java-config[.bat]" as it was not packaged/distributed,
anyway.
- Changed Mtest.py (and tests) that used monetdb-java-config to find out
where the MonetDB/Java .jar's (and Java/JDBC tests) are installed,
to extract this information from CLASSPATH (falling back to
`monetdb-config --pkgdatadir`/lib and `monetdb-config --pkgdatadir`/Tests
in case CLASSPATH is not set accordingly, assuming MonetDB/Java is stalled
in the same prefix as MonetDB/Common).
- Removed all(?) code that became unused after above changes.
These changes should not break or add any inter-package/-module
dependencies.
TODO (Any help by any Java expert is more than welcome!):
====
For convenience of testing Java/JDBC functionality of binary distributions,
the tests in source/java/tests/ (installed in
<prefix>/share/MonetDB/Tests/*.class) should be collected in a single
"jdbctests.jar" (or alike) to be installed in <prefix>/share/MonetDB/Tests/
or <prefix>/share/MonetDB/lib/ (like the other *.jar files).
If necessary, the tests in sql/src/jdbc/tests/Tests/ then need to be adapted
to use the "jdbctests.jar" instead of the individual
<prefix>/share/MonetDB/Tests/*.class .
Just like "jdbcclient.jar", "jdbctests.jar" is meant for (internal) testing
convenience, only, and not to be distributed.
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/sql/vertoo.config,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -u -d -r1.31.2.1 -r1.31.2.2
--- vertoo.config 24 May 2008 17:17:09 -0000 1.31.2.1
+++ vertoo.config 1 Jul 2008 15:06:23 -0000 1.31.2.2
@@ -4,7 +4,6 @@
main = addModule('sql')
monetdb = addModule('MonetDB')
-java = addModule('java')
clients = addModule('clients')
monetdb4 = addModule('MonetDB4')
monetdb5 = addModule('MonetDB5')
@@ -56,9 +55,6 @@
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")
-
clients.setVersionFormat('@normal%[rc?%rc%build:]')
clients.addAnchor("configure.ag", "req_clients_ver=%q")
clients.addAnchors("MonetDB-SQL.spec.in",
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/sql/vertoo.data,v
retrieving revision 1.33.2.3
retrieving revision 1.33.2.4
diff -u -d -r1.33.2.3 -r1.33.2.4
--- vertoo.data 28 Jun 2008 10:19:55 -0000 1.33.2.3
+++ vertoo.data 1 Jul 2008 15:06:23 -0000 1.33.2.4
@@ -1,4 +1,3 @@
-java = major:1; minor:7; release:0; rc:x; build:1;
clients = major:1; minor:24; release:0; rc:x; build:1;
monetdb = major:1; minor:24; release:0; rc:x; build:1;
sql = major:2; minor:24; release:1; rc:x; build:1;
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/configure.ag,v
retrieving revision 1.134.2.3
retrieving revision 1.134.2.4
diff -u -d -r1.134.2.3 -r1.134.2.4
--- configure.ag 28 Jun 2008 10:19:54 -0000 1.134.2.3
+++ configure.ag 1 Jul 2008 15:06:22 -0000 1.134.2.4
@@ -66,11 +66,6 @@
AC_MSG_ERROR([MonetDB/SQL requires at least version
$req_monetdb_ver of MonetDB, but only version $MONETDB_VERSION was found.])
fi
fi
-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.24.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
