Skip to content

Commit

Permalink
Include all of JdbcClient in the jdbc jar
Browse files Browse the repository at this point in the history
  • Loading branch information
@joerivanruth
joerivanruth committed Jan 8, 2025
1 parent 2f99328 commit 995d5fc
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 105 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# ChangeLog file for monetdb-java
# This file is updated with Maddlog

* Wed Jan 8 2025 Joeri van Ruth <[email protected]>
- The JDBC jar now includes JdbcClient. For backward compatibility the jar
is still also available as jdbcclient.jreX.jar.

* Thu Nov 7 2024 Martin van Dinther <[email protected]>
- In JdbcClient when running the \vsci or \vdbi or \vsi commands, we now
suppress "42000 SELECT: insufficient privileges for ..." and
Expand Down
49 changes: 14 additions & 35 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,49 +69,25 @@ Copyright 1997 - July 2008 CWI.
</target>

<target name="default">
<antcall target="jar_jdbcclient" />
<antcall target="jar_jdbc" />
<antcall target="jar_jmonetdb" />
</target>

<target name="distjdbc">
<antcall target="jar_jdbc" />
<antcall target="jar_jdbcclient" />
</target>

<target name="distmerocontrol">
<antcall target="jar_mero_control" />
</target>

<!-- jar targets -->
<target name="jar_jdbc" depends="compile_mcl,compile_jdbc"
<target name="jar_jdbc" depends="compile_mcl,compile_jdbc,compile_util,compile_client"
unless="uptodate.jdbc-jar">
<echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo>
<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" />
<include name="${util-package}/FileTransferHandler.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 jdbcclient command line program plus JDBC driver -->
<target name="jar_jdbcclient"
depends="compile_mcl,compile_jdbc,compile_util,compile_client"
unless="uptodate.jdbcclient-jar">
<echo message="Building jdbcclient + JDBC driver convenience jar" />
<jar jarfile="${jdbcclient-jar}">
<fileset dir="${builddir}">
<include name="${client-package}/**/*.class" />
<include name="${util-package}/**/*.class" />
<include name="META-INF/services/java.sql.Driver" />
Expand All @@ -125,6 +101,13 @@ Copyright 1997 - July 2008 CWI.
</jar>
</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">
<echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" />
<copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" />
</target>

<!-- a convenience jar of MeroControl plus the JMonetDB utility -->
<target name="jar_jmonetdb"
depends="compile_mcl,compile_util,compile_mero_control,compile_client"
Expand Down Expand Up @@ -292,15 +275,11 @@ Copyright 1997 - July 2008 CWI.

<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" />
<include name="${jdbc-package}/**/*.java" />
<include name="${mcl-package}/**/*.java" />
<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" />
</srcfiles>
</uptodate>
<uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
Expand Down
49 changes: 14 additions & 35 deletions build_jre17.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,49 +72,25 @@ Copyright 1997 - July 2008 CWI.
</target>

<target name="default">
<antcall target="jar_jdbcclient" />
<antcall target="jar_jdbc" />
<antcall target="jar_jmonetdb" />
</target>

<target name="distjdbc">
<antcall target="jar_jdbc" />
<antcall target="jar_jdbcclient" />
</target>

<target name="distmerocontrol">
<antcall target="jar_mero_control" />
</target>

<!-- jar targets -->
<target name="jar_jdbc" depends="compile_mcl,compile_jdbc"
<target name="jar_jdbc" depends="compile_mcl,compile_jdbc,compile_util,compile_client"
unless="uptodate.jdbc-jar">
<echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo>
<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" />
<include name="${util-package}/FileTransferHandler.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 jdbcclient command line program plus JDBC driver -->
<target name="jar_jdbcclient"
depends="compile_mcl,compile_jdbc,compile_util,compile_client"
unless="uptodate.jdbcclient-jar">
<echo message="Building jdbcclient + JDBC driver convenience jar" />
<jar jarfile="${jdbcclient-jar}">
<fileset dir="${builddir}">
<include name="${client-package}/**/*.class" />
<include name="${util-package}/**/*.class" />
<include name="META-INF/services/java.sql.Driver" />
Expand All @@ -128,6 +104,13 @@ Copyright 1997 - July 2008 CWI.
</jar>
</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">
<echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" />
<copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" />
</target>

<!-- a convenience jar of MeroControl plus the JMonetDB utility -->
<target name="jar_jmonetdb"
depends="compile_mcl,compile_util,compile_mero_control,compile_client"
Expand Down Expand Up @@ -295,15 +278,11 @@ Copyright 1997 - July 2008 CWI.

<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" />
<include name="${jdbc-package}/**/*.java" />
<include name="${mcl-package}/**/*.java" />
<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" />
</srcfiles>
</uptodate>
<uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
Expand Down
49 changes: 14 additions & 35 deletions build_jre21.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,49 +75,25 @@ Copyright 1997 - July 2008 CWI.
</target>

<target name="default">
<antcall target="jar_jdbcclient" />
<antcall target="jar_jdbc" />
<antcall target="jar_jmonetdb" />
</target>

<target name="distjdbc">
<antcall target="jar_jdbc" />
<antcall target="jar_jdbcclient" />
</target>

<target name="distmerocontrol">
<antcall target="jar_mero_control" />
</target>

<!-- jar targets -->
<target name="jar_jdbc" depends="compile_mcl,compile_jdbc"
<target name="jar_jdbc" depends="compile_mcl,compile_jdbc,compile_util,compile_client"
unless="uptodate.jdbc-jar">
<echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo>
<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" />
<include name="${util-package}/FileTransferHandler.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 jdbcclient command line program plus JDBC driver -->
<target name="jar_jdbcclient"
depends="compile_mcl,compile_jdbc,compile_util,compile_client"
unless="uptodate.jdbcclient-jar">
<echo message="Building jdbcclient + JDBC driver convenience jar" />
<jar jarfile="${jdbcclient-jar}">
<fileset dir="${builddir}">
<include name="${client-package}/**/*.class" />
<include name="${util-package}/**/*.class" />
<include name="META-INF/services/java.sql.Driver" />
Expand All @@ -131,6 +107,13 @@ Copyright 1997 - July 2008 CWI.
</jar>
</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">
<echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" />
<copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" />
</target>

<!-- a convenience jar of MeroControl plus the JMonetDB utility -->
<target name="jar_jmonetdb"
depends="compile_mcl,compile_util,compile_mero_control,compile_client"
Expand Down Expand Up @@ -298,15 +281,11 @@ Copyright 1997 - July 2008 CWI.

<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" />
<include name="${jdbc-package}/**/*.java" />
<include name="${mcl-package}/**/*.java" />
<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" />
</srcfiles>
</uptodate>
<uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
Expand Down

0 comments on commit 995d5fc

Please sign in to comment.