From 1d4d9703a8dd99b8051f7324ba2620a0f497a85a Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Mon, 15 Jan 2024 14:34:32 +0100 Subject: [PATCH] AppMan: Remove AppManagerMakeInstallStep Change-Id: Ia14b925f513da507bda80ab4a4fc39b6e6deded7 Reviewed-by: hjk --- .../qtapplicationmanager/CMakeLists.txt | 1 - .../appmanagermakeinstallstep.cpp | 72 ------------------- .../appmanagermakeinstallstep.h | 12 ---- .../qtapplicationmanager/appmanagerplugin.cpp | 2 - .../qtapplicationmanager.qbs | 2 - 5 files changed, 89 deletions(-) delete mode 100644 src/plugins/qtapplicationmanager/appmanagermakeinstallstep.cpp delete mode 100644 src/plugins/qtapplicationmanager/appmanagermakeinstallstep.h diff --git a/src/plugins/qtapplicationmanager/CMakeLists.txt b/src/plugins/qtapplicationmanager/CMakeLists.txt index bb0ef7e8439..e94a0dc9e2a 100644 --- a/src/plugins/qtapplicationmanager/CMakeLists.txt +++ b/src/plugins/qtapplicationmanager/CMakeLists.txt @@ -13,7 +13,6 @@ add_qtc_plugin(QtApplicationManagerIntegration appmanagerdeploypackagestep.cpp appmanagerdeploypackagestep.h appmanagerinstallpackagestep.cpp appmanagerinstallpackagestep.h appmanagerremoteinstallpackagestep.cpp appmanagerremoteinstallpackagestep.h - appmanagermakeinstallstep.cpp appmanagermakeinstallstep.h appmanagercmakepackagestep.cpp appmanagercmakepackagestep.h appmanagerplugin.cpp appmanagerrunconfiguration.cpp appmanagerrunconfiguration.h diff --git a/src/plugins/qtapplicationmanager/appmanagermakeinstallstep.cpp b/src/plugins/qtapplicationmanager/appmanagermakeinstallstep.cpp deleted file mode 100644 index 19b950d9e2a..00000000000 --- a/src/plugins/qtapplicationmanager/appmanagermakeinstallstep.cpp +++ /dev/null @@ -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 -#include -#include -#include - -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(Constants::MAKE_INSTALL_STEP_ID); - setDisplayName(AppManagerMakeInstallStep::tr("Make install")); - setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY); - } -}; - -void setupAppManagerMakeInstallStep() -{ - static AppManagerMakeInstallStepFactory theAppManagerMakeInstallStepFactory; -} - -} // AppManager::Internal diff --git a/src/plugins/qtapplicationmanager/appmanagermakeinstallstep.h b/src/plugins/qtapplicationmanager/appmanagermakeinstallstep.h deleted file mode 100644 index b8a87ca3ab8..00000000000 --- a/src/plugins/qtapplicationmanager/appmanagermakeinstallstep.h +++ /dev/null @@ -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 diff --git a/src/plugins/qtapplicationmanager/appmanagerplugin.cpp b/src/plugins/qtapplicationmanager/appmanagerplugin.cpp index 189b196c112..191e71170e4 100644 --- a/src/plugins/qtapplicationmanager/appmanagerplugin.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerplugin.cpp @@ -9,7 +9,6 @@ #include "appmanagerdeploypackagestep.h" #include "appmanagerinstallpackagestep.h" #include "appmanagerremoteinstallpackagestep.h" -#include "appmanagermakeinstallstep.h" #include "appmanagercmakepackagestep.h" #include "appmanagerrunconfiguration.h" #include "appmanagerruncontrol.h" @@ -26,7 +25,6 @@ class AppManagerPlugin final : public ExtensionSystem::IPlugin void initialize() final { setupAppManagerCMakePackageStep(); - setupAppManagerMakeInstallStep(); setupAppManagerCreatePackageStep(); setupAppManagerDeployPackageStep(); setupAppManagerInstallPackageStep(); diff --git a/src/plugins/qtapplicationmanager/qtapplicationmanager.qbs b/src/plugins/qtapplicationmanager/qtapplicationmanager.qbs index 25ab142b19e..cc6adeadc1d 100644 --- a/src/plugins/qtapplicationmanager/qtapplicationmanager.qbs +++ b/src/plugins/qtapplicationmanager/qtapplicationmanager.qbs @@ -34,8 +34,6 @@ QtcPlugin { "appmanagerdeployconfigurationfactory.h", "appmanagerdeploypackagestep.cpp", "appmanagerdeploypackagestep.h", - "appmanagerinstallpackagestep.cpp", - "appmanagerinstallpackagestep.h", "appmanagermakeinstallstep.cpp", "appmanagermakeinstallstep.h", "appmanagerplugin.cpp",