Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc

[jsvc.git] / build.xml

diff --git a/build.xml b/build.xml
index c7a3065..ff36849 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -13,33 +13,31 @@
    <target name="build-env">
       <mkdir dir="build" />
       <mkdir dir="build/bin" />
-      <mkdir dir="build/test-bin" />
+      <mkdir dir="build/api" />
     </target>
 
     <target name="jsvc" depends="build-env">
-      <javac srcdir="src" destdir="build/bin" debug="on">
+      <javac srcdir="src" destdir="build/bin" debug="on" includeantruntime="true">
        <!-- <classpath refid="classpath" /> -->
         <compilerarg value="-Xlint:unchecked" />
       </javac>
       <copy todir="build/bin/dolda/jsvc/j2ee" file="etc/web.xml.template" />
+      <copy todir="build/bin/dolda/jsvc/next/catalog">
+       <fileset dir="etc/catalog" />
+      </copy>
     </target>
     
     <target name="jsvc-jar" depends="build-env, jsvc">
         <jar destfile="build/jsvc.jar" basedir="build/bin" />
     </target>
     
-    <target name="test-war" depends="build-env, jsvc-jar">
-      <taskdef name="jsvc-war" classname="dolda.jsvc.j2ee.Archive$AntTask" classpath="build/jsvc.jar" />
-      <copy tofile="build/test-bin/jsvc.properties" file="etc/test.jsvc.properties" />
-      <jar destfile="build/jsvc-test.jar" basedir="build/test-bin" />
-      <jsvc-war destfile="build/jsvc-test.war">
-       <jars dir="build">
-         <include name="jsvc.jar" />
-         <include name="jsvc-test.jar" />
-       </jars>
-      </jsvc-war>
+    <target name="javadoc" depends="jsvc-jar">
+      <javadoc packagenames="dolda.jsvc.*"
+              sourcepath="src"
+              destdir="build/api" />
+      <zip destfile="build/jsvc-api.zip" basedir="build/api" />
     </target>
-    
+
     <target name="clean">
        <delete dir="build" />
     </target>