/hg/visualvm: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jan 7 19:48:25 PST 2011
changeset afb288d37834 in /hg/visualvm
details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=afb288d37834
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 08 01:02:33 2011 +0000
Make VisualVM work regardless of where it is installed.
2011-01-07 Andrew John Hughes <ahughes at redhat.com>
Make VisualVM work regardless of where it is
installed.
* Makefile.am: (NBPLATFORM_DIR_COPY): Removed.
(install-exec-local): Install configuration to $(sysconfdir)
rather than $(libdir)/visualvm/etc. Patch launcher with
$(sysconfdir), platform directory, and $(libdir)/visualvm.
Patch visualvm.conf with jdkhome. Don't bother copying the
platform symlink, just use the original location directly in
the configuration file.
changeset 307d1a64ee76 in /hg/visualvm
details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=307d1a64ee76
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 08 01:12:46 2011 +0000
Install visualvm.desktop into $(datadir)/applications.
2011-01-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (install-exec-local): Install the
desktop file into the applications subdirectory.
changeset d0293407ac9c in /hg/visualvm
details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=d0293407ac9c
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 08 02:00:50 2011 +0000
Turn on debugging information for native code.
2011-01-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (nbplatform): Turn on debugging
information for native code.
diffstat:
2 files changed, 39 insertions(+), 13 deletions(-)
ChangeLog | 25 +++++++++++++++++++++++++
Makefile.am | 27 ++++++++++++++-------------
diffs (102 lines):
diff -r 97e73715aa7e -r d0293407ac9c ChangeLog
--- a/ChangeLog Fri Jan 07 16:24:38 2011 +0000
+++ b/ChangeLog Sat Jan 08 02:00:50 2011 +0000
@@ -1,3 +1,28 @@ 2011-01-07 Jiri Vanek <jvanek at redhat.co
+2011-01-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (nbplatform): Turn on debugging information
+ for native code.
+
+2011-01-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (install-exec-local): Install the desktop file
+ into the applications subdirectory.
+
+2011-01-07 Andrew John Hughes <ahughes at redhat.com>
+
+ Make VisualVM work regardless of where it is
+ installed.
+ * Makefile.am:
+ (NBPLATFORM_DIR_COPY): Removed.
+ (install-exec-local): Install configuration
+ to $(sysconfdir) rather than $(libdir)/visualvm/etc.
+ Patch launcher with $(sysconfdir), platform directory,
+ and $(libdir)/visualvm. Patch visualvm.conf with jdkhome.
+ Don't bother copying the platform symlink, just use the
+ original location directly in the configuration file.
+
2011-01-07 Jiri Vanek <jvanek at redhat.com>
* visualvm.desktop.in:
diff -r 97e73715aa7e -r d0293407ac9c Makefile.am
--- a/Makefile.am Fri Jan 07 16:24:38 2011 +0000
+++ b/Makefile.am Sat Jan 08 02:00:50 2011 +0000
@@ -30,7 +30,6 @@ if VVVERSION_131
VISUALVM_SRC_ZIP=$(VISUALVM_131_SRC_ZIP)
VISUALVM_SHA256SUM=$(VISUALVM_131_SHA256SUM)
NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm/platform
- NBPLATFORM_DIR_COPY=$(NBPLATFORM_DIR)
ADDITIONAL_DIRS=profiler.oql
PROFILER=profiler
else
@@ -42,7 +41,6 @@ if VVVERSION_13
VISUALVM_SRC_ZIP=$(VISUALVM_13_SRC_ZIP)
VISUALVM_SHA256SUM=$(VISUALVM_13_SHA256SUM)
NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm/platform
- NBPLATFORM_DIR_COPY=$(NBPLATFORM_DIR)
ADDITIONAL_DIRS=profiler.oql
PROFILER=profiler
else
@@ -53,7 +51,6 @@ else
VISUALVM_SRC_ZIP=$(VISUALVM_122_SRC_ZIP)
VISUALVM_SHA256SUM=$(VISUALVM_122_SHA256SUM)
NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm
- NBPLATFORM_DIR_COPY=$(NBPLATFORM_DIR)/$(NB_PLATFORM)
NBBUILD_PROPERTIES=-Dpermit.jdk6.builds=true -Dbuildnumber=091221-4fc006d17cb1
PROFILER=profiler3
endif
@@ -171,7 +168,7 @@ stamps/nbplatform.stamp: stamps/extract-
ln -s linux-amd64 netbeans/lib.profiler/release/lib/deployed/jdk15/linux
ln -s linux-amd64 netbeans/lib.profiler/release/lib/deployed/jdk16/linux
cd netbeans/lib.profiler/native/build && \
- sed -i -e 's#gcc32#$(CC)#' -e 's#-m64#$(ARCHFLAG)#' buildnative-linux64.sh && \
+ sed -i -e 's#gcc32#$(CC)#' -e 's#-m64#$(ARCHFLAG)#' -e 's#Wall#Wall -g#' buildnative-linux64.sh && \
JAVA_HOME_15=$(SYSTEM_JDK_DIR) JAVA_HOME_16=$(SYSTEM_JDK_DIR) ./buildnative-linux64.sh
JAVA_HOME=$(SYSTEM_JDK_DIR) $(ANT) $(NBBUILD_PROPERTIES) -f netbeans/nbbuild/build.xml bootstrap
for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler $(ADDITIONAL_DIRS); do \
@@ -198,20 +195,24 @@ clean-visualvm:
install-exec-local:
mkdir -p $(DESTDIR)$(bindir)
- mkdir -p $(DESTDIR)$(libdir)/visualvm/etc
+ mkdir -p $(DESTDIR)$(sysconfdir)
mkdir -p $(DESTDIR)$(libdir)/visualvm/visualvm
- mkdir -p $(DESTDIR)$(datadir)
- sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \
- visualvm/launcher/visualvm >> \
+ mkdir -p $(DESTDIR)$(datadir)/applications
+ cat visualvm/launcher/visualvm | \
+ sed "s:APPNAME=\`basename.*\`:APPNAME=visualvm:" | \
+ sed "s:\$$BASEDIR/etc:$(sysconfdir):" | \
+ sed "s:\$$BASEDIR/\$$X:$(libdir)/visualvm/\$$X:" | \
+ sed "s:^nbexec=.*:nbexec=$(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM)/lib/nbexec:" > \
$(DESTDIR)$(bindir)/jvisualvm
chmod a+x $(DESTDIR)$(bindir)/jvisualvm
- cp visualvm/launcher/visualvm.conf $(DESTDIR)$(libdir)/visualvm/etc
- echo visualvm >> $(DESTDIR)$(libdir)/visualvm/etc/visualvm.clusters
- echo $(PROFILER) >> $(DESTDIR)$(libdir)/visualvm/etc/visualvm.clusters
+ sed -e "s:^#jdkhome=.*:jdkhome=\"$(SYSTEM_JDK_DIR)\"":g \
+ visualvm/launcher/visualvm.conf > \
+ $(DESTDIR)$(sysconfdir)/visualvm.conf
+ echo visualvm >> $(DESTDIR)$(sysconfdir)/visualvm.clusters
+ echo $(PROFILER) >> $(DESTDIR)$(sysconfdir)/visualvm.clusters
cp -r visualvm/build/cluster/* $(DESTDIR)$(libdir)/visualvm/visualvm
- cp -r $(NBPLATFORM_DIR_COPY) $(DESTDIR)$(libdir)/visualvm
cp -r netbeans/nbbuild/netbeans_visualvm/$(PROFILER) $(DESTDIR)$(libdir)/visualvm
- cp visualvm.desktop $(DESTDIR)$(datadir)
+ cp visualvm.desktop $(DESTDIR)$(datadir)/applications
download-netbeans-profiler: stamps/download-netbeans-profiler.stamp
More information about the distro-pkg-dev
mailing list