summaryrefslogtreecommitdiff
path: root/bin/qt5_tool
Commit message (Collapse)AuthorAgeFilesLines
* qt5_tool: Adapt to commercial repositoryFriedemann Kleint2021-01-181-1/+6
| | | | | | | | - Read the git config files from the submodules - Do not error out if the requested branch does not exist yet Change-Id: I850c948e533a3f41853cd03cd721c158f088ad0c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* qt5_tool: Add options for dry-run and editing of config fileFriedemann Kleint2020-03-041-3/+25
| | | | | | | Bring it up to par with the planned qt6_tool and qp5_tool. Change-Id: Ic6af1839ac4e34bba241dfa7f0ee4ed9eb491cd4 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* bin/qt5_tool: Add --avoid option for incredibuildFriedemann Kleint2020-02-191-0/+1
| | | | | | | It should speed up things (version v0.96.74) Change-Id: I0eae0da129745423fd111339a5b85f922c865b39 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* qt5_tool: Handle prefixed branches like wip/cmakeFriedemann Kleint2019-11-271-3/+10
| | | | | | | | Do not assume a configured branch is to be found under origin/name, match using a regexp to be able to correctly set up origin/wip/cmake. Change-Id: I76c786d2b0f58db5b4e4049f6de04e628d5a1af4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qt5_tool: Fix bootstrapping on new machinesFriedemann Kleint2019-11-201-2/+6
| | | | | | | | | Change df3090cb05817277b0dd3586e9e2e7a673955a24 (adding incredibuild) broke bootstrapping on new machines since it tries to read the config file in checkMake(). Add a check for existence of the config file. Change-Id: I08bd2b0a56f50a8f5f61c3c73c2714719bc97ab0 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* qt5_tool: Add config keys for jobs and incredibuildFriedemann Kleint2019-03-261-6/+21
| | | | | Change-Id: Ic8f51beea43899de0301a49490e08bba184dd10c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* qt5_tool: Add the ability to reference arbitrary config keys by $(name)Friedemann Kleint2019-02-061-1/+23
| | | | | | | | This should help to clean up the config files considerably. Change-Id: I8c994f4b1654bd5ec648715b3ccdbdd4e02a6fca Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* qt5_tool: Refactor config file readingFriedemann Kleint2019-01-181-20/+27
| | | | | | | | The tool opened the file for each branch-specific key and each key. Store the values in a hash instead. Change-Id: I6719e490a4ad78da70e9db0ce8016b0db2ea3ed5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* qt5_tool: Add an option to use incredibuildFriedemann Kleint2019-01-171-20/+39
| | | | | | | | | | | | Add option -i which performs a quick test on Linux or tries to locate ibjom on Windows. Move the code checking for make into a subroutine so that it can be called after the options parsing. Add elapsed time output. Change-Id: Ie7b965b53d5e06521fb3eedee463c7178a96267c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* qt5_tool: Use fetch origin instead of fetch --allFriedemann Kleint2017-07-251-2/+2
| | | | | | | This is faster and also works in the case of gerrit hickups. Change-Id: Id990cc16731f4ef6543a1a55c416ebb84bbe0e5b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* qt5_tool: Detect MinGW by checking for g++Friedemann Kleint2017-06-201-3/+1
| | | | | | | | Previously, the environment variable QMAKESPEC was checked, which should no longer be set. Change-Id: I1f9925fb2c468472dd1789289ada0727f1d3c441 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* qt5_tool: Check out requested branch of qt5.git as wellFriedemann Kleint2016-08-181-0/+1
| | | | | | | Previously, the tool would not create the tracking branch of qt5.git. Change-Id: I13b29852d71e3f56a0a3735c0141bb1366ebf1ec Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* qt5_tool: Support continuation lines indicated by trailing \.Friedemann Kleint2016-02-151-0/+8
| | | | | | | This makes the growing skip-list manageable again. Change-Id: If418ed7d22411fda50a9e2ef8446954434524a2e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* qt5_tool: Remove some cruft related to webkit and quick3d.Friedemann Kleint2015-10-231-13/+5
| | | | | Change-Id: I4fda2bd1e7908af453b7c4e1b30b22093ff7d08a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* qt5_tool: Use / +/ when splitting lists.Friedemann Kleint2015-10-221-2/+2
| | | | | | | | Repetitive white space in configure argument lists will then no longer cause errors. Change-Id: I747c410106dddc9d4161464e06332f9c24649620 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* qt5_tool: Introduce configuration file key for modules to be skipped.Friedemann Kleint2015-09-241-3/+15
| | | | | | | | | | Having to specify the modules in 'configureArguments' causes overlong configuration files lines as Qt grows (-skip qtquick1 ...) Introduce as eparate key 'skip' for this, in which only the module names are listed (qtquick1 ...). Change-Id: I00f72630e1fc69086c76d67985fea1601b9b3f3a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* qt5_tool: Adapt to file structure of "Git for Windows version 2.5".Friedemann Kleint2015-09-071-9/+7
| | | | | | | | | Add newly introduced directory 'usr/bin' to the search path and always perform search in order to account for all installation options (bin/cmd). Change-Id: I23cd835d3d574aacd9c641ddf7f7ec5aae927983 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* qt5_tool: Remove some cruft.Friedemann Kleint2015-03-231-12/+4
| | | | | | | | | Remove broken option to rebuild configure.exe and unused $optModuleBranchArgument. Change-Id: I7a66e5ac72acde3a3f9f8d55f367ae90417d3b1e Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* qt5_tool: Change super repository URL to code.qt.io.Friedemann Kleint2015-03-231-4/+4
| | | | | Change-Id: I14cffe56652ada9d1b0c38a22868ee702a3b9d07 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* qt5_tool: Fix arguments to init-repository.Friedemann Kleint2015-03-231-1/+1
| | | | | | | Use new option syntax and exclude qtwebengine by default. Change-Id: I3a3f082df5137c8fe787f44039a87f9c3fcc1ce7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* qt5_tool: Introduce function for preferred branch.Friedemann Kleint2015-03-111-12/+26
| | | | | | | | Replace hash %preferredBranches by a function, making it possible to return values depending on the Qt branch. Change-Id: I2271cb945dabeb544290f5152ab8ad6c628d8c33 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-111-2/+2
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: If3c8d221bcf8e5010048ed5f1c50cd35c04e7199 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* qt5_tool: fix for perl v5.8.8Alessandro Portale2014-02-211-0/+1
| | | | | | | | | | | | | | The perl version which comes with msysgit is v5.8.8. There, the script fails with Undefined subroutine &Cwd::realpath called at qtrepotools/bin/qt5_tool line 600. In this perl version Cwd's realpath apparently needs to be explicitly exported. Change-Id: I467c5879e3b67e14652054fc9df1ce9fd547aa14 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Use rebase instead of just pull when using qt5_tool -pFrederik Gladhorn2013-11-291-1/+1
| | | | | | Change-Id: I3df6caa4903c242981125abb2f5467b4b805dc02 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qt5_tool: Fix configuration file help.Friedemann Kleint2013-09-261-1/+1
| | | | | Change-Id: Ifacfc9ccf6ac7c967d1aae4f52801865bf108a43 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* qt5_tool: Remove configuration file key developerBuild.Friedemann Kleint2013-09-261-4/+3
| | | | | | | | | | The key written to the configuration file was determined from the initial user input and then no longer used. Add -developer-build automatically unless specified or a prefix is given. Change-Id: I6dda75d2a92bdf79e1bbe31e72fda6af657bd87f Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* connectivity, location and systems no longer have master branchesFrederik Gladhorn2013-08-121-3/+0
| | | | | Change-Id: I124639f856019f5415bc830850856d5870524612 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix bug when skipping webkit on windowsJan Arve Saether2013-05-131-1/+4
| | | | | | | | | | | | | | | Do not add "-skip qtwebkit" as one single item to the array, since that will effectively run configure like this: .\configure.exe "-skip qtwebkit" This gave the error: Unknown option -skip qtwebkit This was found to be a problem with Windows Powershell, not sure if this is a problem under command.com Change-Id: Id2a2e8d4705fc46905450e6a7ac503d6c27710aa Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Remove obsolete build configuration for QtWebKitAndras Becsi2013-05-101-30/+1
| | | | | | | | | | | | | | | | Building the qtwebkit module works the same way as any other module these days (i.e. qmake && make), thus using the build-webkit script for this purpose is obsolete. In particular when using the qt5_tool the module is actually built twice: first time with the top-level Makefile, and for the second time in a final step with build-webkit which fails because the other build is present. Since the build-webkit script is meant for upstream developer builds the option can be removed from qt5_tool. Configure with '-skip qtwebkit' when a webkit build was not requested. Task-number: QTBUG-30858 Change-Id: Ib6b51b188c9f97064efb834da46de4d03e2a72b7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* qt5_tool: Change reset (-r) to reset to upstream state.Friedemann Kleint2013-04-251-3/+3
| | | | | | Change-Id: Idb5f1f618fe692f2e59266c2d8dfe93722b7037a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix order of . and "Frederik Gladhorn2013-04-021-1/+1
| | | | | Change-Id: Ia3640b91ad063da0d719172ae264c903b898135a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* qt5_tool: Remove special branch for QtWayland.Friedemann Kleint2013-03-221-2/+1
| | | | | | | It has the standard branches now. Change-Id: I958d47be0ed3bbe9336b6610cf1ecb06b5e096b2 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* qt5_tool: Disambiguate build/branch options by uppercasing --Branch.Friedemann Kleint2013-03-121-5/+6
| | | | | Change-Id: I635f50881c9ef146b6154016105dfe0ccebf1ed4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Allow specifying branch on command line.Frederik Gladhorn2013-03-071-5/+8
| | | | | | | | I find myself switching branches too often in different checkouts. Change-Id: I59a133a3ac4d88b6c9f08a3a326605a78b8eb36d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* update copyright yearOswald Buddenhagen2013-02-111-1/+1
| | | | | Change-Id: I670423c6001e2a504df8be80b42ee88566ad3baa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* update code guideline commentJoerg Bornemann2013-02-111-2/+1
| | | | | Change-Id: I964f24da68b08893d775b04a3d6885175f1d34f5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* fix warning about redefined getcwdJoerg Bornemann2013-02-081-1/+0
| | | | | | | | getcwd is already provided by POSIX. If we need other functions from Cwd, we should import only those. Change-Id: I6f85e4db5670b36355123accc17e4bc7b5573a55 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* qt5_tool: Remove special handling for QtWebKit.Friedemann Kleint2013-02-051-1/+1
| | | | | | | It has dev/stable branches now. Change-Id: I95f367c60469efac875aae2abd451ef582ccb23a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qt5_tool: Use -q (quiet) for clean.Friedemann Kleint2013-02-051-1/+1
| | | | | Change-Id: I03622bdd124a4d3a116fc7235d27c17636787a43 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Ensure paths in the post-commit hook don't have backslashesJan Arve Saether2012-12-071-0/+1
| | | | | Change-Id: I6f3eacc4064dbb2a815508f7445441153ebcd82d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Improve qt5_tool to install local post-commit hookJan Arve Saether2012-12-071-2/+30
| | | | | Change-Id: I5b4d63eb3defbce52f2358b44ec48ecfd7286a07 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* qt5_tool: Handle branches.Friedemann Kleint2012-12-041-24/+53
| | | | | | | | Introduce new config key 'branch' and modify checkout to create tracking branches. Change-Id: I4cdafbedda36141de4c15ff6cfb06fb437fecde4 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qt5_tool: Remove old code.Friedemann Kleint2012-12-041-89/+9
| | | | | Change-Id: I5f9faf58e133cac4cad09d6407d0e61fa5224a40 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Change copyright info from Nokia to DigiaSergio Ahumada2012-11-281-2/+2
| | | | | Change-Id: I1cec04e8763c6102b485638058df37d9093ed859 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* qt5_tool: Fix locating utilities for msysgit 1.8.Friedemann Kleint2012-11-221-5/+7
| | | | | | | git.exe is now in the cmd folder. Change-Id: I84892a88a79d2dbc97bcf2419cfff095bfc33638 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* qt5_tool: Turn off parallelization for make install.Friedemann Kleint2012-07-111-1/+5
| | | | | | | Causes failures on Windows. Change-Id: I3384e746d663004dea874db8b563612d209be11c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* qt5_tool: Improve make handlingFriedemann Kleint2012-07-091-14/+31
| | | | | | | | | - Windows: Autodetect jom - Execute make install if required, deduced only from configure arguments. Change-Id: I59806a2c1c7c8e1bbd12fa667885a835365edd32 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* qt5_tool: Adapt to buildsystem branchFriedemann Kleint2012-07-021-25/+4
| | | | | | | | - Remove Windows workaround (copying of profiles). - Remove call to obsoleted 'build' script. Change-Id: I00e754d9a9780a96e1d578f09d855e63da34f5ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* qt5_tool: Execute some git commands repeatedly on failure.Friedemann Kleint2012-05-071-28/+41
| | | | | | | | Run 'pull' and 'clean' repeatly on failure in order to work around network hangs and clean failing on Windows. Change-Id: I8b22227dd90905c50ee97015a315c7ae902bebd4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* qt5_tool: Fix config file creation, do not unnecessarily fetch.Friedemann Kleint2012-04-251-5/+6
| | | | | | | | - Keys developerBuild, nokiaDeveloper were mixed up. - For -p, fetch only if the branch needs to be switched. Change-Id: I9020aaaa98ff49dde05bcec40928eda5f651993a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
View Lorry Controller Status