WIP: Upstream merge

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: johanneswilm
+custom: https://www.fiduswriter.org/donate/

.shellspec

@@ -0,0 +1,12 @@
+--require spec_helper
+
+## Default kcov (coverage) options
+# --kcov-options "--include-path=. --path-strip-level=1"
+# --kcov-options "--include-pattern=.sh"
+# --kcov-options "--exclude-pattern=/.shellspec,/spec/,/coverage/,/report/"
+
+## Example: Include script "myprog" with no extension
+# --kcov-options "--include-pattern=.sh,myprog"
+
+## Example: Only specified files/directories
+# --kcov-options "--include-pattern=myprog,/lib/"

README.md

@@ -1,5 +1,9 @@
 # fiduswriter-snap
-Snapcraft build instructions for Fidus Writer (work in progress)
+Snapcraft build instructions for Fidus Writer.
 
 
-Large parts of this package is based on [Snappy Nextcloud](https://github.com/nextcloud/nextcloud-snap)
+Large parts of this package are based on the the snapcraft build instructions for [Nextcloud](https://github.com/nextcloud/nextcloud-snap).
+
+## How to install
+
+[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-white.svg)](https://snapcraft.io/fiduswriter)

build_clean.sh

@@ -0,0 +1,4 @@
+#!/bin/sh -e
+
+
+snapcraft clean && SNAPCRAFT_BUILD_ENVIRONMENT_MEMORY=8G snapcraft

snap/plugins/apache.py

@@ -0,0 +1,57 @@
+import subprocess
+import snapcraft.plugins.v1
+
+
+class ApachePlugin(snapcraft.plugins.v1.PluginV1):
+
+    @classmethod
+    def schema(cls):
+        schema = super().schema()
+
+        schema['properties']['modules'] = {
+            'type': 'array',
+            'minitems': 1,
+            'uniqueItems': True,
+            'items': {
+                'type': 'string'
+            },
+        }
+
+        schema['properties']['mpm'] = {
+            'type': 'string',
+            'default': 'event',
+        }
+
+        schema['required'] = ['modules']
+
+        return schema
+
+    @classmethod
+    def get_build_properties(cls):
+        # Inform Snapcraft of the properties associated with building. If these
+        # change in the YAML Snapcraft will consider the build step dirty.
+        return super().get_build_properties() + ["modules", "mpm"]
+
+    def __init__(self, name, options, project):
+        super().__init__(name, options, project)
+
+        self.build_packages.extend(
+            ['pkg-config', 'libapr1-dev', 'libaprutil1-dev', 'libpcre3-dev',
+             'libssl-dev'])
+        self.stage_packages.extend(['libapr1', 'libaprutil1'])
+
+
+    def build(self):
+        super().build()
+
+        subprocess.check_call(
+            "./configure --prefix={} --with-mpm={} --enable-modules=none --enable-mods-static='{}'".format(
+                self.installdir, self.options.mpm,
+                ' '.join(self.options.modules)),
+            cwd=self.builddir, shell=True)
+
+        self.run(
+            ['make', '-j{}'.format(
+                self.project.parallel_build_count)],
+            cwd=self.builddir)
+        self.run(['make', 'install'], cwd=self.builddir)

snap/plugins/redis.py

@@ -0,0 +1,27 @@
+import os
+import logging
+import shutil
+import re
+import subprocess
+
+import snapcraft
+from snapcraft.plugins.v1 import make
+
+logger = logging.getLogger(__name__)
+
+
+class RedisPlugin(make.MakePlugin):
+
+    def build(self):
+        super(make.MakePlugin, self).build()
+
+        command = ['make']
+
+        if self.options.makefile:
+            command.extend(['-f', self.options.makefile])
+
+        if self.options.make_parameters:
+            command.extend(self.options.make_parameters)
+
+        self.run(command + ['-j{}'.format(self.project.parallel_build_count)])
+        self.run(command + ['install', 'PREFIX=' + self.installdir])