aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts/platforms
Commit message (Collapse)AuthorAgeFilesLines
* Split off shibokengeneratorFriedemann Kleint2025-11-241-5/+7
| | | | | | | | | | | | 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>
* Shiboken6Tools: Use shiboken6-generator from CMake easilyShyamnath Premnadh2025-08-152-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Inspecting the `samplebinding` example, much of the code to effectively call `shiboken6-generator` can be moved into CMake function `shiboken_generator_create_binding` and shipped with `Shiboken6Tools` cmake package enabling users to easily use `shiboken6-generator` in their CMake projects. This also helps to get rid of the `pyside_config.py` script which is used to query certain required paths. - This `Shiboken6Tools` CMake package is packaged with the `shiboken6-generator` wheel and can be used easily in CMake projects by using the `find_package(Shiboken6Tools)` command by adding the Python site-packages directory to the CMake module path. - The `shiboken6-generator` path installed into the Python site-packages is different from the one used by the consecutive setup.py build/ super project build. Hence, we create a new export set `Shiboken6ToolsWheelTargets` just for the wheel package. When copied into `package_for_wheels` this export set is used. - Add a special condition to the `Shiboken6ToolsConfig.cmake` file to skip the dependency checking when building PySide which would otherwise lead to a circular dependency. Task-number: PYSIDE-3138 Change-Id: I199b8d9fe743adee4e3b12e8a7e1ad01f3c277de Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Use newer versions of the MSVC runtimeFriedemann Kleint2025-07-111-1/+1
| | | | | | | | | Bump the archive version. Pick-to: 6.9 Fixes: PYSIDE-2938 Change-Id: I1e00c96df9c6ba4ea55f1c0cf9e6ebdd0ae1f4f3 Reviewed-by: Simo Fält <simo.falt@qt.io>
* Download MSVC runtime instead of copying it from the build hostFriedemann Kleint2025-07-111-29/+2
| | | | | | | | | | | | This effectivly reverts 36f62dd5d45b8b84bd80064ceb43bab74a89321e since the MSVC runtime found on COIN hosts is quite old and cannot easily be updated. Now, the downloadable artifacts are used. Pick-to: 6.9 Task-number: PYSIDE-2938 Task-number: PYSIDE-2162 Change-Id: I228632070c92c18c60367d39c9d3540d36e7f6a2 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
* build scripts: Introduce a cache directory for Qt artifactsFriedemann Kleint2025-07-111-14/+30
| | | | | | | | | | | Future patches will use the MSVC runtime from the downloadable artifacts for several wheels, so cache the DLLs in a directory named by the COIN job id. Pick-to: 6.9 Task-number: PYSIDE-2938 Change-Id: Id0e0889f306c45bdf9c056f4f76bede5c783645d Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
* Fix CMake targets to be relocatable in wheelsShyamnath Premnadh2025-07-072-25/+15
| | | | | | | | | | - Create two CMake export sets. One for building PySide6 and shiboken6 together called *Targets.cmake. Another with the corrected paths based on the wheel tree structure called *WheelTargets.cmake - Copy all the necessary CMake files to the wheel. Change-Id: If538ed3dac4d8195e96157c595bc63e991a5ee90 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Modify headers installation for CMake buildsShyamnath Premnadh2025-07-042-7/+7
| | | | | | | | | | | | | | | | | | | Previously, the headers are installed as ${CMAKE_INSTALL_PREFIX}/include/cmake_package_name, where cmake_package_name is the CMake package name, e.g., PySide6. In the wheels, the headers were included as package_name/include. Since the level of the include directory is different, this caused issues when importing the CMake package in a downstream project. - This change modifies the installation of the headers so that the CMake install prefix and the wheels are consistent. - Additionally - this change adds the libpyside6 headers to the wheels. - The include headers for libshiboken were shipped with shiboken6-generator and not with shiboken6, which has the libshiboken binary. Change-Id: I96e3280799da169836e24551b906274f5b0fc962 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Android: Fix missing multimedia libsShyamnath Premnadh2025-06-191-1/+1
| | | | | | | | - Regression introduced by 38c0d909ff78f5432d4a99a55974fda35786f868 Pick-to: 6.8 6.9 Change-Id: I172514816a1768c1de4df115c450b0d52afc63dd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* PySide: Move CMake config packages into wheelsShyamnath Premnadh2025-06-112-3/+27
| | | | | | | | - This becomes useful for QtBridges to access cmake variables related to PySide6 and shibken6 installation. Change-Id: I260282b56af0709c49c3e30c16aa950ce5c1653f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* CI: Enable Windows on Arm configSimo Fält2025-03-151-1/+5
| | | | | Change-Id: I66aa36d69b41afb86a6278304a231b97eabc5270 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* pyside6-deploy: 3. Rename project folder to project_libJaime Resano2025-01-222-2/+2
| | | | | | | | | | | | | This is a refactor in order to improve the code clarity. In the testing of the pyside6-project command, importlib.import_module is used to import the project_lib folder. Currently, importlib.import_module("project") is ambiguous because it may refer to both the file and the folder. It chooses the folder over the file. Task-number: PYSIDE-1612 Pick-to: 6.8 Change-Id: I8903ea9d2112cf2eb7a68d0e302d3c74edcf2c22 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix multimedia to work on Linux with 6.8.1Friedemann Kleint2024-11-112-12/+8
| | | | | | | | | | The helper libraries are now also required on Linux. Also, some new libraries libQt6FFmpegStub*.so* were added. Pick-to: 6.8 Change-Id: I78ecd66139b18f48bbbe677990dc8ec570238199 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
* build/Windows: Use multimedia artifacts from the Qt build instead of the ↵Friedemann Kleint2024-10-181-3/+9
| | | | | | | | | | download They should be present when building with -DQT_DEPLOY_FFMPEG=TRUE or from the Online installer. Change-Id: Ief39e6825968cba7cf3d4b95d013ee0ab6f0150e Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
* build/Windows: Clean up the codeFriedemann Kleint2024-10-181-29/+19
| | | | | | | | | | | | | | | | - Remove the binaries from the list of filters retrieved from the .7z file. - Rename copy_qt_dependency_dlls() to download_qt_dependency_dlls() for clarity. - Split the artifact list into one containing the Multimedia libraries and a helper function qt_rhi_artifacts_permanent() for RHI/rendering related libraries. - Add a helper function returning whether it is running in COIN Complements 36f62dd5d45b8b84bd80064ceb43bab74a89321e. Pick-to: 6.8 Change-Id: I47518c2f1f9abe601c57c85bd1ec30e5ec5d13c2 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
* build: Install module doc snippet filesFriedemann Kleint2024-10-162-8/+7
| | | | | | | | | | Amends b55e221464c18053fa44f18132071ebdaee8f432. Task-number: PYSIDE-1106 Fixes: PYSIDE-2893 Pick-to: 6.8 Change-Id: I4a2688bfb5fcdddc5c6baea49d2fdc9c0f2381f1 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
* Wheels/Windows: Use updated zip archive with latest msvc redist libsSimo Fält2024-10-081-1/+1
| | | | | | | Pick-to: 6.8 Task-number: PYSIDE-2620 Change-Id: I96cffe4dc3b13b495f04875b3e82f99ff7d09288 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Wheels/Windows: Use updated zip archive for Multimedia dependenciesFriedemann Kleint2024-09-251-3/+1
| | | | | | | | Remove the old 32bit file. Pick-to: 6.7 6.7.3 Change-Id: I0835c611537e4caf462827eea27f5def9492ac18 Reviewed-by: Simo Fält <simo.falt@qt.io>
* build: Use a wildcard for installing multimedia auxiliary libraries versions ↵Friedemann Kleint2024-09-241-5/+5
| | | | | | | | | | for 6.7.3 Amends 79a91f5881567bc26070386c1443d8627a55b16d. Pick-to: 6.7 6.7.3 Change-Id: I94878fd5cbc50206cd9cf680b733ce8e04914ba7 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
* Android: Additional libraries for 6.8Shyamnath Premnadh2024-09-061-0/+7
| | | | | | | | | | - Some extra libraries are bundled in Android 6.8 which are dependencies for certain plugins like Multimedia. Task-number: PYSIDE-2620 Task-number: PYSIDE-1612 Change-Id: I4e286e1f6c9a59c7a7cfb73ba094f39d68ee075d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* CI: Use default libclang on WindowsSimo Fält2024-09-031-1/+0
| | | | | | | | Clang 10 crashed with Qt 6.8 on Windows, use a newer version. Task-number: PYSIDE-2620 Change-Id: I157dd6ed1c19034805f19c9879814dfc08037484 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Python-3.10: Allow the new syntax for Python 3.9Christian Tismer2024-06-205-0/+5
| | | | | | | | Add a future statement to all Python source files. Task-number: PYSIDE-2786 Change-Id: Icd6688c7795a9e16fdcaa829686d57792df27690 Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
* Android Deployment: Enable pyside6-android-deploy in macOSShyamnath Premnadh2024-06-141-1/+1
| | | | | | | | | | - enable the tool for macOS - add dependency .xml to the Android wheels Pick-to: 6.7 Task-number: PYSIDE-2766 Change-Id: I77495466b8a9cc3565c640beac202d533ee1d2a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Android Deployment: Build wheels with macOS hostShyamnath Premnadh2024-06-032-2/+8
| | | | | | | | | | | | - Additionally, also move setting Python_SOABI manually for Android to where FindPython CMake module is called. This also aids in naming the wheel correctly. Pick-to: 6.7 Task-number: PYSIDE-2766 Change-Id: I73c089d31e2ee629f3ed676965fca27d53882110 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* build: Add multimedia dependencies to Qt artifactsAdrian Herrmann2024-03-281-0/+5
| | | | | | | | | | Add a number of DLL dependencies required by Qt Multimedia to the list of Qt artifacts to be retrieved from the Qt binary directory. Fixes: PYSIDE-2656 Pick-to: 6.7 6.6 6.6.3.1 Change-Id: I0ead82ce09a7afb309ff674b4f5fe5afc32319da Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Android Wheels: Update Python version to 3.11Shyamnath Premnadh2024-03-131-1/+1
| | | | | | | | | | | | | | - python-for-android target python is now upgrade to 3.11 - https://github.com/kivy/python-for-android/pull/2850. This constrains us to update to 3.11 to resolve linker issues for shiboken and PySide binaries. - The also helps for CI wheel creation since the Python version in our CI system is 3.11. - As a drive-by remove designer plugins from Android wheels. Task-number: PYSIDE-1612 Change-Id: I8c75d4d4567b6830e26a2d9a24db90592f6dc03d Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
* deploy: add pyside icons for windowsCristián Maureira-Fredes2024-02-061-1/+2
| | | | | | Change-Id: Ia8dc07da08cf90db5f847b595c33b649a5cdc55a Pick-to: 6.6 6.5 6.2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build/Linux: Fix shiboken6 failing to launch due to missing libicuFriedemann Kleint2024-02-061-3/+1
| | | | | | | | | | | | Also ship ICU for the shiboken generator. Amends 43fe3494a9d902034896e3afa7b5158c77163be0. Pick-to: 6.6 6.6.2 6.5 6.2 Task-number: PYSIDE-749 Change-Id: Ib5529693fde51f245a90be0ae4a56139e3aadf45 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
* build scripts: Fix some flake8 issuesFriedemann Kleint2024-01-182-7/+7
| | | | | Change-Id: I26c77eb6448ec539a33acea6d2f39678c2b089a3 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
* Android Deployment: Add requirements.txtShyamnath Premnadh2023-12-041-0/+1
| | | | | | | | | | | | - Adds a requirements-android.txt file - Simplifies code in pyside_tool.py - Sets up installing requirements in tests without redundantly listing the dependent packages Task-number: PYSIDE-1612 Pick-to: 6.6 Change-Id: If98f6458673bc72103c898e078e6a16f1cf38b12 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Deployment: Add icon for applicationShyamnath Premnadh2023-12-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | - For Android deployment, by default kivy's icon is used when the application is deployed. This patch makes use of PySide icon as the default for all applications created with pyside6-android-deploy. - Icon formats accepted by Nutika windows: .ico macOS: .icns (contains a 128x128 .png file) linux: all standard image formats. We use .jpg - For Desktop deployment - change the option --linux-onefile-icon to --linux-icon. Both are the same. - Add icon options for macOS and Windows. - Adapt deployment test accordingly. - As an addition, add a default value to the --config-file option so that it picks up the one in the project directory automatically, if it exists. It aligns with the desktop deployment tool as per 6337e4a306babdb4015c248a14ad734b320ed2c1 - As another extra, remove an unused typing import from config.py Pick-to: 6.6 Task-number: PYSIDE-1612 Change-Id: Ia67ea96f94ddffe4bc65652f91c8b394c4e56a33 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Use correct install locationsSamuli Piippo2023-10-312-2/+2
| | | | | | | | | | | Use the correct install locations for QtAsyncio and designer plugin. Pick-to: 6.6 Fixes: PYSIDE-2494 Change-Id: I760e8f52f19cd1f1cdf742a15df071c4f4deffa5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* PySide Build: Remove patchelf for Qfp binariesShyamnath Premnadh2023-09-061-4/+2
| | | | | | | | | | | | | | | | | | | | - patchelf was used only for setting RPATH - This approach uses CMake for setting RPATH instead of using a post processing hack like patchelf - Additionally, CMAKE_INSTALL_RPATH_USE_LINK_PATH which was passed explicitly is removed - For shiboken6 generator, removal of patchelf dependency leads to having local paths in the binary because of appending local path to linked library files when installed. With this patch, similar to Windows, for Unix platforms shiboken6 generator used for building PySide6 sets the path to the dependencies using a shell script by appending to the `LD_LIBRARY_PATH` variable Task-number: PYSIDE-2410 Change-Id: Ibee03ce7d8085a94b343664295b3ab93b76317c2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Implement custom asyncio event loop based on QtAdrian Herrmann2023-07-272-0/+14
| | | | | | | | | | | | asyncio is an established library for Python applications with concurrency and asynchronous I/O, and the de facto standard that multiple other async frameworks build upon. Like Qt, it is based on an event loop, so to this end, it offers an extensive API to implement custom event loops that applications using asyncio can then leverage. Task-number: PYSIDE-769 Change-Id: I3daf5d631e2fa0d44fd8c3c272ac5cce96f58653 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Android Deployment: Rpath changes through linker flagsShyamnath Premnadh2023-07-262-6/+8
| | | | | | | | | | | | | - Using patchelf to modify the binaries for rpath changes corrupts the binary. This leads to binaries not being able to be loaded at startup by the Android runtime which is required for establishing callbacks from C++ back to Python. - Using linker flags -Wl,-rpath='$ORIGIN' -Wl,-rpath='$ORIGIN/Qt/lib' and disabling patchelf for Android cross compilation solves the issue Task-number: PYSIDE-1612 Change-Id: I70e74d3ca2b0bc65e2565268c36038eeb7c47ddd Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Cleanup build scriptsShyamnath Premnadh2023-07-131-3/+3
| | | | | | | | | - remove unused variable for update_rpaths() Pick-to: 6.5 Change-Id: I0bee785c6d90bf889a9afce511df3f7c201142e2 Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Android Deployment - Add dependencies.xml filesShyamnath Premnadh2023-05-021-0/+3
| | | | | | | | | | | These files that are available with the Qt installation enable us to find all the Android permissions and Qt dependencies required for each module Pick-to: 6.5 Task-number: PYSIDE-1612 Change-Id: I6df41f1456ccd226f5df0cfd17022f337f5d2198 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Tooling: Simplify adding new toolsShyamnath Premnadh2023-04-184-20/+17
| | | | | | | | | | | | - Amends a48de6afbf127831aa46c1c006d777861bbbe9cb - Simplify the developer doc for adding new tools - Make build_scripts/__init__.py the primary place to add new tools for the build process Pick-to: 6.5 Change-Id: I1e8bd9e069471bf51a186c067773d7fbc2588769 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Copy Qt module JSON files for usage by create_wheels.pyFriedemann Kleint2023-04-172-0/+8
| | | | | | Pick-to: 6.5 Change-Id: I147609680589019c6db9dc13add64bf3e0dbab94 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
* Fix missing opengl32sw.dllAdrian Herrmann2023-04-141-17/+10
| | | | | | | | | | There was a fault in logic that determined whether to download the 7z file that contains opengl32sw.dll. Fixes: PYSIDE-2289 Pick-to: 6.5 Change-Id: Ib11afbacd23ff6ee4c85e8dfce942d1d72916807 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* build: remove unused imports and obsolete commentCristián Maureira-Fredes2023-04-052-2/+0
| | | | | | Change-Id: I52ce8b449e5a0c4f1d94872becaa391c1c9ae605 Pick-to: 6.5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Deployment: New pyside6-android-deploy toolShyamnath Premnadh2023-03-311-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Preliminary support for PySide6 Android deployment - Uses jinja2 to create PySide6 and shiboken6 recipes, to be used by buildozer when python_for_android builds the app distribution - Classes for Buildozer config interaction - Run deployment to android. Typical command looks like: """ pyside6-android-deploy --wheel-pyside=./PySide6-6.5.0a1-6.5.0-cp37-abi3-android_x86_64.whl --wheel-shiboken=./shiboken6-6.5.0a1-6.5.0-cp37-abi3-android_x86_64.whl --name=stringlistmodel """ - New entrypoint for pyside6-android-deploy - Helper functinos for Android Deployment - Remove unused function main_py_exists() - Added the new files to deploy.pyproject - Remove dry_run argument from install_python_dependencies() - new Python packages added in requirements.txt to enable the deploy and cross compile tool Note: python-for-android uses my local fork. This will be changed once it is merged into python-for-android dev. Task-number: PYSIDE-1612 Pick-to: 6.5 Change-Id: I7eb96fa5507a476b4e86ec0195a5e9869f0f85fd Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* build: remove examples from wheels and installationCristián Maureira-Fredes2023-03-212-20/+0
| | | | | | | | | | | | | | | | | | To reduce the size and cluttering of wheels and installations the examples are not including any longer. The recommended way to get examples now is to download them directly from the Example Gallery in the documentation page. The option no-examples was removed. [ChangeLog][pyside6] Examples are not included in the wheels anymore and the option no-example was removed. Change-Id: I94fb24f9ffd6c55e2762e7c2e380b0f0ffe0bf61 Fixes: PYSIDE-2247 Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Android Deployment: jar files in wheelsShyamnath Premnadh2023-03-101-0/+7
| | | | | | | | | | | - Create Qt6AndroidBindings.jar from all the main entrypoint Android Qt classes. - Add Qt6AndroidBindings.jar and other relevant Qt Android jar files added to PySide6 wheel Task-number: PYSIDE-1612 Change-Id: Ie212dd65a844b7c174acc33c43108d0b5fc3cbb7 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Android Deployment: Remove patchelf rpath for platform pluginShyamnath Premnadh2023-03-101-1/+2
| | | | | | Task-number: PYSIDE-1612 Change-Id: I3a4747f14c932f23ab37d981713d7bbb34cba611 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Android Deployment - cross building for android wheelsShyamnath Premnadh2023-03-062-72/+89
| | | | | | | | | | | | | | | | | | | | - basically controls what goes into the android wheels - presently restricted to Qt essential modules - controlled using the --plat_name=android_aarch64, --plat_name=android_armv7 etc - the libQt6*.so libraries in Android do not have the version in the end.This is the same for all the Android Qt installations. Hence we look for libQt6*.so* instead of libQt6*.so.? - folders like 'glue', 'typesystems', 'support' are not relevant for for cross compiled wheels because shiboken6_generator is not cross compiled - for Android cross compilation, the 'examples' folder is also not relevant in addition to the above folder Task-number: PYSIDE-1612 Change-Id: Icc7561a6e990ed9b080f55cb30bac34e4774be7f Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* build: introduce log levelCristián Maureira-Fredes2023-02-024-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Removed the "quiet" and "verbose" older approach, and introduced a 3-level configuration so we can switch between them depending of the amount of output we need. By default, the log level is set to INFO, but it can be changed to VERBOSE and QUIET. The older "--verbose-build" and "--quiet" options were deprecated. The new way for setting the log level is: --log-level=quiet --log-level=verbose --log-level=info (default) The default option was made less verbose, controlling the output of the logging module, and cmake: for verbose it uses DEBUG, quiet uses ERROR, and no option uses INFO. Change-Id: Ida0289e3ea0ed09b7489a7513254137bba186fd0 Reviewed-by: Christian Tismer <tismer@stackless.com>
* build_scripts: Fix missing MSVC DLLs in PySide dirAdrian Herrmann2023-01-121-14/+15
| | | | | | | | | | | Fix a problem where the MSVC DLLs would only be copied into the shiboken6 directory of the wheel and not the PySide6 directory, leading to missing DLL errors on clean Windows installs. Pick-to: 6.2 5.15 Fixes: PYSIDE-2162 Change-Id: I4c07275906a292e4f314ab68231148664af70c4e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build_scripts: Remove unused argumentAdrian Herrmann2023-01-111-3/+3
| | | | | | | | | Remove unused _vars argument in copy_msvc_redist_files(). Pick-to: 6.2 6.4 5.15 Task-number: PYSIDE-2162 Change-Id: I9bb28dad335e1349ceebfd9b0e0672b9d890bcc5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build_scripts: Change source of bundled MSVC DLLsAdrian Herrmann2022-12-221-23/+38
| | | | | | | | | | | | | | | | | | | | Currently, PySide bundles MSVC DLLs (+ others) sourced from a very outdated self-hosted archive. Best practice would be relying on the redistributable package and installing it if necessary, but we cannot assume that the user has the required admin rights. As a compromise, the bundled DLLs are now sourced from the CI machine, which is assumed to be kept somewhat up-to-date, at least on a better cadence than the current 3+ year old archive. These non-MSVC DLLs are no longer bundled as they are pre-installed on Windows: d3dcompiler (part of DirectX) and ucrtbase (Microsoft C Runtime Library). Only opengl32sw continues to be sourced from the self-hosted archive. Pick-to: 6.2 5.15 Task-number: PYSIDE-2162 Change-Id: I6495f6953cd1c3e78a9777d24ee54e429a63d3d9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Rename folder: deploy to deploy_libShyamnath Premnadh2022-12-222-2/+2
| | | | | | | | | | - to distinguish between deploy.py and deploy folder, since both are Python modules. This is especially useful when testing since our tests are located in sources/pyside6/tests/tools. Task-number: PYSIDE-1612 Change-Id: Ideb35b23f454ec64415421e00464cfb1f7055401 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>