Added PyDCS as a submodule

.github/workflows/release.yml

@@ -9,13 +9,9 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
-
-    # Only needed to work around missing libraries from current PyDCS module
     - uses: actions/checkout@v2
       with:
-        repository: "${{github['repository_owner']}}/dcs"
-        path: '.\pydcs'
+        submodules: true
 
     - name: Set up Python 3.8
       uses: actions/setup-python@v2
@@ -30,14 +26,13 @@ jobs:
       run: |
         ./venv/scripts/activate
         pip install -r requirements.txt
-        # Workaround for the missing libraries needed for Syria within the PyDCS module.
-        Copy-Item .\pydcs\dcs .\venv\Lib\site-packages\ -Container -Recurse -Force
+        # For some reason the shiboken2.abi3.dll is not found properly, so I copy it instead
         Copy-Item .\venv\Lib\site-packages\shiboken2\shiboken2.abi3.dll .\venv\Lib\site-packages\PySide2\ -Force
-        
+
     - name: Build binaries
       run: |
         ./venv/scripts/activate
-        $env:PYTHONPATH="."
+        $env:PYTHONPATH=".;./pydcs"
         pyinstaller pyinstaller.spec
 
     - name: Create Installer
@@ -45,8 +40,8 @@ jobs:
         TAG_NAME: ${{ github.ref }}
       run: |
         $version = ($env:TAG_NAME -split "/") | Select-Object -Last 1
-        (Get-Content .\msi_installer\dcs_liberation.iss) -replace "{{version}}",$version | Out-File .\build\installer.iss
-        cd .\msi_installer
+        (Get-Content .\installer\dcs_liberation.iss) -replace "{{version}}",$version | Out-File .\build\installer.iss
+        cd .\installer
         iscc.exe ..\build\installer.iss
         cd ..
         Copy-Item .\changelog.md .\dist
@@ -71,7 +66,7 @@ jobs:
       run: |
         Get-ChildItem -Recurse -Depth 1
         $version = ($env:TAG_NAME -split "/") | Select-Object -Last 1
-        $prerelease = $version -match '[^\.\d]'
+        $prerelease = ("2.1.1-alpha3" -match '[^\.\d]').ToString().ToLower()
         Write-Host $version
         Write-Host $prerelease
         Write-Output "::set-output name=number::$version"

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "pydcs"]
+	path = pydcs
+	url = https://github.com/pydcs/dcs
+	branch = master

game/data/building_data.py

@@ -1,5 +1,5 @@
 import inspect
-import dcs
+from pydcs import dcs
 
 DEFAULT_AVAILABLE_BUILDINGS = ['fuel', 'ammo', 'comms', 'oil', 'ware', 'farp', 'fob', 'power', 'factory', 'derrick', 'aa']
 

gen/conflictgen.py

@@ -1,7 +1,7 @@
 import logging
 import typing
 import pdb
-import dcs
+from pydcs import dcs
 
 from random import randint
 from dcs import Mission

pydcs

@@ -0,0 +1 @@
+Subproject commit dcc3d846316af2925c93ae09840c3ab4a1150e59

qt_ui/main.py

@@ -4,7 +4,7 @@ import logging
 import os
 import sys
 
-import dcs
+from pydcs import dcs
 from PySide2 import QtWidgets
 from PySide2.QtGui import QPixmap
 from PySide2.QtWidgets import QApplication, QSplashScreen

requirements.txt

@@ -1,4 +1,4 @@
-pydcs>=0.9.10
+#pydcs>=0.9.10
 Pyside2>=5.13.0
 pyinstaller==3.6
 pyproj==2.6.1.post1

resources/tools/generate_loadout_check.py

@@ -1,6 +1,6 @@
 import os
 import sys
-import dcs
+from pydcs import dcs
 
 from game import db
 from gen.aircraft import AircraftConflictGenerator

theater/conflicttheater.py

@@ -1,6 +1,6 @@
 import typing
 
-import dcs
+from pydcs import dcs
 from dcs.mapping import Point
 
 from .controlpoint import ControlPoint

userdata/liberation_install.py

@@ -2,7 +2,7 @@ import json
 import os
 from shutil import copyfile
 
-import dcs
+from pydcs import dcs
 
 from userdata import persistency