diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c648d9e..2e803c6 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -11,7 +11,7 @@ { "label": "PySide: build (Windows)", "type": "shell", - "command":"${workspaceFolder}/scripts/build.cmd", + "command":"${workspaceFolder}/scripts/build.ps1", "group": "build", "problemMatcher": [] }, diff --git a/hatch_build.py b/hatch_build.py index c8937d5..fc427fc 100644 --- a/hatch_build.py +++ b/hatch_build.py @@ -9,12 +9,12 @@ class CustomBuildHook(BuildHookInterface): # pyright: ignore[reportMissingTypeA if os.name == "posix": _ = subprocess.run("./scripts/clean.sh", check=True) if os.name == "nt": - _ = subprocess.run(["powershell", "-ExecutionPolicy", "Bypass", "-File", "\"scripts\\clean.ps1\""], check=True, shell=True) + _ = subprocess.run(["powershell", "-ExecutionPolicy", "Bypass", "-File", "scripts\\clean.ps1"], check=True, shell=True) return super().clean(versions) def initialize(self, version, build_data) -> None: # pyright: ignore[reportMissingParameterType] if os.name == "posix": _ = subprocess.run("./scripts/build.sh", check=True) if os.name == "nt": - _ = subprocess.run(["powershell", "ExecutionPolicy", "Bypass", "-File", "\"scripts\\build.ps1\""], check=True, shell=True) + _ = subprocess.run(["powershell", "-ExecutionPolicy", "Bypass", "-File", "scripts\\build.ps1"], check=True, shell=True) return super().initialize(version, build_data) diff --git a/packages.py b/packages.py index e97ecfc..cc17271 100644 --- a/packages.py +++ b/packages.py @@ -4,4 +4,4 @@ import subprocess if os.name == "posix": _ = subprocess.run("./scripts/packages.sh", check=True) if os.name == "nt": - _ = subprocess.run(["powershell", "-ExecutionPolicy", "Bypass", "-File", "\"scripts\\packages.ps1\""], check=True, shell=True) + _ = subprocess.run(["powershell", "-ExecutionPolicy", "Bypass", "-File", "scripts\\packages.ps1"], check=True, shell=True) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index e218c61..afcc73e 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -1,7 +1,7 @@ $ErrorActionPreference = 'Stop' Write-Output "Starting Compilaton of Qt Ressource" -pyside6-rcc "res.qrc" -o "src\lce_qt_launcher\res_rc.py" || exit /b 1 +pyside6-rcc "res.qrc" -o "src\lce_qt_launcher\res_rc.py" Write-Output "done" Write-Output "Compilation of Qt ui files" @@ -11,7 +11,7 @@ $QT_UI_ARRAY="system_info","form","instance","settingDialog","about", "contentIn foreach ($QT_UI in $QT_UI_ARRAY) { Write-Output "Compiling $QT_UI.ui Qt UI file" - pyside6-uic "src/$T_UI..ui" -o "src\lce_qt_launcher\ui_$Qt_UI.py" + pyside6-uic "src\$QT_UI.ui" -o "src\lce_qt_launcher\ui_$Qt_UI.py" Write-Output "done" } diff --git a/src/lce_qt_launcher/__init__.py b/src/lce_qt_launcher/__init__.py index f497c05..4a732a4 100644 --- a/src/lce_qt_launcher/__init__.py +++ b/src/lce_qt_launcher/__init__.py @@ -28,8 +28,6 @@ try: _license_url_temp: str = app_metadata["LicenseURL"] _license_temp: str = app_metadata["License"] - print(app_metadata.json) - if _version_temp: version_str = _version_temp if _app_name_temp: