refactor(release): clean up release build process

* handle case where a dist has never been created
* ignore requirements.txt
* include map resources instead of pulling from submodule

pyinstaller.spec

@@ -3,38 +3,47 @@
 block_cipher = None
 
 
-a = Analysis(['__init__.py'],
-             pathex=['C:\\Users\\shdwp\\PycharmProjects\\dcs_liberation'],
-             binaries=[],
-             datas=[
-             ('resources', 'resources'),
-             ('submodules/dcs/dcs/terrain/caucasus.p', 'dcs/terrain/'),
-             ('submodules/dcs/dcs/terrain/nevada.p', 'dcs/terrain/'),
-             ],
-             hookspath=[],
-             runtime_hooks=[],
-             excludes=[],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher,
-             noarchive=False)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          [],
-          icon="resources/icon.ico",
-          exclude_binaries=True,
-          name='liberation_main',
-          debug=False,
-          bootloader_ignore_signals=False,
-          strip=False,
-          upx=True,
-          console=True )
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name='dcs_liberation')
+analysis = Analysis(
+    ['__init__.py'],
+    pathex=['.'],
+    binaries=[],
+    datas=[
+        ('resources', 'resources'),
+        ('resources/caucasus.p', 'dcs/terrain/'),
+        ('resources/nevada.p', 'dcs/terrain/'),
+    ],
+    hookspath=[],
+    runtime_hooks=[],
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=block_cipher,
+    noarchive=False,
+)
+pyz = PYZ(
+    analysis.pure,
+    analysis.zipped_data,
+    cipher=block_cipher,
+)
+exe = EXE(
+    pyz,
+    analysis.scripts,
+    [],
+    icon="resources/icon.ico",
+    exclude_binaries=True,
+    name='liberation_main',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=True,
+)
+coll = COLLECT(
+    exe,
+    analysis.binaries,
+    analysis.zipfiles,
+    analysis.datas,
+    strip=False,
+    upx=True,
+    name='dcs_liberation',
+)

resources/tools/mkrelease.py

@@ -7,12 +7,10 @@ from zipfile import *
 IGNORED_PATHS = [
     "__pycache__",
     ".gitignore",
-    ".gitmodules",
     ".git",
     ".idea",
     ".DS_Store",
-    "submodules",
-
+    "requirements.txt",
     "build",
     "venv",
 ]
@@ -38,18 +36,19 @@ def _zip_dir(archieve, path):
 
 
 def _mk_archieve():
-    path = os.path.join("build", "dcs_liberation_{}.zip".format(VERSION))
+    path = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, "build", "dcs_liberation_{}.zip".format(VERSION))
     if os.path.exists(path):
         print("version already exists")
         return
 
-    shutil.rmtree("./dist")
-
+    try:
+        shutil.rmtree("./dist")
+    except FileNotFoundError:
+        pass
     os.system("pyinstaller.exe pyinstaller.spec")
-
     archieve = ZipFile(path, "w")
     archieve.writestr("dcs_liberation.bat", "cd dist\\dcs_liberation\r\nliberation_main \"%UserProfile%\\Saved Games\" \"{}\"".format(VERSION))
     _zip_dir(archieve, "./dist/dcs_liberation")
 
 
-_mk_archieve()
+_mk_archieve()