Changeset 8099885 for LFS/lfs.xsl


Ignore:
Timestamp:
05/21/2013 08:20:24 PM (11 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
2.4, ablfs-more, legacy, new_features, trunk
Children:
eb14b7f
Parents:
0700131
Message:

adaptations to recent modifications in the systemd book and
merging of a change (rev 3750) in the ablfs branch

File:
1 edited

Legend:

Unmodified
Added
Removed

  • LFS/lfs.xsl

    r0700131 r8099885  
    146146    <!--XML::Parser is on the same page as Perl. The present code is OK
    147147        except for PKG_DEST and PKGDIR, which would be the same as for Perl.
    148         so set them to valid values.-->
     148        so set them to valid values.
     149        Since rev 10281, that is no more true. So comment out.
    149150    <xsl:if test="contains(string(./title),'XML::Parser')">
    150151      <xsl:text>PKGDIR=$(dirname $PKGDIR)/</xsl:text>
    … …  
    153154PKG_DEST=$(dirname $PKGDIR)/000-xml-parser
    154155</xsl:text>
    155     </xsl:if>
     156    </xsl:if>-->
    156157    <xsl:apply-templates
    157158      select=".//screen[not(@role) or
    … …  
    270271    <xsl:variable name="filename" select="substring-before(substring($pi-file-value,2),'.html')"/>
    271272     <!-- Creating dirs and files -->
    272     <exsl:document href="{$dirname}/{$order}-{position()}-{$filename}" method="text">
    273       <xsl:text>#!/bin/bash
     273    <xsl:if test="count(descendant::screen/userinput) &gt; 0 and
     274                  count(descendant::screen/userinput) &gt;
     275                      count(descendant::screen[@role='nodump'])">
     276      <exsl:document href="{$dirname}/{$order}-{position()}-{$filename}"
     277                     method="text">
     278        <xsl:text>#!/bin/bash
    274279set +h
    275280set -e
    … …  
    277282cd $PKGDIR
    278283</xsl:text>
    279       <xsl:apply-templates
    280            select=".//screen[not(@role) or @role != 'nodump']/userinput[@remap != 'adjust']"
     284        <xsl:apply-templates
     285           select=".//screen[not(@role) or
     286                            @role != 'nodump']/userinput[@remap != 'adjust']"
    281287           mode="pkgmngt"/>
    282       <xsl:if test="$dirname = 'chapter06'">
    283         <xsl:text>packInstall
     288        <xsl:if test="$dirname = 'chapter06'">
     289          <xsl:text>packInstall
    284290rm -rf $PKG_DEST
    285291</xsl:text>
    286       </xsl:if>
    287       <xsl:apply-templates
    288            select=".//screen[
    289               not(@role) or
    290               @role != 'nodump'
    291                             ]/userinput[
    292                                 not(@remap) or
    293                                 @remap='adjust'
     292        </xsl:if>
     293        <xsl:apply-templates
     294           select=".//screen[not(@role) or
     295                             @role != 'nodump'
     296                            ]/userinput[not(@remap) or
     297                                        @remap='adjust'
    294298                                       ]"
    295299           mode="pkgmngt"/>
    296       <xsl:text>
     300        <xsl:text>
    297301echo -e "\n\nTotalseconds: $SECONDS\n"
    298302exit
    299303</xsl:text>
    300     </exsl:document>
     304      </exsl:document>
     305    </xsl:if>
    301306  </xsl:template>
    302307
Note: See TracChangeset for help on using the changeset viewer.