/hg/visualvm: Updated for support 1.3.2

[jvanek at icedtea.classpath.org]

changeset 45b57bad723b in /hg/visualvm
details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=45b57bad723b
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Mar 08 11:13:35 2011 +0100

	Updated for support 1.3.2


diffstat:

 ChangeLog    |   8 ++++++++
 INSTALL      |   1 +
 Makefile.am  |  20 ++++++++++++++++++++
 acinclude.m4 |   6 +++++-
 4 files changed, 34 insertions(+), 1 deletions(-)

diffs (100 lines):

diff -r c54fdee46ffc -r 45b57bad723b ChangeLog
--- a/ChangeLog	Mon Mar 07 14:30:58 2011 +0100
+++ b/ChangeLog	Tue Mar 08 11:13:35 2011 +0100
@@ -1,3 +1,11 @@
+2011-03-08  Tomas Hurka  <tomas.hurka at googlemail.com>>
+
+        Support VisualVM 1.3.2.
+        * INSTALL: Mention 1.3.2.
+        * Makefile.am: Add settings for 1.3.2.
+        * acinclude.m4: Define VVVERSION_132 if 1.3.2
+        is requested.
+
 2011-03-07  Tomas Hurka  <tomas.hurka at googlemail.com>
 
 	* Makefile.am: changed urls of sources' tarballs.
diff -r c54fdee46ffc -r 45b57bad723b INSTALL
--- a/INSTALL	Mon Mar 07 14:30:58 2011 +0100
+++ b/INSTALL	Tue Mar 08 11:13:35 2011 +0100
@@ -21,6 +21,7 @@
 * 1.2.2 with NetBeans 6.8
 * 1.3 with NetBeans 6.9
 * 1.3.1 with NetBeans Platform 6.9.1
+* 1.3.2 with NetBeans Platform 6.9.1
 
 To build with a version other than the default, specify
 --with-visualvm-version=x where x is the version.
diff -r c54fdee46ffc -r 45b57bad723b Makefile.am
--- a/Makefile.am	Mon Mar 07 14:30:58 2011 +0100
+++ b/Makefile.am	Tue Mar 08 11:13:35 2011 +0100
@@ -10,6 +10,10 @@
 NETBEANS_691_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release691.tar.gz
 NETBEANS_691_PROFILER_SHA256SUM = 9f0e285d983c29bab7aa4f0644d64618139b2967fae80a1ef2b96299bf00fcc0
 
+NETBEANS_691_1_PROFILER_URL = http://java.net/projects/visualvm/downloads/download/release132/
+NETBEANS_691_1_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release691.tar.gz
+NETBEANS_691_1_PROFILER_SHA256SUM = ee083f4417435ba7f398f1c3e65433a8a983aa68ef90d27385688991fab1c493
+
 VISUALVM_122_URL = http://java.net/projects/visualvm/downloads/download/release122/
 VISUALVM_122_SRC_ZIP = visualvm_122-src.tar.gz
 VISUALVM_122_SHA256SUM = 1b1cd77354757d64ca902722bb9481e1292a88c4884ffea8af7bb47f8ae24af5
@@ -22,6 +26,21 @@
 VISUALVM_131_SRC_ZIP = visualvm_131-src.tar.gz
 VISUALVM_131_SHA256SUM = 910a47e62a48c3fe576752d2d877360a2324d01814702cda5b5c4c8e2df2197a
 
+VISUALVM_132_URL = http://java.net/projects/visualvm/downloads/download/release132/
+VISUALVM_132_SRC_ZIP = visualvm_132-src.tar.gz
+VISUALVM_132_SHA256SUM = 1ad1b87a1d8ce7ce1bb1700c10942c4fd2afd47e3f024448c593abc0dff8e163
+
+if VVVERSION_132
+  NETBEANS_PROFILER_URL=$(NETBEANS_691_1_PROFILER_URL)
+  NETBEANS_PROFILER_SRC_ZIP=$(NETBEANS_691_1_PROFILER_SRC_ZIP)
+  NETBEANS_PROFILER_SHA256SUM=$(NETBEANS_691_1_PROFILER_SHA256SUM)
+  VISUALVM_URL=$(VISUALVM_132_URL)
+  VISUALVM_SRC_ZIP=$(VISUALVM_132_SRC_ZIP)
+  VISUALVM_SHA256SUM=$(VISUALVM_132_SHA256SUM)
+  NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm/platform
+  ADDITIONAL_DIRS=profiler.oql
+  PROFILER=profiler
+else
 if VVVERSION_131
   NETBEANS_PROFILER_URL=$(NETBEANS_691_PROFILER_URL)
   NETBEANS_PROFILER_SRC_ZIP=$(NETBEANS_691_PROFILER_SRC_ZIP)
@@ -55,6 +74,7 @@
   PROFILER=profiler3
 endif
 endif
+endif
 
 all: visualvm
 
diff -r c54fdee46ffc -r 45b57bad723b acinclude.m4
--- a/acinclude.m4	Mon Mar 07 14:30:58 2011 +0100
+++ b/acinclude.m4	Tue Mar 08 11:13:35 2011 +0100
@@ -128,6 +128,7 @@
   AC_MSG_RESULT([${VVVERSION}])
   AM_CONDITIONAL([VVVERSION_13], [test "$VVVERSION" = "1.3"])
   AM_CONDITIONAL([VVVERSION_131], [test "$VVVERSION" = "1.3.1"])
+  AM_CONDITIONAL([VVVERSION_132], [test "$VVVERSION" = "1.3.2"])
 ])
 
 AC_DEFUN_ONCE([VV_CHECK_FOR_NETBEANS],
@@ -150,7 +151,9 @@
             ])
 AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
 AC_SUBST(SYSTEM_NETBEANS_DIR)
-if test "$VVVERSION" = "1.3.1"; then
+if test "$VVVERSION" = "1.3.2"; then
+   NB_PLATFORM=platform12;
+else if test "$VVVERSION" = "1.3.1"; then
    NB_PLATFORM=platform12;
 else if test "$VVVERSION" = "1.3"; then
    NB_PLATFORM=platform12;
@@ -158,6 +161,7 @@
    NB_PLATFORM=platform11;
 fi
 fi
+fi
 if ! test -d ${SYSTEM_NETBEANS_DIR}/${NB_PLATFORM} ; then
   AC_MSG_ERROR([Couldn't find NetBeans platform directory: ${SYSTEM_NETBEANS_DIR}/${NB_PLATFORM}])
 fi