[Cdk-commits] CVS: cdk build.xml,1.71,1.72

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk
In directory sc8-pr-cvs1:/tmp/cvs-serv31484

Modified Files:
	build.xml 
Log Message:
Fixed dist.extra target. Not all classes were added to the jar: it did
not depend on the compile target.


Index: build.xml
===================================================================
RCS file: /cvsroot/cdk/cdk/build.xml,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** build.xml	22 Nov 2002 12:29:15 -0000	1.71
--- build.xml	22 Nov 2002 12:49:59 -0000	1.72
***************
*** 57,61 ****
          </target>
  
!         <target name="compile" depends="info, clean, init">
                  <echo message="Compiling only the classes that don't use Java3d." />
  
--- 57,61 ----
          </target>
  
!         <target name="compile" depends="info, init">
                  <echo message="Compiling only the classes that don't use Java3d." />
  
***************
*** 79,82 ****
--- 79,84 ----
                               libraries, and which are compiled elsewhere -->
                          <exclude name="org/openscience/cdk/applications/**/*.java" />
+                         <!-- exclude patch versions -->
+                         <exclude name="org/openscience/cdk/**/*.applet.java" />
  
                          <classpath refid="project.class.path" />
***************
*** 152,155 ****
--- 154,159 ----
          </target>
  
+         <target name="compile-extra" depends="compile"/>
+ 
          <target name="compile-cml">
                  <!-- Task to build the CML Lib classes. (For Jmol) -->
***************
*** 266,273 ****
          </target>
  
!         <target name="dist-extra" depends="dist-core">
                  <jar jarfile="${dist}/jar/cdk-extra.jar">
                      <fileset dir="${build}">
!                         <include name="**/cdk/**" />
                          <!-- Exclude core classes -->
                          <exclude name="org/openscience/cdk/AtomContainer.class" />
--- 270,277 ----
          </target>
  
!         <target name="dist-extra" depends="dist-core, compile-extra">
                  <jar jarfile="${dist}/jar/cdk-extra.jar">
                      <fileset dir="${build}">
!                         <include name="org/openscience/cdk/**/**" />
                          <!-- Exclude core classes -->
                          <exclude name="org/openscience/cdk/AtomContainer.class" />