Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qt-creator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tobias Hunger
qt-creator
Commits
1a658090
Commit
1a658090
authored
14 years ago
by
con
Browse files
Options
Downloads
Patches
Plain Diff
Add error reporting if executable is not found for external tool.
parent
90f7ab49
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/coreplugin/externaltool.cpp
+32
-5
32 additions, 5 deletions
src/plugins/coreplugin/externaltool.cpp
src/plugins/coreplugin/externaltool.h
+5
-0
5 additions, 0 deletions
src/plugins/coreplugin/externaltool.h
with
37 additions
and
5 deletions
src/plugins/coreplugin/externaltool.cpp
+
32
−
5
View file @
1a658090
...
@@ -529,7 +529,8 @@ bool ExternalTool::operator==(const ExternalTool &other) const
...
@@ -529,7 +529,8 @@ bool ExternalTool::operator==(const ExternalTool &other) const
ExternalToolRunner
::
ExternalToolRunner
(
const
ExternalTool
*
tool
)
ExternalToolRunner
::
ExternalToolRunner
(
const
ExternalTool
*
tool
)
:
m_tool
(
new
ExternalTool
(
tool
)),
:
m_tool
(
new
ExternalTool
(
tool
)),
m_process
(
0
),
m_process
(
0
),
m_outputCodec
(
QTextCodec
::
codecForLocale
())
m_outputCodec
(
QTextCodec
::
codecForLocale
()),
m_hasError
(
false
)
{
{
run
();
run
();
}
}
...
@@ -540,6 +541,16 @@ ExternalToolRunner::~ExternalToolRunner()
...
@@ -540,6 +541,16 @@ ExternalToolRunner::~ExternalToolRunner()
delete
m_tool
;
delete
m_tool
;
}
}
bool
ExternalToolRunner
::
hasError
()
const
{
return
m_hasError
;
}
QString
ExternalToolRunner
::
errorString
()
const
{
return
m_errorString
;
}
bool
ExternalToolRunner
::
resolve
()
bool
ExternalToolRunner
::
resolve
()
{
{
if
(
!
m_tool
)
if
(
!
m_tool
)
...
@@ -548,14 +559,27 @@ bool ExternalToolRunner::resolve()
...
@@ -548,14 +559,27 @@ bool ExternalToolRunner::resolve()
m_resolvedArguments
.
clear
();
m_resolvedArguments
.
clear
();
m_resolvedWorkingDirectory
.
clear
();
m_resolvedWorkingDirectory
.
clear
();
{
// executable
{
// executable
QStringList
expandedExecutables
;
/* for error message */
foreach
(
const
QString
&
executable
,
m_tool
->
executables
())
{
foreach
(
const
QString
&
executable
,
m_tool
->
executables
())
{
QString
resolv
ed
=
Utils
::
expandMacros
(
executable
,
QString
expand
ed
=
Utils
::
expandMacros
(
executable
,
Core
::
VariableManager
::
instance
()
->
macroExpander
());
Core
::
VariableManager
::
instance
()
->
macroExpander
());
expandedExecutables
<<
expanded
;
m_resolvedExecutable
=
m_resolvedExecutable
=
Utils
::
Environment
::
systemEnvironment
().
searchInPath
(
resolved
);
Utils
::
Environment
::
systemEnvironment
().
searchInPath
(
expanded
);
if
(
!
m_resolvedExecutable
.
isEmpty
())
break
;
}
}
if
(
m_resolvedExecutable
.
isEmpty
())
if
(
m_resolvedExecutable
.
isEmpty
())
{
m_hasError
=
true
;
for
(
int
i
=
0
;
i
<
expandedExecutables
.
size
();
++
i
)
{
m_errorString
+=
tr
(
"Could not find executable for '%1' (expanded '%2')
\n
"
)
.
arg
(
m_tool
->
executables
().
at
(
i
))
.
arg
(
expandedExecutables
.
at
(
i
));
}
if
(
!
m_errorString
.
isEmpty
())
m_errorString
.
chop
(
1
);
return
false
;
return
false
;
}
}
}
{
// arguments
{
// arguments
m_resolvedArguments
=
Utils
::
QtcProcess
::
expandMacros
(
m_tool
->
arguments
(),
m_resolvedArguments
=
Utils
::
QtcProcess
::
expandMacros
(
m_tool
->
arguments
(),
...
@@ -759,7 +783,10 @@ void ExternalToolManager::menuActivated()
...
@@ -759,7 +783,10 @@ void ExternalToolManager::menuActivated()
QTC_ASSERT
(
action
,
return
);
QTC_ASSERT
(
action
,
return
);
ExternalTool
*
tool
=
m_tools
.
value
(
action
->
data
().
toString
());
ExternalTool
*
tool
=
m_tools
.
value
(
action
->
data
().
toString
());
QTC_ASSERT
(
tool
,
return
);
QTC_ASSERT
(
tool
,
return
);
new
ExternalToolRunner
(
tool
);
ExternalToolRunner
*
runner
=
new
ExternalToolRunner
(
tool
);
if
(
runner
->
hasError
())
{
ICore
::
instance
()
->
messageManager
()
->
printToOutputPane
(
runner
->
errorString
(),
true
);
}
}
}
QMap
<
QString
,
QList
<
Internal
::
ExternalTool
*>
>
ExternalToolManager
::
toolsByCategory
()
const
QMap
<
QString
,
QList
<
Internal
::
ExternalTool
*>
>
ExternalToolManager
::
toolsByCategory
()
const
...
...
This diff is collapsed.
Click to expand it.
src/plugins/coreplugin/externaltool.h
+
5
−
0
View file @
1a658090
...
@@ -135,6 +135,9 @@ public:
...
@@ -135,6 +135,9 @@ public:
ExternalToolRunner
(
const
ExternalTool
*
tool
);
ExternalToolRunner
(
const
ExternalTool
*
tool
);
~
ExternalToolRunner
();
~
ExternalToolRunner
();
bool
hasError
()
const
;
QString
errorString
()
const
;
private
slots
:
private
slots
:
void
started
();
void
started
();
void
finished
(
int
exitCode
,
QProcess
::
ExitStatus
status
);
void
finished
(
int
exitCode
,
QProcess
::
ExitStatus
status
);
...
@@ -157,6 +160,8 @@ private:
...
@@ -157,6 +160,8 @@ private:
QTextCodec
::
ConverterState
m_errorCodecState
;
QTextCodec
::
ConverterState
m_errorCodecState
;
QString
m_processOutput
;
QString
m_processOutput
;
QString
m_expectedFileName
;
QString
m_expectedFileName
;
bool
m_hasError
;
QString
m_errorString
;
};
};
}
// Internal
}
// Internal
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment