Merge lp:~zeller-benjamin/ubuntu-sdk-ide/maliit-plugin into lp:ubuntu-sdk-ide

[Benjamin Zeller]

Build maliit plugin for the touch SDK IDE

Build maliit plugin for the touch SDK IDE

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:116
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/21/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/941/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/21/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

Fantastic!!!

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:116
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/23/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1567/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/23/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-26 10:45:13 +0000
+++ CMakeLists.txt	2016-02-17 08:30:43 +0000
@@ -65,6 +65,19 @@
   INSTALL_COMMAND   sh -c "LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib make install"
 )
 
+SET (MALIITPLUGIN_PREFIX "${CMAKE_BINARY_DIR}/maliit-plugin-qt-build")
+ExternalProject_Add(maliit-plugin
+  DEPENDS     ${QT_VERSION}
+  PREFIX      "${MALIITPLUGIN_PREFIX}"
+  SOURCE_DIR  "${MALIITPLUGIN_PREFIX}/maliit-framework"
+  BINARY_DIR  "${MALIITPLUGIN_PREFIX}/maliit-framework"
+  INSTALL_DIR "${QT_INSTALL_DIR}"
+  DOWNLOAD_COMMAND  sh -c "cd ${MALIITPLUGIN_PREFIX} && ${CMAKE_SOURCE_DIR}/get_package_source.py maliit-framework"
+  CONFIGURE_COMMAND sh -c "LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib ${QT_INSTALL_DIR}/bin/qmake -r CONFIG+=\"qt5-inputcontext glib debug nodoc warn_off\"  M_IM_PREFIX=${QT_INSTALL_DIR} MALIIT_SERVER_ARGUMENTS=\"-software -bypass-wm-hint\" MALIIT_DEFAULT_PLUGIN=libmaliit-keyboard-plugin.so"
+  BUILD_COMMAND     sh -c "LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib make  ${GENERATED_MAKE_FLAGS}"
+  INSTALL_COMMAND   sh -c "cd ${MALIITPLUGIN_PREFIX}/maliit-framework/input-context && make install"
+)
+
 SET (FCITX_PREFIX "${CMAKE_BINARY_DIR}/fcitx-qt-build")
 ConcatStrings (FCITX_BUILD_SCRIPT
   "${CMAKE_COMMAND} "
@@ -112,7 +125,7 @@
 )
 
 ExternalProject_Add(qtcreator_3.5.0
-  DEPENDS appmenu-qt5
+  DEPENDS appmenu-qt5 fcitx-qt5 maliit-plugin
   PREFIX      "${QTCREATOR_PREFIX}"
   SOURCE_DIR  "${QTCREATOR_PREFIX}/qtcreator"
   BINARY_DIR  "${QTCREATOR_PREFIX}/build"
 
=== modified file 'debian/control'
--- debian/control	2016-01-27 15:30:05 +0000
+++ debian/control	2016-02-17 08:30:43 +0000
@@ -72,6 +72,12 @@
                extra-cmake-modules (>= 1.4.0),
                fcitx-libs-dev (>= 1:4.2.8),
                intltool,
+               cdbs,
+               libmtdev-dev,
+               libxcb-composite0-dev,
+               libxcb-damage0-dev,
+               libxext-dev,
+
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-sdk-ide
 # If you aren't a member of ~ubuntu-sdk-team but need to upload packaging changes,
 
=== added file 'get_package_source.py'
--- get_package_source.py	1970-01-01 00:00:00 +0000
+++ get_package_source.py	2016-02-17 08:30:43 +0000
@@ -0,0 +1,79 @@
+#!/usr/bin/python
+from optparse import OptionParser
+import re
+import urlparse
+from launchpadlib.launchpad import Launchpad
+from subprocess import call
+import sys
+import os
+import glob
+
+def create_webroot_url_from_self_link(self_link):
+    scheme, netloc, _, _, _ = urlparse.urlsplit(self_link)
+    netloc = netloc.lstrip("api.")
+    return u"%s://%s/" % (scheme, netloc)
+
+
+def get_dsc(archive, package, series):
+    re_version = re.compile(r"^\d+\:")
+    x = archive.getPublishedSources(exact_match=True, source_name=package,
+                                    distro_series=series)
+    webroot = create_webroot_url_from_self_link(archive.self_link)
+    version = x[0].source_package_version
+    version = re_version.sub("", version, 1)
+    if archive.owner.name == "ubuntu-archive":
+        yield "%subuntu/+archive/primary/+files/%s_%s.dsc" \
+            % (webroot, x[0].source_package_name, version)
+    else:
+        yield "%s/~ci-train-ppa-service/+archive/ubuntu/stable-phone-overlay/+files/%s_%s.dsc" \
+            % (webroot, x[0].source_package_name, version)
+
+
+def main():
+    parser = OptionParser(usage="usage: %prog [options] pkgname ...")
+    parser.add_option(
+        "-l", "--launchpad", dest="launchpad_instance", default="production")
+    options, args = parser.parse_args()
+    launchpad = Launchpad.login_anonymously('just testing', options.launchpad_instance)
+    ubuntu = launchpad.distributions["ubuntu"]
+    distro_archive = ubuntu.main_archive
+    overlay_archive = launchpad.people["ci-train-ppa-service"].\
+        getPPAByName(name="stable-phone-overlay")
+    series = ubuntu.getSeries(name_or_version="xenial")
+
+    for source_package in args:
+        re_version = re.compile(r"^\d+\:")
+
+        #first try the overlay archive
+        archive = overlay_archive
+        x = overlay_archive.getPublishedSources(exact_match=True,
+                                                source_name=source_package,
+                                                distro_series=series)
+        if len(x) == 0:
+            archive = distro_archive
+            x = distro_archive.getPublishedSources(exact_match=True,
+                                                   source_name=source_package,
+                                                   distro_series=series)
+            if len(x) == 0:
+                print("Could not find "+source_package)
+                sys.exit(1)
+            else:
+                print(source_package+" found in Archive")
+        else:
+            print(source_package+" found in overlay ppa")
+
+        x = x[0].source_package_version
+
+        generator = get_dsc(archive, source_package, series)
+        for i in generator:
+            call(["dget", i, "--quiet", "--download-only"])
+            for dsc_file in glob.glob('%s*dsc' % source_package):
+                call(["dpkg-source", "-x", dsc_file])
+            for junk_files in glob.glob("*.?z"):
+                os.remove(junk_files)
+            for junk_files in glob.glob("*.dsc"):
+                os.remove(junk_files)
+            for fetched_module_directory in glob.glob('%s*' % source_package):
+                os.rename(fetched_module_directory, source_package)
+
+main()