Browse Source

Nifty versioning stuff

master
Chris Smith 15 years ago
parent
commit
ff01481019
4 changed files with 28 additions and 2 deletions
  1. 1
    0
      .gitignore
  2. 7
    0
      build.xml
  3. 18
    1
      src/uk/co/md87/evetool/Main.java
  4. 2
    1
      src/uk/co/md87/evetool/ui/StatusPanel.java

+ 1
- 0
.gitignore View File

@@ -3,3 +3,4 @@
3 3
 /derby.log
4 4
 /dist
5 5
 /coverage
6
+/src/uk/co/md87/evetool/version.txt

+ 7
- 0
build.xml View File

@@ -71,4 +71,11 @@
71 71
     nbproject/build-impl.xml file. 
72 72
 
73 73
     -->
74
+
75
+    <target name="-pre-init">
76
+        <exec dir="." executable="/bin/bash">
77
+            <arg value="-c"/>
78
+            <arg value="git-describe --tags >src/uk/co/md87/evetool/version.txt"/>
79
+        </exec>
80
+    </target>
74 81
 </project>

+ 18
- 1
src/uk/co/md87/evetool/Main.java View File

@@ -22,6 +22,9 @@
22 22
 
23 23
 package uk.co.md87.evetool;
24 24
 
25
+import java.io.BufferedReader;
26
+import java.io.IOException;
27
+import java.io.InputStreamReader;
25 28
 import java.util.Collections;
26 29
 import java.util.logging.Handler;
27 30
 import java.util.logging.Level;
@@ -38,10 +41,14 @@ import uk.co.md87.evetool.ui.MainWindow;
38 41
  */
39 42
 public class Main {
40 43
 
44
+    public static String version;
45
+
41 46
     /**
42 47
      * @param args the command line arguments
43 48
      */
44
-    public static void main(String[] args) {
49
+    public static void main(final String[] args) {
50
+        readVersion();
51
+        
45 52
         Logger.getLogger("uk").setLevel(Level.ALL);
46 53
 
47 54
         for (Handler handler : Logger.getLogger("").getHandlers()) {
@@ -61,4 +68,14 @@ public class Main {
61 68
         System.out.println(cs.getSkills());
62 69
     }
63 70
 
71
+    protected static void readVersion() {
72
+        try {
73
+            final BufferedReader br = new BufferedReader(new InputStreamReader(
74
+                    Main.class.getResourceAsStream("version.txt")));
75
+            version = br.readLine();
76
+        } catch (IOException ex) {
77
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
78
+        }
79
+    }
80
+
64 81
 }

+ 2
- 1
src/uk/co/md87/evetool/ui/StatusPanel.java View File

@@ -27,6 +27,7 @@ import javax.swing.BorderFactory;
27 27
 import javax.swing.JLabel;
28 28
 import javax.swing.JPanel;
29 29
 import net.miginfocom.swing.MigLayout;
30
+import uk.co.md87.evetool.Main;
30 31
 
31 32
 /**
32 33
  *
@@ -40,7 +41,7 @@ public class StatusPanel extends JPanel {
40 41
     public StatusPanel() {
41 42
         super(new MigLayout());
42 43
 
43
-        leftLabel = new JLabel("Welcome to EVE Tool", JLabel.LEFT);
44
+        leftLabel = new JLabel("Welcome to EVE Tool " + Main.version, JLabel.LEFT);
44 45
         rightLabel = new JLabel("No skill training", JLabel.RIGHT);
45 46
 
46 47
         setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, Color.DARK_GRAY));

Loading…
Cancel
Save