Maemo: Tighter integration of packaging meta data.

Optionally add packaging files to project file and version control
on target creation and remove them on target removal.

Task-number: QTCREATORBUG-3703

src/plugins/projectexplorer/projectexplorer.cpp

@@ -2204,13 +2204,19 @@ void ProjectExplorerPlugin::addExistingFiles()
 {
     QTC_ASSERT(d->m_currentNode, return)
 
+    QStringList fileNames = QFileDialog::getOpenFileNames(Core::ICore::instance()->mainWindow(),
+        tr("Add Existing Files"), directoryFor(d->m_currentNode));
+    if (fileNames.isEmpty())
+        return;
+    addExistingFiles(fileNames);
+}
+
+void ProjectExplorerPlugin::addExistingFiles(const QStringList &filePaths)
+{
     ProjectNode *projectNode = qobject_cast<ProjectNode*>(d->m_currentNode->projectNode());
     Core::ICore *core = Core::ICore::instance();
     const QString dir = directoryFor(d->m_currentNode);
-    QStringList fileNames = QFileDialog::getOpenFileNames(core->mainWindow(), tr("Add Existing Files"), dir);
-    if (fileNames.isEmpty())
-        return;
-
+    QStringList fileNames = filePaths;
     QHash<FileType, QString> fileTypeToFiles;
     foreach (const QString &fileName, fileNames) {
         FileType fileType = typeForFileName(core->mimeDatabase(), QFileInfo(fileName));

src/plugins/projectexplorer/projectexplorer.h

@@ -120,6 +120,8 @@ public:
     void runProject(Project *pro, const QString &mode);
     void runRunConfiguration(ProjectExplorer::RunConfiguration *rc, const QString &mode);
 
+    void addExistingFiles(const QStringList &filePaths);
+
 signals:
     void aboutToShowContextMenu(ProjectExplorer::Project *project,
                                 ProjectExplorer::Node *node);

src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp

@@ -35,10 +35,16 @@
 #include "maemorunconfiguration.h"
 #include "qt4maemodeployconfiguration.h"
 
+#include <coreplugin/icore.h>
+#include <coreplugin/iversioncontrol.h>
+#include <coreplugin/vcsmanager.h>
 #include <projectexplorer/customexecutablerunconfiguration.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectnodes.h>
 #include <qt4projectmanager/qt4project.h>
 
 #include <QtGui/QApplication>
+#include <QtGui/QMainWindow>
 #include <QtCore/QBuffer>
 #include <QtCore/QRegExp>
 #include <QtCore/QDir>
@@ -105,7 +111,8 @@ AbstractQt4MaemoTarget::AbstractQt4MaemoTarget(Qt4Project *parent, const QString
 {
     setIcon(QIcon(":/projectexplorer/images/MaemoDevice.png"));
     connect(parent, SIGNAL(addedTarget(ProjectExplorer::Target*)),
-        this, SLOT(handleTargetAdded(ProjectExplorer::Target*)));
+        this, SLOT(handleTargetAdded(ProjectExplorer::Target*)),
+        Qt::QueuedConnection); // Otherwise ProjextExplorerPlugin::addExistingFiles() won't be ready.
 }
 
 AbstractQt4MaemoTarget::~AbstractQt4MaemoTarget()
@@ -248,12 +255,23 @@ void AbstractQt4MaemoTarget::handleTargetToBeRemoved(ProjectExplorer::Target *ta
         return;
     if (!targetCanBeRemoved())
         return;
-    const int answer = QMessageBox::warning(0, tr("Qt Creator"),
-        tr("Do you want to remove the packaging file(s) "
+
+    Core::ICore * const core = Core::ICore::instance();
+    const int answer = QMessageBox::warning(core->mainWindow(),
+        tr("Qt Creator"), tr("Do you want to remove the packaging file(s) "
            "associated with the target '%1'?").arg(displayName()),
         QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
     if (answer == QMessageBox::No)
         return;
+    const QStringList pkgFilePaths = packagingFilePaths();
+    project()->rootProjectNode()->removeFiles(ProjectExplorer::UnknownFileType,
+        pkgFilePaths);
+    Core::IVersionControl * const vcs = core->vcsManager()
+        ->findVersionControlForDirectory(QFileInfo(packagingFilePaths().first()).dir().path());
+    if (vcs && vcs->supportsOperation(Core::IVersionControl::DeleteOperation)) {
+        foreach (const QString &filePath, pkgFilePaths)
+            vcs->vcsDelete(filePath);
+    }
     removeTarget();
     QString error;
     const QString packagingPath = project()->projectDirectory()
@@ -276,7 +294,22 @@ AbstractQt4MaemoTarget::ActionStatus AbstractQt4MaemoTarget::createTemplates()
         return ActionFailed;
     }
 
-    return createSpecialTemplates();
+    const ActionStatus actionStatus = createSpecialTemplates();
+    if (actionStatus == ActionFailed)
+        return ActionFailed;
+    if (actionStatus == ActionSuccessful) {
+        const QStringList &files = packagingFilePaths();
+        QMessageBox::StandardButton button
+            = QMessageBox::question(Core::ICore::instance()->mainWindow(),
+                  tr("Add Packaging Files to Project"),
+                  tr("Qt Creator has set up the following files to enable "
+                     "packaging:\n   %1\nDo you want to add them to the project?")
+                      .arg(files.join(QLatin1String("\n   "))),
+                  QMessageBox::Yes | QMessageBox::No);
+        if (button == QMessageBox::Yes)
+            ProjectExplorer::ProjectExplorerPlugin::instance()->addExistingFiles(files);
+    }
+    return actionStatus;
 }
 
 bool AbstractQt4MaemoTarget::initPackagingSettingsFromOtherTarget()
@@ -634,8 +667,7 @@ bool AbstractDebBasedQt4MaemoTarget::targetCanBeRemoved() const
 void AbstractDebBasedQt4MaemoTarget::removeTarget()
 {
     QString error;
-    if (!MaemoGlobal::removeRecursively(debianDirPath(), error))
-        qDebug("%s", qPrintable(error));
+    MaemoGlobal::removeRecursively(debianDirPath(), error);
 }
 
 void AbstractDebBasedQt4MaemoTarget::handleDebianFileChanged(const QString &filePath)
@@ -796,6 +828,15 @@ bool AbstractDebBasedQt4MaemoTarget::initAdditionalPackagingSettingsFromOtherTar
     return true;
 }
 
+QStringList AbstractDebBasedQt4MaemoTarget::packagingFilePaths() const
+{
+    QStringList filePaths;
+    const QString parentDir = debianDirPath();
+    foreach (const QString &fileName, debianFiles())
+        filePaths << parentDir + QLatin1Char('/') + fileName;
+    return filePaths;
+}
+
 QString AbstractDebBasedQt4MaemoTarget::defaultPackageFileName() const
 {
     QString packageName = project()->displayName().toLower();
@@ -948,10 +989,7 @@ bool AbstractRpmBasedQt4MaemoTarget::targetCanBeRemoved() const
 
 void AbstractRpmBasedQt4MaemoTarget::removeTarget()
 {
-    if (!QFile::remove(specFilePath())) {
-        qDebug("%s: Could not remove %s", Q_FUNC_INFO,
-            qPrintable(specFilePath()));
-    }
+    QFile::remove(specFilePath());
 }
 
 bool AbstractRpmBasedQt4MaemoTarget::initAdditionalPackagingSettingsFromOtherTarget()

src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h

@@ -107,7 +107,7 @@ private:
     virtual void handleTargetAddedSpecial()=0;
     virtual bool targetCanBeRemoved() const=0;
     virtual void removeTarget()=0;
-    virtual QStringList packagingFiles() const=0;
+    virtual QStringList packagingFilePaths() const=0;
 
     ActionStatus createTemplates();
     bool initPackagingSettingsFromOtherTarget();
@@ -160,7 +160,7 @@ private:
     virtual bool targetCanBeRemoved() const;
     virtual void removeTarget();
     virtual bool initAdditionalPackagingSettingsFromOtherTarget();
-    virtual QStringList packagingFiles() const { return QStringList(debianDirPath()); }
+    virtual QStringList packagingFilePaths() const;
 
     QString changeLogFilePath() const;
     QString controlFilePath() const;
@@ -209,7 +209,7 @@ private:
     virtual bool targetCanBeRemoved() const;
     virtual void removeTarget();
     virtual bool initAdditionalPackagingSettingsFromOtherTarget();
-    virtual QStringList packagingFiles() const { return QStringList(specFilePath()); }
+    virtual QStringList packagingFilePaths() const { return QStringList(specFilePath()); }
 
     virtual QString specFileName() const=0;