Merge lp:~abreu-alexandre/ubuntu-html5-theme/add-ubuntu-api-bindings-to-container into lp:ubuntu-html5-theme

[Alexandre Abreu]

Expose Ubuntu API bindings to HTML5 applications

Expose Ubuntu API bindings to HTML5 applications.

The "Html5 container" at the moment is made of:

- a small qml wrapper around a cordovaview object that basically allows you to open your html5 application in a webview window and have access to cordova apis (roughly),

- a small "launcher" executable that hides the qml magic bits and only exposes the index.html and the various html specific pieces to the qtcreator developer,

It was meant as some sort of a facade to the HTML5 runtime environment and to the various API extensions that we provide.

With this change, we bring the Ubuntu APIs to the set of available APIs to the HTML5 developer. The QML component expands a bit and acts as a bridge between cordova and the extra ubuntu apis.

In order to test it, one needs:

- trunk of cordova 2.8 (or the one from the campo ppa https://launchpad.net/~campo/+archive/1.0?field.series_filter=trusty)

- this branch of unity-webapps-qml https://code.launchpad.net/~abreu-alexandre/unity-webapps-qml/ubuntu-api-bindings-generation/+merge/203342 (or the one from the campo ppa https://launchpad.net/~campo/+archive/1.0?field.series_filter=trusty)

then:

bzr branch lp:~abreu-alexandre/ubuntu-html5-theme/add-ubuntu-api-bindings-to-container
bzr branch lp:~abreu-alexandre/unity-webapps-qml/ubuntu-api-bindings-generation
cd add-ubuntu-api-bindings-to-container/src/ubuntu-html5-app-launcher
./ubuntu-html5-app-launcher --www=../../../ubuntu-api-bindings-generation/examples/api-bindings/alarm/www

You should be able to set an alarm (hence have access to the ubuntu APIs from the container in addition to the cordova ones)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:109
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2629
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2631
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2631/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/63/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:110
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2635
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2635/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/64/rebuild

review: Approve (continuous-integration)

[lp:~abreu-alexandre/ubuntu-html5-theme/add-ubuntu-api-bindings-to-container]

108. By Robert Bruce Park on 2014-01-27

Rename ubuntu-html5-theme binary package to ubuntu-html5-ui-toolkit.

Approved by PS Jenkins bot, Alexandre Abreu.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/68/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2654/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2656/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/68/rebuild

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/ubuntu-html5-theme/add-ubuntu-api-bindings-to-container]

109. By Alexandre Abreu on 2014-01-28

resolve conflicts

[Robert Bruce Park (robru)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-01-27 18:47:29 +0000
+++ debian/control	2014-01-28 01:21:20 +0000
@@ -77,6 +77,7 @@
          qtdeclarative5-cordova-2.8-plugin,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-extras-browser-plugin,
+         unity-webapps-qml (>= 0.1+14.04.20131106-0ubuntu2),
          ubuntu-html5-ui-toolkit (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends},

=== modified file 'src/qml/Ubuntu/WebApps/WebAppContainer.qml'
--- src/qml/Ubuntu/WebApps/WebAppContainer.qml	2014-01-21 21:44:42 +0000
+++ src/qml/Ubuntu/WebApps/WebAppContainer.qml	2014-01-28 01:21:20 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import CordovaUbuntu 2.8
+import Ubuntu.UnityWebApps 0.1
 
 
 /*!
@@ -38,16 +39,47 @@
 
       The path is absolute or relative to the current dir.
       */
-    property alias htmlIndexDirectory: view.wwwDir
+    property alias htmlIndexDirectory: cordovaView.wwwDir
 
     /*!
       \internal
      */
     CordovaView {
-        id: view
+        id: cordovaView
         objectName: "view"
 
         anchors.fill: parent
     }
+
+    /*!
+      \internal
+     */
+    function getUnityWebappsProxies() {
+        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(cordovaView.mainWebview);
+    }
+
+    /*!
+      \internal
+     */
+    Loader {
+    	id: webappBindingsLoader
+        visible: false
+        anchors.fill: parent
+        sourceComponent: cordovaView.mainWebview ? webappBindingsComponent : undefined
+    }
+
+    /*!
+      \internal
+     */
+    Component {
+        id: webappBindingsComponent
+
+        UnityWebApps {
+            id: webapps
+            bindee: root
+            injectExtraUbuntuApis: true
+            requiresInit: false
+        }
+    }
 }
 

=== modified file 'src/ubuntu-html5-app-launcher/main.cpp'
--- src/ubuntu-html5-app-launcher/main.cpp	2014-01-27 18:42:31 +0000
+++ src/ubuntu-html5-app-launcher/main.cpp	2014-01-28 01:21:20 +0000
@@ -35,8 +35,16 @@
     QString importPath = Webapp::Config::getContainerImportPath();
     if ( !importPath.isEmpty())
     {
-        qDebug() << "Setting import path to: " << importPath;
-        qputenv("QML2_IMPORT_PATH", importPath.toLatin1());
+        QString existingImportPath (qgetenv("QML2_IMPORT_PATH"));
+        existingImportPath = existingImportPath.trimmed();
+
+        if ( ! existingImportPath.trimmed().isEmpty())
+           existingImportPath.append(":");
+        existingImportPath.append(importPath);
+
+        qDebug() << "Setting import path to: " << existingImportPath;
+
+        qputenv("QML2_IMPORT_PATH", existingImportPath.toLatin1());
     }
 }