# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1277249947 -3600
# Node ID 7562d97763115f90682d6003624969a6dab3f605
# Parent  331abb57831ca7987054a94d294d0742f893d199
Support visualvm.desktop, with path and version generation by configure.

2010-06-23  Andrew John Hughes  <ahughes@redhat.com>

	* Makefile.am: Install visualvm.desktop
	in ${datadir}.
	* configure.ac: Generate visualvm.desktop.
	* visualvm.desktop.in: Input file for visualvm.desktop,
	imported from IcedTea.

diff -r 331abb57831c -r 7562d9776311 ChangeLog
--- a/ChangeLog	Wed Jun 23 00:04:30 2010 +0100
+++ b/ChangeLog	Wed Jun 23 00:39:07 2010 +0100
@@ -1,3 +1,11 @@
+2010-06-23  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am: Install visualvm.desktop
+	in ${datadir}.
+	* configure.ac: Generate visualvm.desktop.
+	* visualvm.desktop.in: Input file for visualvm.desktop,
+	imported from IcedTea.
+
 2010-06-22  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
diff -r 331abb57831c -r 7562d9776311 Makefile.am
--- a/Makefile.am	Wed Jun 23 00:04:30 2010 +0100
+++ b/Makefile.am	Wed Jun 23 00:39:07 2010 +0100
@@ -146,6 +146,7 @@
 	mkdir -p $(bindir)
 	mkdir -p $(libdir)/visualvm/etc
 	mkdir -p $(libdir)/visualvm/visualvm
+	mkdir -p $(datadir)
 	sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \
 	  visualvm/launcher/visualvm >> \
 	  $(bindir)/jvisualvm
@@ -156,6 +157,7 @@
 	cp -r visualvm/build/cluster/* $(libdir)/visualvm/visualvm
 	cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) $(libdir)/visualvm
 	cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 $(libdir)/visualvm	
+	cp visualvm.desktop $(datadir)
 
 download-netbeans-profiler: stamps/download-netbeans-profiler.stamp
 
diff -r 331abb57831c -r 7562d9776311 configure.ac
--- a/configure.ac	Wed Jun 23 00:04:30 2010 +0100
+++ b/configure.ac	Wed Jun 23 00:39:07 2010 +0100
@@ -1,6 +1,6 @@
 AC_INIT([visualvm], [1.2.2], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile visualvm.desktop])
 
 # Older automake doesn't generate these correctly
 abs_top_builddir=`pwd -P`
diff -r 331abb57831c -r 7562d9776311 visualvm.desktop.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/visualvm.desktop.in	Wed Jun 23 00:39:07 2010 +0100
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=OpenJDK VisualVM
+Comment=Integrates commandline JDK tools and profiling capabilites.
+Exec=@prefix@/bin/jvisualvm
+Icon=java
+Terminal=false
+Type=Application
+Categories=Development;Java;
+Version=@PACKAGE_VERSION@