Unity 8

Merge lp://staging/~nick-dedekind/unity8/console-log into lp://staging/unity8

  1. console-log
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Work in progress
Proposed branch: lp://staging/~nick-dedekind/unity8/console-log
Merge into: lp://staging/unity8
Prerequisite: lp://staging/~mzanetti/unity8/onthefly-debugging
Diff against target: 586 lines (+454/-5)
12 files modified
plugins/Unity/CMakeLists.txt (+1/-0)
plugins/Unity/Debug/CMakeLists.txt (+30/-0)
plugins/Unity/Debug/consolelog.cpp (+221/-0)
plugins/Unity/Debug/consolelog.h (+87/-0)
plugins/Unity/Debug/plugin.cpp (+31/-0)
plugins/Unity/Debug/plugin.h (+32/-0)
plugins/Unity/Debug/qmldir (+3/-0)
qml/Shell.qml (+17/-0)
src/DebuggingController.cpp (+13/-2)
src/DebuggingController.h (+15/-0)
src/ShellApplication.cpp (+2/-1)
tests/uqmlscene/main.cpp (+2/-2)
To merge this branch: bzr merge lp://staging/~nick-dedekind/unity8/console-log
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+299527@code.staging.launchpad.net

Commit message

Debug tool for printing our the console log to a control.

Description of the change

Debug tool for printing our the console log to a control.

Enable/Disable shell overlay via debug dbus interface:
com.canonical.Unity8/com/canonical/Unity8/Debugging::SetLogOverlay

To post a comment you must log in.
lp://staging/~nick-dedekind/unity8/console-log updated
2537. By Nick Dedekind

added missing files

2538. By Nick Dedekind

fixed comment

2539. By Nick Dedekind

order

2540. By Nick Dedekind

use functional

2541. By Nick Dedekind

use qthread::sleep, close write fd + cleanup

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2537
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1696/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2243/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2271
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2177
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2177
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2177
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2168/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2168/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1696/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2541
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1697/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2244/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2272
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2178
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2178
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2178
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2169/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2169/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2169/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2169/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2169/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2169/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2169/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2169/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2169/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1697/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in tests/uqmlscene/CMakeLists.txt
1 conflicts encountered.

Reply
Revision history for this message
Albert Astals Cid (aacid) wrote :

More than a month with merge conflicts -> WiP

Reply

Unmerged revisions

2541. By Nick Dedekind

use qthread::sleep, close write fd + cleanup

2540. By Nick Dedekind

use functional

2539. By Nick Dedekind

order

2538. By Nick Dedekind

fixed comment

2537. By Nick Dedekind

added missing files

2536. By Nick Dedekind

connect to debug interface

2535. By Nick Dedekind

pulled parent

2534. By Nick Dedekind

merged fly debugging

2533. By Nick Dedekind

Added Unity.Debug

2532. By Nick Dedekind

added console log

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