Changeset d0d9e90 for BLFS/libs/func_dependencies

Timestamp:

08/13/2006 10:01:14 AM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

00f4966

Parents:

1b99a8b

Message:

Merged r2925:2931 from trunk

File:

• BLFS/libs/func_dependencies (modified) (10 diffs)

BLFS/libs/func_dependencies

@@ -63 +63 @@
   ENTRY_END="\"/>"
 
-  echo -en "\tGenerating $TARGET dependencies tree ..."
+  echo -e "\tGenerating $TARGET dependencies tree ..."
 
   mkdir dependencies
@@ -121 +121 @@
   esac
 
-  #------------------P---
-  # Start with a clean depure.txt file
-  > depure.txt
-
   #---------------------
   # If have dependencies, write its XInclude and find sub-dependencies
   if [[ -f dependencies/$TARGET.dep ]]; then
-    echo -e "Start loop for PKG $TARGET\n" >> depure.txt
     mkdir xincludes && do_dependencies $TARGET
   fi
 
-  echo "done"
+  echo -e "\n\t... done"
 }
 
@@ -167 +162 @@
   local DEP_LV=$DEP_LEVEL
   local line line2 DEP
-  echo -e "\tPKG is $PKG" >> depure.txt
-  echo -e "\tDEP_LEVEL for $PKG is $DEP_LV\n" >> depure.txt
 
   #------------------
   #  If a premade xinclude file exists, use it. If not, create one
   if [[ -f xincludes/$PKG.xinc ]] ; then
-    echo -e "\tReusing xinclude file for PKG $PKG" >> depure.txt
     IFS=$'\x0A'
     for line in `cat xincludes/$PKG.xinc` ; do
@@ -219 +211 @@
 
     #------------------
-    echo -e "\tDEP for $PKG is $DEP" >> depure.txt
     # Prevent circular dependencies
     # If all dependencies are circular, the creation of the *.dep file
@@ -260 +251 @@
 
     #------------------
-    echo -e "\tDEP_LEVEL for $DEP is $DEP_LV" >> depure.txt
     # XML file of dependency package
     DEP_XML=`grep "^$DEP[[:space:]]" ../packages | cut -f2`
-    echo -e "\t\tDEP_XML is $DEP_XML\n" >> depure.txt
     case $DEP in
       x-window-system | alsa ) ;; # No page for that (proper link must be created when generating the book)
@@ -310 +299 @@
       # If a premade xinclude file esist, include it
       if [[ -f xincludes/$DEP.xinc ]] ; then
-        echo -e "\tReusing xinclude file for PKG $DEP (to solve $PKG)\n" >> depure.txt
         IFS=$'\x0A'
         for line2 in `cat xincludes/$DEP.xinc` ; do
@@ -322 +310 @@
       # Create the xinclude file
       else
-        echo -e "\nStart new loop for PKG $DEP (to solve $PKG)\n" >> depure.txt
         #
         # >>>>>> THIS IS A RECURSIVE FUNCTION CALL.. BEWARE OF GREMLINS. <<<<<<
@@ -330 +317 @@
         #
         set +e
-         [[ "${VERBOSITY}" > 0 ]] && echo -ne "\nrecursive call: $((++cntr)) ${spaceSTR:0:$cntr} ${RED}$DEP${OFF}"
+         [[ "${VERBOSITY}" > 0 ]] && echo -ne "\ncall: $((++cntr))${spaceSTR:0:$cntr}${RED}$DEP${OFF}"
             do_dependencies $DEP
-         [[ "${VERBOSITY}" > 0 ]] && echo -ne  "\n          ret:  $cntr ${spaceSTR:0:$((cntr--))} ${GREEN}$DEP${OFF}\tUsing the new xinclude file for PKG $DEP (to solve $PKG)"
+         [[ "${VERBOSITY}" > 0 ]] && echo -ne "\n ret: $cntr${spaceSTR:0:$((cntr--))}${GREEN}$DEP${OFF}  Using $DEP Xinc to solve $PKG"
         set -e
 
         # Include it when done
-        echo -e "\tUsing the new xinclude file for PKG $DEP (to solve $PKG)\n" >> depure.txt
         IFS=$'\x0A'
         for line2 in `cat xincludes/$DEP.xinc` ; do
@@ -358 +344 @@
   #------------------
   mv xincludes/$PKG.xinc.tmp xincludes/$PKG.xinc
-  echo -e "Using the new xinclude file for PKG $PKG" >> depure.txt
   IFS=$'\x0A'
   for line in `cat xincludes/$PKG.xinc` ; do
@@ -367 +352 @@
     echo -e "$line" >> $TARGET-index.xml.tmp
   done
-
-  echo -e "\nEnd loop for PKG $PKG\n" >> depure.txt
 }