diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_scripts/config.py | 2 | ||||
| -rw-r--r-- | sources/pyside-tools/CMakeLists.txt | 59 | ||||
| -rwxr-xr-x | sources/pyside-tools/pyside_tool.py | 89 |
4 files changed, 151 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 63c415302..4e38b5231 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,5 +18,7 @@ add_subdirectory(sources/shiboken2) list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_BINARY_DIR}/sources/shiboken2/data") add_subdirectory(sources/pyside2) +add_subdirectory(sources/pyside-tools) + # Semi-hack to include exported pyside2 variables. list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_BINARY_DIR}/sources/pyside2/libpyside") diff --git a/build_scripts/config.py b/build_scripts/config.py index 92f1e5cab..0a6c3bbb2 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -332,7 +332,7 @@ class Config(object): if self.is_internal_shiboken_module_build() or self.is_internal_shiboken_generator_build(): return ['shiboken2'] elif self.is_internal_pyside_build(): - return ['pyside2'] + return ['pyside2', 'pyside-tools'] return None def set_is_top_level_invocation(self): diff --git a/sources/pyside-tools/CMakeLists.txt b/sources/pyside-tools/CMakeLists.txt new file mode 100644 index 000000000..0def5a82f --- /dev/null +++ b/sources/pyside-tools/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required(VERSION 3.16) +project(pyside-tools) + +# Don't display "up-to-date / install" messages when installing, to reduce visual clutter. +if (QUIET_BUILD) + set(CMAKE_INSTALL_MESSAGE NEVER) +endif() + +find_package(Qt6 COMPONENTS Core) + +set(TOOLS_PATH "${QT6_INSTALL_PREFIX}/bin") + +set(UIC_PATH "${TOOLS_PATH}/uic${CMAKE_EXECUTABLE_SUFFIX}") +set(RCC_PATH "${TOOLS_PATH}/rcc${CMAKE_EXECUTABLE_SUFFIX}") +if (APPLE) + set(DESIGNER_PATH "${TOOLS_PATH}/Designer.app") +else() + set(DESIGNER_PATH "${TOOLS_PATH}/designer${CMAKE_EXECUTABLE_SUFFIX}") +endif() + +install(FILES "${UIC_PATH}" + DESTINATION bin + PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) + +install(FILES "${RCC_PATH}" + DESTINATION bin + PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) + +if (EXISTS ${DESIGNER_PATH}) + if (APPLE) + install(DIRECTORY "${DESIGNER_PATH}" + DESTINATION bin + FILE_PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) + else() + install(FILES "${DESIGNER_PATH}" + DESTINATION bin + PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) + endif() +endif() + +# pyside2-rcc, pyside2-uic, pyside2-designer, shiboken and pyside2-lupdate entrypoints +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py + DESTINATION bin + PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) diff --git a/sources/pyside-tools/pyside_tool.py b/sources/pyside-tools/pyside_tool.py new file mode 100755 index 000000000..99a3700f4 --- /dev/null +++ b/sources/pyside-tools/pyside_tool.py @@ -0,0 +1,89 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +############################################################################# +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of Qt for Python. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# +import sys +import os +import subprocess + +from subprocess import Popen, PIPE +import PySide2 as ref_mod + + +def main(): + # This will take care of "pyside2-lupdate" listed as an entrypoint + # in setup.py are copied to 'scripts/..' + cmd = os.path.join("..", os.path.basename(sys.argv[0])) + command = [os.path.join(os.path.dirname(os.path.realpath(__file__)), cmd)] + command.extend(sys.argv[1:]) + sys.exit(subprocess.call(command)) + + +def qt_tool_wrapper(qt_tool, args): + # Taking care of pyside2-uic, pyside2-rcc, and pyside2-designer + # listed as an entrypoint in setup.py + pyside_dir = os.path.dirname(ref_mod.__file__) + exe = os.path.join(pyside_dir, qt_tool) + + cmd = [exe] + args + proc = Popen(cmd, stderr=PIPE) + out, err = proc.communicate() + if err: + msg = err.decode("utf-8") + print("Error: {}\nwhile executing '{}'".format(msg, ' '.join(cmd))) + sys.exit(proc.returncode) + + +def uic(): + qt_tool_wrapper("uic", ['-g', 'python'] + sys.argv[1:]) + + +def rcc(): + qt_tool_wrapper("rcc", ['-g', 'python'] + sys.argv[1:]) + + +def designer(): + if sys.platform == "darwin": + qt_tool_wrapper("Designer.app/Contents/MacOS/Designer", sys.argv[1:]) + else: + qt_tool_wrapper("designer", sys.argv[1:]) + + +if __name__ == "__main__": + main() |