comparison build.xml @ 945:4dd3bc7162f6

repair dependencies
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Thu, 09 Jan 2025 17:44:02 +0100 (3 months ago)
parents 45c26b1a0677
children 52508322a849
comparison
equal deleted inserted replaced
944:fc32ba68a2cc 945:4dd3bc7162f6
16 Build file to allow ant (http://ant.apache.org/) to be used 16 Build file to allow ant (http://ant.apache.org/) to be used
17 to build the MonetDB Java packages, such as the JDBC driver. 17 to build the MonetDB Java packages, such as the JDBC driver.
18 --> 18 -->
19 19
20 <project name="MonetDB_Java_Drivers" default="default" basedir="."> 20 <project name="MonetDB_Java_Drivers" default="default" basedir=".">
21
22 21
23 <!-- set global properties for this build --> 22 <!-- set global properties for this build -->
24 <property name="srcdir" value="src/main/java" /> 23 <property name="srcdir" value="src/main/java" />
25 <property name="libdir" value="lib" /> 24 <property name="libdir" value="lib" />
26 <property name="jardir" value="jars" /> 25 <property name="jardir" value="jars" />
67 <antcall target="distjdbc" /> 66 <antcall target="distjdbc" />
68 <antcall target="distmerocontrol" /> 67 <antcall target="distmerocontrol" />
69 </target> 68 </target>
70 69
71 <target name="default"> 70 <target name="default">
72 <antcall target="jar_jdbc" /> 71 <antcall target="distjdbc" />
73 <antcall target="jar_jmonetdb" /> 72 <antcall target="jar_jmonetdb" />
74 </target> 73 </target>
75 74
76 <target name="distjdbc"> 75 <target name="distjdbc">
77 <antcall target="jar_jdbc" /> 76 <antcall target="jar_jdbc" />
77 <antcall target="jar_jdbcclient" />
78 </target> 78 </target>
79 79
80 <target name="distmerocontrol"> 80 <target name="distmerocontrol">
81 <antcall target="jar_mero_control" /> 81 <antcall target="jar_mero_control" />
82 </target> 82 </target>
86 unless="uptodate.jdbc-jar"> 86 unless="uptodate.jdbc-jar">
87 <echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo> 87 <echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo>
88 <jar jarfile="${jdbc-jar}"> 88 <jar jarfile="${jdbc-jar}">
89 <fileset dir="${builddir}"> 89 <fileset dir="${builddir}">
90 <include name="META-INF/services/java.sql.Driver" /> 90 <include name="META-INF/services/java.sql.Driver" />
91 <include name="${jdbc-package}/**/*.class" />
92 <include name="${mcl-package}/**/*.class" />
93 <!-- JdbcClient is now included in the JDBC jar -->
91 <include name="${client-package}/**/*.class" /> 94 <include name="${client-package}/**/*.class" />
92 <include name="${util-package}/**/*.class" /> 95 <include name="${util-package}/**/*.class" />
93 <include name="META-INF/services/java.sql.Driver" />
94 <include name="${jdbc-package}/**/*.class" />
95 <include name="${mcl-package}/**/*.class" />
96 </fileset> 96 </fileset>
97 <manifest> 97 <manifest>
98 <attribute name="Built-By" value="${user.name}" /> 98 <attribute name="Built-By" value="${user.name}" />
99 <attribute name="Main-Class" value="org.monetdb.client.JdbcClient" /> 99 <attribute name="Main-Class" value="org.monetdb.client.JdbcClient" />
100 </manifest> 100 </manifest>
101 </jar> 101 </jar>
102 </target> 102 </target>
103 103
104 <!-- JdbcClient is now included in the JDBC jar but we also provide it by its old name for backward compatibility --> 104 <!-- JdbcClient is now included in the JDBC jar but we also provide it by its old name for backward compatibility -->
105 <target name="jar_jdbcclient" 105 <target name="jar_jdbcclient" depends="jar_jdbc">
106 depends="jar_jdbc">
107 <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" /> 106 <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" />
108 <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" /> 107 <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" />
109 </target> 108 </target>
110 109
111 <!-- a convenience jar of MeroControl plus the JMonetDB utility --> 110 <!-- a convenience jar of MeroControl plus the JMonetDB utility -->
273 </not> 272 </not>
274 </condition> 273 </condition>
275 274
276 <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar"> 275 <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
277 <srcfiles dir="${srcdir}"> 276 <srcfiles dir="${srcdir}">
278 <include name="${client-package}/**/*.class" />
279 <include name="${util-package}/**/*.class" />
280 <include name="META-INF/services/java.sql.Driver" /> 277 <include name="META-INF/services/java.sql.Driver" />
281 <include name="${jdbc-package}/**/*.class" /> 278 <include name="${jdbc-package}/**/*.java" />
282 <include name="${mcl-package}/**/*.class" /> 279 <include name="${mcl-package}/**/*.java" />
280 <include name="${client-package}/**/*.java" />
281 <include name="${util-package}/**/*.java" />
283 </srcfiles> 282 </srcfiles>
284 </uptodate> 283 </uptodate>
285 <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar"> 284 <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
286 <srcfiles dir="${srcdir}"> 285 <srcfiles dir="${srcdir}">
287 <include name="${client-package}/**/*.java" /> 286 <include name="${client-package}/**/*.java" />