forked from qt-creator/qt-creator
AppMan: Remove AppManagerMakeInstallStep
Change-Id: Ia14b925f513da507bda80ab4a4fc39b6e6deded7 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -13,7 +13,6 @@ add_qtc_plugin(QtApplicationManagerIntegration
|
|||||||
appmanagerdeploypackagestep.cpp appmanagerdeploypackagestep.h
|
appmanagerdeploypackagestep.cpp appmanagerdeploypackagestep.h
|
||||||
appmanagerinstallpackagestep.cpp appmanagerinstallpackagestep.h
|
appmanagerinstallpackagestep.cpp appmanagerinstallpackagestep.h
|
||||||
appmanagerremoteinstallpackagestep.cpp appmanagerremoteinstallpackagestep.h
|
appmanagerremoteinstallpackagestep.cpp appmanagerremoteinstallpackagestep.h
|
||||||
appmanagermakeinstallstep.cpp appmanagermakeinstallstep.h
|
|
||||||
appmanagercmakepackagestep.cpp appmanagercmakepackagestep.h
|
appmanagercmakepackagestep.cpp appmanagercmakepackagestep.h
|
||||||
appmanagerplugin.cpp
|
appmanagerplugin.cpp
|
||||||
appmanagerrunconfiguration.cpp appmanagerrunconfiguration.h
|
appmanagerrunconfiguration.cpp appmanagerrunconfiguration.h
|
||||||
|
@@ -1,72 +0,0 @@
|
|||||||
// Copyright (C) 2019 Luxoft Sweden AB
|
|
||||||
// Copyright (C) 2018 Pelagicore AG
|
|
||||||
// Copyright (C) 2023 The Qt Company Ltd.
|
|
||||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
|
||||||
|
|
||||||
#include "appmanagermakeinstallstep.h"
|
|
||||||
|
|
||||||
#include "appmanagerconstants.h"
|
|
||||||
#include "appmanagertargetinformation.h"
|
|
||||||
|
|
||||||
#include <projectexplorer/makestep.h>
|
|
||||||
#include <projectexplorer/processparameters.h>
|
|
||||||
#include <projectexplorer/projectexplorerconstants.h>
|
|
||||||
#include <projectexplorer/target.h>
|
|
||||||
|
|
||||||
using namespace ProjectExplorer;
|
|
||||||
using namespace Utils;
|
|
||||||
|
|
||||||
namespace AppManager::Internal {
|
|
||||||
|
|
||||||
class AppManagerMakeInstallStep final : public MakeStep
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
AppManagerMakeInstallStep(BuildStepList *bsl, Id id)
|
|
||||||
: MakeStep(bsl, id)
|
|
||||||
{
|
|
||||||
setSelectedBuildTarget("install");
|
|
||||||
}
|
|
||||||
|
|
||||||
bool init() final
|
|
||||||
{
|
|
||||||
if (!MakeStep::init())
|
|
||||||
return false;
|
|
||||||
|
|
||||||
const TargetInformation targetInformation(target());
|
|
||||||
if (!targetInformation.isValid())
|
|
||||||
return false;
|
|
||||||
|
|
||||||
const QString buildDirectoryPath = targetInformation.buildDirectory.absolutePath();
|
|
||||||
if (buildDirectoryPath.isEmpty())
|
|
||||||
return false;
|
|
||||||
|
|
||||||
const QString buildDirectoryPathQuoted = ProcessArgs::quoteArg(QDir::toNativeSeparators(buildDirectoryPath));
|
|
||||||
const QString installRoot = QString("INSTALL_ROOT=%1").arg(buildDirectoryPathQuoted);
|
|
||||||
|
|
||||||
processParameters()->setWorkingDirectory(FilePath::fromString(buildDirectoryPath));
|
|
||||||
|
|
||||||
CommandLine cmd = processParameters()->command();
|
|
||||||
cmd.addArg(installRoot);
|
|
||||||
processParameters()->setCommandLine(cmd);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
class AppManagerMakeInstallStepFactory final : public BuildStepFactory
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
AppManagerMakeInstallStepFactory()
|
|
||||||
{
|
|
||||||
registerStep<AppManagerMakeInstallStep>(Constants::MAKE_INSTALL_STEP_ID);
|
|
||||||
setDisplayName(AppManagerMakeInstallStep::tr("Make install"));
|
|
||||||
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
void setupAppManagerMakeInstallStep()
|
|
||||||
{
|
|
||||||
static AppManagerMakeInstallStepFactory theAppManagerMakeInstallStepFactory;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // AppManager::Internal
|
|
@@ -1,12 +0,0 @@
|
|||||||
// Copyright (C) 2019 Luxoft Sweden AB
|
|
||||||
// Copyright (C) 2018 Pelagicore AG
|
|
||||||
// Copyright (C) 2023 The Qt Company Ltd.
|
|
||||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace AppManager::Internal {
|
|
||||||
|
|
||||||
void setupAppManagerMakeInstallStep();
|
|
||||||
|
|
||||||
} // AppManager::Internal
|
|
@@ -9,7 +9,6 @@
|
|||||||
#include "appmanagerdeploypackagestep.h"
|
#include "appmanagerdeploypackagestep.h"
|
||||||
#include "appmanagerinstallpackagestep.h"
|
#include "appmanagerinstallpackagestep.h"
|
||||||
#include "appmanagerremoteinstallpackagestep.h"
|
#include "appmanagerremoteinstallpackagestep.h"
|
||||||
#include "appmanagermakeinstallstep.h"
|
|
||||||
#include "appmanagercmakepackagestep.h"
|
#include "appmanagercmakepackagestep.h"
|
||||||
#include "appmanagerrunconfiguration.h"
|
#include "appmanagerrunconfiguration.h"
|
||||||
#include "appmanagerruncontrol.h"
|
#include "appmanagerruncontrol.h"
|
||||||
@@ -26,7 +25,6 @@ class AppManagerPlugin final : public ExtensionSystem::IPlugin
|
|||||||
void initialize() final
|
void initialize() final
|
||||||
{
|
{
|
||||||
setupAppManagerCMakePackageStep();
|
setupAppManagerCMakePackageStep();
|
||||||
setupAppManagerMakeInstallStep();
|
|
||||||
setupAppManagerCreatePackageStep();
|
setupAppManagerCreatePackageStep();
|
||||||
setupAppManagerDeployPackageStep();
|
setupAppManagerDeployPackageStep();
|
||||||
setupAppManagerInstallPackageStep();
|
setupAppManagerInstallPackageStep();
|
||||||
|
@@ -34,8 +34,6 @@ QtcPlugin {
|
|||||||
"appmanagerdeployconfigurationfactory.h",
|
"appmanagerdeployconfigurationfactory.h",
|
||||||
"appmanagerdeploypackagestep.cpp",
|
"appmanagerdeploypackagestep.cpp",
|
||||||
"appmanagerdeploypackagestep.h",
|
"appmanagerdeploypackagestep.h",
|
||||||
"appmanagerinstallpackagestep.cpp",
|
|
||||||
"appmanagerinstallpackagestep.h",
|
|
||||||
"appmanagermakeinstallstep.cpp",
|
"appmanagermakeinstallstep.cpp",
|
||||||
"appmanagermakeinstallstep.h",
|
"appmanagermakeinstallstep.h",
|
||||||
"appmanagerplugin.cpp",
|
"appmanagerplugin.cpp",
|
||||||
|
Reference in New Issue
Block a user