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

Misc stuff (ant-file, Matlab-interface)

Browse Source
This commit is contained in:
Marcel Kronfeld 2009-10-19 10:08:35 +00:00
parent ca490cf482
commit 08ab9a7d58
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
ant/build.xml
View File

@ -44,7 +44,12 @@
<property name="debug.flag" value="true" /> <property name="debug.flag" value="true" />
<property name="jar.name" value="EvA2Base" /> <property name="jar.name" value="EvA2Base" />
<property name="srcpack.name" value="EvA2BaseSrc" /> <property name="srcpack.name" value="EvA2BaseSrc" />
<!-- documentation -->
<property name="doc.directory" value="doc" />
<property name="htmldoc.directory.name" value="EvA2Doc" />
<property name="pdfdoc.name" value="EvA2Doc.pdf" />
<property name="web.documentation.directory" value="/afs/cs.uni-tuebingen.de/ra/www/software/EvA2/EvA2Doc/" />
<!-- SET THESE PATHES IF YOU WANT TO COMPILE ADDITIONAL EvA2 PACKAGES --> <!-- SET THESE PATHES IF YOU WANT TO COMPILE ADDITIONAL EvA2 PACKAGES -->
<property name="JE2Probs.directory" value="../JE2Probs" /> <property name="JE2Probs.directory" value="../JE2Probs" />
<property name="JE2ESModel.directory" value="../JE2ESModel" /> <property name="JE2ESModel.directory" value="../JE2ESModel" />
@ -433,7 +438,7 @@
--> -->
<tar tarfile="${distribution.directory}/eva2-bin-${DSTAMP}.tar"> <tar tarfile="${distribution.directory}/eva2-bin-${DSTAMP}.tar">
<tarfileset dir="${binary.distribution.directory}"> <tarfileset dir="${bin.dist.dir}">
<include name="**" /> <include name="**" />
<exclude name="*.tar*, *.zip" /> <exclude name="*.tar*, *.zip" />
</tarfileset> </tarfileset>
@ -443,7 +448,7 @@
<delete file="${distribution.directory}/eva2-bin-${DSTAMP}.tar" /> <delete file="${distribution.directory}/eva2-bin-${DSTAMP}.tar" />
<zip zipfile="${distribution.directory}/eva2-bin-${DSTAMP}.zip"> <zip zipfile="${distribution.directory}/eva2-bin-${DSTAMP}.zip">
<zipfileset dir="${binary.distribution.directory}"> <zipfileset dir="${bin.dist.dir}">
<include name="**" /> <include name="**" />
<exclude name="*.tar*, *.zip" /> <exclude name="*.tar*, *.zip" />
</zipfileset> </zipfileset>
@ -546,34 +551,17 @@
<delete file="${matlabinterface.basedir}/${matlabinterface.title}.tar.gz" /> <delete file="${matlabinterface.basedir}/${matlabinterface.title}.tar.gz" />
</target> </target>
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Generate Distribution and put it online. This also replaces the Copy documentation to web directory. tex2html must be updated manually beforehand!
Probs and ESModel packages so keep them synchronized.
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<target name="docToWWW" depends="init">
<target name="distToWWW" depends="init"> <delete>
<mkdir dir="${web.download.directory}/old-${DSTAMP}-${TSTAMP}" />
<copy todir="${web.download.directory}/old-${DSTAMP}-${TSTAMP}">
<fileset dir="${web.download.directory}">
<include name="**Src.tar.gz" />
<include name="**.jar" />
<include name="${matlabinterface.title}.tar.gz" />
</fileset>
<fileset dir="${web.documentation.directory}">
<include name="**" />
</fileset>
</copy>
<delete>
<fileset dir="${web.documentation.directory}"> <fileset dir="${web.documentation.directory}">
<include name="**" /> <include name="**" />
</fileset> </fileset>
</delete> </delete>
<property name="doc.directory" value="doc" />
<property name="htmldoc.directory.name" value="EvA2Doc" />
<property name="pdfdoc.name" value="EvA2Doc.pdf" />
<property name="web.documentation.directory" value="/afs/cs.uni-tuebingen.de/ra/www/software/EvA2/EvA2Doc/" />
<copy todir="${web.documentation.directory}"> <copy todir="${web.documentation.directory}">
<fileset dir="${doc.directory}"> <fileset dir="${doc.directory}">
<include name="${pdfdoc.name}" /> <include name="${pdfdoc.name}" />
@ -584,6 +572,30 @@
<include name="**" /> <include name="**" />
</fileset> </fileset>
</copy> </copy>
</target>
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Copy www distributed version to backup directory.
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<target name="backupWWW" depends="init">
<mkdir dir="${web.download.directory}/old-${DSTAMP}-${TSTAMP}" />
<copy todir="${web.download.directory}/old-${DSTAMP}-${TSTAMP}">
<fileset dir="${web.download.directory}">
<include name="**Src.tar.gz" />
<include name="**.jar" />
<include name="${matlabinterface.title}.tar.gz" />
</fileset>
<fileset dir="${web.documentation.directory}">
<include name="**" />
</fileset>
</copy>
</target>
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Generate Distribution and put it online. This also replaces the
Probs and ESModel packages so keep them synchronized.
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<target name="distToWWW" depends="init, backupWWW, docToWWW">
<copy todir="${web.download.directory}"> <copy todir="${web.download.directory}">
<fileset dir="${distribution.directory}"> <fileset dir="${distribution.directory}">
<include name="**Src.tar.gz" /> <include name="**Src.tar.gz" />
@ -595,7 +607,6 @@
</fileset> </fileset>
</copy> </copy>
</target> </target>
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Run EvA2 Run EvA2

2
resources/MatlabInterface/@JEInterface/testEvalFunc.m
View File

@ -33,7 +33,7 @@ try
catch ME catch ME
disp('Function evaluation failed:'); disp('Function evaluation failed:');
disp(ME.message); disp(ME.message);
error('Test failed!'); error(['Test failed! ' ME.message]);
end end
disp('Function returned: '); disp('Function returned: ');