From a3b108382e017d62377f674fdf241797b950b3ea Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 27 Sep 2015 09:45:44 -0400 Subject: [PATCH] Move eve.db to root --- config.py | 9 +-------- staticdata/eve.db => eve.db | Bin setup.py | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) rename staticdata/eve.db => eve.db (100%) diff --git a/config.py b/config.py index 72a68259d..93410fcc6 100644 --- a/config.py +++ b/config.py @@ -26,7 +26,6 @@ evemonMinVersion = "4081" pyfaPath = None savePath = None -staticPath = None saveDB = None gameDB = None @@ -65,7 +64,6 @@ def defPaths(): global debug global pyfaPath global savePath - global staticPath global saveDB global gameDB global saveInRoot @@ -113,18 +111,13 @@ def defPaths(): #sl = StreamToLogger(stderr_logger, logging.ERROR) #sys.stderr = sl - - # Static EVE Data from the staticdata repository, should be in the staticdata - # directory in our pyfa directory - staticPath = os.path.join(pyfaPath, "staticdata") - # The database where we store all the fits etc saveDB = os.path.join(savePath, "saveddata.db") # The database where the static EVE data from the datadump is kept. # This is not the standard sqlite datadump but a modified version created by eos # maintenance script - gameDB = os.path.join(staticPath, "eve.db") + gameDB = os.path.join(pyfaPath, "eve.db") ## DON'T MODIFY ANYTHING BELOW ## import eos.config diff --git a/staticdata/eve.db b/eve.db similarity index 100% rename from staticdata/eve.db rename to eve.db diff --git a/setup.py b/setup.py index 240e688dd..04966bb0d 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ Windows executable + installer: python setup.py bdist_msi """ packages = ['eos', 'gui', 'service', 'utils'] -include_files = ['staticdata', 'gpl.txt'] +include_files = ['eve.db', 'gpl.txt'] # this is read by dist.py to package the icons icon_dirs = ['gui', 'icons', 'renders']