Merge lp:~gcollura/phablet-tools/click-buddy-python into lp:phablet-tools

[Giulio Collura]

Rewrite click-buddy in python 3. Add more options.

Rewrite click-buddy in python 3.
Add more options, such as --extra-params, which allows to add custom cmake parameters during compilation time.

Thanks for your time,
Giulio

Unmerged revisions

331. By Giulio Collura on 2014-10-26

Rewrite click-buddy in python, add option to manage more cmake flags

=== modified file 'click-buddy'
--- click-buddy	2014-09-09 14:46:55 +0000
+++ click-buddy	2014-10-26 22:09:23 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/python3
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the the GNU General Public License version 3, as
 # published by the Free Software Foundation.
@@ -12,193 +12,145 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# Copyright (C) 2014 Canonical, Ltd.
+# Copyright (C) 2014 Giulio Collura <[e-mail]>
 #
-# Author: Sergio Schvezov <[e-mail]>
-
-export LC_ALL=C
-
-usage() {
-cat <<EOF
-usage: $0 [OPTIONS]
-
-Creates and runs click apps
-
-OPTIONS:
-  -h	Show this message
-  -s    Specify the serial of the device to install (see adb $ADBOPTS devices)
-
-  --bzr-source 	bzr sources used to backreference the package
-  --dir      	directory holding the package to build
-  --provision   Install resulting click and run tests
-  --no-clean    Don't clean temporary directories
-  --extra-deps  Packages required in the chroot which are not part of the SDK
-  --arch        Target architecture, requires a created click chroot
-                (defaults to arch all)
-  --framework   Target click framework, requires a created click chroot
-                (defaults to ubuntu-sdk-13.10)
-EOF
-}
-
-ADBOPTS=""
-PROVISION=""
-SOURCE=""
-BZR_SOURCE=""
-NO_CLEAN=""
-EXTRA_DEPS=""
-ARCH="all"
-FRAMEWORK="ubuntu-sdk-13.10"
-MAINTMODE=""
-
-TEST_DIR='tests/autopilot'
-DEVICE_USER='phablet'
-
-ARGS=$(getopt -o s:h -l "maint-mode,extra-deps:,bzr-source:,provision,no-clean,framework:,dir:,arch:,help" -n "$0" -- "$@")
-
-if [ $? -ne 0 ] ; then
-    exit 1
-fi
-eval set -- "$ARGS"
-
-while true; do
-    case "$1" in
-        -h|--help)
-            usage
-            exit 0
-            ;;
-        -s)
-            shift
-            ADBOPTS="-s $1"
-            shift
-            ;;
-        --provision)
-            shift
-            PROVISION=1
-            ;;
-        --bzr-source)
-            shift
-            BZR_SOURCE="$1"
-            shift
-            ;;
-        --dir)
-            shift
-            SOURCE="$(readlink -f $1)"
-            shift
-            ;;
-        --no-clean)
-            shift
-            NO_CLEAN=1
-            ;;
-		--arch)
-			shift
-			ARCH="$1"
-			shift
-			;;
-		--framework)
-			shift
-			FRAMEWORK="$1"
-			shift
-			;;
-		--extra-deps)
-			shift
-			EXTRA_DEPS="$1"
-			shift
-			;;
-		--maint-mode)
-			shift
-			MAINTMODE=1
-			;;
-        --)
-            shift
-            break
-            ;;
-    esac
-done
-
-builddir=$(mktemp -d)
-installdir=$(mktemp -d)
-if [ -z "$NO_CLEAN" ]; then
-    trap 'rm -rf "$builddir" "$installdir"' EXIT
-fi
-
-if [ -z "$SOURCE" ]; then
-	SOURCE="$(readlink -f $(pwd))"
-fi
-
-if [ ! -f $SOURCE/CMakeLists.txt ]; then
-    echo "$SOURCE not a valid source dir"
-    usage
-    exit 1
-fi
-
-workdir=$(pwd)
-cd $builddir
-
-CMAKE_PARAMS="-DINSTALL_TESTS=off -DCLICK_MODE=on \
-	-DBZR_REVNO=$(cd $SOURCE; bzr revno)"
-
-if [ -n "$BZR_SOURCE" ]; then
-	CMAKE_PARAMS="$CMAKE_PARAMS -DBZR_SOURCE=$BZR_SOURCE"
-fi
-
-set -e
-if [ "$ARCH" = "all" ]; then
-	cmake "$SOURCE" $CMAKE_PARAMS
-	make DESTDIR=$installdir install
-else
-	if [ -n "$EXTRA_DEPS" ] && [ -z "$MAINTMODE" ]; then
-		echo "click chroot still doesn\'t support sessions and deps outside the"
-		echo "default sdk were requested, you can optionally use click maint"
-		echo "to install $EXTRA_DEPS by running"
-		echo "    click chroot -a$ARCH -f$FRAMEWORK maint apt-get update"
-		echo "    click chroot -a$ARCH -f$FRAMEWORK maint apt-get install $EXTRA_DEPS"
-		echo
-		echo "Your chroot will be unclean from then on, so if you want to"
-		echo "guarantee clean builds the chroot would need to be recreated."
-		echo
-		echo "Use the undocumented --maint-mode if you want this automated."
-		exit 1
-	fi
-	cd "$SOURCE"
-	if [ -n "$MAINTMODE" ]; then
-		trap 'click chroot -a$ARCH -f$FRAMEWORK maint apt-get autoremove --yes $EXTRA_DEPS' \
-		   	EXIT HUP INT TERM
-		click chroot -a$ARCH -f$FRAMEWORK maint apt-get update
-		click chroot -a$ARCH -f$FRAMEWORK maint apt-get install --yes $EXTRA_DEPS
-	fi
-	click chroot -a$ARCH -f$FRAMEWORK run cmake $CMAKE_PARAMS
-	click chroot -a$ARCH -f$FRAMEWORK run make
-    click chroot -a$ARCH -f$FRAMEWORK run make DESTDIR=$installdir install
-fi
-
-if [ ! -f "$installdir/manifest.json" ]; then
-	echo Building failed, check environment
-	exit 1
-fi
-
-click build $installdir
-if [ "$workdir" != "$(pwd)" ]; then
-	cp *.click $workdir
-fi
-
-if [ -n "$PROVISION" ]; then
-    set -e
-    for click in *.click; do
-        adb $ADBOPTS push "$click" /tmp
-        adb $ADBOPTS shell sudo -u $DEVICE_USER bash -ic "pkcon install-local --allow-untrusted /tmp/$click"
-    done
-
-    adb $ADBOPTS shell mkdir -p /home/$DEVICE_USER/autopilot
-    adb $ADBOPTS push $SOURCE/tests/autopilot /home/$DEVICE_USER/autopilot
-    adb $ADBOPTS shell chown -R "$DEVICE_USER":"$DEVICE_USER" /home/$DEVICE_USER/autopilot
-    set +e
-
-    echo Allowing autopilot to play well with apparmor
-    phablet-config autopilot --dbus-probe enable
-    echo "Ready to run autopilot"
-fi
-
-if [ -n "$NO_CLEAN" ]; then
-    echo build dir was $builddir
-    echo install dir was $installdir
-fi
+# Author: Giulio Collura <[e-mail]>
+
+import argparse
+import tempfile
+import sys
+import os
+import shutil
+import subprocess
+
+from phabletutils.device import AndroidBridge
+from phabletutils import fileutils
+
+from click.chroot import ClickChroot
+from gi.repository import Click
+from click.build import ClickBuildError, ClickBuilder
+
+
+def error(*msgs):
+    print("ERROR:", *msgs, file=sys.stderr)
+
+
+def execute(command):
+    proc = subprocess.Popen(command, stderr=subprocess.STDOUT, shell=True)
+    return proc.communicate()
+
+
+def parse_arguments():
+    parser = argparse.ArgumentParser(description="Creates and runs click apps")
+
+    parser.add_argument("-s", "--serial",
+            help="Specify the serial of the device to install (see adb devices)")
+    parser.add_argument("-d", "--dir",
+            help="Directory holding the package to build, it must have a CMakeLists.txt")
+    parser.add_argument("--bzr-source",
+            help="bzr sources used to backreference the package")
+    parser.add_argument("-p", "--provision", help="Install resulting click and run tests",
+            action="store_true")
+    parser.add_argument("-f", "--framework", default="ubuntu-sdk-14.04",
+            help="Target click framework, requires a created click chroot")
+    parser.add_argument("--extra-params", default="",
+            help="Set extra cmake parameters")
+    parser.add_argument("-a", "--arch", default="all",
+            help="Target architecture, requires a created click chroot")
+    parser.add_argument("--extra-deps",
+            help="Packages required in the chroot which are not part of the SDK")
+    parser.add_argument("--maint-mode",
+            help="Automatically remove installed packages from the chroot environment",
+            action="store_true")
+    return parser.parse_args()
+
+
+def main(args):
+    build_dir_td = tempfile.TemporaryDirectory(prefix='click-buddy-build-')
+    install_dir_td = tempfile.TemporaryDirectory(prefix='click-buddy-install-')
+
+    build_dir = build_dir_td.name
+    install_dir = install_dir_td.name
+    working_dir = os.getcwd()
+
+    if args.dir:
+        source_dir = os.path.realpath(args.dir)
+    else:
+        source_dir = os.getcwd()
+
+    if not os.path.isfile(os.path.join(source_dir, "CMakeLists.txt")):
+        error("{0} not a valid source dir".format(source_dir))
+        return -1
+
+    cmake_params = "-DINSTALL_TESTS=off -DCLICK_MODE=on " + args.extra_params
+
+    os.chdir(source_dir)
+    bzr_revno, err = execute("bzr revno")
+
+    if bzr_revno:
+        print(bzr_revno)
+        cmake_params += " -DBZR_REVNO={0} ".format(bzr_revno)
+
+    if args.bzr_source:
+        cmake_params += " -DBZR_SOURCE={0} ".format(args.bzr_source)
+
+    os.chdir(build_dir)
+
+    if args.arch == 'all':
+        execute("cmake {source} {params}".format(source=source_dir, params=cmake_params))
+        execute("make DESTDIR={destdir} install".format(destdir=install_dir))
+    else:
+        chroot = ClickChroot(args.arch, args.framework, "click")
+        if not chroot.exists():
+            error("create a chroot: click chroot create")
+            return -1
+        if args.extra_deps:
+            chroot.maint(*["apt-get", "update"])
+            chroot.maint(*["apt-get", "install", "--yes"] + args.extra_deps.split(" "))
+        chroot.run(*["cmake", cmake_params, source_dir])
+        chroot.run(*["make"])
+        chroot.run(*["make", "DESTDIR={0}".format(install_dir), "install"])
+
+    manifest = os.path.join(install_dir, "manifest.json")
+    if not os.path.isfile(manifest):
+        error("Building failed, check environment")
+        return -1
+
+    # execute("click build {dir}".format(dir=install_dir.name))
+    builder = ClickBuilder()
+    builder.add_file(install_dir, ".")
+
+    try:
+        click_pkg = builder.build(working_dir, manifest_path=manifest)
+    except ClickBuildError as e:
+        error(e)
+        return -1
+
+    print("Click package:", click_pkg)
+    try:
+        print("Validating:", click_pkg)
+        subprocess.check_call(['click-review', click_pkg])
+    except subprocess.CalledProcessError as e:
+        error(e)
+        return -1
+
+    if args.provision:
+        if args.serial:
+            adb = AndroidBridge(args.serial)
+        else:
+            adb = AndroidBridge()
+        adb.push(click_pkg, "/tmp")
+        output = adb.shell("pkcon install-local --allow-untrusted /tmp/%s"
+                % os.path.basename(click_pkg))
+        print(output.decode('utf-8'))
+
+    #TODO: add autopilot support
+    # Cleanup chroot
+    if args.extra_deps and args.maint_mode:
+        chroot.maint(*["apt-get", "autoremove", "--yes"] + args.extra_deps.split(" "))
+
+
+if __name__ == '__main__':
+    args = parse_arguments()
+    sys.exit(main(args))
+