[MOBY-guts] biomoby commit

[senger at ebi.ac.uk]

senger
Wed Sep 24 10:33:37 EDT 2003
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv13154

Modified Files:
	build.xml run-cmdline-client run-cmdline-client.bat 
	run-testing-central run-testing-central.bat 
Log Message:
still adding ant and changing directory structure

moby-live/Java build.xml,1.1,1.2 run-cmdline-client,1.1,1.2 run-cmdline-client.bat,1.1,1.2 run-testing-central,1.1,1.2 run-testing-central.bat,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/build.xml	2003/09/24 12:33:47	1.1
+++ /home/repository/moby/moby-live/Java/build.xml	2003/09/24 14:33:37	1.2
@@ -1,7 +1,7 @@
 <!-- =================== Build for jMoby =================== -->
 <!-- $Id$ -->
 
-<project name="BioMoby in Java" default="compile" basedir=".">
+<project name="jMoby: BioMoby in Java" default="compile" basedir=".">
 
    <!-- ================================================================== -->
    <!--                            Properties                              -->
@@ -16,13 +16,15 @@
    <property name="lib.dir" value="lib"/>
 
    <!-- Temporary build directories -->
-   <property name="build.dir" value="build"/>
+   <property name="build.dir"     value="build"/>
    <property name="build.classes" value="${build.dir}/classes"/>
-   <property name="build.lib" value="${build.dir}/lib"/>
+   <property name="build.lib"     value="${build.dir}/lib"/>
+   <property name="build.clients" value="${build.dir}/Clients"/>
 
    <!-- Classpath -->
    <path id="build.classpath">
-      <pathelement location="${classes}"/>
+      <pathelement location="${build.classes}"/>
+      <pathelement location="${build.clients}"/>
       <fileset dir="${lib.dir}">
          <include name="*.jar"/>
       </fileset>
@@ -32,9 +34,6 @@
    <!-- Note: this is used by the 'gather' task       -->
    <property name="remote.dir" value="http://industry.ebi.ac.uk/~senger/storage/shared"/>
 
-   <!-- The Java compiler -->
-   <property name="build.compiler" value="jikes"/>
-
    <!-- Excludes for compilation and API documentation -->
    <property name="project.excludes" value="**/notyet/*"/>
 
@@ -73,18 +72,37 @@
       <mkdir dir="${build.dir}"/>
       <mkdir dir="${build.classes}"/>
       <mkdir dir="${build.lib}"/>
+      <mkdir dir="${build.clients}"/>
+      <mkdir dir="${build.clients}/help"/>
    </target>
 
    <target name="clean" description="Remove all generated files.">
       <delete dir="${build.dir}"/>
    </target>
 
+   <target name="cleanall" depends="clean"
+           description="Remove all generated files and third-party libraries.">
+      <delete>
+         <fileset dir="${lib.dir}">
+            <include name="*.jar"/>
+         </fileset>
+      </delete>
+   </target>
+
    <target name="compile" depends="prepare" description="Compiles all source code.">
-      <javac srcdir="${src.dir}"
+      <javac srcdir="${src.dir}/main"
              destdir="${build.classes}"
              excludes="${project.excludes}">
          <classpath refid="build.classpath"/>
       </javac>
+      <javac srcdir="${src.dir}/Clients"
+             destdir="${build.clients}"
+             excludes="${project.excludes}">
+         <classpath refid="build.classpath"/>
+      </javac>
+      <copy todir="${build.clients}/help">
+         <fileset dir="${src.dir}/Clients/help"/>
+      </copy>
    </target>
 
 <!--

===================================================================
RCS file: /home/repository/moby/moby-live/Java/run-cmdline-client,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/run-cmdline-client	2003/09/24 12:33:47	1.1
+++ /home/repository/moby/moby-live/Java/run-cmdline-client	2003/09/24 14:33:37	1.2
@@ -12,7 +12,7 @@
 # ----------------------------------------------------
 
 CLASSPATH=./build/classes
-CLASSPATH=./src/Clients:$CLASSPATH
+CLASSPATH=./build/Clients:$CLASSPATH
 CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH
 
 exec java -cp $CLASSPATH MobyCmdLineClient "$@"

===================================================================
RCS file: /home/repository/moby/moby-live/Java/run-cmdline-client.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/run-cmdline-client.bat	2003/09/24 12:33:47	1.1
+++ /home/repository/moby/moby-live/Java/run-cmdline-client.bat	2003/09/24 14:33:37	1.2
@@ -3,5 +3,6 @@
 set CP=
 for %%i in (lib\*.jar) do call cp.bat %%i
 set CP=build\classes;%CP%
+set CP=build\Clients;%CP%
 
 java -classpath %CP% MobyCmdLineClient %1 %2 %3 %4 %5 %6 %7 %8 %9

===================================================================
RCS file: /home/repository/moby/moby-live/Java/run-testing-central,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/run-testing-central	2003/09/24 12:33:47	1.1
+++ /home/repository/moby/moby-live/Java/run-testing-central	2003/09/24 14:33:37	1.2
@@ -12,6 +12,7 @@
 # ----------------------------------------------------
 
 CLASSPATH=./build/classes
+CLASSPATH=./build/Clients:$CLASSPATH
 CLASSPATH=`echo lib/*.jar | tr ' ' ':'`:$CLASSPATH
 
 exec java -cp $CLASSPATH TestingCentral "$@"

===================================================================
RCS file: /home/repository/moby/moby-live/Java/run-testing-central.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/run-testing-central.bat	2003/09/24 12:33:47	1.1
+++ /home/repository/moby/moby-live/Java/run-testing-central.bat	2003/09/24 14:33:37	1.2
@@ -3,5 +3,6 @@
 set CP=
 for %%i in (lib\*.jar) do call cp.bat %%i
 set CP=build\classes;%CP%
+set CP=build\Clients;%CP%
 
 java -classpath %CP% TestingCentral %1 %2 %3 %4 %5 %6 %7 %8 %9