zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed depure.txt creation.

Browse source 
The recursive call code is more usefull to catch circular dependencies.
This commit is contained in:
Manuel Canales Esparcia 2006-08-12 14:47:31 +00:00
parent 73c3c1c765
commit 4a7e066e2a
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
BLFS/libs/func_dependencies
View file

@ -127,7 +127,6 @@ inline_doc
#--------------------- #---------------------
# If have dependencies, write its XInclude and find sub-dependencies # If have dependencies, write its XInclude and find sub-dependencies
if [[ -f dependencies/$TARGET.dep ]]; then if [[ -f dependencies/$TARGET.dep ]]; then
echo -e "Start loop for PKG $TARGET\n" >> depure.txt
mkdir xincludes && do_dependencies $TARGET mkdir xincludes && do_dependencies $TARGET
fi fi
@ -166,13 +165,10 @@ inline_doc
local saveIFS=$IFS local saveIFS=$IFS
local DEP_LV=$DEP_LEVEL local DEP_LV=$DEP_LEVEL
local line line2 DEP 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 a premade xinclude file exists, use it. If not, create one
if [[ -f xincludes/$PKG.xinc ]] ; then if [[ -f xincludes/$PKG.xinc ]] ; then
echo -e "\tReusing xinclude file for PKG $PKG" >> depure.txt
IFS=$'\x0A' IFS=$'\x0A'
for line in `cat xincludes/$PKG.xinc` ; do for line in `cat xincludes/$PKG.xinc` ; do
IFS=$saveIFS IFS=$saveIFS
@ -218,7 +214,6 @@ inline_doc
esac esac
#------------------ #------------------
echo -e "\tDEP for $PKG is $DEP" >> depure.txt
# Prevent circular dependencies # Prevent circular dependencies
# If all dependencies are circular, the creation of the *.dep file # If all dependencies are circular, the creation of the *.dep file
# must be skipped, not placed here, to avoid that the script will bomb # must be skipped, not placed here, to avoid that the script will bomb
@ -259,10 +254,8 @@ inline_doc
esac esac
#------------------ #------------------
echo -e "\tDEP_LEVEL for $DEP is $DEP_LV" >> depure.txt
# XML file of dependency package # XML file of dependency package
DEP_XML=`grep "^$DEP[[:space:]]" ../packages | cut -f2` DEP_XML=`grep "^$DEP[[:space:]]" ../packages | cut -f2`
echo -e "\t\tDEP_XML is $DEP_XML\n" >> depure.txt
case $DEP in case $DEP in
x-window-system | alsa ) ;; # No page for that (proper link must be created when generating the book) x-window-system | alsa ) ;; # No page for that (proper link must be created when generating the book)
xorg7 ) ;; # This page will be dump in the xorg7.xinc file xorg7 ) ;; # This page will be dump in the xorg7.xinc file
@ -309,7 +302,6 @@ inline_doc
if [[ -f dependencies/$DEP.dep ]] ; then if [[ -f dependencies/$DEP.dep ]] ; then
# If a premade xinclude file esist, include it # If a premade xinclude file esist, include it
if [[ -f xincludes/$DEP.xinc ]] ; then if [[ -f xincludes/$DEP.xinc ]] ; then
echo -e "\tReusing xinclude file for PKG $DEP (to solve $PKG)\n" >> depure.txt
IFS=$'\x0A' IFS=$'\x0A'
for line2 in `cat xincludes/$DEP.xinc` ; do for line2 in `cat xincludes/$DEP.xinc` ; do
IFS=$saveIFS IFS=$saveIFS
@ -321,7 +313,6 @@ inline_doc
#------------------ #------------------
# Create the xinclude file # Create the xinclude file
else else
echo -e "\nStart new loop for PKG $DEP (to solve $PKG)\n" >> depure.txt
# #
# >>>>>> THIS IS A RECURSIVE FUNCTION CALL.. BEWARE OF GREMLINS. <<<<<< # >>>>>> THIS IS A RECURSIVE FUNCTION CALL.. BEWARE OF GREMLINS. <<<<<<
# #
@ -335,7 +326,6 @@ inline_doc
set -e set -e
# Include it when done # Include it when done
echo -e "\tUsing the new xinclude file for PKG $DEP (to solve $PKG)\n" >> depure.txt
IFS=$'\x0A' IFS=$'\x0A'
for line2 in `cat xincludes/$DEP.xinc` ; do for line2 in `cat xincludes/$DEP.xinc` ; do
IFS=$saveIFS IFS=$saveIFS
@ -357,7 +347,6 @@ inline_doc
#------------------ #------------------
mv xincludes/$PKG.xinc.tmp xincludes/$PKG.xinc mv xincludes/$PKG.xinc.tmp xincludes/$PKG.xinc
echo -e "Using the new xinclude file for PKG $PKG" >> depure.txt
IFS=$'\x0A' IFS=$'\x0A'
for line in `cat xincludes/$PKG.xinc` ; do for line in `cat xincludes/$PKG.xinc` ; do
IFS=$saveIFS IFS=$saveIFS
@ -366,6 +355,4 @@ inline_doc
# Write the XInclude # Write the XInclude
echo -e "$line" >> $TARGET-index.xml.tmp echo -e "$line" >> $TARGET-index.xml.tmp
done done
echo -e "\nEnd loop for PKG $PKG\n" >> depure.txt
} }