From 9954cced34d69a40425cdc7e7c586ea19fd3c7f1 Mon Sep 17 00:00:00 2001 From: Ben Maurer Date: Sun, 16 Jan 2005 19:05:24 +0000 Subject: [PATCH] In src/viewer/gui-gtk: 2005-01-16 Ben Maurer * Shell.cs (OnOpen): Add filter for heap prof files In .: 2005-01-16 Ben Maurer * configure.in: Add some checks for mime type crap * Makefile.am (SUBDIRS): Add mime-data In mime-data: 2005-01-16 Ben Maurer * Makefile.am, mono-heap-prof.xml: install mime data for the profile dump. svn path=/trunk/heap-prof/; revision=38994 --- ChangeLog | 6 ++++++ Makefile.am | 2 +- configure.in | 27 ++++++++++++++++++++++++++- mime-data/ChangeLog | 5 +++++ mime-data/Makefile.am | 14 ++++++++++++++ mime-data/mono-heap-prof.xml | 12 ++++++++++++ src/viewer/gui-gtk/ChangeLog | 4 ++++ src/viewer/gui-gtk/Shell.cs | 12 ++++++++++++ 8 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 mime-data/ChangeLog create mode 100644 mime-data/Makefile.am create mode 100644 mime-data/mono-heap-prof.xml diff --git a/ChangeLog b/ChangeLog index 01b7ec6..26622cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-01-16 Ben Maurer + + * configure.in: Add some checks for mime type crap + + * Makefile.am (SUBDIRS): Add mime-data + 2005-01-15 Ben Maurer * mono.patch: update the patch for looking at the gc heap size. diff --git a/Makefile.am b/Makefile.am index f963eff..1b6fc35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = src \ No newline at end of file +SUBDIRS = src mime-data diff --git a/configure.in b/configure.in index 90ab403..5dbaf97 100644 --- a/configure.in +++ b/configure.in @@ -6,13 +6,38 @@ AC_PROG_LIBTOOL PKG_CHECK_MODULES(CCOMPILE, mono glib-2.0) PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 gtk-dotnet-2.0) +AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) + +if test "x$UPDATE_MIME_DATABASE" = "xno" ; then +enable_xdgmime="no" +else +enable_xdgmime="yes" +fi + +AM_CONDITIONAL(ENABLE_XDGMIME, test "x$enable_xdgmime" = "xyes") + AC_PATH_PROG(MCS, mcs) AC_PATH_PROG(MONO, mono) AC_OUTPUT([ Makefile +mime-data/Makefile src/Makefile src/runtime-profiler/Makefile src/viewer/Makefile src/viewer/mono-heap-prof-view -]) \ No newline at end of file +]) + +echo "---" +echo "Configuration summary" +echo "" +echo " * Installation prefix = $prefix" +echo " * XDG Mime Data = $enable_xdgmime" +echo "" +echo " NOTE: if any of the above say 'no' you may install the" +echo " corresponding development packages for them, and" +echo " rerun autogen.sh. If you are sure the proper" +echo " libraries are installed, use PKG_CONFIG_PATH to" +echo " point to their .pc files" +echo "" +echo "---" diff --git a/mime-data/ChangeLog b/mime-data/ChangeLog new file mode 100644 index 0000000..9a14557 --- /dev/null +++ b/mime-data/ChangeLog @@ -0,0 +1,5 @@ +2005-01-16 Ben Maurer + + * Makefile.am, mono-heap-prof.xml: install mime data for the + profile dump. + diff --git a/mime-data/Makefile.am b/mime-data/Makefile.am new file mode 100644 index 0000000..01ad21a --- /dev/null +++ b/mime-data/Makefile.am @@ -0,0 +1,14 @@ + +if ENABLE_XDGMIME + +xdgmimedir = $(prefix)/share/mime/packages +xdgmime_DATA = mono-heap-prof.xml + +install-data-hook: + $(UPDATE_MIME_DATABASE) $(prefix)/share/mime + + +uninstall-hook: + $(UPDATE_MIME_DATABASE) $(prefix)/share/mime + +endif diff --git a/mime-data/mono-heap-prof.xml b/mime-data/mono-heap-prof.xml new file mode 100644 index 0000000..d394ad5 --- /dev/null +++ b/mime-data/mono-heap-prof.xml @@ -0,0 +1,12 @@ + + + + Mono Heap Profile + Mono Heap Profile + + + + + + diff --git a/src/viewer/gui-gtk/ChangeLog b/src/viewer/gui-gtk/ChangeLog index 8f97b77..67a59df 100644 --- a/src/viewer/gui-gtk/ChangeLog +++ b/src/viewer/gui-gtk/ChangeLog @@ -1,3 +1,7 @@ +2005-01-16 Ben Maurer + + * Shell.cs (OnOpen): Add filter for heap prof files + 2005-01-11 Ben Maurer * TypeGraphViewer.cs: Make the TypeListTreeNode a list only node diff --git a/src/viewer/gui-gtk/Shell.cs b/src/viewer/gui-gtk/Shell.cs index 20a2f4c..4a1980e 100644 --- a/src/viewer/gui-gtk/Shell.cs +++ b/src/viewer/gui-gtk/Shell.cs @@ -84,6 +84,18 @@ void OnOpen (object obj, EventArgs args) fd.AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel); fd.AddButton (Gtk.Stock.Open, Gtk.ResponseType.Ok); + FileFilter filter_all = new FileFilter (); + filter_all.AddPattern ("*"); + filter_all.Name = "All Files"; + + FileFilter filter_prof = new FileFilter (); + filter_prof.AddMimeType ("application/x-mono-heap-prof"); + filter_prof.Name = "Mono Heap Profiles"; + + fd.AddFilter (filter_all); + fd.AddFilter (filter_prof); + fd.Filter = filter_prof; + if (fd.Run () == (int) ResponseType.Ok) s = fd.Filename;