Changeset: 84ccfd207347 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84ccfd207347
Modified Files:
java/build.xml
Branch: maven
Log Message:
Do not build a JDBC jar with Ant, Maven will do that now
diffs (62 lines):
diff --git a/java/build.xml b/java/build.xml
--- a/java/build.xml
+++ b/java/build.xml
@@ -34,8 +34,6 @@ Copyright 2008-2015 MonetDB B.V.
<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"
@@ -90,36 +88,6 @@ Copyright 2008-2015 MonetDB B.V.
<antcall target="jar_mero_control" />
</target>
- <!-- jar targets -->
- <target name="jar_jdbc" depends="compile_mcl,compile_jdbc"
- unless="uptodate.jdbc-jar">
- <echo file="${builddir}/META-INF/services/java.sql.Driver"
append="false">nl.cwi.monetdb.jdbc.MonetDriver</echo>
- <jar jarfile="${jdbc-jar}">
- <fileset dir="${builddir}">
- <include name="${jdbc-package}/**/*.class" />
- <include name="${mcl-package}/**/*.class" />
- <include name="META-INF/services/java.sql.Driver" />
- </fileset>
- </jar>
- </target>
-
- <target name="jar_mcl" depends="compile_mcl">
- <jar jarfile="${mcl-jar}">
- <fileset dir="${builddir}">
- <include name="${mcl-package}/**/*.class" />
- </fileset>
- </jar>
- </target>
-
- <target name="jar_client" depends="compile_util,compile_client">
- <jar jarfile="${jardir}/monetdb-clients.jar">
- <fileset dir="${builddir}">
- <include name="${client-package}/**/*.class" />
- <include name="${util-package}/**/*.class" />
- </fileset>
- </jar>
- </target>
-
<!-- a convenience jar of JDBC plus the JdbcClient utililty -->
<target name="jar_jdbcclient"
depends="compile_mcl,compile_jdbc,compile_util,compile_client"
@@ -308,12 +276,6 @@ Copyright 2008-2015 MonetDB B.V.
</not>
</condition>
- <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
- <srcfiles dir="${srcdir}">
- <include name="${jdbc-package}/**/*.java" />
- <include name="${mcl-package}/**/*.java" />
- </srcfiles>
- </uptodate>
<uptodate targetfile="${jdbcclient-jar}"
property="uptodate.jdbcclient-jar">
<srcfiles dir="${srcdir}">
<include name="${client-package}/**/*.java" />
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
