Changeset f1f871c

Timestamp:

09/29/2007 08:03:34 AM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

1f10495

Parents:

41d8577

Message:

Don't copy XSL files to $JHALFSDIR.
Removed the now unneeded packages.xsl code.

Files:

• common/libs/func_book_parser (modified) (1 diff)
• common/libs/func_download_pkgs (modified) (5 diffs)
• common/packages.xsl (deleted)
• jhalfs (modified) (2 diffs)

common/libs/func_book_parser

@@ -158 +158 @@
   chmod -R +x $JHALFSDIR/${PROGNAME}-commands
 
-  # Create the packages file. We need it for proper Makefile creation
-  create_package_list
-
   # Done. Moving on...
   get_sources
 
 }
-
-#----------------------------#
-create_package_list() {      #
-#----------------------------#
-
-  # Create the packages file. We need it for proper Makefile creation
-  rm -f pkg_tarball_list
-  echo -n "Creating <${PROGNAME}> list of tarball names for $BOOK"
-  if [ ! -z $ARCH ] ; then echo -n " $ARCH" ; fi
-  echo -n "... "
-  case ${PROGNAME} in
-    clfs | clfs2 | clfs3 )
-        xsltproc --nonet --xinclude -o pkg_tarball_list packages.xsl \
-                 $BOOK/materials/${ARCH}-chapter.xml >>$LOGDIR/$LOG 2>&1
-      ;;
-    hlfs)
-        xsltproc --nonet --xinclude \
-                 --stringparam model $MODEL \
-                 --stringparam kernel $KERNEL \
-                  -o pkg_tarball_list packages.xsl \
-                 $BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
-      ;;
-    lfs)
-        xsltproc --nonet --xinclude -o pkg_tarball_list packages.xsl \
-                 $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
-      ;;
-  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
-$SVN_PKG
-$GPM_PKG
-EOF
-) >> pkg_tarball_list
-  fi
-
-  echo "done"
-
-}
-

common/libs/func_download_pkgs

@@ -138 +138 @@
                  --stringparam server $SERVER \
                  --stringparam family clfs \
-                 -o $BUILDDIR/sources/urls.lst urls.xsl \
+                 -o $BUILDDIR/sources/urls.lst $CODE_DIR/$COMMON_DIR/urls.xsl \
                  $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
         echo " ...OK"
@@ -147 +147 @@
                  --stringparam server $SERVER \
                  --stringparam family clfs \
-                 -o $BUILDDIR/sources/urls.lst urls.xsl \
+                 -o $BUILDDIR/sources/urls.lst $CODE_DIR/$COMMON_DIR/urls.xsl \
                  $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
         echo " ...OK"
@@ -156 +156 @@
                  --stringparam server $SERVER \
                  --stringparam family clfs \
-                 -o $BUILDDIR/sources/urls.lst urls.xsl \
+                 -o $BUILDDIR/sources/urls.lst $CODE_DIR/$COMMON_DIR/urls.xsl \
                  $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
         echo " ...OK"
@@ -167 +167 @@
                  --stringparam model $MODEL \
                  --stringparam kernel $KERNEL \
-                 -o $BUILDDIR/sources/urls.lst urls.xsl \
+                 -o $BUILDDIR/sources/urls.lst $CODE_DIR/$COMMON_DIR/urls.xsl \
                  $BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
         echo " ...OK"
@@ -176 +176 @@
                  --stringparam server $SERVER \
                  --stringparam family lfs \
-                 -o ../sources/urls.lst urls.xsl \
+                 -o ../sources/urls.lst $CODE_DIR/$COMMON_DIR/urls.xsl \
                  $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
         echo " ...OK"

jhalfs

@@ -250 +250 @@
 
 # Set true internal variables
+CODE_DIR=`pwd`
 COMMON_DIR="common"
 PACKAGE_DIR=$(echo $PROGNAME | tr '[a-z]' '[A-Z]')
 MODULE=$PACKAGE_DIR/master.sh
+
+# Qick fix until have the new code ready
+XSL=$CODE_DIR/$PACKAGE_DIR/$XSL
 
 [[ $VERBOSITY > 0 ]] && echo -n "Loading common-functions module..."
@@ -358 +362 @@
   #
   # Copy common helper files
-  cp $COMMON_DIR/{makefile-functions,progress_bar.sh,packages.xsl} $JHALFSDIR/
-  #
-  # Fix the XSL book parser
-  sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
-  export XSL=$JHALFSDIR/${XSL}
-  #
-
-  # Copy urls.xsl, if needed
-  [[ "$GETPKG" = "y" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
-  #
+  cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
+  #
+
   # Create the test-log directory, if needed
   [[ "$TEST" != "0" ]] && [[ ! -d $TESTLOGDIR ]] && install -d -m 1777 $TESTLOGDIR