Modified build.xml to automatically zip run scripts and add version to zip file name. New --sequential option.

chhh · chhh · commit 1ad734871672 · 2017-05-25T12:26:27.000-04:00
diff --git a/MSFragger-GUI/build.xml b/MSFragger-GUI/build.xml
@@ -80,6 +80,8 @@
         <property name="store.dir" value="dist"/>
         <property name="temp.dir" value="temp"/>
         <property name="store.jar" value="${store.dir}/${store.jar.name}.jar"/>
+        <property file="src/umich/msfragger/gui/Bundle.properties"/>
+        <property name="store.zip" value="${store.dir}/${store.jar.name}_v${msfragger.gui.version}.zip"/>
 
         <echo message="Packaging ${application.title} into a single JAR at ${store.jar}"/>
 
@@ -104,6 +106,11 @@
 
         <delete dir="${temp.dir}"/>
 
+        <zip destfile="${store.zip}">
+            <fileset dir="${store.dir}" includes="*.jar"/>
+            <fileset dir="start-scripts"/>
+        </zip>
+        
     </target>
     
 </project>
diff --git a/MSFragger-GUI/src/umich/msfragger/Version.java b/MSFragger-GUI/src/umich/msfragger/Version.java
@@ -15,15 +15,26 @@
  */
 package umich.msfragger;
 
+import javax.swing.JOptionPane;
+
 /**
  *
  * @author Dmitry Avtonomov
  */
 public class Version {
-    public static final String version = "v2.2";
-
+    public static final String PROP_VER = "msfragger.gui.version";
+    public static final String VERSION = "2.3";
+    
     public static String getVersion() {
-        return version;
+        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("umich/msfragger/gui/Bundle"); // NOI18N
+        String val = bundle.getString(PROP_VER);
+        if (!VERSION.equals(val)) {
+            JOptionPane.showMessageDialog(null, String.format(
+                    "Version in the bundle (%s) doesn't match hardcoded value (%s).\n"
+                            + "Have you modified MSFragger-GUI.jar/umich/msfragger/gui/Bundle.properties?", val, VERSION), 
+                    "Version mismatch", JOptionPane.WARNING_MESSAGE);
+        }
+        return VERSION;
     }
     
     
diff --git a/MSFragger-GUI/src/umich/msfragger/gui/Bundle.properties b/MSFragger-GUI/src/umich/msfragger/gui/Bundle.properties
@@ -1,7 +1,7 @@
 # To change this license header, choose License Headers in Project Properties.
 # To change this template file, choose Tools | Templates
 # and open the template in the editor.
-
+msfragger.gui.version=2.3
 default.msfragger.jar=MSFragger.jar
 default.msconvert.win=msconvert.exe
 default.msconvert.nix=msconvert
@@ -12,6 +12,6 @@ proteinprophet.cmd.line.opts.closed=
 proteinprophet.cmd.line.opts.open=--maxppmdiff 20.0
 peptideprophet.cmd.line.opts.closed=--nonparam --expectscore --accmass --decoy rev --decoyprobs
 peptideprophet.cmd.line.opts.open=--nonparam --expectscore --decoy rev --decoyprobs --masswidth 500.0
-report.filter.closed=
-report.filter.open=--mapmods
+report.filter.closed=--sequential
+report.filter.open=--mapmods --sequential
 default.prot.xml.filename=interact.prot.xml
diff --git a/MSFragger-GUI/src/umich/msfragger/gui/MsfraggerGuiFrame.java b/MSFragger-GUI/src/umich/msfragger/gui/MsfraggerGuiFrame.java
@@ -121,7 +121,7 @@ public MsfraggerGuiFrame() {
 
     private void initMore() {
         
-        setTitle("MSFragger GUI (" + Version.getVersion() + ")");
+        setTitle("MSFragger GUI (v" + Version.getVersion() + ")");
     
         console = new TextConsole();
         consoleScrollPane.setViewportView(console);
@@ -1181,7 +1181,7 @@ private void btnAboutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
 
         JEditorPane ep = new JEditorPane("text/html", "<html><body style=\"" + style + "\">"
             + "MSFragger - Ultrafast Proteomics Search Engine<br/>"
-            + "GUI Wrapper (" + Version.getVersion() + ")<br/>"
+            + "GUI Wrapper (v" + Version.getVersion() + ")<br/>"
             + "Dmitry Avtonomov<br/>"
             + "University of Michigan, 2017<br/>"
             + "<a href=\"http://nesvilab.org/\">Alexey Nesvizhskii lab</a><br/>&nbsp;<br/>&nbsp;"
