Ignore:
Timestamp:
01/27/2016 11:21:15 PM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
1e76622
Parents:
a7e1ac8
Message:

Merge Chapter 13 from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16861 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • general/prog/git.xml

    ra7e1ac8 r2037ec4  
    99  <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
    1010  <!ENTITY git-download-ftp  "ftp://ftp.kernel.org/pub/software/scm/git/git-&git-version;.tar.xz">
    11   <!ENTITY git-md5sum        "847787cd0616d38b0e429ea85f558c31">
    12   <!ENTITY git-size          "3.6 MB">
    13   <!ENTITY git-buildsize     "300 MB">
    14   <!ENTITY git-time          "0.7 SBU">
     11  <!ENTITY git-md5sum        "0214e04f7041f835c5c38f2b78eccced">
     12  <!ENTITY git-size          "3.7 MB">
     13  <!ENTITY git-buildsize     "349 MB (add 28 MB for building documentation)">
     14  <!ENTITY git-time          "0.7 SBU (add 12 SBU for tests and 2.4 SBU for building documentation)">
    1515]>
    1616
    … …  
    3333
    3434    <para>
     35
    3536      <application>Git</application> is a free and open source, distributed
    3637      version control system designed to handle everything from small to very
    … …  
    4243      files, much like tools such as <xref linkend="mercurial"/>,
    4344      <application>Bazaar</application>, <xref linkend="subversion"/>,
    44       <xref linkend="cvs"/>, <application>Perforce</application>, and
     45      <ulink url="http://www.nongnu.org/cvs/">CVS</ulink>,
     46      <application>Perforce</application>, and
    4547      <application>Team Foundation Server</application>.
    46     </para>
    47 
    48     &lfs77_checked;
     48
     49    </para>
     50
     51    &lfs78_checked;
    4952
    5053    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    8891          <ulink url="&git-root;/git-manpages-&git-version;.tar.xz">
    8992          &git-root;/git-manpages-&git-version;.tar.xz</ulink>
    90           (Not needed if you have installed asciidoc and xmlto and
    91           wish to build them).
     93          (if you prefer the original, not needed if you've installed asciidoc
     94          and xmlto and prefer to build them).
    9295        </para>
    9396      </listitem>
    … …  
    9699          <ulink url="&git-root;/git-htmldocs-&git-version;.tar.xz">
    97100          &git-root;/git-htmldocs-&git-version;.tar.xz</ulink>
    98           and other docs (Not needed if you have installed asciidoc
    99           and wish to build them).
     101          and other docs (if you prefer the original, not needed if you've
     102          installed asciidoc and prefer to build them).
    100103        </para>
    101104      </listitem>
    … …  
    124127    <para>
    125128      <xref linkend="xmlto"/> and
    126       <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> or 
     129      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> or
    127130      <ulink url="http://asciidoctor.org/">AsciiDoctor</ulink>
    128131    </para>
    … …  
    145148
    146149    <para>
    147       If you have installed <application>AsciiDoc</application>,
    148       you can build a html version of the man pages and other
    149       docs by running the following command:
     150      You can build the man pages and/or html docs, or
     151      use downloaded ones. If you choose to build them, use next two following
     152      instructions.
     153    </para>
     154
     155    <para>
     156      If you have installed <ulink
     157      url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> you can
     158      create the html version of the man pages and other docs:
    150159    </para>
    151160
    … …  
    153162
    154163    <para>
    155       If you have installed <application>AsciiDoc</application>
    156       and <application>xmlto</application>, you can build the
    157       man pages by running the following command:
     164      If you have installed <ulink
     165      url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> and
     166      <xref linkend="xmlto"/> you can create the man pages:
    158167    </para>
    159168
    … …  
    161170
    162171    <para>
    163       To test the results, issue: <command>make test</command>.
    164       The test suite takes a long time to complete and the
    165       results have no meaning to an end user.
     172      The test suite can be run in parallel mode. To run the test suite, issue:
     173      <command>make test</command>.
    166174    </para>
    167175
    … …  
    173181<screen role="root"><userinput>make install</userinput></screen>
    174182
    175     <para>
    176       If the manual pages were built, install them by running the
    177       following command as the <systemitem
    178       class="username">root</systemitem> user:
     183<!-- ==== Method 1 for docs ====== -->
     184    <bridgehead renderas="sect3">If you created the man pages and/or html docs</bridgehead>
     185
     186    <para>
     187      Install the man pages as
     188      <systemitem class="username">root</systemitem> user:
    179189    </para>
    180190
    … …  
    182192
    183193    <para>
    184       Or, if you have downloaded the optional manual pages tarball, you
    185       can install the manual pages by running the following commands
    186       as the <systemitem class="username">root</systemitem> user:
     194      Install the html docs as
     195      <systemitem class="username">root</systemitem> user:
     196    </para>
     197
     198<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
     199
     200<!-- ==== Method 2 for docs ====== -->
     201    <bridgehead renderas="sect3">If you downloaded the man pages and/or html docs</bridgehead>
     202
     203    <para>
     204      If you downloaded the man pages untar them as the
     205      <systemitem class="username">root</systemitem> user:
    187206    </para>
    188207
    … …  
    191210
    192211    <para>
    193       If the html docs were built, install them by running the
    194       following command as the <systemitem
    195       class="username">root</systemitem> user:
    196     </para>
    197 
    198 <screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
    199 
    200     <para>
    201       Or, if you have downloaded the optional html docs tarball, you
    202       can install the html docs by running the following commands
    203       as the <systemitem class="username">root</systemitem> user:
    204     </para>
    205 
    206 <screen role="root"><userinput>mkdir -pv   /usr/share/doc/git-&git-version;                                    &amp;&amp;
     212      If you downloaded the html docs untar them as the
     213      <systemitem class="username">root</systemitem> user:
     214    </para>
     215
     216<screen role="root"><userinput>mkdir -vp   /usr/share/doc/git-&git-version; &amp;&amp;
    207217tar   -xf   ../git-htmldocs-&git-version;.tar.xz \
    208218      -C    /usr/share/doc/git-&git-version; --no-same-owner --no-overwrite-dir &amp;&amp;
    209219
    210 find        /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \;      &amp;&amp;
     220find        /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \; &amp;&amp;
    211221find        /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;</userinput></screen>
    212222
    213     <para>
    214       If the html documentation was installed, ensure that the files
    215       were installed in proper locations by running the following
    216       commands as the <systemitem class="username">root</systemitem>
    217       user:
    218     </para>
    219 
    220 <screen role="root"><userinput>mkdir -v /usr/share/doc/git-&git-version;/man-pages/{html,text}          &amp;&amp;
     223<!-- ==== Reorganize docs ====== -->
     224    <bridgehead renderas="sect3">Reorganize man pages and/or html docs (both methods)</bridgehead>
     225
     226    <para>
     227      For both methods, reorganize the files, as
     228      <systemitem class="username">root</systemitem> user:
     229    </para>
     230
     231<screen role="root"><userinput>mkdir -vp /usr/share/doc/git-&git-version;/man-pages/{html,text}         &amp;&amp;
    221232mv        /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
    222233mv        /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
    223234
    224 mkdir -v /usr/share/doc/git-&git-version;/technical/{html,text}          &amp;&amp;
     235mkdir -vp /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
    225236mv        /usr/share/doc/git-&git-version;/technical/{*.txt,text}        &amp;&amp;
    226237mv        /usr/share/doc/git-&git-version;/technical/{*.,}html           &amp;&amp;
    227238
    228 mkdir -v /usr/share/doc/git-&git-version;/howto/{html,text}              &amp;&amp;
     239mkdir -vp /usr/share/doc/git-&git-version;/howto/{html,text}             &amp;&amp;
    229240mv        /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &amp;&amp;
    230241mv        /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen>
    … …  
    271282
    272283    <para>
    273       <command>find ... chmod ...</command>: These commands correct the 
     284      <command>find ... chmod ...</command>: These commands correct the
    274285      permissions in the shipped documentation tar file.
    275286    </para>
    … …  
    316327        </seg>
    317328        <seg>
    318           /usr/libexec/git-core,
    319           /usr/share/doc/git-&git-version;,
    320           /usr/share/git-core,
    321           /usr/share/git-gui,
    322           /usr/share/gitk,
    323           /usr/share/gitweb,
    324           /usr/lib/perl5/site_perl/&lt;5.x.y&gt;/Git and
    325           /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/Git
     329          /usr/lib/perl5/site_perl/&lt;5.x.y&gt;{,&lt;arch&gt;-linux/auto}/Git,
     330          /usr/libexec/git-core and
     331          /usr/share/{doc/git-&git-version;,git-core,git-gui,gitk,gitweb}
    326332        </seg>
    327333      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.