Changeset d68eb1b for common

Timestamp:

01/12/2014 09:40:20 PM (10 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

b97ed5b

Parents:

7735c7a

Message:

Major change to th scripts layout:

• Do not put the chroot commands in $PROGNAME-commands, but rather in a separate directory chroot-scripts
• Use the commands in the chroot-scripts directory to generate the CHROOT variables in Makefile
• The commands are extracted to $PROGNAME-commands only if they do not have role="nodump attribute and they do not begin with "chroot" (for compatibility with previous books where chroot commands did not have the role="nodump" attribute.

Location:

common

Files:

• chroot.xsl (added)
• libs/func_book_parser (modified) (6 diffs)

common/libs/func_book_parser

@@ -17 +17 @@
       lfs) svn_root="LFS" ;;
       hlfs) svn_root="HLFS" ;;
-      clfs*) svn_root="cross-lfs" ;;
+      clfs*) ;;
       *) echo "BOOK not defined in function <get_book>"
           exit 1 ;;
@@ -57 +57 @@
 #----------------------------#
 
-  # Check for libxslt instead of just letting the script hit 'xsltproc' and fail.
-  test `type -p xsltproc` || eval "echo \"This feature requires libxslt.\"
-  exit 1"
-
   cd $JHALFSDIR
   case $PROGNAME in
@@ -69 +65 @@
   esac
 
-  # Start clean
-  if [ -d ${PROGNAME}-commands ]; then
-    rm -rf ${PROGNAME}-commands
-    mkdir -v ${PROGNAME}-commands
-  fi
+  # Clean
+  rm -rf ${PROGNAME}-commands
+
+  # Extract the commands
   echo -n "Extracting commands for"
-
-  # Dump the commands in shell script form from the HLFS book.
   case ${PROGNAME} in
     clfs)
@@ -149 +142 @@
                  -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
       ;;
-    *)  echo -n " ${L_arrow}${BOLD}${PROGNAME}${R_arrow} book invalid, terminate build... "
+    *)  echo -n " ${L_arrow}${PROGNAME}${R_arrow} book invalid, terminate build... "
         exit 1 ;;
   esac
@@ -160 +153 @@
   # Create the packages file. We need it for proper Makefile creation
   create_package_list
+  create_chroot_scripts
 
   # Done. Moving on...
@@ -196 +190 @@
   esac
 
-  if [[ "${BLFS_TOOL}" = "y" ]] ; then
-(
-cat << EOF
-$LIBXML_PKG
-$LIBXSLT_PKG
-$TIDY_PKG
-$UNZIP_PKG
-$DBXML_PKG
-$DBXSL_PKG
-$LYNX_PKG
-$SUDO_PKG
-$WGET_PKG
-$SQLITE_PKG
-$APR_PKG
-$APR_U_PKG
-$SVN_PKG
-$GPM_PKG
-EOF
-) >> pkg_tarball_list
-  fi
-
   echo "done"
 
 }
 
+#----------------------------#
+create_chroot_scripts() {      #
+#----------------------------#
+
+  rm -rf chroot_scripts
+  echo -n "Creating chroot commands scripts from $BOOK"
+  if [ ! -z $ARCH ] ; then echo -n " $ARCH" ; fi
+  echo -n "... "
+  case ${PROGNAME} in
+    clfs*)
+      xsltproc --nonet --xinclude \
+               -o chroot-scripts/ chroot.xsl \
+               $BOOK/BOOK/${ARCH}-index.xml >> $LOGDIR/$LOG 2>&1
+      ;;
+    hlfs)
+      xsltproc --nonet --xinclude \
+               -o chroot-scripts/ chroot.xsl \
+               $BOOK/index.xml >> $LOGDIR/$LOG 2>&1
+      ;;
+    lfs)
+      xsltproc --nonet --xinclude \
+               -o chroot-scripts/ chroot.xsl \
+               $BOOK/chapter06/chapter06.xml >> $LOGDIR/$LOG 2>&1
+      ;;
+    *)
+  esac
+  echo "done"
+
+}