diff --git a/overviewer.py b/overviewer.py index 8357212..ffc3882 100755 --- a/overviewer.py +++ b/overviewer.py @@ -28,6 +28,7 @@ import subprocess import multiprocessing import time import logging +import util logging.basicConfig(level=logging.INFO,format="%(asctime)s [%(levelname)s] %(message)s") @@ -50,21 +51,6 @@ helptext = """ %prog -d [tiles dest dir]""" -def findGitVersion(): - if os.path.exists(".git"): - with open(os.path.join(".git","HEAD")) as f: - data = f.read().strip() - if data.startswith("ref: "): - with open(os.path.join(".git", data[5:])) as g: - return g.read().strip() - else: - return data - else: - try: - import overviewer_version - return overviewer_version.VERSION - except: - return "unknown" def main(): try: @@ -92,7 +78,7 @@ def main(): if options.version: print "Minecraft-Overviewer" - print "Git version: %s" % findGitVersion() + print "Git version: %s" % util.findGitVersion() try: import overviewer_version if hasattr(sys, "frozen"): diff --git a/setup.py b/setup.py index 5e5f809..9d2f7aa 100644 --- a/setup.py +++ b/setup.py @@ -94,9 +94,9 @@ if py2exe is not None: class CustomPy2exe(py2exe.build_exe.py2exe): def run(self): try: - import overviewer + import util f = open("overviewer_version.py", "w") - f.write("VERSION=%r\n" % overviewer.findGitVersion()) + f.write("VERSION=%r\n" % util.findGitVersion()) f.write("BUILD_DATE=%r\n" % time.asctime()) f.write("BUILD_PLATFORM=%r\n" % platform.processor()) f.write("BUILD_OS=%r\n" % platform.platform()) diff --git a/util.py b/util.py index 280bcab..f39798a 100644 --- a/util.py +++ b/util.py @@ -30,3 +30,21 @@ def get_program_path(): return os.path.dirname(__file__) except NameError: return os.path.dirname(sys.argv[0]) + + + +def findGitVersion(): + if os.path.exists(".git"): + with open(os.path.join(".git","HEAD")) as f: + data = f.read().strip() + if data.startswith("ref: "): + with open(os.path.join(".git", data[5:])) as g: + return g.read().strip() + else: + return data + else: + try: + import overviewer_version + return overviewer_version.VERSION + except: + return "unknown"