# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1287092423 -3600
# Node ID ba2ccec163d04ec94ac31ee75cad10d1b7d8f6ee
# Parent  12011c66e5207d937d06eb22f4f7b99fd5cd63e7
Support VisualVM 1.3.1.

2010-10-14  Tomas Hurka  <tomas.hurka@googlemail.com>>

	Support VisualVM 1.3.1.
	* INSTALL: Mention 1.3.1.
	* Makefile.am: Add settings for 1.3.1.
	* acinclude.m4: Define VVVERSION_131 if 1.3.1
	is requested.

diff -r 12011c66e520 -r ba2ccec163d0 ChangeLog
--- a/ChangeLog	Thu Sep 09 12:59:32 2010 +0100
+++ b/ChangeLog	Thu Oct 14 22:40:23 2010 +0100
@@ -1,3 +1,11 @@
+2010-10-14  Tomas Hurka  <tomas.hurka@googlemail.com>>
+
+	Support VisualVM 1.3.1.
+	* INSTALL: Mention 1.3.1.
+	* Makefile.am: Add settings for 1.3.1.
+	* acinclude.m4: Define VVVERSION_131 if 1.3.1
+	is requested.
+
 2010-09-09  Andrew John Hughes  <ahughes@redhat.com>
 
 	* configure.ac: Bump to 1.1pre.
diff -r 12011c66e520 -r ba2ccec163d0 INSTALL
--- a/INSTALL	Thu Sep 09 12:59:32 2010 +0100
+++ b/INSTALL	Thu Oct 14 22:40:23 2010 +0100
@@ -20,6 +20,7 @@
 
 * 1.2.2 with NetBeans 6.8
 * 1.3 with NetBeans 6.9
+* 1.3.1 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 12011c66e520 -r ba2ccec163d0 Makefile.am
--- a/Makefile.am	Thu Sep 09 12:59:32 2010 +0100
+++ b/Makefile.am	Thu Oct 14 22:40:23 2010 +0100
@@ -6,6 +6,10 @@
 NETBEANS_69_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release69.tar.gz
 NETBEANS_69_PROFILER_SHA256SUM = 201060e9ccb4243f7ff1bb490e66a23f3fb16d450892e15f9adbd0728ec0ec83
 
+NETBEANS_691_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/153051/
+NETBEANS_691_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release691.tar.gz
+NETBEANS_691_PROFILER_SHA256SUM = 9f0e285d983c29bab7aa4f0644d64618139b2967fae80a1ef2b96299bf00fcc0
+
 VISUALVM_122_URL = https://visualvm.dev.java.net/files/documents/7163/146746/
 VISUALVM_122_SRC_ZIP = visualvm_122-src.tar.gz
 VISUALVM_122_SHA256SUM = 1b1cd77354757d64ca902722bb9481e1292a88c4884ffea8af7bb47f8ae24af5
@@ -14,6 +18,22 @@
 VISUALVM_13_SRC_ZIP = visualvm_13-src.tar.gz
 VISUALVM_13_SHA256SUM = 18105c1e05347caac04830a8ee940219c573a5447d3cd9b084d6883c9ff07353
 
+VISUALVM_131_URL = https://visualvm.dev.java.net/files/documents/7163/153046/
+VISUALVM_131_SRC_ZIP = visualvm_131-src.tar.gz
+VISUALVM_131_SHA256SUM = 910a47e62a48c3fe576752d2d877360a2324d01814702cda5b5c4c8e2df2197a
+
+if VVVERSION_131
+  NETBEANS_PROFILER_URL=$(NETBEANS_691_PROFILER_URL)
+  NETBEANS_PROFILER_SRC_ZIP=$(NETBEANS_691_PROFILER_SRC_ZIP)
+  NETBEANS_PROFILER_SHA256SUM=$(NETBEANS_691_PROFILER_SHA256SUM)
+  VISUALVM_URL=$(VISUALVM_131_URL)
+  VISUALVM_SRC_ZIP=$(VISUALVM_131_SRC_ZIP)
+  VISUALVM_SHA256SUM=$(VISUALVM_131_SHA256SUM)
+  NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm/platform
+  NBPLATFORM_DIR_COPY=$(NBPLATFORM_DIR)
+  ADDITIONAL_DIRS=profiler.oql
+  PROFILER=profiler
+else
 if VVVERSION_13
   NETBEANS_PROFILER_URL=$(NETBEANS_69_PROFILER_URL)
   NETBEANS_PROFILER_SRC_ZIP=$(NETBEANS_69_PROFILER_SRC_ZIP)
@@ -37,6 +57,7 @@
   NBBUILD_PROPERTIES=-Dpermit.jdk6.builds=true -Dbuildnumber=091221-4fc006d17cb1
   PROFILER=profiler3
 endif
+endif
 
 all: visualvm
 
diff -r 12011c66e520 -r ba2ccec163d0 acinclude.m4
--- a/acinclude.m4	Thu Sep 09 12:59:32 2010 +0100
+++ b/acinclude.m4	Thu Oct 14 22:40:23 2010 +0100
@@ -127,6 +127,7 @@
   fi
   AC_MSG_RESULT([${VVVERSION}])
   AM_CONDITIONAL([VVVERSION_13], [test "$VVVERSION" = "1.3"])
+  AM_CONDITIONAL([VVVERSION_131], [test "$VVVERSION" = "1.3.1"])
 ])
 
 AC_DEFUN_ONCE([VV_CHECK_FOR_NETBEANS],
@@ -149,11 +150,14 @@
             ])
 AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
 AC_SUBST(SYSTEM_NETBEANS_DIR)
-if test "$VVVERSION" = "1.3"; then
+if test "$VVVERSION" = "1.3.1"; then
+   NB_PLATFORM=platform12;
+else if test "$VVVERSION" = "1.3"; then
    NB_PLATFORM=platform12;
 else
    NB_PLATFORM=platform11;
 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