From: <eg...@us...> - 2008-02-17 08:13:25
|
Revision: 10150 http://cdk.svn.sourceforge.net/cdk/?rev=10150&view=rev Author: egonw Date: 2008-02-17 00:13:14 -0800 (Sun, 17 Feb 2008) Log Message: ----------- Compiling weka depending code is now optional Modified Paths: -------------- branches/cdk-1.0.x/build.xml branches/cdk-1.0.x/src/org/openscience/cdk/libio/weka/Weka.java Modified: branches/cdk-1.0.x/build.xml =================================================================== --- branches/cdk-1.0.x/build.xml 2008-02-17 07:36:36 UTC (rev 10149) +++ branches/cdk-1.0.x/build.xml 2008-02-17 08:13:14 UTC (rev 10150) @@ -15,6 +15,7 @@ <!-- where to find some libraries --> <property name="pathtojoelib" value="jar/libio" /> <property name="pathtojmol" value="jar/libio" /> + <property name="weka.jar" value="weja.jar"/> <!-- directories --> <property name="build" value="build" /> @@ -80,6 +81,7 @@ <echo message=" JAI found: ${jai.present}" /> <echo message=" XIndice found: ${xindice.present}"/> <echo message=" SJava found: ${sjava.present}"/> + <echo message=" Weka found: ${weka.present}"/> <echo message=" --- optional libraries ---" /> <echo message="" /> <echo message="Compiling:" /> @@ -122,6 +124,7 @@ <available property="cmllibs.present" file="${lib}/jumbo52.jar"/> <available property="dadml.present" file="${lib}/dadml.jar"/> <available property="sjava-0.68.present" file="${lib}/sjava-0.68.jar"/> + <available property="weka.present" file="${lib}/${weka.jar}"/> <condition property="batik.present"> <and> <available file="${lib}/batik-awt-util.jar"/> @@ -289,6 +292,7 @@ <condition property="compile.xindice"><and><available file="${build}/xindice.javafiles"/><istrue value="xindice.present"/></and></condition> <condition property="compile.jumbo52"><and><available file="${build}/jumbo52.javafiles"/><istrue value="cmllibs.present"/></and></condition> <condition property="compile.r-project"><and><available file="${build}/r-project.javafiles"/><istrue value="sjava.present"/></and></condition> + <condition property="compile.weka"><and><available file="${build}/weka.jar.javafiles"/><istrue value="weka.present"/></and></condition> <!-- be somewhat informative --> <echo message="Datafiles defined: ${module.datafiles.present}"/> @@ -315,6 +319,7 @@ <excludesfile name="${build}/xindice.javafiles" unless="compile.xindice"/> <excludesfile name="${build}/jumbo52.javafiles" unless="compile.jumbo52"/> <excludesfile name="${build}/r-project.javafiles" unless="compile.r-project"/> + <excludesfile name="${build}/weka.jar.javafiles" unless="compile.weka"/> <includesfile name="${build}/${module}.javafiles"/> </fileset> @@ -349,6 +354,7 @@ <excludesfile name="${build}/xindice.javafiles" unless="compile.xindice"/> <excludesfile name="${build}/jumbo52.javafiles" unless="compile.jumbo52"/> <excludesfile name="${build}/r-project.javafiles" unless="compile.r-project"/> + <excludesfile name="${build}/weka.jar.javafiles" unless="compile.weka"/> <includesfile name="${build}/${module}.javafiles"/> </javac> @@ -367,6 +373,7 @@ <excludesfile name="${build}/xindice.javafiles" unless="compile.xindice"/> <excludesfile name="${build}/jumbo52.javafiles" unless="compile.jumbo52"/> <excludesfile name="${build}/r-project.javafiles" unless="compile.r-project"/> + <excludesfile name="${build}/weka.jar.javafiles" unless="compile.weka"/> </fileset> <fileset dir="${build}"> <include name="${module}.javafiles" /> Modified: branches/cdk-1.0.x/src/org/openscience/cdk/libio/weka/Weka.java =================================================================== --- branches/cdk-1.0.x/src/org/openscience/cdk/libio/weka/Weka.java 2008-02-17 07:36:36 UTC (rev 10149) +++ branches/cdk-1.0.x/src/org/openscience/cdk/libio/weka/Weka.java 2008-02-17 08:13:14 UTC (rev 10150) @@ -50,7 +50,7 @@ * @cdk.license GPL * @cdk.module qsar-weka * @cdk.keyword weka, machine learning - * @cdk.depends weka.jar + * @cdk.require weka.jar */ public class Weka { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |