From df7dc30e7e7f5aba1df0b33149bae8e8ae84ba8e Mon Sep 17 00:00:00 2001
From: blitzmann <holmes.ryan.90@gmail.com>
Date: Sun, 12 Nov 2017 12:57:36 -0500
Subject: [PATCH] Write out git version information to a file, use in about
 box, remove all the other stuff until I can format it correctly

---
 .gitignore       |  1 +
 config.py        |  8 +++++++-
 gui/mainFrame.py | 50 ++++++++++++++++++++++++------------------------
 pyfa.spec        |  9 ++++++++-
 4 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index 41586d1b5..c3530eab7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,3 +117,4 @@ ENV/
 # Pycharm project settings
 .idea
 eos.iml
+gitversion
diff --git a/config.py b/config.py
index f097385a4..05317583d 100644
--- a/config.py
+++ b/config.py
@@ -51,11 +51,17 @@ def getPyfaRoot():
     return root
 
 
+def getGitVersion():
+    with open(os.path.join(pyfaPath, 'gitversion')) as f:
+        version = f.readline()
+    return version
+
+
 def getDefaultSave():
     return os.path.expanduser(os.path.join("~", ".pyfa"))
 
 
-def defPaths(customSavePath):
+def defPaths(customSavePath=None):
     global debug
     global pyfaPath
     global savePath
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index d03d2fe76..a856c391b 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -359,31 +359,31 @@ class MainFrame(wx.Frame):
         v = sys.version_info
         info = wx.adv.AboutDialogInfo()
         info.Name = "pyfa"
-        info.Version = gui.aboutData.versionString
-
-        try:
-            import matplotlib
-            matplotlib_version = matplotlib.__version__
-        except:
-            matplotlib_version = None
-
-        info.Description = wordwrap(gui.aboutData.description + "\n\nDevelopers:\n\t" +
-                                    "\n\t".join(gui.aboutData.developers) +
-                                    "\n\nAdditional credits:\n\t" +
-                                    "\n\t".join(gui.aboutData.credits) +
-                                    "\n\nLicenses:\n\t" +
-                                    "\n\t".join(gui.aboutData.licenses) +
-                                    "\n\nEVE Data: \t" + gamedata_version +
-                                    "\nPython: \t\t" + '{}.{}.{}'.format(v.major, v.minor, v.micro) +
-                                    "\nwxPython: \t" + wx.__version__ +
-                                    "\nSQLAlchemy: \t" + sqlalchemy.__version__ +
-                                    "\nmatplotlib: \t {}".format(matplotlib_version if matplotlib_version else "Not Installed"),
-                                    500, wx.ClientDC(self))
-        if "__WXGTK__" in wx.PlatformInfo:
-            forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&amp;t=466425"
-        else:
-            forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&t=466425"
-        info.WebSite = (forumUrl, "pyfa thread at EVE Online forum")
+        info.Version = config.getGitVersion() #  gui.aboutData.versionString
+        #
+        # try:
+        #     import matplotlib
+        #     matplotlib_version = matplotlib.__version__
+        # except:
+        #     matplotlib_version = None
+        #
+        # info.Description = wordwrap(gui.aboutData.description + "\n\nDevelopers:\n\t" +
+        #                             "\n\t".join(gui.aboutData.developers) +
+        #                             "\n\nAdditional credits:\n\t" +
+        #                             "\n\t".join(gui.aboutData.credits) +
+        #                             "\n\nLicenses:\n\t" +
+        #                             "\n\t".join(gui.aboutData.licenses) +
+        #                             "\n\nEVE Data: \t" + gamedata_version +
+        #                             "\nPython: \t\t" + '{}.{}.{}'.format(v.major, v.minor, v.micro) +
+        #                             "\nwxPython: \t" + wx.__version__ +
+        #                             "\nSQLAlchemy: \t" + sqlalchemy.__version__ +
+        #                             "\nmatplotlib: \t {}".format(matplotlib_version if matplotlib_version else "Not Installed"),
+        #                             500, wx.ClientDC(self))
+        # if "__WXGTK__" in wx.PlatformInfo:
+        #     forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&amp;t=466425"
+        # else:
+        #     forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&t=466425"
+        # info.WebSite = (forumUrl, "pyfa thread at EVE Online forum")
         wx.adv.AboutBox(info)
 
     def showCharacterEditor(self, event):
diff --git a/pyfa.spec b/pyfa.spec
index f330a16c7..7671e380d 100644
--- a/pyfa.spec
+++ b/pyfa.spec
@@ -2,6 +2,13 @@
 
 import os
 from itertools import chain
+import subprocess
+
+label = subprocess.check_output([
+    "git", "describe", "--tags"]).strip()
+
+with open('gitversion', 'w+') as f:
+    f.write(label.decode())
 
 block_cipher = None
 
@@ -15,6 +22,7 @@ added_files = [
              ( 'eve.db', '.' ),
              ( 'README.md', '.' ),
              ( 'LICENSE', '.' ),
+             ( 'gitversion', '.' ),
              ]
 
 import_these = []
@@ -32,7 +40,6 @@ for root, folders, files in chain.from_iterable(os.walk(path) for path in paths)
 
 a = Analysis([r'C:\Users\Ryan\Sync\Git\blitzmann\Pyfa\pyfa.py'],
              pathex=[
-                 r'C:\Users\Ryan\Sync\Git\blitzmann\Pyfa',
                  # Need this, see https://github.com/pyinstaller/pyinstaller/issues/1566
                  # To get this, download and install windows 10 SDK
                  # If not building on Windows 10, this might be optional