diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-28 07:51:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-28 09:34:35 +0000 |
| commit | 2a2a0827fa54b2eeb48e0e2090dfc503492ef33e (patch) | |
| tree | 4311f7ad34ff98fabcbe4c34e59a970ae4ff4bcf /build_scripts/platforms | |
| parent | fb1c0f204e09ba29fa3d360d72231d4ed468c1e4 (diff) | |
Rename shiboken2 to shiboken6
Adapt CMake files, build scripts, tests and examples.
Task-number: PYSIDE-904
Change-Id: I4cb5ee4c8df539546014b08202a7b1e98ed3ff07
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts/platforms')
| -rw-r--r-- | build_scripts/platforms/linux.py | 2 | ||||
| -rw-r--r-- | build_scripts/platforms/unix.py | 10 | ||||
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index 712739e05..ddfd8e21a 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -85,7 +85,7 @@ def prepare_standalone_package_linux(self, vars): # which ICU libs are used by QtCore (if used at all) using a # custom written ldd, and copy the ICU libs to the Pyside Qt # dir if necessary. We choose the QtCore lib to inspect, by - # checking which QtCore library the shiboken2 executable uses. + # checking which QtCore library the shiboken6 executable uses. if not maybe_icu_libs: copy_icu_libs(self._patchelf_path, resolved_destination_lib_dir) diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 30fa237c7..1e1c1e4a8 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -72,11 +72,11 @@ def prepare_packages_posix(self, vars): return name + postfix if config.is_internal_shiboken_module_build(): - # <build>/shiboken2/doc/html/* -> - # <setup>/{st_package_name}/docs/shiboken2 + # <build>/shiboken6/doc/html/* -> + # <setup>/{st_package_name}/docs/shiboken6 copydir( - "{build_dir}/shiboken2/doc/html", - "{st_build_dir}/{st_package_name}/docs/shiboken2", + "{build_dir}/shiboken6/doc/html", + "{st_build_dir}/{st_package_name}/docs/shiboken6", force=False, vars=vars) # <install>/lib/lib* -> {st_package_name}/ @@ -95,7 +95,7 @@ def prepare_packages_posix(self, vars): "{install_dir}/bin/", "{st_build_dir}/{st_package_name}", filter=[ - "shiboken2", + "shiboken6", ], recursive=False, vars=vars)) diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index 77bf9bfd2..83485e1d7 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -66,11 +66,11 @@ def prepare_packages_win32(self, vars): vars=vars) if config.is_internal_shiboken_module_build(): - # <build>/shiboken2/doc/html/* -> - # <setup>/{st_package_name}/docs/shiboken2 + # <build>/shiboken6/doc/html/* -> + # <setup>/{st_package_name}/docs/shiboken6 copydir( - "{build_dir}/shiboken2/doc/html", - "{st_build_dir}/{st_package_name}/docs/shiboken2", + "{build_dir}/shiboken6/doc/html", + "{st_build_dir}/{st_package_name}/docs/shiboken6", force=False, vars=vars) # <install>/bin/*.dll -> {st_package_name}/ @@ -91,14 +91,14 @@ def prepare_packages_win32(self, vars): # {shibokengenerator}.pdb file. # Task-number: PYSIDE-615 copydir( - "{build_dir}/shiboken2/shibokenmodule", + "{build_dir}/shiboken6/shibokenmodule", "{st_build_dir}/{st_package_name}", filter=pdbs, recursive=False, vars=vars) # pdb files for libshiboken and libpyside copydir( - "{build_dir}/shiboken2/libshiboken", + "{build_dir}/shiboken6/libshiboken", "{st_build_dir}/{st_package_name}", filter=pdbs, recursive=False, vars=vars) @@ -126,7 +126,7 @@ def prepare_packages_win32(self, vars): # {shibokenmodule}.pdb file. # Task-number: PYSIDE-615 copydir( - "{build_dir}/shiboken2/generator", + "{build_dir}/shiboken6/generator", "{st_build_dir}/{st_package_name}", filter=pdbs, recursive=False, vars=vars) |