Ubuntu HTML5 UI SDK

Merge lp://staging/~dholbach/ubuntu-html5-theme/add-docs-package into lp://staging/ubuntu-html5-theme

  1. add-docs-package
  2. Merge into trunk
Proposed by Daniel Holbach
Status: Rejected
Rejected by: Daniel Holbach
Proposed branch: lp://staging/~dholbach/ubuntu-html5-theme/add-docs-package
Merge into: lp://staging/ubuntu-html5-theme
Diff against target: 12372 lines (+12011/-16)
55 files modified
0.1/ambiance/js/docsbuild/api.js (+57/-0)
0.1/ambiance/js/docsbuild/assets/css/main.css (+429/-0)
0.1/ambiance/js/docsbuild/assets/index.html (+10/-0)
0.1/ambiance/js/docsbuild/assets/js/api-filter.js (+80/-0)
0.1/ambiance/js/docsbuild/assets/js/api-list.js (+279/-0)
0.1/ambiance/js/docsbuild/assets/js/api-search.js (+126/-0)
0.1/ambiance/js/docsbuild/assets/js/apidocs.js (+398/-0)
0.1/ambiance/js/docsbuild/assets/js/tabs.js (+67/-0)
0.1/ambiance/js/docsbuild/assets/js/yui-prettify.js (+44/-0)
0.1/ambiance/js/docsbuild/assets/vendor/prettify/CHANGES.html (+130/-0)
0.1/ambiance/js/docsbuild/assets/vendor/prettify/COPYING (+202/-0)
0.1/ambiance/js/docsbuild/assets/vendor/prettify/README.html (+203/-0)
0.1/ambiance/js/docsbuild/assets/vendor/prettify/prettify-min.css (+1/-0)
0.1/ambiance/js/docsbuild/assets/vendor/prettify/prettify-min.js (+28/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.Button.html (+170/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.Dialog.html (+188/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.Header.html (+171/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.List.html (+310/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.OptionSelector.html (+133/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.Page.html (+248/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.Pagestack.html (+265/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.Popover.html (+210/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.Progress.html (+157/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.Shape.html (+169/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.Tab.html (+205/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.Tabs.html (+186/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.Toolbar.html (+193/-0)
0.1/ambiance/js/docsbuild/classes/UbuntuUI.html (+491/-0)
0.1/ambiance/js/docsbuild/data.json (+1978/-0)
0.1/ambiance/js/docsbuild/files/buttons.js.html (+159/-0)
0.1/ambiance/js/docsbuild/files/core.js.html (+713/-0)
0.1/ambiance/js/docsbuild/files/dialogs.js.html (+175/-0)
0.1/ambiance/js/docsbuild/files/fast-buttons.js.html (+253/-0)
0.1/ambiance/js/docsbuild/files/header.js.html (+174/-0)
0.1/ambiance/js/docsbuild/files/list.js.html (+292/-0)
0.1/ambiance/js/docsbuild/files/option-selector.js.html (+303/-0)
0.1/ambiance/js/docsbuild/files/page.js.html (+329/-0)
0.1/ambiance/js/docsbuild/files/pagestacks.js.html (+305/-0)
0.1/ambiance/js/docsbuild/files/popovers.js.html (+331/-0)
0.1/ambiance/js/docsbuild/files/progress.js.html (+199/-0)
0.1/ambiance/js/docsbuild/files/shape.js.html (+160/-0)
0.1/ambiance/js/docsbuild/files/tab.js.html (+250/-0)
0.1/ambiance/js/docsbuild/files/tabs.js.html (+427/-0)
0.1/ambiance/js/docsbuild/files/toolbars.js.html (+420/-0)
0.1/ambiance/js/docsbuild/index.html (+132/-0)
0.1/ambiance/js/docsbuild/modules/UbuntuUI.html (+115/-0)
0.1/ambiance/js/fix_copyright_header.py (+60/-0)
0.1/ambiance/js/yuidoc-build.sh (+1/-1)
0.1/ambiance/js/yuidoc.json (+5/-5)
debian/changelog (+10/-0)
debian/control (+12/-2)
debian/copyright (+46/-8)
debian/rules (+3/-0)
debian/ubuntu-html5-ui-toolkit-doc.docs (+1/-0)
update-docs (+8/-0)
To merge this branch: bzr merge lp://staging/~dholbach/ubuntu-html5-theme/add-docs-package
Reviewer Review Type Date Requested Status
David Barth Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+254596@code.staging.launchpad.net

Commit message

Add -doc package, whose contents have to be generated locally (use the ./update-docs command) because not all of its node dependencies are in the archive. This is done, so we can more easily update developer.ubuntu.com/api

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

For reviewing this MP, you can basically ignore everything in "0.1/ambiance/js/docsbuild" as it's all generated from yuidocs.

Revision history for this message
Daniel Holbach (dholbach) wrote :

<mhall119> dholbach: then it looks good to me

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/170/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/762/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-armhf-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/905/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:207
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/171/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/763/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/906/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
David Barth (dbarth) wrote :

I think you forgot to add the update-docs command to the commit.

Revision history for this message
Daniel Holbach (dholbach) wrote :

daniel@daydream:~/ubuntu-html5-theme$ bzr inventory | grep update
update-docs
daniel@daydream:~/ubuntu-html5-theme$

Maybe it's not on this page, as the diff is truncated to 5000 lines?

Revision history for this message
Daniel Holbach (dholbach) wrote :

Diff without the automatically generated files: http://paste.ubuntu.com/10711079/

Revision history for this message
David Barth (dbarth) wrote :

+1 on the untruncated merge proposal ;) Thanks for your contribution Daniel

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/173/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/770/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/913/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/174/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/771/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-vivid-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/914/console

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

review: Needs Fixing (continuous-integration)
lp://staging/~dholbach/ubuntu-html5-theme/add-docs-package updated
201. By Michael Hall

Merge from dholbach to include API docs output

202. By Michael Hall

Explicitly define copyright for additional JS files

203. By Alexandre Abreu

Force-add copyright headers to generated doc files

204. By Daniel Holbach

let the -autopilot packages depend on qml-module-qttest instead of libqt5test5

Revision history for this message
Daniel Holbach (dholbach) wrote :

I used https://code.launchpad.net/~mhall119/ubuntu-html5-theme/add-docs-package/+merge/255279 as a basis and let the -autopilot packages depend on qml-module-qttest instead of libqt5test5 in the hope of making jenkins happy. Please re-review.

Revision history for this message
David Barth (dbarth) :
review: Approve
Revision history for this message
Daniel Holbach (dholbach) wrote :

Michael's branch was merged instead.

Unmerged revisions

204. By Daniel Holbach

let the -autopilot packages depend on qml-module-qttest instead of libqt5test5

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches