Skip to content

Commit

Permalink
Moved screenshot to a new position and updated build script accordingly.
Browse files Browse the repository at this point in the history
  • Loading branch information
@draeger
draeger committed Apr 25, 2013
1 parent 03449a7 commit 9c467a8
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 26 deletions.
50 changes: 30 additions & 20 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@
memoryMaximumSize="512M"
nowarn="no"
optimize="${optimize}"
source="1.5"
target="1.5"
source="1.6"
target="1.6"
verbose="${verbose}"
>
<src path="${build.src}"/>
Expand All @@ -192,14 +192,15 @@
<manifest file="${build.dest}/META-INF/MANIFEST.MF">
<attribute name="Main-Class" value="org.sbml.simulator.SBMLsimulator"/>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Built-Date" value="${TODAY}"/>
<attribute name="SplashScreen-Image" value="org/sbml/simulator/gui/img/Splash.gif"/>
<attribute name="Implementation-Vendor" value="University of Tuebingen"/>
<attribute name="Implementation-Title" value="${Name}"/>
<attribute name="Implementation-Version" value="Revision ${repository.revision} (Build ${build.number})"/>
<section name="${Name}">
<attribute name="Specification-Title" value="${Name}"/>
<attribute name="Specification-Version" value="${version}"/>
<attribute name="Specification-Vendor" value="Center for Bioinformatics Tuebingen (ZBIT)"/>
<attribute name="Implementation-Title" value="${Name}"/>
<attribute name="Implementation-Version" value="Revision ${repository.revision} (Build ${build.number})"/>
<attribute name="Implementation-Vendor" value="University of Tuebingen"/>
</section>
</manifest>

Expand All @@ -215,8 +216,15 @@
>

<jar
compress="true"
filesetmanifest="mergewithoutmain"
index="true"
indexMetaInf="true"
jarfile="${appJar}"
level="9"
manifest="${build.dest}/META-INF/MANIFEST.MF"
manifestencoding="utf-8"
strict="warn"
update="true"
>

Expand All @@ -230,7 +238,7 @@
/>
<fileset
dir="${build.src}"
includes="**.txt **/*.txt, **.xml, **/*.xml, **.properties, **/*.properties, **.cfg, **/*.cfg, **.obo, **/*.obo, **/*.html, **.html, **/*.htm, **.htm, **/*.png, **.png, **/*.gif, **.gif"
includes="**.txt, **/*.txt, **.xml, **/*.xml, **.properties, **/*.properties, **.cfg, **/*.cfg, **.obo, **/*.obo, **/*.html, **.html, **/*.htm, **.htm, **/*.png, **.png, **/*.gif, **.gif"
excludes="**.java"
/>
<fileset dir="${basedir}/licenses">
Expand All @@ -240,23 +248,22 @@
</fileset>

<!-- These libraries are required by most classes -->
<zipfileset excludes="META-INF/**" src="${lib}/commons-math-2.2.jar"/>
<zipfileset excludes="META-INF/**" src="${lib}/EvA2Base.jar"/>
<zipfileset excludes="META-INF/**" src="${lib}/jcommon-1.0.17.jar"/>
<zipfileset excludes="META-INF/**" src="${lib}/jfreechart-1.0.15_beta.jar"/>
<zipfileset excludes="META-INF/**" src="${lib}/jsbml-1.0-a1-with-dependencies.jar"/>
<zipfileset excludes="META-INF/**" src="${lib}/SimulationCoreLibrary_v1.3_slim.jar"/>
<zipfileset excludes="META-INF/**" src="${lib}/sysbio.jar"/>
<zipfileset excludes="META-INF/**" src="${lib-garuda}/garuda-csr.jar"/>
<zipfileset excludes="META-INF/**" src="${lib-garuda}/jsonic-1.2.10.jar"/>
<zipfileset excludes="META-INF/**, COPYING.txt, licenses/COPYING.txt, overview.html, AUTHORS.txt" src="${lib}/commons-math-2.2.jar"/>
<zipfileset excludes="META-INF/**, COPYING.txt, licenses/COPYING.txt, overview.html, AUTHORS.txt" src="${lib}/EvA2Base.jar"/>
<zipfileset excludes="META-INF/**, COPYING.txt, licenses/COPYING.txt, overview.html, AUTHORS.txt" src="${lib}/jcommon-1.0.17.jar"/>
<zipfileset excludes="META-INF/**, COPYING.txt, licenses/COPYING.txt, overview.html, AUTHORS.txt" src="${lib}/jfreechart-1.0.15_beta.jar"/>
<zipfileset excludes="META-INF/**, COPYING.txt, licenses/COPYING.txt, overview.html, AUTHORS.txt" src="${lib}/jsbml-1.0-a1-with-dependencies.jar"/>
<zipfileset excludes="META-INF/**, COPYING.txt, licenses/COPYING.txt, overview.html, AUTHORS.txt" src="${lib}/SimulationCoreLibrary_v1.3_slim.jar"/>
<zipfileset excludes="META-INF/**, COPYING.txt, licenses/COPYING.txt, overview.html, AUTHORS.txt" src="${lib}/sysbio.jar"/>
<zipfileset excludes="META-INF/**, COPYING.txt, licenses/COPYING.txt, overview.html, AUTHORS.txt" src="${lib-garuda}/garuda-csr.jar"/>
<zipfileset excludes="META-INF/**, COPYING.txt, licenses/COPYING.txt, overview.html, AUTHORS.txt" src="${lib-garuda}/jsonic-1.2.10.jar"/>
</jar>

</target>

<!-- =================================================================== -->
<!-- Signs the JAR file -->
<!-- =================================================================== -->
<!-- signs the application -->
<target
name="sign"
depends="jar_incl-libs"
Expand Down Expand Up @@ -297,7 +304,7 @@
notree="false"
overview="${src}/overview.html"
packagenames="org.*"
source="1.5"
source="1.6"
sourcepath="${src}:${test}:${resources}"
splitindex="true"
stylesheetfile="${doc}/javadoc-style.css"
Expand Down Expand Up @@ -370,13 +377,16 @@
<zipfileset dir="${resources}" prefix="resources" excludes="*svn*" includes="**/*.java,**/*.png"/>
<zipfileset dir="${lib}" prefix="lib" excludes="*svn*" includes="**/*.jar"/>
<zipfileset dir="${basedir}/licenses" prefix="licenses" excludes="*svn*"/>
<zipfileset dir="${basedir}" excludes="*svn*,${basedir}/files" includes="*.xml *.txt"/>
<zipfileset dir="${basedir}" excludes="*svn*,${basedir}/files" includes="*.xml, *.txt"/>
<zipfileset dir="${doc}/version_${version}" prefix="doc/api/" excludes="*svn*,${doc}/publications,${doc}/posters"/>
<zipfileset dir="${dist.dir}" prefix="dist/" includes="${appJar}"/>
<mappedresources>
<fileset file="${garuda.gadget}"/>
<globmapper from="*" to="dist/*"/>
</mappedresources>
<mappedresources>
<fileset file="${appJar}"/>
<globmapper from="*" to="dist/*"/>
</mappedresources>
</zip>
</target>

Expand Down Expand Up @@ -426,7 +436,7 @@
<globmapper from="*" to="${uuid}/icons/*"/>
</mappedresources>
<mappedresources>
<fileset file="${resources}/org/sbml/simulator/gui/img/Screenshot_1.PNG"/>
<fileset file="${dist}/Screenshot_1.PNG"/>
<globmapper from="*" to="${uuid}/snapshot/*"/>
</mappedresources>
</zip>
Expand Down
6 changes: 3 additions & 3 deletions dist/SBMLsimulator-latest.jnlp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file is part of SBMLsimulator, a Java-based simulator for models
* of biochemical processes encoded in the modeling language SBML.
*
* Copyright (C) 2007-2012 by the University of Tuebingen, Germany.
* Copyright (C) 2007-2013 by the University of Tuebingen, Germany.
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
Expand All @@ -26,8 +26,8 @@
<description>SBMLsimulator - a versatile and efficient simulator and parameter estimator for biological models.</description>
<description kind="short">SBMLsimulator</description>
<homepage href="http://www.cogsys.cs.uni-tuebingen.de/software/SBMLsimulator"/>
<!-- <icon href="http://www.cogsys.cs.uni-tuebingen.de/software/SBMLsimulator/img/SBMLsimulator_48.png"/> -->
<!-- <icon kind="shortcut" href="http://www.cogsys.cs.uni-tuebingen.de/software/SBMLsimulator/img/SBMLsimulator_16.png" width="16" height="16"/> -->
<icon href="http://www.cogsys.cs.uni-tuebingen.de/software/SBMLsimulator/img/SBMLsimulator_48.png"/>
<icon kind="shortcut" href="http://www.cogsys.cs.uni-tuebingen.de/software/SBMLsimulator/img/SBMLsimulator_16.png" width="16" height="16"/>
<icon kind="splash" href="http://www.cogsys.cs.uni-tuebingen.de/software/SBMLsimulator/img/Splash.gif"/>
<offline-allowed/>
</information>
Expand Down
0 ...g/sbml/simulator/gui/img/Screenshot_1.PNG → dist/Screenshot_1.PNG
View file
File renamed without changes
2 changes: 1 addition & 1 deletion src/org/sbml/simulator/SBMLsimulator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ public void run() {
icon,
bundle.getString("PROGRAM_DESCRIPTION"),
Arrays.asList(bundle.getStringArray("KEYWORDS")),
Arrays.asList(new String[] {folder + "Screenshot_1.png"})
Arrays.asList(new String[] { "snapshot/Screenshot_1.png" })
);
garudaBackend.addInputFileFormat("xml", "SBML");
garudaBackend.addInputFileFormat("sbml", "SBML");
Expand Down
4 changes: 2 additions & 2 deletions src/org/sbml/simulator/gui/SimulatorUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ protected JMenuItem[] additionalEditMenuItems() {

if (!appConf.getCmdArgs().containsKey(GarudaOptions.CONNECT_TO_GARUDA)
|| appConf.getCmdArgs().getBoolean(GarudaOptions.CONNECT_TO_GARUDA)) {
items.add(GarudaGUIfactory.createGarudaMenu(EventHandler.create(ActionListener.class, this, "sentToGaruda")));
items.add(GarudaGUIfactory.createGarudaMenu(EventHandler.create(ActionListener.class, this, "sendToGaruda")));
}

return items.toArray(new JMenuItem[0]);
Expand All @@ -338,7 +338,7 @@ protected JMenuItem[] additionalEditMenuItems() {
/**
*
*/
public void sentToGaruda() {
public void sendToGaruda() {
if (simPanel != null) {
final MultiTable table = simPanel.getSimulationResultsTable();
String options[] = {bundle.getString("SIM_DATA_FILE"), bundle.getString("MODEL_FILE")};
Expand Down

0 comments on commit 9c467a8

Please sign in to comment.