Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/lp1446062 into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

Fix bug lp:1446062, RSync failes if translation dir is not created

Fix bug lp:1446062, RSync failes if translation dir is not created

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:376
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/532/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/66

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/532/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/lp1446062]

377. By Benjamin Zeller on 2015-04-20

- Check if the translation dir exists before adding it to the rsync
command

=== modified file 'src/ubuntu/ubuntupackagestep.cpp'
--- src/ubuntu/ubuntupackagestep.cpp	2015-04-17 09:36:23 +0000
+++ src/ubuntu/ubuntupackagestep.cpp	2015-04-20 19:52:06 +0000
@@ -73,6 +73,15 @@
 
 bool UbuntuPackageStep::init()
 {
+    //initialization happens in internalInit,
+    //because it requires informations that are only available at this
+    //time
+    //@TODO refactor into single buildsteps per projecttype
+    return true;
+}
+
+void UbuntuPackageStep::internalInit()
+{
     m_tasks.clear();
 
     QString projectDir = target()->project()->projectDirectory();
@@ -81,6 +90,9 @@
     Utils::Environment env = Utils::Environment::systemEnvironment();
     Utils::AbstractMacroExpander *mExp = 0;
 
+    m_MakeParam = m_ClickParam = m_ReviewParam = ProjectExplorer::ProcessParameters();
+    m_clickPackageName.clear();
+
     bool isCMake  = target()->project()->id() == CMakeProjectManager::Constants::CMAKEPROJECT_ID;
     bool isQMake  = target()->project()->id() == QmakeProjectManager::Constants::QMAKEPROJECT_ID;
 
@@ -103,7 +115,7 @@
                 m_tasks.append(t);
 
                 //UbuntuClickPackageStep::run will stop if tasks exist
-                return true;
+                return;
             } else {
                 //backward compatibility, old HTML5 projects did not have a Buildconfiguration
                 //this would crash otherwise
@@ -174,12 +186,17 @@
                       << QStringLiteral("--exclude")<<QStringLiteral("*.ubuntuhtmlproject")
                       << QString(QStringLiteral("--exclude-from=%1")).arg(projectDir+QDir::separator()+QStringLiteral(".excludes"));
 
-            arguments << projectDir+QDir::separator()
-                      << m_buildDir
+            arguments << projectDir+QDir::separator();
+
+            QString translationsDir = m_buildDir
                          + QDir::separator()
                          + QString::fromLatin1(Constants::UBUNTU_CLICK_QML_BUILD_TRANSL_DIR)
-                         + QDir::separator()
-                      << m_deployDir;
+                         + QDir::separator();
+
+            if (QDir(translationsDir).exists())
+                arguments << translationsDir;
+
+            arguments << m_deployDir;
 
             ProjectExplorer::ProcessParameters* params = &m_MakeParam;
             params->setMacroExpander(mExp);
@@ -240,11 +257,13 @@
         params->setEnvironment(tmpEnv);
     }
 
-    return true;
+    return;
 }
 
 void UbuntuPackageStep::run(QFutureInterface<bool> &fi)
 {
+    internalInit();
+
     if (m_tasks.size()) {
         foreach (const ProjectExplorer::Task& task, m_tasks) {
             addTask(task);

=== modified file 'src/ubuntu/ubuntupackagestep.h'
--- src/ubuntu/ubuntupackagestep.h	2015-02-16 19:03:04 +0000
+++ src/ubuntu/ubuntupackagestep.h	2015-04-20 19:52:06 +0000
@@ -91,6 +91,7 @@
     void currentSubStepFinished();
 
 protected:
+    void internalInit ();
     void setupAndStartProcess ( const ProjectExplorer::ProcessParameters &params );
     bool processFinished (FinishedCheckMode mode = CheckReturnCode);
     void cleanup ();