diff options
| author | Friedemann Kleint <friedemann.kleint@qt.io> | 2022-12-05 15:44:50 +0100 |
|---|---|---|
| committer | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2025-11-24 12:06:11 +0100 |
| commit | 39bf64f845d6b759ebc726e85949e82dab678d37 (patch) | |
| tree | 4049c7bcd70aeed935f5bfcad4baffad750a87b7 /build_scripts/setup_runner.py | |
| parent | 845630ad239c4b37ff37e49ef5bb969a8946744b (diff) | |
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 <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_scripts/setup_runner.py')
| -rw-r--r-- | build_scripts/setup_runner.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py index ec679801e..116ab4a72 100644 --- a/build_scripts/setup_runner.py +++ b/build_scripts/setup_runner.py @@ -126,7 +126,7 @@ class SetupRunner: # instead of shiboken_generator_option_name, but it will # actually build the generator. host_cmd = self.new_setup_internal_invocation( - initialized_config.shiboken_module_option_name, + initialized_config.shiboken_generator_option_name, extra_args=extra_host_args, replace_command_with="build") @@ -228,19 +228,14 @@ class SetupRunner: # target invocations. if config.is_cross_compile(): extra_args = self.add_host_tools_setup_internal_invocation(config) + else: + self.add_setup_internal_invocation( + config.shiboken_generator_option_name) self.add_setup_internal_invocation( config.shiboken_module_option_name, extra_args=extra_args) - # Reuse the shiboken build for the generator package instead - # of rebuilding it again. - # Don't build it in a cross-build though. - if not config.is_cross_compile(): - self.add_setup_internal_invocation( - config.shiboken_generator_option_name, - reuse_build=True) - self.add_setup_internal_invocation(config.pyside_option_name, extra_args=extra_args) |