Merge lp:~vanvugt/unity/fix-1024179 into lp:unity

[Daniel van Vugt]

Make sure org.compiz.unity*.gschema.xml actually get installed on
'make install'. (LP: #1024179)

Make sure org.compiz.unity*.gschema.xml actually get installed on
'make install'. (LP: #1024179)

[Daniel van Vugt (vanvugt)]

This is a quick fix that works. I think the compiz cmake library is meant to do this for us, but right now I cannot figure it out.

[Sam Spilsbury (smspillaz)]

It might be better to try and figure out why the schema files are not being installed by the compiz macro - this code does not invoke the compiler so they won't appear to be installed to gsettings anyways. Maybe try checking to see if the schemas are actually being compiled after being installed as well (I hate how GSettings does this ...).

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:2489
http://jenkins.qa.ubuntu.com/job/unity-ci/75/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/75/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/75/console

review: Needs Fixing (continuous-integration)

[Łukasz Zemczak (sil2100)]

I tested it - and it works like a charm, otherwise the gsettings migration is not possible. Approved.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/957/console reported an error when processing this lp:~vanvugt/unity/fix-1024179 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/958/console reported an error when processing this lp:~vanvugt/unity/fix-1024179 branch.
Not merging it.

[Daniel van Vugt (vanvugt)]

This is on hold, now Sam has proposed a fix to compiz.

[Daniel van Vugt (vanvugt)]

Rejected. The generalized fix in compiz works.

review: Disapprove

Unmerged revisions

2489. By Daniel van Vugt on 2012-07-13

Make sure org.compiz.unity*.gschema.xml actually get installed on
'make install'. (LP: #1024179)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-07-09 07:51:54 +0000
+++ CMakeLists.txt	2012-07-13 03:17:19 +0000
@@ -209,6 +209,18 @@
 configure_file (${CMAKE_SOURCE_DIR}/${UNITY_SCHEMAS} ${CMAKE_BINARY_DIR}/settings/${UNITY_SCHEMAS})
 execute_process (COMMAND ${_glib_comple_schemas} ${CMAKE_BINARY_DIR}/settings)
 
+set (PLUGIN_NAMES
+  networkarearegion
+  unitymtgrabhandles
+  unityshell
+  unitydialog
+)
+set (_gschema_gen_dir "${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/")
+foreach (_plugin ${PLUGIN_NAMES})
+  set (_plugin_src "${_gschema_gen_dir}/org.compiz.${_plugin}.gschema.xml")
+  install (FILES ${_plugin_src} DESTINATION ${GSETTINGS_DIR})
+endforeach ()
+
 #
 # docs
 #