Commit 7d44ffed authored by Christian Kandeler's avatar Christian Kandeler Committed by hjk
Browse files

Madde: Remove support for generic MeeGo.



Platform is dead, no known users, not tested in ages (and no resources
to do so).

Change-Id: I6f4f913d9379010a3d4abc2728d9ab4425a32bc3
Reviewed-by: default avatarRobin Burchell <robin+qt@viroteck.net>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 1d85d8e7
......@@ -45,5 +45,8 @@ FakeVim
Version control plugins
Madde
* Remove generic MeeGo support due to complete irrelevance
Additional credits go to:
......@@ -49,7 +49,6 @@ HEADERS += \
maddedevicetester.h \
maddedeviceconfigurationfactory.h \
maddedevice.h \
rpmmanager.h \
maemoapplicationrunnerhelperactions.h
SOURCES += \
......@@ -93,7 +92,6 @@ SOURCES += \
maddedevicetester.cpp \
maemorunconfiguration.cpp \
maddedevice.cpp \
rpmmanager.cpp \
maemoapplicationrunnerhelperactions.cpp
FORMS += \
......
......@@ -117,8 +117,6 @@ QtcPlugin {
"maddedevice.h",
"debianmanager.h",
"debianmanager.cpp",
"rpmmanager.h",
"rpmmanager.cpp",
"maemoapplicationrunnerhelperactions.h",
"maemoapplicationrunnerhelperactions.cpp"
]
......
......@@ -125,7 +125,8 @@ QString MaddeDevice::maddeDisplayType(Core::Id type)
return tr("Maemo5/Fremantle");
if (type == Core::Id(HarmattanOsType))
return tr("MeeGo 1.2 Harmattan");
return tr("Other MeeGo OS");
QTC_ASSERT(false, return QString());
return QString(); // For crappy compilers.
}
bool MaddeDevice::allowsRemoteMounts(Core::Id type)
......@@ -143,11 +144,6 @@ bool MaddeDevice::allowsQmlDebugging(Core::Id type)
return type == Core::Id(HarmattanOsType);
}
bool MaddeDevice::isDebianBased(Core::Id type)
{
return type != Core::Id(MeeGoOsType);
}
QSize MaddeDevice::packageManagerIconSize(Core::Id type)
{
if (type == Core::Id(Maemo5OsType))
......
......@@ -60,7 +60,6 @@ public:
static bool allowsPackagingDisabling(Core::Id type);
static bool allowsQmlDebugging(Core::Id type);
static bool isDebianBased(Core::Id type);
static QSize packageManagerIconSize(Core::Id type);
private:
......
......@@ -53,7 +53,7 @@ QString MaddeDeviceConfigurationFactory::displayNameForId(Core::Id type) const
QList<Core::Id> MaddeDeviceConfigurationFactory::availableCreationIds() const
{
return QList<Core::Id>() << Core::Id(Maemo5OsType) << Core::Id(HarmattanOsType) << Core::Id(MeeGoOsType);
return QList<Core::Id>() << Core::Id(Maemo5OsType) << Core::Id(HarmattanOsType);
}
IDevice::Ptr MaddeDeviceConfigurationFactory::create(Core::Id id) const
......@@ -67,8 +67,7 @@ IDevice::Ptr MaddeDeviceConfigurationFactory::create(Core::Id id) const
bool MaddeDeviceConfigurationFactory::canRestore(const QVariantMap &map) const
{
const Core::Id type = IDevice::typeFromMap(map);
return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType)
|| type == Core::Id(MeeGoOsType);
return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType);
}
IDevice::Ptr MaddeDeviceConfigurationFactory::restore(const QVariantMap &map) const
......
......@@ -110,14 +110,8 @@ void MaddeDeviceTester::handleGenericTestFinished(TestResult result)
connect(m_processRunner, SIGNAL(connectionError()), SLOT(handleConnectionError()));
connect(m_processRunner, SIGNAL(processClosed(int)), SLOT(handleProcessFinished(int)));
QString qtInfoCmd;
if (m_deviceConfiguration->type() == Core::Id(MeeGoOsType)) {
qtInfoCmd = QLatin1String("rpm -qa 'libqt*' --queryformat '%{NAME} %{VERSION}\\n'");
} else {
qtInfoCmd = QLatin1String("dpkg-query -W -f "
const QString qtInfoCmd = QLatin1String("dpkg-query -W -f "
"'${Package} ${Version} ${Status}\n' 'libqt*' |grep ' installed$'");
}
emit progressMessage(tr("Checking for Qt libraries..."));
m_state = QtTest;
m_processRunner->run(qtInfoCmd.toUtf8(), m_deviceConfiguration->sshParameters());
......@@ -234,11 +228,8 @@ QString MaddeDeviceTester::processedQtLibsList()
{
QString unfilteredLibs = QString::fromUtf8(m_processRunner->readAllStandardOutput());
QString filteredLibs;
QString patternString;
if (m_deviceConfiguration->type() == Core::Id(MeeGoOsType))
patternString = QLatin1String("(libqt\\S+) ((\\d+)\\.(\\d+)\\.(\\d+))");
else
patternString = QLatin1String("(\\S+) (\\S*(\\d+)\\.(\\d+)\\.(\\d+)\\S*) \\S+ \\S+ \\S+");
const QString patternString
= QLatin1String("(\\S+) (\\S*(\\d+)\\.(\\d+)\\.(\\d+)\\S*) \\S+ \\S+ \\S+");
QRegExp packagePattern(patternString);
int index = packagePattern.indexIn(unfilteredLibs);
if (index == -1)
......
......@@ -40,7 +40,6 @@
#include "maemorunfactories.h"
#include "maemosettingspages.h"
#include "qt4maemodeployconfiguration.h"
#include "rpmmanager.h"
#include "maemoqtversionfactory.h"
#include <QtPlugin>
......@@ -74,7 +73,6 @@ bool MaddePlugin::initialize(const QStringList &arguments, QString *error_messag
addAutoReleasedObject(new MaddeDeviceConfigurationFactory);
new DebianManager(this);
new RpmManager(this);
return true;
}
......
......@@ -126,23 +126,6 @@ private:
HarmattanPackageInstaller * const m_installer;
};
class MeegoUploadAndInstallPackageAction : public AbstractMaddeUploadAndInstallPackageAction
{
Q_OBJECT
public:
MeegoUploadAndInstallPackageAction(AbstractRemoteLinuxDeployStep *step)
: AbstractMaddeUploadAndInstallPackageAction(step),
m_installer(new MaemoRpmPackageInstaller(this))
{
}
AbstractRemoteLinuxPackageInstaller *packageInstaller() const { return m_installer; }
private:
MaemoRpmPackageInstaller * const m_installer;
};
} // anonymous namespace
......@@ -196,53 +179,6 @@ QString MaemoUploadAndInstallPackageStep::displayName()
return tr("Deploy Debian package via SFTP upload");
}
MeegoUploadAndInstallPackageStep::MeegoUploadAndInstallPackageStep(ProjectExplorer::BuildStepList *bsl)
: AbstractRemoteLinuxDeployStep(bsl, stepId())
{
ctor();
}
MeegoUploadAndInstallPackageStep::MeegoUploadAndInstallPackageStep(ProjectExplorer::BuildStepList *bsl,
MeegoUploadAndInstallPackageStep *other) : AbstractRemoteLinuxDeployStep(bsl, other)
{
ctor();
}
void MeegoUploadAndInstallPackageStep::ctor()
{
setDefaultDisplayName(displayName());
m_deployService = new MeegoUploadAndInstallPackageAction(this);
}
AbstractRemoteLinuxDeployService *MeegoUploadAndInstallPackageStep::deployService() const
{
return m_deployService;
}
bool MeegoUploadAndInstallPackageStep::initInternal(QString *error)
{
const AbstractMaemoPackageCreationStep * const pStep
= deployConfiguration()->earlierBuildStep<MaemoRpmPackageCreationStep>(this);
if (!pStep) {
if (error)
*error = tr("No RPM package creation step found.");
return false;
}
m_deployService->setPackageFilePath(pStep->packageFilePath());
return deployService()->isDeploymentPossible(error);
}
Core::Id MeegoUploadAndInstallPackageStep::stepId()
{
return Core::Id("MaemoUploadAndInstallRpmPackageStep");
}
QString MeegoUploadAndInstallPackageStep::displayName()
{
return tr("Deploy RPM package via SFTP upload");
}
} // namespace Internal
} // namespace Madde
......
......@@ -60,27 +60,6 @@ private:
RemoteLinux::AbstractUploadAndInstallPackageService *m_deployService;
};
class MeegoUploadAndInstallPackageStep : public RemoteLinux::AbstractRemoteLinuxDeployStep
{
Q_OBJECT
public:
MeegoUploadAndInstallPackageStep(ProjectExplorer::BuildStepList *bsl);
MeegoUploadAndInstallPackageStep(ProjectExplorer::BuildStepList *bsl,
MeegoUploadAndInstallPackageStep *other);
bool initInternal(QString *error);
static Core::Id stepId();
static QString displayName();
private:
RemoteLinux::AbstractRemoteLinuxDeployService *deployService() const;
void ctor();
RemoteLinux::AbstractUploadAndInstallPackageService *m_deployService;
};
} // namespace Internal
} // namespace Madde
......
......@@ -37,7 +37,6 @@ namespace Internal {
const char Maemo5OsType[] = "Maemo5OsType";
const char HarmattanOsType[] = "HarmattanOsType";
const char MeeGoOsType[] = "MeeGoOsType";
#define PREFIX "Qt4ProjectManager.MaemoRunConfiguration"
......
......@@ -84,10 +84,6 @@ QList<Core::Id> MaemoDeployStepFactory::availableCreationIds(BuildStepList *pare
<< Core::Id(MaemoInstallDebianPackageToSysrootStep::Id)
<< Core::Id(MaemoUploadAndInstallPackageStep::stepId())
<< Core::Id(GenericDirectUploadStep::stepId());
} else if (platform == QtSupport::Constants::MEEGO_PLATFORM) {
ids << Core::Id(MaemoMakeInstallToSysrootStep::Id)
<< Core::Id(MaemoInstallRpmPackageToSysrootStep::Id)
<< Core::Id(MeegoUploadAndInstallPackageStep::stepId());
}
return ids;
......@@ -101,12 +97,8 @@ QString MaemoDeployStepFactory::displayNameForId(const Core::Id id) const
return MaemoCopyFilesViaMountStep::displayName();
else if (id == MaemoUploadAndInstallPackageStep::stepId())
return MaemoUploadAndInstallPackageStep::displayName();
else if (id == MeegoUploadAndInstallPackageStep::stepId())
return MeegoUploadAndInstallPackageStep::displayName();
else if (id == MaemoInstallDebianPackageToSysrootStep::Id)
return MaemoInstallDebianPackageToSysrootStep::displayName();
else if (id == MaemoInstallRpmPackageToSysrootStep::Id)
return MaemoInstallRpmPackageToSysrootStep::displayName();
else if (id == MaemoCopyToSysrootStep::Id)
return MaemoCopyToSysrootStep::displayName();
else if (id == MaemoMakeInstallToSysrootStep::Id)
......@@ -130,8 +122,6 @@ BuildStep *MaemoDeployStepFactory::create(BuildStepList *parent, const Core::Id
if (id == MaemoInstallDebianPackageToSysrootStep::Id) {
return new MaemoInstallDebianPackageToSysrootStep(parent);
} else if (id == MaemoInstallRpmPackageToSysrootStep::Id) {
return new MaemoInstallRpmPackageToSysrootStep(parent);
} else if (id == MaemoCopyToSysrootStep::Id) {
return new MaemoCopyToSysrootStep(parent);
} else if (id == MaemoMakeInstallToSysrootStep::Id) {
......@@ -144,9 +134,6 @@ BuildStep *MaemoDeployStepFactory::create(BuildStepList *parent, const Core::Id
} else if (id == MaemoUploadAndInstallPackageStep::stepId()
|| (id == Core::Id(OldMaemoDeployStepId) && deviceType == Core::Id(HarmattanOsType))) {
return new MaemoUploadAndInstallPackageStep(parent);
} else if (id == MeegoUploadAndInstallPackageStep::stepId()
|| (id == Core::Id(OldMaemoDeployStepId) && deviceType == Core::Id(MeeGoOsType))) {
return new MeegoUploadAndInstallPackageStep(parent);
} else if (id == GenericDirectUploadStep::stepId()) {
return new GenericDirectUploadStep(parent, id);
} else if (id == RemoteLinuxCheckForFreeDiskSpaceStep::stepId()) {
......@@ -190,15 +177,9 @@ BuildStep *MaemoDeployStepFactory::clone(BuildStepList *parent, BuildStep *produ
} else if (product->id() == MaemoUploadAndInstallPackageStep::stepId()) {
return new MaemoUploadAndInstallPackageStep(parent,
qobject_cast<MaemoUploadAndInstallPackageStep*>(product));
} else if (product->id() == MeegoUploadAndInstallPackageStep::stepId()) {
return new MeegoUploadAndInstallPackageStep(parent,
qobject_cast<MeegoUploadAndInstallPackageStep*>(product));
} else if (product->id() == MaemoInstallDebianPackageToSysrootStep::Id) {
return new MaemoInstallDebianPackageToSysrootStep(parent,
qobject_cast<MaemoInstallDebianPackageToSysrootStep *>(product));
} else if (product->id() == MaemoInstallRpmPackageToSysrootStep::Id) {
return new MaemoInstallRpmPackageToSysrootStep(parent,
qobject_cast<MaemoInstallRpmPackageToSysrootStep *>(product));
} else if (product->id() == MaemoCopyToSysrootStep::Id) {
return new MaemoCopyToSysrootStep(parent,
qobject_cast<MaemoCopyToSysrootStep *>(product));
......
......@@ -61,10 +61,8 @@ namespace Madde {
namespace Internal {
namespace {
QString defaultUser(Core::Id deviceType)
QString defaultUser()
{
if (deviceType == Core::Id(MeeGoOsType))
return QLatin1String("meego");
return QLatin1String("developer");
}
......@@ -448,7 +446,7 @@ private:
sshParams.port = m_wizardData.sshPort;
sshParams.password = password();
sshParams.timeout = 10;
sshParams.userName = defaultUser(m_wizardData.deviceType);
sshParams.userName = defaultUser();
m_ui->statusLabel->setText(tr("Deploying... "));
m_keyDeployer->deployPublicKey(sshParams, m_wizardData.publicKeyFilePath);
}
......@@ -558,13 +556,12 @@ IDevice::Ptr MaemoDeviceConfigWizard::device()
bool doTest;
QString freePortsSpec;
QSsh::SshConnectionParameters sshParams;
sshParams.userName = defaultUser(d->wizardData.deviceType);
sshParams.userName = defaultUser();
sshParams.host = d->wizardData.hostName;
sshParams.port = d->wizardData.sshPort;
if (d->wizardData.machineType == IDevice::Emulator) {
sshParams.authenticationType = QSsh::SshConnectionParameters::AuthenticationByPassword;
sshParams.password = d->wizardData.deviceType == Core::Id(MeeGoOsType)
? QLatin1String("meego") : QString();
sshParams.password = QString();
sshParams.timeout = 30;
freePortsSpec = QLatin1String("13219,14168");
doTest = false;
......
......@@ -65,15 +65,13 @@ bool MaemoGlobal::hasMaemoDevice(const Profile *p)
return false;
const Core::Id type = dev->type();
return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType)
|| type == Core::Id(MeeGoOsType);
return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType);
}
bool MaemoGlobal::supportsMaemoDevice(const Profile *p)
{
const Core::Id type = DeviceTypeProfileInformation::deviceTypeId(p);
return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType)
|| type == Core::Id(MeeGoOsType);
return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType);
}
bool MaemoGlobal::isValidMaemo5QtVersion(const QString &qmakePath)
......@@ -86,11 +84,6 @@ bool MaemoGlobal::isValidHarmattanQtVersion(const QString &qmakePath)
return isValidMaemoQtVersion(qmakePath, Core::Id(HarmattanOsType));
}
bool MaemoGlobal::isValidMeegoQtVersion(const QString &qmakePath)
{
return isValidMaemoQtVersion(qmakePath, Core::Id(MeeGoOsType));
}
bool MaemoGlobal::isValidMaemoQtVersion(const QString &qmakePath, Core::Id deviceType)
{
if (MaemoGlobal::deviceType(qmakePath) != deviceType)
......@@ -136,10 +129,8 @@ QString MaemoGlobal::remoteSudo(Core::Id deviceType, const QString &uname)
{
if (uname == QLatin1String("root"))
return QString();
if (deviceType == Core::Id(Maemo5OsType) || deviceType == Core::Id(HarmattanOsType)
|| deviceType == Core::Id(MeeGoOsType)) {
if (deviceType == Core::Id(Maemo5OsType) || deviceType == Core::Id(HarmattanOsType))
return devrootshPath();
}
return QString(); // Using sudo would open a can of worms.
}
......@@ -219,8 +210,6 @@ Core::Id MaemoGlobal::deviceType(const QString &qmakePath)
return Core::Id(Maemo5OsType);
if (name.startsWith(QLatin1String("harmattan")))
return Core::Id(HarmattanOsType);
if (name.startsWith(QLatin1String("meego")))
return Core::Id(MeeGoOsType);
return Core::Id(RemoteLinux::Constants::GenericLinuxOsType);
}
......
......@@ -81,13 +81,10 @@ class MaemoGlobal
{
Q_DECLARE_TR_FUNCTIONS(RemoteLinux::Internal::MaemoGlobal)
public:
enum PackagingSystem { Dpkg, Rpm, Tar };
static bool hasMaemoDevice(const ProjectExplorer::Profile *p);
static bool supportsMaemoDevice(const ProjectExplorer::Profile *p);
static bool isValidMaemo5QtVersion(const QString &qmakePath);
static bool isValidHarmattanQtVersion(const QString &qmakePath);
static bool isValidMeegoQtVersion(const QString &qmakePath);
static QString homeDirOnDevice(const QString &uname);
static QString devrootshPath();
......
......@@ -106,15 +106,6 @@ public:
virtual QString displayName() const { return MaemoInstallDebianPackageToSysrootStep::displayName(); }
};
class MaemoInstallRpmPackageToSysrootWidget : public AbstractMaemoInstallPackageToSysrootWidget
{
Q_OBJECT
public:
MaemoInstallRpmPackageToSysrootWidget(AbstractMaemoInstallPackageToSysrootStep *step)
: AbstractMaemoInstallPackageToSysrootWidget(step) {}
virtual QString displayName() const { return MaemoInstallRpmPackageToSysrootStep::displayName(); }
};
class MaemoCopyFilesToSysrootWidget : public BuildStepConfigWidget
{
......@@ -259,37 +250,6 @@ QString MaemoInstallDebianPackageToSysrootStep::displayName()
return tr("Install Debian package to sysroot");
}
MaemoInstallRpmPackageToSysrootStep::MaemoInstallRpmPackageToSysrootStep(BuildStepList *bsl)
: AbstractMaemoInstallPackageToSysrootStep(bsl, Id)
{
setDisplayName(displayName());
}
MaemoInstallRpmPackageToSysrootStep::MaemoInstallRpmPackageToSysrootStep(BuildStepList *bsl,
MaemoInstallRpmPackageToSysrootStep *other)
: AbstractMaemoInstallPackageToSysrootStep(bsl, other)
{
setDisplayName(displayName());
}
BuildStepConfigWidget *MaemoInstallRpmPackageToSysrootStep::createConfigWidget()
{
return new MaemoInstallRpmPackageToSysrootWidget(this);
}
QStringList MaemoInstallRpmPackageToSysrootStep::madArguments() const
{
return QStringList() << QLatin1String("xrpm") << QLatin1String("-i");
}
const Core::Id MaemoInstallRpmPackageToSysrootStep::Id
= Core::Id("MaemoInstallRpmPackageToSysrootStep");
QString MaemoInstallRpmPackageToSysrootStep::displayName()
{
return tr("Install RPM package to sysroot");
}
MaemoCopyToSysrootStep::MaemoCopyToSysrootStep(BuildStepList *bsl)
: BuildStep(bsl, Id)
{
......
......@@ -89,22 +89,6 @@ private:
virtual QStringList madArguments() const;
};
class MaemoInstallRpmPackageToSysrootStep : public AbstractMaemoInstallPackageToSysrootStep
{
Q_OBJECT
public:
explicit MaemoInstallRpmPackageToSysrootStep(ProjectExplorer::BuildStepList *bsl);
MaemoInstallRpmPackageToSysrootStep(ProjectExplorer::BuildStepList *bsl,
MaemoInstallRpmPackageToSysrootStep *other);
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
static const Core::Id Id;
static QString displayName();
private:
virtual QStringList madArguments() const;
};
class MaemoCopyToSysrootStep : public ProjectExplorer::BuildStep
{
Q_OBJECT
......
......@@ -39,6 +39,7 @@
#include <projectexplorer/profileinformation.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
#include <utils/qtcassert.h>
#include <QCoreApplication>
......@@ -61,13 +62,8 @@ QList<Core::Id> MaemoPackageCreationFactory::availableCreationIds(ProjectExplore
QList<Core::Id> ids;
if (!qobject_cast<Qt4MaemoDeployConfiguration *>(parent->parent()))
return ids;
Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(parent->target()->profile());
if (MaddeDevice::isDebianBased(deviceType)
&& !parent->contains(MaemoDebianPackageCreationStep::CreatePackageId))
if (!parent->contains(MaemoDebianPackageCreationStep::CreatePackageId))
ids << MaemoDebianPackageCreationStep::CreatePackageId;
else if (!MaddeDevice::isDebianBased(deviceType)
&& !parent->contains(MaemoRpmPackageCreationStep::CreatePackageId))
ids << MaemoRpmPackageCreationStep::CreatePackageId;
return ids;
}
......@@ -76,9 +72,6 @@ QString MaemoPackageCreationFactory::displayNameForId(const Core::Id id) const
if (id == MaemoDebianPackageCreationStep::CreatePackageId) {
return QCoreApplication::translate("RemoteLinux::Internal::MaemoPackageCreationFactory",
"Create Debian Package");
} else if (id == MaemoRpmPackageCreationStep::CreatePackageId) {
return QCoreApplication::translate("RemoteLinux::Internal::MaemoPackageCreationFactory",
"Create RPM Package");
}
return QString();
}
......@@ -93,8 +86,6 @@ BuildStep *MaemoPackageCreationFactory::create(ProjectExplorer::BuildStepList *p
Q_ASSERT(canCreate(parent, id));
if (id == MaemoDebianPackageCreationStep::CreatePackageId)
return new MaemoDebianPackageCreationStep(parent);
else if (id == MaemoRpmPackageCreationStep::CreatePackageId)
return new MaemoRpmPackageCreationStep(parent);
return 0;
}
......@@ -110,19 +101,10 @@ BuildStep *MaemoPackageCreationFactory::restore(ProjectExplorer::BuildStepList *
{
Q_ASSERT(canRestore(parent, map));
BuildStep * step = 0;
Core::Id deviceType
= ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(parent->target()->profile());
const Core::Id id = ProjectExplorer::idFromMap(map);
if (id == MaemoDebianPackageCreationStep::CreatePackageId
|| (id == Core::Id(OldCreatePackageId)
&& MaddeDevice::isDebianBased(deviceType))) {
if (id == MaemoDebianPackageCreationStep::CreatePackageId)
step = new MaemoDebianPackageCreationStep(parent);
} else if (id == MaemoRpmPackageCreationStep::CreatePackageId
|| (id == Core::Id(OldCreatePackageId)
&& !MaddeDevice::isDebianBased(deviceType))) {
step = new MaemoRpmPackageCreationStep(parent);
}
Q_ASSERT(step);
QTC_ASSERT(step, return 0);
if (!step->fromMap(map)) {
delete step;
......@@ -145,10 +127,6 @@ BuildStep *MaemoPackageCreationFactory::clone(ProjectExplorer::BuildStepList *pa
= qobject_cast<MaemoDebianPackageCreationStep *>(product)) {
return new MaemoDebianPackageCreationStep(parent, debianStep);
}
if (MaemoRpmPackageCreationStep * const rpmStep
= qobject_cast<MaemoRpmPackageCreationStep *>(product)) {
return new MaemoRpmPackageCreationStep(parent, rpmStep);
}
return 0;
}
......
......@@ -32,7 +32,6 @@
#include "maemoconstants.h"
#include "maemoglobal.h"
#include "debianmanager.h"
#include "rpmmanager.h"
#include "maemopackagecreationwidget.h"
#include <projectexplorer/projectexplorerconstants.h>
......@@ -479,69 +478,5 @@ bool MaemoDebianPackageCreationStep::adaptRulesFile(
return true;
}
/////////////////
// MaemoRpmPackageCreationStep
/////////////////
MaemoRpmPackageCreationStep::MaemoRpmPackageCreationStep(BuildStepList *bsl)
: AbstractMaemoPackageCreationStep(bsl, CreatePackageId)
{
ctor();
}
MaemoRpmPackageCreationStep::MaemoRpmPackageCreationStep(BuildStepList *buildConfig,
MaemoRpmPackageCreationStep *other)
: AbstractMaemoPackageCreationStep(buildConfig, other)
{
ctor();
}
void MaemoRpmPackageCreationStep::ctor()
{
setDefaultDisplayName(tr("Create RPM Package"));
}
bool MaemoRpmPackageCreationStep::init()
{
m_specFile = RpmManager::specFile(target());