Mercurial > hg > release > icedtea6-1.3

changeset 1064:09dcedbe63a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-10-02 Lillian Angel <langel@redhat.com> * HACKING: Updated with new visualvm patch. * INSTALL: Updated to include netbeans in requirements. * Makefile.am: Updated to build and install visualvm with system-installed NetBeans 6.1 (currently in Fedora rawhide). Added new visualvm patch to the list and removed need for NetBeans platform sources. * README: Updated visualvm notes. * acinclude.m4: Updated to find netbeans and removed WITH_NETBEANS_PLATFORM_SRC_ZIP check. * configure.ac: Updated to check for netbeans and added --with-netbeans-home option. * patches/icedtea-visualvm.patch: Visualvm patch.
author Lillian Angel <langel@redhat.com>
date Thu, 02 Oct 2008 10:55:55 -0400
parents f4981f8a1720
children fc63d0674a46 868547baa028
files ChangeLog HACKING INSTALL Makefile.am README acinclude.m4 configure.ac patches/icedtea-visualvm.patch
diffstat 8 files changed, 177 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 01 05:52:01 2008 -0400
+++ b/ChangeLog	Thu Oct 02 10:55:55 2008 -0400
@@ -1,3 +1,18 @@
+2008-10-02  Lillian Angel  <langel@redhat.com>
+
+	* HACKING: Updated with new visualvm patch.
+	* INSTALL: Updated to include netbeans in requirements.
+	* Makefile.am: Updated to build and install visualvm with
+	system-installed NetBeans 6.1 (currently in Fedora rawhide). Added new
+	visualvm patch to the list and removed need for NetBeans platform
+	sources.
+	* README: Updated visualvm notes.
+	* acinclude.m4: Updated to find netbeans and removed
+	WITH_NETBEANS_PLATFORM_SRC_ZIP check.
+	* configure.ac: Updated to check for netbeans and added
+	--with-netbeans-home option.
+	* patches/icedtea-visualvm.patch: Visualvm patch.
+
 2008-10-01  Gary Benson  <gbenson@redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkState.cpp: Remove a
--- a/HACKING	Wed Oct 01 05:52:01 2008 -0400
+++ b/HACKING	Thu Oct 02 10:55:55 2008 -0400
@@ -53,6 +53,7 @@
 * icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti.
 * icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486).
 * icedtea-version.patch: Replace name and bug URL with IcedTea versions.
+* icedtea-visualvm.patch: Patches sources to build with platform8 and profiler3 instead of platform7 and profiler2.
 * icedtea-webservices.patch: Add applet support.
 * icedtea-zero-build.patch: Add support for the zero assembler build.
 * icedtea-shark-build.patch: Add support for building the Shark JIT.
--- a/INSTALL	Wed Oct 01 05:52:01 2008 -0400
+++ b/INSTALL	Thu Oct 02 10:55:55 2008 -0400
@@ -30,6 +30,7 @@
 libjpeg-devel = 6b
 zlib-devel
 rhino
+netbeans (harness, platform8, apisupport1, java2, ide9) - for visualvm
 
 For building the zero-assembler port (see below), you will need libffi.
 
--- a/Makefile.am	Wed Oct 01 05:52:01 2008 -0400
+++ b/Makefile.am	Thu Oct 02 10:55:55 2008 -0400
@@ -5,7 +5,7 @@
 CACAO_VERSION = 0.99.3
 CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
 
-NETBEANS_PLATFORM_MD5SUM = 77c79b3a7d3dbe6a8858639f8d564a38
+NETBEANS_BASIC_CLUSTER = a7ea855f475fa3a982f094a45c155ab4
 NETBEANS_PROFILER_MD5SUM = ff8e8abc42df6c6749e6b02bcf7bb0a5
 VISUALVM_MD5SUM = 4b55bc623418818793392bb233da2927
 
@@ -19,8 +19,8 @@
 ICEDTEAPLUGIN_CLEAN =
 ICEDTEAPLUGIN_TARGET =
 ICEDTEAPLUGIN_JAR =
+LIVECONNECT =
 PLUGIN_PATCH = patches/icedtea-plugin.patch
-LIVECONNECT = 
 if ENABLE_PLUGIN
 GCJWEBPLUGIN_CLEAN = clean-gcjwebplugin
 GCJWEBPLUGIN_TARGET = gcjwebplugin.so
@@ -30,6 +30,12 @@
 endif
 endif
 
+if WITH_VISUALVM
+VISUALVM_PATCH = patches/icedtea-visualvm.patch
+else
+VISUALVM_PATCH = 
+endif
+
 # Top-Level Targets
 # =================
 
@@ -48,19 +54,15 @@
 	rm -rf hotspot-tools
 if ENABLE_LIVECONNECT
 	rm -f IcedTeaPlugin.so
-	rm -rf IcedTeaPlugin.jar
+	rm -f IcedTeaPlugin.jar
 else
 if ENABLE_PLUGIN
 	rm -f gcjwebplugin.so
 endif
 endif
-if WITH_VISUALVM
+	rm -rf cacao
 	rm -rf visualvm
 	rm -rf netbeans
-endif
-if WITH_CACAO
-	rm -rf cacao
-endif
 
 install:
 
@@ -83,7 +85,7 @@
 	overlays extra jconsole.desktop policytool.desktop \
 	test/jtreg patches/icedtea-plugin.patch \
 	patches/icedtea-liveconnect.patch IcedTeaPlugin.cc \
-	HACKING
+	HACKING patches/icedtea-visualvm.patch
 
 # The Binary plugs directory is called jdk1.7.0 for historical reasons. The
 # name is completely irrelevant; only contains the plugs to build IcedTea.
@@ -280,13 +282,8 @@
   CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
 endif
 
-NETBEANS_PLATFORM_URL = http://download.netbeans.org/netbeans/6.0/final/zip/
-
-if USE_ALT_NETBEANS_PLATFORM_SRC_ZIP
-  NETBEANS_PLATFORM_SRC_ZIP = $(ALT_NETBEANS_PLATFORM_SRC_ZIP)
-else
-  NETBEANS_PLATFORM_SRC_ZIP = netbeans-6.0.1-200801291616-platform-src.zip
-endif
+NETBEANS_BASIC_CLUSTER_URL = http://nbi.netbeans.org/files/documents/210/2056/
+NETBEANS_BASIC_CLUSTER_SRC_ZIP = netbeans-6.1-200805300101-basic_cluster-src.zip 
 
 NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/
 
@@ -334,19 +331,17 @@
 endif
 endif
 if WITH_VISUALVM
-if USE_ALT_NETBEANS_PLATFORM_SRC_ZIP
-else
-	if ! echo "$(NETBEANS_PLATFORM_MD5SUM) $(NETBEANS_PLATFORM_SRC_ZIP)" \
+	if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \
 	  | $(MD5SUM) --check ; \
 	then \
-	  if [ $(NETBEANS_PLATFORM_SRC_ZIP) ] ; \
+	  if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \
 	  then \
-	    mv $(NETBEANS_PLATFORM_SRC_ZIP) $(NETBEANS_PLATFORM_SRC_ZIP).old ; \
+	    mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \
 	  fi ; \
-	  $(WGET) $(NETBEANS_PLATFORM_URL)$(NETBEANS_PLATFORM_SRC_ZIP) \
-	    -O $(NETBEANS_PLATFORM_SRC_ZIP) ; \
+	$(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
+	  -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \
 	fi
-endif
+
 if USE_ALT_NETBEANS_PROFILER_SRC_ZIP
 else
 	if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
@@ -384,8 +379,8 @@
 endif
 if WITH_VISUALVM
 	rm -f $(VISUALVM_SRC_ZIP) 
-	rm -f $(NETBEANS_PLATFORM_SRC_ZIP) 
 	rm -f $(NETBEANS_PROFILER_SRC_ZIP)
+	rm -rf $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)
 endif
 
 # Link ports sources into tree
@@ -510,7 +505,8 @@
 	$(GCC_PATCH) \
 	patches/icedtea-arch.patch \
 	patches/icedtea-lc_ctype.patch \
-	patches/icedtea-messageutils.patch
+	patches/icedtea-messageutils.patch \
+	$(VISUALVM_PATCH)
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -550,8 +546,17 @@
 	if ! test -d netbeans ; \
 	then \
 	  mkdir netbeans ; \
-	  $(UNZIP) -q $(NETBEANS_PLATFORM_SRC_ZIP) -d netbeans ; \
 	  $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \
+	  $(UNZIP) -q $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) nbbuild/* -d netbeans/ ; \
+	  mv netbeans/profiler/ netbeans/profiler.cvs/ ; \
+	  $(UNZIP) -q $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
+	  api.java/* api.progress/* apisupport.harness/* editor.mimelookup/* \
+	  o.jdesktop.layout/* openide.actions/* openide.awt/* \
+	  openide.dialogs/* openide.execution/* openide.explorer/* \
+	  openide.filesystems/* openide.io/* openide.loaders/* \
+	  openide.modules/* openide.nodes/* openide.text/* openide.util/* \
+	  openide.windows/* options.api/* projectapi/* queries/* java.platform/* \
+	  -d netbeans/ ; \
 	fi
 endif
 	if [ ! -e $(abs_top_builddir)/generated ]; then \
@@ -595,6 +600,7 @@
 	  echo WARNING make clean-patch before retrying a fix ; \
 	  false; \
 	fi
+
 if ENABLE_LIVECONNECT
 	cp -a plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
 endif
@@ -936,6 +942,7 @@
 endif
 if WITH_VISUALVM
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
+	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
 	sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \
 	  visualvm/visualvm/launcher/visualvm >> \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
@@ -944,18 +951,18 @@
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
 	echo visualvm >> \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
-	echo profiler2 >> \
+	echo profiler3 >> \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
-	cp -r visualvm/visualvm/build/cluster \
+	cp -r visualvm/visualvm/build/cluster/* \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
-	cp -r netbeans/nbbuild/netbeans/platform7 \
+	cp -r netbeans/nbbuild/netbeans/platform8 \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
-	cp -r netbeans/nbbuild/netbeans/profiler2 \
+	cp -r netbeans/nbbuild/netbeans/profiler3 \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm
 endif
 	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
 	  extra-lib/about.jar \
-	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
+	  $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \
 	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
@@ -989,9 +996,29 @@
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
 endif
 endif
+if WITH_VISUALVM
+	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
+	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
+	sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \
+	  visualvm/visualvm/launcher/visualvm >> \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
+	chmod a+x $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
+	cp visualvm/visualvm/launcher/visualvm.conf \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
+	echo visualvm >> \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
+	echo profiler3 >> \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
+	cp -r visualvm/visualvm/build/cluster/* \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
+	cp -r netbeans/nbbuild/netbeans/platform8 \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
+	cp -r netbeans/nbbuild/netbeans/profiler3 \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm
+endif
 	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  extra-lib/about.jar \
-	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
+	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib ; \
 	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
@@ -1247,10 +1274,10 @@
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAR) cf $@ -C lib/rt com -C lib/rt java \
-            -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
+	    -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
-            -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
+	    -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
 	fi
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \
@@ -1326,7 +1353,6 @@
 	  $(GTK_CFLAGS) \
 	  $(XULRUNNER_CFLAGS) \
 	  -fPIC -c -o $@ $<
-
 IcedTeaPlugin.so: IcedTeaPlugin.o
 	$(CXX) $(CXXFLAGS) \
 	  $< \
@@ -1427,7 +1453,8 @@
 	stamps/extract.stamp stamps/nbplatform.stamp
 if WITH_VISUALVM
 	cd visualvm/visualvm ; \
-	ln -s $(abs_top_srcdir)/netbeans/nbbuild/netbeans netbeans ; \
+	ln -s $(abs_top_srcdir)/netbeans/nbbuild/netbeans . ; \
+	rm netbeans/profiler3 && mv netbeans/extra netbeans/profiler3 ; \
 	JAVA_HOME=$(ICEDTEA_HOME) $(ANT) build
 endif
 	mkdir -p stamps
@@ -1442,10 +1469,18 @@
 stamps/nbplatform.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/extract.stamp \
 	stamps/download.stamp
 if WITH_VISUALVM
-	cd netbeans/nbbuild && JAVA_HOME=$(ICEDTEA_HOME) $(ANT) \
-	  -Dpermit.jdk6.builds=true build-platform ; \
-	cd ../profiler && find . -iname '*.so' | xargs rm ; \
-	cd libs/jfluid/native/build ; \
+	cd netbeans ; \
+	ln -s $(abs_top_srcdir)/netbeans/profiler.cvs/libs/jfluid/ lib.profiler ; \
+	ln -s $(abs_top_srcdir)/netbeans/profiler.cvs/libs/common/ lib.profiler.common ; \
+	ln -s $(abs_top_srcdir)/netbeans/profiler.cvs/libs/jfluid-ui/ lib.profiler.ui ; \
+	ln -s $(abs_top_srcdir)/netbeans/profiler.cvs/modules/nbmodule/ profiler.nbmodule ; \
+	mkdir -p ./nbbuild/netbeans/ ; \
+	ln -s $(SYSTEM_NETBEANS_DIR)/platform8/ ./nbbuild/netbeans/platform8 ; \
+	ln -s $(SYSTEM_NETBEANS_DIR)/apisupport1/ ./nbbuild/netbeans/apisupport1 ; \
+	ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans/harness ; \
+	ln -s $(SYSTEM_NETBEANS_DIR)/java2/ ./nbbuild/netbeans/java2 ; \
+	ln -s $(SYSTEM_NETBEANS_DIR)/ide9/ ./nbbuild/netbeans/ide9 ; \
+	cd profiler.cvs/libs/jfluid/native/build ; \
 	if ! (uname -a | grep x86_64) ; then \
 	  buildscript=./buildnative-linux-15.sh ; \
 	else \
@@ -1453,13 +1488,15 @@
 	fi ; \
 	JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \
 	  $$buildscript ; \
-	cd ../../../.. ; \
+	cd ../../../../.. ; \
+	ln -s $(abs_top_srcdir)/netbeans/nbbuild/netbeans/extra nbbuild/netbeans/profiler3 ; \
+	ln -s $(abs_top_srcdir)/netbeans/profiler.cvs/modules/main/ profiler ; \
 	for dir in jfluid jfluid-ui common ; do \
 	  JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \
-	    -f libs/$$dir/build.xml ; \
+	    -f profiler.cvs/libs/$$dir/build.xml ; \
 	done ; \
 	JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \
-	  -f modules/main/build.xml ;
+	  -f profiler.cvs/modules/main/build.xml ;
 endif
 	mkdir -p stamps
 	touch $@
--- a/README	Wed Oct 01 05:52:01 2008 -0400
+++ b/README	Thu Oct 02 10:55:55 2008 -0400
@@ -151,10 +151,11 @@
 ========
 
 Passing --enable-visualvm to configure will build the VisualVM profiling
-and troubleshooting tool. NetBeans platform7 and a modified version of
-NetBeans profiler2 (visualvm_preview2) are built from source before building
-VisualVM. A binary launcher jvisualvm is placed in the
+and troubleshooting tool. NetBeans profiler3 (visualvm_preview2) is 
+built from source before building VisualVM. NetBeans 6.1 must be installed 
+on the system. A binary launcher jvisualvm is placed in the
 openjdk/control/build/arch/j2sdk-image/bin directory after the jdk is built.
 Other useful VisualVM configure options include --with-visualvm-src-zip,
---with-netbeans-platform-src-zip, and --with-netbeans-profiler-src-zip which
-can be used to prevent re-downloading of the source zips.
+and --with-netbeans-profiler-src-zip which can be used to prevent 
+re-downloading of the source zips. --with-netbeans-home can be used to specify
+where the Netbeans tools are installed (default /usr/share/netbeans).
--- a/acinclude.m4	Wed Oct 01 05:52:01 2008 -0400
+++ b/acinclude.m4	Thu Oct 02 10:55:55 2008 -0400
@@ -456,23 +456,6 @@
   AC_SUBST(ALT_VISUALVM_SRC_ZIP)
 ])
 
-AC_DEFUN([WITH_NETBEANS_PLATFORM_SRC_ZIP],
-[
-  AC_MSG_CHECKING(netbeans platform source zip)
-  AC_ARG_WITH([netbeans-platform-src-zip],
-              [AS_HELP_STRING(--with-netbeans-platform-src-zip, specify the location of the netbeans platform source zip)],
-  [
-    ALT_NETBEANS_PLATFORM_SRC_ZIP=${withval}
-    AM_CONDITIONAL(USE_ALT_NETBEANS_PLATFORM_SRC_ZIP, test x = x)
-  ],
-  [ 
-    ALT_NETBEANS_PLATFORM_SRC_ZIP="not specified"
-    AM_CONDITIONAL(USE_ALT_NETBEANS_PLATFORM_SRC_ZIP, test x != x)
-  ])
-  AC_MSG_RESULT(${ALT_NETBEANS_PLATFORM_SRC_ZIP})
-  AC_SUBST(ALT_NETBEANS_PLATFORM_SRC_ZIP)
-])
-
 AC_DEFUN([WITH_NETBEANS_PROFILER_SRC_ZIP],
 [
   AC_MSG_CHECKING(netbeans profiler source zip)
@@ -615,6 +598,31 @@
   AC_SUBST(XERCES2_JAR)
 ])
 
+AC_DEFUN([FIND_NETBEANS],
+[
+  AC_ARG_WITH([netbeans],
+              [AS_HELP_STRING(--with-netbeans,specify location of netbeans)],
+  [
+    if test -f "${withval}"; then
+      AC_MSG_CHECKING(netbeans)
+      NETBEANS="${withval}"
+      AC_MSG_RESULT(${withval})
+    else
+      AC_PATH_PROG(NETBEANS, "${withval}")
+    fi
+  ],
+  [
+    NETBEANS=
+  ])
+  if test -z "${NETBEANS}"; then
+    AC_PATH_PROG(NETBEANS, "netbeans")
+  fi
+  if test -z "${NETBEANS}"; then
+    AC_MSG_ERROR("NetBeans was not found.")
+  fi
+  AC_SUBST(NETBEANS)
+])
+
 AC_DEFUN([FIND_RHINO_JAR],
 [
   AC_MSG_CHECKING(whether to include Javascript support via Rhino)
--- a/configure.ac	Wed Oct 01 05:52:01 2008 -0400
+++ b/configure.ac	Thu Oct 02 10:55:55 2008 -0400
@@ -82,6 +82,22 @@
             ])
 AC_SUBST(SYSTEM_ICEDTEA_DIR)
 
+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_SUBST(SYSTEM_NETBEANS_DIR)
+
 AC_ARG_WITH([ant-home],
             [AS_HELP_STRING([--with-ant-home],
                             [Ant home directory (default is /usr/share/ant)])],
@@ -122,6 +138,11 @@
               [enable_visualvm="yes"], [enable_visualvm="no"])
 AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes")
 
+if test "x${enable_visualvm}" = "xyes"
+then
+  FIND_NETBEANS
+fi
+
 AC_ARG_WITH([icedtea],
         [AS_HELP_STRING([--with-icedtea],
                         [build IcedTea with system-installed IcedTea])],
@@ -214,10 +235,10 @@
 fi
 fi
 FIND_RHINO_JAR
+FIND_NETBEANS
 WITH_OPENJDK_SRC_ZIP
 WITH_OPENJDK_SRC_DIR
 WITH_VISUALVM_SRC_ZIP
-WITH_NETBEANS_PLATFORM_SRC_ZIP
 WITH_NETBEANS_PROFILER_SRC_ZIP
 WITH_ALT_JAR_BINARY
 AC_CHECK_WITH_CACAO
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-visualvm.patch	Thu Oct 02 10:55:55 2008 -0400
@@ -0,0 +1,26 @@
+--- oldplatform.properties	2008-09-29 13:52:36.000000000 -0400
++++ visualvm/visualvm/jvm/nbproject/platform.properties	2008-09-29 13:53:33.000000000 -0400
+@@ -16,8 +16,8 @@
+     org.openide.compat,\
+     org.openide.util.enumerations
+ enabled.clusters=\
+-    platform7,\
+-    profiler2
++    platform8,\
++    profiler3
+ nbjdk.active=Java_HotSpot_TM__Client_VM_1.6.0-b88-17-release
+ nbplatform.active=NetBeans_Platform_Dev_(Build_200711261600)
+ suite.dir=${basedir}
+--- oldplatform.properties1	2008-09-29 13:52:46.000000000 -0400
++++ visualvm/visualvm/nbproject/platform.properties	2008-09-29 13:53:41.000000000 -0400
+@@ -15,8 +15,8 @@
+     org.openide.compat,\
+     org.openide.util.enumerations
+ enabled.clusters=\
+-    platform7,\
+-    profiler2
++    platform8,\
++    profiler3
+ nbjdk.active=default
+ nbplatform.active=NetBeans_Platform_6.0.1_(Build_200801291616)
+ suite.dir=${basedir}