[Jmol-commits] CVS: Jmol build.xml,1.34,1.35

[Bradley S. <ye...@us...>]

Update of /cvsroot/jmol/Jmol
In directory usw-pr-cvs1:/tmp/cvs-serv12564

Modified Files:
	build.xml 
Log Message:
Excluded additional application or development jars.
Moved build of distributions into build directory.

Index: build.xml
===================================================================
RCS file: /cvsroot/jmol/Jmol/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** build.xml	30 Sep 2002 17:08:32 -0000	1.34
--- build.xml	1 Oct 2002 08:47:01 -0000	1.35
***************
*** 13,18 ****
    <property name="applet.classes.dir" value="${build.dir}/applet-classes" />
    <property name="tests.dir" value="${build.dir}/unit.tests" />
!   <property name="dist.dir" value="dist" />
!   <property name="sourcedist.dir" value="sourcedist" />
    <property name="doc.dir" value="doc" />
    <property name="javadoc.dir" value="javadoc" />
--- 13,18 ----
    <property name="applet.classes.dir" value="${build.dir}/applet-classes" />
    <property name="tests.dir" value="${build.dir}/unit.tests" />
!   <property name="dist.dir" value="${build.dir}/dist" />
!   <property name="sourcedist.dir" value="${build.dir}/sourcedist" />
    <property name="doc.dir" value="doc" />
    <property name="javadoc.dir" value="javadoc" />
***************
*** 208,211 ****
--- 208,212 ----
          <exclude name="junit.jar" />
          <exclude name="saxon.jar" />
+         <exclude name="baysmith-io.jar" />
        </fileset>
      </copy>
***************
*** 238,241 ****
--- 239,245 ----
          <exclude name="multi.jar" />
          <exclude name="saxon.jar" />
+         <exclude name="gnujaxp.jar" />
+         <exclude name="baysmith-io.jar" />
+         <exclude name="itext-0.94.jar" />
        </fileset>
      </copy>
***************
*** 298,310 ****
  
    <target name="dist.zip" depends="dist">
!     <zip zipfile="jmol-${version}.zip" basedir="${dist.dir}"
        includes="jmol-${version}/**" />
      
!     <zip zipfile="jmol-applet-${version}.zip" basedir="${dist.dir}"
        includes="jmol-applet-${version}/**" />
    </target>
  
    <target name="dist.tar.gz" depends="dist">
!     <tar tarfile="jmol-${version}.tar" basedir="${dist.dir}" excludes="**">
        <!-- The excludes="**" attribute in the tag above is a workaround
             for a problem in Ant 1.3 -->
--- 302,315 ----
  
    <target name="dist.zip" depends="dist">
!     <zip zipfile="${build.dir}/jmol-${version}.zip" basedir="${dist.dir}"
        includes="jmol-${version}/**" />
      
!     <zip zipfile="${build.dir}/jmol-applet-${version}.zip" basedir="${dist.dir}"
        includes="jmol-applet-${version}/**" />
    </target>
  
    <target name="dist.tar.gz" depends="dist">
!     <tar tarfile="${build.dir}/jmol-${version}.tar" basedir="${dist.dir}"
!         excludes="**">
        <!-- The excludes="**" attribute in the tag above is a workaround
             for a problem in Ant 1.3 -->
***************
*** 319,329 ****
        </tarfileset>
      </tar>
!     <gzip zipfile="jmol-${version}.tar.gz" src="jmol-${version}.tar"/>
!     <delete file="jmol-${version}.tar" />
      
!     <tar tarfile="jmol-applet-${version}.tar" basedir="${dist.dir}"
!       includes="jmol-applet-${version}/**"/>
!     <gzip zipfile="jmol-applet-${version}.tar.gz" src="jmol-applet-${version}.tar"/>
!     <delete file="jmol-applet-${version}.tar" />
    </target>
  
--- 324,336 ----
        </tarfileset>
      </tar>
!     <gzip zipfile="${build.dir}/jmol-${version}.tar.gz"
!         src="${build.dir}/jmol-${version}.tar"/>
!     <delete file="${build.dir}/jmol-${version}.tar" />
      
!     <tar tarfile="${build.dir}/jmol-applet-${version}.tar" basedir="${dist.dir}"
!       includes="${build.dir}/jmol-applet-${version}/**"/>
!     <gzip zipfile="${build.dir}/jmol-applet-${version}.tar.gz"
!         src="${build.dir}/jmol-applet-${version}.tar"/>
!     <delete file="${build.dir}/jmol-applet-${version}.tar" />
    </target>
  
***************
*** 355,364 ****
  
    <target name="sourcedist.zip" depends="sourcedist">
!     <zip zipfile="jmol-${version}.source.zip" basedir="${sourcedist.dir}" includes="**" />
    </target>
  
    <target name="sourcedist.tar.gz" depends="sourcedist">
!     <tar tarfile="jmol-${version}.source.tar" basedir="${sourcedist.dir}"
!         excludes="**">
        <!-- The excludes="**" attribute in the tag above is a workaround
             for a problem in Ant 1.3 -->
--- 362,372 ----
  
    <target name="sourcedist.zip" depends="sourcedist">
!     <zip zipfile="${build.dir}/jmol-${version}.source.zip"
!         basedir="${sourcedist.dir}" includes="**" />
    </target>
  
    <target name="sourcedist.tar.gz" depends="sourcedist">
!     <tar tarfile="${build.dir}/jmol-${version}.source.tar"
!         basedir="${sourcedist.dir}" excludes="**">
        <!-- The excludes="**" attribute in the tag above is a workaround
             for a problem in Ant 1.3 -->
***************
*** 373,378 ****
        </tarfileset>
      </tar>
!     <gzip zipfile="jmol-${version}.source.tar.gz" src="jmol-${version}.source.tar"/>
!     <delete file="jmol-${version}.source.tar" />
    </target>
  
--- 381,387 ----
        </tarfileset>
      </tar>
!     <gzip zipfile="${build.dir}/jmol-${version}.source.tar.gz"
!         src="${build.dir}/jmol-${version}.source.tar"/>
!     <delete file="${build.dir}/jmol-${version}.source.tar" />
    </target>
  
***************
*** 391,403 ****
    <target name="spotless" depends="clean">
      <delete dir="${build.dir}"/>
-     <delete>
-       <fileset dir=".">
-         <include name="jmol-*.zip" />
-         <include name="jmol-*.tar.gz" />
-       </fileset>
-     </delete>
      <delete dir="${javadoc.dir}"/>
-     <delete dir="${dist.dir}"/>
-     <delete dir="${sourcedist.dir}"/>
    </target>
    
--- 400,404 ----