Merge lp:~abreu-alexandre/qtcreator-plugin-ubuntu/html5-run-desktop into lp:qtcreator-plugin-ubuntu

[Alexandre Abreu]

Fix running html5 app on the host machine. The exec launcher selection is based on the policy version since it has changed between 1.2 and 1.3 from html5-app-launcher to webapp-container.

Fix running html5 app on the host machine. The exec launcher selection is based on the policy version since it has changed between 1.2 and 1.3 from html5-app-launcher to webapp-container.

Unmerged revisions

412. By Alexandre Abreu on 2015-09-01

Handle run html5 apps on desktop

=== modified file 'src/ubuntu/ubuntuconstants.h'
--- src/ubuntu/ubuntuconstants.h	2015-08-10 15:36:37 +0000
+++ src/ubuntu/ubuntuconstants.h	2015-09-01 15:02:38 +0000
@@ -158,6 +158,8 @@
 const char UBUNTUHTML_PROJECT_LAUNCHER_EXE[] = "ubuntu-html5-app-launcher";
 const char UBUNTUWEBAPP_PROJECT_LAUNCHER_EXE[] = "webapp-container";
 const char UBUNTUSCOPES_PROJECT_LAUNCHER_EXE[] = "qtc_desktop_scoperunner.py";
+ 
+const char UBUNTUHTML_WEBAPP_CONTAINER_POLICY_MIN[] = "1.3";
 
 const char UBUNTU_PROJECT_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Ubuntu");
 

=== modified file 'src/ubuntu/ubuntulocalrunconfiguration.cpp'
--- src/ubuntu/ubuntulocalrunconfiguration.cpp	2015-06-30 13:34:14 +0000
+++ src/ubuntu/ubuntulocalrunconfiguration.cpp	2015-09-01 15:02:38 +0000
@@ -449,10 +449,31 @@
     if (ubuntuProject) {
         m_workingDir = ubuntuProject->projectDirectory();
         if (ubuntuProject->mainFile().compare(QString::fromLatin1("www/index.html"), Qt::CaseInsensitive) == 0) {
+            QString manifestFilePath =
+                UbuntuProjectHelper::getManifestPath (target(),
+                                                      QStringLiteral("manifest.json"));
+
             Utils::Environment env = Utils::Environment::systemEnvironment();
-            m_executable = env.searchInPath(QString::fromLatin1(Ubuntu::Constants::UBUNTUHTML_PROJECT_LAUNCHER_EXE)).toString();
-            m_args = QStringList()<<QString::fromLatin1("--www=%0/www").arg(ubuntuProject->projectDirectory().toString())
-                                  <<QString::fromLatin1("--inspector");
+
+            UbuntuClickManifest manifest;
+            if (QFile::exists(manifestFilePath)
+                && manifest.load(manifestFilePath)
+                && manifest.policyVersion() >= QString::fromLatin1(Ubuntu::Constants::UBUNTUHTML_WEBAPP_CONTAINER_POLICY_MIN)) {
+                m_executable =
+                  env.searchInPath(QString::fromLatin1(Ubuntu::Constants::UBUNTUWEBAPP_PROJECT_LAUNCHER_EXE)).toString();
+                m_args = QStringList()
+                  << QString::fromLatin1("%0/www/index.html")
+                      .arg(ubuntuProject->projectDirectory().toString());
+            } else {
+                m_executable =
+                  env.searchInPath(QString::fromLatin1(Ubuntu::Constants::UBUNTUHTML_PROJECT_LAUNCHER_EXE)).toString();
+                m_args = QStringList()
+                  << QString::fromLatin1("--www=%0/www")
+                      .arg(ubuntuProject->projectDirectory().toString());
+            }
+
+            m_args << QString::fromLatin1("--inspector");
+
         } else if (ubuntuProject->mainFile().endsWith(QStringLiteral(".desktop"), Qt::CaseInsensitive)) {
             Utils::Environment env = Utils::Environment::systemEnvironment();
 

=== modified file 'src/ubuntu/ubuntumenu.cpp'
--- src/ubuntu/ubuntumenu.cpp	2015-06-19 07:22:31 +0000
+++ src/ubuntu/ubuntumenu.cpp	2015-09-01 15:02:38 +0000
@@ -673,8 +673,14 @@
                         }
 
                         if (isProperUbuntuHtmlProject(project)) {
-                            command = command.replace(QLatin1String(Constants::UBUNTU_ACTION_APP_RUNNER_EXECNAME),
-                                                      QLatin1String(Constants::UBUNTUHTML_PROJECT_LAUNCHER_EXE));
+                            QString launcherExec =
+                              QLatin1String(Constants::UBUNTUHTML_PROJECT_LAUNCHER_EXE);
+                            if (manifest.isInitialized()
+                                && manifest.policyVersion() >= QLatin1String(Constants::UBUNTUHTML_WEBAPP_CONTAINER_POLICY_MIN)) {
+                                launcherExec = QLatin1String(Constants::UBUNTUWEBAPP_PROJECT_LAUNCHER_EXE);
+                            }
+
+                            command = command.replace(QLatin1String(Constants::UBUNTU_ACTION_APP_RUNNER_EXECNAME), launcherExec);
                         }
 
                         QVariant clickTargetRequired = act->property(Constants::UBUNTU_MENUJSON_CLICKTARGETREQUIRED);