From a975d62071d71814eb9e6b3c379228f4cd66f0d3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 3 Jan 2011 21:31:55 -0500 Subject: [PATCH] Rename gtk-update-icon-cache and gtk-builder-convert back In bug 635207, it was pointed out that it is a bad idea to rename these tools purely in the name of parallel-installability, since it forces dependencies to make a choice between running gtk-update-icon-cache and gtk-update-icon-cache-3.0 (or both ?!). So, we rename these utilities back to their un-suffixed names and rely on distributors to resolve the conflict between GTK+ 2.x and GTK+ 3.0 packages, which can be done e.g. by dropping the utilities from the gtk3 packages and add a gtk3 -> gtk2 dependency. --- docs/reference/gtk/Makefile.am | 8 +++---- ...onvert-3.0.xml => gtk-builder-convert.xml} | 10 ++++----- docs/reference/gtk/gtk-docs.sgml | 4 ++-- ...ache-3.0.xml => gtk-update-icon-cache.xml} | 14 +++++------- gtk/Makefile.am | 22 +++++++++---------- ...uilder-convert-3.0 => gtk-builder-convert} | 0 modules/input/Makefile.am | 4 ++-- 7 files changed, 30 insertions(+), 32 deletions(-) rename docs/reference/gtk/{gtk-builder-convert-3.0.xml => gtk-builder-convert.xml} (84%) rename docs/reference/gtk/{gtk-update-icon-cache-3.0.xml => gtk-update-icon-cache.xml} (91%) rename gtk/{gtk-builder-convert-3.0 => gtk-builder-convert} (100%) diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 9389c0413a..959e0b0a5e 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -134,8 +134,8 @@ content_files = \ windows.sgml \ x11.sgml \ gtk-query-immodules-3.0.xml \ - gtk-update-icon-cache-3.0.xml \ - gtk-builder-convert-3.0.xml \ + gtk-update-icon-cache.xml \ + gtk-builder-convert.xml \ visual_index.xml \ getting_started.xml \ overview.xml @@ -370,8 +370,8 @@ EXTRA_DIST += version.xml.in man_MANS = \ gtk-query-immodules-3.0.1 \ - gtk-update-icon-cache-3.0.1 \ - gtk-builder-convert-3.0.1 + gtk-update-icon-cache.1 \ + gtk-builder-convert.1 if ENABLE_MAN diff --git a/docs/reference/gtk/gtk-builder-convert-3.0.xml b/docs/reference/gtk/gtk-builder-convert.xml similarity index 84% rename from docs/reference/gtk/gtk-builder-convert-3.0.xml rename to docs/reference/gtk/gtk-builder-convert.xml index eccfe336f3..aa98d5d659 100644 --- a/docs/reference/gtk/gtk-builder-convert-3.0.xml +++ b/docs/reference/gtk/gtk-builder-convert.xml @@ -1,18 +1,18 @@ -gtk-builder-convert-3.0 +gtk-builder-convert 1 -gtk-builder-convert-3.0 +gtk-builder-convert Glade file conversion utility -gtk-builder-convert-3.0 +gtk-builder-convert --skip-windows --root name input @@ -21,7 +21,7 @@ Description -gtk-builder-convert-3.0 converts glade files +gtk-builder-convert converts glade files into XML files which can be loaded with GtkBuilder. @@ -40,7 +40,7 @@ its output the file specified as the second argument. --root -r - Convert only the widget named name + Convert only the widget named name and its children. diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 39b9624c0a..ca98b8f6fa 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -356,8 +356,8 @@ GTK+ Tools - - + + diff --git a/docs/reference/gtk/gtk-update-icon-cache-3.0.xml b/docs/reference/gtk/gtk-update-icon-cache.xml similarity index 91% rename from docs/reference/gtk/gtk-update-icon-cache-3.0.xml rename to docs/reference/gtk/gtk-update-icon-cache.xml index 477f37c381..2a5bc27fbf 100644 --- a/docs/reference/gtk/gtk-update-icon-cache-3.0.xml +++ b/docs/reference/gtk/gtk-update-icon-cache.xml @@ -5,18 +5,18 @@ -gtk-update-icon-cache-3.0 +gtk-update-icon-cache 1 -gtk-update-icon-cache-3.0 +gtk-update-icon-cache Icon theme caching utility -gtk-update-icon-cache-3.0 +gtk-update-icon-cache --force --ignore-theme-index --index-only @@ -29,7 +29,7 @@ Description - gtk-update-icon-cache-3.0 creates mmap()able cache + gtk-update-icon-cache creates mmap()able cache files for icon themes. @@ -39,7 +39,7 @@ information about the icons in the directory tree below the given directory. - GTK+ can use the cache files created by gtk-update-icon-cache-3.0 + GTK+ can use the cache files created by gtk-update-icon-cache to avoid a lot of system call and disk seek overhead when the application starts. Since the format of the cache files allows them to be mmap()ed shared between multiple applications, the overall memory consumption is @@ -60,7 +60,7 @@ --ignore-theme-index -t Don't check for the existence of 'index.theme' in the icon - theme directory. Without this option, gtk-update-icon-cache-3.0 + theme directory. Without this option, gtk-update-icon-cache refuses to create an icon cache in a directory which does not appear to be the toplevel directory of an icon theme. @@ -104,5 +104,3 @@ None known yet. - - diff --git a/gtk/Makefile.am b/gtk/Makefile.am index d04e253256..215f305777 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -990,18 +990,18 @@ endif # bin_PROGRAMS = \ gtk-query-immodules-3.0 \ - gtk-update-icon-cache-3.0 + gtk-update-icon-cache -bin_SCRIPTS = gtk-builder-convert-3.0 +bin_SCRIPTS = gtk-builder-convert if OS_WIN32 # Workaround for UAC silliness: programs with "update" in their name # are believed to be installers and require elevated privileges to be # used... Use a manifest file to tell Windows that -# gtk-update-icon-cache-3.0.exe doesn't require any special privileges. +# gtk-update-icon-cache.exe doesn't require any special privileges. -GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache-3.0.exe.manifest +GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest bin_SCRIPTS += \ $(GTK_UPDATE_ICON_CACHE_MANIFEST) @@ -1011,7 +1011,7 @@ $(GTK_UPDATE_ICON_CACHE_MANIFEST): echo '' ; \ echo ' ' ; \ echo ' ' ; \ echo ' ' ; \ @@ -1031,8 +1031,8 @@ gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS) gtk_query_immodules_3_0_LDADD = $(LDADDS) gtk_query_immodules_3_0_SOURCES = queryimmodules.c -gtk_update_icon_cache_3_0_LDADD = $(GDK_PIXBUF_LIBS) -gtk_update_icon_cache_3_0_SOURCES = updateiconcache.c +gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) +gtk_update_icon_cache_SOURCES = updateiconcache.c .PHONY: files test test-debug @@ -1329,12 +1329,12 @@ if CROSS_COMPILING gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) else gtk_update_icon_cache_program = \ - ./gtk-update-icon-cache-3.0 + ./gtk-update-icon-cache endif gtkbuiltincache.h: @REBUILD@ stamp-icons - $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache-3.0$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) - $(gtk_update_icon_cache_program) --force --ignore-theme-index \ + $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) + $(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index \ --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ mv gtkbuiltincache.h.tmp gtkbuiltincache.h @@ -1348,7 +1348,7 @@ EXTRA_DIST += \ tree_minus.xpm \ tree_plus.xpm \ gtk.def \ - gtk-builder-convert-3.0 \ + gtk-builder-convert \ gtk-win32.rc \ gtk-win32.rc.in \ gtkwin32embed.h \ diff --git a/gtk/gtk-builder-convert-3.0 b/gtk/gtk-builder-convert similarity index 100% rename from gtk/gtk-builder-convert-3.0 rename to gtk/gtk-builder-convert diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 72c2029f2b..eb078f98f4 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -184,7 +184,7 @@ endif # install-data-am, and not install-exec-am. We need to ensure this gets run # after the libraries are installed in their final locations. install-data-hook: - @if $(RUN_QUERY_IMMODULES_TEST) ; then \ + $(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \ echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \ $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \ echo "$(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache" ; \ @@ -236,7 +236,7 @@ noinst_LTLIBRARIES = \ included-modules: $(noinst_LTLIBRARIES) immodules.cache: Makefile.am $(module_LTLIBRARIES) - $(top_builddir)/gtk/gtk-query-immodules-3.0 $(module_LTLIBRARIES) > immodules.cache + $(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-3.0 $(module_LTLIBRARIES) > immodules.cache EXTRA_DIST += README.multipress