Merge lp:~mzanetti/reminders-app/run_on_device into lp:reminders-app

[Michael Zanetti]

add run_on_ubuntu_touch.sh script

This adds a script "run_on_ubuntu_touch.sh" which can be used to directly compile and run the app on the phone.

** You need to have the device in rw mode **

Once (rather every time you reflash) you need to setup the build environment on the phone with:

./run_on_ubuntu_touch.sh -s

After this you can just run the app with

./run_on_ubuntu_touch.sh

To create a click package for uploading to the store, use:

./run_on_ubuntu_touch.sh -c

The click package will be built on the phone and downloaded to the PC.

Additionally this branch fixes the .desktop file to be working with click packaging.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:17
http://91.189.93.70:8080/job/reminders-app-ci/10/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/213
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-raring-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/10

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/10/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:18
http://91.189.93.70:8080/job/reminders-app-ci/11/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/214
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-raring-amd64-ci/11
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/11
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/11

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/11/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me, thanks!

Just two small nitpicks:

1) Could you add the license header to the .sh file?

2) 23 +Comment=Ubuntu Evernote client

Evernote have asked us not to call the app an Evernote client until they've reviewed the first stable version. Would you mind changing the comment to something along these lines?

"Ubuntu Reminders app, powered by Evernote"

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> Looks good to me, thanks!
>
> Just two small nitpicks:
>
> 1) Could you add the license header to the .sh file?

Actually we are lacking license headers everywhere... I'll do a separete MR adding those.

>
> 2) 23 +Comment=Ubuntu Evernote client
>
> Evernote have asked us not to call the app an Evernote client until they've
> reviewed the first stable version. Would you mind changing the comment to
> something along these lines?
>
> "Ubuntu Reminders app, powered by Evernote"

fixed.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:19
http://91.189.93.70:8080/job/reminders-app-ci/15/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/237/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-raring-amd64-ci/15
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/15
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/15

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:19
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/~mzanetti/reminders-app/run_on_device/+merge/196506/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/16/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/238/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-raring-amd64-ci/16
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/16
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/16

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

So testing the app both on the desktop and on the device, I get the same result:

- Authentication works
- No notes are displayed

This seems to do with the change introduced in:

169 === modified file 'src/app/qml/ui/NotesPage.qml

Reverting that change gets the notes displayed again.

review: Needs Fixing

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:20
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/~mzanetti/reminders-app/run_on_device/+merge/196506/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/17/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/239/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-raring-amd64-ci/17
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/17
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/17

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/17/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

> So testing the app both on the desktop and on the device, I get the same
> result:
>
> - Authentication works
> - No notes are displayed
>
> This seems to do with the change introduced in:
>
> 169 === modified file 'src/app/qml/ui/NotesPage.qml
>
> Reverting that change gets the notes displayed again.

fixed

[David Planella (dpm)]

Tested the script now, seems to work well: http://ubuntuone.com/4VH3j9ezw4qamOOG9hLugJ

I've noticed a couple of issues while running the app on the phone. They are unrelated to this MP, so I'll just list them as a heads up and point to the separate bugs filed for them:

- On the initial page, when being shown the account to use, it is empty (bug 1254697)
- The notes' background color seems to be transparent (bug 1254700)
- I get frequent disconnects from the Evernote service, meaning that notes can no longer be fetched. It seems another branch improves on this, so I'll wait until further testing before filing a bug

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:19
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/~mzanetti/reminders-app/run_on_device/+merge/196506/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/19/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/257
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-raring-amd64-ci/19
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/19
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/19

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/19/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'apparmor/reminders-app.json'
--- apparmor/reminders-app.json	2013-11-20 21:49:45 +0000
+++ apparmor/reminders-app.json	2013-11-25 11:14:06 +0000
@@ -1,6 +1,6 @@
 {
     "policy_groups": [
-        "networking"
+        "networking", "accounts"
     ],
     "policy_version": 1
 }

=== modified file 'reminders-app.desktop'
--- reminders-app.desktop	2013-11-20 22:21:37 +0000
+++ reminders-app.desktop	2013-11-25 11:14:06 +0000
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=reminders-app
-Comment=My project description
-Exec=/usr/bin/qmlscene $@ /usr/share/reminders-app/reminders-app.qml
-Icon=/usr/share/ubuntu-clock-app/reminders-app.png
+Name=Reminders
+Comment=Ubuntu Reminders app, powered by Evernote
+Exec=/usr/bin/qmlscene $@ -I . qml/reminders-app.qml
+Icon=reminders-app.png
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true

=== removed file 'reminders-app.json'
--- reminders-app.json	2013-10-23 11:02:37 +0000
+++ reminders-app.json	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-{
-    "policy_groups": [
-        "networking"
-    ],
-    "policy_version": 1
-}

=== added file 'run_on_ubuntu_touch.sh'
--- run_on_ubuntu_touch.sh	1970-01-01 00:00:00 +0000
+++ run_on_ubuntu_touch.sh	2013-11-25 11:14:06 +0000
@@ -0,0 +1,123 @@
+#!/bin/sh
+CODE_DIR=reminders-app
+BUILD_DIR=builddir
+USER=phablet
+USER_ID=32011
+PASSWORD=phablet
+PACKAGE=reminders-app
+BINARY=reminders-app
+TARGET_IP=${TARGET_IP-127.0.0.1}
+TARGET_SSH_PORT=${TARGET_SSH_PORT-2222}
+TARGET_DEBUG_PORT=3768
+RUN_OPTIONS=-qmljsdebugger=port:$TARGET_DEBUG_PORT
+SETUP=false
+GDB=false
+CLICK=false
+SUDO="echo $PASSWORD | sudo -S"
+NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'
+FLIPPED=false
+DEPS="qt5-default qtbase5-dev qtdeclarative5-dev libboost-dev libssl-dev"
+
+exec_with_ssh() {
+    ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -t $USER@$TARGET_IP -p $TARGET_SSH_PORT sudo -u $USER -i bash -ic \"$@\"
+}
+
+exec_with_adb() {
+    adb shell $@
+}
+
+adb_root() {
+    adb root
+    adb wait-for-device
+}
+
+install_ssh_key() {
+    ssh-keygen -R $TARGET_IP
+    HOME_DIR="/home/phablet"
+    adb push ~/.ssh/id_rsa.pub $HOME_DIR/.ssh/authorized_keys
+    adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh
+    adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh/authorized_keys
+    adb shell chmod 700 $HOME_DIR/.ssh
+    adb shell chmod 600 $HOME_DIR/.ssh/authorized_keys
+}
+
+setup_adb_forwarding() {
+    adb shell start ssh
+    adb forward tcp:$TARGET_SSH_PORT tcp:22
+    adb forward tcp:$TARGET_DEBUG_PORT tcp:$TARGET_DEBUG_PORT
+}
+
+install_dependencies() {
+    exec_with_adb apt-get --yes install build-essential $DEPS
+}
+
+sync_code() {
+    WORK_DIR=`pwd`
+    [ -e .bzr ] && bzr export --uncommitted --format=dir /tmp/$CODE_DIR
+    [ -e .git ] && cd /tmp && cp -r $WORK_DIR $CODE_DIR && cd $CODE_DIR && git clean -f -x && rm .git -rf && cd -
+    rsync -crlOzv --delete --exclude builddir -e "ssh -p $TARGET_SSH_PORT -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" /tmp/$CODE_DIR/ $USER@$TARGET_IP:$CODE_DIR/
+    rm -rf /tmp/$CODE_DIR
+}
+
+build() {
+    exec_with_ssh mkdir -p $CODE_DIR/$BUILD_DIR
+    exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH qmake --version"
+    exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH QT_SELECT=qt5 qmake .."
+    exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH make -j2"
+}
+
+build_click_package() {
+    exec_with_ssh mkdir -p $CODE_DIR/$BUILD_DIR/install
+    exec_with_ssh rm -rf $CODE_DIR/$BUILD_DIR/install/*
+    exec_with_ssh cp -r $CODE_DIR/src/app/qml $CODE_DIR/$BUILD_DIR/install
+    exec_with_ssh cp $CODE_DIR/*.json $CODE_DIR/$BUILD_DIR/install
+    exec_with_ssh cp $CODE_DIR/apparmor/*.json $CODE_DIR/$BUILD_DIR/install
+    exec_with_ssh cp $CODE_DIR/$PACKAGE.desktop $CODE_DIR/$BUILD_DIR/install
+    exec_with_ssh cp $CODE_DIR/$PACKAGE.png $CODE_DIR/$BUILD_DIR/install
+    exec_with_ssh cp -r $CODE_DIR/$BUILD_DIR/src/plugin/Evernote $CODE_DIR/$BUILD_DIR/install/
+    exec_with_ssh click build $CODE_DIR/$BUILD_DIR/install
+    scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -P $TARGET_SSH_PORT $USER@$TARGET_IP:/home/phablet/com.ubuntu*$PACKAGE*.click .
+}
+
+run() {
+    exec_with_ssh "cd $CODE_DIR/$BUILD_DIR/src/app/ && ./$BINARY --desktop_file_hint=$CODE_DIR/reminders-app.desktop"
+}
+
+set -- `getopt -n$0 -u -a --longoptions="setup,gdb,click,help" "sgch" "$@"`
+
+# FIXME: giving incorrect arguments does not call usage and exit
+while [ $# -gt 0 ]
+do
+    case "$1" in
+       -s|--setup)   SETUP=true;;
+       -g|--gdb)     GDB=true;;
+       -c|--click)   CLICK=true;;
+       -h|--help)    usage;;
+       --)           shift;break;;
+    esac
+    shift
+done
+
+
+adb_root
+[ "${TARGET_IP}" = "127.0.0.1" ] && setup_adb_forwarding
+
+echo "Transferring code.."
+sync_code
+
+if $SETUP; then
+    echo "Setting up environment for building $PACKAGE..."
+    install_ssh_key
+    install_dependencies
+    sync_code
+else
+    echo "Building.."
+    build
+    if $CLICK; then
+        echo "Building click package..."
+        build_click_package
+    else
+        echo "Running.."
+        run
+    fi
+fi