Mercurial > hg > monetdb-java
changeset 945:4dd3bc7162f6
repair dependencies
| author | Martin van Dinther <martin.van.dinther@monetdbsolutions.com> |
|---|---|
| date | Thu, 09 Jan 2025 17:44:02 +0100 (2 months ago) |
| parents | fc32ba68a2cc |
| children | b21578cf909f |
| files | build.xml build_jre17.xml build_jre21.xml |
| diffstat | 3 files changed, 30 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/build.xml +++ b/build.xml @@ -19,7 +19,6 @@ Copyright 1997 - July 2008 CWI. <project name="MonetDB_Java_Drivers" default="default" basedir="."> - <!-- set global properties for this build --> <property name="srcdir" value="src/main/java" /> <property name="libdir" value="lib" /> @@ -69,12 +68,13 @@ Copyright 1997 - July 2008 CWI. </target> <target name="default"> - <antcall target="jar_jdbc" /> + <antcall target="distjdbc" /> <antcall target="jar_jmonetdb" /> </target> <target name="distjdbc"> <antcall target="jar_jdbc" /> + <antcall target="jar_jdbcclient" /> </target> <target name="distmerocontrol"> @@ -88,11 +88,11 @@ Copyright 1997 - July 2008 CWI. <jar jarfile="${jdbc-jar}"> <fileset dir="${builddir}"> <include name="META-INF/services/java.sql.Driver" /> + <include name="${jdbc-package}/**/*.class" /> + <include name="${mcl-package}/**/*.class" /> + <!-- JdbcClient is now included in the JDBC jar --> <include name="${client-package}/**/*.class" /> <include name="${util-package}/**/*.class" /> - <include name="META-INF/services/java.sql.Driver" /> - <include name="${jdbc-package}/**/*.class" /> - <include name="${mcl-package}/**/*.class" /> </fileset> <manifest> <attribute name="Built-By" value="${user.name}" /> @@ -102,8 +102,7 @@ Copyright 1997 - July 2008 CWI. </target> <!-- JdbcClient is now included in the JDBC jar but we also provide it by its old name for backward compatibility --> - <target name="jar_jdbcclient" - depends="jar_jdbc"> + <target name="jar_jdbcclient" depends="jar_jdbc"> <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" /> <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" /> </target> @@ -275,11 +274,11 @@ Copyright 1997 - July 2008 CWI. <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar"> <srcfiles dir="${srcdir}"> - <include name="${client-package}/**/*.class" /> - <include name="${util-package}/**/*.class" /> <include name="META-INF/services/java.sql.Driver" /> - <include name="${jdbc-package}/**/*.class" /> - <include name="${mcl-package}/**/*.class" /> + <include name="${jdbc-package}/**/*.java" /> + <include name="${mcl-package}/**/*.java" /> + <include name="${client-package}/**/*.java" /> + <include name="${util-package}/**/*.java" /> </srcfiles> </uptodate> <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
--- a/build_jre17.xml +++ b/build_jre17.xml @@ -19,7 +19,6 @@ Copyright 1997 - July 2008 CWI. <project name="MonetDB_Java_Drivers" default="default" basedir="."> - <!-- set global properties for this build --> <property name="srcdir" value="src/main/java" /> <property name="libdir" value="lib" /> @@ -72,12 +71,13 @@ Copyright 1997 - July 2008 CWI. </target> <target name="default"> - <antcall target="jar_jdbc" /> + <antcall target="distjdbc" /> <antcall target="jar_jmonetdb" /> </target> <target name="distjdbc"> <antcall target="jar_jdbc" /> + <antcall target="jar_jdbcclient" /> </target> <target name="distmerocontrol"> @@ -91,11 +91,11 @@ Copyright 1997 - July 2008 CWI. <jar jarfile="${jdbc-jar}"> <fileset dir="${builddir}"> <include name="META-INF/services/java.sql.Driver" /> + <include name="${jdbc-package}/**/*.class" /> + <include name="${mcl-package}/**/*.class" /> + <!-- JdbcClient is now included in the JDBC jar --> <include name="${client-package}/**/*.class" /> <include name="${util-package}/**/*.class" /> - <include name="META-INF/services/java.sql.Driver" /> - <include name="${jdbc-package}/**/*.class" /> - <include name="${mcl-package}/**/*.class" /> </fileset> <manifest> <attribute name="Built-By" value="${user.name}" /> @@ -105,8 +105,7 @@ Copyright 1997 - July 2008 CWI. </target> <!-- JdbcClient is now included in the JDBC jar but we also provide it by its old name for backward compatibility --> - <target name="jar_jdbcclient" - depends="jar_jdbc"> + <target name="jar_jdbcclient" depends="jar_jdbc"> <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" /> <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" /> </target> @@ -278,11 +277,11 @@ Copyright 1997 - July 2008 CWI. <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar"> <srcfiles dir="${srcdir}"> - <include name="${client-package}/**/*.class" /> - <include name="${util-package}/**/*.class" /> <include name="META-INF/services/java.sql.Driver" /> - <include name="${jdbc-package}/**/*.class" /> - <include name="${mcl-package}/**/*.class" /> + <include name="${jdbc-package}/**/*.java" /> + <include name="${mcl-package}/**/*.java" /> + <include name="${client-package}/**/*.java" /> + <include name="${util-package}/**/*.java" /> </srcfiles> </uptodate> <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
--- a/build_jre21.xml +++ b/build_jre21.xml @@ -19,7 +19,6 @@ Copyright 1997 - July 2008 CWI. <project name="MonetDB_Java_Drivers" default="default" basedir="."> - <!-- set global properties for this build --> <property name="srcdir" value="src/main/java" /> <property name="libdir" value="lib" /> @@ -75,12 +74,13 @@ Copyright 1997 - July 2008 CWI. </target> <target name="default"> - <antcall target="jar_jdbc" /> + <antcall target="distjdbc" /> <antcall target="jar_jmonetdb" /> </target> <target name="distjdbc"> <antcall target="jar_jdbc" /> + <antcall target="jar_jdbcclient" /> </target> <target name="distmerocontrol"> @@ -94,11 +94,11 @@ Copyright 1997 - July 2008 CWI. <jar jarfile="${jdbc-jar}"> <fileset dir="${builddir}"> <include name="META-INF/services/java.sql.Driver" /> + <include name="${jdbc-package}/**/*.class" /> + <include name="${mcl-package}/**/*.class" /> + <!-- JdbcClient is now included in the JDBC jar --> <include name="${client-package}/**/*.class" /> <include name="${util-package}/**/*.class" /> - <include name="META-INF/services/java.sql.Driver" /> - <include name="${jdbc-package}/**/*.class" /> - <include name="${mcl-package}/**/*.class" /> </fileset> <manifest> <attribute name="Built-By" value="${user.name}" /> @@ -108,8 +108,7 @@ Copyright 1997 - July 2008 CWI. </target> <!-- JdbcClient is now included in the JDBC jar but we also provide it by its old name for backward compatibility --> - <target name="jar_jdbcclient" - depends="jar_jdbc"> + <target name="jar_jdbcclient" depends="jar_jdbc"> <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" /> <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" /> </target> @@ -281,11 +280,11 @@ Copyright 1997 - July 2008 CWI. <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar"> <srcfiles dir="${srcdir}"> - <include name="${client-package}/**/*.class" /> - <include name="${util-package}/**/*.class" /> <include name="META-INF/services/java.sql.Driver" /> - <include name="${jdbc-package}/**/*.class" /> - <include name="${mcl-package}/**/*.class" /> + <include name="${jdbc-package}/**/*.java" /> + <include name="${mcl-package}/**/*.java" /> + <include name="${client-package}/**/*.java" /> + <include name="${util-package}/**/*.java" /> </srcfiles> </uptodate> <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">