Merge lp:~popey/ubuntu-terminal-app/add-snapcraft-config into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Alan Pope 🍺🐧🐱 🦄]

Adds snapcraft.yaml to do builds of ubuntu-terminal-app.
Also fixes broken xenial build - thanks to Dan Chapman

Adds snapcraft.yaml to do builds of ubuntu-terminal-app.
Also fixes broken xenial build - thanks to Dan Chapman

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:208
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/~popey/ubuntu-terminal-app/add-snapcraft-config/+merge/305206/+edit-commit-message

https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/57/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/972/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/57/rebuild

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Nice work!

I've added some comments. Right now, if I understand it correctly, the terminal will only run on Unity 7, whereas we'd like to get it running on Unity 8.

I'm just adding it as a reminder, which shouldn't block this MP to get approved after reviewing the comments, but it's something to have a look at on the next iteration.

To get it running on Unity 8 will either require a wrapper [1] or the desktop-launcher to include these lines from the wrapper (plus a couple of extra dependencies, which IIRC did not add much to the size of the snap).

[1] https://github.com/ubuntu/snappy-playpen/blob/master/ubuntu-clock-app/clock.wrapper#L19

review: Needs Information

[David Planella (dpm)]

I've added another comment, but I also just noticed that this branch attempts to fix the same thing, but adding the CMake rule somewhere else:

https://code.launchpad.net/~larryprice/ubuntu-terminal-app/fix-cmake-xenial/+merge/297394

[Dan Chapman  (dpniel)]

Added a comment inline.

[David Planella (dpm)]

Replied inline again, thanks!

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Thanks for the comments - fixing!

[lp:~popey/ubuntu-terminal-app/add-snapcraft-config]

209. By Alan Pope 🍺🐧🐱 🦄 on 2016-09-15

Set click mode, tidy out comments, remove unnecessary delete from cmake, as per comments.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:209
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/58/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/974/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/terminal-app-ci/58/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me, thanks!

I think we can merge it as it is. CLICK_MODE=on is not necessary and installs extra files [1], but it seems the snap works, so we might as well leave it as it is for a first pass.

[1] http://bazaar.launchpad.net/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot/view/head:/CMakeLists.txt#L24

review: Approve

=== added file 'snapcraft.yaml'
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ snapcraft.yaml	2016-09-15 10:24:26 +0000
@@ -0,0 +1,37 @@
+name: ubuntu-terminal-app
+version: 0.7.207
+summary: Ubuntu Terminal app
+description: The terminal app for all Ubuntu devices.
+
+confinement: devmode
+
+apps:
+  ubuntu-terminal-app:
+    command: desktop-launch $SNAP/usr/lib/*/qt5/bin/qmlscene $SNAP/qml/ubuntu-terminal-app.qml
+    plugs: [unity7, opengl, network, network-bind, home]
+
+parts:
+  terminal:
+    plugin: cmake
+    configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=on]
+    source: .
+    build-packages:
+      - build-essential
+      - cmake
+      - gettext
+      - intltool
+      - python3
+      - qtbase5-dev
+      - qtdeclarative5-dev
+      - libqtermwidget5-0-dev
+      - libpam0g-dev
+    stage-packages:
+      - ubuntu-sdk-libs
+      - qtubuntu-desktop
+      - libqtermwidget5-0
+      - libqt5systeminfo5
+      - qml-module-qtsysteminfo
+    snap:
+      - -usr/share/doc
+      - -usr/include
+    after: [desktop-qt5]
 
=== modified file 'src/plugin/qmltermwidget/CMakeLists.txt'
--- src/plugin/qmltermwidget/CMakeLists.txt	2014-11-15 14:39:05 +0000
+++ src/plugin/qmltermwidget/CMakeLists.txt	2016-09-15 10:24:26 +0000
@@ -70,6 +70,7 @@
 
 # Copy the plugin, the qmldir file and other assets to the build dir for running in QtCreator
 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR})
     add_custom_target(qmltermwidget-qmldir ALL
         COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/src/qmldir ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
         DEPENDS ${QMLFILES}
@@ -80,7 +81,6 @@
         DEPENDS ${QMLFILES}
     )
     add_custom_command(TARGET qmltermwidget POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
         COMMENT "Creating plugin directory layout in the build dir"
         COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:qmltermwidget> ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
         COMMENT "Copying to output directory"