Merge branch 'release/1.2.0'

Author: synapticvoid

.gitignore

@@ -5,6 +5,8 @@
 *.retry
 
 *.pyc
+.vagrant/
+/cache/
 
 # compiled output
 /dist

CHANGELOG

@@ -1,3 +1,13 @@
+v1.2.0 - 2017-03-29
+- Add QtSvg module
+- Add QtSerialPort module
+- Add local cache for raspbian / toolchain / Qt modules
+- Add Vagrant to virtualize qtrpi (provisionned with Ansible)
+- Add test qtrpi minimal script
+- Add download ci artefacts scripts
+- Update raspbian compatibility to the version 2017-03-02
+- Update README
+
 v1.1.0 - 2016-11-09
 - Add support for RPi 1 & RPi 3
 - Add support of Qt 5.6.2

README.md

@@ -1,7 +1,74 @@
-# qtrpi
+# QtRpi
 
 ## Purpose
-Offer an easy-to-use environment to cross-compile Qt application on a Raspberry Pi. This repo contains all the scripts necessary to prepare a sysroot, cross-compile Qt and deploy Qt libraries to your Raspberry.
+Offer an easy-to-use environment to cross-compile Qt application on a Raspberry Pi. This repo contains all the scripts needed to prepare a sysroot, cross-compile Qt and deploy Qt libraries to your Raspberry.
 
 For more information, go to http://www.qtrpi.com/faq.
 
+## How to contact us?
+You can fill a contact form from our [official website](https://www.neuronalmotion.com/contact/) or send us an email at *contact [at] neuronalmotion [dot] com*.
+
+## Difference between init-qtrpi-minimal and init-qtrpi-full
+* **init-qtrpi-minimal**, the typical way: downloads ready-to-use Qt binaries for the Raspberry Pi and a minimal sysroot that we released on the [official website](http://www.qtrpi.com/download)
+* **init-qtrpi-full**, the custom way: compiles on your computer the Qt binaries for the Raspberry Pi to let you tweak the configuration, enhance the compilation by adding some missing Qt moduless to QtRpi or add some specific third-party dependencies
+
+### Summary
+|                     | init-qtrpi-minimal            | init-qtrpi-full                      |
+| ------------------- | ----------------------------- | ------------------------------------ |
+| Raspbian image      |                               | *from [raspberrypi.org](https://www.raspberrypi.org/downloads/raspbian/)*               |
+| Toochain            | *from [the github project](https://github.com/raspberrypi/tools)* | *from [the github project](https://github.com/raspberrypi/tools)*   |
+| Sysroot             | *from [qtrpi.com](http://www.qtrpi.com/download)*              | generated from raspbian image        |
+| Qt binaries         | *from [qtrpi.com](http://www.qtrpi.com/download)*              | compiled                             |
+
+## Tutorial of init-qtrpi-minimal.sh
+
+This tutorial will help you to:
+* Configure your host computer to be able to cross-compile Qt 5.7.0 applications for your Raspberry Pi 3
+* Deploy the pre-compiled Qt binaries on your Raspberry Pi
+* Cross-compile your application for a Raspberry Pi with the CLI or Qt Creator
+
+### Requirements
+* A 64-bit Linux host computer
+* A Raspberry Pi 3
+
+In this example, you already have an SSH access to your Raspberry Pi 3 at `192.168.1.12` with the user `pi`. The script will use sudo several times to install the packages on the board. You should add your SSH key in your Raspberry Pi. For example with **`ssh-copy-id`**:
+```bash
+ssh-copy-id pi@192.168.1.12
+```
+
+### Installation 
+Open a terminal and follow the steps below:
+```bash
+git clone https://github.com/neuronalmotion/qtrpi.git
+cd qtrpi
+export QTRPI_QT_VERSION='5.7.0'
+export QTRPI_TARGET_DEVICE='linux-rpi3-g++'
+export QTRPI_TARGET_HOST='pi@192.168.1.12'
+./init-qtrpi-minimal.sh
+./deploy-qtrpi.sh --prepare-rpi
+```
+
+Note: You can also export the *environment variables* in your **.bashrc**.
+
+### Usage in CLI
+```
+cd myproject
+/opt/qtrpi/bin/qmake-qtrpi
+make
+```
+You can now copy and execute the generated binary file on your Raspberry Pi
+
+Note: You can also add **/opt/qtrpi/bin/** to your `PATH` in your .bashrc and call **qmake-qtrpi** without the full path.
+
+### Usage in Qt Creator
+*coming soon...*
+
+## Tutorial of init-qtrpi-full.sh
+
+### How to add a new Qt module in QtRpi?
+* In this case, you must use [init-qtrpi-full.sh](https://github.com/neuronalmotion/qtrpi/blob/develop/init-qtrpi-full.sh), because you will have to recompile it on your computers
+* All the modules are cloned from the official Qt website (http://code.qt.io/)
+* If you want to add a module, just add the repository name in the file [qt-modules.txt](https://github.com/neuronalmotion/qtrpi/blob/develop/qt-modules.txt)
+* You might have to add some packages in the sysroot, this can be done in [utils/prepare-sysroot-full.sh](https://github.com/neuronalmotion/qtrpi/blob/develop/utils/prepare-sysroot-full.sh)
+* Once you have modified these scripts, you should be able to re-execute [init-qtrpi-full.sh](https://github.com/neuronalmotion/qtrpi/blob/develop/init-qtrpi-full.sh) and see the magic happen.
+

Vagrantfile

@@ -0,0 +1,19 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+  #config.vm.box = "ubuntu/xenial64"
+  config.vm.box = "bento/ubuntu-16.04"
+  config.vm.define "#{ENV['QTRPI_VM_NAME']}"
+ 
+  config.vm.provider "virtualbox" do |v|
+    v.memory = 4096
+    v.cpus = 8
+  end
+
+  config.vm.provision :ansible do |ansible|
+    ansible.verbose = "v"
+    ansible.playbook = "ansible/vagrant.yml"
+  end
+
+end

ansible/vagrant.yml

@@ -0,0 +1,29 @@
+---
+- hosts: all
+  become: yes
+  become_method: sudo
+  gather_facts: no
+  pre_tasks:
+      - name: 'install python2'
+        raw: sudo apt-get -y install python-simplejson
+  tasks:
+      - name: update apt cache
+        apt: update_cache=yes
+
+      - name: install packages
+        apt: name={{ item }} state=present
+        with_items:
+            - g++
+            - git
+            - realpath
+            - unzip
+            - zip
+
+      - name: update QT_VERSION in .profile
+        lineinfile: dest=/home/vagrant/.profile line="export QTRPI_QT_VERSION='{{ lookup('env', 'QTRPI_QT_VERSION') }}'"
+
+      - name: update TARGET_DEVICE in .profile
+        lineinfile: dest=/home/vagrant/.profile line="export QTRPI_TARGET_DEVICE='{{ lookup('env', 'QTRPI_TARGET_DEVICE') }}'"
+
+      - name: update ssh working directory
+        lineinfile: dest=/home/vagrant/.profile line="cd /vagrant"

compile-all-versions.sh

@@ -40,15 +40,18 @@ if [[ $DISPLAY_HELP ]]; then
 fi
 
 if [[ $PREPARE_RPI ]]; then
-    ssh $TARGET_HOST 'sudo mkdir /usr/local/qt5pi ; sudo chown -R pi:pi /usr/local/qt5pi'
+    TARGET_USER=$(echo $TARGET_HOST | cut -d@ -f1)
+    ssh $TARGET_HOST "sudo mkdir /usr/local/qt5pi ; sudo chown -R ${TARGET_USER}:users /usr/local/qt5pi"
     ssh $TARGET_HOST 'sudo apt-get install -y apt-transport-https'
     ssh $TARGET_HOST 'sudo apt-get install -y libts-0.0-0 libinput5'
-    ssh $TARGET_HOST "sudo sh -c 'echo /usr/local/qt5pi/lib > /etc/ld.so.conf.d/qt5pi.conf'"
+    ssh $TARGET_HOST "sudo sh -c 'echo /usr/local/qt5pi/lib > /etc/ld.so.conf.d/99-qt5pi.conf'"
 
     # to fix which version of libEGL should be picked by Qt applications (/opt/vc rather than /usr/lib/....)
     ssh $TARGET_HOST "sudo sh -c 'rm /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0 /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0'"
     ssh $TARGET_HOST "sudo sh -c 'ln -sf /opt/vc/lib/libEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1.0.0'"
+    ssh $TARGET_HOST "sudo sh -c 'ln -sf /opt/vc/lib/libEGL.so /usr/lib/arm-linux-gnueabihf/libEGL.so.1'"
     ssh $TARGET_HOST "sudo sh -c 'ln -sf /opt/vc/lib/libGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2.0.0'"
+    ssh $TARGET_HOST "sudo sh -c 'ln -sf /opt/vc/lib/libGLESv2.so /usr/lib/arm-linux-gnueabihf/libGLESv2.so.2'"
 fi
 
 rsync -avz $OUTPUT_DIR $TARGET_HOST:/usr/local/

deploy-qtrpi.sh

@@ -1,8 +1,43 @@
 #!/bin/bash
 
+function usage() {
+    cat <<EOF
+Usage: $0 [options]
+
+-h| --help                      Display help text.
+-n| --no-questions              No interactive mode (default behavior by default: raspbian image cache is not re-downloaded).
+EOF
+}
+
+while [[ $# -gt 0 ]]; do
+    KEY="$1"
+    case $KEY in
+        -h|--help)
+            DISPLAY_HELP=true
+        ;;
+        -n|--no-questions)
+            NO_QUESTIONS=true
+        ;;
+        *)
+        ;;
+    esac
+    shift
+done
+
+if [[ $DISPLAY_HELP ]]; then
+    usage
+    exit 0
+fi
+
+RASPBIAN_ARG=''
+if [[ $NO_QUESTIONS ]]; then
+    RASPBIAN_ARG='--no-download'
+fi
+
 cd utils
 ./init-common.sh
-./init-full.sh
+./synchronize-toolchain.sh
+./download-raspbian.sh $RASPBIAN_ARG
 ./prepare-sysroot-full.sh
 ./prepare-sysroot-minimal.sh
 ./switch-sysroot.sh full

init-qtrpi-full.sh

@@ -1,25 +1,12 @@
 #!/bin/bash
 
-QTRPI_BASE_URL='http://www.qtrpi.com/downloads'
-
 source ${0%/*}/utils/common.sh
 
 # prepare environment
-$UTILS_DIR/utils/init-common.sh
+$UTILS_DIR/init-common.sh
+$UTILS_DIR/synchronize-toolchain.sh
 cd_root
 
-# download and unzip sysroot
-message 'Download sysroot-minimal'
-SYSROOT_ZIP=sysroot-minimal-latest.zip
-curl -o $SYSROOT_ZIP $QTRPI_BASE_URL/sysroot/qtrpi-sysroot-minimal-latest.zip 
-unzip $SYSROOT_ZIP
-$UTILS_DIR/utils/switch-sysroot.sh minimal
-
-# download qtrpi
-message 'Download qtrpi binaries'
-QTRPI_ZIP="qtrpi-${DEVICE_NAME}_qt-${QT_VERSION}.zip"
-curl -o $QTRPI_ZIP $QTRPI_BASE_URL/qtrpi/$DEVICE_NAME/$QTRPI_ZIP
-unzip $QTRPI_ZIP
+download_sysroot_minimal
+download_qtrpi_binaries
 
-# create symlink
-ln -sf $ROOT/raspi/qt5/bin/qmake $ROOT/bin/qmake-qtrpi

init-qtrpi-minimal.sh

@@ -0,0 +1,8 @@
+# Qt modules list
+qtbase
+qtdeclarative
+qt3d
+qtquickcontrols
+qtquickcontrols2
+qtserialport
+qtsvg