/hg/release/icedtea6-1.10: backported "resolves rhbz#580478, is ...

[jvanek at icedtea.classpath.org]

changeset fec5c1edeb55 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=fec5c1edeb55
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Jan 25 14:57:48 2012 +0100

	backported "resolves rhbz#580478, is adding full paths to desktop
	files"


diffstat:

 ChangeLog             |  12 ++++++++++++
 configure.ac          |  26 +++++++++++++++-----------
 jconsole.desktop      |  10 ----------
 jconsole.desktop.in   |  10 ++++++++++
 policytool.desktop    |  10 ----------
 policytool.desktop.in |  10 ++++++++++
 6 files changed, 47 insertions(+), 31 deletions(-)

diffs (120 lines):

diff -r d6b24f481e6c -r fec5c1edeb55 ChangeLog
--- a/ChangeLog	Thu Jan 12 13:10:28 2012 +0000
+++ b/ChangeLog	Wed Jan 25 14:57:48 2012 +0100
@@ -1,3 +1,15 @@
+2012-01-25  Jiri Vanek  <jvanek at redhat.com>
+
+	fixes rhbz#580478
+	* configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block
+	 Added policytool.desktop and jconsole.desktop as AC_CONFIG_FILES
+	* jconsole.desktop:  removed, replaced by jconsole.desktop.in
+	* jconsole.desktop.in: new file, stub for desktop file, have variable
+	to be substituted during configure
+	* policytool.desktop:  removed, replaced by policytool.desktop.in
+	* policytool.desktop.in: new file, stub for desktop file, have variable
+	to be substituted during configure 
+
 2012-01-12  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Add 1.10.6.
diff -r d6b24f481e6c -r fec5c1edeb55 configure.ac
--- a/configure.ac	Thu Jan 12 13:10:28 2012 +0000
+++ b/configure.ac	Wed Jan 25 14:57:48 2012 +0100
@@ -264,6 +264,21 @@
   fi
 fi
 
+AC_MSG_CHECKING([for absolute java home install dir])
+AC_ARG_WITH([abs-install-dir],
+	    [AS_HELP_STRING([--with-abs-install-dir], 
+			    [The absolute path where the j2sdk-image dir will be installed])],
+	    [if test "x${withval}" = x; then
+		ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"
+	     else
+		ABS_JAVA_HOME_DIR="${withval}"
+	     fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"])
+AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}])
+AC_SUBST(ABS_JAVA_HOME_DIR)
+
+AC_CONFIG_FILES([jconsole.desktop])
+AC_CONFIG_FILES([policytool.desktop])
+
 if test "x${ENABLE_SYSTEMTAP}" = xyes; then
 AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'],
                 [SDT_H_FOUND='no';
@@ -305,19 +320,8 @@
 ]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([systemtap sdt.h or g++ too old])])
   AC_LANG_POP([C++])
 
-  AC_MSG_CHECKING([for absolute java home install dir])
-  AC_ARG_WITH([abs-install-dir],
-	      [AS_HELP_STRING([--with-abs-install-dir], 
-			      [The absolute path where the j2sdk-image dir will be installed])],
-	      [if test "x${withval}" = x; then
-		 ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"
-	       else
-		 ABS_JAVA_HOME_DIR="${withval}"
-	       fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"])
-  AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}])
   ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so"
   ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so"
-  AC_SUBST(ABS_JAVA_HOME_DIR)
   AC_SUBST(ABS_CLIENT_LIBJVM_SO)
   AC_SUBST(ABS_SERVER_LIBJVM_SO)
   AC_CONFIG_FILES([tapset/hotspot.stp])
diff -r d6b24f481e6c -r fec5c1edeb55 jconsole.desktop
--- a/jconsole.desktop	Thu Jan 12 13:10:28 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Monitoring & Management Console
-Comment=Monitor and manage OpenJDK applications
-Exec=/usr/bin/jconsole
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Monitor;Java;
-Version=1.0
diff -r d6b24f481e6c -r fec5c1edeb55 jconsole.desktop.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jconsole.desktop.in	Wed Jan 25 14:57:48 2012 +0100
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=OpenJDK Monitoring & Management Console
+Comment=Monitor and manage OpenJDK applications
+Exec=@ABS_JAVA_HOME_DIR@/bin/jconsole
+Icon=java
+Terminal=false
+Type=Application
+StartupWMClass=sun-tools-jconsole-JConsole
+Categories=Development;Monitor;Java;
+Version=1.0
diff -r d6b24f481e6c -r fec5c1edeb55 policytool.desktop
--- a/policytool.desktop	Thu Jan 12 13:10:28 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Policy Tool
-Comment=Manage OpenJDK policy files
-Exec=/usr/bin/policytool
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-security-tools-PolicyTool
-Categories=Development;Java;
-Version=1.0
diff -r d6b24f481e6c -r fec5c1edeb55 policytool.desktop.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policytool.desktop.in	Wed Jan 25 14:57:48 2012 +0100
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=OpenJDK Policy Tool
+Comment=Manage OpenJDK policy files
+Exec=@ABS_JAVA_HOME_DIR@/bin/policytool
+Icon=java
+Terminal=false
+Type=Application
+StartupWMClass=sun-security-tools-PolicyTool
+Categories=Development;Java;
+Version=1.0