Mercurial > hg > monetdb-java

comparison build.xml @ 942:45c26b1a0677

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include all of JdbcClient in the jdbc jar
author Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
date Wed, 08 Jan 2025 17:30:48 +0100 (3 months ago)
parents d416e9b6b3d0
children 4dd3bc7162f6
comparison
equal deleted inserted replaced
941:8dca959599c8 942:45c26b1a0677
67 <antcall target="distjdbc" /> 67 <antcall target="distjdbc" />
68 <antcall target="distmerocontrol" /> 68 <antcall target="distmerocontrol" />
69 </target> 69 </target>
70 70
71 <target name="default"> 71 <target name="default">
72 <antcall target="jar_jdbcclient" /> 72 <antcall target="jar_jdbc" />
73 <antcall target="jar_jmonetdb" /> 73 <antcall target="jar_jmonetdb" />
74 </target> 74 </target>
75 75
76 <target name="distjdbc"> 76 <target name="distjdbc">
77 <antcall target="jar_jdbc" /> 77 <antcall target="jar_jdbc" />
78 <antcall target="jar_jdbcclient" />
79 </target> 78 </target>
80 79
81 <target name="distmerocontrol"> 80 <target name="distmerocontrol">
82 <antcall target="jar_mero_control" /> 81 <antcall target="jar_mero_control" />
83 </target> 82 </target>
84 83
85 <!-- jar targets --> 84 <!-- jar targets -->
86 <target name="jar_jdbc" depends="compile_mcl,compile_jdbc" 85 <target name="jar_jdbc" depends="compile_mcl,compile_jdbc,compile_util,compile_client"
87 unless="uptodate.jdbc-jar"> 86 unless="uptodate.jdbc-jar">
88 <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>
89 <jar jarfile="${jdbc-jar}"> 88 <jar jarfile="${jdbc-jar}">
90 <fileset dir="${builddir}"> 89 <fileset dir="${builddir}">
91 <include name="META-INF/services/java.sql.Driver" /> 90 <include name="META-INF/services/java.sql.Driver" />
92 <include name="${jdbc-package}/**/*.class" />
93 <include name="${mcl-package}/**/*.class" />
94 <include name="${util-package}/FileTransferHandler.class" />
95 </fileset>
96 </jar>
97 </target>
98
99 <target name="jar_client" depends="compile_util,compile_client">
100 <jar jarfile="${jardir}/monetdb-clients.jar">
101 <fileset dir="${builddir}">
102 <include name="${client-package}/**/*.class" />
103 <include name="${util-package}/**/*.class" />
104 </fileset>
105 </jar>
106 </target>
107
108 <!-- a convenience jar of jdbcclient command line program plus JDBC driver -->
109 <target name="jar_jdbcclient"
110 depends="compile_mcl,compile_jdbc,compile_util,compile_client"
111 unless="uptodate.jdbcclient-jar">
112 <echo message="Building jdbcclient + JDBC driver convenience jar" />
113 <jar jarfile="${jdbcclient-jar}">
114 <fileset dir="${builddir}">
115 <include name="${client-package}/**/*.class" /> 91 <include name="${client-package}/**/*.class" />
116 <include name="${util-package}/**/*.class" /> 92 <include name="${util-package}/**/*.class" />
117 <include name="META-INF/services/java.sql.Driver" /> 93 <include name="META-INF/services/java.sql.Driver" />
118 <include name="${jdbc-package}/**/*.class" /> 94 <include name="${jdbc-package}/**/*.class" />
119 <include name="${mcl-package}/**/*.class" /> 95 <include name="${mcl-package}/**/*.class" />
121 <manifest> 97 <manifest>
122 <attribute name="Built-By" value="${user.name}" /> 98 <attribute name="Built-By" value="${user.name}" />
123 <attribute name="Main-Class" value="org.monetdb.client.JdbcClient" /> 99 <attribute name="Main-Class" value="org.monetdb.client.JdbcClient" />
124 </manifest> 100 </manifest>
125 </jar> 101 </jar>
102 </target>
103
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"
106 depends="jar_jdbc">
107 <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" />
108 <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" />
126 </target> 109 </target>
127 110
128 <!-- a convenience jar of MeroControl plus the JMonetDB utility --> 111 <!-- a convenience jar of MeroControl plus the JMonetDB utility -->
129 <target name="jar_jmonetdb" 112 <target name="jar_jmonetdb"
130 depends="compile_mcl,compile_util,compile_mero_control,compile_client" 113 depends="compile_mcl,compile_util,compile_mero_control,compile_client"
290 </not> 273 </not>
291 </condition> 274 </condition>
292 275
293 <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar"> 276 <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
294 <srcfiles dir="${srcdir}"> 277 <srcfiles dir="${srcdir}">
295 <include name="${jdbc-package}/**/*.java" /> 278 <include name="${client-package}/**/*.class" />
296 <include name="${mcl-package}/**/*.java" /> 279 <include name="${util-package}/**/*.class" />
297 </srcfiles> 280 <include name="META-INF/services/java.sql.Driver" />
298 </uptodate> 281 <include name="${jdbc-package}/**/*.class" />
299 <uptodate targetfile="${jdbcclient-jar}" property="uptodate.jdbcclient-jar"> 282 <include name="${mcl-package}/**/*.class" />
300 <srcfiles dir="${srcdir}">
301 <include name="${client-package}/**/*.java" />
302 <include name="${jdbc-package}/**/*.java" />
303 <include name="${mcl-package}/**/*.java" />
304 </srcfiles> 283 </srcfiles>
305 </uptodate> 284 </uptodate>
306 <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar"> 285 <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
307 <srcfiles dir="${srcdir}"> 286 <srcfiles dir="${srcdir}">
308 <include name="${client-package}/**/*.java" /> 287 <include name="${client-package}/**/*.java" />