Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename qp5_tool to qfp_tool.pyFriedemann Kleint2024-01-121-416/+0
| | | | | | | Version 5 in the name becomes increasingly incorrect. Change-Id: I7f584f8d6480f292bc357f516c25651a0c267137 Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
* qp5_tool: Fix root detectionFriedemann Kleint2022-12-151-1/+2
| | | | | | | | | | | | When launched from a subdirectory: File "pyside-setup\build_scripts\qp5_tool.py", line 392, in <module> if str(cwd) == '/' or (IS_WINDOWS and len(cwd) < 4): Amends 84bcb12d69bb24869f263839c26a13c858ca050d. Task-number: PYSIDE-2080 Change-Id: I4be4296c19258b5f5407053215e46ef0b262e4f3 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* qp5_tool: Fix the generator configuration keyFriedemann Kleint2022-12-081-1/+1
| | | | | | | | | Change the default generator to Ninja, so that other values cause the option to be set. Pick-to: 6.4 6.2 Change-Id: I97e6d0f87ab7143d8617892a94aab17175b83f41 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* pathlib: migrate qp5_tool from os.pathCristián Maureira-Fredes2022-10-141-27/+30
| | | | | | Task-number: PYSIDE-2080 Change-Id: I0460f18fe734419255954b32357308fa10427a30 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build: fix readability detailsCristián Maureira-Fredes2022-06-291-3/+3
| | | | | | | | | | | | | | Removing some leftover common anti-patterns: - remove unnecessary dict() usage - remove unnecessary map() - avoid index-based loops - use capitalize() instead of index-based capitalization - use f-strings for concatenation Pick-to: 6.2 6.3 Change-Id: I0ffdf73ec47c6ef537789015052dea0fd047350d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* build: replace the usage of reserved Python wordsCristián Maureira-Fredes2022-06-291-2/+2
| | | | | | | | | | Internally, we were using many words like 'filter', 'vars', and 'dir' which are built-in functions in Python. To avoid confusion and a possible wrong behavior, we renamed them. Pick-to: 6.2 6.3 Change-Id: Idbadda3857705ef3a5f0440112ee923d3a61ffa0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Use SPDX license identifiersLucie Gérard2022-05-271-38/+2
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: I065150015bdb84a3096b5b39c061cf0a20ab637d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* flake8: fix style issues to build_scripts/Cristián Maureira-Fredes2022-04-131-3/+2
| | | | | | Pick-to: 6.3 Change-Id: Ie56b054ca32869a488356b31eea49cc985fc463e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* flake8: improve codestyling of build scriptsCristián Maureira-Fredes2022-03-221-0/+1
| | | | | | | | | | | - Fixing f-strings - Fixing indentation of some lines - Removing unused variables and imports - Changing the way of verifying if sphinx is installed Change-Id: I3f361759682324c9b0c9d33c24583435f137f05a Pick-to: 6.2 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>
* 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>
* 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>
* python3: remove all obsolete "from __future__" import statementsChristian Tismer2020-11-091-2/+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>
* Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-10-081-1/+1
|\ | | | | | | Change-Id: I30aaad19852c50b1222222ba66171f9c98ecb7c8
| * setup.py: Fix some flake8 warningsFriedemann Kleint2020-10-071-1/+1
| | | | | | | | | | | | | | Fix spaces around operators, missing lines, import order. Change-Id: I05ecafec849578fed6018654fcefaa008b6801e8 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>
* | 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>
* | Remove the pyside-tools moduleFriedemann Kleint2020-09-041-1/+1
|/ | | | | | | | | Completes 0eec9fecd241a178ca8f09218b9286ae763f29b3. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I424336c08c9ce4e1db820811f3c7fb207e5a9260 Reviewed-by: Christian Tismer <tismer@stackless.com>
* qp5_tool.py: Fix 'clean' mode on WindowsFriedemann Kleint2020-07-161-2/+2
| | | | | | | | Use the relative path for git as git submodule foreach (as invoked by "clean") does not work with spaces in the path on Windows. Change-Id: Ia53e8ef9a48c88fb3159bf961da4798216422f3c Reviewed-by: Christian Tismer <tismer@stackless.com>
* qp5_tool.py: Fix reading config files with empty linesFriedemann Kleint2020-07-161-1/+2
| | | | | | | Move rstrip() below read check. Change-Id: I56333b813aaa8608296e8f8e3181bacf10d2f63f Reviewed-by: Christian Tismer <tismer@stackless.com>
* qp5_tool.py: Add an configuration key for the CMake generatorFriedemann Kleint2020-06-301-0/+6
| | | | | | | | | | | Add a key Generator (similar to the planned qt6_tool). Currently, only default (make) and Ninja are supported (pending the refactoring of the mkspec option of setup.py, which will become a qmake legacy). Task-number: PYSIDE-904 Change-Id: I75f87c59f8b6421dc5d2b8ae46d3107e2ac61614 Reviewed-by: Christian Tismer <tismer@stackless.com>
* qp5_tool: Add option to run "build" onlyFriedemann Kleint2020-02-251-3/+6
| | | | | | | This is useful for mimicking the COIN test environment. Change-Id: I9a4567be171d940d6574c4135fabb2a8721bbd79 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* qp5_tool: Output command parameters with quotes for shell if requiredFriedemann Kleint2020-02-251-1/+4
| | | | | Change-Id: I682fb765fc3f69f0ca3c4d6717d415d0bff0517e Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* qp5_tool: Add --avoid option for Incredibuild/LinuxFriedemann Kleint2020-02-191-0/+1
| | | | | | | Available as of version v0.96.74, it speeds up things considerably. Change-Id: I5d8312b2d59adcce0881d3485af966bebf69317b Reviewed-by: Christian Tismer <tismer@stackless.com>
* qp5_tool: Add test runFriedemann Kleint2020-02-191-2/+34
| | | | | | | Run the test redirected into a log file with time stamp. Change-Id: Id9a5047e0b6594760d0329f9a15450c688a585f8 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Polish qp5_tool.pyFriedemann Kleint2020-02-121-52/+166
| | | | | | | | | | | | | Fix coding style warnings and bring it up to par with the qt6_tool in the works: - Add edit config file option - Add dry run option. - Add support for Incredibuild - Log build time - Print help if no option is given Change-Id: Ia8ec5f0d4d9e9c127172fb22f3efea11ce1ab6ff Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Improve code style with flake8Cristián Maureira-Fredes2019-11-251-8/+20
| | | | | | | | | | | | | | | | | - We agreed on 100 columns time ago, so I move around a few things, - Removing unused modules, - Fix white-spaces tabs without being multiple of 4, - Encourage the use of os.path.join when joining paths, - Using .format() for string formatting, - Remove white-spaces from default arguments, - Adjusting white-spaces before inline comments, - Adding extra newlines when expected, - Adjust spaces for lines under-indented for visual indent, - Remove white-spaces from parenthesis, and adding them for arithmetic operators. Change-Id: I9cb28cefd114d63580b584a063c452f90d3ca885 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Say hello to qp5_tool.pyFriedemann Kleint2019-03-051-0/+261
qp5_tool.py is a developer helper tool modeled after the qt5_tool Perl script of Qt 5. It maintains a configuration file where per-directory values (build options, module subsets) can be given. Creating an up-to-date Build is then done by calling: python build_scripts/qp5_tool.py -c -p -b in each directory, Change-Id: Ifdcf414f7ff89512bb81a132c0bfd2e49275ed24 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>