[MOBY-guts] biomoby commit

senger@ebi.ac.uk senger at pub.open-bio.org
Thu Sep 23 00:18:01 UTC 2004


senger
Wed Sep 22 20:18:01 EDT 2004
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv16113

Modified Files:
	build.xml 
Removed Files:
	run-any-client run-any-client.bat run-cmdline-client 
	run-cmdline-client.bat run-graphs-client run-graphs-client.bat 
	run-testing-central run-testing-central.bat 
Log Message:
enhanced build.xml to support other subprojects

moby-live/Java build.xml,1.6,1.7 run-any-client,1.1,NONE run-any-client.bat,1.1,NONE run-cmdline-client,1.2,NONE run-cmdline-client.bat,1.2,NONE run-graphs-client,1.1,NONE run-graphs-client.bat,1.1,NONE run-testing-central,1.2,NONE run-testing-central.bat,1.2,NONE
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/build.xml	2003/11/09 01:05:02	1.6
+++ /home/repository/moby/moby-live/Java/build.xml	2004/09/23 00:18:00	1.7
@@ -22,6 +22,7 @@
    <property name="src.services" value="${src.root}/Services"/>
    <property name="src.webapps"  value="${src.root}/webapps"/>
    <property name="src.support"  value="${src.root}/support"/>
+   <property name="src.config"   value="${src.root}/config"/>
 
    <!-- Properties for the documentation and distribution -->
    <property name="docs.dir"            value="docs"/>
@@ -43,6 +44,7 @@
    <property name="build.services" value="${build.dir}/Services"/>
    <property name="build.dist"     value="${build.dir}/dist"/>
    <property name="build.webapps"  value="${build.dir}/webapps/jmoby"/>
+   <property name="build.run"      value="${build.dir}/run"/>
 
    <!-- Classpath -->
    <path id="build.classpath">
@@ -79,6 +81,18 @@
    <property name="activation"        value="activation.jar"/>
    <property name="adenine"           value="adenine.jar"/>
    <property name="jena"              value="jena.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                           -->
@@ -115,6 +129,20 @@
 
       <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}/${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"/>
+
+
    </target>
 
 
@@ -135,6 +163,7 @@
       <mkdir dir="${build.clients}"/>
       <mkdir dir="${build.clients}/help"/>
       <mkdir dir="${build.services}"/>
+      <mkdir dir="${build.run}"/>
 
       <!-- Conditions -->
       <condition property="libs.present">
@@ -156,6 +185,19 @@
             <available file="${lib.dir}/${activation}"/>
             <available file="${lib.dir}/${adenine}"/>
             <available file="${lib.dir}/${jena}"/>
+
+            <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>
 
@@ -209,12 +251,24 @@
          <not><isset property="dot.path"/></not>
       </condition>
 
+      <!-- Files dependent on the timestamp of the local build.properties -->
+      <dependset>
+        <srcfileset dir="${project.home}" includes="build.properties"/>
+        <srcfileset dir="${user.home}"    includes="build.properties"/>
+        <targetfileset dir="${build.run}"  includes="run-*"/>
+      </dependset>
+
+      <!-- filters for configuration files and run scripts -->
+      <filterset id="general.filter">
+        <filter token="PROJECT_HOME" value="${basedir}"/>
+      </filterset>
+
    </target>
 
    <!-- ================================================================== -->
    <!-- Compiles everything                                                -->
    <!-- ================================================================== -->
-   <target name="compile" depends="init"
+   <target name="compile" depends="init,config"
            description="Compile all source code (default).">
       <fail unless="libs.present">
       Missing one or more third-party libraries.
@@ -240,6 +294,18 @@
       </copy>
    </target>
 
+   <!-- ================================================================== -->
+   <!-- Builds config files and run-time scripts                           -->
+   <!-- ================================================================== -->
+   <target name="config" depends="init"
+     description="Create all run-time scripts.">
+     <copy todir="${build.run}">
+       <fileset dir="${src.config}" includes="run-* source.me*"/>
+       <filterset refid="general.filter"/>
+     </copy>
+     <chmod dir="${build.run}" includes="run-*" perm="a+rx"/>
+   </target>
+
    <!-- =================================================================== -->
    <!-- Creates the API documentation                                       -->
    <!-- =================================================================== -->
@@ -407,6 +473,20 @@
             <include name="*.jar"/>
             <exclude name="ant_home/*"/>
             <exclude name="servlet.jar"/>
+
+            <!-- remove it from this list only if you need something for servlets -->
+            <exclude name="jaxen-core"/>
+            <exclude name="jaxen-jdom"/>
+            <exclude name="saxpath"/>
+            <exclude name="xalan"/>
+            <exclude name="concurrent"/>
+            <exclude name="icu4j"/>
+            <exclude name="jakarta-oro"/>
+            <exclude name="jdom"/>
+            <exclude name="junit"/>
+            <exclude name="mail"/>
+            <exclude name="rdf-api"/>
+
          </lib>
          <zipfileset dir="${build.webapps}/cache" 
                      prefix="cache"/>

rcsdiff: /home/repository/moby/moby-live/Java/RCS/run-any-client,v: No such file or directory

rcsdiff: /home/repository/moby/moby-live/Java/RCS/run-any-client.bat,v: No such file or directory

rcsdiff: /home/repository/moby/moby-live/Java/RCS/run-cmdline-client,v: No such file or directory

rcsdiff: /home/repository/moby/moby-live/Java/RCS/run-cmdline-client.bat,v: No such file or directory

rcsdiff: /home/repository/moby/moby-live/Java/RCS/run-graphs-client,v: No such file or directory

rcsdiff: /home/repository/moby/moby-live/Java/RCS/run-graphs-client.bat,v: No such file or directory

rcsdiff: /home/repository/moby/moby-live/Java/RCS/run-testing-central,v: No such file or directory

rcsdiff: /home/repository/moby/moby-live/Java/RCS/run-testing-central.bat,v: No such file or directory




More information about the MOBY-guts mailing list