aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidpackageinstallationstep.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/android/androidpackageinstallationstep.cpp')
-rw-r--r--src/plugins/android/androidpackageinstallationstep.cpp26
1 files changed, 18 insertions, 8 deletions
diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp
index b16a8e864e..c6bf60a143 100644
--- a/src/plugins/android/androidpackageinstallationstep.cpp
+++ b/src/plugins/android/androidpackageinstallationstep.cpp
@@ -58,6 +58,8 @@ public:
BuildStepConfigWidget *createConfigWidget() final;
+ QString nativeAndroidBuildPath() const;
+
private:
bool init() final;
void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
@@ -74,8 +76,9 @@ public:
AndroidPackageInstallationStepWidget(BuildStep *step)
: BuildStepConfigWidget(step)
{
- setDisplayName(tr("Make install"));
- setSummaryText("<b>" + tr("Make install") + "</b>");
+ const QString cmd = static_cast<AndroidPackageInstallationStep *>(step)
+ ->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()
{
- 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());
QTC_ASSERT(tc, return false);
- CommandLine cmd{tc->makeCommand(buildEnvironment())};
+ QString dirPath = nativeAndroidBuildPath();
const QString innerQuoted = QtcProcess::quoteArg(dirPath);
const QString outerQuoted = QtcProcess::quoteArg("INSTALL_ROOT=" + innerQuoted);
+
+ CommandLine cmd{tc->makeCommand(buildEnvironment())};
cmd.addArgs(outerQuoted + " install", CommandLine::Raw);
ProcessParameters *pp = processParameters();
@@ -120,6 +120,16 @@ bool AndroidPackageInstallationStep::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)
{
formatter->addLineParser(new GnuMakeParser);