From 34a120fcb38cf509038255d77858b369e88d550c Mon Sep 17 00:00:00 2001 From: Don Domingo Date: Tue, 1 Dec 2009 11:00:38 +1000 Subject: minor modifications to allow book to build in latest Publican (1.x). to build in older versions of Publican, use old-syncandbuild.sh --- doc/SystemTap_Beginners_Guide/old-syncandbuild.sh | 25 +++++++++++++++++++++++ doc/SystemTap_Beginners_Guide/publican.cfg | 8 ++++++++ 2 files changed, 33 insertions(+) create mode 100755 doc/SystemTap_Beginners_Guide/old-syncandbuild.sh create mode 100644 doc/SystemTap_Beginners_Guide/publican.cfg (limited to 'doc/SystemTap_Beginners_Guide') diff --git a/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh b/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh new file mode 100755 index 00000000..e6a6c1f4 --- /dev/null +++ b/doc/SystemTap_Beginners_Guide/old-syncandbuild.sh @@ -0,0 +1,25 @@ +#!/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 new file mode 100644 index 00000000..cc174563 --- /dev/null +++ b/doc/SystemTap_Beginners_Guide/publican.cfg @@ -0,0 +1,8 @@ +# Config::Simple 4.59 +# Tue Dec 1 09:26:42 2009 + +debug: 1 +xml_lang: en-US +brand: fedora +condition: fedora + -- cgit From 53482a8b534a30f620da745e467d85276b02ea9b Mon Sep 17 00:00:00 2001 From: Don Domingo Date: Tue, 1 Dec 2009 11:01:47 +1000 Subject: minor modifications to allow book to build in latest Publican (1.x). to build in older versions of Publican, use old-syncandbuild.sh --- doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'doc/SystemTap_Beginners_Guide') diff --git a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml index acca17ae..4b13da34 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml @@ -9,7 +9,7 @@ 2.0 Red Hat Enterprise Linux - 5 + 5.4 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;. @@ -23,11 +23,12 @@ Logo - + + -- cgit From 2b1f3c4fce8bf90dd1fb43d1958e5371bc66736e Mon Sep 17 00:00:00 2001 From: Don Domingo Date: Tue, 1 Dec 2009 11:02:00 +1000 Subject: minor modifications to allow book to build in latest Publican (1.x). to build in older versions of Publican, use old-syncandbuild.sh --- doc/SystemTap_Beginners_Guide/en-US/SystemTap_Beginners_Guide.ent | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/SystemTap_Beginners_Guide') diff --git a/doc/SystemTap_Beginners_Guide/en-US/SystemTap_Beginners_Guide.ent b/doc/SystemTap_Beginners_Guide/en-US/SystemTap_Beginners_Guide.ent index 6d15d297..454df409 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/SystemTap_Beginners_Guide.ent +++ b/doc/SystemTap_Beginners_Guide/en-US/SystemTap_Beginners_Guide.ent @@ -3,4 +3,5 @@ - \ No newline at end of file + + -- cgit From e5e29c7f0f3c8b71444ae12fcd3f2c624d124cae Mon Sep 17 00:00:00 2001 From: Don Domingo Date: Tue, 1 Dec 2009 11:02:19 +1000 Subject: minor modifications to allow book to build in latest Publican (1.x). to build in older versions of Publican, use old-syncandbuild.sh --- doc/SystemTap_Beginners_Guide/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/SystemTap_Beginners_Guide') diff --git a/doc/SystemTap_Beginners_Guide/Makefile b/doc/SystemTap_Beginners_Guide/Makefile index 32dc0d50..5c9c2379 100644 --- a/doc/SystemTap_Beginners_Guide/Makefile +++ b/doc/SystemTap_Beginners_Guide/Makefile @@ -2,7 +2,7 @@ XML_LANG = en-US -BRAND = RedHat +BRAND = fedora # please define the BRAND in the pre:: section below #SHOW_REMARKS = 1 -- cgit From 789aad3429c6a3f7b8f66b609f18a092c7b04f62 Mon Sep 17 00:00:00 2001 From: Don Domingo Date: Tue, 1 Dec 2009 11:02:29 +1000 Subject: minor modifications to allow book to build in latest Publican (1.x). to build in older versions of Publican, use old-syncandbuild.sh --- doc/SystemTap_Beginners_Guide/syncandbuild.sh | 29 +++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'doc/SystemTap_Beginners_Guide') diff --git a/doc/SystemTap_Beginners_Guide/syncandbuild.sh b/doc/SystemTap_Beginners_Guide/syncandbuild.sh index e6a6c1f4..00084985 100755 --- a/doc/SystemTap_Beginners_Guide/syncandbuild.sh +++ b/doc/SystemTap_Beginners_Guide/syncandbuild.sh @@ -4,22 +4,35 @@ 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 +#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/10/g' en-US/Book_Info.xml; - sed -i -e 's/BRAND = RedHat/BRAND = fedora/g' Makefile; - make $PARM $TARG-en-US post + 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' Makefile; -make post $PARM $TARG-en-US +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..." -make post +rm -rf en-US/extras/testsuite ; echo "...done." \ No newline at end of file -- cgit From af68f71a7667bed7a5356c1028e9db329d5ccef9 Mon Sep 17 00:00:00 2001 From: Don Domingo Date: Wed, 2 Dec 2009 10:48:48 +1000 Subject: correcting license, forgot to change back yesterday while testing default Publican 1 license --- doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/SystemTap_Beginners_Guide') diff --git a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml index 4b13da34..ccad7928 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml @@ -26,9 +26,9 @@ - + --> + + -- cgit From ae3d9351dec2533ffa4c55b3d7543d5b270efec7 Mon Sep 17 00:00:00 2001 From: Don Domingo Date: Wed, 2 Dec 2009 13:47:15 +1000 Subject: minor correction --- doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/SystemTap_Beginners_Guide') diff --git a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml index ccad7928..fb6bec20 100644 --- a/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml +++ b/doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml @@ -23,10 +23,10 @@ Logo - + -- cgit