Ubuntu Terminal App

Merge lp://staging/~dpm/ubuntu-terminal-app/merge-plugin into lp://staging/ubuntu-terminal-app

  1. merge-plugin
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 75
Merged at revision: 57
Proposed branch: lp://staging/~dpm/ubuntu-terminal-app/merge-plugin
Merge into: lp://staging/ubuntu-terminal-app
Diff against target: 25271 lines (+24506/-71)
106 files modified
.bzrignore (+0/-6)
CMakeLists.txt (+33/-18)
README (+0/-1)
README.md (+152/-0)
apparmor.json (+3/-2)
click/CMakeLists.txt (+0/-8)
debian/changelog (+6/-2)
debian/control (+29/-8)
debian/qtdeclarative5-konsole-qml-plugin.install (+1/-0)
manifest.json (+6/-6)
plugins.json (+0/-6)
src/CMakeLists.txt (+2/-0)
src/app/CMakeLists.txt (+24/-0)
src/app/main.cpp (+120/-0)
src/plugin/CMakeLists.txt (+7/-0)
src/plugin/konsole/BlockArray.cpp (+377/-0)
src/plugin/konsole/BlockArray.h (+126/-0)
src/plugin/konsole/CMakeLists.txt (+93/-0)
src/plugin/konsole/Character.h (+221/-0)
src/plugin/konsole/CharacterColor.h (+294/-0)
src/plugin/konsole/ColorScheme.cpp (+774/-0)
src/plugin/konsole/ColorScheme.h (+342/-0)
src/plugin/konsole/ColorTables.h (+55/-0)
src/plugin/konsole/DefaultTranslatorText.h (+2/-0)
src/plugin/konsole/Emulation.cpp (+458/-0)
src/plugin/konsole/Emulation.h (+467/-0)
src/plugin/konsole/ExtendedDefaultTranslator.h (+74/-0)
src/plugin/konsole/Filter.cpp (+542/-0)
src/plugin/konsole/Filter.h (+380/-0)
src/plugin/konsole/History.cpp (+986/-0)
src/plugin/konsole/History.h (+490/-0)
src/plugin/konsole/KeyboardTranslator.cpp (+892/-0)
src/plugin/konsole/KeyboardTranslator.h (+584/-0)
src/plugin/konsole/LineFont.h (+21/-0)
src/plugin/konsole/LineFont.src (+786/-0)
src/plugin/konsole/Pty.cpp (+310/-0)
src/plugin/konsole/Pty.h (+206/-0)
src/plugin/konsole/Screen.cpp (+1360/-0)
src/plugin/konsole/Screen.h (+672/-0)
src/plugin/konsole/ScreenWindow.cpp (+292/-0)
src/plugin/konsole/ScreenWindow.h (+257/-0)
src/plugin/konsole/Session.cpp (+1064/-0)
src/plugin/konsole/Session.h (+626/-0)
src/plugin/konsole/ShellCommand.cpp (+167/-0)
src/plugin/konsole/ShellCommand.h (+90/-0)
src/plugin/konsole/TerminalCharacterDecoder.cpp (+251/-0)
src/plugin/konsole/TerminalCharacterDecoder.h (+148/-0)
src/plugin/konsole/TerminalDisplay.cpp (+2170/-0)
src/plugin/konsole/TerminalDisplay.h (+715/-0)
src/plugin/konsole/Vt102Emulation.cpp (+1221/-0)
src/plugin/konsole/Vt102Emulation.h (+188/-0)
src/plugin/konsole/assets/color-schemes/BlackOnLightYellow.schema (+42/-0)
src/plugin/konsole/assets/color-schemes/BlackOnRandomLight.colorscheme (+104/-0)
src/plugin/konsole/assets/color-schemes/BlackOnWhite.schema (+42/-0)
src/plugin/konsole/assets/color-schemes/DarkPastels.colorscheme (+103/-0)
src/plugin/konsole/assets/color-schemes/GreenOnBlack.colorscheme (+104/-0)
src/plugin/konsole/assets/color-schemes/Linux.colorscheme (+100/-0)
src/plugin/konsole/assets/color-schemes/WhiteOnBlack.schema (+42/-0)
src/plugin/konsole/assets/color-schemes/historic/BlackOnLightColor.schema (+42/-0)
src/plugin/konsole/assets/color-schemes/historic/DarkPicture.schema (+44/-0)
src/plugin/konsole/assets/color-schemes/historic/Example.Schema (+47/-0)
src/plugin/konsole/assets/color-schemes/historic/GreenOnBlack.schema (+42/-0)
src/plugin/konsole/assets/color-schemes/historic/GreenTint.schema (+49/-0)
src/plugin/konsole/assets/color-schemes/historic/GreenTint_MC.schema (+49/-0)
src/plugin/konsole/assets/color-schemes/historic/LightPicture.schema (+44/-0)
src/plugin/konsole/assets/color-schemes/historic/Linux.schema (+47/-0)
src/plugin/konsole/assets/color-schemes/historic/README.Schema (+132/-0)
src/plugin/konsole/assets/color-schemes/historic/README.default.Schema (+44/-0)
src/plugin/konsole/assets/color-schemes/historic/Transparent.schema (+49/-0)
src/plugin/konsole/assets/color-schemes/historic/Transparent_MC.schema (+51/-0)
src/plugin/konsole/assets/color-schemes/historic/Transparent_darkbg.schema (+42/-0)
src/plugin/konsole/assets/color-schemes/historic/Transparent_lightbg.schema (+51/-0)
src/plugin/konsole/assets/color-schemes/historic/XTerm.schema (+46/-0)
src/plugin/konsole/assets/color-schemes/historic/syscolor.schema (+44/-0)
src/plugin/konsole/assets/color-schemes/historic/vim.schema (+40/-0)
src/plugin/konsole/assets/kb-layouts/README (+72/-0)
src/plugin/konsole/assets/kb-layouts/default.keytab (+169/-0)
src/plugin/konsole/assets/kb-layouts/historic/vt100.keytab (+133/-0)
src/plugin/konsole/assets/kb-layouts/historic/x11r5.keytab (+71/-0)
src/plugin/konsole/assets/kb-layouts/linux.keytab (+164/-0)
src/plugin/konsole/assets/kb-layouts/macbook.keytab (+175/-0)
src/plugin/konsole/assets/kb-layouts/solaris.keytab (+108/-0)
src/plugin/konsole/assets/kb-layouts/vt420pc.keytab (+168/-0)
src/plugin/konsole/default.keytab (+128/-0)
src/plugin/konsole/konsole_wcwidth.cpp (+224/-0)
src/plugin/konsole/konsole_wcwidth.h (+24/-0)
src/plugin/konsole/kprocess.cpp (+412/-0)
src/plugin/konsole/kprocess.h (+372/-0)
src/plugin/konsole/kpty.cpp (+701/-0)
src/plugin/konsole/kpty.h (+191/-0)
src/plugin/konsole/kpty_p.h (+50/-0)
src/plugin/konsole/kptydevice.cpp (+422/-0)
src/plugin/konsole/kptydevice.h (+360/-0)
src/plugin/konsole/kptyprocess.cpp (+129/-0)
src/plugin/konsole/kptyprocess.h (+178/-0)
src/plugin/konsole/ksession.cpp (+242/-0)
src/plugin/konsole/ksession.h (+132/-0)
src/plugin/konsole/plugin.cpp (+63/-0)
src/plugin/konsole/plugin.h (+46/-0)
src/plugin/konsole/plugins.qmltypes (+169/-0)
src/plugin/konsole/qmldir (+3/-0)
src/plugin/konsole/tools.cpp (+80/-0)
src/plugin/konsole/tools.h (+10/-0)
tests/autopilot/CMakeLists.txt (+1/-1)
tests/autopilot/ubuntu_terminal_app/tests/__init__.py (+25/-10)
ubuntu-terminal-app.in (+0/-3)
To merge this branch: bzr merge lp://staging/~dpm/ubuntu-terminal-app/merge-plugin
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nicholas Skaggs Pending
Review via email: mp+217380@code.staging.launchpad.net

Commit message

Merge the terminal app's plugin into the app's repository

Description of the change

This branch merges the terminal app's plugin into the app's repository, enabling shipping the plugin into the same .click package. Separate .deb packages for the app and the plugin are still generated.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:67
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dpm/ubuntu-terminal-app/merge-plugin/+merge/217380/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/49/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2254
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/49
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/49
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/37

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/49/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~dpm/ubuntu-terminal-app/merge-plugin updated
68. By David Planella

Added rule to copy the plugin to the build directory

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:68
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/50/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2256
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/50
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/50
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/38

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/50/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Tried building this in qtcreator, it built a click package, but that fails the click-reviewers-tools..

ERROR: Could not find 'com.ubuntu.terminal.desktop.in'

lp://staging/~dpm/ubuntu-terminal-app/merge-plugin updated
69. By David Planella

Fixed wrong desktop file in the manifest

Revision history for this message
David Planella (dpm) wrote :

Sorry, that was a typo in the manifest file. Fixed now.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:69
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/51/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2260
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/51
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/51
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/39

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/51/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Trying to test this but qtc is conspiring against me: bug 1314960

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

In order to get this to run, you need the python3-lxml lib added to /home/phablet/autopilot -- and you need the armhf version as it's a compiled module ;-) I would recommend adding this info to the readme.

I was able to successfully build and run this on my device.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

I would also change the dependency to python3-lxml from python-lxml.

lp://staging/~dpm/ubuntu-terminal-app/merge-plugin updated
70. By David Planella

Updated python-lxml dependency to Python 3, added note about manual set up for running tests on device

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:70
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/52/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2428/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/52
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/52
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/40

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/52/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

could not import package ubuntu_terminal_app: No module named 'ubuntu_terminal_app'
Loading tests from:

Did not find any tests

We had this same issue with shorts; py3 meant jenkins couldn't find the tests. If you change back to python-lxml I assume it will work.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

On 6 May 2014 18:09, Nicholas Skaggs <email address hidden> wrote:
> could not import package ubuntu_terminal_app: No module named 'ubuntu_terminal_app'
> Loading tests from:
>
> Did not find any tests
>
> We had this same issue with shorts; py3 meant jenkins couldn't find the tests. If you change back to python-lxml I assume it will work.

Both Python2 & Python3 comes with an xml module in the standard
library is that not sufficient?

--
Regards,

Dimitri.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

See https://code.launchpad.net/~xnox/ubuntu-terminal-app/drop-lxml-dep/+merge/218482

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Dimitri, yes in this case I think we simply drop the lxml dependency.

In regards to what I was saying about jenkins missing tests, I finally figured out why jenkins wasn't finding the tests. It requires the core app to depend on python3, and for the cmakelists file for autopilot tests to copy the module to the python3 path, instead of python2 :-)

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

See https://code.launchpad.net/~nskaggs/ubuntu-terminal-app/working-py3-jenkins/+merge/218488 for the fix

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

On 6 May 2014 19:39, Nicholas Skaggs <email address hidden> wrote:
> See https://code.launchpad.net/~nskaggs/ubuntu-terminal-app/working-py3-jenkins/+merge/218488 for the fix
> --
> https://code.launchpad.net/~dpm/ubuntu-terminal-app/merge-plugin/+merge/217380
> Your team Ubuntu Terminal Developers is subscribed to branch lp:ubuntu-terminal-app.

Or see... https://code.launchpad.net/~xnox/ubuntu-terminal-app/merge-plugin+lxml+py3
which is mid-air colition, slightly older than your branch.

--
Regards,

Dimitri.

Revision history for this message
David Planella (dpm) wrote :

As far as I can tell, the standard module is not a drop-in replacement for lxml, so just replacing the import won't work.

In any case, as discussed on IRC, I'll split this MP to separate the change that introduced the lxml dependency.

lp://staging/~dpm/ubuntu-terminal-app/merge-plugin updated
71. By David Planella

Reverted the feature of autodetecting Qt Creator's build dir. Will submit it in a separate MP

72. By David Planella

Updated README too

73. By David Planella

Merged nskagg's Jenkins Python 3 fixes

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:73
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/55/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2455/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/55/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/55/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/43/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/55/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~dpm/ubuntu-terminal-app/merge-plugin updated
74. By David Planella

Merge Python 3 print() fix from balloons

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:74
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/56/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2461/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/56
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/56
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/44

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/56/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Specify python3-autopilot so jenkins runs with it.

=== modified file 'debian/control'
--- debian/control 2014-05-06 19:04:04 +0000
+++ debian/control 2014-05-06 21:41:01 +0000
@@ -45,6 +45,7 @@
 Depends: ${misc:Depends},
          libautopilot-qt,
          libqt5test5,
+ python3-autopilot,
          ubuntu-terminal-app (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
 Description: Autopilot tests for Terminal Application

lp://staging/~dpm/ubuntu-terminal-app/merge-plugin updated
75. By David Planella

Add Python 3 dependency to make Jenkins happy

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

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