Author: bdubbs
Date: Mon Jun 22 16:11:08 2020
New Revision: 11981

Log:
Move tcl, expect, and dejagnu to Chapter 8

Added:
   trunk/BOOK/chapter08/dejagnu.xml
      - copied unchanged from r11980, trunk/BOOK/chapter07/dejagnu.xml
   trunk/BOOK/chapter08/expect.xml
      - copied, changed from r11980, trunk/BOOK/chapter07/expect.xml
   trunk/BOOK/chapter08/tcl.xml
      - copied, changed from r11980, trunk/BOOK/chapter07/tcl.xml
Deleted:
   trunk/BOOK/chapter07/dejagnu.xml
   trunk/BOOK/chapter07/expect.xml
   trunk/BOOK/chapter07/tcl.xml
Modified:
   trunk/BOOK/chapter03/packages.xml
   trunk/BOOK/chapter07/chapter07.xml
   trunk/BOOK/chapter08/chapter08.xml
   trunk/BOOK/packages.ent

Modified: trunk/BOOK/chapter03/packages.xml
==============================================================================
--- trunk/BOOK/chapter03/packages.xml   Mon Jun 22 13:51:45 2020        (r11980)
+++ trunk/BOOK/chapter03/packages.xml   Mon Jun 22 16:11:08 2020        (r11981)
@@ -694,6 +694,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Tcl Documentation (&tcl-version;) - 
<token>&tcl-docs-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&tcl-docs-url;"/></para>
+        <para>MD5 sum: <literal>&tcl-docs-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Texinfo (&texinfo-version;) - <token>&texinfo-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&texinfo-home;"/></para>

Modified: trunk/BOOK/chapter07/chapter07.xml
==============================================================================
--- trunk/BOOK/chapter07/chapter07.xml  Mon Jun 22 13:51:45 2020        (r11980)
+++ trunk/BOOK/chapter07/chapter07.xml  Mon Jun 22 16:11:08 2020        (r11981)
@@ -24,9 +24,13 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="python.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="util-linux.xml"/>
+  
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dejagnu.xml"/>
+-->
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="stripping.xml"/>
 
 </chapter>

Modified: trunk/BOOK/chapter08/chapter08.xml
==============================================================================
--- trunk/BOOK/chapter08/chapter08.xml  Mon Jun 22 13:51:45 2020        (r11980)
+++ trunk/BOOK/chapter08/chapter08.xml  Mon Jun 22 16:11:08 2020        (r11981)
@@ -14,6 +14,11 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="pkgmgt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="man-pages.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dejagnu.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="zlib.xml"/>

Copied: trunk/BOOK/chapter08/dejagnu.xml (from r11980, 
trunk/BOOK/chapter07/dejagnu.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/BOOK/chapter08/dejagnu.xml    Mon Jun 22 16:11:08 2020        
(r11981, copy of r11980, trunk/BOOK/chapter07/dejagnu.xml)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-tools-dejagnu" role="wrap">
+  <?dbhtml filename="dejagnu.html"?>
+
+  <sect1info condition="script">
+    <productname>dejagnu</productname>
+    <productnumber>&dejagnu-version;</productnumber>
+    <address>&dejagnu-url;</address>
+  </sect1info>
+
+  <title>DejaGNU-&dejagnu-version;</title>
+
+  <indexterm zone="ch-tools-dejagnu">
+    <primary sortas="a-DejaGNU">DejaGNU</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The <application>DejaGnu</application> package contains a framework 
for running test
+      suites on GNU tools. It is written in <command>expect</command>, which 
itself
+      uses <application>Tcl</application> (Tool Command Language).</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&dejagnu-tmp-sbu;</seg>
+        <seg>&dejagnu-tmp-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of DejaGNU</title>
+
+    <para>Prepare DejaGNU for compilation:</para>
+
+<screen><userinput remap="configure">./configure --prefix=/usr
+makeinfo --html --no-split -o doc/dejagnu.html doc/dejagnu.texi
+makeinfo --plaintext       -o doc/dejagnu.txt  
doc/dejagnu.texi</userinput></screen>
+
+    <para>Build and install the package:</para>
+
+<screen><userinput remap="install">make install
+install -v -dm755  /usr/share/doc/dejagnu-&dejagnu-version;
+install -v -m644   doc/dejagnu.{html,txt} 
/usr/share/doc/dejagnu-&dejagnu-version;</userinput></screen>
+
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
+
+  </sect2>
+
+
+  <sect2 id="contents-dejagnu" role="content">
+    <title>Contents of DejaGNU</title>
+
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+
+      <seglistitem>
+        <seg>runtest</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="runtest">
+        <term><command>runtest</command></term>
+        <listitem>
+          <para>A wrapper script that locates the proper
+          <command>expect</command> shell and then runs DejaGNU</para>
+          <indexterm zone="ch-tools-dejagnu runtest">
+            <primary sortas="b-runtest">runtest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied and modified: trunk/BOOK/chapter08/expect.xml (from r11980, 
trunk/BOOK/chapter07/expect.xml)
==============================================================================
--- trunk/BOOK/chapter07/expect.xml     Mon Jun 22 13:51:45 2020        
(r11980, copy source)
+++ trunk/BOOK/chapter08/expect.xml     Mon Jun 22 16:11:08 2020        (r11981)
@@ -82,6 +82,10 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make test</userinput></screen>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install

Copied and modified: trunk/BOOK/chapter08/tcl.xml (from r11980, 
trunk/BOOK/chapter07/tcl.xml)
==============================================================================
--- trunk/BOOK/chapter07/tcl.xml        Mon Jun 22 13:51:45 2020        
(r11980, copy source)
+++ trunk/BOOK/chapter08/tcl.xml        Mon Jun 22 16:11:08 2020        (r11981)
@@ -49,11 +49,15 @@
     packages.  Installing three packages for testing purposes may seem
     excessive, but it is very reassuring, if not essential, to know that the
     most important tools are working properly. These packages are required
-    to run the test suites in <xref linkend="chapter-building-system"/>.</para>
+    to run the test suites in this chapter.</para>
 
-    <para>Note that the Tcl package used here is a minimal version needed
+<!--    <para>Note that the Tcl package used here is a minimal version needed
     to run the LFS tests.  For the full package, see the  
-    <ulink url='&blfs-book;general/tcl.html'>BLFS Tcl 
procedures</ulink>.</para>
+    <ulink url='&blfs-book;general/tcl.html'>BLFS Tcl 
procedures</ulink>.</para>-->
+
+    <para>First, unpack the documentation by issuing the following 
command:</para>
+
+<screen><userinput remap="pre">tar -xf ../tcl8.6.10-html.tar.gz 
--strip-components=1</userinput></screen>
 
     <para>Prepare Tcl for compilation:</para>
 
@@ -106,6 +110,10 @@
     This is not mandatory for the remainder of LFS, but may be needed in case a
     package built later uses Tcl.</para>
 
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make test</userinput></screen>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Mon Jun 22 13:51:45 2020        (r11980)
+++ trunk/BOOK/packages.ent     Mon Jun 22 16:11:08 2020        (r11981)
@@ -678,6 +678,9 @@
 <!ENTITY tcl-url 
"https://downloads.sourceforge.net/tcl/tcl&tcl-version;-src.tar.gz";>
 <!ENTITY tcl-md5 "97c55573f8520bcab74e21bfd8d0aadc">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/";>
+<!ENTITY tcl-docs-url 
"https://downloads.sourceforge.net/tcl/tcl&tcl-version;-html.tar.gz";>
+<!ENTITY tcl-docs-md5 "a012711241ba3a5bd4a04e833001d489">
+<!ENTITY tcl-docs-size "1,171 KB">
 <!ENTITY tcl-tmp-du "76 MB">
 <!ENTITY tcl-tmp-sbu "0.9 SBU">
 
-- 
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to