Mercurial > hg > monetdb-java
diff 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 |
line wrap: on
line diff
--- a/build.xml +++ b/build.xml @@ -33,17 +33,6 @@ Copyright 1997 - July 2008 CWI, August 2 <property file="build.local.properties" /> <property file="build.properties" /> - <property name="jdbc-jar" - value="${jardir}/monetdb-jdbc-${JDBC_MAJOR}.${JDBC_MINOR}.jar" /> - <property name="jdbcclient-jar" - value="${jardir}/jdbcclient.jar" /> - <property name="jmonetdb-jar" - value="${jardir}/jmonetdb.jar" /> - <property name="mcl-jar" - value="${jardir}/monetdb-mcl-${MCL_MAJOR}.${MCL_MINOR}.jar" /> - <property name="mero-control-jar" - value="${jardir}/merocontrol.jar" /> - <!-- Cross-compile for JVM 1.5 ("Java 5"). This allows the driver to work with older java installations. @@ -56,8 +45,20 @@ Copyright 1997 - July 2008 CWI, August 2 2015-07-16, sjoerd@acm.org --> - <property name="jvm.version" value="1.7" /> - <property name="javac.flags" value="-Xlint:-options" /> + <property name="jvm.version" value="1.7" /> + <property name="jre.version" value="jre7" /> + <property name="javac.flags" value="-Xlint:-options" /> + + <property name="jdbc-jar" + value="${jardir}/monetdb-jdbc-${JDBC_MAJOR}.${JDBC_MINOR}.${jre.version}.jar" /> + <property name="jdbcclient-jar" + value="${jardir}/jdbcclient.${jre.version}.jar" /> + <property name="jmonetdb-jar" + value="${jardir}/jmonetdb.${jre.version}.jar" /> + <property name="mcl-jar" + value="${jardir}/monetdb-mcl-${MCL_MAJOR}.${MCL_MINOR}.${jre.version}.jar" /> + <property name="mero-control-jar" + value="${jardir}/merocontrol.${jre.version}.jar" /> <!-- full target --> <target name="all">