[MOBY-guts] biomoby commit

Martin Senger senger at pub.open-bio.org
Thu May 19 20:18:54 UTC 2005


senger
Thu May 19 16:18:53 EDT 2005
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv4985

Modified Files:
	build.xml 
Log Message:


moby-live/Java build.xml,1.15,1.16
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- /home/repository/moby/moby-live/Java/build.xml	2005/05/19 15:57:21	1.15
+++ /home/repository/moby/moby-live/Java/build.xml	2005/05/19 20:18:53	1.16
@@ -1,3 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE project [
+  <!ENTITY libraries SYSTEM "file:xmls/libraries.xml">
+  <!ENTITY exceptions SYSTEM "file:xmls/exceptions.xml">
+]>
+
 <!-- =================== Build for jMoby =================== -->
 <!-- $Id$ -->
 
@@ -25,13 +31,11 @@
    <property name="src.config"   value="${src.root}/config"/>
 
    <!-- Properties for the documentation and distribution -->
-   <property name="docs.dir"            value="docs"/>
-   <property name="javadoc.dir"         value="${docs.dir}/API"/>
-   <property name="documented.packages" value="org.biomoby.shared"/>
-   <property name="documented.files"    value="${src.clients}/MobyCmdLineClient.java"/>
-   <property name="dist.dir"            value="${docs.dir}/dist"/>
+   <property name="docs.dir"     value="docs"/>
+   <property name="javadoc.dir"  value="${docs.dir}/API"/>
+   <property name="dist.dir"     value="${docs.dir}/dist"/>
 
-       <!-- The directory containing third-party libraries          -->
+   <!-- The directory containing third-party libraries          -->
    <!-- Note: this directory can be populated from remote sites -->
    <!--       using target 'gather', e.g. ./build.sh gather     -->
    <property name="lib.dir" value="lib"/>
@@ -67,110 +71,19 @@
       </fileset>
    </path>
    
-   
-   <!-- A remote URL containing third-party libraries -->
-   <!-- Note: this is used by the 'gather' task       -->
-   <property name="remote.dir" value="http://industry.ebi.ac.uk/~senger/storage/shared"/>
-
-   <!-- Excludes for compilation and API documentation -->
+   <!-- Excludes for compilation -->
    <property name="project.excludes" value="**/notyet/*"/>
 
-   <!-- Excludes for compilation under older JDK than 1.5 -->
-   <property name="version.excludes" value="**/MobyObjectDecompositionImpl.java,**/MobyObjectDecomposition.java"/>
-
-   <!-- Names of the used third-parties libraries -->
-   <property name="alltools"          value="alltools.jar"/>
-   <property name="xercesImpl"        value="xercesImpl.jar"/>
-   <property name="xercesSamples"     value="xercesSamples.jar"/>
-   <property name="xml-apis"          value="xml-apis.jar"/>
-   <property name="xmlParserAPIs"     value="xmlParserAPIs.jar"/>
-   <property name="axis-ant"          value="axis-ant.jar"/>
-   <property name="commons-discovery" value="commons-discovery.jar"/>
-   <property name="commons-logging"   value="commons-logging.jar"/>
-   <property name="jaxrpc"            value="jaxrpc.jar"/>
-   <property name="wsdl4j"            value="wsdl4j.jar"/>
-   <property name="axis"              value="axis.jar"/>
-   <property name="log4j"             value="log4j-1.2.4.jar"/>
-   <property name="saaj"              value="saaj.jar"/>
-   <property name="servlet"           value="servlet.jar"/>
-   <property name="activation"        value="activation.jar"/>
-   <property name="adenine"           value="adenine.jar"/>
-   <property name="jena"              value="jena.jar"/>
-   <property name="taverna"           value="taverna.jar"/>
-   <property name="lsid-server"       value="lsid-server-1.1.2.jar"/>
-   <property name="lsid-client"       value="lsid-client-1.1.2.jar"/>
-   <property name="mysql"             value="mysql-connector-java-3.1.7-bin.jar"/>
-   <property name="jaxen-core"        value="jaxen-core.jar"/>
-   <property name="jaxen-jdom"        value="jaxen-jdom.jar"/>
-   <property name="saxpath"           value="saxpath.jar"/>
-   <property name="xalan"             value="xalan.jar"/>
-   <property name="concurrent"        value="concurrent.jar"/>
-   <property name="icu4j"             value="icu4j.jar"/>
-   <property name="jakarta-oro"       value="jakarta-oro-2.0.5.jar"/>
-   <property name="jdom"              value="jdom.jar"/>
-   <property name="junit"             value="junit.jar"/>
-   <property name="mail"              value="mail.jar"/>
-   <property name="rdf-api"           value="rdf-api-2001-01-19.jar"/>
-   
-   
-    
-   <!-- ================================================================== -->
-   <!--                            Targets/Tasks                           -->
-   <!-- ================================================================== -->
-
-   <!-- ================================================================== -->
-   <!-- Gather                                                             -->
-   <!--                                                                    -->
-   <!-- Fetch things from the internet... just once                        -->
-   <!-- Note: Other tasks do not depend on this task explicitly            -->
-   <!--       because it would be inconvenient when you call them without  -->
-   <!--       having an internet connection. Therefore, this task is       -->
-   <!--       usually called in a separate ant invocation before anything  -->
-   <!--       else happens.                                                -->
-   <!-- ================================================================== -->
-   <target name="gather" description="Fetch all third-party libraries.">
-      <get src="${remote.dir}/${alltools}"          dest="${lib.dir}/${alltools}"   usetimestamp="true"/>
-
-      <get src="${remote.dir}/${xercesImpl}"        dest="${lib.dir}/${xercesImpl}" usetimestamp="true"/>
-      <get src="${remote.dir}/${xercesSamples}"     dest="${lib.dir}/${xercesSamples}" usetimestamp="true"/>
-      <get src="${remote.dir}/${xml-apis}"          dest="${lib.dir}/${xml-apis}" usetimestamp="true"/>
-      <get src="${remote.dir}/${xmlParserAPIs}"     dest="${lib.dir}/${xmlParserAPIs}" usetimestamp="true"/>
-
-      <get src="${remote.dir}/${axis-ant}"          dest="${lib.dir}/${axis-ant}" usetimestamp="true"/>
-      <get src="${remote.dir}/${commons-discovery}" dest="${lib.dir}/${commons-discovery}" usetimestamp="true"/>
-      <get src="${remote.dir}/${commons-logging}"   dest="${lib.dir}/${commons-logging}" usetimestamp="true"/>
-      <get src="${remote.dir}/${jaxrpc}"            dest="${lib.dir}/${jaxrpc}" usetimestamp="true"/>
-      <get src="${remote.dir}/${wsdl4j}"            dest="${lib.dir}/${wsdl4j}" usetimestamp="true"/>
-      <get src="${remote.dir}/${axis}"              dest="${lib.dir}/${axis}" usetimestamp="true"/>
-      <get src="${remote.dir}/${log4j}"             dest="${lib.dir}/${log4j}" usetimestamp="true"/>
-      <get src="${remote.dir}/${saaj}"              dest="${lib.dir}/${saaj}" usetimestamp="true"/>
-      <get src="${remote.dir}/${servlet}"           dest="${lib.dir}/${servlet}" usetimestamp="true"/>
-      <get src="${remote.dir}/${activation}"        dest="${lib.dir}/${activation}" usetimestamp="true"/>
-
-      <get src="${remote.dir}/${adenine}"           dest="${lib.dir}/${adenine}" usetimestamp="true"/>
-      <get src="${remote.dir}/${jena}"              dest="${lib.dir}/${jena}" usetimestamp="true"/>
-
-      <get src="${remote.dir}/${taverna}"           dest="${lib.dir}/${taverna}" usetimestamp="true"/>
-
-      <get src="${remote.dir}/${lsid-server}"       dest="${lib.dir}/${lsid-server}" usetimestamp="true"/>
-      <get src="${remote.dir}/${lsid-client}"       dest="${lib.dir}/${lsid-client}" usetimestamp="true"/>
-      <get src="${remote.dir}/${mysql}"             dest="${lib.dir}/${mysql}" usetimestamp="true"/>
-
-      <get src="${remote.dir}/${jaxen-core}"        dest="${lib.dir}/${jaxen-core}" usetimestamp="true"/>
-      <get src="${remote.dir}/${jaxen-jdom}"        dest="${lib.dir}/${jaxen-jdom}" usetimestamp="true"/>
-      <get src="${remote.dir}/${saxpath}"           dest="${lib.dir}/${saxpath}" usetimestamp="true"/>
-      <get src="${remote.dir}/${xalan}"             dest="${lib.dir}/${xalan}" usetimestamp="true"/>
-      <get src="${remote.dir}/${concurrent}"        dest="${lib.dir}/${concurrent}" usetimestamp="true"/>
-      <get src="${remote.dir}/${icu4j}"             dest="${lib.dir}/${icu4j}" usetimestamp="true"/>
-      <get src="${remote.dir}/${jakarta-oro}"       dest="${lib.dir}/${jakarta-oro}" usetimestamp="true"/>
-      <get src="${remote.dir}/${jdom}"              dest="${lib.dir}/${jdom}" usetimestamp="true"/>
-      <get src="${remote.dir}/${junit}"             dest="${lib.dir}/${junit}" usetimestamp="true"/>
-      <get src="${remote.dir}/${mail}"              dest="${lib.dir}/${mail}" usetimestamp="true"/>
-      <get src="${remote.dir}/${rdf-api}"           dest="${lib.dir}/${rdf-api}" usetimestamp="true"/>
-
+   <!-- Excludes for compilation under JDK older than 1.5 -->
+   <property
+     name="version.excludes"
+     value="**/MobyObjectDecompositionImpl.java,**/MobyObjectDecomposition.java"/>
 
-   </target>
+   <!-- third-party libraries -->
+   &libraries;
 
+   <!-- only for latest Java -->
+   &exceptions;
 
    <!-- ================================================================== -->
    <!-- Initialize (whatever needs to be done)                             -->
@@ -193,47 +106,6 @@
       <mkdir dir="${build.run}"/>
 
       <!-- Conditions -->
-      <condition property="libs.present">
-         <and> 
-            <available file="${lib.dir}/${alltools}"/>
-            <available file="${lib.dir}/${xercesImpl}"/>
-            <available file="${lib.dir}/${xercesSamples}"/>
-            <available file="${lib.dir}/${xml-apis}"/>
-            <available file="${lib.dir}/${xmlParserAPIs}"/>
-            <available file="${lib.dir}/${axis-ant}"/>
-            <available file="${lib.dir}/${commons-discovery}"/>
-            <available file="${lib.dir}/${commons-logging}"/>
-            <available file="${lib.dir}/${jaxrpc}"/>
-            <available file="${lib.dir}/${wsdl4j}"/>
-            <available file="${lib.dir}/${axis}"/>
-            <available file="${lib.dir}/${log4j}"/>
-	    <available file="${lib.dir}/${saaj}"/>
-            <available file="${lib.dir}/${servlet}"/>
-            <available file="${lib.dir}/${activation}"/>
-            <available file="${lib.dir}/${adenine}"/>
-            <available file="${lib.dir}/${jena}"/>
-            <available file="${lib.dir}/${taverna}"/>
-
-            <available file="${lib.dir}/${lsid-server}"/>
-            <available file="${lib.dir}/${lsid-client}"/>
-            <available file="${lib.dir}/${mysql}"/>
-
-            <available file="${lib.dir}/${jaxen-core}"/>
-            <available file="${lib.dir}/${jaxen-jdom}"/>
-            <available file="${lib.dir}/${saxpath}"/>
-            <available file="${lib.dir}/${xalan}"/>
-            <available file="${lib.dir}/${concurrent}"/>
-            <available file="${lib.dir}/${icu4j}"/>
-            <available file="${lib.dir}/${jakarta-oro}"/>
-            <available file="${lib.dir}/${jdom}"/>
-            <available file="${lib.dir}/${junit}"/>
-            <available file="${lib.dir}/${mail}"/>
-            <available file="${lib.dir}/${rdf-api}"/>
-
-
-         </and>
-      </condition>
-
       <condition property="web.xml.present">
          <available file="${src.webapps}/web.xml"/>
       </condition>
@@ -557,8 +429,6 @@
 
    </target>
 
-   
-   
    <!-- ================================================================== -->
    <!-- Builds RDF Agent files for binary distribution                     -->
    <!-- ================================================================== -->




More information about the MOBY-guts mailing list