r2747 - jhalfs/branches/experimental/BLFS/libs

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Jun 2 13:27:02 PDT 2006


Author: manuel
Date: 2006-06-02 14:27:01 -0600 (Fri, 02 Jun 2006)
New Revision: 2747

Added:
   jhalfs/branches/experimental/BLFS/libs/book.xsl
Modified:
   jhalfs/branches/experimental/BLFS/libs/func_dependencies
   jhalfs/branches/experimental/BLFS/libs/func_parser
Log:
Added template book.xsl file.
Fixed a few dependencies.

Added: jhalfs/branches/experimental/BLFS/libs/book.xsl
===================================================================
--- jhalfs/branches/experimental/BLFS/libs/book.xsl	                        (rev 0)
+++ jhalfs/branches/experimental/BLFS/libs/book.xsl	2006-06-02 20:27:01 UTC (rev 2747)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+<!-- $Id$ -->
+
+  <!-- NOTE: the base dir (blfs-xml) must be changed to FAKEDIR on the
+  final version and set it to the proper dir via a sed in ./blfs -->
+  <xsl:import href="../blfs-xml/stylesheets/blfs-chunked.xsl"/>
+
+</xsl:stylesheet>


Property changes on: jhalfs/branches/experimental/BLFS/libs/book.xsl
___________________________________________________________________
Name: svn:keywords
   + Author Date Revision Id

Modified: jhalfs/branches/experimental/BLFS/libs/func_dependencies
===================================================================
--- jhalfs/branches/experimental/BLFS/libs/func_dependencies	2006-06-02 17:53:17 UTC (rev 2746)
+++ jhalfs/branches/experimental/BLFS/libs/func_dependencies	2006-06-02 20:27:01 UTC (rev 2747)
@@ -46,6 +46,8 @@
 
   #---------------------
   # The BLFS sources directory.
+  # Note: for book.xsl this value must be set via a sed in ./blfs.
+  # For consistency, we should to do the same here.
   BLFS_XML=`echo $PKGXML | sed -e 's,/.*,,'`
 
   if [[ ! -d ../$BLFS_XML ]] ; then
@@ -195,13 +197,18 @@
 
       db ) # The proper version of DB is installed in LFS
         continue ;;
-      hal-requirements | hal-runtime-dependencies ) # Don't have their own XML file
+
+        # Don't have their own XML file
+      hal-requirements | hal-runtime-dependencies )
         continue ;;
-      perl-* | tk-perl )  DEP=perl-modules ;;
 
         # Orphan links (proper link must be created when generating the book)
-      arts )              DEP=aRts ;;
-      kde )               DEP=kde-core ;;
+      arts )                     DEP=aRts ;;
+      kde )                      DEP=kde-core ;;
+      perl-* | tk-perl )         DEP=perl-modules ;;
+      GNOME-desktop-file-utils ) DEP=desktop-file-utils ;;
+      GNOME-shared-mime-info )   DEP=shared-mime-info ;;
+
         # Set values for alternative packages
         # X is a meta-package, thus handled in another way.
       LPRng | cups )      DEP=$PRINT_SERVER ;;

Modified: jhalfs/branches/experimental/BLFS/libs/func_parser
===================================================================
--- jhalfs/branches/experimental/BLFS/libs/func_parser	2006-06-02 17:53:17 UTC (rev 2746)
+++ jhalfs/branches/experimental/BLFS/libs/func_parser	2006-06-02 20:27:01 UTC (rev 2747)
@@ -99,8 +99,7 @@
 
   echo -en  "\tGenerating the HTML book ..."
   xsltproc --xinclude --nonet --stringparam base.dir HTML/ \
-           --stringparam chunk.quietly 1 \
-           ../$BLFS_XML/stylesheets/blfs-chunked.xsl \
+           ../libs/book.xsl \
            $TARGET-index.xml > xsltproc.log 2>&1
 
   mkdir HTML/{stylesheets,images}




More information about the alfs-log mailing list