diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-02 09:51:45 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-02 12:16:49 +0200 |
| commit | 29a40c45c78aad65adb4bc17318fdc53a5ed418b (patch) | |
| tree | 75854b815c1bcbb6300a576c022f7d55f4fc5148 | |
| parent | 065766883f5e34d20ca88084cd747813a84ed2d3 (diff) | |
Add an entry point for qtpy2cpp
[ChangeLog][pyside6] pyside6-qtpy2cpp.py, a Qt-specific, simple tool
for converting Python code to C++ has been added.
Fixes: PYSIDE-1945
Change-Id: I77659ec6b49c0d3f657b4d19e5866f3057561771
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | build_scripts/config.py | 3 | ||||
| -rw-r--r-- | build_scripts/platforms/unix.py | 9 | ||||
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 9 | ||||
| -rw-r--r-- | sources/pyside-tools/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | sources/pyside-tools/pyside_tool.py | 4 |
5 files changed, 27 insertions, 4 deletions
diff --git a/build_scripts/config.py b/build_scripts/config.py index 9c0c41280..70a63f746 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -201,7 +201,8 @@ class Config(object): ] _pyside_tools = ["uic", "rcc", "assistant", "designer", "linguist", "lupdate", "lrelease", "genpyi", "metaobjectdump", - "project", "qml", "qmltyperegistrar", "qmllint", "qmlformat", "qmlls"] + "project", "qml", "qmltyperegistrar", "qmllint", "qmlformat", "qmlls", + "qtpy2cpp"] setup_kwargs['entry_points'] = { 'console_scripts': [f'{PYSIDE}-{tool} = {package_name}.scripts.pyside_tool:{tool}' for tool in _pyside_tools] diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 9b1aa3552..65455d2c9 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -111,11 +111,18 @@ def prepare_packages_posix(self, _vars): _vars=_vars) # For setting up setuptools entry points - for script in ("pyside_tool.py", "metaobjectdump.py", "project.py", "qml.py"): + for script in ("pyside_tool.py", "metaobjectdump.py", "project.py", "qml.py", + "qtpy2cpp.py"): src = f"{{install_dir}}/bin/{script}" target = f"{{st_build_dir}}/{{st_package_name}}/scripts/{script}" copyfile(src, target, force=False, _vars=_vars) + for script_dir in ("qtpy2cpp_lib",): + src = f"{{install_dir}}/bin/{script_dir}" + target = f"{{st_build_dir}}/{{st_package_name}}/scripts/{script_dir}" + # Exclude subdirectory tests + copydir(src, target, _filter=["*.py"], recursive=False, _vars=_vars) + # <install>/bin/* -> {st_package_name}/ executables.extend(copydir( "{install_dir}/bin/", diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index fd65e35c4..8aec3f37a 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -115,11 +115,18 @@ def prepare_packages_win32(self, _vars): _vars=_vars) # For setting up setuptools entry points - for script in ("pyside_tool.py", "metaobjectdump.py", "project.py", "qml.py"): + for script in ("pyside_tool.py", "metaobjectdump.py", "project.py", "qml.py", + "qtpy2cpp.py"): src = f"{{install_dir}}/bin/{script}" target = f"{{st_build_dir}}/{{st_package_name}}/scripts/{script}" copyfile(src, target, force=False, _vars=_vars) + for script_dir in ("qtpy2cpp_lib",): + src = f"{{install_dir}}/bin/{script_dir}" + target = f"{{st_build_dir}}/{{st_package_name}}/scripts/{script_dir}" + # Exclude subdirectory tests + copydir(src, target, _filter=["*.py"], recursive=False, _vars=_vars) + # <install>/bin/*.exe,*.dll -> {st_package_name}/ filters = ["pyside*.exe", "pyside*.dll"] if not OPTION['NO_QT_TOOLS']: diff --git a/sources/pyside-tools/CMakeLists.txt b/sources/pyside-tools/CMakeLists.txt index 3b11a5056..2fc63029b 100644 --- a/sources/pyside-tools/CMakeLists.txt +++ b/sources/pyside-tools/CMakeLists.txt @@ -6,7 +6,9 @@ include(cmake/PySideToolsSetup.cmake) set(files ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py ${CMAKE_CURRENT_SOURCE_DIR}/metaobjectdump.py ${CMAKE_CURRENT_SOURCE_DIR}/project.py - ${CMAKE_CURRENT_SOURCE_DIR}/qml.py) + ${CMAKE_CURRENT_SOURCE_DIR}/qml.py + ${CMAKE_CURRENT_SOURCE_DIR}/qtpy2cpp.py) + set(directories) if(NOT NO_QT_TOOLS STREQUAL "yes") @@ -33,6 +35,8 @@ if(NOT NO_QT_TOOLS STREQUAL "yes") endif() endif() +list(APPEND directories ${CMAKE_CURRENT_SOURCE_DIR}/qtpy2cpp_lib) + # pyside6-rcc, pyside6-uic, pyside6-designer, shiboken and pyside6-lupdate entrypoints foreach(file ${files}) diff --git a/sources/pyside-tools/pyside_tool.py b/sources/pyside-tools/pyside_tool.py index 8deed8cf1..f9fda6de4 100644 --- a/sources/pyside-tools/pyside_tool.py +++ b/sources/pyside-tools/pyside_tool.py @@ -158,5 +158,9 @@ def qml(): pyside_script_wrapper("qml.py") +def qtpy2cpp(): + pyside_script_wrapper("qtpy2cpp.py") + + if __name__ == "__main__": main() |