Merge lp:~compiz-team/compiz/compiz.fix_1184755 into lp:compiz/0.9.10

[Sam Spilsbury]

Fix some files not installing:

 1. gsettings schemas never get added to the install_manifest list
    because we use install (CODE) so we need to add a custom
    uninstall target for those, and also need to recompile on uninstall
    too
 2. Run the gtk-update-icon-cache stage during install for ccsm and
    also add icon-theme.cache to the uninstall target

(LP: #1168475)

Fix some files not installing:

 1. gsettings schemas never get added to the install_manifest list
    because we use install (CODE) so we need to add a custom
    uninstall target for those, and also need to recompile on uninstall
    too
 2. Run the gtk-update-icon-cache stage during install for ccsm and
    also add icon-theme.cache to the uninstall target

(LP: #1168475)

Unmerged revisions

=== modified file 'cmake/CompizGSettings.cmake'
--- cmake/CompizGSettings.cmake	2013-02-20 10:53:57 +0000
+++ cmake/CompizGSettings.cmake	2013-04-28 04:51:28 +0000
@@ -55,6 +55,9 @@
 		 execute_process (COMMAND cmake -DSCHEMADIR_USER=${_schemadir_user} -DSCHEMADIR_ROOT=${GSETTINGS_GLOBAL_INSTALL_DIR} -P ${COMPIZ_CMAKE_MODULE_PATH}/recompile_gsettings_schemas_in_dir_user_env.cmake)
 		 ")
 
+	# We must also recompile on uninstall too
+	compiz_add_code_to_uninstall_target ("cmake -DSCHEMADIR_USER=${_schemadir_user} -DSCHEMADIR_ROOT=${GSETTINGS_GLOBAL_INSTALL_DIR} -P ${COMPIZ_CMAKE_MODULE_PATH}/recompile_gsettings_schemas_in_dir_user_env.cmake" ${CMAKE_CURRENT_BINARY_DIR})
+
     endif (GSETTINGS_GLOBAL_INSTALL_DIR_SET)
 
 endfunction (compiz_add_install_recompile_gsettings_schemas)
@@ -76,9 +79,15 @@
 
 	# Install schema file
 	install (CODE "
-		 execute_process (COMMAND cmake -DFILE=${_src} -DINSTALLDIR_USER=${_dst} -DINSTALLDIR_ROOT=${GSETTINGS_GLOBAL_INSTALL_DIR} -P ${COMPIZ_CMAKE_MODULE_PATH}/copy_file_install_user_env.cmake)
+		 execute_process (COMMAND cmake -DFILE=${_src}
+                                                -DINSTALLDIR_USER=${_dst} 
+                                                -DINSTALLDIR_ROOT=${GSETTINGS_GLOBAL_INSTALL_DIR} 
+                                                -P ${COMPIZ_CMAKE_MODULE_PATH}/copy_file_install_user_env.cmake)
 		 ")
 
+	get_filename_component (_src_file_basename ${_src} NAME)
+	compiz_add_code_to_uninstall_target ("cmake -E remove -f ${_dst}/${_src_file_basename}" ${CMAKE_CURRENT_BINARY_DIR})
+
 	get_property (COMPIZ_INHIBIT_ADD_INSTALL_RECOMPILE_RULE_SET
 		      GLOBAL
 		      PROPERTY COMPIZ_INHIBIT_ADD_INSTALL_RECOMPILE_RULE

=== modified file 'compizconfig/ccsm/setup.py'
--- compizconfig/ccsm/setup.py	2012-10-16 13:53:20 +0000
+++ compizconfig/ccsm/setup.py	2013-04-28 04:51:28 +0000
@@ -36,7 +36,28 @@
 
     def run (self):
         _install.run (self)
+
+        icon_prefix = '%s/share/ccsm/icons/hicolor' % prefix
+        icon_theme_cache = '%s/icon-theme.cache' % icon_prefix
+
+        print ("icon_prefix ", icon_prefix)
+        print ("icon_theme_cache ", icon_theme_cache)
+
         outputs = self.get_outputs ()
+
+        # Update icon cache
+        gtk_update_icon_cache = '''gtk-update-icon-cache -f -t \
+%s''' % icon_prefix
+        root_specified = len (filter (lambda s: s.startswith ("--root"),
+                                      sys.argv)) > 0
+        if not root_specified:
+            print "Updating Gtk icon cache."
+            os.system (gtk_update_icon_cache)
+            outputs.append (icon_theme_cache)
+        else:
+            print '''*** Icon cache not updated. After install, run this:
+***     %s''' % gtk_update_icon_cache
+
         length = 0
         if self.root:
             length += len (self.root)
@@ -216,15 +237,3 @@
      )
 
 os.remove ("ccm/Constants.py")
-
-if sys.argv[1] == "install":
-    gtk_update_icon_cache = '''gtk-update-icon-cache -f -t \
-%s/share/ccsm/icons/hicolor''' % prefix
-    root_specified = len (filter (lambda s: s.startswith ("--root"),
-                                  sys.argv)) > 0
-    if not root_specified:
-        print "Updating Gtk icon cache."
-        os.system (gtk_update_icon_cache)
-    else:
-        print '''*** Icon cache not updated. After install, run this:
-***     %s''' % gtk_update_icon_cache