Mercurial > hg > monetdb-java

comparison build.xml @ 391:f523727db392

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.* This naming complies to the Java Package Naming convention as MonetDB's main website is www.monetdb.org.
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Thu, 12 Nov 2020 22:02:01 +0100 (2020-11-12)
parents b1f8750e6cde
children bf9f6b6ecf40
comparison
equal deleted inserted replaced
390:6199e0be3c6e 391:f523727db392
17 17
18 <project name="MonetDB_Java_Drivers" default="default" basedir="."> 18 <project name="MonetDB_Java_Drivers" default="default" basedir=".">
19 19
20 20
21 <!-- set global properties for this build --> 21 <!-- set global properties for this build -->
22 <property name="srcdir" value="src/main/java" /> 22 <property name="srcdir" value="src/main/java" />
23 <property name="libdir" value="lib" /> 23 <property name="libdir" value="lib" />
24 <property name="jardir" value="jars" /> 24 <property name="jardir" value="jars" />
25 <property name="builddir" value="build" /> 25 <property name="builddir" value="build" />
26 <property name="docdir" value="doc" /> 26 <property name="docdir" value="doc" />
27 <property name="jdbc-package" value="nl/cwi/monetdb/jdbc" /> 27 <property name="jdbc-package" value="org/monetdb/jdbc" />
28 <property name="mcl-package" value="nl/cwi/monetdb/mcl" /> 28 <property name="mcl-package" value="org/monetdb/mcl" />
29 <property name="client-package" value="nl/cwi/monetdb/client" /> 29 <property name="client-package" value="org/monetdb/client" />
30 <property name="util-package" value="nl/cwi/monetdb/util" /> 30 <property name="util-package" value="org/monetdb/util" />
31 <property name="mero-control-package" value="nl/cwi/monetdb/merovingian" /> 31 <property name="mero-control-package" value="org/monetdb/merovingian" />
32
33 <!-- old nl/cwi/monetdb packages for some deprecated classes as of nov2020 -->
34 <property name="nl-cwi-jdbc-package" value="nl/cwi/monetdb/jdbc" />
35 <property name="nl-cwi-mcl-package" value="nl/cwi/monetdb/mcl" />
36 <property name="nl-cwi-client-package" value="nl/cwi/monetdb/client" />
32 37
33 <property file="build.local.properties" /> 38 <property file="build.local.properties" />
34 <property file="build.properties" /> 39 <property file="build.properties" />
35 40
36 <!-- 41 <!--
92 </target> 97 </target>
93 98
94 <!-- jar targets --> 99 <!-- jar targets -->
95 <target name="jar_jdbc" depends="compile_mcl,compile_jdbc" 100 <target name="jar_jdbc" depends="compile_mcl,compile_jdbc"
96 unless="uptodate.jdbc-jar"> 101 unless="uptodate.jdbc-jar">
97 <echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">nl.cwi.monetdb.jdbc.MonetDriver</echo> 102 <echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo>
98 <jar jarfile="${jdbc-jar}"> 103 <jar jarfile="${jdbc-jar}">
99 <fileset dir="${builddir}"> 104 <fileset dir="${builddir}">
105 <include name="META-INF/services/java.sql.Driver" />
100 <include name="${jdbc-package}/**/*.class" /> 106 <include name="${jdbc-package}/**/*.class" />
107 <include name="${nl-cwi-jdbc-package}/MonetDriver.class" />
108 <include name="${nl-cwi-jdbc-package}/types/*.class" />
101 <include name="${mcl-package}/**/*.class" /> 109 <include name="${mcl-package}/**/*.class" />
102 <include name="META-INF/services/java.sql.Driver" /> 110 <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
103 </fileset> 111 </fileset>
104 </jar> 112 </jar>
105 </target> 113 </target>
106 114
107 <target name="jar_mcl" depends="compile_mcl"> 115 <target name="jar_mcl" depends="compile_mcl">
108 <jar jarfile="${mcl-jar}"> 116 <jar jarfile="${mcl-jar}">
109 <fileset dir="${builddir}"> 117 <fileset dir="${builddir}">
110 <include name="${mcl-package}/**/*.class" /> 118 <include name="${mcl-package}/**/*.class" />
119 <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
111 </fileset> 120 </fileset>
112 </jar> 121 </jar>
113 </target> 122 </target>
114 123
115 <target name="jar_client" depends="compile_util,compile_client"> 124 <target name="jar_client" depends="compile_util,compile_client">
116 <jar jarfile="${jardir}/monetdb-clients.jar"> 125 <jar jarfile="${jardir}/monetdb-clients.jar">
117 <fileset dir="${builddir}"> 126 <fileset dir="${builddir}">
118 <include name="${client-package}/**/*.class" /> 127 <include name="${client-package}/**/*.class" />
128 <include name="${nl-cwi-client-package}/JdbcClient.class" />
119 <include name="${util-package}/**/*.class" /> 129 <include name="${util-package}/**/*.class" />
120 </fileset> 130 </fileset>
121 </jar> 131 </jar>
122 </target> 132 </target>
123 133
126 depends="compile_mcl,compile_jdbc,compile_util,compile_client" 136 depends="compile_mcl,compile_jdbc,compile_util,compile_client"
127 unless="uptodate.jdbcclient-jar"> 137 unless="uptodate.jdbcclient-jar">
128 <echo message="Building jdbcclient + JDBC driver convenience jar" /> 138 <echo message="Building jdbcclient + JDBC driver convenience jar" />
129 <jar jarfile="${jdbcclient-jar}"> 139 <jar jarfile="${jdbcclient-jar}">
130 <fileset dir="${builddir}"> 140 <fileset dir="${builddir}">
131 <include name="${jdbc-package}/**/*.class" />
132 <include name="${mcl-package}/**/*.class" />
133 <include name="${client-package}/**/*.class" /> 141 <include name="${client-package}/**/*.class" />
142 <include name="${nl-cwi-client-package}/JdbcClient.class" />
134 <include name="${util-package}/**/*.class" /> 143 <include name="${util-package}/**/*.class" />
135 <include name="META-INF/services/java.sql.Driver" /> 144 <include name="META-INF/services/java.sql.Driver" />
145 <include name="${jdbc-package}/**/*.class" />
146 <include name="${nl-cwi-jdbc-package}/MonetDriver.class" />
147 <include name="${nl-cwi-jdbc-package}/types/*.class" />
148 <include name="${mcl-package}/**/*.class" />
149 <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
136 </fileset> 150 </fileset>
137 <manifest> 151 <manifest>
138 <attribute name="Built-By" value="${user.name}" /> 152 <attribute name="Built-By" value="${user.name}" />
139 <attribute name="Main-Class" value="nl.cwi.monetdb.client.JdbcClient" /> 153 <attribute name="Main-Class" value="org.monetdb.client.JdbcClient" />
140 </manifest> 154 </manifest>
141 </jar> 155 </jar>
142 </target> 156 </target>
143 157
144 <!-- a convenience jar of MeroControl plus the JMonetDB utility --> 158 <!-- a convenience jar of MeroControl plus the JMonetDB utility -->
148 <echo message="Building MeroControl + JmonetDB convenience jar" /> 162 <echo message="Building MeroControl + JmonetDB convenience jar" />
149 <jar jarfile="${jmonetdb-jar}"> 163 <jar jarfile="${jmonetdb-jar}">
150 <fileset dir="${builddir}"> 164 <fileset dir="${builddir}">
151 <include name="${mero-control-package}/**/*.class" /> 165 <include name="${mero-control-package}/**/*.class" />
152 <include name="${mcl-package}/**/*.class" /> 166 <include name="${mcl-package}/**/*.class" />
153 <include name="${client-package}/**/JMonetDB.class" /> 167 <include name="${client-package}/JMonetDB.class" />
154 <include name="${util-package}/**/*.class" /> 168 <include name="${util-package}/**/*.class" />
155 </fileset> 169 </fileset>
156 <manifest> 170 <manifest>
157 <attribute name="Built-By" value="${user.name}" /> 171 <attribute name="Built-By" value="${user.name}" />
158 <attribute name="Main-Class" value="nl.cwi.monetdb.client.JMonetDB" /> 172 <attribute name="Main-Class" value="org.monetdb.client.JMonetDB" />
159 </manifest> 173 </manifest>
160 </jar> 174 </jar>
161 </target> 175 </target>
162 176
163 <target name="jar_mero_control" 177 <target name="jar_mero_control"
184 source="${jvm.version}" 198 source="${jvm.version}"
185 target="${jvm.version}" 199 target="${jvm.version}"
186 > 200 >
187 <src path="${srcdir}" /> 201 <src path="${srcdir}" />
188 <include name="${jdbc-package}/**/*.java" /> 202 <include name="${jdbc-package}/**/*.java" />
203 <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
204 <include name="${nl-cwi-jdbc-package}/types/*.java" />
205 <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
189 <compilerarg line="${javac.flags}" /> 206 <compilerarg line="${javac.flags}" />
190 </javac> 207 </javac>
191 </target> 208 </target>
192 209
193 <target name="compile_mcl" depends="prepare"> 210 <target name="compile_mcl" depends="prepare">
201 includeantruntime="false" 218 includeantruntime="false"
202 source="${jvm.version}" 219 source="${jvm.version}"
203 target="${jvm.version}" 220 target="${jvm.version}"
204 > 221 >
205 <include name="${mcl-package}/**/*.java" /> 222 <include name="${mcl-package}/**/*.java" />
223 <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
206 <compilerarg line="${javac.flags}" /> 224 <compilerarg line="${javac.flags}" />
207 </javac> 225 </javac>
208 </target> 226 </target>
209 227
210 <target name="compile_client" depends="prepare"> 228 <target name="compile_client" depends="prepare">
218 includeantruntime="false" 236 includeantruntime="false"
219 source="${jvm.version}" 237 source="${jvm.version}"
220 target="${jvm.version}" 238 target="${jvm.version}"
221 > 239 >
222 <include name="${client-package}/**/*.java" /> 240 <include name="${client-package}/**/*.java" />
241 <include name="${nl-cwi-client-package}/JdbcClient.java" />
223 <compilerarg line="${javac.flags}" /> 242 <compilerarg line="${javac.flags}" />
224 </javac> 243 </javac>
225 </target> 244 </target>
226 245
227 <target name="compile_util" depends="prepare"> 246 <target name="compile_util" depends="prepare">
310 </condition> 329 </condition>
311 330
312 <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar"> 331 <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
313 <srcfiles dir="${srcdir}"> 332 <srcfiles dir="${srcdir}">
314 <include name="${jdbc-package}/**/*.java" /> 333 <include name="${jdbc-package}/**/*.java" />
334 <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
335 <include name="${nl-cwi-jdbc-package}/types/*.java" />
315 <include name="${mcl-package}/**/*.java" /> 336 <include name="${mcl-package}/**/*.java" />
337 <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
316 </srcfiles> 338 </srcfiles>
317 </uptodate> 339 </uptodate>
318 <uptodate targetfile="${jdbcclient-jar}" property="uptodate.jdbcclient-jar"> 340 <uptodate targetfile="${jdbcclient-jar}" property="uptodate.jdbcclient-jar">
319 <srcfiles dir="${srcdir}"> 341 <srcfiles dir="${srcdir}">
320 <include name="${client-package}/**/*.java" /> 342 <include name="${client-package}/**/*.java" />
343 <include name="${nl-cwi-client-package}/JdbcClient.java" />
321 <include name="${jdbc-package}/**/*.java" /> 344 <include name="${jdbc-package}/**/*.java" />
345 <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
346 <include name="${nl-cwi-jdbc-package}/types/*.java" />
322 <include name="${mcl-package}/**/*.java" /> 347 <include name="${mcl-package}/**/*.java" />
348 <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
323 </srcfiles> 349 </srcfiles>
324 </uptodate> 350 </uptodate>
325 <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar"> 351 <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
326 <srcfiles dir="${srcdir}"> 352 <srcfiles dir="${srcdir}">
327 <include name="${client-package}/**/*.java" /> 353 <include name="${client-package}/**/*.java" />