Hoi,
for after the release, I have the attached patch ready.
Stefan
On Tue, Oct 16, 2007 at 08:08:36AM +0200, Fabian Groffen wrote:
> On 16-10-2007 07:44:47 +0200, Stefan Manegold wrote:
> > Hoi,
>
> Hi,
>
> > I don't consider the fact that our RedHat 4WS machine (titan) has only Java
> > 1.4 a limiting factor and/or reason to for the support of anchient Java 1.4.
> > My main point was to make the software requirements for MonetDB quite clear.
> > Apparently, Java 1.4 is no longer sufficient to compile all part of the
> > MonetDB SW collection. Hence, we should tighten the requirements
> > accordingly. Apparently, Java 1.5 seems to be the only version that allows
> > to compile all MonetDB relates Java code successfully. On systems that do
> > not have Java 1.5, but only Java <= 1.4 (e.g., RedHat 4WS on Itanium) or
> > only Java >= 1.6, the MonetDB-related Java code can hence not be compiled.
> > Since we know this, configure should say so instead of make failing with
> > some strange error.
>
> Yeah, and my main point is that it seems unreasonable to me to *have* to
> use *one* configure check for all sub-projects involved. clients can
> remain as-is. pathfinder just needs a check for 1.5 and up. Forcing
> 1.5 for all sub-projects sounds unreasonable and pointless to me.
>
> > Unfortunately, it's too late for this release, but the will be a next
> > (bug-fix) release.
>
> Neither did I want to suggest so.
>
> -------------------------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc.
> Still grepping through log files to find problems? Stop.
> Now Search log events and configuration files using AJAX and a browser.
> Download your FREE copy of Splunk now >> http://get.splunk.com/
> _______________________________________________
> Monetdb-developers mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/monetdb-developers
--
| Dr. Stefan Manegold | mailto:[EMAIL PROTECTED] |
| CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ |
| 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 |
| The Netherlands | Fax : +31 (20) 592-4312 |
Index: buildtools/conf/MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.37.2.6
diff -u -r1.37.2.6 MonetDB.m4
--- buildtools/conf/MonetDB.m4 14 Oct 2007 09:09:40 -0000 1.37.2.6
+++ buildtools/conf/MonetDB.m4 16 Oct 2007 06:30:22 -0000
@@ -437,6 +437,12 @@
AC_DEFUN([AM_MONETDB_COMPILER],
[
+if test "x$1" = "x"; then
+ JAVA_REQUIRED_VERSION="1.4"
+else
+ JAVA_REQUIRED_VERSION="$1"
+fi
+
AC_PROG_CPP()
dnl check for compiler (also set GCC (yes/no)).
AC_PROG_CC()
@@ -954,23 +960,23 @@
if test "x$have_java" != xno; then
AC_PATH_PROG(JAVA,java,,$JPATH)
if test "x$JAVA" != "x"; then
- AC_MSG_CHECKING([for Java >= 1.4, but < 1.6])
+ AC_MSG_CHECKING([for Java >= $JAVA_REQUIRED_VERSION, but < 1.6])
JAVA_VERSION=[`"$JAVA" -version 2>&1 | grep '[0-9]\.[0-9]' | head -n1 |
sed -e 's|^[^0-9]*||' -e 's|[^0-9]*$||'`]
- have_java_1_4=no
- if test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -ge
MONETDB_VERSION_TO_NUMBER(echo "1.4"); then
+ have_java_req=no
+ if test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -ge
MONETDB_VERSION_TO_NUMBER(echo "$JAVA_REQUIRED_VERSION"); then
if test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -lt
MONETDB_VERSION_TO_NUMBER(echo "1.6"); then
- have_java_1_4=yes
+ have_java_req=yes
fi
fi
- AC_MSG_RESULT($have_java_1_4 -> $JAVA_VERSION found)
+ AC_MSG_RESULT($have_java_req -> $JAVA_VERSION found)
fi
AC_PATH_PROG(JAVAC,javac,,$JPATH)
AC_PATH_PROG(JAR,jar,,$JPATH)
AC_PATH_PROG(JAVADOC,javadoc,,$JPATH)
- if test x$have_java_1_4 != xyes; then
+ if test x$have_java_req != xyes; then
if test "x$have_java" = xyes; then
- AC_MSG_ERROR([Java version too old (1.4 required) or too new (1.6 an
higher not yet supported)])
+ AC_MSG_ERROR([Java version too old ($JAVA_REQUIRED_VERSION required) or
too new (1.6 an higher not yet supported)])
fi
have_java=no
elif test "x$JAVAC" = "x"; then
Index: pathfinder/configure.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/configure.ag,v
retrieving revision 1.116.2.2
diff -u -r1.116.2.2 configure.ag
--- pathfinder/configure.ag 20 Sep 2007 11:42:54 -0000 1.116.2.2
+++ pathfinder/configure.ag 16 Oct 2007 06:30:22 -0000
@@ -72,7 +72,8 @@
dnl must check for compiler before checking for MonetDB4
AM_MONETDB_DEFAULTS()
-AM_MONETDB_COMPILER()
+req_java_ver=1.5
+AM_MONETDB_COMPILER($req_java_ver)
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
Index: pathfinder/src/tools/java/build.properties
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/java/build.properties,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 build.properties
--- pathfinder/src/tools/java/build.properties 10 Oct 2007 11:01:17 -0000
1.1.2.1
+++ pathfinder/src/tools/java/build.properties 16 Oct 2007 06:30:22 -0000
@@ -10,5 +10,5 @@
enable_debug=true
# should we optimize the build
enable_optimize=true
-# what JVM do we want to be compatible with? (lower than 1.4 will not work)
-javac_version=1.4
+# what JVM do we want to be compatible with? (lower than 1.5 will not work)
+javac_version=1.5
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-developers
