Further refactoring to clear up package structure.

This commit is contained in:
2013-07-19 16:44:59 +02:00
parent a4c45b6295
commit 85ec784da2
19 changed files with 1363 additions and 1694 deletions

View File

@@ -275,7 +275,7 @@
</fileset>
</copy>
<!--
<!--
<copy todir="${JE2Probs.directory}/${build.directory}/resources">
<fileset dir="${JE2Probs.directory}/${resources.directory}" includes="**/*" />
</copy>
@@ -285,9 +285,9 @@
</copy>
<copy todir="${JE2Research.directory}/${build.directory}/resources">
<fileset dir="${JE2Research.directory}/${resources.directory}" includes="**/*" />
</copy>
</copy>
-->
</target>
</target>
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Compile JE2Probs
@@ -345,7 +345,7 @@
<jar jarfile="${bin.dist.dir}/${library.directory}/EvA2Base.jar" basedir="${build.directory}">
<!--<fileset dir="${classes.dir}" excludes="*test*"/>-->
<manifest> <attribute name="Main-Class" value="eva2.client.EvAClient"/> </manifest>
<manifest> <attribute name="Main-Class" value="eva2.gui.Main"/> </manifest>
</jar>
</target>
@@ -372,7 +372,7 @@
<!-- <fileset dir="${classes.dir}" excludes="*test*"/>
-->
<manifest>
<attribute name="Main-Class" value="eva2.client.EvAClient" />
<attribute name="Main-Class" value="eva2.gui.Main" />
</manifest>
</jar>
</target>
@@ -389,7 +389,7 @@
<jar jarfile="${bin.dist.dir}/${jar.name}.jar" basedir="${build.directory}" >
<manifest>
<attribute name="Main-Class" value="eva2.client.EvAClient"/>
<attribute name="Main-Class" value="eva2.gui.Main"/>
<attribute name="Built-By" value="Center for Bioinformatics Tuebingen (ZBIT)"/>
<!--
<attribute name="Xdock:name" value="EvA2"/>
@@ -662,7 +662,7 @@
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<target name="run" description="Runs EvA2.">
<java classname="eva2.client.EvAClient" fork="yes">
<java classname="eva2.gui.Main" fork="yes">
<jvmarg value="-Xmx512m"/>
<classpath>
<pathelement path="${project.class.path}" />

View File

@@ -197,7 +197,7 @@
<exclude name="**/*.xcf" />
</fileset>
</copy>
</target>
</target>
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Compile JE2Probs
@@ -255,7 +255,7 @@
</delete>
<jar jarfile="${bin.dist.dir}/${jar.name}.jar" basedir="${build.directory}" >
<manifest> <attribute name="Main-Class" value="eva2.client.EvAClient"/> </manifest>
<manifest> <attribute name="Main-Class" value="eva2.gui.Main"/> </manifest>
</jar>
<copy todir="${distribution.directory}">
@@ -333,7 +333,7 @@
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<target name="run" description="Runs EvA2.">
<java classname="eva2.client.EvAClient" fork="yes">
<java classname="eva2.gui.Main" fork="yes">
<jvmarg value="-Xmx512m"/>
<classpath>
<pathelement path="${project.class.path}" />