ubuntu-touch-coreapps-reviewers team mailing list archive

[Alan Pope  <alan@xxxxxxxxxx>]

Alan Pope  has proposed merging lp:~popey/ubuntu-terminal-app/add-snapcraft-config into lp:ubuntu-terminal-app.

Requested reviews:
  Ubuntu Terminal Developers (ubuntu-terminal-dev)

For more details, see:
https://code.launchpad.net/~popey/ubuntu-terminal-app/add-snapcraft-config/+merge/305206

Adds snapcraft.yaml to do builds of ubuntu-terminal-app.
Also fixes broken xenial build - thanks to Dan Chapman
-- 
Your team Ubuntu Terminal Developers is requested to review the proposed merge of lp:~popey/ubuntu-terminal-app/add-snapcraft-config into lp:ubuntu-terminal-app.

=== added file 'snapcraft.yaml'
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ snapcraft.yaml	2016-09-08 11:44:05 +0000
@@ -0,0 +1,40 @@
+name: ubuntu-terminal-app
+version: 0.7.207
+summary: Ubuntu Terminal app
+description: The terminal app for all Ubuntu devices.
+
+confinement: strict
+
+apps:
+  ubuntu-terminal-app:
+    # If CLICK_MODE=off
+    #command: desktop-launch $SNAP/usr/lib/*/qt5/bin/qmlscene $SNAP/usr/share/terminal/qml/ubuntu-terminal-app.qml
+    # If CLICK_MODE=on
+    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-08 11:44:05 +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}