Merge lp:~dobey/cmake-extras/fix-gsettings into lp:cmake-extras

[dobey]

Check for gsettings schema file in binary dir first.
Add autopkgtest for testing the gsettings module.

[Charles Kerr (charlesk)]

I understand this is a work in progress, but I'd like to see more complete tests before this lands

[dobey (dobey)]

> I understand this is a work in progress, but I'd like to see more complete
> tests before this lands

And done.

[Pete Woods (pete-woods)]

review: Approve

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-09 12:47:56 +0000
+++ debian/changelog	2017-02-13 18:15:21 +0000
@@ -1,3 +1,10 @@
+cmake-extras (1.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Add autopkgtest for gsettings macro.
+  * Handle generated gschema files. (LP: #1661686)
+
+ -- Rodney Dawes <[e-mail]>  Fri, 10 Feb 2017 18:01:37 -0500
+
 cmake-extras (1.1+17.04.20170209-0ubuntu1) zesty; urgency=medium
 
   [ Pete ]

=== modified file 'debian/tests/control'
--- debian/tests/control	2017-02-09 10:55:03 +0000
+++ debian/tests/control	2017-02-13 18:15:21 +0000
@@ -45,3 +45,13 @@
   libglib2.0-dev,
   pkg-config,
   python-clang-3.8,
+
+Tests: gsettings
+Restrictions: allow-stderr
+Depends:
+  build-essential,
+  cmake,
+  cmake-extras,
+  libglib2.0-dev,
+  pkg-config,
+  uuid-runtime,

=== added file 'debian/tests/gsettings'
--- debian/tests/gsettings	1970-01-01 00:00:00 +0000
+++ debian/tests/gsettings	2017-02-13 18:15:21 +0000
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# autopkgtest check: Build a trivial project that uses the
+# find_package(GSettings) macro.
+# (C) 2017 Canonical Ltd.
+
+set -euo pipefail
+IFS=$'\n\t'
+
+tempdir=$(mktemp --tmpdir="${AUTOPKGTEST_TMP:-/tmp}" -d)
+trap "rm -rf $tempdir" 0 INT QUIT ABRT PIPE TERM
+
+demodir="$(pwd)/examples/gsettings-demo"
+srcdir="${tempdir}/source"
+bindir="${tempdir}/build"
+installdir="${tempdir}/install"
+
+cp -r "${demodir}" "${srcdir}"
+mkdir -p "${bindir}"
+
+DEFAULT_UUID=$(uuidgen)
+
+# Move into bindir temporarily
+(
+  cd "${bindir}"
+  cmake "${srcdir}" -DCMAKE_INSTALL_PREFIX="${installdir}" -DGSETTINGS_LOCALINSTALL=1 -DGSETTINGS_COMPILE=1 -DDEFAULT_UUID_VALUE=${DEFAULT_UUID}
+  make
+  make VERBOSE=1 install
+)
+
+### Test the schemas
+export GSETTINGS_SCHEMA_DIR="${installdir}/share/glib-2.0/schemas"
+
+# verify generated schema
+VALUE=$(gsettings get com.canonical.cmake-extras.generated-test install-id)
+
+if [ "x${VALUE}" != "x'${DEFAULT_UUID}'" ]; then
+    echo "Generated schema is wrong."
+    echo "\tActual:   ${VALUE}"
+    echo "\tExpected: '${DEFAULT_UUID}'"
+    exit 1
+fi
+
+# verify static schema
+VALUE=$(gsettings get com.canonical.cmake-extras.static-test use-gsettings)
+
+EXPECTED=false
+if [ ${VALUE} != ${EXPECTED} ]; then
+    echo "Generated schema is wrong."
+    echo "\tActual:   ${VALUE}"
+    echo "\tExpected: ${EXPECTED}"
+    exit 1
+fi

=== added directory 'examples/gsettings-demo'
=== added file 'examples/gsettings-demo/CMakeLists.txt'
--- examples/gsettings-demo/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ examples/gsettings-demo/CMakeLists.txt	2017-02-13 18:15:21 +0000
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.1)
+project(intltool-demo)
+
+include(GNUInstallDirs)
+find_package(GSettings)
+
+set (DEFAULT_UUID_VALUE "" CACHE STRING "Default UUID to use in schema.")
+set (DEFAULT_UUID "'${DEFAULT_UUID_VALUE}'")
+
+add_schema ("static.gschema.xml")
+
+configure_file ("generated.gschema.xml.in" "generated.gschema.xml")
+add_schema ("generated.gschema.xml")

=== added file 'examples/gsettings-demo/generated.gschema.xml.in'
--- examples/gsettings-demo/generated.gschema.xml.in	1970-01-01 00:00:00 +0000
+++ examples/gsettings-demo/generated.gschema.xml.in	2017-02-13 18:15:21 +0000
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema id="com.canonical.cmake-extras.generated-test" path="/com/canonical/cmake-extras/generated-test/">
+    <key name="install-id" type="s">
+      <default>@DEFAULT_UUID@</default>
+      <summary>Just a test</summary>
+      <description>No really, it's just a test.</description>
+    </key>
+  </schema>
+</schemalist>

=== added file 'examples/gsettings-demo/static.gschema.xml'
--- examples/gsettings-demo/static.gschema.xml	1970-01-01 00:00:00 +0000
+++ examples/gsettings-demo/static.gschema.xml	2017-02-13 18:15:21 +0000
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema id="com.canonical.cmake-extras.static-test" path="/com/canonical/cmake-extras/static-test/">
+    <key name="use-gsettings" type="b">
+      <default>false</default>
+      <summary>Just a test</summary>
+      <description>No really, it's just a test.</description>
+    </key>
+  </schema>
+</schemalist>

=== modified file 'src/GSettings/GSettingsConfig.cmake'
--- src/GSettings/GSettingsConfig.cmake	2016-12-07 15:30:09 +0000
+++ src/GSettings/GSettingsConfig.cmake	2017-02-13 18:15:21 +0000
@@ -23,9 +23,16 @@
         SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
     endif (GSETTINGS_LOCALINSTALL)
 
+    # Use the correct schema file as it may be generated
+    if (EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME})
+      set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
+    else ()
+      set (SCHEMA_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}")
+    endif ()
+
     # Run the validator and error if it fails
     execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${SCHEMA_FILE} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     if (_schemas_invalid)
       message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
@@ -33,7 +40,7 @@
 
     # Actually install and recomple schemas
     message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
+    install (FILES ${SCHEMA_FILE} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
 
     if (GSETTINGS_COMPILE)
         install (CODE "message (STATUS \"Compiling GSettings schemas\")")