aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts
Commit message (Collapse)AuthorAgeFilesLines
* build_scripts: remove unused codeCristian Maureira-Fredes2021-03-031-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. Change-Id: Ifb74b9eb327518dbc7b114e6868b773f304a577e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit b3dd5989db62cbb18bb9eff2ff8bad29f0ccb5a3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add mirror url to download MSVC redistributablesSimo Fält2021-01-221-1/+6
| | | | | | | Change-Id: If990cb45c2187cdfda5c41ea8b8123d803fa8934 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 63614c3085fa8105e9f8ced6b2d166c2a7a2c6e6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revert "Qt CI: Install libCLang 10.0"Simo Fält2021-01-221-65/+0
| | | | | | | | | | | LibClang with dynamic libs is now provisioned with Qt5 scripts. So this is no longer needed. This reverts commit cbe5ac758c59f4d16b64704a1c5a3ddf88f3f85b. Change-Id: I1ca354e14231d677a72fc4d8391a705e70d28f35 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 5676675320bd41a9c321e9259962ced923f69757) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. Fixes: PYSIDE-1469 Change-Id: Iadf76c523dfca78c8b8d85511d06dc366de6273f Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 3f6c13dc7b4241c924b0b4366e3cbc94572737b7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* build_scripts: use f-strings instead of format()Cristian Maureira-Fredes2021-01-0410-232/+215
| | | | | | | | Change-Id: I165e9a39f968f67f9eae3a632739908d5f8fda59 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 6cc55fefc8ddf12ecc9dcce33e367148e6216b1f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* build_scripts: replace print by distutils.logCristian Maureira-Fredes2021-01-044-27/+26
| | | | | | | Change-Id: I1106598719b48650847b08637e0caf6677cb26a0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit a35afc89a911612b4de3c71a8717f1fb74a39455) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qp5_tool: use f-strings instead of format()Cristian Maureira-Fredes2021-01-041-10/+10
| | | | | | | | Change-Id: If6b472d5abbdc1018790c447532453a2fe956eed Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 5f1a3d89c4b90b1929f23b33ddd7027fceff983a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* build_scripts: remove unused importsCristian Maureira-Fredes2021-01-046-7/+3
| | | | | | | Change-Id: I8a62512707b576ea79fff56779322c7e38bbb21b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit a99e441a2c6e58833c577eeb901f483234a3b816) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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 Change-Id: Idde477fb5012c5e61df0713ee07b42895be72ec2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 2c725e77c9cd25b38ea56accab3bdf46e15faf16) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-10-064-203/+220
|\| | | | | | | Change-Id: I89aa3d4c4a3fa274e2c5ccd8b5facb9531137e80
| * setup.py: Do not display help multiple timesFriedemann Kleint2020-10-061-1/+5
| | | | | | | | | | | | | | | | Run only the pyside build when help is requested. Task-number: PYSIDE-807 Change-Id: I0aa5bf2db0a6a7e6e32a66357efd200af70dd653 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * setup.py: Make it possible to access QtInfo from several sourcesFriedemann Kleint2020-10-062-200/+212
| | | | | | | | | | | | | | | | | | | | - Turn it into a singleton. - Move the qtchooser resolving code into QtInfo. - Delay-initialize the dictionary. Task-number: PYSIDE-807 Change-Id: I3be2f3d0e0e9bc8aa61e1ec90ea37f7078c7f0bb Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * setup.py: Fix check for limited APIFriedemann Kleint2020-10-062-2/+3
| | | | | | | | | | | | | | | | Check for "yes"/"no", consistently. Task-number: PYSIDE-807 Change-Id: Id9f2ba125acb9ea8e811fd6cb5994bbb070605de Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-09-301-1/+83
|\| | | | | | | Change-Id: I13721e13d2fab13945385fe529afe4ab431e0532
| * Add command to build rst documentation onlyCristian Maureira-Fredes2020-09-291-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the process to get the documentation built is to build the whole project, that is too time consuming. Additionally, using qdoc on the Qt API takes a lot of time. This patch introduces the setup.py option called 'build_rst_docs' which skip the general build, and only generates HTML documentation based on all the .rst files we have for shiboken and pyside. To use it: python setup.py build_rst_docs The build will throw warnings related missing directories, and files, which are generated on the 'qdoc' process, but since they are skipped they are not present. Some missing references warnings are skipped due to also come from the qdoc-based step. Task-number: PYSIDE-1106 Fixes: PYSIDE-1390 Change-Id: I4118fd3b64e217717df6cae093138f6951d37094 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-09-291-5/+15
|\| | | | | | | Change-Id: Ie6da3938b82f5ebe96dd12bd65a3ccc4180d2fba
| * Test with additional python versionSimo Fält2020-09-241-5/+15
| | | | | | | | | | Change-Id: I17726f6bd02d36a7acc3ed99ca11796b780b837d Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-09-211-1/+3
|\| | | | | | | Change-Id: Ia31df23a16575f9ecefe13ec85fb70197d103278
| * qp5_tool: No longer default to 'python3' in virtualenvFriedemann Kleint2020-09-171-1/+3
| | | | | | | | | | | | | | | | | | This causes problems on Windows where old python3 versions are shipped with Visual Studio and virtualenv does not create a python3.exe. Change-Id: I695fbcd7a007ff72bd4d79399c700bf93a8e4f94 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-09-101-1/+5
|\| | | | | | | Change-Id: I8a627fd459c3f9601d078a00d3d77c8b3fe04304
| * One more fix for the missing win runtime libsSimo Fält2020-09-091-1/+5
| | | | | | | | | | | | | | Change-Id: Ic430a687a6d7af7ba45df51a34c6fe7c56b3799d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 275aba0c773e649f15c89e34f15310cb8fd35c09) Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Re-add missing toolsFriedemann Kleint2020-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | Bring back wrapper and tools from the sub-repo which was removed by 9c9b506f3b2cc64da6fbbef9f58ccec7ccfe4457. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ib4f83721e4b56174109629dce64da56b9a71ffa5 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Remove pyside-tools from qp5_toolFriedemann Kleint2020-09-071-3/+0
| | | | | | | | | | | | | | | | | | Amends 9c9b506f3b2cc64da6fbbef9f58ccec7ccfe4457. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I0f700d067a93224418f0c7a1f89185691f5d82ed Reviewed-by: Christian Tismer <tismer@stackless.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 13:24:59 +0000