From de4ed881b58ac19d449da17c957e316c53a892c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Mon, 10 Nov 2014 08:41:23 +0100
Subject: [PATCH] versioning changes

---
 build_common.xml                                   |  6 +++---
 .../src/com/jpexs/decompiler/flash/Version.java    |  7 ++++++-
 src/com/jpexs/decompiler/flash/gui/Main.java       | 14 +++++++++++++-
 .../decompiler/flash/gui/NewVersionDialog.java     |  4 ++--
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/build_common.xml b/build_common.xml
index f8bb31cac..5ba35495e 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -31,7 +31,7 @@
 
     <target name="-loadversion">
         <loadproperties srcfile="version.properties" prefix="version"/> 
-        <property name="VERSION" value="${version.major}.${version.minor}.${version.release}.${version.build}" />
+        <property name="VERSION" value="${version.major}.${version.minor}.${version.release}" />
         <property name="VERSIONNUMBER" value="${VERSION}" />  
         <script language="javascript">
             if(project.getProperty("version.debug")=="true"){
@@ -362,7 +362,7 @@
     </target>
     
     <target name="-nightly-suffix" if="NIGHTLY">        
-        <property name="VERSIONSUFFIX" value="_nightly"/>         
+        <property name="VERSIONSUFFIX" value="_nightly${version.build}"/>         
     </target>
     
     <target name="-nonightly-suffix" unless="NIGHTLY">
@@ -534,7 +534,7 @@
         <exec executable="git" failonerror="true">
             <arg value="commit"/>            
             <arg value="-m"/>
-            <arg value="version changed to ${newversion.major}.${newversion.minor}.${newversion.release}.${newversion.build}"/>
+            <arg value="version changed to ${newversion.major}.${newversion.minor}.${newversion.release} build ${newversion.build}"/>
         </exec> 
     </target>
     
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/Version.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/Version.java
index c3b64ed8b..5826ace22 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/Version.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/Version.java
@@ -12,7 +12,8 @@
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
 */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.flash;
 
 import java.util.HashMap;
@@ -33,6 +34,10 @@ public class Version {
     public String appName;
     public String appFullName;
     public String updateLink;
+    public int major;
+    public int minor;
+    public int release;
+    public int build;
     public boolean nightly;
     public Map<String, List<String>> changes = new HashMap<>();
 }
diff --git a/src/com/jpexs/decompiler/flash/gui/Main.java b/src/com/jpexs/decompiler/flash/gui/Main.java
index ea45c3472..a18e226fd 100644
--- a/src/com/jpexs/decompiler/flash/gui/Main.java
+++ b/src/com/jpexs/decompiler/flash/gui/Main.java
@@ -115,7 +115,7 @@ public class Main {
     private static MenuItem stopMenuItem;
     private static MainFrame mainFrame;
     public static final int UPDATE_SYSTEM_MAJOR = 1;
-    public static final int UPDATE_SYSTEM_MINOR = 1;
+    public static final int UPDATE_SYSTEM_MINOR = 2;
     public static LoadFromMemoryFrame loadFromMemoryFrame;
     public static LoadFromCacheFrame loadFromCacheFrame;
     private static final Logger logger = Logger.getLogger(Main.class.getName());
@@ -1343,6 +1343,18 @@ public class Main {
                                 if (key.equals("revision")) {
                                     ver.revision = val;
                                 }
+                                if (key.equals("build")) {
+                                    ver.build = Integer.parseInt(val);
+                                }
+                                if (key.equals("major")) {
+                                    ver.major = Integer.parseInt(val);
+                                }
+                                if (key.equals("minor")) {
+                                    ver.minor = Integer.parseInt(val);
+                                }
+                                if (key.equals("release")) {
+                                    ver.release = Integer.parseInt(val);
+                                }
                                 if (key.equals("longVersionName")) {
                                     ver.longVersionName = val;
                                 }
diff --git a/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java b/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java
index eb969ada5..ea070fd2b 100644
--- a/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java
@@ -73,7 +73,7 @@ public class NewVersionDialog extends AppDialog implements ActionListener {
                 changesStr += "<hr />";
             }
             first = false;
-            changesStr += "<b>" + translate("version") + " " + v.versionName + (v.nightly ? " nightly" : "") + "</b><br />";
+            changesStr += "<b>" + translate("version") + " " + v.versionName + "</b><br />";
             String releaseDate = v.releaseDate;
             try {
                 Date date = serverFormatter.parse(releaseDate);
@@ -100,7 +100,7 @@ public class NewVersionDialog extends AppDialog implements ActionListener {
         }
         changesText.setContentType("text/html");
         changesText.setText("<html>" + changesStr + "</html>");
-        JLabel newAvailableLabel = new JLabel("<html><b><center>" + translate("newversionavailable") + " " + latestVersion.appName + " " + translate("version") + " " + latestVersion.versionName + (latestVersion.nightly ? " nightly" : "") + "</center></b></html>", SwingConstants.CENTER);
+        JLabel newAvailableLabel = new JLabel("<html><b><center>" + translate("newversionavailable") + " " + latestVersion.appName + " " + translate("version") + " " + latestVersion.versionName + "</center></b></html>", SwingConstants.CENTER);
         newAvailableLabel.setAlignmentX(JLabel.CENTER_ALIGNMENT);
         cnt.add(newAvailableLabel);