summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Service: Add test cradle and basic teststesting/add-service-cradleEmmanuele Bassi2018-08-122-0/+16
| | | | Signed-off-by: Philip Withnall <withnall@endlessm.com>
* Service: Set up autopointersEmmanuele Bassi2018-08-122-0/+47
| | | | Signed-off-by: Philip Withnall <withnall@endlessm.com>
* Avoid use of link_whole in the gsettings backendEmmanuele Bassi2018-08-111-3/+7
| | | | | | | | | | | | | | | | | | The GSettings backend loadable module should not expose any symbol except for the g_io_module_* ones. By using the internal dependency objects, we end up using `link_whole` on libdconf-common and libdconf-gdbus-thread, which means that we now inherit all the symbols exposed by those static libraries. We still want to use `link_whole` every time we depend on those static libraries, but for the GSettings backend module we make an exception, and use `link_with` with the build targets, instead of the internal dependencies. This fixes the `abicheck` test unit. Reviewed-by: nobody Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
* Namespace the dependencies variablesEmmanuele Bassi2018-08-116-12/+17
| | | | | | | | | | | | | The build currently, unintentionally, depends on side effects, namely: that a variable defined in a meson.build file will be valid for any other included meson.build file, until it gets re-defined. We use the same `deps` variable in many places, and we end up depending on the inclusion order when we get to the client library, which depends on the gsettings backend defining the `deps` variable. Reviewed-by: nobody Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
* Use the correct Meson argument for linkingEmmanuele Bassi2018-08-112-2/+2
| | | | | | | | | | | | | Some of the internal static libraries in dconf implement public symbols. This means that they must be linked using `link_whole`, to prevent the linker from hiding unused symbols in there when building the shared libdconf.so. This fixes the build of projects using the dconf API directly, like dconf-editor, in GNOME Continuous. Reviewed-by: nobody Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
* Merge branch 'meson' into 'master'Philip Withnall2018-08-1115-251/+164
|\ | | | | | | | | Various meson related improvements See merge request GNOME/dconf!11
| * tests: Add libdbus-1-dev and bash-completion packagesIñigo Martínez2018-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | meson uses `dbus-1.pc` file to check the `session_bus_services_dir` variable and `bash-completion.pc` file to check the `completionsdir` variable. However, the debian packages containing these files are missing from the gitlab CI file. `libdbus-1-dev` and `bash-completion` packages have been added that contain the `dbus-1.pc` and `bash-completion.pc` files.
| * build: Simplified pkg-config file generationIñigo Martínez2018-08-112-5/+2
| | | | | | | | | | | | | | | | | | | | Since meson's 0.46 version, the `pkg-config` file generation has been simplified[0]. This new improvements has been used to generate the same `pkg-config` file by using less parameters. meson version has also been bumped accordingly to 0.46. [0] http://mesonbuild.com/Release-notes-for-0-46-0.html#improvements-to-pkgconfig-module
| * build: Add trailing commas where necessaryIñigo Martínez2018-08-1112-49/+49
| | | | | | | | | | | | Having trailing commas in place means that if another source file or parameter is added to the end of the list or function, there won't be noise when adding the comma to the line above.
| * build: Do not make heavy use of project_nameIñigo Martínez2018-08-1110-53/+37
| | | | | | | | | | | | | | | | | | The current meson build files make heavy use of meson's `project_name` function. However this makes difficult for any developer to find for given program/library/file names. The project name is also never going to change. Due to this reason these calls have been changed for `dconf` itself.
| * build: Simplified checking compiler supported argumentsIñigo Martínez2018-08-111-4/+2
| | | | | | | | | | An auxiliary variable is used to hold the compiler arguments to be checked. However, this is not necessary, so it has been removed.
| * build: Use vapi dir from pkg-config fileIñigo Martínez2018-08-112-1/+2
| | | | | | | | | | | | | | | | The `vapigen` pkg-config file provides a variable with the location of the vapi files. This variable is checked to set the installation directory of the vapi file provided by dconf.
| * build: Use completions dir from pkg-config fileIñigo Martínez2018-08-113-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | The `bash-completions` pkg-config file provides a variable with the location of the completion files. This variable is checked to set the installation directory of the completion file provided by dconf. As a side note, the variable in the `bash-completions` pkg-config file is not totally correct, because it provides a directory that is relative to prefix while it should be relative to datadir.
| * build: Remove duplicated warning parameterIñigo Martínez2018-08-111-1/+0
| | | | | | | | | | | | | | The `dconf` binary uses the `-w` compiler argument which is already added by meson by default. This duplicated parameter has been removed.
| * build: Fix pkg-config exec_prefix variableIñigo Martínez2018-08-111-1/+1
| | | | | | | | | | | | | | The `exec_prefix` variable in the pkg-config file should point to `prefix` but it is pointing to `libexecdir`. This has been updated to point to `${prefix}`.
| * build: Fix parameters orderIñigo Martínez2018-08-111-2/+2
| | | | | | | | | | | | | | | | The install parameters should be the last parameters when calling a function. The `configuration` parameter has been moved leaving install parameters at the end.
| * build: Use gnome's gtkdoc_html_dir functionIñigo Martínez2018-08-111-1/+1
| | | | | | | | | | | | | | | | meson's `gtkdoc_html_dir` function returns the path where HTML files will be installed for a given module. Instead of hard coding the directory, this function is used to set documentations installation directory.
| * build: Remove unnecessary variablesIñigo Martínez2018-08-113-15/+4
| | | | | | | | | | | | | | | | | | There are some defined variables that are not used. Some of these variables are also used as install directories, that are equal to default installation directories. These all unnecessary variables and default installation directories have been removed.
| * build: Fix internal dependenciesIñigo Martínez2018-08-1111-56/+99
| | | | | | | | | | | | | | | | | | meson is able to generate internal dependencies for handling built libraries. These internal dependencies depend on other dependencies as well, based on the includes exposed by their headers. This have been fixed by using proper internal dependencies for these libraries.
| * build: Avoid building libraries twiceIñigo Martínez2018-08-117-72/+14
| | | | | | | | | | | | | | | | | | | | | | dconf builts a number of internal static libraries which in some cases are duplicated. This duplication comes from autotools that used to built two libraries for each library, one with PIC enabled and the other one without it. This has been changed to build only one library for each library to be built, except `libdconf-common-hidden` which hides some symbols for the GIO module to be built.
| * build: Remove config.h definitionsIñigo Martínez2018-08-111-20/+1
| | | | | | | | | | | | | | | | Although many files include the `config.h` file, no defitions are used at all. Due to this, all the definitions have been removed. However, the `config.h` file is still generated and included in many files, as it may be useful for future global definitions.
| * build: Retrieve D-Bus and gio paths from pkg-config filesIñigo Martínez2018-08-115-25/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | D-Bus' session bus services' paths and gio's module's paths are hardcoded. However, these directories can be retrieved by checking this information from their pkgconfig files. This patch retrieves the paths for their correspondant pkgconfig files and uses those paths as installation directories. The options to set different directories for these options are not necessary anymore, so they have been removed. Finally, the post install script does not depend anymore on the existence of `gio-querymodules` and is always executed.
| * build: Use get_supported_arguments helperIñigo Martínez2018-08-112-11/+3
| | | | | | | | | | | | | | | | | | meson 0.43.0 comes with a new function in the compiler's object called `get_supported_arguments`, which allows checking multiple optiones at once. This patch bumps meson's version number and also takes advantage of this new feature.
| * build: Remove default optionsIñigo Martínez2018-08-111-4/+0
| | | | | | | | | | | | | | | | dconf uses 1 as the project's default warning level. However, meson already sets this option by default. This patch removes the option from project's default options. It also removes the debugoptimized built type.
| * build: Remove macro definitionIñigo Martínez2018-08-111-1/+1
| | | | | | | | | | | | | | meson uses the compiler's HAVE_CONFIG_H macro definiton, inherited from autotools behaviours. However it is not necessary. This patch removes the use of the macro definition.
| * build: Rename build optionsIñigo Martínez2018-08-114-11/+11
| | | | | | | | | | | | | | | | | | | | Following the new meson porting guidelines, this patch renames the build options. The list of changes is as follows: - Remove the enable prefix from boolean options. - Remove the with prefix from string options. - The character separator from multi-word options has been changed to underscore.
* | Merge branch 'ci' into 'master'Philip Withnall2018-08-111-2/+2
|\ \ | |/ |/| | | | | ci: Fix documentation build for `pages` job See merge request GNOME/dconf!12
| * ci: Fix documentation build for `pages` jobPhilip Withnall2018-08-111-2/+2
|/ | | | Signed-off-by: Philip Withnall <withnall@endlessm.com>
* Merge branch 'ci' into 'master'Philip Withnall2018-08-117-5/+141
|\ | | | | | | | | Add GitLab CI See merge request GNOME/dconf!10
| * tests: Don’t run D-Bus tests on CI as they fail unexpectedlyPhilip Withnall2018-08-101-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | I can’t work out why they’re failing, so disable them for the moment. The immediate error they give is about not being able to start a bus when $DISPLAY isn’t defined — but if you switch them to run under GTestDBus, they fail more cryptically with a failure to find a bus socket. This can be reapproached later. Signed-off-by: Philip Withnall <withnall@endlessm.com>
| * fixup! build: Add GitLab CI supportPhilip Withnall2018-08-101-8/+21
| |
| * tests: Set G_DEBUG and other useful environment variablesPhilip Withnall2018-08-103-2/+19
| | | | | | | | Signed-off-by: Philip Withnall <withnall@endlessm.com>
| * tests: Fix a deprecation warning about source definitionsPhilip Withnall2018-08-101-1/+1
| | | | | | | | | | | | | | /usr/include/features.h:183:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp] # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" Signed-off-by: Philip Withnall <withnall@endlessm.com>
| * bin: Stop copying a delegatePhilip Withnall2018-08-101-1/+1
| | | | | | | | | | | | | | | | | | This fixes a build warning: ../bin/dconf.vala:310.15-310.18: warning: copying delegates is not supported ../bin/dconf.vala:305.2-305.13: warning: copying delegates is not supported Signed-off-by: Philip Withnall <withnall@endlessm.com>
| * build: Add GitLab CI supportPhilip Withnall2018-08-101-0/+64
| | | | | | | | Signed-off-by: Philip Withnall <withnall@endlessm.com>
| * doc: Update bug reporting URIPhilip Withnall2018-08-091-1/+1
|/ | | | Signed-off-by: Philip Withnall <withnall@endlessm.com>
* docs: Add Daniel and me as comaintainersPhilip Withnall2018-08-091-0/+17
| | | | Signed-off-by: Philip Withnall <withnall@endlessm.com>
* Merge branch 'transfer-annotations' into 'master'Xavier Claessens2018-08-082-25/+29
|\ | | | | | | | | Add transfer annotations See merge request GNOME/dconf!9
| * client: Fix a minor typo in some documentationPhilip Withnall2018-08-081-1/+1
| | | | | | | | Signed-off-by: Philip Withnall <withnall@endlessm.com>
| * Add some transfer annotationsXavier Claessens2018-08-082-24/+28
| | | | | | | | | | | | | | (Expanded by Philip Withnall <withnall@endlessm.com> to add more annotations and fix prior review comments.) https://bugzilla.gnome.org/show_bug.cgi?id=758903
* | dconf: fix command line completion for "dconf update"Andrea Stacchiotti2018-08-081-2/+2
| | | | | | | | | | | | | | Due to a typo, there was no "update" completion option, but a " update" one, which required the user to type "\ " to get a completion, instead of "u". https://bugzilla.gnome.org/show_bug.cgi?id=758126
* | abicheck: Use ${NM} and fall back to `nm`Marvin Schmidt2018-08-081-1/+1
| | | | | | | | | | | | | | `nm` possibly isn't the correct nm executable, especially when cross-compiling. Allow overriding it using ${NM} https://bugzilla.gnome.org/show_bug.cgi?id=781769
* | Allow manpages to be build seperate from gtk-doc.Koop Mast2018-08-082-18/+16
| | | | | | | | | | | | | | | | | | Move the get_option('enable-gtk-doc') to the meson.build file in docs. And wrap the gtk-doc code, so 'enable-man' can be used independant from gtkdoc. Instead of skipping the docs directory completly. Reviewed-by: Philip Withnall <withnall@endlessm.com> https://bugzilla.gnome.org/show_bug.cgi?id=794446
* | Merge branch 'private-data' into 'master'Philip Withnall2018-08-081-3/+2
|\ \ | |/ |/| | | | | service: Port from g_type_class_add_private() to G_ADD_PRIVATE() See merge request GNOME/dconf!7
| * service: Port from g_type_class_add_private() to G_ADD_PRIVATE()Philip Withnall2018-08-011-3/+2
|/ | | | | | The former has been deprecated for a long time. Signed-off-by: Philip Withnall <withnall@endlessm.com>
* Merge branch 'patch-1' into 'master'Philip Withnall2018-08-011-1/+1
|\ | | | | | | | | dconf-update.vala: correct error message grammar See merge request GNOME/dconf!6
| * dconf-update.vala: correct error message grammarKenyon Ralph2018-07-261-1/+1
|/
* Merge branch 'patch/ow' into 'master'Ray Strode2018-07-133-14/+151
|\ | | | | | | | | Engine: track in progress watch handles to avoid spurious changed signals for the root path See merge request GNOME/dconf!1
| * Engine: track in progress watch handles to avoid spurious changed signals ↵Daniel Playfair Cal2018-07-133-14/+151
|/ | | | for the root path
* Don't create the user config dir as world readableSebastien Bacher2018-04-172-2/+2
| | | | https://bugzilla.gnome.org/show_bug.cgi?id=792677