aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts
Commit message (Collapse)AuthorAgeFilesLines
* Build system: Make numpy centrally availableFriedemann Kleint2021-04-212-1/+15
| | | | | | | | | | | In order to be able to use numpy in PySide6 modules besides libshiboken, move the numpy detection into the build scripts and pass it as a CMake variable. Task-number: PYSIDE-1540 Task-number: PYSIDE-1503 Change-Id: Ib30fdbab83904878286b7eaae1674ffba0f2febd Reviewed-by: Christian Tismer <tismer@stackless.com>
* Enable shiboken documentation build for macOS againChristian Tismer2021-04-111-0/+7
| | | | | | | | | | | | | | | | | | Python v3.6 and docutils v0.17 have an encoding problem, because the default encoding is ASCII. That produces an encoding error on macOS in Sphinx: Running Sphinx v3.5.3 Encoding error: 'ascii' codec can't decode byte 0xc2 in position 69: ordinal not in range(128) The problem happens on macOS because CI uses that old version. It can be avoided by setting UTF-8 encoding. Change-Id: I88ee27cfb529dfec291dc079bcc2d52f656f180f Pick-to: 5.15 Pick-to: 6.0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Revert "Temporarily disable the designer plugin"Friedemann Kleint2021-04-112-2/+10
| | | | | | | | | | | | The underlying bug has been fixed in Qt. This reverts commit 54f8953d629fd97460c82c977ba81d95f0dc5235. Task-number: QTBUG-92361 Task-number: PYSIDE-1455 Change-Id: I904074685121c2bec87ba23697401a1bd93947fb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com>
* doc: make sure '--skip-docs' skip the docsCristian Maureira-Fredes2021-04-061-8/+14
| | | | | | | | | | | | | Even when using the code, some portions of the cmake file in sources/pyside6/doc/ was still being executed. This makes sure everything is skipped if we use the '--skip-docs' option when building. Pick-to: 6.0 5.15 Change-Id: If78b19b9650b61b642e447b8c96b814e82994d7c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Temporarily disable the designer pluginFriedemann Kleint2021-04-062-10/+2
| | | | | | | | | | This needs to be reverted after the underlying bug has been fixed. Task-number: QTBUG-92361 Task-number: PYSIDE-1455 Change-Id: I1067190d96e70e36bf655bdba7d2e66e3eb4f890 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Add an option to disable copying of the Qt toolsFriedemann Kleint2021-03-164-18/+29
| | | | | | Fixes: PYSIDE-1518 Change-Id: Ida9982b9349bb5c34af671a9027aa90e9c87a02a Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Fix build after moving uic/rcc to libexecFriedemann Kleint2021-03-161-1/+3
| | | | | | | | | Grab uic/rcc from libexec for installation. Task-number: QTBUG-88791 Task-number: PYSIDE-1518 Change-Id: I6d3c1298725c942e7705b747f49a152ce7ccdbec Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* PySide6: Add a Designer pluginFriedemann Kleint2021-02-162-3/+14
| | | | | | | | | | | | | | Add a convencience class QPyDesignerCustomWidgetCollection to the Qt Designer module, which provides functions for registering widget types or adding QDesignerCustomWidgetInterface instances. A static instance of it is stored as a dynamic property on QCoreApplication, which is retrieved by a Qt Designer plugin, which provides the collection of widgets registered in Python. Task-number: PYSIDE-1455 Change-Id: If4055e6c9db6a03b32016b013a1130051bbd472a Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Add option for switching the protected hackFriedemann Kleint2021-02-042-0/+6
| | | | | | | It is useful to test it on non-Windows platforms as well. Change-Id: I6886900e9f619250c4281f2012d2c14bd7310a4c Reviewed-by: Christian Tismer <tismer@stackless.com>
* build scripts: Do not unnecessarily copy files when installingFriedemann Kleint2021-02-031-19/+32
| | | | | | | | Check whether files and symlinks already exist before actually copying or creating links. Change-Id: I4bf8d04a6a2bd07b02214b675757899fdfaa87ba Reviewed-by: Christian Tismer <tismer@stackless.com>
* Add mirror url to download MSVC redistributablesSimo Fält2021-01-201-1/+6
| | | | | | | Pick-to: 5.15 Pick-to: 6.0 Change-Id: If990cb45c2187cdfda5c41ea8b8123d803fa8934 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* qp5_tool: Add warning when the configured python binary is not under virtual envFriedemann Kleint2021-01-181-5/+16
| | | | | | | | | | | On Windows, the virtual env needs to be created by the debug binary python_d.exe in case of debug. When changing the configuration to release, it can happen that the system binary is used, which will then install to the system Python and cause strange errors. Change-Id: Ie3faf5d5f6a4cee3faec066f45cb3c6cbba416f5 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Revert "Replace _ARCH_ by 64/32bit in LLVM_INSTALL_DIR"Friedemann Kleint2021-01-111-3/+0
| | | | | | | | | | | | | | This reverts commit c3fc507d3b2a502273bd92472e1e7aa459c2d13e. 29be13664858cdb7ed7cbc02d6ad496bf57a9bbd moves this handling to the coin scripts, where it belongs. Some functionality was already removed by e44e21f14d8b10b1832c5db5459bf26f287ab6e8. Task-number: PYSIDE-431 Change-Id: I7474ea17230e484a53019eb7575d3dd9839e9263 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Windows: Fix running the example tests in COINFriedemann Kleint2021-01-111-0/+10
| | | | | | | | | | | | | | Move the logic expanding the Clang-related variables introduced by c3fc507d3b2a502273bd92472e1e7aa459c2d13e to the COIN scripts since they are needed when building the sample binding. c3fc507d3b2a502273bd92472e1e7aa459c2d13e should then be reverted. Task-number: PYSIDE-431 Change-Id: I1f118fdbd8989b7b9e3d24a249af81f4020c73f3 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 01b1d3218d70d128fe6c2f2ce3e6dce74608adaa) Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* qp5_tool: Add verbose optionFriedemann Kleint2021-01-111-2/+9
| | | | | | | | | | Add an option that cause the --quiet option to be removed from the build arguments specified in the configuration file. This removes the need to change the configuration file to temporarily enable cmake messages for debugging cmake issues. Change-Id: Ib57fa95d730e2c984aea36234a5cdc8e8fb88703 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Revert "Qt CI: Install libCLang 10.0"Simo Fält2021-01-051-65/+0
| | | | | | | | | | LibClang with dynamic libs is now provisioned with Qt5 scripts. So this is no longer needed. This reverts commit cbe5ac758c59f4d16b64704a1c5a3ddf88f3f85b. Pick-to: 6.0 Change-Id: I1ca354e14231d677a72fc4d8391a705e70d28f35 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build_scripts: remove unused codeCristian Maureira-Fredes2021-01-051-8/+1
| | | | | | | | | | | | The function was removed in 609b1cd7ab8514354c93249e8a295e5e907d8de9 because CMake is in charge of discovering the location via llvm-config. This removes the code and raise a OSError if LLVM/CLANG_INSTALL_DIR is not defined. Pick-to: 6.0 Change-Id: Ifb74b9eb327518dbc7b114e6868b773f304a577e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build_scripts: fix get_config_var for Big SurCristian Maureira-Fredes2021-01-051-1/+2
| | | | | | | | | | get_config_var(...) returns an integer so the split fails. Pick-to: 6.0 Fixes: PYSIDE-1469 Change-Id: Iadf76c523dfca78c8b8d85511d06dc366de6273f Reviewed-by: Christian Tismer <tismer@stackless.com>
* build_scripts: use f-strings instead of format()Cristian Maureira-Fredes2021-01-0410-232/+215
| | | | | | | Pick-to: 6.0 Change-Id: I165e9a39f968f67f9eae3a632739908d5f8fda59 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* qp5_tool: use f-strings instead of format()Cristian Maureira-Fredes2021-01-041-10/+10
| | | | | | | Pick-to: 6.0 Change-Id: If6b472d5abbdc1018790c447532453a2fe956eed Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* build_scripts: replace print by distutils.logCristian Maureira-Fredes2021-01-044-27/+26
| | | | | | Pick-to: 6.0 Change-Id: I1106598719b48650847b08637e0caf6677cb26a0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build_scripts: remove unused importsCristian Maureira-Fredes2021-01-046-7/+3
| | | | | | Pick-to: 6.0 Change-Id: I8a62512707b576ea79fff56779322c7e38bbb21b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* designer: add rpath for linuxCristian Maureira-Fredes2020-12-211-4/+5
| | | | | | | | | | | | 'designer' was not on the list of tools that we modify to add a run path for linux. Fixes: PYSIDE-1457 Fixes: PYSIDE-1456 Pick-to: 5.15 Pick-to: 6.0 Change-Id: Idde477fb5012c5e61df0713ee07b42895be72ec2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* setup.py: Pass --reuse-build only to commands that use DistUtilsCommandMixinDmitry Shachnev2020-12-091-1/+1
| | | | | | | | | | Other commands, such as configure, do not support it. Amends 0a00958b083008dea340ef78b0f235ca49b7d22c. Pick-to: 5.15 Change-Id: I5dbcea6aea60e027a8ff15d10351edbeaefdf338 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Qt CI: Install libCLang 10.0Simo Fält2020-12-081-0/+65
| | | | | | | | Qt 6.0.0 CI configuration includes only static version of libClang so we need to install dynamic libs ourselves to be able to run shiboken6. Change-Id: I7654f9ac111c0dc2bfb78b3b3f3acb49b159925c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build scripts: Import 'PYSIDE' for linux platformSimo Fält2020-12-021-1/+1
| | | | | Change-Id: I08b665ae4feccc9b22b45da999150188228f29e2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Allow calling CI's build scripts with python2Simo Fält2020-11-301-1/+7
| | | | | | | | | Currently we can't be sure that python3 is a default python in all CI nodes. Change-Id: I58ba7d2bb2dd987d344709c296ee3c5bc5c9c376 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* setup.py: Fix 'clean' commandFriedemann Kleint2020-11-241-1/+6
| | | | | | | | | | | Do not add -reuse-build, which it cannot handle. Amends ff5a96c49e2aa5347c1c9892aad33c591e931639. Pick-to: 5.15 5.15.2 Task-number: PYSIDE-807 Change-Id: I96ab03b95dd7762b1a16f2acc5d8ca31555ef1a3 Reviewed-by: Alexander Volkov <avolkov@astralinux.ru> Reviewed-by: Christian Tismer <tismer@stackless.com>
* Windows: Prevent cmake from auto-detecting the clang compilerFriedemann Kleint2020-11-101-0/+4
| | | | | | | | cmake tends to auto-detect the clang compiler from the path and then fails the build. Force it to use cl.exe. Change-Id: Ic58cc0e734dd42bba0ad383842ef73f23de50c76 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* python3: remove all obsolete "from __future__" import statementsChristian Tismer2020-11-094-6/+0
| | | | | | | | | | | Note that not all future statements can be removed: PEP 563 for instance deals with from __future__ import annotations Task-number: PYSIDE-904 Change-Id: Ia387ec87f3c68ca64d13e8e80191eda900f58638 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build scripts: Fix warning about import orderFriedemann Kleint2020-11-052-11/+8
| | | | | | | | | | Import Setuptools before Distutils, fixing: distutils_patch.py:25: UserWarning: Distutils was imported before Setuptools. This usage is discouraged and may exhibit undesirable behaviors or errors. Please use Setuptools' objects directly or at least import Setuptools first. Pick-to: 5.15 Change-Id: Ibbc1a5cd1d348f6f44f7e80a3ba7e9a7341fae8e Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Build scripts: Switch to Qt 6Friedemann Kleint2020-11-024-15/+15
| | | | | Change-Id: I40ba653f38bf079a697f0a509300a87e45181c30 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Fix the Windows buildFriedemann Kleint2020-11-021-1/+1
| | | | | | | Amends 559c56b140410bcfa0ce6f19b47d1ba0daa9a201. Change-Id: I1e41dcf0b4bf52d84a16a02b995cc9d7ec9c15f7 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Rename PySide2 to PySide6Friedemann Kleint2020-11-028-19/+19
| | | | | | | | Adapt CMake files, build scripts, tests and examples. Task-number: PYSIDE-904 Change-Id: I845f7b006e9ad274fed5444ec4c1f9dbe176ff88 Reviewed-by: Christian Tismer <tismer@stackless.com>
* build scripts: Introduce variables for the versionsFriedemann Kleint2020-11-029-71/+122
| | | | | Change-Id: Iac73fcf6e60f882968463d1c612f5ca5dc206222 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Rename shiboken2 to shiboken6Friedemann Kleint2020-10-286-45/+45
| | | | | | | | 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>
* build_scripts: remove references to python 2Cristian Maureira-Fredes2020-10-277-68/+24
| | | | | | | | | * Removing all the special cases for Python 2.7 * Removing Python >=3 conditions * Keeping Python 3.6+ as the allowed Python Change-Id: Ie48cafe952ae7a11bea997da2a35e7df5fea9a44 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* setup: remove ez_setup and update requirementsCristian Maureira-Fredes2020-10-271-5/+1
| | | | | | | | * Removing ez_setup since we will have Python 3 only * Updating requirements.txt to exclude Python 2 special cases Change-Id: I6ff5e3f6eba76a6e9726f01840e67316e786d450 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build_scripts: Fix the make_path error messageChristian Tismer2020-10-271-2/+3
| | | | | Change-Id: I32bfdfb728b39609ce4a63a6554ef0a3db58b122 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* setup.py: Make ninja the default generatorFriedemann Kleint2020-10-261-2/+2
| | | | | | | | It is recommended for use with Qt 6. As a drive by, fix invalid parameter in error message. Change-Id: I7d01a2b70b9033fa827f34fffece0368c1a5462a Reviewed-by: Christian Tismer <tismer@stackless.com>
* Remove wheel.pep425tags importsCristian Maureira-Fredes2020-10-261-18/+19
| | | | | | | | | | | The import was removed starting from v0.35 in favor of the packaging module and other functions that are not placed in 'bdist_wheel'. Pick-to: 5.15 Fixes: PYSIDE-1385 Change-Id: I97f5dbf9867f779a897d9041489831255ea54b67 Reviewed-by: Simo Fält <simo.falt@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-10-161-3/+4
|\ | | | | | | Change-Id: I27beffe4a6e2fc2f818960c3b9f5ffbfaac4a670
| * build_rst_docs: add DistUtilsCommandMixin to the commandCristian Maureira-Fredes2020-10-151-3/+4
| | | | | | | | | | | | Task-number: PYSIDE-807 Change-Id: Ib2369887bafc61971ffa500427ec85c1cd73c2b2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-10-144-111/+258
|\| | | | | | | Change-Id: I46f5d2dc758d0e1f23377c91ba7496793461771e
| * Fix wheel_override error when wheel not availableCristian Maureira-Fredes2020-10-141-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Since the try failed, there was no option to import DistUtilsCommandMixin and then a: NameError: name 'DistUtilsCommandMixin' is not defined and AttributeError: type object 'type' has no attribute 'user_options' was raised. Task-number: PYSIDE-807 Change-Id: If5aa37ce9928a5c029b21decc24bd2bccf9b4dc4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * setup.py: Show options in command helpFriedemann Kleint2020-10-144-107/+216
| | | | | | | | | | | | | | | | | | | | | | | | Move some options to a command mixin. This cannot be done for all options since some determine the package name and need to be known at before instantiating the commands. Print an additional help text listing them. Fixes: PYSIDE-807 Change-Id: I43adb09db16f74af037bfb754cad2c0f5cfe43be Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-10-089-304/+353
|\| | | | | | | Change-Id: I30aaad19852c50b1222222ba66171f9c98ecb7c8
| * setup.py: Refactor PysideBuild::run()Friedemann Kleint2020-10-071-149/+153
| | | | | | | | | | | | | | | | | | | | | | | | The function produces a warning about a too-high cyclomatic complexity. Factor out functions to retrieve the make program and the Python library. Streamline the code to avoid repetitive find_executable() invocations and unindent the multi-arch code. Change-Id: I7aac9bc1324e57878e97d81b3e0424f055f7f2b9 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * setup.py: Fix some flake8 warningsFriedemann Kleint2020-10-076-22/+21
| | | | | | | | | | | | | | Fix spaces around operators, missing lines, import order. Change-Id: I05ecafec849578fed6018654fcefaa008b6801e8 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * setup.py: Remove constructor parameters depending on options from ↵Friedemann Kleint2020-10-064-133/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | PysideBuildWheel Constructor parameters depending on option values create a problem for introducing per-command option parsing. To fix this, split utility functions used by the commands in main.py and PysideBuildWheel into a separate wheel_utils.py Task-number: PYSIDE-807 Change-Id: Idabd3ba03726d2284e80234fc8485b70e6eb20ca Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 21:36:17 +0000