Mercurial > hg > release > icedtea-1.10
changeset 1796:0a36fab09f89
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.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 20 May 2009 19:51:45 +0100 |
| parents | 7a561e7b887e |
| children | f06356634030 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 30 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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