Skip to content

Commit

Permalink
repair dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvdvm
mvdvm committed Jan 9, 2025
1 parent d0172b7 commit 9aff261
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 33 deletions.
21 changes: 10 additions & 11 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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">
Expand All @@ -87,12 +87,12 @@ Copyright 1997 - July 2008 CWI.
<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="${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" />
<!-- JdbcClient is now included in the JDBC jar -->
<include name="${client-package}/**/*.class" />
<include name="${util-package}/**/*.class" />
</fileset>
<manifest>
<attribute name="Built-By" value="${user.name}" />
Expand All @@ -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>
Expand Down Expand Up @@ -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">
Expand Down
21 changes: 10 additions & 11 deletions build_jre17.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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">
Expand All @@ -90,12 +90,12 @@ Copyright 1997 - July 2008 CWI.
<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="${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" />
<!-- JdbcClient is now included in the JDBC jar -->
<include name="${client-package}/**/*.class" />
<include name="${util-package}/**/*.class" />
</fileset>
<manifest>
<attribute name="Built-By" value="${user.name}" />
Expand All @@ -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>
Expand Down Expand Up @@ -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">
Expand Down
21 changes: 10 additions & 11 deletions build_jre21.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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">
Expand All @@ -93,12 +93,12 @@ Copyright 1997 - July 2008 CWI.
<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="${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" />
<!-- JdbcClient is now included in the JDBC jar -->
<include name="${client-package}/**/*.class" />
<include name="${util-package}/**/*.class" />
</fileset>
<manifest>
<attribute name="Built-By" value="${user.name}" />
Expand All @@ -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>
Expand Down Expand Up @@ -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">
Expand Down

0 comments on commit 9aff261

Please sign in to comment.