comparison build.xml @ 319:816650cda8d0

Include the java version in the jar files for clarity to users on which minimum Java version to use.
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Wed, 04 Sep 2019 19:40:50 +0200 (2019-09-04)
parents d4baf8a4b43a
children 54137aeb1f92
comparison
equal deleted inserted replaced
318:13a9d5316e37 319:816650cda8d0
31 <property name="mero-control-package" value="nl/cwi/monetdb/merovingian" /> 31 <property name="mero-control-package" value="nl/cwi/monetdb/merovingian" />
32 32
33 <property file="build.local.properties" /> 33 <property file="build.local.properties" />
34 <property file="build.properties" /> 34 <property file="build.properties" />
35 35
36 <property name="jdbc-jar"
37 value="${jardir}/monetdb-jdbc-${JDBC_MAJOR}.${JDBC_MINOR}.jar" />
38 <property name="jdbcclient-jar"
39 value="${jardir}/jdbcclient.jar" />
40 <property name="jmonetdb-jar"
41 value="${jardir}/jmonetdb.jar" />
42 <property name="mcl-jar"
43 value="${jardir}/monetdb-mcl-${MCL_MAJOR}.${MCL_MINOR}.jar" />
44 <property name="mero-control-jar"
45 value="${jardir}/merocontrol.jar" />
46
47 <!-- 36 <!--
48 37
49 Cross-compile for JVM 1.5 ("Java 5"). This allows the driver to work with older java installations. 38 Cross-compile for JVM 1.5 ("Java 5"). This allows the driver to work with older java installations.
50 see also https://blogs.oracle.com/darcy/entry/bootclasspath_older_source for details on the error message w.r.t rt.jar 39 see also https://blogs.oracle.com/darcy/entry/bootclasspath_older_source for details on the error message w.r.t rt.jar
51 to get around this issue, the -Xlint:-options compiler option has also been addded. 40 to get around this issue, the -Xlint:-options compiler option has also been addded.
54 Update: cross-compile for JVM 1.7 since 1.5 and 1.6 are both long 43 Update: cross-compile for JVM 1.7 since 1.5 and 1.6 are both long
55 since EOL. 44 since EOL.
56 2015-07-16, sjoerd@acm.org 45 2015-07-16, sjoerd@acm.org
57 46
58 --> 47 -->
59 <property name="jvm.version" value="1.7" /> 48 <property name="jvm.version" value="1.7" />
60 <property name="javac.flags" value="-Xlint:-options" /> 49 <property name="jre.version" value="jre7" />
50 <property name="javac.flags" value="-Xlint:-options" />
51
52 <property name="jdbc-jar"
53 value="${jardir}/monetdb-jdbc-${JDBC_MAJOR}.${JDBC_MINOR}.${jre.version}.jar" />
54 <property name="jdbcclient-jar"
55 value="${jardir}/jdbcclient.${jre.version}.jar" />
56 <property name="jmonetdb-jar"
57 value="${jardir}/jmonetdb.${jre.version}.jar" />
58 <property name="mcl-jar"
59 value="${jardir}/monetdb-mcl-${MCL_MAJOR}.${MCL_MINOR}.${jre.version}.jar" />
60 <property name="mero-control-jar"
61 value="${jardir}/merocontrol.${jre.version}.jar" />
61 62
62 <!-- full target --> 63 <!-- full target -->
63 <target name="all"> 64 <target name="all">
64 <antcall target="distjdbc" /> 65 <antcall target="distjdbc" />
65 <antcall target="distmerocontrol" /> 66 <antcall target="distmerocontrol" />