Merge lp://staging/~abreu-alexandre/unity-webapps-qml/simplified-manifest-handling into lp://staging/unity-webapps-qml
| Status: | Merged |
|---|---|
| Merged at revision: | 117 |
| Proposed branch: | lp://staging/~abreu-alexandre/unity-webapps-qml/simplified-manifest-handling |
| Merge into: | lp://staging/unity-webapps-qml |
| Diff against target: |
446 lines (+202/-81) 12 files modified
src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.cpp (+60/-41) src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.h (+16/-7) src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp (+60/-29) src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h (+2/-2) tests/unit/test_plugin/data/manifests/valid-simplified-manifest.json (+6/-0) tests/unit/test_plugin/data/simple-install-webapp-properties-file/manifest.json (+15/-0) tests/unit/test_plugin/data/simple-install-webapp-properties-file/webapp-properties.json (+6/-0) tests/unit/test_plugin/data/simple-install/manifest.json (+6/-0) tests/unit/test_plugin/test_plugin.pro (+3/-1) tests/unit/test_plugin/tst_manifestParser.cpp (+1/-0) tests/unit/test_plugin/tst_webappsAppModel.cpp (+26/-0) tests/unit/test_plugin/tst_webappsAppModel.h (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/unity-webapps-qml/simplified-manifest-handling |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| David Barth (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Simplifies the manifest.json handling in some instances. More precisely when one is using a custom model search path for the webapp lookup, some restrictions are being put on what is expected to be found in the folder among which:
- a common/ subfolder (even if the webapp doesnt require one),
- one or more unity-webapps-* folders with manifest.json & *.user.js files in it,
More over the manifest files do require user scripts to be defined.
This imposes a set of constraints over a given webapp that simply wants to use the container (w/o js injection).
This simplifies it an allows one to define a manifest.json file (still with some required elements, but a smaller set), directly in the model search path. E.g. something like:
{
"name": "MyWebApp",
"homepage": "http://
"domain": "bbc.co.uk",
"includes": []
}
will do,
or to avoid any confusion w/ the click manifest.json file, one also searches for a webapp-
Description of the change
Simplifies the manifest.json handling in some instances. More precisely when one is using a custom model search path for the webapp lookup, some restrictions are being put on what is expected to be found in the folder among which:
- a common/ subfolder (even if the webapp doesnt require one),
- one or more unity-webapps-* folders with manifest.json & *.user.js files in it,
More over the manifest files do require user scripts to be defined.
This imposes a set of constraints over a given webapp that simply wants to use the container (w/o js injection).
This simplifies it an allows one to define a manifest.json file (still with some required elements, but a smaller set), directly in the model search path. E.g. something like:
{
"name": "MyWebApp",
"homepage": "http://
"domain": "bbc.co.uk",
"includes": []
}
will do,
or to avoid any confusion w/ the click manifest.json file, one also searches for a webapp-
| PS Jenkins bot (ps-jenkins) wrote | # |
| David Barth (dbarth) | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
PASSED: Continuous integration, rev:117
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://