@@ -1,65 +1,132 @@ <?xml version="1.0"?> -<project name="incanter" default="jar"> +<project name="incanter" default="incanter"> <description> Compile Incanter into a Java JAR. </description> <property name="src" location="src" /> - <property name="build" location="build" /> + <property name="build.dir" location="build" /> <property name="lib" location="lib" /> <property name="clojure.jar" location="${lib}/clojure.jar" /> <property name="clojure-contrib.jar" location="${lib}/clojure-contrib.jar" /> <property name="colt.jar" location="${lib}/parallelcolt-0.7.2.jar" /> + <property name="jfreechart.jar" location="${lib}/jfreechart-1.0.13.jar" /> + <property name="processing-core.jar" location="${lib}/processing/core.jar" /> + <property name="arpack-combo.jar" location="${lib}/arpack-combo-0.1.jar" /> + <property name="concurrent.jar" location="${lib}/concurrent.jar" /> + <property name="gnujaxp.jar" location="${lib}/gnujaxp.jar" /> + <property name="jcommon.jar" location="${lib}/jcommon-1.0.16.jar" /> + <property name="jline.jar" location="${lib}/jline-0.9.94.jar" /> + <property name="netlib.jar" location="${lib}/netlib-java-0.9.1.jar" /> + <property name="opencsv.jar" location="${lib}/opencsv-1.8.jar" /> <property name="jarfile" location="incanter.jar" /> <property name="LICENSE" location="epl-v10.html" /> <property name="deps.file" value="deps.zip"/> <property name="deps.url" value="http://cloud.github.com/downloads/liebke/incanter/${deps.file}"/> - + + <path id="classpath"> + <path location="${src}"/> + <path location="${build.dir}" /> +  + <path location="${clojure.jar}"/> +  + <path location="${colt.jar}"/> + <path location="${netlib.jar}"/> + <path location="${arpack-combo.jar}"/> + +  + <path location="${clojure-contrib.jar}"/> +  + <path location="${jfreechart.jar}"/> + <path location="${jcommon.jar}"/> + <path location="${gnujaxp.jar}"/> +  + <path location="${processing-core.jar}"/> +  + <path location="${opencsv.jar}"/> + </path> <target name="init"> - <mkdir dir="${build}" /> + <mkdir dir="${build.dir}" /> </target> <target name="compile-java" depends="init" description="Compile Java sources."> - <javac srcdir="${src}" destdir="${build}" includeJavaRuntime="yes" + <javac srcdir="${src}" destdir="${build.dir}" includeJavaRuntime="yes" debug="true" target="1.5"> <classpath> <path location="${src}"/> <path location="${clojure.jar}"/> <path location="${colt.jar}"/> + <path location="${clojure-contrib.jar}"/> + <path location="${jfreechart.jar}"/> + <path location="${processing-core.jar}"/> + <path location="${arpack-combo.jar}"/> + <path location="${concurrent.jar}"/> + <path location="${gnujaxp.jar}"/> + <path location="${jcommon.jar}"/> + <path location="${jline.jar}"/> + <path location="${netlib.jar}"/> + <path location="${opencvs.jar}"/> + <path location="${build.dir}" /> </classpath> </javac> </target> - <target name="compile-clojure" depends="compile-java" + <target name="compile-clj" depends="compile-java" description="Compile Clojure sources."> - <java classname="clojure.lang.Compile" failonerror="true"> - <classpath> - <path location="${src}"/> - <path location="${clojure.jar}"/> - <path location="${clojure-contrib.jar}"/> - <path location="${colt.jar}"/> - </classpath> - <sysproperty key="clojure.compile.path" value="${build}"/> + <java classname="clojure.lang.Compile" fork="true" failonerror="true"> + <sysproperty key="clojure.compile.path" value="${build.dir}"/> + <classpath refid="classpath" /> + <arg value="incanter.internal" /> + <arg value="incanter.core" /> + <arg value="incanter.stats" /> + <arg value="incanter.charts" /> + <arg value="incanter.processing" /> + <arg value="incanter.io" /> + <arg value="incanter.datasets" /> + <arg value="incanter.optimize" /> + <arg value="incanter.som" /> + <arg value="incanter.bayes" /> + <arg value="incanter.censored" /> </java> </target> - <target name="jar" depends="compile-clojure"> + <target name="incanter" depends="compile-clj"> <jar jarfile="${jarfile}" > - <fileset dir="${build}" includes="**/*.class"/> - <fileset dir="${src}" includes="**/*.clj"/> - <fileset dir="${src}" includes="**/*.java"/> + <fileset dir="${build.dir}" includes="**/*.class"/> +  <manifest> <attribute name="Class-Path" value="."/> </manifest> </jar> </target> + <target name="compile-core-clj" depends="compile-java" + description="Compile Clojure sources."> + <java classname="clojure.lang.Compile" fork="true" failonerror="true"> + <sysproperty key="clojure.compile.path" value="${build.dir}"/> + <classpath refid="classpath" /> + <arg value="incanter.internal" /> + <arg value="incanter.core" /> + <arg value="incanter.stats" /> + </java> + </target> + + <target name="incanter-core" depends="compile-core-clj"> + <jar jarfile="${jarfile}" > + <fileset dir="${build.dir}" includes="**/*.class"/> + <manifest> + <attribute name="Class-Path" value="."/> + </manifest> + </jar> + </target> + <target name="clean"> <delete file="${jarfile}"/> - <delete dir="${build}" /> + <delete dir="${build.dir}" /> </target> build.xml @@ -17,6 +17,7 @@ (ns incanter.bayes + (:gen-class) (:use [incanter.core :only (matrix mmult mult div minus trans ncol nrow plus to-list decomp-cholesky solve half-vectorize vectorize symmetric-matrix identity-matrix kronecker src/incanter/bayes.clj @@ -1,4 +1,5 @@ (ns incanter.censored + (:gen-class) (:use [incanter.core :only (mult pow)] [incanter.stats :only (pdf-normal cdf-normal sd)])) src/incanter/censored.clj @@ -17,6 +17,7 @@ (ns incanter.charts + (:gen-class) ;(:use (incanter core stats)) (:use [incanter.core :only (matrix? to-list plus minus div group-by bind-columns view save)] src/incanter/charts.clj @@ -17,6 +17,7 @@ (ns incanter.core + (:gen-class) (:use (incanter internal)) (:import (incanter Matrix) (cern.colt.matrix.tdouble DoubleMatrix2D src/incanter/core.clj @@ -17,6 +17,7 @@ (ns incanter.datasets + (:gen-class) (:use [incanter.io :only (read-dataset)])) src/incanter/datasets.clj @@ -17,6 +17,7 @@ (ns incanter.internal + (:gen-class) (:import (incanter Matrix) (cern.colt.matrix.tdouble.algo DoubleFormatter) (cern.jet.math.tdouble DoubleFunctions DoubleArithmetic) src/incanter/internal.clj @@ -20,6 +20,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (ns incanter.io + (:gen-class) (:import (java.io FileReader) (au.com.bytecode.opencsv CSVReader)) (:use [incanter.core :only (dataset save)]) src/incanter/io.clj @@ -17,6 +17,7 @@ (ns incanter.optimize + (:gen-class) (:use [incanter.core :only (plus minus div mult mmult symmetric-matrix ncol solve abs sel trans bind-columns to-list identity-matrix)])) src/incanter/optimize.clj @@ -16,6 +16,7 @@ (ns incanter.processing + (:gen-class) (:use [incanter.core :only (view save)]) (:import (processing.core PApplet PImage PGraphics PFont))) src/incanter/processing.clj @@ -14,6 +14,7 @@ (ns incanter.som + (:gen-class) (:use [incanter.core :only (sel ncol nrow mult div plus minus trans to-vect sqrt sum pow)] [incanter.stats :only (mean principal-components covariance)])) src/incanter/som.clj @@ -17,6 +17,7 @@ (ns incanter.stats + (:gen-class) (:import (cern.colt.list.tdouble DoubleArrayList) (cern.jet.random.tdouble Gamma Beta Binomial ChiSquare DoubleUniform Exponential NegativeBinomial Normal Poisson src/incanter/stats.clj 693a1dba38c5a41d290b71b4fdb809d0b99e0486 David Edgar Liebke liebke@gmail.com http://github.com/liebke/incanter/commit/048072c45903ffd34de2bfebe1d5c715074e3d50 048072c45903ffd34de2bfebe1d5c715074e3d50

2009-10-30T18:03:08-07:00

Pre-compiling all libraries with :gen-class; added incanter-core target to build.xml that builds an incanter.jar with only the core and stats libraries. 6f65bcd142d78475a802101d5e44c7e643cac18c David Edgar Liebke liebke@gmail.com