From 18896a69cf93f224ba75a4a7d95b933ff38407a4 Mon Sep 17 00:00:00 2001 From: Anthony Conrad Date: Sat, 22 Aug 2020 19:02:26 -0700 Subject: [PATCH] Added PyDCS as a submodule --- .github/workflows/release.yml | 19 +++++++----------- .gitmodules | 4 ++++ game/data/building_data.py | 2 +- gen/conflictgen.py | 2 +- {msi_installer => installer}/ISCC.exe | Bin .../dcs_liberation.iss | 0 pydcs | 1 + qt_ui/main.py | 2 +- requirements.txt | 2 +- resources/tools/generate_loadout_check.py | 2 +- theater/conflicttheater.py | 2 +- userdata/liberation_install.py | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 .gitmodules rename {msi_installer => installer}/ISCC.exe (100%) rename {msi_installer => installer}/dcs_liberation.iss (100%) create mode 160000 pydcs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 31b89197..5fad7bff 100644 --- a/.github/workflows/release.yml +++ b/.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" diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..d8db9cf5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "pydcs"] + path = pydcs + url = https://github.com/pydcs/dcs + branch = master diff --git a/game/data/building_data.py b/game/data/building_data.py index 90d94cb2..6236a9e1 100644 --- a/game/data/building_data.py +++ b/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'] diff --git a/gen/conflictgen.py b/gen/conflictgen.py index 9b83b51e..1a5dabdb 100644 --- a/gen/conflictgen.py +++ b/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 diff --git a/msi_installer/ISCC.exe b/installer/ISCC.exe similarity index 100% rename from msi_installer/ISCC.exe rename to installer/ISCC.exe diff --git a/msi_installer/dcs_liberation.iss b/installer/dcs_liberation.iss similarity index 100% rename from msi_installer/dcs_liberation.iss rename to installer/dcs_liberation.iss diff --git a/pydcs b/pydcs new file mode 160000 index 00000000..dcc3d846 --- /dev/null +++ b/pydcs @@ -0,0 +1 @@ +Subproject commit dcc3d846316af2925c93ae09840c3ab4a1150e59 diff --git a/qt_ui/main.py b/qt_ui/main.py index e019d32c..dff7e51b 100644 --- a/qt_ui/main.py +++ b/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 diff --git a/requirements.txt b/requirements.txt index a7e3170e..6f314f97 100644 --- a/requirements.txt +++ b/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 diff --git a/resources/tools/generate_loadout_check.py b/resources/tools/generate_loadout_check.py index 3d86d329..ae299a0f 100644 --- a/resources/tools/generate_loadout_check.py +++ b/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 diff --git a/theater/conflicttheater.py b/theater/conflicttheater.py index 621f106a..2934f15e 100644 --- a/theater/conflicttheater.py +++ b/theater/conflicttheater.py @@ -1,6 +1,6 @@ import typing -import dcs +from pydcs import dcs from dcs.mapping import Point from .controlpoint import ControlPoint diff --git a/userdata/liberation_install.py b/userdata/liberation_install.py index 5f19ec0a..440fe29f 100644 --- a/userdata/liberation_install.py +++ b/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