Merge tag 'v0.3.16' into stable

v0.3.16

Author: arteymix

Dockerfile

@@ -1,24 +1,20 @@
-FROM ubuntu:latest
+FROM ubuntu:xenial
 
 MAINTAINER Guillaume Poirier-Morency <[email protected]>
 
 RUN apt-get update && apt-get install -y \
     libfcgi-dev                          \
     libglib2.0-dev                       \
     libsoup2.4-dev                       \
+    ninja-build                          \
     python3-pip                          \
     unzip                                \
     valac                                \
     && rm -rf /var/lib/apt/lists/*
 
-# Meson
 RUN pip3 install meson
 
-# Ninja
-ADD https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-linux.zip /tmp
-RUN unzip /tmp/ninja-linux.zip -d /usr/local/bin
-
 WORKDIR /valum
 ADD . .
 
-RUN mkdir build && meson --prefix=/usr --buildtype=release . build && ninja -C build && ninja -C build test && ninja -C build install
+RUN mkdir build && meson --prefix=/usr --buildtype=release . build && ninja -C build && meson test -C build && ninja -C build install

meson.build

@@ -1,5 +1,5 @@
 project('Valum', 'vala', 'c',
-        version: '0.3.15',
+        version: '0.3.16',
         license: 'LGPL',
         meson_version: '>=0.42.0')
 

src/valum/install.sh

@@ -27,13 +27,11 @@ valum_lib = library('valum-' + api_version, valum_sources,
                     dependencies: [glib, gobject, gio, soup, vsgi],
                     vala_args: vala_defines,
                     vala_header: 'valum.h',
-                    install: true)
+                    install: [true, true, true, true])
 
 valum = declare_dependency(include_directories: include_directories('.'),
                            link_with: valum_lib)
 
-meson.add_install_script('install.sh')
-
 pkgconfig = import('pkgconfig')
 pkgconfig.generate(requires: 'vsgi-' + api_version,
                    libraries: valum_lib,

src/valum/meson.build

@@ -24,14 +24,12 @@ vsgi_lib = library('vsgi-' + api_version, vsgi_sources,
                    vala_args: ['--pkg=posix'] + vala_defines,
                    vala_header: 'vsgi.h',
                    build_rpath: join_paths(meson.current_build_dir(), 'servers'),
-                   install: true,
+                   install: [true, true, true, true],
                    install_rpath: join_paths(get_option('prefix'), get_option('libdir'), 'vsgi-@0@/servers'.format(api_version)))
 
 vsgi = declare_dependency(include_directories: include_directories('.'),
                           link_with: vsgi_lib)
 
-meson.add_install_script('install.sh')
-
 pkgconfig = import('pkgconfig')
 pkgconfig.generate(requires: 'glib-2.0 gobject-2.0 gio-2.0 libsoup-2.4',
                    requires_private: 'gio-unix-2.0 gmodule-2.0',

src/vsgi/install.sh

@@ -1,33 +1,33 @@
-shared_library('vsgi-http', ['vsgi-http.vala'],
-        dependencies: [glib, gobject, gio, soup, vsgi],
-        vala_args: vala_defines,
-        install: true,
-        install_dir: '@0@/vsgi-@1@/servers'.format(get_option('libdir'), api_version))
+shared_module('vsgi-http', ['vsgi-http.vala'],
+    dependencies: [glib, gobject, gio, soup, vsgi],
+    vala_args: vala_defines,
+    install: true,
+    install_dir: '@0@/vsgi-@1@/servers'.format(get_option('libdir'), api_version))
 
-shared_library('vsgi-cgi', 'vsgi-cgi.vala',
-        dependencies: [glib, gobject, gio, gio_unix, soup, vsgi],
-        vala_args: vala_defines,
-        install: true,
-        install_dir: '@0@/vsgi-@1@/servers'.format(get_option('libdir'), api_version))
+shared_module('vsgi-cgi', 'vsgi-cgi.vala',
+    dependencies: [glib, gobject, gio, gio_unix, soup, vsgi],
+    vala_args: vala_defines,
+    install: true,
+    install_dir: '@0@/vsgi-@1@/servers'.format(get_option('libdir'), api_version))
 
 fcgi = meson.get_compiler('c').find_library('fcgi', required: false)
 if fcgi.found()
     fcgi_vapi = meson.get_compiler('vala').find_library('fcgi', dirs: meson.current_source_dir())
-    shared_library('vsgi-fastcgi', 'vsgi-fastcgi.vala',
-                   dependencies: [glib, gobject, gio, gio_unix, soup, vsgi, fcgi, fcgi_vapi],
-                   vala_args: vala_defines,
-                   install: true,
-                   install_dir: '@0@/vsgi-@1@/servers'.format(get_option('libdir'), api_version))
-endif
-
-shared_library('vsgi-scgi', 'vsgi-scgi.vala',
-        dependencies: [glib, gobject, gio, soup, vsgi],
+    shared_module('vsgi-fastcgi', 'vsgi-fastcgi.vala',
+        dependencies: [glib, gobject, gio, gio_unix, soup, vsgi, fcgi, fcgi_vapi],
         vala_args: vala_defines,
         install: true,
         install_dir: '@0@/vsgi-@1@/servers'.format(get_option('libdir'), api_version))
+endif
 
-shared_library('vsgi-mock', 'vsgi-mock.vala',
-        dependencies: [glib, gobject, gio, soup, vsgi],
-        vala_args: vala_defines,
-        install: true,
-        install_dir: '@0@/vsgi-@1@/servers'.format(get_option('libdir'), api_version))
+shared_module('vsgi-scgi', 'vsgi-scgi.vala',
+    dependencies: [glib, gobject, gio, soup, vsgi],
+    vala_args: vala_defines,
+    install: true,
+    install_dir: '@0@/vsgi-@1@/servers'.format(get_option('libdir'), api_version))
+
+shared_module('vsgi-mock', 'vsgi-mock.vala',
+    dependencies: [glib, gobject, gio, soup, vsgi],
+    vala_args: vala_defines,
+    install: true,
+    install_dir: '@0@/vsgi-@1@/servers'.format(get_option('libdir'), api_version))