svn commit: r641908 - /tomcat/sandbox/tomcat-oacc/trunk/build.xml

[rjung]

Author: rjung
Date: Thu Mar 27 10:25:34 2008
New Revision: 641908

URL: http://svn.apache.org/viewvc?rev=641908&view=rev
Log:
Prepare ant file for addition of docs sub directory.

Modified:
    tomcat/sandbox/tomcat-oacc/trunk/build.xml

Modified: tomcat/sandbox/tomcat-oacc/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.xml?rev=641908&r1=641907&r2=641908&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.xml Thu Mar 27 10:25:34 2008
@@ -76,13 +76,23 @@
   </target>
 
   <!-- =================== BUILD: Create Directories ====================== -->
+
   <target name="build-prepare">
     <mkdir dir="${oacc.build}"/>
     <mkdir dir="${oacc.build}/classes"/>
-    <mkdir dir="${oacc.dist}"/>
   </target>
 
+  <!-- =================== BUILD: All ====================== -->
+
+  <target name="build-all" depends="build-oacc,build-docs">
+  </target>
+
+
+  <!-- =================== BUILD: Documentation ====================== -->
 
+  <target name="build-docs">
+    <ant dir="docs"/>
+  </target>
 
 
   <!-- ================ BUILD: Compile Catalina Components ================ -->
@@ -123,7 +133,7 @@
   <target name="javadoc">
     <delete dir="${oacc.build}/javadoc"/>
     <mkdir dir="${oacc.build}/javadoc"/>
-    <javadoc packagenames="org.apache.catalina.*,org.apache.naming.*"
+    <javadoc packagenames="org.apache.catalina.*"
       classpathref="catalina.classpath"
       sourcepathref="javadoc.sourcepath"
       destdir="${oacc.build}/javadoc"
@@ -131,7 +141,7 @@
       version="true"
       windowtitle="Catalina Internal API Documentation"
       doctitle="Catalina API"
-      bottom="Copyright &#169; 2000-2007 Apache Software Foundation.  All 
Rights Reserved."
+      bottom="Copyright &#169; 2000-2008 Apache Software Foundation.  All 
Rights Reserved."
     />
   </target>
 
@@ -147,16 +157,24 @@
 
 
 
+  <!-- ======================= DIST: Create Directories =================== -->
+  <target name="dist-prepare">
+    <mkdir dir="${oacc.dist}"/>
+    <mkdir dir="${oacc.dist}/lib"/>
+    <mkdir dir="${oacc.dist}/docs"/>
+  </target>
+
+
   <!-- ================ DIST: Create Distribution ========================= -->
-  <target name="dist" depends="build-oacc">
+  <target name="dist" depends="build-all,dist-prepare">
 
-    <jar destfile="${oacc.dist}/catalina-oacc.jar"
+    <jar destfile="${oacc.dist}/lib/catalina-oacc.jar"
          basedir="${oacc.build}/classes">
        <include name="org/apache/catalina/cluster/**" />
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />
     </jar>
-    <jar destfile="${oacc.dist}/catalina-sso.jar"
+    <jar destfile="${oacc.dist}/lib/catalina-sso.jar"
          basedir="${oacc.build}/classes">
        <include name="org/apache/catalina/authenticator/**" />
        <exclude name="**/package.html" />
@@ -165,13 +183,18 @@
   </target>
 
   <target name="copy" depends="dist" >
-     <copy file="${oacc.dist}/catalina-oacc.jar" todir="${catalina.build}/lib" 
/>
+     <copy file="${oacc.dist}/lib/catalina-oacc.jar" 
todir="${catalina.build}/lib" />
   </target>
 
-  <!-- ======================== DIST: Clean Directory ===================== -->
+  <!-- ======================= DIST: Clean Directory ====================== -->
+  <target name="dist-clean">
+    <delete dir="${oacc.dist}/${docs.dir}"/>
+  </target>
 
 
   <!-- ====================== Convenient Synonyms ========================= -->
+  <target name="clean" depends="build-clean,dist-clean"
+   description="Clean build and dist directories"/>
 
 
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]