Maemo: Introduce abstract class for debian-based Maemo targets.

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
index 62832ad..348b628 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
@@ -270,7 +270,7 @@ bool MaemoPackageCreationStep::copyDebianFiles(bool inSourceBuild)
                    .arg(debianDirPath));
         return false;
     }
-    const QString templatesDirPath = maemoTarget()->debianDirPath();
+    const QString templatesDirPath = debBasedMaemoTarget()->debianDirPath();
     QDir templatesDir(templatesDirPath);
     const QStringList &files = templatesDir.entryList(QDir::Files);
     foreach (const QString &fileName, files) {
@@ -336,6 +336,11 @@ AbstractQt4MaemoTarget *MaemoPackageCreationStep::maemoTarget() const
     return qobject_cast<AbstractQt4MaemoTarget *>(buildConfiguration()->target());
 }
 
+AbstractDebBasedQt4MaemoTarget *MaemoPackageCreationStep::debBasedMaemoTarget() const
+{
+    return qobject_cast<AbstractDebBasedQt4MaemoTarget*>(buildConfiguration()->target());
+}
+
 QString MaemoPackageCreationStep::buildDirectory() const
 {
     return qt4BuildConfiguration()->buildDirectory();
@@ -371,14 +376,19 @@ bool MaemoPackageCreationStep::packagingNeeded() const
             return true;
     }
 
-    const QString debianPath = maemoTarget()->debianDirPath();
-    if (packageInfo.lastModified() <= QFileInfo(debianPath).lastModified())
-        return true;
-    const QStringList debianFiles = maemoTarget()->debianFiles();
-    foreach (const QString &debianFile, debianFiles) {
-        const QString absFilePath = debianPath + QLatin1Char('/') + debianFile;
-        if (packageInfo.lastModified() <= QFileInfo(absFilePath).lastModified())
+    if (debBasedMaemoTarget()) {
+        const QString debianPath = debBasedMaemoTarget()->debianDirPath();
+        if (packageInfo.lastModified() <= QFileInfo(debianPath).lastModified())
             return true;
+        const QStringList debianFiles = debBasedMaemoTarget()->debianFiles();
+        foreach (const QString &debianFile, debianFiles) {
+            const QString absFilePath
+                = debianPath + QLatin1Char('/') + debianFile;
+            if (packageInfo.lastModified() <= QFileInfo(absFilePath).lastModified())
+                return true;
+        }
+    } else {
+        // TODO: Check spec file date.
     }
 
     return false;

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
index 5c84d24..cc57887 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
@@ -57,6 +57,7 @@ namespace Internal {
 class MaemoDeployStep;
 class MaemoDeployableListModel;
 class AbstractQt4MaemoTarget;
+class AbstractDebBasedQt4MaemoTarget;
 
 class MaemoPackageCreationStep : public ProjectExplorer::BuildStep
 {
@@ -86,6 +87,7 @@ public:
     QString projectName() const;
     const Qt4BuildConfiguration *qt4BuildConfiguration() const;
     AbstractQt4MaemoTarget *maemoTarget() const;
+    AbstractDebBasedQt4MaemoTarget *debBasedMaemoTarget() const;
 
     static const QLatin1String DefaultVersionNumber;
 

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
index a8472e3..70893e9 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
@@ -96,12 +96,18 @@ void MaemoPackageCreationWidget::initGui()
     connect(m_step, SIGNAL(packageFilePathChanged()), this,
         SIGNAL(updateSummary()));
     versionInfoChanged();
-    connect(m_step->maemoTarget(), SIGNAL(debianDirContentsChanged()),
-        SLOT(updateDebianFileList()));
-    connect(m_step->maemoTarget(), SIGNAL(changeLogChanged()),
-        SLOT(updateVersionInfo()));
-    connect(m_step->maemoTarget(), SIGNAL(controlChanged()),
-        SLOT(handleControlFileUpdate()));
+    const AbstractDebBasedQt4MaemoTarget * const debBasedMaemoTarget
+        = m_step->debBasedMaemoTarget();
+    if (debBasedMaemoTarget) {
+        connect(debBasedMaemoTarget, SIGNAL(debianDirContentsChanged()),
+            SLOT(updateDebianFileList()));
+        connect(debBasedMaemoTarget, SIGNAL(changeLogChanged()),
+            SLOT(updateVersionInfo()));
+        connect(debBasedMaemoTarget, SIGNAL(controlChanged()),
+            SLOT(handleControlFileUpdate()));
+    } else {
+        // TODO: Connect the respective signals for RPM-based target
+    }
     connect(m_ui->nameLineEdit, SIGNAL(editingFinished()), SLOT(setName()));
     m_ui->shortDescriptionLineEdit->setMaxLength(60);
     connect(m_ui->shortDescriptionLineEdit, SIGNAL(editingFinished()),
@@ -111,7 +117,7 @@ void MaemoPackageCreationWidget::initGui()
 void MaemoPackageCreationWidget::updateDebianFileList()
 {
     m_ui->debianFilesComboBox->clear();
-    const QStringList &debianFiles = m_step->maemoTarget()->debianFiles();
+    const QStringList &debianFiles = m_step->debBasedMaemoTarget()->debianFiles();
     foreach (const QString &fileName, debianFiles) {
         if (fileName != QLatin1String("compat")
                 && !fileName.endsWith(QLatin1Char('~')))
@@ -236,7 +242,7 @@ void MaemoPackageCreationWidget::versionInfoChanged()
 
 void MaemoPackageCreationWidget::editDebianFile()
 {
-    const QString debianFilePath = m_step->maemoTarget()->debianDirPath()
+    const QString debianFilePath = m_step->debBasedMaemoTarget()->debianDirPath()
         + QLatin1Char('/') + m_ui->debianFilesComboBox->currentText();
     Core::EditorManager::instance()->openEditor(debianFilePath, QString(),
         Core::EditorManager::ModeSwitch);

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
index 5d3316d..fbc1e01 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
@@ -587,7 +587,7 @@ bool MaemoPublisherFremantleFree::addOrReplaceDesktopFileValue(QByteArray &fileC
 QStringList MaemoPublisherFremantleFree::findProblems() const
 {
     QStringList problems;
-    const Qt4Maemo5Target * const target
+    const AbstractQt4MaemoTarget * const target
         = qobject_cast<Qt4Maemo5Target *>(m_buildConfig->target());
     const QString &description = target->shortDescription();
     if (description.trimmed().isEmpty()) {

diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
index 09a4f26..b8036e4 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
@@ -60,9 +60,9 @@ const QLatin1String PackagingDirName("qtc_packaging");
 
 AbstractQt4MaemoTarget::AbstractQt4MaemoTarget(Qt4Project *parent, const QString &id) :
     Qt4BaseTarget(parent, id),
+    m_filesWatcher(new QFileSystemWatcher(this)),
     m_buildConfigurationFactory(new Qt4BuildConfigurationFactory(this)),
-    m_deployConfigurationFactory(new Qt4MaemoDeployConfigurationFactory(this)),
-    m_debianFilesWatcher(new QFileSystemWatcher(this))
+    m_deployConfigurationFactory(new Qt4MaemoDeployConfigurationFactory(this))
 {
     setIcon(QIcon(":/projectexplorer/images/MaemoDevice.png"));
     connect(parent, SIGNAL(addedTarget(ProjectExplorer::Target*)),
@@ -126,7 +126,171 @@ QList<ProjectExplorer::RunConfiguration *> AbstractQt4MaemoTarget::runConfigurat
     return result;
 }
 
-QString AbstractQt4MaemoTarget::projectVersion(QString *error) const
+bool AbstractQt4MaemoTarget::setProjectVersion(const QString &version,
+    QString *error)
+{
+    bool success = true;
+    foreach (Target * const target, project()->targets()) {
+        AbstractQt4MaemoTarget * const maemoTarget
+            = qobject_cast<AbstractQt4MaemoTarget *>(target);
+        if (maemoTarget) {
+            if (!maemoTarget->setProjectVersionInternal(version, error))
+                success = false;
+        }
+    }
+    return success;
+}
+
+bool AbstractQt4MaemoTarget::setPackageManagerIcon(const QString &iconFilePath,
+    QString *error)
+{
+    bool success = true;
+    foreach (Target * const target, project()->targets()) {
+        AbstractQt4MaemoTarget * const maemoTarget
+            = qobject_cast<AbstractQt4MaemoTarget *>(target);
+        if (maemoTarget) {
+            if (!maemoTarget->setPackageManagerIconInternal(iconFilePath, error))
+                success = false;
+        }
+    }
+    return success;
+}
+
+
+bool AbstractQt4MaemoTarget::setName(const QString &name)
+{
+    bool success = true;
+    foreach (Target * const target, project()->targets()) {
+        AbstractQt4MaemoTarget * const maemoTarget
+            = qobject_cast<AbstractQt4MaemoTarget *>(target);
+        if (maemoTarget) {
+            if (!maemoTarget->setNameInternal(name))
+                success = false;
+        }
+    }
+    return success;
+}
+
+bool AbstractQt4MaemoTarget::setShortDescription(const QString &description)
+{
+    bool success = true;
+    foreach (Target * const target, project()->targets()) {
+        AbstractQt4MaemoTarget * const maemoTarget
+            = qobject_cast<AbstractQt4MaemoTarget *>(target);
+        if (maemoTarget) {
+            if (!maemoTarget->setShortDescriptionInternal(description))
+                success = false;
+        }
+    }
+    return success;
+}
+
+QSharedPointer<QFile> AbstractQt4MaemoTarget::openFile(const QString &filePath,
+    QIODevice::OpenMode mode, QString *error) const
+{
+    const QString nativePath = QDir::toNativeSeparators(filePath);
+    QSharedPointer<QFile> file(new QFile(filePath));
+    if (!file->exists()) {
+        if (error)
+            *error = tr("File '%1' does not exist").arg(nativePath);
+        file.clear();
+    } else if (!file->open(mode)) {
+        if (error) {
+            *error = tr("Cannot open file '%1': %2")
+                .arg(nativePath, file->errorString());
+        }
+        file.clear();
+    }
+    return file;
+}
+
+void AbstractQt4MaemoTarget::handleTargetAdded(ProjectExplorer::Target *target)
+{
+    if (target != this)
+        return;
+
+    disconnect(project(), SIGNAL(addedTarget(ProjectExplorer::Target*)),
+        this, SLOT(handleTargetAdded(ProjectExplorer::Target*)));
+    connect(project(), SIGNAL(aboutToRemoveTarget(ProjectExplorer::Target*)),
+        SLOT(handleTargetToBeRemoved(ProjectExplorer::Target*)));
+    if (!createTemplates())
+        return;
+    initPackagingSettingsFromOtherTarget();
+    handleTargetAddedSpecial();
+}
+
+void AbstractQt4MaemoTarget::handleTargetToBeRemoved(ProjectExplorer::Target *target)
+{
+    if (target != this)
+        return;
+    if (!targetCanBeRemoved())
+        return;
+    const int answer = QMessageBox::warning(0, tr("Qt Creator"),
+        tr("Do you want to remove the packaging directory\n"
+           "associated with the target '%1'?").arg(displayName()),
+        QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+    if (answer == QMessageBox::No)
+        return;
+    removeTarget();
+    QString error;
+    const QString packagingPath = project()->projectDirectory()
+        + QLatin1Char('/') + PackagingDirName;
+    const QStringList otherContents = QDir(packagingPath).entryList(QDir::Dirs
+        | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot);
+    if (otherContents.isEmpty()) {
+        if (!MaemoGlobal::removeRecursively(packagingPath, error))
+            qDebug("%s", qPrintable(error));
+    }
+}
+
+bool AbstractQt4MaemoTarget::createTemplates()
+{
+    QDir projectDir(project()->projectDirectory());
+    if (!projectDir.exists(PackagingDirName)
+            && !projectDir.mkdir(PackagingDirName)) {
+        raiseError(tr("Error creating Maemo packaging directory '%1'.")
+            .arg(PackagingDirName));
+        return false;
+    }
+
+    return createSpecialTemplates();
+}
+
+bool AbstractQt4MaemoTarget::initPackagingSettingsFromOtherTarget()
+{
+    bool success = true;
+    foreach (const Target * const target, project()->targets()) {
+        const AbstractQt4MaemoTarget * const maemoTarget
+            = qobject_cast<const AbstractQt4MaemoTarget *>(target);
+        if (maemoTarget && maemoTarget != this) {
+            if (!setProjectVersionInternal(maemoTarget->projectVersion()))
+                success = false;
+            if (!setRawIconValue(maemoTarget->rawIconValue()))
+                success = false;
+            if (!setNameInternal(maemoTarget->name()))
+                success = false;
+            if (!setShortDescriptionInternal(maemoTarget->shortDescription()))
+                success = false;
+            break;
+        }
+    }
+    return success;
+}
+
+void AbstractQt4MaemoTarget::raiseError(const QString &reason)
+{
+    QMessageBox::critical(0, tr("Error creating Maemo templates"), reason);
+}
+
+
+AbstractDebBasedQt4MaemoTarget::AbstractDebBasedQt4MaemoTarget(Qt4Project *parent,
+    const QString &id) : AbstractQt4MaemoTarget(parent, id)
+{
+}
+
+AbstractDebBasedQt4MaemoTarget::~AbstractDebBasedQt4MaemoTarget() {}
+
+QString AbstractDebBasedQt4MaemoTarget::projectVersion(QString *error) const
 {
     QSharedPointer<QFile> changeLog = openFile(changeLogFilePath(),
         QIODevice::ReadOnly, error);
@@ -153,22 +317,7 @@ QString AbstractQt4MaemoTarget::projectVersion(QString *error) const
         closeParenPos - openParenPos - 1).data());
 }
 
-bool AbstractQt4MaemoTarget::setProjectVersion(const QString &version,
-    QString *error)
-{
-    bool success = true;
-    foreach (Target * const target, project()->targets()) {
-        AbstractQt4MaemoTarget * const maemoTarget
-            = qobject_cast<AbstractQt4MaemoTarget *>(target);
-        if (maemoTarget) {
-            if (!maemoTarget->setProjectVersionInternal(version, error))
-                success = false;
-        }
-    }
-    return success;
-}
-
-bool AbstractQt4MaemoTarget::setProjectVersionInternal(const QString &version,
+bool AbstractDebBasedQt4MaemoTarget::setProjectVersionInternal(const QString &version,
     QString *error)
 {
     const QString filePath = changeLogFilePath();
@@ -195,7 +344,7 @@ bool AbstractQt4MaemoTarget::setProjectVersionInternal(const QString &version,
     return true;
 }
 
-QIcon AbstractQt4MaemoTarget::packageManagerIcon(QString *error) const
+QIcon AbstractDebBasedQt4MaemoTarget::packageManagerIcon(QString *error) const
 {
     const QByteArray &base64Icon = controlFileFieldValue(IconFieldName, true);
     if (base64Icon.isEmpty())
@@ -209,22 +358,7 @@ QIcon AbstractQt4MaemoTarget::packageManagerIcon(QString *error) const
     return QIcon(pixmap);
 }
 
-bool AbstractQt4MaemoTarget::setPackageManagerIcon(const QString &iconFilePath,
-    QString *error)
-{
-    bool success = true;
-    foreach (Target * const target, project()->targets()) {
-        AbstractQt4MaemoTarget * const maemoTarget
-            = qobject_cast<AbstractQt4MaemoTarget *>(target);
-        if (maemoTarget) {
-            if (!maemoTarget->setPackageManagerIconInternal(iconFilePath, error))
-                success = false;
-        }
-    }
-    return success;
-}
-
-bool AbstractQt4MaemoTarget::setPackageManagerIconInternal(const QString &iconFilePath,
+bool AbstractDebBasedQt4MaemoTarget::setPackageManagerIconInternal(const QString &iconFilePath,
     QString *error)
 {
     const QString filePath = controlFilePath();
@@ -287,96 +421,49 @@ bool AbstractQt4MaemoTarget::setPackageManagerIconInternal(const QString &iconFi
     return true;
 }
 
-QString AbstractQt4MaemoTarget::name() const
+QString AbstractDebBasedQt4MaemoTarget::name() const
 {
     return QString::fromUtf8(controlFileFieldValue(NameFieldName, false));
 }
 
-bool AbstractQt4MaemoTarget::setName(const QString &name)
-{
-    bool success = true;
-    foreach (Target * const target, project()->targets()) {
-        AbstractQt4MaemoTarget * const maemoTarget
-            = qobject_cast<AbstractQt4MaemoTarget *>(target);
-        if (maemoTarget) {
-            if (!maemoTarget->setNameInternal(name))
-                success = false;
-        }
-    }
-    return success;
-}
-
-bool AbstractQt4MaemoTarget::setNameInternal(const QString &name)
+bool AbstractDebBasedQt4MaemoTarget::setNameInternal(const QString &name)
 {
     return setControlFieldValue(NameFieldName, name.toUtf8());
 }
 
-QString AbstractQt4MaemoTarget::shortDescription() const
+QString AbstractDebBasedQt4MaemoTarget::shortDescription() const
 {
     return QString::fromUtf8(controlFileFieldValue(ShortDescriptionFieldName, false));
 }
 
-bool AbstractQt4MaemoTarget::setShortDescription(const QString &description)
-{
-    bool success = true;
-    foreach (Target * const target, project()->targets()) {
-        AbstractQt4MaemoTarget * const maemoTarget
-            = qobject_cast<AbstractQt4MaemoTarget *>(target);
-        if (maemoTarget) {
-            if (!maemoTarget->setShortDescriptionInternal(description))
-                success = false;
-        }
-    }
-    return success;
-}
-
-bool AbstractQt4MaemoTarget::setShortDescriptionInternal(const QString &description)
+bool AbstractDebBasedQt4MaemoTarget::setShortDescriptionInternal(const QString &description)
 {
     return setControlFieldValue(ShortDescriptionFieldName, description.toUtf8());
 }
 
-QString AbstractQt4MaemoTarget::debianDirPath() const
+QString AbstractDebBasedQt4MaemoTarget::debianDirPath() const
 {
     return project()->projectDirectory() + QLatin1Char('/') + PackagingDirName
         + QLatin1Char('/') + debianDirName();
 }
 
-QStringList AbstractQt4MaemoTarget::debianFiles() const
+QStringList AbstractDebBasedQt4MaemoTarget::debianFiles() const
 {
     return QDir(debianDirPath())
         .entryList(QDir::Files, QDir::Name | QDir::IgnoreCase);
 }
 
-QString AbstractQt4MaemoTarget::changeLogFilePath() const
+QString AbstractDebBasedQt4MaemoTarget::changeLogFilePath() const
 {
     return debianDirPath() + QLatin1String("/changelog");
 }
 
-QString AbstractQt4MaemoTarget::controlFilePath() const
+QString AbstractDebBasedQt4MaemoTarget::controlFilePath() const
 {
     return debianDirPath() + QLatin1String("/control");
 }
 
-QSharedPointer<QFile> AbstractQt4MaemoTarget::openFile(const QString &filePath,
-    QIODevice::OpenMode mode, QString *error) const
-{
-    const QString nativePath = QDir::toNativeSeparators(filePath);
-    QSharedPointer<QFile> file(new QFile(filePath));
-    if (!file->exists()) {
-        if (error)
-            *error = tr("File '%1' does not exist").arg(nativePath);
-        file.clear();
-    } else if (!file->open(mode)) {
-        if (error) {
-            *error = tr("Cannot open file '%1': %2")
-                .arg(nativePath, file->errorString());
-        }
-        file.clear();
-    }
-    return file;
-}
-
-QByteArray AbstractQt4MaemoTarget::controlFileFieldValue(const QString &key,
+QByteArray AbstractDebBasedQt4MaemoTarget::controlFileFieldValue(const QString &key,
     bool multiLine) const
 {
     QByteArray value;
@@ -414,7 +501,7 @@ QByteArray AbstractQt4MaemoTarget::controlFileFieldValue(const QString &key,
     return value;
 }
 
-bool AbstractQt4MaemoTarget::setControlFieldValue(const QByteArray &fieldName,
+bool AbstractDebBasedQt4MaemoTarget::setControlFieldValue(const QByteArray &fieldName,
     const QByteArray &fieldValue)
 {
     QFile controlFile(controlFilePath());
@@ -429,7 +516,7 @@ bool AbstractQt4MaemoTarget::setControlFieldValue(const QByteArray &fieldName,
     return true;
 }
 
-bool AbstractQt4MaemoTarget::adaptControlFileField(QByteArray &document,
+bool AbstractDebBasedQt4MaemoTarget::adaptControlFileField(QByteArray &document,
     const QByteArray &fieldName, const QByteArray &newFieldValue)
 {
     QByteArray adaptedLine = fieldName + ": " + newFieldValue;
@@ -454,69 +541,60 @@ bool AbstractQt4MaemoTarget::adaptControlFileField(QByteArray &document,
     return updated;
 }
 
-void AbstractQt4MaemoTarget::handleTargetAdded(ProjectExplorer::Target *target)
+void AbstractDebBasedQt4MaemoTarget::handleTargetAddedSpecial()
 {
-    if (target != this)
-        return;
-
-    disconnect(project(), SIGNAL(addedTarget(ProjectExplorer::Target*)),
-        this, SLOT(handleTargetAdded(ProjectExplorer::Target*)));
-    connect(project(), SIGNAL(aboutToRemoveTarget(ProjectExplorer::Target*)),
-        SLOT(handleTargetToBeRemoved(ProjectExplorer::Target*)));
-    if (!createDebianTemplatesIfNecessary())
-        return;
-    initPackagingSettingsFromOtherTarget();
-
-    m_debianFilesWatcher->addPath(debianDirPath());
-    m_debianFilesWatcher->addPath(changeLogFilePath());
-    m_debianFilesWatcher->addPath(controlFilePath());
-    connect(m_debianFilesWatcher, SIGNAL(directoryChanged(QString)), this,
+    m_filesWatcher->addPath(debianDirPath());
+    m_filesWatcher->addPath(changeLogFilePath());
+    m_filesWatcher->addPath(controlFilePath());
+    connect(m_filesWatcher, SIGNAL(directoryChanged(QString)), this,
         SLOT(handleDebianDirContentsChanged()));
-    connect(m_debianFilesWatcher, SIGNAL(fileChanged(QString)), this,
+    connect(m_filesWatcher, SIGNAL(fileChanged(QString)), this,
         SLOT(handleDebianFileChanged(QString)));
     handleDebianDirContentsChanged();
     handleDebianFileChanged(changeLogFilePath());
     handleDebianFileChanged(controlFilePath());
 }
 
-void AbstractQt4MaemoTarget::handleTargetToBeRemoved(ProjectExplorer::Target *target)
+bool AbstractDebBasedQt4MaemoTarget::targetCanBeRemoved() const
+{
+    return QFileInfo(debianDirPath()).exists();
+}
+
+void AbstractDebBasedQt4MaemoTarget::removeTarget()
 {
-    if (target != this)
-        return;
-    const QString debianPath = debianDirPath();
-    if (!QFileInfo(debianPath).exists())
-        return;
-    const int answer = QMessageBox::warning(0, tr("Qt Creator"),
-        tr("Do you want to remove the packaging directory\n"
-           "associated with the target '%1'?").arg(displayName()),
-        QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
-    if (answer == QMessageBox::No)
-        return;
     QString error;
-    if (!MaemoGlobal::removeRecursively(debianPath, error))
+    if (!MaemoGlobal::removeRecursively(debianDirPath(), error))
         qDebug("%s", qPrintable(error));
-    const QString packagingPath = project()->projectDirectory()
-        + QLatin1Char('/') + PackagingDirName;
-    const QStringList otherContents = QDir(packagingPath).entryList(QDir::Dirs
-        | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot);
-    if (otherContents.isEmpty()) {
-        if (!MaemoGlobal::removeRecursively(packagingPath, error))
-            qDebug("%s", qPrintable(error));
-    }
 }
 
-bool AbstractQt4MaemoTarget::createDebianTemplatesIfNecessary()
+QByteArray AbstractDebBasedQt4MaemoTarget::rawIconValue() const
+{
+    return controlFileFieldValue(IconFieldName, true);
+}
+
+bool AbstractDebBasedQt4MaemoTarget::setRawIconValue(const QByteArray &icon)
+{
+    return setControlFieldValue(IconFieldName, icon);
+}
+
+void AbstractDebBasedQt4MaemoTarget::handleDebianFileChanged(const QString &filePath)
+{
+    if (filePath == changeLogFilePath())
+        emit changeLogChanged();
+    else if (filePath == controlFilePath())
+        emit controlChanged();
+}
+
+void AbstractDebBasedQt4MaemoTarget::handleDebianDirContentsChanged()
+{
+    emit debianDirContentsChanged();
+}
+
+bool AbstractDebBasedQt4MaemoTarget::createSpecialTemplates()
 {
     if (QFileInfo(debianDirPath()).exists())
         return true;
     QDir projectDir(project()->projectDirectory());
-    if (!projectDir.exists(PackagingDirName)
-            && !projectDir.mkdir(PackagingDirName)) {
-        raiseError(tr("Error creating Maemo packaging directory '%1'.")
-            .arg(PackagingDirName));
-        return false;
-    }
-
     QProcess dh_makeProc;
     QString error;
     const Qt4BuildConfiguration * const bc = activeBuildConfiguration();
@@ -568,7 +646,7 @@ bool AbstractQt4MaemoTarget::createDebianTemplatesIfNecessary()
     return adaptRulesFile() && adaptControlFile();
 }
 
-bool AbstractQt4MaemoTarget::adaptRulesFile()
+bool AbstractDebBasedQt4MaemoTarget::adaptRulesFile()
 {
     const QString rulesFilePath = debianDirPath() + "/rules";
     QFile rulesFile(rulesFilePath);
@@ -603,7 +681,7 @@ bool AbstractQt4MaemoTarget::adaptRulesFile()
     return true;
 }
 
-bool AbstractQt4MaemoTarget::adaptControlFile()
+bool AbstractDebBasedQt4MaemoTarget::adaptControlFile()
 {
     QFile controlFile(controlFilePath());
     if (!controlFile.open(QIODevice::ReadWrite)) {
@@ -643,48 +721,8 @@ bool AbstractQt4MaemoTarget::adaptControlFile()
     return true;
 }
 
-bool AbstractQt4MaemoTarget::initPackagingSettingsFromOtherTarget()
-{
-    bool success = true;
-    foreach (const Target * const target, project()->targets()) {
-        const AbstractQt4MaemoTarget * const maemoTarget
-            = qobject_cast<const AbstractQt4MaemoTarget *>(target);
-        if (maemoTarget && maemoTarget != this) {
-            if (!setProjectVersionInternal(maemoTarget->projectVersion()))
-                success = false;
-            if (!setControlFieldValue(IconFieldName, maemoTarget->controlFileFieldValue(IconFieldName, true)))
-                success = false;
-            if (!setNameInternal(maemoTarget->name()))
-                success = false;
-            if (!setShortDescriptionInternal(maemoTarget->shortDescription()))
-                success = false;
-            break;
-        }
-    }
-    return success;
-}
-
-void AbstractQt4MaemoTarget::handleDebianFileChanged(const QString &filePath)
-{
-    if (filePath == changeLogFilePath())
-        emit changeLogChanged();
-    else if (filePath == controlFilePath())
-        emit controlChanged();
-}
-
-void AbstractQt4MaemoTarget::handleDebianDirContentsChanged()
-{
-    emit debianDirContentsChanged();
-}
-
-void AbstractQt4MaemoTarget::raiseError(const QString &reason)
-{
-    QMessageBox::critical(0, tr("Error creating Maemo templates"), reason);
-}
-
-
 Qt4Maemo5Target::Qt4Maemo5Target(Qt4Project *parent, const QString &id)
-        : AbstractQt4MaemoTarget(parent, id)
+        : AbstractDebBasedQt4MaemoTarget(parent, id)
 {
     setDisplayName(defaultDisplayName());
 }
@@ -702,8 +740,8 @@ QString Qt4Maemo5Target::debianDirName() const
     return QLatin1String("debian_fremantle");
 }
 
-Qt4HarmattanTarget::Qt4HarmattanTarget(Qt4Project *parent,
-    const QString &id) : AbstractQt4MaemoTarget(parent, id)
+Qt4HarmattanTarget::Qt4HarmattanTarget(Qt4Project *parent, const QString &id)
+        : AbstractDebBasedQt4MaemoTarget(parent, id)
 {
     setDisplayName(defaultDisplayName());
 }

diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
index af5a382..e604734 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
@@ -58,24 +58,63 @@ public:
     void createApplicationProFiles();
     QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Node *n);
 
-    QString debianDirPath() const;
-    QStringList debianFiles() const;
+    virtual bool allowsRemoteMounts() const=0;
+    virtual bool allowsPackagingDisabling() const=0;
+    virtual bool allowsQmlDebugging() const=0;
 
-    QString projectVersion(QString *error = 0) const;
-    bool setProjectVersion(const QString &version, QString *error = 0);
+    virtual QString projectVersion(QString *error = 0) const=0;
+    virtual QIcon packageManagerIcon(QString *error = 0) const=0;
+    virtual QString name() const=0;
+    virtual QString shortDescription() const=0;
 
-    QIcon packageManagerIcon(QString *error = 0) const;
+    bool setProjectVersion(const QString &version, QString *error = 0);
     bool setPackageManagerIcon(const QString &iconFilePath, QString *error = 0);
-
-    QString name() const;
     bool setName(const QString &name);
-
-    QString shortDescription() const;
     bool setShortDescription(const QString &description);
 
-    virtual bool allowsRemoteMounts() const=0;
-    virtual bool allowsPackagingDisabling() const=0;
-    virtual bool allowsQmlDebugging() const=0;
+protected:
+    void raiseError(const QString &reason);
+    QSharedPointer<QFile> openFile(const QString &filePath,
+        QIODevice::OpenMode mode, QString *error) const;
+
+    QFileSystemWatcher * const m_filesWatcher;
+
+private slots:
+    void handleTargetAdded(ProjectExplorer::Target *target);
+    void handleTargetToBeRemoved(ProjectExplorer::Target *target);
+
+private:
+    virtual bool setProjectVersionInternal(const QString &version,
+        QString *error = 0)=0;
+    virtual bool setPackageManagerIconInternal(const QString &iconFilePath,
+        QString *error = 0)=0;
+    virtual bool setNameInternal(const QString &name)=0;
+    virtual bool setShortDescriptionInternal(const QString &description)=0;
+    virtual bool createSpecialTemplates()=0;
+    virtual void handleTargetAddedSpecial()=0;
+    virtual bool targetCanBeRemoved() const=0;
+    virtual void removeTarget()=0;
+
+    bool createTemplates();
+    bool initPackagingSettingsFromOtherTarget();
+
+    virtual QByteArray rawIconValue() const=0;
+    virtual bool setRawIconValue(const QByteArray &icon)=0;
+
+    Qt4BuildConfigurationFactory *m_buildConfigurationFactory;
+    Qt4MaemoDeployConfigurationFactory *m_deployConfigurationFactory;
+};
+
+
+class AbstractDebBasedQt4MaemoTarget : public AbstractQt4MaemoTarget
+{
+    Q_OBJECT
+public:
+    AbstractDebBasedQt4MaemoTarget(Qt4Project *parent, const QString &id);
+    ~AbstractDebBasedQt4MaemoTarget();
+
+    QString debianDirPath() const;
+    QStringList debianFiles() const;
 
 signals:
     void debianDirContentsChanged();
@@ -83,19 +122,29 @@ signals:
     void controlChanged();
 
 private slots:
-    void handleTargetAdded(ProjectExplorer::Target *target);
-    void handleTargetToBeRemoved(ProjectExplorer::Target *target);
     void handleDebianDirContentsChanged();
     void handleDebianFileChanged(const QString &filePath);
 
 private:
     virtual QString debianDirName() const=0;
-
-    bool setProjectVersionInternal(const QString &version, QString *error = 0);
-    bool setPackageManagerIconInternal(const QString &iconFilePath,
+    virtual QString projectVersion(QString *error = 0) const;
+    virtual QIcon packageManagerIcon(QString *error = 0) const;
+    virtual QString name() const;
+    virtual QString shortDescription() const;
+    virtual bool setProjectVersionInternal(const QString &version,
+        QString *error = 0);
+    virtual bool setPackageManagerIconInternal(const QString &iconFilePath,
         QString *error = 0);
-    bool setNameInternal(const QString &name);
-    bool setShortDescriptionInternal(const QString &description);
+    virtual bool setNameInternal(const QString &name);
+    virtual bool setShortDescriptionInternal(const QString &description);
+
+    virtual bool createSpecialTemplates();
+    virtual void handleTargetAddedSpecial();
+    virtual bool targetCanBeRemoved() const;
+    virtual void removeTarget();
+
+    virtual QByteArray rawIconValue() const;
+    virtual bool setRawIconValue(const QByteArray &icon);
 
     QString changeLogFilePath() const;
     QString controlFilePath() const;
@@ -104,21 +153,11 @@ private:
         const QByteArray &fieldValue);
     bool adaptControlFileField(QByteArray &document, const QByteArray &fieldName,
         const QByteArray &newFieldValue);
-    QSharedPointer<QFile> openFile(const QString &filePath,
-        QIODevice::OpenMode mode, QString *error) const;
-    bool createDebianTemplatesIfNecessary();
     bool adaptRulesFile();
     bool adaptControlFile();
-    bool initPackagingSettingsFromOtherTarget();
-    void raiseError(const QString &reason);
-
-    Qt4BuildConfigurationFactory *m_buildConfigurationFactory;
-    Qt4MaemoDeployConfigurationFactory *m_deployConfigurationFactory;
-    QFileSystemWatcher * const m_debianFilesWatcher;
 };
 
-
-class Qt4Maemo5Target : public AbstractQt4MaemoTarget
+class Qt4Maemo5Target : public AbstractDebBasedQt4MaemoTarget
 {
     Q_OBJECT
 public:
@@ -134,7 +173,7 @@ private:
     virtual bool allowsQmlDebugging() const { return false; }
 };
 
-class Qt4HarmattanTarget : public AbstractQt4MaemoTarget
+class Qt4HarmattanTarget : public AbstractDebBasedQt4MaemoTarget
 {
     Q_OBJECT
 public: