# HG changeset patch # User Lillian Angel # Date 1232473411 18000 # Node ID bfe44d820632558b010cf300c7380fcd59d5cd16 # Parent 15b39cd337dcd10f4e03d7256dd3551db52dc5b1 2009-01-20 Lillian Angel * HACKING: Removed visualvm patch. * INSTALL: Updated to remove visualvm notes. * Makefile.am: Removed building of netbeans and visualvm. * README: Updated to remove visualvm notes. * acinclude.m4: Removed options for netbeans and visualvm. * configure.ac: Likewise. * patches/icedtea-visualvm.patch: Removed. * visualvm.desktop: Removed. diff -r 15b39cd337dc -r bfe44d820632 ChangeLog --- a/ChangeLog Tue Jan 20 15:28:47 2009 +0100 +++ b/ChangeLog Tue Jan 20 12:43:31 2009 -0500 @@ -1,3 +1,14 @@ +2009-01-20 Lillian Angel + + * HACKING: Removed visualvm patch. + * INSTALL: Updated to remove visualvm notes. + * Makefile.am: Removed building of netbeans and visualvm. + * README: Updated to remove visualvm notes. + * acinclude.m4: Removed options for netbeans and visualvm. + * configure.ac: Likewise. + * patches/icedtea-visualvm.patch: Removed. + * visualvm.desktop: Removed. + 2009-01-20 Gary Benson Matthias Klose diff -r 15b39cd337dc -r bfe44d820632 HACKING --- a/HACKING Tue Jan 20 15:28:47 2009 +0100 +++ b/HACKING Tue Jan 20 12:43:31 2009 -0500 @@ -54,7 +54,6 @@ * 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. diff -r 15b39cd337dc -r bfe44d820632 INSTALL --- a/INSTALL Tue Jan 20 15:28:47 2009 +0100 +++ b/INSTALL Tue Jan 20 12:43:31 2009 -0500 @@ -31,10 +31,6 @@ zlib-devel rhino (can be disabled using --without-rhino) -For building VisualVM, you will need: -netbeans (harness, platform8, apisupport1, java2, ide9) -jakarta-commons-logging - For building the PulseAudio based mixer, you will need pulseaudio-libs-devel >= 0.9.11 pulseaudio >= 0.9.11 diff -r 15b39cd337dc -r bfe44d820632 Makefile.am --- a/Makefile.am Tue Jan 20 15:28:47 2009 +0100 +++ b/Makefile.am Tue Jan 20 12:43:31 2009 -0500 @@ -5,10 +5,6 @@ CACAO_VERSION = 0.99.3 CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8 -NETBEANS_BASIC_CLUSTER = a7ea855f475fa3a982f094a45c155ab4 -NETBEANS_PROFILER_MD5SUM = ff8e8abc42df6c6749e6b02bcf7bb0a5 -VISUALVM_MD5SUM = 4b55bc623418818793392bb233da2927 - if ENABLE_GCJWEBPLUGIN GCJWEBPLUGIN_CLEAN = clean-gcjwebplugin GCJWEBPLUGIN_TARGET = gcjwebplugin.so @@ -41,12 +37,6 @@ PULSE_JAVA_CLASS_DIR = endif -if WITH_VISUALVM -VISUALVM_PATCH = patches/icedtea-visualvm.patch -else -VISUALVM_PATCH = -endif - if WITH_ALT_HSBUILD HOTSPOT_MAKE_DIR = make else @@ -78,8 +68,6 @@ endif endif rm -rf cacao - rm -rf visualvm - rm -rf netbeans rm -f jni-common.o install: @@ -93,13 +81,13 @@ clean-tools-jar clean-shared-objects \ clean-copy clean-hotspot-tools clean-rt $(GCJWEBPLUGIN_CLEAN) \ $(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \ - clean-jtreg clean-jtreg-reports clean-visualvm clean-nbplatform + clean-jtreg clean-jtreg-reports EXTRA_DIST = rt generated \ patches/* \ gcjwebplugin.cc tools-copy contrib ports \ extra overlays \ - javaws.png javaws.desktop visualvm.desktop \ + javaws.png javaws.desktop \ jconsole.desktop policytool.desktop \ test/jtreg \ IcedTeaPlugin.cc \ @@ -316,30 +304,6 @@ CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz endif -NETBEANS_BASIC_CLUSTER_URL = http://nbi.netbeans.org/files/documents/210/2056/ - -if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP - NETBEANS_BASIC_CLUSTER_SRC_ZIP = $(ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP) -else - NETBEANS_BASIC_CLUSTER_SRC_ZIP = netbeans-6.1-200805300101-basic_cluster-src.zip -endif - -NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/ - -if USE_ALT_NETBEANS_PROFILER_SRC_ZIP - NETBEANS_PROFILER_SRC_ZIP = $(ALT_NETBEANS_PROFILER_SRC_ZIP) -else - NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_preview2.tar.gz -endif - -VISUALVM_URL = http://icedtea.classpath.org/visualvm/ - -if USE_ALT_VISUALVM_SRC_ZIP - VISUALVM_SRC_ZIP = $(ALT_VISUALVM_SRC_ZIP) -else - VISUALVM_SRC_ZIP = visualvm-20081031-src.tar.gz -endif - stamps/hgforest.stamp: if OPENJDK_SRC_DIR_FOUND else @@ -417,46 +381,6 @@ endif endif endif -if WITH_VISUALVM -if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP -else - if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \ - then \ - mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \ - fi ; \ - $(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)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \ - then \ - mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \ - -O $(NETBEANS_PROFILER_SRC_ZIP) ; \ - fi -endif -if USE_ALT_VISUALVM_SRC_ZIP -else - if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(VISUALVM_SRC_ZIP) ] ; \ - then \ - mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \ - fi -endif -endif mkdir -p stamps touch stamps/download.stamp @@ -469,11 +393,6 @@ if WITH_CACAO rm -f $(CACAO_SRC_ZIP) endif -if WITH_VISUALVM - rm -f $(VISUALVM_SRC_ZIP) - rm -f $(NETBEANS_PROFILER_SRC_ZIP) - rm -rf $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) -endif # Link ports sources into tree stamps/ports.stamp: stamps/extract.stamp @@ -629,7 +548,6 @@ patches/icedtea-arch.patch \ patches/icedtea-lc_ctype.patch \ patches/icedtea-messageutils.patch \ - $(VISUALVM_PATCH) \ patches/icedtea-javac-debuginfo.patch \ patches/icedtea-xjc.patch \ patches/icedtea-renderer-crossing.patch \ @@ -731,27 +649,6 @@ fi endif endif -if WITH_VISUALVM - if ! test -d visualvm ; \ - then \ - $(TAR) xf $(VISUALVM_SRC_ZIP) ; \ - fi - if ! test -d netbeans ; \ - then \ - mkdir 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 \ cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \ find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \ @@ -1119,7 +1016,7 @@ stamps/hotspot-tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ $(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \ - extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \ + extra-lib/about.jar stamps/cacao.stamp \ stamps/pulse-java.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ @@ -1148,26 +1045,6 @@ cp -pPRf pulse-java.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext 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/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ @@ -1211,26 +1088,6 @@ cp -pPRf pulse-java.jar \ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/ext 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 ; \ @@ -1804,64 +1661,6 @@ dist-openjdk-fsg: stamps/patch-fsg.stamp $(ZIP) -r openjdk-fsg-$(OPENJDK_VERSION) openjdk/ -# VisualVM - -stamps/visualvm.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/download.stamp \ - stamps/extract.stamp stamps/nbplatform.stamp -if WITH_VISUALVM - cd visualvm/visualvm ; \ - 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 - touch $@ - -clean-visualvm: - rm -rf visualvm - rm -f stamps/visualvm.stamp - -# Netbeans platform and profiler - -stamps/nbplatform.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/extract.stamp \ - stamps/download.stamp -if WITH_VISUALVM - 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 ! ($(ARCH_PREFIX) uname -a | grep x86_64) ; then \ - buildscript=./buildnative-linux-15.sh ; \ - else \ - buildscript=./buildnative-linux64-15.sh ; \ - fi ; \ - JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \ - $$buildscript ; \ - 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 profiler.cvs/libs/$$dir/build.xml ; \ - done ; \ - JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \ - -f profiler.cvs/modules/main/build.xml ; -endif - mkdir -p stamps - touch $@ - -clean-nbplatform: - rm -rf netbeans - rm -f stamps/nbplatform.stamp - # Target Aliases # =============== @@ -1875,10 +1674,6 @@ cacao: stamps/cacao.stamp -visualvm: stamps/visualvm.stamp - -nbplatform: stamps/nbplatform.stamp - copy-source-files: stamps/copy-source-files.stamp download: stamps/download.stamp diff -r 15b39cd337dc -r bfe44d820632 README --- a/README Tue Jan 20 15:28:47 2009 +0100 +++ b/README Tue Jan 20 12:43:31 2009 -0500 @@ -147,20 +147,6 @@ The environment variable CACAO_CONFIGURE_ARGS can be used to pass additional arguments to the cacao configure. -VisualVM -======== - -Passing --enable-visualvm to configure will build the VisualVM profiling -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, -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). - - PulseAudio Mixer ================ diff -r 15b39cd337dc -r bfe44d820632 acinclude.m4 --- a/acinclude.m4 Tue Jan 20 15:28:47 2009 +0100 +++ b/acinclude.m4 Tue Jan 20 12:43:31 2009 -0500 @@ -445,57 +445,6 @@ AC_SUBST(ALT_OPENJDK_SRC_ZIP) ]) -AC_DEFUN([WITH_VISUALVM_SRC_ZIP], -[ - AC_MSG_CHECKING(for a VisualVM source zip) - AC_ARG_WITH([visualvm-src-zip], - [AS_HELP_STRING(--with-visualvm-src-zip, specify the location of the visualvm source zip)], - [ - ALT_VISUALVM_SRC_ZIP=${withval} - AM_CONDITIONAL(USE_ALT_VISUALVM_SRC_ZIP, test x = x) - ], - [ - ALT_VISUALVM_SRC_ZIP="not specified" - AM_CONDITIONAL(USE_ALT_VISUALVM_SRC_ZIP, test x != x) - ]) - AC_MSG_RESULT(${ALT_VISUALVM_SRC_ZIP}) - AC_SUBST(ALT_VISUALVM_SRC_ZIP) -]) - -AC_DEFUN([WITH_NETBEANS_PROFILER_SRC_ZIP], -[ - AC_MSG_CHECKING(for a NetBeans profiler source zip) - AC_ARG_WITH([netbeans-profiler-src-zip], - [AS_HELP_STRING(--with-netbeans-profiler-src-zip, specify the location of the netbeans profiler source zip)], - [ - ALT_NETBEANS_PROFILER_SRC_ZIP=${withval} - AM_CONDITIONAL(USE_ALT_NETBEANS_PROFILER_SRC_ZIP, test x = x) - ], - [ - ALT_NETBEANS_PROFILER_SRC_ZIP="not specified" - AM_CONDITIONAL(USE_ALT_NETBEANS_PROFILER_SRC_ZIP, test x != x) - ]) - AC_MSG_RESULT(${ALT_NETBEANS_PROFILER_SRC_ZIP}) - AC_SUBST(ALT_NETBEANS_PROFILER_SRC_ZIP) -]) - -AC_DEFUN([WITH_NETBEANS_BASIC_CLUSTER_SRC_ZIP], -[ - AC_MSG_CHECKING(for a NetBeans basic cluster source zip) - AC_ARG_WITH([netbeans-basic-cluster-src-zip], - [AS_HELP_STRING(--with-netbeans-basic-cluster-src-zip, specify the location of the netbeans basic cluster source zip)], - [ - ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP=${withval} - AM_CONDITIONAL(USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP, test x = x) - ], - [ - ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP="not specified" - AM_CONDITIONAL(USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP, test x != x) - ]) - AC_MSG_RESULT(${ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP}) - AC_SUBST(ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP) -]) - AC_DEFUN([WITH_ALT_JAR_BINARY], [ AC_MSG_CHECKING(for an alternate jar command) @@ -608,31 +557,6 @@ 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) diff -r 15b39cd337dc -r bfe44d820632 configure.ac --- a/configure.ac Tue Jan 20 15:28:47 2009 +0100 +++ b/configure.ac Tue Jan 20 12:43:31 2009 -0500 @@ -73,24 +73,6 @@ AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" = true) AC_MSG_RESULT(${with_openjdk}) -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) - AC_MSG_CHECKING(for Ant home directory) AC_ARG_WITH([ant-home], [AS_HELP_STRING([--with-ant-home], @@ -149,18 +131,6 @@ AM_CONDITIONAL([ENABLE_XRENDER], [test x$ENABLE_XRENDER = xyes]) AC_MSG_RESULT(${ENABLE_XRENDER}) -AC_MSG_CHECKING(whether to build VisualVM) -AC_ARG_ENABLE([visualvm], - [AS_HELP_STRING([--enable-visualvm], - [Enable compilation of visualvm.])], - [enable_visualvm="${enableval}"], [enable_visualvm="no"]) -AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes") - -if test "x${enable_visualvm}" = "xyes" -then - FIND_NETBEANS -fi - AC_MSG_CHECKING(how many parallel build jobs to execute) AC_ARG_WITH([parallel-jobs], [AS_HELP_STRING([--with-parallel-jobs], @@ -251,9 +221,6 @@ WITH_OPENJDK_SRC_ZIP WITH_HOTSPOT_SRC_ZIP WITH_OPENJDK_SRC_DIR -WITH_VISUALVM_SRC_ZIP -WITH_NETBEANS_PROFILER_SRC_ZIP -WITH_NETBEANS_BASIC_CLUSTER_SRC_ZIP WITH_ALT_JAR_BINARY AC_CHECK_ENABLE_CACAO AC_CHECK_WITH_CACAO_HOME diff -r 15b39cd337dc -r bfe44d820632 patches/icedtea-visualvm.patch --- a/patches/icedtea-visualvm.patch Tue Jan 20 15:28:47 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ ---- pp 2008-10-31 11:24:42.000000000 -0400 -+++ visualvm/visualvm/jvm/nbproject/platform.properties 2008-10-31 11:24:48.000000000 -0400 -@@ -16,8 +16,8 @@ - org.openide.compat,\ - org.openide.util.enumerations - enabled.clusters=\ -- platform7,\ -- profiler2 -+ platform8,\ -+ profiler3 - nbjdk.active=default - nbplatform.active=NetBeans_Platform_Dev_(Build_200711261600) - suite.dir=${basedir} ---- pp2 2008-10-31 11:50:40.000000000 -0400 -+++ visualvm/visualvm/nbproject/platform.properties 2008-10-31 11:50:47.000000000 -0400 -@@ -14,8 +14,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} diff -r 15b39cd337dc -r bfe44d820632 visualvm.desktop --- a/visualvm.desktop Tue Jan 20 15:28:47 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=OpenJDK VisualVM -Comment=Integrates commandline JDK tools and profiling capabilites. -Exec=/usr/bin/jvisualvm -Icon=java -Terminal=false -Type=Application -Categories=Development;Java; -Version=1.0