From 74c18612403dff5d2fe83cc32e1460cf6714219a Mon Sep 17 00:00:00 2001 From: Vasyl Horbachenko Date: Tue, 31 Jul 2018 23:40:35 +0300 Subject: [PATCH] build archieve tool --- __init__.py | 2 +- resources/tools/mkrelease.py | 38 ++++++++++++++++++++++++++++++++++++ start.bat | 1 - userdata/logging.py | 21 +++++++++++++------- 4 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 resources/tools/mkrelease.py delete mode 100644 start.bat diff --git a/__init__.py b/__init__.py index a4e2836b..1dbd27a3 100755 --- a/__init__.py +++ b/__init__.py @@ -16,8 +16,8 @@ from game.game import Game from theater import start_generator from userdata import persistency, logging - persistency.setup(sys.argv[1]) +logging.setup_version_string(sys.argv[2]) dcs.planes.FlyingType.payload_dirs.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), "resources\\payloads")) diff --git a/resources/tools/mkrelease.py b/resources/tools/mkrelease.py new file mode 100644 index 00000000..7ffc5c41 --- /dev/null +++ b/resources/tools/mkrelease.py @@ -0,0 +1,38 @@ +import os + +from zipfile import * + + +IGNORED_PATHS = [ + "__pycache__", + ".gitignore", + ".gitmodules", + ".git", + ".idea", + ".DS_Store", + + "build", +] + +VERSION = "1.3.2" + + +def _mk_archieve(): + archieve = ZipFile("build/dcs_liberation_{}.zip".format(VERSION), "w") + archieve.writestr("start.bat", "py.exe __init__.py \"%UserProfile%\" \"{}\"".format(VERSION)) + + for path, directories, files in os.walk("."): + is_ignored = False + for ignored_path in IGNORED_PATHS: + if ignored_path in path: + is_ignored = True + break + + if is_ignored: + continue + + for file in files: + archieve.write(os.path.join(path, file)) + + +_mk_archieve() \ No newline at end of file diff --git a/start.bat b/start.bat deleted file mode 100644 index b3235fcd..00000000 --- a/start.bat +++ /dev/null @@ -1 +0,0 @@ -py.exe __init__.py "%UserProfile%" diff --git a/userdata/logging.py b/userdata/logging.py index e0c22766..4bd5b616 100644 --- a/userdata/logging.py +++ b/userdata/logging.py @@ -6,11 +6,7 @@ from io import StringIO from tkinter import * from tkinter.scrolledtext import * -if "-stdout" in sys.argv: - logging.basicConfig(stream=sys.stdout, level=logging.INFO) -else: - log_stream = StringIO() - logging.basicConfig(stream=log_stream, level=logging.INFO) +_version_string = None def _error_prompt(): @@ -29,5 +25,16 @@ def _handle_exception(self, exception: BaseException, *args): _error_prompt() -Tk.report_callback_exception = _handle_exception -logging.info("DCS Libration 1.3 RC2") +def setup_version_string(str): + global _version_string + _version_string = str + + +if "-stdout" in sys.argv: + logging.basicConfig(stream=sys.stdout, level=logging.INFO) +else: + log_stream = StringIO() + logging.basicConfig(stream=log_stream, level=logging.INFO) + Tk.report_callback_exception = _handle_exception + +logging.info("DCS Libration {}".format(_version_string))