[MOBY-guts] biomoby commit

[senger@ebi.ac.uk]

senger
Sun Dec  5 17:28:01 EST 2004
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv14933

Modified Files:
	README build.xml 
Log Message:
a lot of changes in docs; but also in code

moby-live/Java README,1.7,1.8 build.xml,1.9,1.10
===================================================================
RCS file: /home/repository/moby/moby-live/Java/README,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- /home/repository/moby/moby-live/Java/README	2003/11/08 00:27:23	1.7
+++ /home/repository/moby/moby-live/Java/README	2004/12/05 22:28:01	1.8
@@ -73,13 +73,15 @@
 After building it all, invoke available clients using provided (and
 very simple) scripts:
 
-   ./run-cmdline-client -help
-   ./run-testing-central
+   ./build/run/run-cmdline-client -help
+   ./build/run/run-testing-central
 
 or, on Windows platforms:
 
-   run-cmdline-client.bat -help
-   run-testing-central.bat
+   build/run/run-cmdline-client.bat -help
+   build/run/run-testing-central.bat
+
+There are more scripts available - check the 'build/run' directory.
 
 Enjoy it!
 

===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- /home/repository/moby/moby-live/Java/build.xml	2004/11/01 19:21:42	1.9
+++ /home/repository/moby/moby-live/Java/build.xml	2004/12/05 22:28:01	1.10
@@ -421,26 +421,30 @@
    <!-- Builds files for binary distribution                               -->
    <!-- ================================================================== -->
    <target name="bindist" depends="compile,jar"
-      description="Create binary distribution.">
+      description="Create binary distribution with basic jMoby clients.">
 
       <!-- Name of the final binary distribution (without extension) -->
       <property name="destfile" value="${dist.dir}/jMoby-${TODAY_SHORT}"/>
 
+      <!-- Name of the final directory with binary distribution -->
+      <property name="bindist.dir" value="jMoby"/>
+
       <!-- Create a binary distribution by copying all wanted files to one place -->
+      <property name="binary.dist" value="${build.dist}/${bindist.dir}"/>
       <delete dir="${build.dist}"/>
-      <mkdir dir="${build.dist}"/>
-      <copy todir="${build.dist}/lib">
+      <mkdir dir="${binary.dist}"/>
+      <copy todir="${binary.dist}/lib">
          <fileset dir="${lib.dir}" excludes="ant_home/**" includes="*.jar"/>
          <fileset dir="${build.lib}" includes="*.jar"/>
       </copy>
-      <copy todir="${build.dist}/docs">
+      <copy todir="${binary.dist}/docs">
          <fileset dir="${docs.dir}" excludes="dist/**,graphs/**,.keep_me"/>
       </copy>
-      <copy todir="${build.dist}">
-         <fileset dir="${src.support}" excludes="_README.FIRST_"/>
+      <copy todir="${binary.dist}">
+        <fileset dir="${src.support}" excludes="_README.FIRST_,rdfagent/**"/>
          <fileset file="${basedir}/cp.bat"/>
       </copy>
-      <chmod dir="${build.dist}" perm="ugo+rx" includes="run-*" excludes="*.bat"/>
+      <chmod dir="${binary.dist}" perm="ugo+rx" includes="run-*" excludes="*.bat"/>
 
       <!-- Make both tarball and zip final files -->
 <!--
@@ -468,13 +472,16 @@
       description="Create RDF Agent binary distribution.">
 
       <!-- Name of the final binary distribution (without extension) -->
-      <property name="destfile" value="${dist.dir}/rdfagent-${TODAY_SHORT}"/>
+      <property name="rdfdestfile" value="${dist.dir}/rdfagent-${TODAY_SHORT}"/>
+
+      <!-- Name of the final directory with binary distribution -->
+      <property name="rdfagent.dir" value="rdfagent"/>
 
       <!-- Create a binary distribution by copying all wanted files to one place -->
-    
+      <property name="rdfagent.dist" value="${build.rdfagent}/${rdfagent.dir}"/>
       <delete dir="${build.rdfagent}"/>
-      <mkdir dir="${build.rdfagent}"/>
-      <copy todir="${build.rdfagent}/lib">
+      <mkdir dir="${rdfagent.dist}"/>
+      <copy todir="${rdfagent.dist}/lib">
          <fileset file="${lib.dir}/${activation}"/>
 	 <fileset file="${lib.dir}/${commons-logging}"/>
          <fileset file="${lib.dir}/${concurrent}"/>
@@ -489,18 +496,18 @@
          <fileset file="${lib.dir}/${xercesImpl}"/>
          <fileset file="${lib.dir}/${xml-apis}"/>
        </copy>	 
-       <copy todir="${build.rdfagent}">	 
+       <copy todir="${rdfagent.dist}">	 
          <fileset dir="${build.lib}" includes="RDFagent.jar"/>
       </copy>
-      <copy file="${src.config}/RDFagent_config.xml" todir="${build.rdfagent}">
+      <copy file="${src.config}/RDFagent_config.xml" todir="${rdfagent.dist}">
       </copy>       			
-      <copy todir="${build.rdfagent}">
+      <copy todir="${rdfagent.dist}">
          <fileset dir="${src.support}/rdfagent" excludes="MANIFEST.MF"/>         
       </copy>
-      <chmod dir="${build.rdfagent}" perm="ugo+rx" includes="run-RDFagent, reset" excludes="*.bat"/>
+      <chmod dir="${rdfagent.dist}" perm="ugo+rx" includes="run-RDFagent, reset" excludes="*.bat"/>
 
-      <tar destfile="${destfile}.tar.gz" basedir="${build.rdfagent}" compression="gzip"/>
-      <zip destfile="${destfile}.zip" basedir="${build.rdfagent}"/>
+      <tar destfile="${rdfdestfile}.tar.gz" basedir="${build.rdfagent}" compression="gzip"/>
+      <zip destfile="${rdfdestfile}.zip" basedir="${build.rdfagent}"/>
 
    </target>
 
@@ -608,7 +615,7 @@
    <!-- all: builds everything (except for gathering external libraries    -->
    <!--                         and for deploying to local Tomcat)         -->
    <!-- ================================================================== -->
-   <target name="all" depends="clean,compile,docs,jar,bindist,war,wardist"
+   <target name="all" depends="clean,compile,docs,jar,jar_rdfagent,bindist,wardist,bindist_rdfagent"
            description="Clean, compile, generate docs, then build all distributions."/>
 
    <!-- ================================================================== -->