feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: add description to make install step

Browse Source 
Change-Id: I6d618b2023260352a47aab400233c09416d03b59
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-06-15 14:51:00 +03:00
parent e01497b27d
commit afd5c70c85
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -58,6 +58,8 @@ public:
BuildStepConfigWidget *createConfigWidget() final; BuildStepConfigWidget *createConfigWidget() final;
QString nativeAndroidBuildPath() const;
private: private:
bool init() final; bool init() final;
void setupOutputFormatter(Utils::OutputFormatter *formatter) override; void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
@@ -74,8 +76,9 @@ public:
AndroidPackageInstallationStepWidget(BuildStep *step) AndroidPackageInstallationStepWidget(BuildStep *step)
: BuildStepConfigWidget(step) : BuildStepConfigWidget(step)
{ {
setDisplayName(tr("Make install")); const QString cmd = static_cast<AndroidPackageInstallationStep *>(step)
setSummaryText("<b>" + tr("Make install") + "</b>"); ->nativeAndroidBuildPath();
setSummaryText(tr("<b>Make install:</b> Copy App Files to %1").arg(cmd));
} }
}; };
@@ -91,17 +94,14 @@ AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bs
bool AndroidPackageInstallationStep::init() bool AndroidPackageInstallationStep::init()
{ {
QString dirPath = buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY).toString();
if (HostOsInfo::isWindowsHost())
if (buildEnvironment().searchInPath("sh.exe").isEmpty())
dirPath = QDir::toNativeSeparators(dirPath);
ToolChain *tc = ToolChainKitAspect::cxxToolChain(target()->kit()); ToolChain *tc = ToolChainKitAspect::cxxToolChain(target()->kit());
QTC_ASSERT(tc, return false); QTC_ASSERT(tc, return false);
CommandLine cmd{tc->makeCommand(buildEnvironment())}; QString dirPath = nativeAndroidBuildPath();
const QString innerQuoted = QtcProcess::quoteArg(dirPath); const QString innerQuoted = QtcProcess::quoteArg(dirPath);
const QString outerQuoted = QtcProcess::quoteArg("INSTALL_ROOT=" + innerQuoted); const QString outerQuoted = QtcProcess::quoteArg("INSTALL_ROOT=" + innerQuoted);
CommandLine cmd{tc->makeCommand(buildEnvironment())};
cmd.addArgs(outerQuoted + " install", CommandLine::Raw); cmd.addArgs(outerQuoted + " install", CommandLine::Raw);
ProcessParameters *pp = processParameters(); ProcessParameters *pp = processParameters();
@@ -120,6 +120,16 @@ bool AndroidPackageInstallationStep::init()
return AbstractProcessStep::init(); return AbstractProcessStep::init();
} }
QString AndroidPackageInstallationStep::nativeAndroidBuildPath() const
{
QString buildPath = buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY).toString();
if (HostOsInfo::isWindowsHost())
if (buildEnvironment().searchInPath("sh.exe").isEmpty())
buildPath = QDir::toNativeSeparators(buildPath);
return buildPath;
}
void AndroidPackageInstallationStep::setupOutputFormatter(OutputFormatter *formatter) void AndroidPackageInstallationStep::setupOutputFormatter(OutputFormatter *formatter)
{ {
formatter->addLineParser(new GnuMakeParser); formatter->addLineParser(new GnuMakeParser);