r2348 - jhalfs/branches/experimental/common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu Mar 16 13:18:28 PST 2006


Author: manuel
Date: 2006-03-16 14:18:28 -0700 (Thu, 16 Mar 2006)
New Revision: 2348

Modified:
   jhalfs/branches/experimental/common/common-functions
Log:
Started support for the revised hlfs.xsl file.
> Parsing only patches.xsl, instead the full book, to create the patches file.
> Trailing space clean-up.

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-03-16 18:50:00 UTC (rev 2347)
+++ jhalfs/branches/experimental/common/common-functions	2006-03-16 21:18:28 UTC (rev 2348)
@@ -594,7 +594,7 @@
            --xinclude \
            -o patcheslist_.wget \
            patcheslist.xsl \
-           $BOOK/index.xml
+           $BOOK/chapter04/patches.xml
 	   #> /dev/null 2>&1
 
   rm -f patches
@@ -651,9 +651,11 @@
                   --xinclude \
                   --stringparam model $MODEL \
                   --stringparam testsuite $TEST \
-                  --stringparam testchaintest 0 \
                   --stringparam vim-lang $VIMLANG \
                   -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
+        for i in $(find ./${PROGNAME}-commands/chapter07/*) ; do
+          sed -i 's/"EOF"/EOF/g' $i ;
+        done
       ;;
     lfs)
         echo -n "${tab_} ${L_arrow}${BOLD}LFS${R_arrow} build"
@@ -670,8 +672,8 @@
         echo -n "${tab_} ${L_arrow}${BOLD}BLFS${R_arrow} build"
         xsltproc --nonet \
                  --xinclude \
-  	         --stringparam testsuite $TEST \
- 	         --stringparam server $SERVER \
+                 --stringparam testsuite $TEST \
+                 --stringparam server $SERVER \
                  -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
       ;;
     *) exit 1
@@ -721,7 +723,7 @@
   DIR=`echo $1 | sed 's at -doc@@;s at -linuxthreads@@;s at -libidn@@;s at -testsuite@@'`
 
   # If the file exists in the archive copy it to the $BUILDDIR/sources dir
-  # MD5SUM is assumed to be correct from previous download 
+  # MD5SUM is assumed to be correct from previous download
   if [ ! -z ${SRC_ARCHIVE} ] &&
      [   -d ${SRC_ARCHIVE} ] &&
      [   -f ${SRC_ARCHIVE}/$2 ]; then
@@ -765,7 +767,7 @@
   fi
 
   # If we make it this far we should copy the freshly downloaded file
-  # to the source archive. 
+  # to the source archive.
   if [ ! -z ${SRC_ARCHIVE} ] &&
      [   -d ${SRC_ARCHIVE} ] &&
      [   -w ${SRC_ARCHIVE} ] &&




More information about the alfs-log mailing list