Menu
▾
▴
[Cdk-commits] CVS: cdk build.xml,1.53,1.54
|
From: Egon W. <eg...@us...> - 2002-07-30 18:55:43
|
Update of /cvsroot/cdk/cdk
In directory usw-pr-cvs1:/tmp/cvs-serv8693
Modified Files:
build.xml
Log Message:
Added JUnit test for libio/joelib/Convertor.java. Adapted build.xml
for correct compilation.
Index: build.xml
===================================================================
RCS file: /cvsroot/cdk/cdk/build.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** build.xml 23 Jul 2002 12:12:54 -0000 1.53
--- build.xml 30 Jul 2002 18:55:40 -0000 1.54
***************
*** 6,11 ****
<property name="dist" value="dist" />
<property name="doc" value="doc" />
! <property name="src" value="src" />
! <property name="lib" value="jar" />
<property name="src.tests" value="${src}/org/openscience/cdk/test" />
<property name="reports.tests" value="reports" />
--- 6,11 ----
<property name="dist" value="dist" />
<property name="doc" value="doc" />
! <property name="src" value="src" />
! <property name="lib" value="jar" />
<property name="src.tests" value="${src}/org/openscience/cdk/test" />
<property name="reports.tests" value="reports" />
***************
*** 77,80 ****
--- 77,81 ----
libraries, and are compiled elsewhere -->
<exclude name="org/openscience/cdk/libio/**" />
+ <exclude name="org/openscience/cdk/test/libio/**" />
<classpath refid="project.class.path" />
***************
*** 92,95 ****
--- 93,97 ----
<javac destdir="${build}" optimize="off" debug="on" deprecation="off">
<src path="${src}/org/openscience/cdk/libio" />
+ <src path="${src}/org/openscience/cdk/test/libio" />
<classpath refid="project.class.path" />
***************
*** 153,161 ****
--- 155,168 ----
<include name="org/openscience/cdk/BioPolymer.class" />
<include name="org/openscience/cdk/Bond.class" />
+ <include name="org/openscience/cdk/CDKConstants.class" />
<include name="org/openscience/cdk/ChemModel.class" />
<include name="org/openscience/cdk/ChemObject.class" />
+ <include name="org/openscience/cdk/ChemObjectListener.class" />
<include name="org/openscience/cdk/ChemSequence.class" />
<include name="org/openscience/cdk/ElectronContainer.class" />
<include name="org/openscience/cdk/Element.class" />
+ <include name="org/openscience/cdk/event/ChemObjectChangeEvent.class" />
+ <include name="org/openscience/cdk/exception/CDKException.class" />
+ <include name="org/openscience/cdk/exception/NoSuchAtomException.class" />
<include name="org/openscience/cdk/Isotope.class" />
<include name="org/openscience/cdk/Molecule.class" />
***************
*** 180,188 ****
--- 187,200 ----
<exclude name="org/openscience/cdk/BioPolymer.class" />
<exclude name="org/openscience/cdk/Bond.class" />
+ <exclude name="org/openscience/cdk/CDKConstants.class" />
<exclude name="org/openscience/cdk/ChemModel.class" />
<exclude name="org/openscience/cdk/ChemObject.class" />
+ <exclude name="org/openscience/cdk/ChemObjectListener.class" />
<exclude name="org/openscience/cdk/ChemSequence.class" />
<exclude name="org/openscience/cdk/ElectronContainer.class" />
<exclude name="org/openscience/cdk/Element.class" />
+ <exclude name="org/openscience/cdk/event/ChemObjectChangeEvent.class" />
+ <exclude name="org/openscience/cdk/exception/CDKException.class" />
+ <exclude name="org/openscience/cdk/exception/NoSuchAtomException.class" />
<exclude name="org/openscience/cdk/Isotope.class" />
<exclude name="org/openscience/cdk/Molecule.class" />
***************
*** 194,197 ****
--- 206,210 ----
<!-- Exclude libio classes -->
<exclude name="org/openscience/cdk/libio/**" />
+ <exclude name="org/openscience/cdk/test/libio/**" />
</fileset>
</jar>
***************
*** 202,205 ****
--- 215,219 ----
<fileset dir="${build}">
<include name="org/openscience/cdk/libio/**" />
+ <include name="org/openscience/cdk/test/libio/**" />
</fileset>
</jar>
***************
*** 308,321 ****
</target>
! <target name="run-with-java3d"
! depends="dist-with-java3d">
! <java
! classname="org.openscience.cdk.test.OrbitalsRenderer3DTest"
! fork="yes">
! <arg value="data/reserpine.mol" />
!
<classpath>
<pathelement location="${dist}/jar/cdk-core.jar" />
! <pathelement location="${dist}/jar/cdk-extra-with-java3d.jar" />
<pathelement path="${java.class.path}" />
<pathelement location="." />
--- 322,331 ----
</target>
! <target name="test-libio" depends="dist-libio">
! <java classname="org.openscience.cdk.test.libio.joelib.JOELibIOTest" fork="yes">
<classpath>
<pathelement location="${dist}/jar/cdk-core.jar" />
! <pathelement location="${dist}/jar/cdk-extra.jar" />
! <pathelement location="${dist}/jar/cdk-libio.jar" />
<pathelement path="${java.class.path}" />
<pathelement location="." />
***************
*** 323,327 ****
<include name="*.jar" />
</fileset>
! <fileset dir="${pathto3djava}">
<include name="*.jar" />
</fileset>
--- 333,337 ----
<include name="*.jar" />
</fileset>
! <fileset dir="${lib}/libio">
<include name="*.jar" />
</fileset>
***************
*** 330,338 ****
</target>
! <target name="run" depends="dist">
! <java classname="org.openscience.cdk.test.FingerprinterTest" fork="yes">
<classpath>
<pathelement location="${dist}/jar/cdk-core.jar" />
! <pathelement location="${dist}/jar/cdk-extra.jar" />
<pathelement path="${java.class.path}" />
<pathelement location="." />
--- 340,353 ----
</target>
! <target name="run-with-java3d"
! depends="dist-with-java3d">
! <java
! classname="org.openscience.cdk.test.OrbitalsRenderer3DTest"
! fork="yes">
! <arg value="data/reserpine.mol" />
!
<classpath>
<pathelement location="${dist}/jar/cdk-core.jar" />
! <pathelement location="${dist}/jar/cdk-extra-with-java3d.jar" />
<pathelement path="${java.class.path}" />
<pathelement location="." />
***************
*** 340,359 ****
<include name="*.jar" />
</fileset>
</classpath>
</java>
</target>
! <target name="runLibIOTest" depends="dist">
! <java classname="org.openscience.cdk.libio.joelib.LibIOTest" fork="yes">
<classpath>
<pathelement location="${dist}/jar/cdk-core.jar" />
<pathelement location="${dist}/jar/cdk-extra.jar" />
- <pathelement location="${dist}/jar/cdk-libio.jar" />
<pathelement path="${java.class.path}" />
<pathelement location="." />
<fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${lib}/libio">
<include name="*.jar" />
</fileset>
--- 355,373 ----
<include name="*.jar" />
</fileset>
+ <fileset dir="${pathto3djava}">
+ <include name="*.jar" />
+ </fileset>
</classpath>
</java>
</target>
! <target name="run" depends="dist">
! <java classname="org.openscience.cdk.test.FingerprinterTest" fork="yes">
<classpath>
<pathelement location="${dist}/jar/cdk-core.jar" />
<pathelement location="${dist}/jar/cdk-extra.jar" />
<pathelement path="${java.class.path}" />
<pathelement location="." />
<fileset dir="${lib}">
<include name="*.jar" />
</fileset>
|