[MOBY-guts] biomoby commit

[Martin Senger]

senger
Sat Aug 27 16:33:39 EDT 2005
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv26812

Modified Files:
	build.xml 
Log Message:


moby-live/Java build.xml,1.19,1.20
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- /home/repository/moby/moby-live/Java/build.xml	2005/08/26 06:27:02	1.19
+++ /home/repository/moby/moby-live/Java/build.xml	2005/08/27 20:33:39	1.20
@@ -618,21 +618,6 @@
       <echo message="${TODAY_SHORT}"/>
       <echo message="${ant.java.version}"/>
       <echo message="${java.version}"/>
-
-      <condition property="real.java.version.latest" value="true">
-        <and>
-          <contains string="${java.version}" substring="1.5."/>
-          <or>
-            <not><isset property="java.version.latest"/></not>
-            <istrue value="${java.version.latest}"/>
-          </or>
-        </and>
-      </condition>
-      <echo message="${real.java.version.latest}"/>
-
-      <get src="http://cvs.open-bio.org/cgi-bin/viewcvs/viewcvs.cgi/*checkout*/jars-archive/current/${alltools}?rev=HEAD&amp;cvsroot=biomoby&amp;content-type=text/plain"
-          dest="${lib.dir}/${alltools}"   usetimestamp="true"/>
-
    </target>
 
 
@@ -687,6 +672,7 @@
      <copy todir="${deploy.axis.dir}/lib">
        <fileset dir="${lib.dir}">
          <include name="alltools.jar"/>
+         <include name="alltools2.jar"/>
          <include name="jdom.jar"/>
        </fileset>
        <fileset dir="${build.lib}" includes="*.jar"/>
@@ -1077,6 +1063,9 @@
      <condition property="moses.authority" value="">
        <not><isset property="moses.authority"/></not>
      </condition>
+     <condition property="dot.location" value="">
+       <not><isset property="dot.location"/></not>
+     </condition>
 
      <condition property="moses.quiet" value="no"><not><isset property="moses.quiet"/></not></condition>
      <condition property="real.moses.quiet" value="-q"><istrue value="${moses.quiet}"/></condition>
@@ -1098,6 +1087,8 @@
        <arg value="${moses.authority}"/>     <!-- TBD -->
        <arg value="-outdir"/>
        <arg file="${src.skeletons}"/>
+       <arg value="-dot"/>
+       <arg value="${dot.location}"/>
        <arg value="${real.moses.quiet}"/>
        <arg value="${real.moses.nographs}"/>
        <arg value="${real.moses.nogener}"/>