# HG changeset patch
# User Emmanuel Bourg <ebourg@apache.org>
# Date 1398868451 -7200
# Node ID 0c205b349623a7c33a52767709a5dee45a6654d8
# Parent  15c584d48dc079acfa4da14b8057a052e18fb3b2
Support VisualVM 1.3.6 and 1.3.7

diff -r 15c584d48dc0 -r 0c205b349623 Makefile.am
--- a/Makefile.am	Wed Dec 14 11:10:15 2011 +0100
+++ b/Makefile.am	Wed Apr 30 16:34:11 2014 +0200
@@ -1,4 +1,5 @@
 BASE_CLASSPATH_URL=http://icedtea.classpath.org/download/visualvm/
+BASE_UPSTREAM_URL=https://java.net/downloads/visualvm
 
 NETBEANS_68_PROFILER_URL = $(BASE_CLASSPATH_URL)
 NETBEANS_68_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release68.tar.gz
@@ -20,6 +21,18 @@
 NETBEANS_701_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release701.tar.gz
 NETBEANS_701_PROFILER_SHA256SUM = 0056c6b7da3fa9499b87319caa6b431b935b48f9579f7c94ec169777ecd2c238
 
+NETBEANS_711_PROFILER_URL = $(BASE_UPSTREAM_URL)/release134/
+NETBEANS_711_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release711.tar.gz
+NETBEANS_711_PROFILER_SHA256SUM = ddca17aa2fc8350aff79c2f0561f204f3e58ef29ac693a25609ee485afbc8e69
+
+NETBEANS_731_PROFILER_URL = $(BASE_UPSTREAM_URL)/release136/
+NETBEANS_731_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release731.tar.gz
+NETBEANS_731_PROFILER_SHA256SUM = 3e2674de14a9104725e75db102a49684aa36b094bd61e1575502a0292f4c3802
+
+NETBEANS_741_PROFILER_URL = $(BASE_UPSTREAM_URL)/release137/
+NETBEANS_741_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release741.tar.gz
+NETBEANS_741_PROFILER_SHA256SUM = c3f2812c9d0ce2a1a3732f67a9104afcce62848bd990d5e75b1a4da7e883dabf
+
 VISUALVM_122_URL = $(BASE_CLASSPATH_URL)
 VISUALVM_122_SRC_ZIP = visualvm_122-src.tar.gz
 VISUALVM_122_SHA256SUM = 1b1cd77354757d64ca902722bb9481e1292a88c4884ffea8af7bb47f8ae24af5
@@ -40,6 +53,54 @@
 VISUALVM_133_SRC_ZIP = visualvm_133-src.tar.gz
 VISUALVM_133_SHA256SUM = 43f4d5c892d3654ada9d07f2a8dc1c1b98db671f558a5c7fa7e9db7e86b7ca81
 
+VISUALVM_134_URL = $(BASE_UPSTREAM_URL)/release134/
+VISUALVM_134_SRC_ZIP = visualvm_134-src.tar.gz
+VISUALVM_134_SHA256SUM = 9c9d950338e0029484577edd255140f0dd28d33ebec7d20f953ad3e16f68ac61
+
+VISUALVM_136_URL = $(BASE_UPSTREAM_URL)/release136/
+VISUALVM_136_SRC_ZIP = visualvm_136-src.tar.gz
+VISUALVM_136_SHA256SUM = f7939435b9edf410ca1cbd6630945ef5753edfa58538a8c7d3ed11020dd44f42
+
+VISUALVM_137_URL = $(BASE_UPSTREAM_URL)/release137/
+VISUALVM_137_SRC_ZIP = visualvm_137-src.tar.gz
+VISUALVM_137_SHA256SUM = be68844bf107235414c758dae9748235e8a89c9cc0ddad924736f27769c050e3
+
+if VVVERSION_137
+  NETBEANS_PROFILER_URL=$(NETBEANS_741_PROFILER_URL)
+  NETBEANS_PROFILER_SRC_ZIP=$(NETBEANS_741_PROFILER_SRC_ZIP)
+  NETBEANS_PROFILER_SHA256SUM=$(NETBEANS_741_PROFILER_SHA256SUM)
+  VISUALVM_URL=$(VISUALVM_137_URL)
+  VISUALVM_SRC_ZIP=$(VISUALVM_137_SRC_ZIP)
+  VISUALVM_SHA256SUM=$(VISUALVM_137_SHA256SUM)
+  NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm/platform
+  NBBUILD_PROPERTIES=-Dpermit.jdk6.builds=true -Dpermit.jdk7.builds=true
+  ADDITIONAL_DIRS=profiler.oql profiler.snaptracer profiler.heapwalker
+  PROFILER=profiler
+else
+if VVVERSION_136
+  NETBEANS_PROFILER_URL=$(NETBEANS_731_PROFILER_URL)
+  NETBEANS_PROFILER_SRC_ZIP=$(NETBEANS_731_PROFILER_SRC_ZIP)
+  NETBEANS_PROFILER_SHA256SUM=$(NETBEANS_731_PROFILER_SHA256SUM)
+  VISUALVM_URL=$(VISUALVM_136_URL)
+  VISUALVM_SRC_ZIP=$(VISUALVM_136_SRC_ZIP)
+  VISUALVM_SHA256SUM=$(VISUALVM_136_SHA256SUM)
+  NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm/platform
+  NBBUILD_PROPERTIES=-Dpermit.jdk6.builds=true -Dpermit.jdk7.builds=true
+  ADDITIONAL_DIRS=profiler.oql profiler.snaptracer profiler.heapwalker
+  PROFILER=profiler
+else
+if VVVERSION_134
+  NETBEANS_PROFILER_URL=$(NETBEANS_711_PROFILER_URL)
+  NETBEANS_PROFILER_SRC_ZIP=$(NETBEANS_711_PROFILER_SRC_ZIP)
+  NETBEANS_PROFILER_SHA256SUM=$(NETBEANS_711_PROFILER_SHA256SUM)
+  VISUALVM_URL=$(VISUALVM_134_URL)
+  VISUALVM_SRC_ZIP=$(VISUALVM_134_SRC_ZIP)
+  VISUALVM_SHA256SUM=$(VISUALVM_134_SHA256SUM)
+  NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm/platform
+  NBBUILD_PROPERTIES=-Dpermit.jdk6.builds=true -Dpermit.jdk7.builds=true
+  ADDITIONAL_DIRS=profiler.oql
+  PROFILER=profiler
+else
 if VVVERSION_133
   NETBEANS_PROFILER_URL=$(NETBEANS_701_PROFILER_URL)
   NETBEANS_PROFILER_SRC_ZIP=$(NETBEANS_701_PROFILER_SRC_ZIP)
@@ -98,6 +159,9 @@
 endif
 endif
 endif
+endif
+endif
+endif
 
 all: visualvm
 
diff -r 15c584d48dc0 -r 0c205b349623 acinclude.m4
--- a/acinclude.m4	Wed Dec 14 11:10:15 2011 +0100
+++ b/acinclude.m4	Wed Apr 30 16:34:11 2014 +0200
@@ -110,7 +110,7 @@
 
 AC_DEFUN_ONCE([VV_CHECK_WITH_VISUALVM_VERSION],
 [
-  DEFAULT_VERSION="1.2.2"
+  DEFAULT_VERSION="1.3.7"
   AC_MSG_CHECKING([which VisualVM version to build])
   AC_ARG_WITH([visualvm-version],
 	      [AS_HELP_STRING(--with-visualvm-version,the VisualVM version to build (see Makefile.am))],
@@ -130,6 +130,9 @@
   AM_CONDITIONAL([VVVERSION_131], [test "$VVVERSION" = "1.3.1"])
   AM_CONDITIONAL([VVVERSION_132], [test "$VVVERSION" = "1.3.2"])
   AM_CONDITIONAL([VVVERSION_133], [test "$VVVERSION" = "1.3.3"])
+  AM_CONDITIONAL([VVVERSION_134], [test "$VVVERSION" = "1.3.4"])
+  AM_CONDITIONAL([VVVERSION_136], [test "$VVVERSION" = "1.3.6"])
+  AM_CONDITIONAL([VVVERSION_137], [test "$VVVERSION" = "1.3.7"])
 ])
 
 AC_DEFUN_ONCE([VV_CHECK_FOR_NETBEANS],
@@ -152,7 +155,13 @@
             ])
 AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
 AC_SUBST(SYSTEM_NETBEANS_DIR)
-if test "$VVVERSION" = "1.3.3"; then
+if test "$VVVERSION" = "1.3.7"; then
+   NB_PLATFORM=platform18;
+else if test "$VVVERSION" = "1.3.6"; then
+   NB_PLATFORM=platform18;
+else if test "$VVVERSION" = "1.3.4"; then
+   NB_PLATFORM=platform14;
+else if test "$VVVERSION" = "1.3.3"; then
    NB_PLATFORM=platform13;
 else if test "$VVVERSION" = "1.3.2"; then
    NB_PLATFORM=platform12;
@@ -166,6 +175,9 @@
 fi
 fi
 fi
+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