Merge lp:~dbarth/qtcreator-plugin-ubuntu/download_prebuilt_cordova_runtime into lp:qtcreator-plugin-ubuntu

[David Barth]

tool to download a pre-compiled cordova runtime

tool to download a pre-compiled cordova runtime

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/130/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/61

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/130/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

Would it be possible to use different name for the script?

For example instead of download_prebuilt_cordova_runtime the local_get_cordova_runtime. Whatever short name what tells that it is not a device script.

[David Barth (dbarth)]

Le 09/02/2014 14:15, Zoltan Balogh a écrit :
> Would it be possible to use different name for the script?
>
> For example instead of download_prebuilt_cordova_runtime the local_get_cordova_runtime. Whatever short name what tells that it is not a device script.
Updated as per your recommendation.

[Zoltan Balogh (bzoltan)]

It is safe to land

review: Approve

[lp:~dbarth/qtcreator-plugin-ubuntu/download_prebuilt_cordova_runtime]

82. By David Barth on 2014-02-10

renamed script to local_get_cordova_runtime

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:82
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/74

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/143/rebuild

review: Approve (continuous-integration)

[lp:~dbarth/qtcreator-plugin-ubuntu/download_prebuilt_cordova_runtime]

83. By David Barth on 2014-02-12

adjust the script to point to the new runtime location in the deb packages

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:83
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/144/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/75

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/144/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

- I'd make sure that you fail gracefully when phony ARCH2 & ARCH3 are provided
NOTE: - just for the sake of it, quite a bit of the package/apt output manipulation can be factored out but that's fine,
NOTE: - CordovaUbuntu.?.? -> it should be fine, but is pretty restrictive in the kind of scheme that can be pulled and there is not clear error message when something else is found,
- L86: why dont you just wipe out ${CORDOVA_CACHE}/lib/${ARCH3 all together?

[David Barth (dbarth)]

ok, so put on hold for now.

[lp:~dbarth/qtcreator-plugin-ubuntu/download_prebuilt_cordova_runtime]

84. By David Barth on 2014-02-12

argument checking

[David Barth (dbarth)]

> - I'd make sure that you fail gracefully when phony ARCH2 & ARCH3 are provided

updated with some argument checking.

> NOTE: - just for the sake of it, quite a bit of the package/apt output
> manipulation can be factored out but that's fine,
> NOTE: - CordovaUbuntu.?.? -> it should be fine, but is pretty restrictive in
> the kind of scheme that can be pulled and there is not clear error message
> when something else is found,

this needs to be kept in sync with the runtime package indeed

> - L86: why dont you just wipe out ${CORDOVA_CACHE}/lib/${ARCH3 all together?

otherwise i would remove the very .so file i'm trying to preserve! :)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/145/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/76

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/145/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-19 16:36:14 +0000
+++ debian/changelog	2014-02-12 15:25:19 +0000
@@ -1,3 +1,9 @@
+qtcreator-plugin-ubuntu (2.8.1.1~campo~saucy) saucy; urgency=low
+
+  * Saucy test package
+
+ -- David Barth <[e-mail]>  Wed, 12 Feb 2014 11:28:43 +0100
+
 qtcreator-plugin-ubuntu (2.8.1.1-0ubuntu1) trusty; urgency=low
 
   [ Timo Jyrinki ]

=== modified file 'share/qtcreator/ubuntu/menu.json'
--- share/qtcreator/ubuntu/menu.json	2014-02-10 14:15:34 +0000
+++ share/qtcreator/ubuntu/menu.json	2014-02-12 15:25:19 +0000
@@ -289,6 +289,13 @@
                 ]
             },
             {
+                "name": "Download pre-built Cordova runtime",
+                "id": "Ubuntu.Menu.DownloadCordovaRuntime",
+                "actions": [
+                    "%SCRIPTDIRECTORY%/local_get_cordova_runtime"
+                ]
+            },
+            {
                 "name": "GPG",
                 "id": "Ubuntu.Menu.gpg",
                 "submenu": [

=== added file 'share/qtcreator/ubuntu/scripts/local_get_cordova_runtime'
--- share/qtcreator/ubuntu/scripts/local_get_cordova_runtime	1970-01-01 00:00:00 +0000
+++ share/qtcreator/ubuntu/scripts/local_get_cordova_runtime	2014-02-12 15:25:19 +0000
@@ -0,0 +1,89 @@
+#!/bin/bash
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 2.1.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Barth <[e-mail]>
+
+SCRIPTPATH=`dirname $0`
+PROJECTPATH=$1
+
+if [[ -z ${PROJECTPATH} ]]; then
+  PROJECTPATH=`pwd`
+fi
+
+CORDOVA_PACKAGE="cordova-ubuntu-3.4-dev"
+PAYLOAD_DIR="/usr/share/cordova-ubuntu-3.4/"
+CORDOVA_CACHE=${HOME}/.cache/cordova
+
+download_arch () {
+    ARCH2=$1
+    ARCH3=$2
+
+    [ -z "$ARCH2" -o -z "$ARCH3" ] && exit "download_arch"
+
+    ARCH=`apt-config dump | grep "APT::Architecture " | cut -d\" -f2`
+    URI=`apt-get download --print-uris ${CORDOVA_PACKAGE} | grep ^\' | cut -d\' -f2`
+    PACKAGE_FILENAME=`apt-get download --print-uris ${CORDOVA_PACKAGE} | grep ^\' | cut -d\  -f2 | sed "s/_${ARCH}.deb$/_${ARCH2}.deb/"`
+
+    mkdir -p ${CORDOVA_CACHE}/lib/${ARCH3}
+
+    (
+        cd /tmp
+        wget `echo $URI | sed "s/_${ARCH}.deb$/_${ARCH2}.deb/"`
+
+        dpkg-deb -x ${PACKAGE_FILENAME} ${CORDOVA_CACHE}/lib/${ARCH3}
+
+        rm -f ${PACKAGE_FILENAME}
+    )
+}
+
+install_arch () {
+    ARCH3=$1
+
+    [ -z "$ARCH3" ] && exit "install_arch"
+
+    mv ${CORDOVA_CACHE}/lib/${ARCH3}/${PAYLOAD_DIR}/* ${CORDOVA_CACHE}/lib/${ARCH3}
+
+    for f in `find ${CORDOVA_CACHE}/lib/${ARCH3} | grep .so$`
+    do
+        mv ${f} ${CORDOVA_CACHE}/lib/${ARCH3}
+    done
+
+    cp -Rf ${CORDOVA_CACHE}/lib/${ARCH3}/CordovaUbuntu.?.? ${CORDOVA_CACHE}
+    cp -Rf ${CORDOVA_CACHE}/lib/${ARCH3}/www/* ${CORDOVA_CACHE}/CordovaUbuntu.?.?
+    cp -Rf ${CORDOVA_CACHE}/lib/${ARCH3}/qml/* ${CORDOVA_CACHE}/CordovaUbuntu.?.?
+
+    rm -rf ${CORDOVA_CACHE}/lib/${ARCH3}/${PAYLOAD_DIR}
+    rm -rf ${CORDOVA_CACHE}/lib/${ARCH3}/usr
+    rm -rf ${CORDOVA_CACHE}/lib/${ARCH3}/www
+    rm -rf ${CORDOVA_CACHE}/lib/${ARCH3}/qml
+    rm -rf ${CORDOVA_CACHE}/lib/${ARCH3}/CordovaUbuntu.?.?
+}
+
+
+echo
+echo "Trying to download a pre-built Cordova runtime to accelerate project creation..."
+echo
+
+rm -rf ${CORDOVA_CACHE}
+
+download_arch "i386" "i386-linux-gnu"
+download_arch "amd64" "x86_64-linux-gnu"
+download_arch "armhf" "arm-linux-gnueabihf"
+
+install_arch "i386-linux-gnu"
+install_arch "x86_64-linux-gnu"
+install_arch "arm-linux-gnueabihf"
+
+find ${CORDOVA_CACHE}