/hg/icedtea6: Drop VisualVM, now maintained independently of Ice...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jun 28 06:18:26 PDT 2010
changeset fa1c6854f1e6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fa1c6854f1e6
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 28 14:18:16 2010 +0100
Drop VisualVM, now maintained independently of IcedTea.
2010-06-25 Andrew John Hughes <ahughes at redhat.com>
Remove VisualVM support, now maintained at
http://icedtea.classpath.org/hg/visualvm
* Makefile.am: Remove VisualVM targets, references and
aliases. (NETBEANS_PROFILER_URL): Removed.
(NETBEANS_PROFILER_SRC_ZIP): Likewise.
(NETBEANS_PROFILER_MD5SUM): Likewise. (VISUALVM_URL):
Likewise. (VISUALVM_SRC_ZIP): Likewise.
(VISUALVM_MD5SUM): Likewise. (EXTRA_DIST): Remove
visualvm.desktop. (distclean-local): Remove visualvm and
netbeans deletion. (.PHONY): Remove clean-visualvm and
clean-nbplatform targets. (download): Don't download
VisualVM. (clean-download): Don't remove the VisualVM and
NetBeans zips. (extract): Don't extract VisualVM and
NetBeans. (icedtea): Don't depend on visualvm.stamp and
remove post-install measures. (icedtea-debug):
Likewise. (nbplatform): Removed. (visualvm):
Removed.
* acinclude.m4: Remove VisualVM-related macros.
(FIND_NETBEANS): Removed.
* configure.ac: Remove --with-netbeans-home and
--enable-visualvm options. Don't invoke VisualVM macros.
* visualvm.desktop: Removed.
diffstat:
5 files changed, 38 insertions(+), 229 deletions(-)
ChangeLog | 32 ++++++++++
Makefile.am | 163 +-----------------------------------------------------
acinclude.m4 | 32 ----------
configure.ac | 31 ----------
visualvm.desktop | 9 --
diffs (410 lines):
diff -r 2abd775a9d46 -r fa1c6854f1e6 ChangeLog
--- a/ChangeLog Fri Jun 25 12:24:35 2010 +0200
+++ b/ChangeLog Mon Jun 28 14:18:16 2010 +0100
@@ -1,3 +1,35 @@ 2010-06-25 Matthias Klose <doko at ubuntu.
+2010-06-25 Andrew John Hughes <ahughes at redhat.com>
+
+ Remove VisualVM support, now maintained at
+ http://icedtea.classpath.org/hg/visualvm
+ * Makefile.am:
+ Remove VisualVM targets, references and aliases.
+ (NETBEANS_PROFILER_URL): Removed.
+ (NETBEANS_PROFILER_SRC_ZIP): Likewise.
+ (NETBEANS_PROFILER_MD5SUM): Likewise.
+ (VISUALVM_URL): Likewise.
+ (VISUALVM_SRC_ZIP): Likewise.
+ (VISUALVM_MD5SUM): Likewise.
+ (EXTRA_DIST): Remove visualvm.desktop.
+ (distclean-local): Remove visualvm and netbeans deletion.
+ (.PHONY): Remove clean-visualvm and clean-nbplatform targets.
+ (download): Don't download VisualVM.
+ (clean-download): Don't remove the VisualVM and NetBeans zips.
+ (extract): Don't extract VisualVM and NetBeans.
+ (icedtea): Don't depend on visualvm.stamp and remove post-install
+ measures.
+ (icedtea-debug): Likewise.
+ (nbplatform): Removed.
+ (visualvm): Removed.
+ * acinclude.m4:
+ Remove VisualVM-related macros.
+ (FIND_NETBEANS): Removed.
+ * configure.ac:
+ Remove --with-netbeans-home and
+ --enable-visualvm options. Don't invoke
+ VisualVM macros.
+ * visualvm.desktop: Removed.
+
2010-06-25 Matthias Klose <doko at ubuntu.com>
Fix shark build failures, update for latest HotSpot taken from
diff -r 2abd775a9d46 -r fa1c6854f1e6 Makefile.am
--- a/Makefile.am Fri Jun 25 12:24:35 2010 +0200
+++ b/Makefile.am Mon Jun 28 14:18:16 2010 +0100
@@ -10,14 +10,6 @@ CACAO_BASE_URL = http://mips.complang.tu
CACAO_BASE_URL = http://mips.complang.tuwien.ac.at
CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
-
-NETBEANS_PROFILER_MD5SUM = 40dd3183b345737ca22162d164c2d5a2
-NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/149581/
-NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release68.tar.gz
-
-VISUALVM_MD5SUM = f1e2525ddcd5fdf97bcf891d715c08ff
-VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/146746/
-VISUALVM_SRC_ZIP = visualvm_122-src.tar.gz
JAXWS_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150724
JAXWS_DROP_ZIP = jdk6-jaxws-b20.zip
@@ -137,12 +129,6 @@ LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/IcedTeaPlugin.so \
stamps/liveconnect-dist.stamp
-endif
-
-if WITH_VISUALVM
-NB_PLATFORM= $(shell ls /usr/share/netbeans | grep platform | tail -n1)
-else
-NB_PLATFORM=
endif
if ENABLE_PULSE_JAVA
@@ -510,7 +496,7 @@ EXTRA_DIST = generated $(NETX_SRCDIR) \
$(abs_top_srcdir)/patches/* \
contrib ports \
extra overlays \
- javaws.png javaws.desktop visualvm.desktop \
+ javaws.png javaws.desktop \
jconsole.desktop policytool.desktop \
test/jtreg \
HACKING pulseaudio fsg.sh \
@@ -545,8 +531,6 @@ distclean-local: clean-copy clean-jtreg
rm -rf $(ECJ_BUILD_OUTPUT_DIR)
rm -rf openjdk
rm -rf $(BUILD_OUTPUT_DIR)
- rm -rf visualvm
- rm -rf netbeans
if BUILD_CACAO
rm -rf cacao
@@ -566,8 +550,7 @@ install:
clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \
clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj \
- clean-tools-jar clean-visualvm clean-nbplatform \
- clean-copy clean-rt $(ICEDTEAPLUGIN_CLEAN) hotspot \
+ clean-tools-jar clean-copy clean-rt $(ICEDTEAPLUGIN_CLEAN) hotspot \
hotspot-helper clean-extra clean-jtreg clean-jtreg-reports
env:
@@ -772,29 +755,6 @@ endif
endif
endif
endif
-if WITH_VISUALVM
- 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
-
- 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
mkdir -p stamps
touch stamps/download.stamp
@@ -802,10 +762,6 @@ clean-download: clean-drops clean-downlo
clean-download: clean-drops clean-download-cacao
rm -f stamps/download.stamp
rm -f $(OPENJDK_SRC_ZIP)
-if WITH_VISUALVM
- rm -f $(VISUALVM_SRC_ZIP)
- rm -f $(NETBEANS_PROFILER_SRC_ZIP)
-endif
#FIXME (meta): Split into multiple targets
stamps/extract.stamp: stamps/extract-openjdk.stamp
@@ -848,20 +804,6 @@ else
fi
endif
endif
-endif
-if WITH_VISUALVM
- set -e ; \
- if ! test -d netbeans ; \
- then \
- mkdir netbeans ; \
- $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \
- fi
-
- set -e ; \
- if ! test -d visualvm ; \
- then \
- $(TAR) xf $(VISUALVM_SRC_ZIP) ; \
- fi
endif
set -e ; \
if [ ! -e $(abs_top_builddir)/generated ]; then \
@@ -1223,8 +1165,8 @@ clean-bootstrap-directory-symlink:
# you change it in the icedtea-debug target as well.
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
- extra-lib/about.jar stamps/cacao.stamp \
- stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
+ extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \
+ stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1250,26 +1192,6 @@ if ENABLE_PULSE_JAVA
$(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
$(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
-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/launcher/visualvm >> \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
- chmod a+x $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
- cp 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/build/cluster/* \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
- cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
- cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm
endif
cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2re-image/lib ; \
@@ -1315,8 +1237,8 @@ endif
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
- extra-lib/about.jar stamps/cacao.stamp \
- stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
+ extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \
+ stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1342,26 +1264,6 @@ if ENABLE_PULSE_JAVA
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
$(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
-endif
-if WITH_VISUALVM
- mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
- mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
- sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \
- visualvm/launcher/visualvm >> \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
- chmod a+x $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
- cp visualvm/launcher/visualvm.conf \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
- echo visualvm >> \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
- echo profiler3 >> \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
- cp -r visualvm/build/cluster/* \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
- cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
- cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm
endif
cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \
@@ -1717,57 +1619,6 @@ endif
mkdir -p stamps
touch stamps/rewrite-rhino.stamp
-# VisualVM
-
-stamps/nbplatform.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) stamps/extract.stamp
-if WITH_VISUALVM
- cd netbeans ; \
- rm nbbuild/external/binaries-list ; \
- mkdir -p ./nbbuild/netbeans_visualvm/ ; \
- ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM)/ ./nbbuild/netbeans_visualvm/$(NB_PLATFORM) ; \
- ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \
- if ! (uname -a | grep x86_64) ; then \
- mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \
- mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \
- buildscript=./buildnative-linux.sh ; \
- else \
- mkdir -p lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \
- mkdir -p lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \
- buildscript=./buildnative-linux64.sh ; \
- fi ; \
- cd lib.profiler/native/build ; \
- JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \
- $$buildscript ; \
- cd ../../.. ; \
- JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \
- -f nbbuild/build.xml bootstrap ; \
- for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler profiler.oql ; do \
- JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=091221-4fc006d17cb1 \
- -Dnetbeans.dest.dir=$(abs_top_builddir)/netbeans/nbbuild/netbeans_visualvm \
- -f $$dir/build.xml ; \
- done
-endif
- mkdir -p stamps
- touch $@
-
-clean-nbplatform:
- rm -rf netbeans
- rm -f stamps/nbplatform.stamp
-
-stamps/visualvm.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/download.stamp \
- stamps/replace-hotspot.stamp stamps/nbplatform.stamp
-if WITH_VISUALVM
- cd visualvm ; \
- ln -s $(abs_top_srcdir)/netbeans/nbbuild/netbeans_visualvm netbeans ; \
- JAVA_HOME=$(ICEDTEA_HOME) $(ANT) build
-endif
- mkdir -p stamps
- touch $@
-
-clean-visualvm:
- rm -rf visualvm
- rm -f stamps/visualvm.stamp
-
# CACAO
stamps/cacao.stamp: $(OPENJDK_TREE) stamps/rt.stamp
@@ -2159,5 +2010,3 @@ rt-class-files: stamps/rt-class-files.st
rt-class-files: stamps/rt-class-files.stamp
tools-jar: stamps/tools.stamp
-
-visualvm: stamps/visualvm.stamp
diff -r 2abd775a9d46 -r fa1c6854f1e6 acinclude.m4
--- a/acinclude.m4 Fri Jun 25 12:24:35 2010 +0200
+++ b/acinclude.m4 Mon Jun 28 14:18:16 2010 +0100
@@ -661,38 +661,6 @@ AC_DEFUN([FIND_XERCES2_JAR],
fi
AC_MSG_RESULT(${XERCES2_JAR})
AC_SUBST(XERCES2_JAR)
-])
-
-AC_DEFUN([FIND_NETBEANS],
-[
- AC_MSG_CHECKING([if the location of NetBeans is specified])
- AC_ARG_WITH([netbeans],
- [AS_HELP_STRING(--with-netbeans,specify location of netbeans)],
- [
- if test "x${withval}" = "xyes"; then
- NETBEANS=no
- else
- NETBEANS="${withval}"
- fi
- ],
- [
- NETBEANS=no
- ])
- AC_MSG_RESULT(${NETBEANS})
- if ! test -f "${NETBEANS}"; then
- if test "x${NETBEANS}" = "xno"; then
- NETBEANS=
- else
- AC_PATH_PROG(NETBEANS, "${NETBEANS}")
- fi
- fi
- 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],
diff -r 2abd775a9d46 -r fa1c6854f1e6 configure.ac
--- a/configure.ac Fri Jun 25 12:24:35 2010 +0200
+++ b/configure.ac Mon Jun 28 14:18:16 2010 +0100
@@ -53,24 +53,6 @@ IT_CP_SUPPORTS_REFLINK
IT_CP_SUPPORTS_REFLINK
IT_CAN_HARDLINK_TO_SOURCE_TREE
-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 an Ant home directory])
AC_ARG_WITH([ant-home],
[AS_HELP_STRING([--with-ant-home],
@@ -88,14 +70,6 @@ AC_ARG_WITH([ant-home],
])
AC_SUBST(SYSTEM_ANT_DIR)
AC_MSG_RESULT(${SYSTEM_ANT_DIR})
-
-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")
-AC_MSG_RESULT(${enable_visualvm})
AC_MSG_CHECKING([whether to include PulseAudio support])
AC_ARG_ENABLE([pulse-java],
@@ -216,11 +190,6 @@ IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [s
IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit])
IT_GETDTDTYPE_CHECK
IT_CHECK_XULRUNNER_VERSION
-
-if test "x${enable_visualvm}" = "xyes"
-then
- FIND_NETBEANS
-fi
dnl pkgconfig cannot be used to find these headers and libraries.
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
diff -r 2abd775a9d46 -r fa1c6854f1e6 visualvm.desktop
--- a/visualvm.desktop Fri Jun 25 12:24:35 2010 +0200
+++ /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
More information about the distro-pkg-dev
mailing list