From 39bf64f845d6b759ebc726e85949e82dab678d37 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 5 Dec 2022 15:44:50 +0100 Subject: Split off shibokengenerator Split the generator executable off to a new directory shiboken6_generator. Adapting the build scripts and cmake configuration. Task-number: PYSIDE-962 Task-number: PYSIDE-1587 Change-Id: I301f96daace0331b0abc17bc59b44cd2396b9953 Reviewed-by: Friedemann Kleint --- build_scripts/config.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'build_scripts/config.py') diff --git a/build_scripts/config.py b/build_scripts/config.py index efafc7688..47dd28b7c 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -7,7 +7,7 @@ import sys from pathlib import Path from typing import Any -from . import PYPROJECT_PATH, PYSIDE, PYSIDE_MODULE, SHIBOKEN +from . import PYPROJECT_PATH, PYSIDE, PYSIDE_MODULE, SHIBOKEN, SHIBOKEN_GENERATOR from .log import LogLevel, log from .utils import available_pyside_tools, Singleton @@ -240,7 +240,7 @@ class Config(metaclass=Singleton): if self.is_internal_shiboken_module_build(): return SHIBOKEN elif self.is_internal_shiboken_generator_build(): - return f"{SHIBOKEN}_generator" + return SHIBOKEN_GENERATOR elif self.is_internal_pyside_build(): return PYSIDE_MODULE else: @@ -299,7 +299,9 @@ class Config(metaclass=Singleton): Used by PysideBuild.run to build the CMake projects. :return: A list of directory names under the sources directory. """ - if self.is_internal_shiboken_module_build() or self.is_internal_shiboken_generator_build(): + if self.is_internal_shiboken_generator_build(): + return [SHIBOKEN_GENERATOR] + if self.is_internal_shiboken_module_build(): return [SHIBOKEN] elif self.is_internal_pyside_build(): return [PYSIDE, 'pyside-tools'] -- cgit v1.2.3