halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes due to public ant build.xml

Browse Source
This commit is contained in:
Marcel Kronfeld 2010-08-16 13:23:55 +00:00
parent 0497184e51
commit cde1d3618a
2 changed files with 41 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ant/build.xml
View File

@ -499,6 +499,14 @@
</fileset> </fileset>
</copy> </copy>
<copy todir="${src.dist.dir}/${ant.directory}">
<fileset dir="${ant.directory}">
<include name="miniBuild.xml" />
</fileset>
</copy>
<!-- rename the mini build -->
<move file="${src.dist.dir}/${ant.directory}/miniBuild.xml" tofile="${src.dist.dir}/${ant.directory}/build.xml"/>
<mkdir dir="${src.dist.dir}/${library.directory}" /> <mkdir dir="${src.dist.dir}/${library.directory}" />
<copy todir="${src.dist.dir}/${library.directory}"> <copy todir="${src.dist.dir}/${library.directory}">

31
ant/miniBuild.xml
View File

@ -29,8 +29,10 @@
<property name="ant.directory" value="ant" /> <property name="ant.directory" value="ant" />
<property name="build.directory" value="build" /> <property name="build.directory" value="build" />
<property name="resources.directory" value="resources" /> <property name="resources.directory" value="resources" />
<property name="library.directory" value="lib" />
<property name="matlabinterface.basedir" value="resources/MatlabInterface" /> <property name="matlabinterface.basedir" value="resources/MatlabInterface" />
<property name="matlabinterface.title" value="JEInterface" /> <property name="matlabinterface.title" value="JEInterface" />
<property name="distribution.directory" value="dist" />
<property name="source.distribution.directory" value="${distribution.directory}/src-dist" /> <property name="source.distribution.directory" value="${distribution.directory}/src-dist" />
<property name="binary.distribution.directory" value="${distribution.directory}/bin-dist" /> <property name="binary.distribution.directory" value="${distribution.directory}/bin-dist" />
<property name="javadoc.directory" value="doc/api" /> <property name="javadoc.directory" value="doc/api" />
@ -159,7 +161,7 @@
<echo message="JE2Base Project"/> <echo message="JE2Base Project"/>
<echo message="ANT_HOME is set to = ${env.ANT_HOME}"/> <echo message="ANT_HOME is set to = ${env.ANT_HOME}"/>
<echo message="JAVA_HOME is set to = ${env.JAVA_HOME}"/> <echo message="JAVA_HOME is set to = ${env.JAVA_HOME}"/>
<echo message="You are using JDK version ${ant.java.version}, at least JDK version 1.5 is recomended!"/> <echo message="You are using JDK version ${ant.java.version}."/>
<echo message=""/> <echo message=""/>
<echo message="use 'ant compileAll' - to compile all packages."/> <echo message="use 'ant compileAll' - to compile all packages."/>
<echo message="use 'ant compile' - to compile only the base package."/> <echo message="use 'ant compile' - to compile only the base package."/>
@ -218,7 +220,7 @@
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Compile JE2ESModel Compile JE2ESModel
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<target name="compileESModel" depends="usage, init, compileInfo" description="Compiles the ESModel project." if="JE2ESModel.available"> <target name="compileESModel" depends="usage, init, compileInfo" description="Compiles the ESModel project (if available)." if="JE2ESModel.available">
<ant inheritAll="false" antfile="${ant.directory}/build.xml" dir="${JE2ESModel.directory}" target="compile"> <ant inheritAll="false" antfile="${ant.directory}/build.xml" dir="${JE2ESModel.directory}" target="compile">
<property name="silent" value="false"/> <property name="silent" value="false"/>
</ant> </ant>
@ -227,7 +229,7 @@
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dist JE2ESModel Dist JE2ESModel
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<target name="distESModel" depends="compileESModel" description="Build dist. of the ESModel project." if="JE2Probs.available"> <target name="distESModel" depends="compileESModel" description="Build dist. of the ESModel project (if available)." if="JE2Probs.available">
<ant inheritAll="false" antfile="${ant.directory}/build.xml" dir="${JE2ESModel.directory}" target="dist"> <ant inheritAll="false" antfile="${ant.directory}/build.xml" dir="${JE2ESModel.directory}" target="dist">
<property name="silent" value="true"/> <property name="silent" value="true"/>
</ant> </ant>
@ -236,7 +238,7 @@
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Compile JE2Research Compile JE2Research
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<target name="compileResearch" depends="usage, init, compileInfo" description="Compiles the Research project." if="JE2Research.available"> <target name="compileResearch" depends="usage, init, compileInfo" description="Compiles the Research project (if available)." if="JE2Research.available">
<ant inheritAll="false" antfile="${ant.directory}/build.xml" dir="${JE2Research.directory}" target="compile"> <ant inheritAll="false" antfile="${ant.directory}/build.xml" dir="${JE2Research.directory}" target="compile">
<property name="silent" value="false"/> <property name="silent" value="false"/>
</ant> </ant>
@ -245,7 +247,7 @@
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Binary Distribution Binary Distribution
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<target name="binaryDist" depends="compile, JEInterface" description="Compiles the project and puts the whole stuff into a jar-file.."> <target name="binaryDist" depends="compile, JEInterface" description="Compiles the project and builds a jar-file.">
<property name="bin.dist.dir" value="${binary.distribution.directory}/eva-${DSTAMP}" /> <property name="bin.dist.dir" value="${binary.distribution.directory}/eva-${DSTAMP}" />
<mkdir dir="${bin.dist.dir}" /> <mkdir dir="${bin.dist.dir}" />
<delete> <delete>
@ -261,23 +263,6 @@
<include name="${jar.name}.jar" /> <include name="${jar.name}.jar" />
</fileset> </fileset>
</copy> </copy>
<tar tarfile="${distribution.directory}/eva2-bin-${DSTAMP}.tar">
<tarfileset dir="${bin.dist.dir}">
<include name="**" />
<exclude name="*.tar*, *.zip" />
</tarfileset>
</tar>
<gzip zipfile="${distribution.directory}/eva2-bin-${DSTAMP}.tar.gz"
src="${distribution.directory}/eva2-bin-${DSTAMP}.tar" />
<delete file="${distribution.directory}/eva2-bin-${DSTAMP}.tar" />
<zip zipfile="${distribution.directory}/eva2-bin-${DSTAMP}.zip">
<zipfileset dir="${bin.dist.dir}">
<include name="**" />
<exclude name="*.tar*, *.zip" />
</zipfileset>
</zip>
</target> </target>
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@ -320,7 +305,7 @@
Generate Distribution Generate Distribution
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<target name="dist" depends="distESModel, distProbs, binaryDist, sourceDist"> <target name="dist" depends="distESModel, distProbs, binaryDist, sourceDist" description="Builds all distributions if all packages are available.">
</target> </target>
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++