Merge ~3v1n0/ubuntu-app-platform:master into ubuntu-app-platform:master

[Marco Trevisan (Treviño)]

snapcraft.yaml: load indicator-qt5 remote part

It adds proper support to app-indicators in classic space.

See https://github.com/3v1n0/indicators-examples-snaps for more infos or the part definition at https://github.com/3v1n0/appindicators-snapcraft-parts

Removed also the unneeded and outdated custom plugins (the x-qmake one specifically was pointing to the wrong location, thus causing indicator-qt5 not to compile).

[Tim Peeters (tpeeters)]

Thanks for the MR, but can you separate adding of a dependency and removing the plugins into separate MRs to make it easier to review?

Perhaps a bug report describing the the outdated plugins is useful too.

review: Needs Fixing

Unmerged commits

2b06828... by Marco Trevisan (Treviño) on 2016-11-23

snapcraft.yaml: load indicator-qt5 remote part

It adds proper support to app-indicators in classic space

df906a2... by Marco Trevisan (Treviño) on 2016-11-23

plugins: remove unneeded custom plugins.

There's nothing to build here, while
qtbase isn't there anymore.

diff --git a/parts/plugins/x-autotools.py b/parts/plugins/x-autotools.py
deleted file mode 100644
index 4cb33b3..0000000
--- a/parts/plugins/x-autotools.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
-#
-# Copyright (C) 2015, 2016 Canonical Ltd
-# Copyright (C) 2016 Harald Sitter <[e-mail]>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""The autotools plugin is used for autotools based parts.
-
-Autotools based projects are the ones that have the usual
-`./configure && make && make install` instruction set.
-
-The plugin tries to build using ./configure first, if it is not there
-it will run ./autogen and if autogen is not there it will run autoreconf.
-
-This plugin uses the common plugin keywords as well as those for "sources".
-For more information check the 'plugins' topic for the former and the
-'sources' topic for the latter.
-
-In addition, this plugin uses the following plugin-specific keywords:
-
-    - configflags:
-      (list of strings)
-      configure flags to pass to the build such as those shown by running
-      './configure --help'
-    - install-via:
-      (enum, 'destdir' or 'prefix')
-      Whether to install via DESTDIR or by using --prefix (default is
-      'destdir')
-"""
-
-import os
-import stat
-
-import snapcraft
-
-
-class AutotoolsPlugin(snapcraft.BasePlugin):
-
-    @classmethod
-    def schema(cls):
-        schema = super().schema()
-        schema['properties']['configflags'] = {
-            'type': 'array',
-            'minitems': 1,
-            'uniqueItems': False,
-            'items': {
-                'type': 'string',
-            },
-            'default': [],
-        }
-
-        schema['properties']['install-via'] = {
-            'enum': ['destdir', 'prefix'],
-            'default': 'destdir',
-        }
-
-        # Inform Snapcraft of the properties associated with building. If these
-        # change in the YAML Snapcraft will consider the build step dirty.
-        schema['build-properties'].extend(['configflags', 'install-via'])
-
-        return schema
-
-    def __init__(self, name, options, project):
-        super().__init__(name, options, project)
-        self.build_packages.extend([
-            'autoconf',
-            'automake',
-            'autopoint',
-            'libtool',
-            'make',
-        ])
-
-        if options.install_via == 'destdir':
-            self.install_via_destdir = True
-        elif options.install_via == 'prefix':
-            self.install_via_destdir = False
-        else:
-            raise RuntimeError('Unsupported installation method: "{}"'.format(
-                options.install_via))
-
-    def build(self):
-        super().build()
-        if not os.path.exists(os.path.join(self.builddir, "configure")):
-            generated = False
-            scripts = ["autogen.sh", "bootstrap"]
-            for script in scripts:
-                path = os.path.join(self.builddir, script)
-                if not os.path.exists(path):
-                    continue
-                # Make sure it's executable
-                if not os.access(path, os.X_OK):
-                    os.chmod(path,
-                             stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |
-                             stat.S_IRGRP | stat.S_IWGRP | stat.S_IXGRP |
-                             stat.S_IROTH | stat.S_IWOTH | stat.S_IXOTH)
-                self.run(['env', 'NOCONFIGURE=1', './{}'.format(script)])
-                generated = True
-                break
-            if not generated:
-                self.run(['autoreconf', '-i'])
-
-        configure_command = ['./configure']
-        make_install_command = ['make', 'install']
-
-        if self.install_via_destdir:
-            # Use an empty prefix since we'll install via DESTDIR
-            configure_command.append('--prefix=')
-            make_install_command.append('DESTDIR=' + self.installdir)
-        else:
-            configure_command.append('--prefix=' + self.installdir)
-
-        self.run(configure_command + self.options.configflags)
-        self.run(['make', '-j{}'.format(self.parallel_build_count)])
-        self.run(make_install_command)
-
-    def snap_fileset(self):
-        fileset = super().snap_fileset()
-        # Remove .la files which don't work when they are moved around
-        fileset.append('-**/*.la')
-        return fileset
diff --git a/parts/plugins/x-qmake.py b/parts/plugins/x-qmake.py
deleted file mode 100644
index df766c0..0000000
--- a/parts/plugins/x-qmake.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
-#
-# Copyright (C) 2016 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""The qmake plugin is useful for building qmake-based parts.
-
-These are projects that are built using .pro files.
-
-This plugin uses the common plugin keywords as well as those for "sources".
-For more information check the 'plugins' topic for the former and the
-'sources' topic for the latter.
-
-Additionally, this plugin uses the following plugin-specific keywords:
-
-    - options:
-      (list of strings)
-      additional options to pass to the qmake invocation.
-    - qt-version:
-      (enum, 'qt4' or 'qt5')
-      Version of Qt to use with qmake.
-    - project-files:
-      (list of strings)
-      list of .pro files to pass to the qmake invocation.
-"""
-
-import os
-
-import snapcraft
-from snapcraft import common
-
-
-class QmakePlugin(snapcraft.BasePlugin):
-
-    @classmethod
-    def schema(cls):
-        schema = super().schema()
-        schema['properties']['options'] = {
-            'type': 'array',
-            'minitems': 1,
-            'uniqueItems': True,
-            'items': {
-                'type': 'string',
-            },
-            'default': [],
-        }
-        schema['properties']['qt-version'] = {
-            'enum': ['qt4', 'qt5'],
-        }
-        schema['properties']['project-files'] = {
-            'type': 'array',
-            'minitems': 1,
-            'uniqueItems': True,
-            'items': {
-                'type': 'string',
-            },
-            'default': [],
-        }
-
-        # Qt version must be specified
-        schema['required'].append('qt-version')
-
-        # Inform Snapcraft of the properties associated with building and
-        # pulling so it can mark those steps dirty if they change in the YAML.
-        schema['build-properties'].append('options')
-        schema['pull-properties'].append('qt-version')
-
-        return schema
-
-    def __init__(self, name, options, project):
-        super().__init__(name, options, project)
-
-        self.build_packages.append('make')
-
-    def build(self):
-        super().build()
-
-        env = self._build_environment()
-
-        sources = []
-        if self.options.project_files:
-            sourcedir = self.sourcedir
-            source_subdir = getattr(self.options, 'source_subdir', None)
-            if source_subdir:
-                sourcedir = os.path.join(sourcedir, source_subdir)
-            sources = [os.path.join(sourcedir, project_file)
-                       for project_file in self.options.project_files]
-
-        self.run([ self.project.parts_dir + '/qtbase/build/bin/qmake'] + self._extra_config() + self.options.options +
-                 sources, env=env)
-
-        self.run(['make', '-j{}'.format(
-            self.parallel_build_count)], env=env)
-
-        self.run(['make', 'install', 'INSTALL_ROOT=' + self.installdir],
-                 env=env)
-
-    def _extra_config(self):
-        extra_config = []
-
-        for root in [self.installdir, self.project.stage_dir]:
-            paths = common.get_library_paths(root, self.project.arch_triplet)
-            for path in paths:
-                extra_config.append("LIBS+=\"-L{}\"".format(path))
-
-            paths = common.get_include_paths(root, self.project.arch_triplet)
-            for path in paths:
-                extra_config.append("INCLUDEPATH+=\"{}\"".format(path))
-            extra_config.append("INCLUDEPATH+=\"{}\"".format(self.project.parts_dir + '/qtbase/build/NAP/include'))
-            extra_config.append("INCLUDEPATH+=\"{}\"".format(self.project.parts_dir + '/qtxmlpatterns/build/include'))
-            extra_config.append("INCLUDEPATH+=\"{}\"".format(self.project.parts_dir + '/qtdeclarative/build/include'))
-            extra_config.append("INCLUDEPATH+=\"{}\"".format(self.project.parts_dir + '/qttools/build/include'))
-            extra_config.append("INCLUDEPATH+=\"{}\"".format(self.project.parts_dir + '/qtmultimedia/build/include'))
-            extra_config.append("INCLUDEPATH+=\"{}\"".format(self.project.parts_dir + '/qtsvg/build/include'))
-            extra_config.append("INCLUDEPATH+=\"{}\"".format(self.project.parts_dir + '/qtgraphicaleffects/build/include'))
-            extra_config.append("INCLUDEPATH+=\"{}\"".format(self.project.parts_dir + '/qtpim/build/include'))
-        return extra_config
-
-    def _build_environment(self):
-        env = os.environ.copy()
-        env['QT_SELECT'] = self.options.qt_version
-        env['QTDIR' ] = self.project.parts_dir + '/qtbase/build/'
-        return env
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 534fe16..5abfbfe 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -116,3 +116,5 @@ parts:
         - usr/share/webbrowser-app
         - usr/share/X11
 
+    after:
+        - indicator-qt5