Update of /cvsroot/monetdb/clients/src/java
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30768
Modified Files:
Tag: Clients_1-18
Makefile.ag build.xml
Log Message:
Back-ported the way in which ant is called.
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/Makefile.ag,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -d -r1.11.2.2 -r1.11.2.3
--- Makefile.ag 16 Aug 2007 10:52:19 -0000 1.11.2.2
+++ Makefile.ag 18 Aug 2007 12:08:04 -0000 1.11.2.3
@@ -25,5 +25,5 @@
ant_distall = {
DIR = datadir/MonetDB/lib
- FILES = monetdb-1.0-mcl.jar monetdb-1.6-jdbc.jar jdbcclient.jar
xrpcwrapper-0.1.jar
+ FILES = monetdb-1.0-mcl.jar monetdb-1.6-jdbc.jar jdbcclient-1.6.jar
xrpcwrapper-0.1.jar
}
Index: build.xml
===================================================================
RCS file: /cvsroot/monetdb/clients/src/java/build.xml,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -d -r1.18.2.2 -r1.18.2.3
--- build.xml 17 Aug 2007 12:56:42 -0000 1.18.2.2
+++ build.xml 18 Aug 2007 12:08:04 -0000 1.18.2.3
@@ -34,7 +34,6 @@
<property name="jardir" value="jars" />
<property name="builddir" value="build" />
<property name="docdir" value="doc" />
- <property name="scriptdir" value="${builddir}/scripts" />
<property name="jdbc-package" value="nl/cwi/monetdb/jdbc" />
<property name="xmldb-package" value="nl/cwi/monetdb/xmldb" />
<property name="mcl-package" value="nl/cwi/monetdb/mcl" />
@@ -68,6 +67,13 @@
<antcall target="doc" />
</target>
+ <target name="distall">
+ <antcall target="jar_mcl" />
+ <antcall target="jar_jdbc" />
+ <antcall target="jar_jdbcclient" />
+ <antcall target="jar_xrpcwrapper" />
+ </target>
+
<target name="default">
<antcall target="jar_jdbcclient" />
<antcall target="jar_xrpcwrapper" />
@@ -111,36 +117,15 @@
<target name="jar_xrpcwrapper"
depends="compile_util,compile_xrpcwrapper">
- <copy file="${srcdir}/${xrpcwrapper-package}/wrapper_functions.xq"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/wrapper_functions.xq"
- filtering="yes" />
- <copy file="${srcdir}/${xrpcwrapper-package}/Tests/auctions.xml"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/Tests/auctions.xml"
- filtering="yes" />
- <copy file="${srcdir}/${xrpcwrapper-package}/Tests/bib.xml"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/Tests/bib.xml"
- filtering="yes" />
- <copy file="${srcdir}/${xrpcwrapper-package}/Tests/persons.xml"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/Tests/persons.xml"
- filtering="yes" />
- <copy file="${srcdir}/${xrpcwrapper-package}/Tests/functions.xq"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/Tests/functions.xq"
- filtering="yes" />
- <copy file="${srcdir}/${xrpcwrapper-package}/Tests/test.xq"
- overwrite="true"
- tofile="${builddir}/${xrpcwrapper-package}/Tests/test.xq"
- filtering="yes" />
<jar jarfile="${xrpcwrapper-jar}">
<fileset dir="${builddir}">
<include name="${util-package}/**/*.class" />
<include name="${xrpcwrapper-package}/**/*.class" />
+ </fileset>
+ <fileset dir="${srcdir}">
<include name="${xrpcwrapper-package}/wrapper_functions.xq" />
- <include name="${xrpcwrapper-package}/Tests/bib.xml" />
+ <include name="${xrpcwrapper-package}/Tests/*.xml" />
+ <include name="${xrpcwrapper-package}/Tests/*.xq" />
</fileset>
<manifest>
<attribute name="Built-By" value="${user.name}" />
@@ -169,32 +154,6 @@
</jar>
</target>
- <!-- a convenience script mjclient which calls the jdbcclient -->
- <target name="create_mjclient">
- <echo message="Crafting an mjclient wrapper script" />
- <filter token="JDBCCLIENT_JAR"
- value="jdbcclient-${JDBC_MAJOR}.${JDBC_MINOR}.jar" />
-
- <!-- now copy and filter the file -->
- <copy file="${scriptdir}/mjclient"
- overwrite="true"
- tofile="${builddir}/mjclient"
- filtering="yes" />
- </target>
-
- <!-- a convenience script mjclient.bat which calls the jdbcclient -->
- <target name="create_mjclient_bat">
- <echo message="Crafting an mjclient.bat wrapper script" />
- <filter token="JDBCCLIENT_JAR"
- value="jdbcclient-${JDBC_MAJOR}.${JDBC_MINOR}.jar" />
-
- <!-- now copy and filter the file -->
- <copy file="${scriptdir}/mjclient.bat"
- overwrite="true"
- tofile="${builddir}/mjclient.bat"
- filtering="yes" />
- </target>
-
<!-- compile targets -->
<target name="compile_jdbc" depends="prepare,driver">
<echo message="Compiling JDBC driver" />
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
