[MOBY-guts] biomoby commit

[Gary Schiltz]

gss
Wed Sep 21 19:08:04 EDT 2005
Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build
In directory pub.open-bio.org:/tmp/cvs-serv13170

Modified Files:
	build.xml 
Log Message:
Build standalone instead of being invoked from ../../build.xml

moby-live/S-MOBY/ref-impl/semanticmoby.org/build build.xml,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/build.xml	2005/03/21 21:40:00	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/build.xml	2005/09/21 23:08:04	1.2
@@ -5,9 +5,6 @@
     <!-- Relative path for where to put stuff that gets built -->
     <property name="build-dir" value="build"/>
     
-    <!-- Relative path for where javac should output class files -->
-    <property name="classes-dir" value="${build-dir}/classes"/>
-
     <!-- Directory with common jar files that are needed to compile -->
     <property name="lib-dir" value="../lib"/>
 
@@ -20,36 +17,78 @@
     <!-- Location of various resource -->
     <property name="resources-dir" value="resources"/>
 
-    <!-- Location of the deployment descriptor file -->
-    <property name="web-xml-file" value="${resources-dir}/web.xml"/>
-
     <!-- Location of the html documents -->
     <property name="htdocs-dir" value="WebRoot"/>
+    
+    <!-- Location of the WEB-INF directory -->
+    <property name="webinf-dir" value="${htdocs-dir}/WEB-INF"/>
+
+    <!-- Relative path for where javac should output class files -->
+    <property name="classes-dir" value="${webinf-dir}/classes"/>
+
+    <!-- Where to write Javadoc -->
+    <property name="javadoc-dir" value="${build-dir}/javadoc"/>
 
-    <!-- Compile all the source files that go into the library -->
+    <!-- Where to write the core Javadoc -->
+    <property name="core-javadoc-dir" value="${htdocs-dir}/developer/javadoc"/>
+
+    <!-- Location of the deployment descriptor file -->
+    <property name="web-xml-file" value="${webinf-dir}/web.xml"/>
+
+    <!-- Project-wide classpath -->
+    <path id="project.class.path">
+        <fileset dir="${lib-dir}">
+            <include name="**/*.jar"/>
+        </fileset>
+    </path>
+
+    <!-- Compile all the source files -->
     <target name="compile">
+        <!-- The core project must be compiled first, if it isn't already -->
+        <ant dir="../core"
+             antfile="../core/build/build.xml"
+             target="jar"
+             inheritAll="false"/>
         <mkdir dir="${classes-dir}"/>
         <javac srcdir="src" destdir="${classes-dir}">
-            <classpath>
-                <fileset dir="${lib-dir}">
-                    <include name="**/*.jar"/>
-                </fileset>
-            </classpath>
+            <classpath refid="project.class.path"/>
         </javac>
     </target>
     
     <!-- Package the compiled source files into the main jar file -->
     <target name="war" depends="compile">
+        <ant dir="../core"
+             antfile="../core/build/build.xml"
+             target="javadoc"
+             inheritAll="false"/>
+        <copy todir="${core-javadoc-dir}">
+            <fileset dir="../core/build/javadoc"/>
+        </copy>
+        <delete file="${war-file-path}"/>
         <war destfile="${war-file-path}" webxml="${web-xml-file}">
-            <fileset dir="${htdocs-dir}"/>
-            <classes dir="${classes-dir}"/>
+            <fileset dir="${htdocs-dir}">
+                <!-- web.xml is automatically included by the war task -->
+                <exclude name="WEB-INF/web.xml"/>
+            	<!-- Don't include files used for development & testing only -->
+            </fileset>
+            <lib dir="${lib-dir}" includes="*.jar"/>
         </war>
     </target>
 
+    <!-- Generate the Javadoc -->
+    <target name="javadoc">
+        <javadoc sourcepath="src"
+                 destdir="${javadoc-dir}">
+            <classpath refid="project.class.path"/>
+            <packageset dir="src"/>
+        </javadoc>
+    </target>
+
 	<!-- Remove the classes directory and jar file -->
 	<target name="clean">
 		<delete dir="${classes-dir}" includeEmptyDirs="true"/>
         <delete file="${war-file-path}"/>
+        <delete dir="${core-javadoc-dir}"/>
 	</target>
     
 </project>