Changeset d0d9e90 for BLFS/libs


Ignore:
Timestamp:
08/13/2006 10:01:14 AM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
00f4966
Parents:
1b99a8b
Message:

Merged r2925:2931 from trunk

Location:
BLFS/libs
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • BLFS/libs/constants.inc

    r1b99a8b rd0d9e90  
    3434declare -r R_arrow=$'\e[1;33m>\e[0m'
    3535declare -r L_arrow=$'\e[1;33m<\e[0m'
    36 
    37 HEADER="# This file is automatically generated by jhalfs
    38 # DO NOT EDIT THIS FILE MANUALLY
    39 #
    40 # Generated on `date \"+%F %X %Z\"`"

  • BLFS/libs/func_dependencies

    r1b99a8b rd0d9e90  
    6363  ENTRY_END="\"/>"
    6464
    65   echo -en "\tGenerating $TARGET dependencies tree ..."
     65  echo -e "\tGenerating $TARGET dependencies tree ..."
    6666
    6767  mkdir dependencies
    … …  
    121121  esac
    122122
    123   #------------------P---
    124   # Start with a clean depure.txt file
    125   > depure.txt
    126 
    127123  #---------------------
    128124  # If have dependencies, write its XInclude and find sub-dependencies
    129125  if [[ -f dependencies/$TARGET.dep ]]; then
    130     echo -e "Start loop for PKG $TARGET\n" >> depure.txt
    131126    mkdir xincludes && do_dependencies $TARGET
    132127  fi
    133128
    134   echo "done"
     129  echo -e "\n\t... done"
    135130}
    136131
    … …  
    167162  local DEP_LV=$DEP_LEVEL
    168163  local line line2 DEP
    169   echo -e "\tPKG is $PKG" >> depure.txt
    170   echo -e "\tDEP_LEVEL for $PKG is $DEP_LV\n" >> depure.txt
    171164
    172165  #------------------
    173166  #  If a premade xinclude file exists, use it. If not, create one
    174167  if [[ -f xincludes/$PKG.xinc ]] ; then
    175     echo -e "\tReusing xinclude file for PKG $PKG" >> depure.txt
    176168    IFS=$'\x0A'
    177169    for line in `cat xincludes/$PKG.xinc` ; do
    … …  
    219211
    220212    #------------------
    221     echo -e "\tDEP for $PKG is $DEP" >> depure.txt
    222213    # Prevent circular dependencies
    223214    # If all dependencies are circular, the creation of the *.dep file
    … …  
    260251
    261252    #------------------
    262     echo -e "\tDEP_LEVEL for $DEP is $DEP_LV" >> depure.txt
    263253    # XML file of dependency package
    264254    DEP_XML=`grep "^$DEP[[:space:]]" ../packages | cut -f2`
    265     echo -e "\t\tDEP_XML is $DEP_XML\n" >> depure.txt
    266255    case $DEP in
    267256      x-window-system | alsa ) ;; # No page for that (proper link must be created when generating the book)
    … …  
    310299      # If a premade xinclude file esist, include it
    311300      if [[ -f xincludes/$DEP.xinc ]] ; then
    312         echo -e "\tReusing xinclude file for PKG $DEP (to solve $PKG)\n" >> depure.txt
    313301        IFS=$'\x0A'
    314302        for line2 in `cat xincludes/$DEP.xinc` ; do
    … …  
    322310      # Create the xinclude file
    323311      else
    324         echo -e "\nStart new loop for PKG $DEP (to solve $PKG)\n" >> depure.txt
    325312        #
    326313        # >>>>>> THIS IS A RECURSIVE FUNCTION CALL.. BEWARE OF GREMLINS. <<<<<<
    … …  
    330317        #
    331318        set +e
    332          [[ "${VERBOSITY}" > 0 ]] && echo -ne "\nrecursive call: $((++cntr)) ${spaceSTR:0:$cntr} ${RED}$DEP${OFF}"
     319         [[ "${VERBOSITY}" > 0 ]] && echo -ne "\ncall: $((++cntr))${spaceSTR:0:$cntr}${RED}$DEP${OFF}"
    333320            do_dependencies $DEP
    334          [[ "${VERBOSITY}" > 0 ]] && echo -ne  "\n          ret:  $cntr ${spaceSTR:0:$((cntr--))} ${GREEN}$DEP${OFF}\tUsing the new xinclude file for PKG $DEP (to solve $PKG)"
     321         [[ "${VERBOSITY}" > 0 ]] && echo -ne "\n ret: $cntr${spaceSTR:0:$((cntr--))}${GREEN}$DEP${OFF}  Using $DEP Xinc to solve $PKG"
    335322        set -e
    336323
    337324        # Include it when done
    338         echo -e "\tUsing the new xinclude file for PKG $DEP (to solve $PKG)\n" >> depure.txt
    339325        IFS=$'\x0A'
    340326        for line2 in `cat xincludes/$DEP.xinc` ; do
    … …  
    358344  #------------------
    359345  mv xincludes/$PKG.xinc.tmp xincludes/$PKG.xinc
    360   echo -e "Using the new xinclude file for PKG $PKG" >> depure.txt
    361346  IFS=$'\x0A'
    362347  for line in `cat xincludes/$PKG.xinc` ; do
    … …  
    367352    echo -e "$line" >> $TARGET-index.xml.tmp
    368353  done
    369 
    370   echo -e "\nEnd loop for PKG $PKG\n" >> depure.txt
    371354}

  • BLFS/libs/func_parser

    r1b99a8b rd0d9e90  
    2323
    2424  local
    25   echo -en "\tGenerating $TARGET-index.xml ..."
     25  echo -en "\n\tGenerating $TARGET-index.xml ..."
    2626
    2727  #---------------------
    … …  
    9999
    100100  local filename # output filename
    101   echo -en  "\tGenerating the HTML book for <$TARGET> from the xml files located in <$BLFS_XML>..."
     101  echo -en  "\n\tGenerating <$TARGET> HTML book from <$BLFS_XML> xml files ..."
    102102  xsltproc --xinclude --nonet \
    103103           --stringparam mail_server $MAIL_SERVER \
    … …  
    139139  echo -e "\n\tScripts generation depuration and errors:\n" >> xsltproc.log
    140140
    141   echo -en  "\tGenerating the build scripts ..."
     141  echo -en "\n\tGenerating the build scripts ..."
    142142  xsltproc --xinclude --nonet \
    143143           -o ./scripts/ ../libs/scripts.xsl \
    144144           $TARGET-index.xml >> xsltproc.log 2>&1
    145   echo "done"
     145  echo -e "done\n"
    146146    # Make the scripts executable.
    147147  chmod -R +x scripts

  • BLFS/libs/scripts.xsl

    r1b99a8b rd0d9e90  
    8484
    8585        <!-- Creating the scripts -->
    86       <exsl:document href="{$order}-{$filename}" method="text">
     86      <exsl:document href="{$order}-z-{$filename}" method="text">
    8787        <xsl:text>#!/bin/sh&#xA;set -e&#xA;&#xA;</xsl:text>
    8888        <xsl:choose>
    … …  
    103103            <!-- Clean-up -->
    104104            <xsl:text>cd ~/sources/$PKG_DIR&#xA;</xsl:text>
    105             <xsl:text>rm -rf $UNPACKDIR&#xA;&#xA;</xsl:text>
     105            <xsl:text>rm -rf $UNPACKDIR unpacked&#xA;&#xA;</xsl:text>
    106106          </xsl:when>
    107107          <!-- Non-package page -->
    … …  
    132132      </xsl:when>
    133133      <xsl:when test="@role = 'installation'">
    134         <xsl:text>tar -xvf $PACKAGE > unpacked&#xA;</xsl:text>
    135         <xsl:text>UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`&#xA;</xsl:text>
    136         <xsl:text>cd $UNPACKDIR&#xA;</xsl:text>
     134        <xsl:text>
     135if [[ -e unpacked ]] ; then
     136  UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
     137  rm -rf $UNPACKDIR
     138fi
     139tar -xvf $PACKAGE > unpacked
     140UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
     141cd $UNPACKDIR
     142          </xsl:text>
    137143        <xsl:apply-templates select=".//screen | .//para/command"/>
    138144        <xsl:text>&#xA;</xsl:text>
    … …  
    305311        <xsl:text>    cp $SRC_ARCHIVE/$PACKAGE $PACKAGE&#xA;  else&#xA;</xsl:text>
    306312        <!-- The FTP_SERVER mirror -->
    307         <xsl:text>    wget $FTP_SERVER/BLFS/conglomeration/$PKG_DIR/$PACKAGE</xsl:text>
     313        <xsl:text>    wget ${FTP_SERVER}conglomeration/$PKG_DIR/$PACKAGE</xsl:text>
    308314        <!-- Upstream HTTP URL -->
    309315        <xsl:if test="string-length(ulink/@url) &gt; '10' and
Note: See TracChangeset for help on using the changeset viewer.