From 53ade4da49f02bedf5c0e7e0b82d961b3e78cb4d Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 1 Jan 2010 20:47:26 +0100 Subject: Add SystemTap_Beginners_Guide to build. * configure.ac: Add --enable-publican and --with-publican-brand. Setup "shadow" directory doc/beginners. * Makefile.in: Regenerated. * configure: Regenerated. * doc/Makefile.am (SUBDIRS): Add beginners. * doc/Makefile.in: Regenerated. * doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml (productname): Set to Systemtap. (productnumber): Set to 1.0. * SystemTap_Beginners_Guide/en-US/*.xml: Replace includes from extras/testsuite to ../testsuite, * doc/SystemTap_Beginners_Guide/publican.cfg: Moved to ... * doc/SystemTap_Beginners_Guide/publican.cfg.in: ... here. * doc/SystemTap_Beginners_Guide/Makefile: Removed. * doc/SystemTap_Beginners_Guide/old-syncandbuild.sh: Removed. * doc/SystemTap_Beginners_Guide/syncandbuild.sh: Removed. * doc/SystemTap_Tapset_Reference/Makefile.in: Regenerated. * doc/beginners/Makefile.am: New makefile. * doc/beginners/Makefile.in: New generated file. * grapher/Makefile.in: Regenerated. * systemtap.spec: Add with_publican and publican_brand. --- doc/SystemTap_Beginners_Guide/Makefile | 22 ------------- doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml | 6 ++-- .../en-US/Useful_Scripts-disktop.xml | 2 +- .../en-US/Useful_Scripts-dropwatch.xml | 2 +- .../en-US/Useful_Scripts-functioncalls.xml | 2 +- .../en-US/Useful_Scripts-futexes.xml | 2 +- .../en-US/Useful_Scripts-ioblktime.xml | 2 +- .../en-US/Useful_Scripts-iotop.xml | 2 +- .../en-US/Useful_Scripts-nettop.xml | 2 +- .../en-US/Useful_Scripts-sockettrace.xml | 2 +- .../en-US/Useful_Scripts-syscallsbyprocpid.xml | 4 +-- .../en-US/Useful_Scripts-tcp_connections.xml | 2 +- .../en-US/Useful_Scripts-tcpdumplike.xml | 2 +- .../en-US/Useful_Scripts-threadtimes.xml | 2 +- .../en-US/Useful_Scripts-timeout.xml | 2 +- .../en-US/Useful_Scripts-topsys.xml | 2 +- .../en-US/Useful_Scripts-traceio.xml | 2 +- .../en-US/Useful_Scripts-traceio2.xml | 2 +- doc/SystemTap_Beginners_Guide/old-syncandbuild.sh | 25 -------------- doc/SystemTap_Beginners_Guide/publican.cfg | 8 ----- doc/SystemTap_Beginners_Guide/publican.cfg.in | 5 +++ doc/SystemTap_Beginners_Guide/syncandbuild.sh | 38 ---------------------- 22 files changed, 25 insertions(+), 113 deletions(-) delete mode 100644 doc/SystemTap_Beginners_Guide/Makefile delete mode 100755 doc/SystemTap_Beginners_Guide/old-syncandbuild.sh delete mode 100644 doc/SystemTap_Beginners_Guide/publican.cfg create mode 100644 doc/SystemTap_Beginners_Guide/publican.cfg.in delete mode 100755 doc/SystemTap_Beginners_Guide/syncandbuild.sh (limited to 'doc/SystemTap_Beginners_Guide') diff --git a/doc/SystemTap_Beginners_Guide/Makefile b/doc/SystemTap_Beginners_Guide/Makefile deleted file mode 100644 index 5c9c2379..00000000 --- a/doc/SystemTap_Beginners_Guide/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -#Makefile for SystemTap_Beginners_Guide - -XML_LANG = en-US - -BRAND = fedora -# please define the BRAND in the pre:: section below -#SHOW_REMARKS = 1 - -#OTHER_LANGS = as-IN bn-IN de-DE es-ES fr-FR gu-IN hi-IN it-IT ja-JP kn-IN ko-KR ml-IN mr-IN or-IN pa-IN pt-BR ru-RU si-LK ta-IN te-IN zh-CN zh-TW - -CONDITION=$(BRAND) - -COMMON_CONFIG = /usr/share/publican -include $(COMMON_CONFIG)/make/Makefile.common - -pre:: - cp -a ../../testsuite en-US/extras/; - -post:: - rm -rf en-US/extras/testsuite - sed -i -e 's/Fedora/Red Hat Enterprise Linux/g' en-US/Book_Info.xml; - sed -i -e 's/10/5/g' en-US/Book_Info.xml; diff --git a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml index fb6bec20..6c847140 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml @@ -5,11 +5,11 @@ SystemTap Beginners Guide Introduction to SystemTap (for Red Hat Enterprise Linux 5.4) - + Introduction to SystemTap (for Fedora 10) 2.0 - Red Hat Enterprise Linux - 5.4 + Systemtap + 1.0 2 This guide provides basic instructions on how to use SystemTap to monitor different subsystems of &PRODUCT; in finer detail. The SystemTap Beginners Guide is recommended for users who have taken RHCT or have a similar level of expertise in &PRODUCT;. diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-disktop.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-disktop.xml index 8a786d82..781ea949 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-disktop.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-disktop.xml @@ -65,7 +65,7 @@ disktop.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-dropwatch.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-dropwatch.xml index 3bc69899..53891bed 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-dropwatch.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-dropwatch.xml @@ -49,7 +49,7 @@ discard packets every five-second interval. dropwatch.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-functioncalls.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-functioncalls.xml index 6a5c8f4d..0d0aa947 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-functioncalls.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-functioncalls.xml @@ -47,7 +47,7 @@ no script in examples functioncallcount.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-futexes.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-futexes.xml index 82bb762b..2426da8d 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-futexes.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-futexes.xml @@ -87,7 +87,7 @@ no script in examples futexes.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-ioblktime.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-ioblktime.xml index e586d81a..b3753e0c 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-ioblktime.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-ioblktime.xml @@ -39,7 +39,7 @@ ioblktime.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-iotop.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-iotop.xml index c5bbb480..2bb0c778 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-iotop.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-iotop.xml @@ -35,7 +35,7 @@ iotop.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-nettop.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-nettop.xml index 2d7e3595..1a9978dc 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-nettop.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-nettop.xml @@ -44,7 +44,7 @@ nettop.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-sockettrace.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-sockettrace.xml index 6e913b48..8bce5a41 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-sockettrace.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-sockettrace.xml @@ -51,7 +51,7 @@ socket-trace.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-syscallsbyprocpid.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-syscallsbyprocpid.xml index d8fe4b39..92727821 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-syscallsbyprocpid.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-syscallsbyprocpid.xml @@ -53,7 +53,7 @@ uses systemtap/testsuite/systemtap.examples/process/syscalls_by_p*.stp syscalls_by_proc.stp - + @@ -97,7 +97,7 @@ Collecting data... Type Ctrl-C to exit and display results syscalls_by_pid.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcp_connections.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcp_connections.xml index c25465b4..6dc2d2b1 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcp_connections.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcp_connections.xml @@ -54,7 +54,7 @@ tcp_connections.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcpdumplike.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcpdumplike.xml index cd42edc6..dfd3fac8 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcpdumplike.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-tcpdumplike.xml @@ -54,7 +54,7 @@ tcpdumplike.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-threadtimes.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-threadtimes.xml index 3bddf067..193012ea 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-threadtimes.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-threadtimes.xml @@ -43,7 +43,7 @@ thread-times.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-timeout.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-timeout.xml index 719f5c6d..1f7b7a11 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-timeout.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-timeout.xml @@ -47,7 +47,7 @@ uses systemtap/testsuite/systemtap.examples/profiling/timeout.stp timeout.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-topsys.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-topsys.xml index 700ef4ed..ba814d5e 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-topsys.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-topsys.xml @@ -62,7 +62,7 @@ uses systemtap/testsuite/systemtap.examples/profiling/topsys.stp topsys.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio.xml index 1af1475d..d3e04eff 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio.xml @@ -42,7 +42,7 @@ traceio.stp - + diff --git a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio2.xml b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio2.xml index 7451de98..aed8c508 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio2.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Useful_Scripts-traceio2.xml @@ -53,7 +53,7 @@ traceio2.stp - + diff --git a/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh b/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh deleted file mode 100755 index e6a6c1f4..00000000 --- a/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# Instead of running the original makefile to build the document, run this script instead -echo -n "Please specify your build target (e.g. html, pdf, or html-single) " -read TARG -echo -n "Please specify the product you are building for (enter 1 for Fedora, 2 for RHEL) " -read PROD -echo -n "Please specify any build parameters you'd like to use (skip this step for none). " -read PARM - -if [ $PROD = 1 ]; -then - sed -i -e 's/Red Hat Enterprise Linux/Fedora/g' en-US/Book_Info.xml; - sed -i -e 's/5/10/g' en-US/Book_Info.xml; - sed -i -e 's/BRAND = RedHat/BRAND = fedora/g' Makefile; - make $PARM $TARG-en-US post - -else -sed -i -e 's/BRAND = fedora/BRAND = RedHat/g' Makefile; -make post $PARM $TARG-en-US -fi - -echo "done." -echo "Cleaning sync'd files..." -make post -echo "...done." \ No newline at end of file diff --git a/doc/SystemTap_Beginners_Guide/publican.cfg b/doc/SystemTap_Beginners_Guide/publican.cfg deleted file mode 100644 index cc174563..00000000 --- a/doc/SystemTap_Beginners_Guide/publican.cfg +++ /dev/null @@ -1,8 +0,0 @@ -# Config::Simple 4.59 -# Tue Dec 1 09:26:42 2009 - -debug: 1 -xml_lang: en-US -brand: fedora -condition: fedora - diff --git a/doc/SystemTap_Beginners_Guide/publican.cfg.in b/doc/SystemTap_Beginners_Guide/publican.cfg.in new file mode 100644 index 00000000..d6cbacde --- /dev/null +++ b/doc/SystemTap_Beginners_Guide/publican.cfg.in @@ -0,0 +1,5 @@ +debug: 0 +xml_lang: en-US +brand: @PUBLICAN_BRAND@ +condition: @PUBLICAN_BRAND@ +tmp_dir: build diff --git a/doc/SystemTap_Beginners_Guide/syncandbuild.sh b/doc/SystemTap_Beginners_Guide/syncandbuild.sh deleted file mode 100755 index 00084985..00000000 --- a/doc/SystemTap_Beginners_Guide/syncandbuild.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# Instead of running the original makefile to build the document, run this script instead -echo -n "Please specify your build target (e.g. html, pdf, or html-single) " -read TARG -echo -n "Please specify the product you are building for (enter 1 for Fedora, 2 for RHEL) " -read PROD -#echo -n "Please specify any build parameters you'd like to use (skip this step for none). " -#read PARM -#copy scripts from testsuite -cp -a ../../testsuite en-US/extras/; - -if [ $PROD = 1 ]; -then - sed -i -e 's/Red Hat Enterprise Linux/Fedora/g' en-US/Book_Info.xml; - sed -i -e 's/5.4/10/g' en-US/Book_Info.xml; - sed -i -e 's/brand: RedHat/brand: fedora/g' publican.cfg; - sed -i -e 's/condition: RedHat/condition: fedora/g' publican.cfg; - publican build --formats=$TARG --langs=en-US; -# rm -rf en-US/extras/testsuite - sed -i -e 's/Fedora/Red Hat Enterprise Linux/g' en-US/Book_Info.xml; - sed -i -e 's/10/5.4/g' en-US/Book_Info.xml; - - -else -sed -i -e 's/brand: fedora/brand: RedHat/g' publican.cfg; -sed -i -e 's/brand: fedora/brand: RedHat/g' publican.cfg; -#make post $PARM $TARG-en-US -publican build --formats=$TARG --langs=en-US; -#rm -rf en-US/extras/testsuite -sed -i -e 's/Fedora/Red Hat Enterprise Linux/g' en-US/Book_Info.xml; -sed -i -e 's/10/5.4/g' en-US/Book_Info.xml; - -fi - -echo "done." -echo "Cleaning sync'd files..." -rm -rf en-US/extras/testsuite ; -echo "...done." \ No newline at end of file -- cgit