Update of /cvsroot/monetdb/pathfinder/src/tools/java
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27856/src/tools/java

Modified Files:
        Makefile.ag build.xml 
Log Message:
- added a separate JAR package for the XRPC java API files
- added the new file for 'make rpm' as well




Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/java/Makefile.ag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.ag 15 Oct 2007 15:39:17 -0000      1.3
+++ Makefile.ag 13 Nov 2007 13:56:51 -0000      1.4
@@ -22,5 +22,5 @@
 
 ant_distall = {
        DIR = datadir/MonetDB/lib
-       FILES = xrpcwrapper.jar xrpcwrapper-test.jar
+       FILES = xrpcutil.jar xrpcwrapper.jar xrpcwrapper-test.jar
 }

Index: build.xml
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/java/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- build.xml   1 Nov 2007 14:35:12 -0000       1.5
+++ build.xml   13 Nov 2007 13:56:51 -0000      1.6
@@ -40,6 +40,8 @@
   <property file="build.local.properties" />
   <property file="build.properties" />
 
+  <property name="xrpcutil-jar"
+    value="${jardir}/xrpcutil.jar" />
   <property name="xrpcwrapper-jar"
     value="${jardir}/xrpcwrapper.jar" />
   <property name="xrpcwrapper-test-jar"
@@ -47,16 +49,26 @@
 
   <!-- full target -->
   <target name="all">
+    <antcall target="jar_xrpcutil" />
     <antcall target="jar_xrpcwrapper" />
     <antcall target="jar_xrpcwrapper_test" />
   </target>
 
   <target name="distall">
+    <antcall target="jar_xrpcutil" />
     <antcall target="jar_xrpcwrapper" />
     <antcall target="jar_xrpcwrapper_test" />
   </target>
 
   <!-- jar targets -->
+  <target name="jar_xrpcutil" depends="compile_util">
+    <jar jarfile="${xrpcutil-jar}">
+      <fileset dir="${builddir}">
+        <include name="${util-package}/**/*.class" />
+      </fileset>
+    </jar>
+  </target>
+
   <target name="jar_xrpcwrapper"
     depends="compile_util,compile_xrpcwrapper">
     <jar jarfile="${xrpcwrapper-jar}">


-------------------------------------------------------------------------
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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to