[visualvm] RFC: add support for building visualvm-1.3.3

[Jiri Vanek]

On 11/01/2011 09:29 PM, Omair Majid wrote:
> Hi,
>
> The attached patch adds support for building visualvm-1.3.3. I have not done any serious tests, but it builds fine on my machine. I intend to replace UPSTREAM_133_URL with BASE_CLASSPATH_URL once all the tarballs are available from icedtea.
>
> The patch looks for ${SYSTEM_NETBEANS_DIR}/platform13 but falls back to ${SYSTEM_NETBEANS_DIR}/platform if platform13 is not found. platform13 is the name used by some distributions (such as debian) while others use platform (like fedora).
Hi!

Looks Ok for me. I have uploaded sources for you to classpath, so you can get rid of  upstream url.
I think that when this is in, we can release harness 1.3 and build visualvm for f16.

Tyvm
   J.
>
> Any thoughts or comments?
>
> ChangeLog:
> 2011-11-01  Omair Majid <omajid at redhat.com>
>
>    * NEWS: Update.
>    * Makefile.am: Add NETBEANS_701_PROFILER_URL,
>    NETBEANS_701_PROFILER_SRC_ZIP, NETBEANS_701_PROFILER_SHA256SUM,
>    UPSTREAM_133_URL, VISUALVM_133_URL, VISUALVM_133_SRC_ZIP,
>    VISUALVM_133_SHA256SUM. Initialize variable if VVVERSION_133 is set.
>    * acinclude.m4 (VV_CHECK_FOR_NETBEANS): Check for platform13 or
>    platform dir.
>
> Cheers,
> Omair
>
>
> visualvm-1.3.3-support.patch
>
>
> diff -r 5b9565081674 Makefile.am
> --- a/Makefile.am	Tue Mar 22 13:10:03 2011 +0100
> +++ b/Makefile.am	Tue Nov 01 16:28:39 2011 -0400
> @@ -1,4 +1,5 @@
>   BASE_CLASSPATH_URL=http://icedtea.classpath.org/download/visualvm/
> +UPSTREAM_133_URL =http://java.net/downloads/visualvm/release133/
>
>   NETBEANS_68_PROFILER_URL = $(BASE_CLASSPATH_URL)
>   NETBEANS_68_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release68.tar.gz
> @@ -16,6 +17,10 @@
>   NETBEANS_691_1_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release691_1.tar.gz
>   NETBEANS_691_1_PROFILER_SHA256SUM = ee083f4417435ba7f398f1c3e65433a8a983aa68ef90d27385688991fab1c493
>
> +NETBEANS_701_PROFILER_URL = $(UPSTREAM_133_URL)
> +NETBEANS_701_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release701.tar.gz
> +NETBEANS_701_PROFILER_SHA256SUM = 0056c6b7da3fa9499b87319caa6b431b935b48f9579f7c94ec169777ecd2c238
> +
>   VISUALVM_122_URL = $(BASE_CLASSPATH_URL)
>   VISUALVM_122_SRC_ZIP = visualvm_122-src.tar.gz
>   VISUALVM_122_SHA256SUM = 1b1cd77354757d64ca902722bb9481e1292a88c4884ffea8af7bb47f8ae24af5
> @@ -32,6 +37,22 @@
>   VISUALVM_132_SRC_ZIP = visualvm_132-src.tar.gz
>   VISUALVM_132_SHA256SUM = 1ad1b87a1d8ce7ce1bb1700c10942c4fd2afd47e3f024448c593abc0dff8e163
>
> +VISUALVM_133_URL = $(UPSTREAM_133_URL)
> +VISUALVM_133_SRC_ZIP = visualvm_133-src.tar.gz
> +VISUALVM_133_SHA256SUM = 43f4d5c892d3654ada9d07f2a8dc1c1b98db671f558a5c7fa7e9db7e86b7ca81
> +
> +if VVVERSION_133
> +  NETBEANS_PROFILER_URL=$(NETBEANS_701_PROFILER_URL)
> +  NETBEANS_PROFILER_SRC_ZIP=$(NETBEANS_701_PROFILER_SRC_ZIP)
> +  NETBEANS_PROFILER_SHA256SUM=$(NETBEANS_701_PROFILER_SHA256SUM)
> +  VISUALVM_URL=$(VISUALVM_133_URL)
> +  VISUALVM_SRC_ZIP=$(VISUALVM_133_SRC_ZIP)
> +  VISUALVM_SHA256SUM=$(VISUALVM_133_SHA256SUM)
> +  NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm/platform
> +  NBBUILD_PROPERTIES=-Dpermit.jdk6.builds=true -Dpermit.jdk7.builds=true
> +  ADDITIONAL_DIRS=profiler.oql
> +  PROFILER=profile
> +else
>   if VVVERSION_132
>     NETBEANS_PROFILER_URL=$(NETBEANS_691_1_PROFILER_URL)
>     NETBEANS_PROFILER_SRC_ZIP=$(NETBEANS_691_1_PROFILER_SRC_ZIP)
> @@ -77,6 +98,7 @@
>   endif
>   endif
>   endif
> +endif
>
>   all: visualvm
>
> diff -r 5b9565081674 NEWS
> --- a/NEWS	Tue Mar 22 13:10:03 2011 +0100
> +++ b/NEWS	Tue Nov 01 16:28:39 2011 -0400
> @@ -8,6 +8,9 @@
>
>   CVE-XXXX-YYYY:http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
>
> +New in release 1.3 (2011-XX-XX):
> +* Support for VisualVM 1.3.3
> +
>   New in release 1.2 (2011-03-09):
>
>   * Support for VisualVM 1.3.2
> diff -r 5b9565081674 acinclude.m4
> --- a/acinclude.m4	Tue Mar 22 13:10:03 2011 +0100
> +++ b/acinclude.m4	Tue Nov 01 16:28:39 2011 -0400
> @@ -129,6 +129,7 @@
>     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"])
> +  AM_CONDITIONAL([VVVERSION_133], [test "$VVVERSION" = "1.3.3"])
>   ])
>
>   AC_DEFUN_ONCE([VV_CHECK_FOR_NETBEANS],
> @@ -151,7 +152,13 @@
>               ])
>   AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
>   AC_SUBST(SYSTEM_NETBEANS_DIR)
> -if test "$VVVERSION" = "1.3.2"; then
> +if test "$VVVERSION" = "1.3.3"; then
> +   if test -d "${SYSTEM_NETBEANS_DIR}/platform13" ; then
> +     NB_PLATFORM=platform13;
> +   else
> +     NB_PLATFORM=platform
> +   fi
> +else if test "$VVVERSION" = "1.3.2"; then
>      NB_PLATFORM=platform12;
>   else if test "$VVVERSION" = "1.3.1"; then
>      NB_PLATFORM=platform12;
> @@ -162,6 +169,7 @@
>   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