summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/abstractprocessstep.cpp
Commit message (Collapse)AuthorAgeFilesLines
* TaskTree: Prepare for de-utils-ization - part 2Jarek Kobus2023-05-121-1/+2
| | | | | | | | | Move TaskTree into Tasking namespace. Move Tasking namespace out of Utils namespace. Change-Id: Ib4c1d7f54f1808517e54768dfa27209c33517b61 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* Utils: Rename qtcprocess.{cpp,h} -> process.{cpp,h}Jarek Kobus2023-05-041-1/+1
| | | | | | | | Follows QtcProcess -> Process rename. Change-Id: I97235a9a40cb7fd52944515b7ab878d96528f919 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Utils: Rename QtcProcess -> ProcessJarek Kobus2023-05-041-7/+7
| | | | | | | | Task-number: QTCREATORBUG-29102 Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
* Utils: Replace FilePath::onDevice() by new FilePath::withMappedPath()hjk2023-04-041-1/+1
| | | | | | | | | | | | | | Basically a.onDevice(b) == b.withNewMappedPath(a), matching the order of b.withNewPath(a). Whether the (curretly docker-specific) path mapping is useful /there/, and whether some of the calls are needed at all is dubious. I added some FIXME and changed a few cases directly. Change-Id: I7514736ce922f632f1f737bc496f6783389a42b6 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* ProjectExplorer: Fix potential division by zeroOrgad Shaneh2023-01-311-1/+1
| | | | | | | Reported by Coverity. Change-Id: Ie11625afc862bd7918d5b9bffd73e6726adaac0f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Tr::trhjk2023-01-161-8/+10
| | | | | Change-Id: I8f1b463c5cc7a53627f7a9ad261998b92f13e56a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Utils: Rename QtcProcess::readAllStandard* to readAllRawStandard*hjk2023-01-101-2/+2
| | | | | | | | | | | | ... and re-use the old QtcProcess::readAllStandard* names for a QString-returning 'decoded' version. For now, only use that in 'full Utf8' cases, to stay bug-compatible, the plan is, however, to employ the QTextCodecs we have already in the channel buffers. That will be one-by-one, though. Change-Id: Id209e0671920d4ea4197918e872f441254112d52 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Qmake: Enhance remote parsinghjk2023-01-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | When parsing remote .pro files the parsers needs to pretend it runs on the remote device. All internal data are now "local on the remote", so that string manipulation in .pro files "just works", and a 'device root' string is passed around to relevant functions which then use it to construct FilePath::toFSPathString()-style paths that our custom FSEngineImpl can then map to the real device. Remote $$system() calls are intercepted by the local parser and redirected using the usual QtcProcess mechanims. Quite a bit of the ProParser needed adjustments, so there's some potential for regression. Task-number: QTCREATORBUG-28242 Task-number: QTCREATORBUG-28161 Task-number: QTCREATORBUG-28355 Change-Id: I6100e7aca4e1db35f5e9689004110aab57e2c595 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* AbstractProcessStep: Provide API for running TaskTreeJarek Kobus2023-01-051-27/+67
| | | | | | | | As an alternative to calling AbstractProcessStep::doRun(). Change-Id: I53142b7470a3e2aed0e219300fb3e0b4621630db Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* AbstractProcessStep: Merge finish() with processFinished()Jarek Kobus2023-01-051-19/+14
| | | | | | Change-Id: Ied15ec3ee9d3bcc80b03b2589d101c65f2fd062a Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* AbstractProcessStep: Remove two virtual methodsJarek Kobus2022-12-131-24/+4
| | | | | | | | | | | Remove stdOutput() and stdError() virtual methods. Connect to addOutput() signal in subclasses instead and filter for desired channel. Change-Id: Ifd9a2e4ff037776caa706bbdb9634992060172ff Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* AbstractProcessStep: Remove processStarted() virtual methodJarek Kobus2022-12-061-27/+27
| | | | | | | | | | | | | | | | | | | | Add concealedParameters / setConcealedParameters instead, to be used in AndroidBuildApkStep. Use concealed parameters also on start failure and on done. By default, concealedParameters() equals processParameters() (i.e. no sensitive data to hide) unless the implementation decides to replace some sensitive data (e.g. password) with asterisks. In this case the reimplementation needs to store separate instance of ProcessParameters and redirect the pointer of concealedParameters() into own structure. This is being done through a call to setConcealedParameters(). Change-Id: I8b1573b007c0f8a10c9592ccaf25e6f088f04691 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* AbstractProcessStep: Don't read std channels on doneJarek Kobus2022-12-021-18/+6
| | | | | | | | | | | | | | | | | Since we are connected to process' readyRead signals and perform readAll inside handlers, there is no need to do it again inside process' done handler. It's guaranteed that before process emits done() signal it emits readyRead signals if new data appeared on any channel. Remove processReadyReadStdOutput() and processReadyReadStdError() helpers. Change-Id: I7e921335e6410a26efd9619cbed8f5e6852d2cf2 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* AbstractProcessStep: Merge virtual functionsJarek Kobus2022-12-021-33/+18
| | | | | | | | | | | | | Merge processSucceeded with processFinished into one virtual function. Leave default implementation empty, so that reimplementations don't need to call base impl. Move processFinished into private section. Pass just one bool success parameter into processFinished. Change-Id: Ide3e262de0c0c5583c9fec2426fa460b6b74a49d Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Ensure working dir is reachableMarcus Tillmanns2022-10-191-6/+15
| | | | | | | | | | | | | | | Previously the working directory might not be reachable by the executable. This change fixes that by calling "ensureReachable", and changing the path to an on-device path of the exectuable. This also fixes the path when the Host is Windows, and the build device is a unix type system by changing the paths from e.g. "c:/..." to "/c/..." Change-Id: I6c86e16c867bb654b6c2a4951d9f62fdb879298e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* AbstractProcessStep: Don't call blocking waitForStarted()Jarek Kobus2022-06-301-8/+6
| | | | | | | | Connect to started() signal instead. Delete the process later when process failed to start. Change-Id: I9901a52c90b018af06348892e2bd97cf967418af Reviewed-by: hjk <hjk@qt.io>
* AbstractProcessStep: Connect to QtcProcess::done() signalJarek Kobus2022-04-281-9/+9
| | | | | | | | Instead of connecting to finished() signal. Change-Id: I2c1266bf699f54053fde37bb7ff22a93131e6b11 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Don't delete process directly from process' finished handlerJarek Kobus2022-04-051-1/+2
| | | | | | | | | | | | | | | | | AbstractProcessStep::slotProcessFinished() slot is connected to m_process finished() signal. We call there AbstractProcessStep::Private::cleanUp(), and that calls m_process.reset(), so it invokes m_process d'tor directly. SshRemoteProcessRunner::handleProcessFinished() slot is connected to d->m_process finished() signal. We call there SshRemoteProcessRunner::setState(), and that calls d->m_process.reset(), so it invokes m_process d'tor directly. Delete later m_process instead in both cases. Change-Id: I4a0f2a631b676b57e8bcc3a7878620bc76dc74de Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Get rid of no-op calls to QtcProcess::kill()Jarek Kobus2022-03-241-1/+1
| | | | | | | Leave the work for implicit ProcessReaper. Change-Id: Ie01c4e996fda18b7cee77851394174556c6f3857 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix canceling compilationJarek Kobus2021-09-211-16/+11
| | | | | | | | | | | | Don't expect that the process being reaped will emit any signal. Before deleting the process inside AbstractProcessStep::doCancel() we do the expected cleanup immediately. We can't expect that the process being reaped will return fine, so we set exitCode to -1 and exitStatus to CrashExit. Fixes: QTCREATORBUG-26271 Change-Id: I0afd7ba8846d0fa57a0531201bbed9bd7a490942 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Move ProcessReaper into lib/utilsJarek Kobus2021-09-061-3/+1
| | | | | | | | | | | | | Reuse ProcessReaper inside process launcher. Automatically reap all internal QProcesses of QtcProcess (either direct child of QtcProcess in QProcessImpl or indirectly inside process launcher). Make ProcessReaper work again on QProcess instead of on QtcProcess, so it may still be reused for non-QtcProcesses. Change-Id: I950cac5cec28f17ae97fe474d6a4e48c01d6aaa2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* Utils: Drop QProcess specific parameters from QtcProcess::finished()hjk2021-06-141-1/+1
| | | | | | | | | | | Mid-term plan is to concentrate on use of QtcProcess::result() instead which is a bit more system-agnostic. There's quite a bit of potential for downstream cleanup by re-using QtcProcess::exitMessage() now. Change-Id: I3806b3f5933d96e64b7cfb18cc6c52823fddcbcd Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer: Show a verbose error message if availablehjk2021-06-071-2/+6
| | | | | | | ... when a start failed, e.g. due to a inacessible working directory. Change-Id: Ibcec1c5323c37f1e8f6c9e55439439b24f3b40b1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Fix Coverity warning in AbstractProcessStephjk2021-06-071-4/+3
| | | | | | | | | | | | | | | | | | | | | *** CID 1505141: Null pointer dereferences (FORWARD_NULL) /qt-creator/src/plugins/projectexplorer/abstractprocessstep.cpp: 409 in ProjectExplorer::AbstractProcessStep::slotProcessFinished(int, QProcess::ExitStatus)() 403 if (!process) // Happens when the process was canceled and handed over to the Reaper. 404 process = qobject_cast<QtcProcess *>(sender()); // The process was canceled! 405 if (process) { 406 stdError(d->stderrStream->toUnicode(process->readAllStandardError())); 407 stdOutput(d->stdoutStream->toUnicode(process->readAllStandardOutput())); 408 } >>> CID 1505141: Null pointer dereferences (FORWARD_NULL) >>> Passing null pointer "process" to "cleanUp", which dereferences it. 409 d->cleanUp(process); 410 } 411 Amends 4a26a2c28. Change-Id: If9a66841b05e389a87a1b843ee5ef9e66edf15dd Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Make QtcProcess::{setW,w}orkingDirectory use FilePathhjk2021-06-031-3/+2
| | | | | | | But keep the old setter for a while to ease transition. Change-Id: If02b79b1fcd31fbf8b06ef26876c41af891127f9 Reviewed-by: hjk <hjk@qt.io>
* Utils: Move QProcess base to QtcProcessPrivatehjk2021-06-021-7/+7
| | | | | Change-Id: I4c6811d42e051fadfcf32edb664ff3bc09e692e6 Reviewed-by: David Schulz <david.schulz@qt.io>
* Utils: Make Environment::setEnglishOutput a proper member functionhjk2021-05-211-1/+1
| | | | | | | | The previous indirection was useful as long as they were overloads for QProcessEnvironment and QStringList, but these are gone now. Change-Id: I5066bd2e72fd06948a5cc7bbac6dda9006db96ed Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Remove some unneeded #includeshjk2021-05-061-4/+0
| | | | | Change-Id: I08cdf8bb02a1cc394dc0698d1eaa5341ab82aa71 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer: Make AbstractProcessStep::doRun() tests work remotelyhjk2021-05-031-6/+6
| | | | | | | By funneling file system accesses through Utils::FilePath. Change-Id: I13a3aac23bd5fc301edf5e5c52e0c7ebd1e6ca6c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Better start/stop messages for remote commandshjk2021-04-291-3/+3
| | | | | Change-Id: I749e178d87e1721b09b8a6d867ab799967acad7c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: AbstractProcessStep code cosmeticshjk2021-04-231-5/+5
| | | | | | | Namespaces. Change-Id: I7781bcf7125ad854e05a3b3a6a97d0c39b76df69 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer: Make APS::setupProcessParameters constAlessandro Portale2021-04-211-1/+1
| | | | | Change-Id: I357505131cff5c98b5c9fe0a3967c79d009167e6 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Simplify use of AbstractProcessStep::init()hjk2020-09-161-1/+6
| | | | | | | | | | | | 1. Systematically check for AbstractProcessStep::init() first in derived classes. 2. Use setupProcessParameters(processParameters()); by default in the base implementation. 3. Drop all re-implementations that are effectively the same. Change-Id: I0ae54dd4909b354672a63ee56d0b7c2ea0732494 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Remove redundant MakeStep::{is,set}Clean()hjk2020-08-261-2/+0
| | | | | | | | This was only used for setIgnoreReturnValue(), which can be done directly and also does not need to be stored in the settings. Change-Id: I7419efe66d164b223463e19c3daf2350b4a2bae4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Start to consolidate AbstractProcessStep setuphjk2020-08-141-0/+41
| | | | | | | | | | Add some convenience functions to the base class to avoid repetition in the derived classes. Will be used immediately it in some derived classes. Change-Id: I8fd6aa4f8351720cdc8f63f7fa5f506e32a8143b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Small code cosmeticshjk2020-07-281-12/+10
| | | | | | | Unused declaration, const, .. Change-Id: I0de544ba9be36a291fec5d1ab187e038a4fcc464 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Core/Utils: Migrate further to Utils::Idhjk2020-07-061-1/+1
| | | | | | | The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge output formatters and output parsersChristian Kandeler2020-04-231-55/+10
| | | | | | | | | | | | | | | | | | | | | | | Now only one piece of code needs to be written to both linkify output in an output pane and create tasks for it in the issues pane. The calling sites are also simplified. For instance, until now, build steps had to feed their output parsers manually and then push the created tasks up the signal stack in parallel with the actual output, which the build manager relied upon for cross-linking the output pane content. Afterwards, the output would get forwarded to the formatter (and parsed for ANSI escape codes a second time). In contrast, a build step now just forwards the process output, and task parsing as well as output formatting is done centrally further up the stack. Concrete user-visible improvements so far: - File paths in compiler/linker messages are clickable links now. - QtTest applications now create clickable links also when run as part of a build step, not just in the app output pane. Task-number: QTCREATORBUG-22665 Change-Id: Ic9fb95b2d97f2520ab3ec653315e9219466ec08d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Enforce PWD in the environment of build stepsEike Ziller2020-04-211-1/+6
| | | | | | | | | | | In the shell PWD can be different from the "real" working directory, because the latter never contains symbolic links (getcwd). E.g. Clang uses PWD as the basis for debug information. Fixes: QTCREATORBUG-23788 Change-Id: I19f06dcfded5ccca2dc0162a3a543cdc756bffb0 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Output parsers: Make file look-up self-containedChristian Kandeler2020-04-171-29/+13
| | | | | Change-Id: Iffe104b6b52f0902f1977adeaa0fee3dc1e374a4 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Split up the IOutputParser classChristian Kandeler2020-04-161-4/+4
| | | | | | | | For symmetry with Utils::OutputFormatter. Task-number: QTCREATORBUG-22665 Change-Id: I148fed69dba042ad3ef26e080829c31cd3f357fd Reviewed-by: hjk <hjk@qt.io>
* Output parsers: Replace the chaining approachChristian Kandeler2020-04-091-28/+19
| | | | | | | | | | | Use "flat" aggregation instead. This is another step towards the formatter/parser merger. Along the way, also fix some some subclasses (mostly in BareMetal) that erroneously forwarded handled output to other parsers. Task-number: QTCREATORBUG-22665 Change-Id: I12947349ca663d2e6bbfc99efd069d69e2b54969 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Dissolve the AnsiFilterParser classChristian Kandeler2020-04-071-4/+4
| | | | | | | | | | | | | | This class was different from all the other output parsers in that its only responsibility was to pre-process the output before it was passed to the real parsers. We now make this explicit by introducing the concept of a filter function and turning the AnsiFilterParser class into one of those. This also gets rid of a case where the order of output parsers in the chain matters, which we want to move away from. Task-number: QTCREATORBUG-22665 Change-Id: Ica135e54ab43cf2ca8186073dc2487c906d4b38d Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Let IOutputParser handle newlinesChristian Kandeler2020-04-071-58/+20
| | | | | | | | | | This makes IOutputParser structurally more similar to Utils::OutputFormatter, which makes it simpler to explore possibilities of somehow uniting these two related classes. Task-number: QTCREATORBUG-22665 Change-Id: Ibb12ab6c8c785d863b9a921102a929864d0a5251 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Clean up IOutputParser interfaceChristian Kandeler2020-04-031-1/+0
| | | | | | | | | | | | - Remove unneeded/unused functions. - De-virtualize where possible. In particular, after untangling a number of self-referential redirections, it became apparent that the outputAdded() infrastructure was entirely unused. Change-Id: I51e1beed008df2727b42494b087efa476342397e Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-031-1/+1
|\ | | | | | | Change-Id: I79083060dfc3bc4408123acd3b7305b9701650fd
| * ProjectExplorer: Fix copy-paste error in AbstractProcessStepChristian Kandeler2020-04-021-1/+1
| | | | | | | | | | Change-Id: Id345f3c2c51d4ac4b773113c7e22533ebcbcfaf7 Reviewed-by: hjk <hjk@qt.io>
* | ProjectExplorer: Introduce some BuildStep convenience accessorshjk2020-02-191-4/+1
|/ | | | | | | ... and use in ProcessStep and related classes. Change-Id: Ie6f1403d0aa2b9f5bcde06e994809466700b1357 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
View Lorry Controller Status