diff options
-rw-r--r-- | build_scripts/platforms/unix.py | 2 | ||||
-rw-r--r-- | build_scripts/platforms/windows_desktop.py | 2 | ||||
-rw-r--r-- | sources/pyside-tools/CMakeLists.txt | 2 | ||||
-rw-r--r-- | sources/pyside-tools/deploy_lib/config.py | 2 | ||||
-rw-r--r-- | sources/pyside-tools/deploy_lib/nuitka_helper.py | 2 | ||||
-rw-r--r-- | sources/pyside-tools/project.py | 14 | ||||
-rw-r--r-- | sources/pyside-tools/project.pyproject | 4 | ||||
-rw-r--r-- | sources/pyside-tools/project_lib/__init__.py (renamed from sources/pyside-tools/project/__init__.py) | 0 | ||||
-rw-r--r-- | sources/pyside-tools/project_lib/design_studio_project.py (renamed from sources/pyside-tools/project/design_studio_project.py) | 0 | ||||
-rw-r--r-- | sources/pyside-tools/project_lib/newproject.py (renamed from sources/pyside-tools/project/newproject.py) | 0 | ||||
-rw-r--r-- | sources/pyside-tools/project_lib/project_data.py (renamed from sources/pyside-tools/project/project_data.py) | 0 | ||||
-rw-r--r-- | sources/pyside-tools/project_lib/utils.py (renamed from sources/pyside-tools/project/utils.py) | 0 |
12 files changed, 14 insertions, 14 deletions
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 3a350a662..35d6dd1c3 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -124,7 +124,7 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False): scripts = ["pyside_tool.py", "metaobjectdump.py", "project.py", "qml.py", "qtpy2cpp.py", "deploy.py"] - script_dirs = ["qtpy2cpp_lib", "deploy_lib", "project"] + script_dirs = ["qtpy2cpp_lib", "deploy_lib", "project_lib"] if sys.platform in ["linux", "darwin"]: scripts.append("android_deploy.py") diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index c82433891..eaab7acb6 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -117,7 +117,7 @@ def prepare_packages_win32(pyside_build, _vars): target = f"{{st_build_dir}}/{{st_package_name}}/scripts/{script}" copyfile(src, target, force=False, _vars=_vars) - for script_dir in ("qtpy2cpp_lib", "deploy_lib", "project"): + for script_dir in ("qtpy2cpp_lib", "deploy_lib", "project_lib"): src = f"{{install_dir}}/bin/{script_dir}" target = f"{{st_build_dir}}/{{st_package_name}}/scripts/{script_dir}" # Exclude subdirectory tests diff --git a/sources/pyside-tools/CMakeLists.txt b/sources/pyside-tools/CMakeLists.txt index 124ecc780..cc9a7e5b3 100644 --- a/sources/pyside-tools/CMakeLists.txt +++ b/sources/pyside-tools/CMakeLists.txt @@ -29,7 +29,7 @@ else() ${CMAKE_CURRENT_SOURCE_DIR}/requirements-android.txt) set(directories ${CMAKE_CURRENT_SOURCE_DIR}/deploy_lib - ${CMAKE_CURRENT_SOURCE_DIR}/project) + ${CMAKE_CURRENT_SOURCE_DIR}/project_lib) if(NOT NO_QT_TOOLS STREQUAL "yes") set(TOOLS_PATH "${QT6_INSTALL_PREFIX}/${QT6_HOST_INFO_BINDIR}") diff --git a/sources/pyside-tools/deploy_lib/config.py b/sources/pyside-tools/deploy_lib/config.py index 0c1ead9d7..998a175ce 100644 --- a/sources/pyside-tools/deploy_lib/config.py +++ b/sources/pyside-tools/deploy_lib/config.py @@ -11,7 +11,7 @@ from configparser import ConfigParser from pathlib import Path from enum import Enum -from project import ProjectData, DesignStudioProject +from project_lib import ProjectData, DesignStudioProject from . import (DEFAULT_APP_ICON, DEFAULT_IGNORE_DIRS, find_pyside_modules, find_permission_categories, QtDependencyReader, run_qmlimportscanner) diff --git a/sources/pyside-tools/deploy_lib/nuitka_helper.py b/sources/pyside-tools/deploy_lib/nuitka_helper.py index 1f0800998..bc2896a4c 100644 --- a/sources/pyside-tools/deploy_lib/nuitka_helper.py +++ b/sources/pyside-tools/deploy_lib/nuitka_helper.py @@ -11,7 +11,7 @@ import shlex import sys from pathlib import Path -from project import DesignStudioProject +from project_lib import DesignStudioProject from . import MAJOR_VERSION, run_command, DEFAULT_IGNORE_DIRS, PLUGINS_TO_REMOVE from .config import DesktopConfig diff --git a/sources/pyside-tools/project.py b/sources/pyside-tools/project.py index 4836a7472..3b4b3e3f7 100644 --- a/sources/pyside-tools/project.py +++ b/sources/pyside-tools/project.py @@ -2,7 +2,6 @@ # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only from __future__ import annotations - """ Builds a '.pyproject' file @@ -25,12 +24,12 @@ import os from pathlib import Path from argparse import ArgumentParser, RawTextHelpFormatter -from project import (QmlProjectData, check_qml_decorators, is_python_file, - QMLDIR_FILE, MOD_CMD, METATYPES_JSON_SUFFIX, - SHADER_SUFFIXES, TRANSLATION_SUFFIX, - requires_rebuild, run_command, remove_path, - ProjectData, resolve_project_file, new_project, - ProjectType, ClOptions) +from project_lib import (QmlProjectData, check_qml_decorators, is_python_file, + QMLDIR_FILE, MOD_CMD, METATYPES_JSON_SUFFIX, + SHADER_SUFFIXES, TRANSLATION_SUFFIX, + requires_rebuild, run_command, remove_path, + ProjectData, resolve_project_file, new_project, + ProjectType, ClOptions) MODE_HELP = """build Builds the project run Builds the project and runs the first file") @@ -71,6 +70,7 @@ class Project: """ Class to wrap the various operations on Project """ + def __init__(self, project_file: Path): self.project = ProjectData(project_file=project_file) self.cl_options = ClOptions() diff --git a/sources/pyside-tools/project.pyproject b/sources/pyside-tools/project.pyproject index 346ef0465..49c7adab2 100644 --- a/sources/pyside-tools/project.pyproject +++ b/sources/pyside-tools/project.pyproject @@ -1,4 +1,4 @@ { - "files": ["project.py", "project/__init__.py", "project/newproject.py", - "project/project_data.py", "project/utils.py"] + "files": ["project.py", "project_lib/__init__.py", "project_lib/design_studio_project.py", + "project_lib/newproject.py", "project_lib/project_data.py", "project_lib/utils.py"] } diff --git a/sources/pyside-tools/project/__init__.py b/sources/pyside-tools/project_lib/__init__.py index aafaa44bf..aafaa44bf 100644 --- a/sources/pyside-tools/project/__init__.py +++ b/sources/pyside-tools/project_lib/__init__.py diff --git a/sources/pyside-tools/project/design_studio_project.py b/sources/pyside-tools/project_lib/design_studio_project.py index ef1935dc4..ef1935dc4 100644 --- a/sources/pyside-tools/project/design_studio_project.py +++ b/sources/pyside-tools/project_lib/design_studio_project.py diff --git a/sources/pyside-tools/project/newproject.py b/sources/pyside-tools/project_lib/newproject.py index 80ed5a75e..80ed5a75e 100644 --- a/sources/pyside-tools/project/newproject.py +++ b/sources/pyside-tools/project_lib/newproject.py diff --git a/sources/pyside-tools/project/project_data.py b/sources/pyside-tools/project_lib/project_data.py index b9c428a08..b9c428a08 100644 --- a/sources/pyside-tools/project/project_data.py +++ b/sources/pyside-tools/project_lib/project_data.py diff --git a/sources/pyside-tools/project/utils.py b/sources/pyside-tools/project_lib/utils.py index a2d91375b..a2d91375b 100644 --- a/sources/pyside-tools/project/utils.py +++ b/sources/pyside-tools/project_lib/utils.py |