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

[jsvc.git] / build.xml

diff --git a/build.xml b/build.xml
index 43314b9..ff36849 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -12,21 +12,32 @@
     
    <target name="build-env">
       <mkdir dir="build" />
-      <mkdir dir="build/classes" />
+      <mkdir dir="build/bin" />
+      <mkdir dir="build/api" />
     </target>
 
     <target name="jsvc" depends="build-env">
-      <javac srcdir="src" destdir="build/classes" debug="on">
+      <javac srcdir="src" destdir="build/bin" debug="on" includeantruntime="true">
        <!-- <classpath refid="classpath" /> -->
         <compilerarg value="-Xlint:unchecked" />
       </javac>
-      <copy todir="build/classes/dolda/jsvc/j2ee" file="etc/web.xml.template" />
+      <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/classes" />
+        <jar destfile="build/jsvc.jar" basedir="build/bin" />
     </target>
     
+    <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>