/hg/visualvm: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Sep 8 12:32:31 PDT 2010
changeset 69b02bea9cf4 in /hg/visualvm
details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=69b02bea9cf4
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 08 17:11:14 2010 +0100
Ignore remaining autoconf files and clean empty stamps directory
post-build.
2010-09-08 Andrew John Hughes <ahughes at redhat.com>
* .hgignore: Add config.guess and config.sub.
* Makefile.am: (clean-local): Remove empty stamps directory.
changeset 11eff73a8d6d in /hg/visualvm
details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=11eff73a8d6d
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 08 19:55:06 2010 +0100
Add README and INSTALL files and set version ready for release.
2010-09-08 Andrew John Hughes <ahughes at redhat.com>
* INSTALL: Added.
* Makefile.am: (clean-local): Move stamps removal...
(distclean-local): ... to here.
* README: Added.
* configure.ac: Fix version to visualvm_harness 1.0 ready for
release.
changeset 37857184a6d9 in /hg/visualvm
details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=37857184a6d9
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 08 20:08:55 2010 +0100
PR546: Check for the NetBeans platform directory appropriate to the
version being built.
2010-09-08 Andrew John Hughes <ahughes at redhat.com>
PR546:
* Makefile.am: (NB_PLATFORM): Removed; defined by configure.
* acinclude.m4: (VV_WITH_NETBEANS_PROFILER_ZIP): Define once
only. (VV_WITH_VISUALVM_ZIP): Likewise.
(IT_CHECK_FOR_JDK): Likewise. (VV_SET_ARCH_SETTINGS):
Likewise. (VV_CHECK_WITH_VISUALVM_VERSION): Likewise.
(VV_CHECK_FOR_NETBEANS): Check that NetBeans home exists and
contains the appropriate platform for the version being
built.
* configure.ac: Call VV_CHECK_FOR_NETBEANS rather than doing
it inline.
changeset 8b1172973c70 in /hg/visualvm
details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=8b1172973c70
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 08 20:22:32 2010 +0100
Set NB_PLATFORM to a relative path as before.
2010-09-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (nbplatform): Remove trailing slash.
* acinclude.m4: (VV_CHECK_FOR_NETBEANS): Set NB_PLATFORM to
a relative path.
changeset 3538695338d9 in /hg/visualvm
details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=3538695338d9
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 08 20:31:33 2010 +0100
Added tag 1.0 for changeset 8b1172973c70
diffstat:
8 files changed, 166 insertions(+), 28 deletions(-)
.hgignore | 2 ++
.hgtags | 1 +
ChangeLog | 41 +++++++++++++++++++++++++++++++++++++++++
INSTALL | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 7 ++++---
README | 25 +++++++++++++++++++++++++
acinclude.m4 | 42 +++++++++++++++++++++++++++++++++++++-----
configure.ac | 22 ++--------------------
diffs (303 lines):
diff -r eb52a28e265d -r 3538695338d9 .hgignore
--- a/.hgignore Wed Sep 08 15:09:55 2010 +0100
+++ b/.hgignore Wed Sep 08 20:31:33 2010 +0100
@@ -4,3 +4,5 @@ configure
configure
install-sh
missing
+config.guess
+config.sub
diff -r eb52a28e265d -r 3538695338d9 .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags Wed Sep 08 20:31:33 2010 +0100
@@ -0,0 +1,1 @@
+8b1172973c70ab07f27468f719b6b34c96586779 1.0
diff -r eb52a28e265d -r 3538695338d9 ChangeLog
--- a/ChangeLog Wed Sep 08 15:09:55 2010 +0100
+++ b/ChangeLog Wed Sep 08 20:31:33 2010 +0100
@@ -1,3 +1,44 @@ 2010-09-08 Andrew John Hughes <ahughes
+2010-09-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (nbplatform): Remove trailing slash.
+ * acinclude.m4:
+ (VV_CHECK_FOR_NETBEANS): Set NB_PLATFORM to
+ a relative path.
+
+2010-09-08 Andrew John Hughes <ahughes at redhat.com>
+
+ PR546:
+ * Makefile.am:
+ (NB_PLATFORM): Removed; defined by configure.
+ * acinclude.m4:
+ (VV_WITH_NETBEANS_PROFILER_ZIP): Define once only.
+ (VV_WITH_VISUALVM_ZIP): Likewise.
+ (IT_CHECK_FOR_JDK): Likewise.
+ (VV_SET_ARCH_SETTINGS): Likewise.
+ (VV_CHECK_WITH_VISUALVM_VERSION): Likewise.
+ (VV_CHECK_FOR_NETBEANS): Check that NetBeans home
+ exists and contains the appropriate platform for
+ the version being built.
+ * configure.ac: Call VV_CHECK_FOR_NETBEANS rather
+ than doing it inline.
+
+2010-09-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * INSTALL: Added.
+ * Makefile.am:
+ (clean-local): Move stamps removal...
+ (distclean-local): ... to here.
+ * README: Added.
+ * configure.ac: Fix version to visualvm_harness
+ 1.0 ready for release.
+
+2010-09-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * .hgignore: Add config.guess and config.sub.
+ * Makefile.am:
+ (clean-local): Remove empty stamps directory.
+
2010-09-08 Andrew John Hughes <ahughes at redhat.com>
Support both 1.2.2 and 1.3.
diff -r eb52a28e265d -r 3538695338d9 INSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/INSTALL Wed Sep 08 20:31:33 2010 +0100
@@ -0,0 +1,54 @@
+Building VisualVM
+=================
+
+For convenience we've provided make targets that automatically
+download, extract and build the source code for VisualVM.
+
+Building requires a bootstrap JDK and an appropriate version of
+NetBeans. Currently, we support the use of IcedTea6 as packaged with
+most GNU/Linux distributions.
+
+See ./configure --help if you need to override the defaults.
+
+$ ./autogen.sh
+$ ./configure --prefix=<visualvm install location>
+$ make
+$ make install
+
+The default version is currently 1.2.2. Supported versions
+are:
+
+* 1.2.2 with NetBeans 6.8
+* 1.3 with NetBeans 6.9
+
+To build with a version other than the default, specify
+--with-visualvm-version=x where x is the version.
+
+VisualVM is installed in the specified prefix as with normal packages.
+To achieve the effect previously used when VisualVM was integrated
+into IcedTea, just use a prefix equal to the JDK's location.
+
+Build Modification Options
+==========================
+
+The build process may be modified by passing the following options
+to configure:
+
+* --with-netbeans-home: Specifies the path to the NetBeans installation
+ to use to build. Defaults to /usr/share/netbeans.
+* --with-jdk-home: Specifies teh path to the JDK to use to build.
+ The first of:
+
+ * /usr/lib/jvm/java-openjdk
+ * /usr/lib/jvm/icedtea6
+ * /usr/lib/jvm/java-6-openjdk
+ * /usr/lib/jvm/openjdk
+ * /usr/lib/jvm/java-icedtea
+
+ which is found to be present is used by default.
+* --with-netbeans-profiler-zip: The path to the appropriate NetBeans
+ profiler zip file to avoid downloading it.
+* --with-visualvm-zip: The path to the appropriate VisualVM zip file
+ to avoid downloading it.
+* --with-visualvm-version: Specify the version of VisualVM to build
+ from those supported. The default is 1.2.2.
diff -r eb52a28e265d -r 3538695338d9 Makefile.am
--- a/Makefile.am Wed Sep 08 15:09:55 2010 +0100
+++ b/Makefile.am Wed Sep 08 20:31:33 2010 +0100
@@ -13,8 +13,6 @@ VISUALVM_13_URL = https://visualvm.dev.j
VISUALVM_13_URL = https://visualvm.dev.java.net/files/documents/7163/151835/
VISUALVM_13_SRC_ZIP = visualvm_13-src.tar.gz
VISUALVM_13_SHA256SUM = 18105c1e05347caac04830a8ee940219c573a5447d3cd9b084d6883c9ff07353
-
-NB_PLATFORM = $(shell ls $(SYSTEM_NETBEANS_DIR) | grep platform | tail -n1)
if VVVERSION_13
NETBEANS_PROFILER_URL=$(NETBEANS_69_PROFILER_URL)
@@ -45,6 +43,9 @@ clean-local: clean-visualvm clean-nbplat
clean-local: clean-visualvm clean-nbplatform clean-extract
distclean-local: clean-local clean-download
+ if [ -e stamps ]; then \
+ rmdir stamps ; \
+ fi
stamps/download.stamp: stamps/download-netbeans-profiler.stamp stamps/download-visualvm.stamp
mkdir -p stamps
@@ -142,7 +143,7 @@ stamps/nbplatform.stamp: stamps/extract-
stamps/nbplatform.stamp: stamps/extract-netbeans-profiler.stamp
rm -f netbeans/nbbuild/external/binaries-list
mkdir -p netbeans/nbbuild/netbeans_visualvm/
- ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM)/ $(NBPLATFORM_DIR)
+ ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM) $(NBPLATFORM_DIR)
ln -s $(SYSTEM_NETBEANS_DIR)/harness/ netbeans/nbbuild/netbeans_visualvm
mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk15/linux-amd64
mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk16/linux-amd64
diff -r eb52a28e265d -r 3538695338d9 README
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/README Wed Sep 08 20:31:33 2010 +0100
@@ -0,0 +1,25 @@
+VisualVM Harness
+================
+
+The VisualVM harness is part of the IcedTea project and provides a
+means to build the source code of various versions of VisualVM
+(https://visualvm.dev.java.net/) using Free Software tools and
+dependencies.
+
+See INSTALL for build instructions.
+
+Homepage (wiki):
+ http://icedtea.classpath.org/
+
+Bugs (bugzilla):
+ http://icedtea.classpath.org/bugzilla
+
+Mailing List:
+ distro-pkg-dev at openjdk.java.net
+ http://mail.openjdk.java.net/mailman/listinfo/distro-pkg-dev
+
+FAQ:
+ http://icedtea.classpath.org/wiki/FrequentlyAskedQuestions
+
+Anonymous Mercurial checkout:
+ hg clone http://icedtea.classpath.org/hg/visualvm
diff -r eb52a28e265d -r 3538695338d9 acinclude.m4
--- a/acinclude.m4 Wed Sep 08 15:09:55 2010 +0100
+++ b/acinclude.m4 Wed Sep 08 20:31:33 2010 +0100
@@ -1,4 +1,4 @@ AC_DEFUN([VV_WITH_NETBEANS_PROFILER_ZIP]
-AC_DEFUN([VV_WITH_NETBEANS_PROFILER_ZIP],
+AC_DEFUN_ONCE([VV_WITH_NETBEANS_PROFILER_ZIP],
[
AC_MSG_CHECKING(for a NetBeans profiler zip)
AC_ARG_WITH([netbeans-profiler-zip],
@@ -14,7 +14,7 @@ AC_DEFUN([VV_WITH_NETBEANS_PROFILER_ZIP]
AC_SUBST(ALT_NETBEANS_PROFILER_ZIP)
])
-AC_DEFUN([VV_WITH_VISUALVM_ZIP],
+AC_DEFUN_ONCE([VV_WITH_VISUALVM_ZIP],
[
AC_MSG_CHECKING(for a VisualVM zip)
AC_ARG_WITH([visualvm-zip],
@@ -30,7 +30,7 @@ AC_DEFUN([VV_WITH_VISUALVM_ZIP],
AC_SUBST(ALT_VISUALVM_ZIP)
])
-AC_DEFUN([IT_CHECK_FOR_JDK],
+AC_DEFUN_ONCE([IT_CHECK_FOR_JDK],
[
AC_MSG_CHECKING([for a JDK home directory])
AC_ARG_WITH([jdk-home],
@@ -76,7 +76,7 @@ AC_DEFUN([IT_FIND_TOOL],
AC_SUBST([$1])
])
-AC_DEFUN([VV_SET_ARCH_SETTINGS],
+AC_DEFUN_ONCE([VV_SET_ARCH_SETTINGS],
[
AC_REQUIRE([AC_CANONICAL_HOST])
case "${host_cpu}" in
@@ -108,7 +108,7 @@ AC_DEFUN([VV_SET_ARCH_SETTINGS],
AC_SUBST(ARCHFLAG)
])
-AC_DEFUN([VV_CHECK_WITH_VISUALVM_VERSION],
+AC_DEFUN_ONCE([VV_CHECK_WITH_VISUALVM_VERSION],
[
DEFAULT_VERSION="1.2.2"
AC_MSG_CHECKING([which VisualVM version to build])
@@ -128,3 +128,35 @@ AC_DEFUN([VV_CHECK_WITH_VISUALVM_VERSION
AC_MSG_RESULT([${VVVERSION}])
AM_CONDITIONAL([VVVERSION_13], [test "$VVVERSION" = "1.3"])
])
+
+AC_DEFUN_ONCE([VV_CHECK_FOR_NETBEANS],
+[
+AC_REQUIRE([VV_CHECK_WITH_VISUALVM_VERSION])
+AC_MSG_CHECKING([for a NetBeans installation])
+AC_ARG_WITH([netbeans-home],
+ [AS_HELP_STRING([--with-netbeans-home],
+ [NetBeans home directory (default is /usr/share/netbeans)])],
+ [
+ if test "x${withval}" = x
+ then
+ SYSTEM_NETBEANS_DIR=/usr/share/netbeans
+ else
+ SYSTEM_NETBEANS_DIR=${withval}
+ fi
+ ],
+ [
+ SYSTEM_NETBEANS_DIR=/usr/share/netbeans
+ ])
+AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
+AC_SUBST(SYSTEM_NETBEANS_DIR)
+if test "$VVVERSION" = "1.3"; then
+ NB_PLATFORM=platform12;
+else
+ NB_PLATFORM=platform11;
+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
+AC_SUBST([NB_PLATFORM])
+])
+
diff -r eb52a28e265d -r 3538695338d9 configure.ac
--- a/configure.ac Wed Sep 08 15:09:55 2010 +0100
+++ b/configure.ac Wed Sep 08 20:31:33 2010 +0100
@@ -1,4 +1,4 @@ AC_INIT([visualvm], [1.2.2], [distro-pkg
-AC_INIT([visualvm], [1.2.2], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([visualvm_harness], [1.0], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile visualvm.desktop])
@@ -13,24 +13,6 @@ AC_SUBST(abs_top_srcdir)
AC_PROG_CC
-AC_MSG_CHECKING([for a NetBeans installation])
-AC_ARG_WITH([netbeans-home],
- [AS_HELP_STRING([--with-netbeans-home],
- [NetBeans home directory (default is /usr/share/netbeans)])],
- [
- if test "x${withval}" = x
- then
- SYSTEM_NETBEANS_DIR=/usr/share/netbeans
- else
- SYSTEM_NETBEANS_DIR=${withval}
- fi
- ],
- [
- SYSTEM_NETBEANS_DIR=/usr/share/netbeans
- ])
-AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
-AC_SUBST(SYSTEM_NETBEANS_DIR)
-
IT_CHECK_FOR_JDK
IT_FIND_TOOL([ANT], [ant])
IT_FIND_TOOL([SHA256SUM], [sha256sum])
@@ -40,6 +22,6 @@ VV_SET_ARCH_SETTINGS
VV_SET_ARCH_SETTINGS
VV_WITH_NETBEANS_PROFILER_ZIP
VV_WITH_VISUALVM_ZIP
-VV_CHECK_WITH_VISUALVM_VERSION
+VV_CHECK_FOR_NETBEANS
AC_OUTPUT
More information about the distro-pkg-dev
mailing list