changeset in /hg/icedtea6: * Makefile.am (icedtea.stamp): Strip ...

[Mark Wielaard]

changeset 6eac34481362 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6eac34481362
description:
	* Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp
	        when client not available (ENABLE_SYSTEMTAP only).
	        (icedtea-debug.stamp): Likewise.

diffstat:

2 files changed, 30 insertions(+), 10 deletions(-)
ChangeLog   |    6 ++++++
Makefile.am |   34 ++++++++++++++++++++++++----------

diffs (78 lines):

diff -r 2b90f322b87e -r 6eac34481362 ChangeLog
--- a/ChangeLog	Sun May 03 16:28:29 2009 +0200
+++ b/ChangeLog	Mon May 04 12:43:27 2009 +0200
@@ -1,3 +1,9 @@ 2009-05-03  Matthias Klose  <doko at ubuntu
+2009-05-04  Mark Wielaard  <mjw at redhat.com>
+
+	* Makefile.am (icedtea.stamp): Strip client probes from hotspot.stp
+	when client not available (ENABLE_SYSTEMTAP only).
+	(icedtea-debug.stamp): Likewise.
+
 2009-05-03  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am (ICEDTEA_PATCHES): Apply icedtea-cacao conditionally
diff -r 2b90f322b87e -r 6eac34481362 Makefile.am
--- a/Makefile.am	Sun May 03 16:28:29 2009 +0200
+++ b/Makefile.am	Mon May 04 12:43:27 2009 +0200
@@ -1172,11 +1172,6 @@ if WITH_VISUALVM
 	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 $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \
@@ -1188,6 +1183,18 @@ endif
 endif
 if WITH_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+endif
+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
@@ -1250,11 +1257,6 @@ if WITH_VISUALVM
 	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_srcdir)/tapset/*.stp \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset
-endif
 	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib ; \
@@ -1266,6 +1268,18 @@ endif
 endif
 if WITH_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+endif
+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