Changeset db181c47


Ignore:
Timestamp:
11/16/2005 06:16:52 PM (19 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
1a17f94
Parents:
6480c2b
Message:

Added suppot to download and build the vim-lang package (can be skipped using a switch).

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • dump-lfs-scripts.xsl

    r6480c2b rdb181c47  
    11<?xml version="1.0"?>
     2<!DOCTYPE xsl:stylesheet [
     3 <!ENTITY % general-entities SYSTEM "FAKEDIR/general.ent">
     4  %general-entities;
     5]>
     6
    27<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
    38    xmlns:exsl="http://exslt.org/common"
    … …  
    1217  <!-- Run toolchain test suites? -->
    1318  <xsl:param name="toolchaintest" select="1"/>
     19
     20  <!-- Install vim-lang package? -->
     21  <xsl:param name="vim-lang" select="1"/>
    1422
    1523  <xsl:template match="/">
    … …  
    6674                @id='ch-system-readjusting'">
    6775          <xsl:text>cd $PKGDIR&#xA;</xsl:text>
     76          <xsl:if test="@id='ch-system-vim' and $vim-lang = '1'">
     77            <xsl:text>tar -xvf ../vim-&vim-version;-lang.*&#xA;</xsl:text>
     78          </xsl:if>
    6879        </xsl:if>
    6980        <xsl:apply-templates select=".//para/userinput | .//screen"/>

  • jhalfs

    r6480c2b rdb181c47  
    6464                                /etc/fstab file with dummy values is
    6565                                created.
     66 
     67  --no-vim-lang                 don't install the optional vim-lang package
    6668
    6769  -C, --kernel-config FILE      use the kernel configuration file specified
    … …  
    105107  exit 1"
    106108  cd $JHALFSDIR
    107 
    108   # Test to make sure the LFS version is set
    109   if [ -z $LFSVRS ] ; then LFSVRS=development ; fi
    110 
    111   # Set the book's sources directory
    112   if [ -z $BOOK ] ; then BOOK=lfs-$LFSVRS ; fi
    113109
    114110  if [ -z $WC ] ; then
    … …  
    160156  # Dump the commands in shell script form from the LFS book.
    161157  xsltproc --nonet --xinclude --stringparam testsuite $TEST \
    162     --stringparam toolchaintest $TOOLCHAINTEST -o ./commands/ \
    163     $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
     158    --stringparam toolchaintest $TOOLCHAINTEST --stringparam vim-lang $VIMLANG \
     159    -o ./commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
    164160
    165161  # Make the scripts executable.
    … …  
    172168  -e '/generic/d' >> packages
    173169  echo `grep "glibc" packages | sed 's@glibc@&-linuxthreads@'` >> packages
     170  # Download the vim-lang package if it must be installed
     171  if [ "$VIMLANG" = "1" ] ; then
     172    echo `grep "vim" packages | sed 's@vim@&-lang@'` >> packages
     173  fi
    174174  echo `grep "udev-config-file" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@'` >> packages
    175175  # Download the module-init-tools-testsuite package only
    … …  
    263263      if [ "$PKG" = "tcl" ] ; then
    264264        FILE="$PKG$VRS-src.tar.bz2"
     265      elif [ "$PKG" = "vim-lang" ] ; then
     266        PKG="vim"
     267        FILE="vim-$VRS-lang.tar.bz2"
    265268      elif [ "$PKG" = "udev-config" ] ; then
    266269        PKG="udev"
    … …  
    919922
    920923    --no-toolchain-test )       TOOLCHAINTEST=0 ;;
     924
     925    --no-vim-lang )     VIMLANG=0 ;;
    921926   
    922927    --page_size )
    … …  
    990995
    991996[[ ! -d $JHALFSDIR ]]        && mkdir -pv $JHALFSDIR
    992 [[ "$PWD" != "$JHALFSDIR" ]] && cp -v $FILES $JHALFSDIR/
     997[[ "$PWD" != "$JHALFSDIR" ]] && cp -v $FILES $JHALFSDIR/ && \
     998  sed -e 's/FAKEDIR/'$BOOK'/' $XSL > $JHALFSDIR/dump-lfs-scripts.xsl && \
     999  export XSL=$JHALFSDIR/dump-lfs-scripts.xsl
    9931000[[ ! -d $LOGDIR ]]           && mkdir -v $LOGDIR
    9941001>$LOGDIR/$LOG

  • jhalfs.conf

    r6480c2b rdb181c47  
    77declare -r SVN="svn://svn.linuxfromscratch.org"
    88declare -r HTTP=http://ftp.lfs-matrix.net/pub/lfs/conglomeration
    9 declare -r XSL=dump-lfs-scripts.xsl
    109declare -r LOG=000-jhalfs.log
    11 
    12 #--- Files that will be copied to $JHALFSDIR
    13 FILES="functions dump-lfs-scripts.xsl"
    1410
    1511#--- Mount point for the build
    1612BUILDDIR=/mnt/lfs
    1713
    18 #--- Working directories
    19 JHALFSDIR=$BUILDDIR/jhalfs
    20    LOGDIR=$JHALFSDIR/logs
    21    MKFILE=$JHALFSDIR/Makefile
    22    
    2314#--- Download the source packages 0(no)/1(yes)
    2415HPKG=0
    … …  
    3930TIMEZONE=Europe/London
    4031
     32#--- install the optional vim-lang package  0(no)/1(yes)
     33VIMLANG=1
     34
     35#--- Location of fstab file (if empty, a template is created)
     36FSTAB=
     37
    4138#--- Location of kernel config file (if the kernel is to be compiled)
    4239CONFIG=
    4340
     41
     42
     43#==== INTERNAL VARIABLES ====
     44# Don't edit it unless you know what you are doing
     45
     46#--- Default stylesheet
     47XSL=dump-lfs-scripts.xsl
     48
     49#--- Files that will be copied to $JHALFSDIR
     50FILES="functions"
     51
     52#--- Working directories
     53JHALFSDIR=$BUILDDIR/jhalfs
     54   LOGDIR=$JHALFSDIR/logs
     55   MKFILE=$JHALFSDIR/Makefile
     56   
     57#--- Book version
     58LFSVRS=development
     59
     60#--- Book's sources directory
     61BOOK=lfs-$LFSVRS
Note: See TracChangeset for help on using the changeset viewer.