# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1242845505 -3600
# Node ID 0a36fab09f898f100477e1215bf16a507ca322ea
# Parent  7a561e7b887e3f53f36858505f84f54c06c955c6
Forwardport SystemTap

2009-05-04  Mark Wielaard  <mjw@redhat.com>

	* Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp
	when client not available (ENABLE_SYSTEMTAP only).
	(icedtea-debug.stamp): Likewise.

diff -r 7a561e7b887e -r 0a36fab09f89 ChangeLog
--- a/ChangeLog	Wed May 20 19:43:38 2009 +0100
+++ b/ChangeLog	Wed May 20 19:51:45 2009 +0100
@@ -1,3 +1,9 @@
+2009-05-04  Mark Wielaard  <mjw@redhat.com>
+
+	* Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp
+	when client not available (ENABLE_SYSTEMTAP only).
+	(icedtea-debug.stamp): Likewise.
+
 2009-04-29  Mark Wielaard  <mjw@redhat.com>
 
 	* README: Document systemtap support.
diff -r 7a561e7b887e -r 0a36fab09f89 Makefile.am
--- a/Makefile.am	Wed May 20 19:43:38 2009 +0100
+++ b/Makefile.am	Wed May 20 19:51:45 2009 +0100
@@ -2601,17 +2601,24 @@
 	cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm	
 endif
-if ENABLE_SYSTEMTAP
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
-	cp $(abs_top_builddir)/tapset/*.stp \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset
-endif
 	cp $(NETX_RESOURCE_DIR)/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
 	cp $(NETX_RESOURCE_DIR)/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+if ENABLE_SYSTEMTAP
+	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
+	if test $$? -eq 0; then \
+	  sed -e '/\/client\/libjvm.so/d' \
+	    < $(abs_top_builddir)/tapset/hotspot.stp \
+	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	else \
+	  cp $(abs_top_builddir)/tapset/hotspot.stp \
+	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	fi
+endif
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 	mkdir -p stamps
 	touch stamps/icedtea.stamp
@@ -2671,6 +2678,18 @@
 	cp $(NETX_RESOURCE_DIR)/default.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
+if ENABLE_SYSTEMTAP
+	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
+	if test $$? -eq 0; then \
+	  sed -e '/\/client\/libjvm.so/d' \
+	    < $(abs_top_builddir)/tapset/hotspot.stp \
+	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	else \
+	  cp $(abs_top_builddir)/tapset/hotspot.stp \
+	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	fi
+endif
 	@echo "IcedTea (debug build) is served:" \
 	  $(BUILD_OUTPUT_DIR)-debug
 	mkdir -p stamps