Changeset c62275f6 for BLFS/libs

Timestamp:

06/13/2006 01:00:46 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

d3f24df

Parents:

5d93cec

Message:

housekeeping on func_makefile

File:

• BLFS/libs/func_makefile (modified) (9 diffs)

BLFS/libs/func_makefile

@@ -13 +13 @@
 declare TRACKING_DIR=/var/lib/jhalfs/BLFS
 declare BUILDDIR=~/TRIAL
-declare LOGDIR=$BUILDDIR/logs
+
 
 #----------------------------------#
@@ -25 +25 @@
 $i:  $PREV
         @\$(call echo_message, Building)
+        @./progress_bar.sh \$@ &
 EOF
 ) >> $MKFILE.tmp
@@ -32 +33 @@
 
 #----------------------------------#
-__write_build_cmd() {              # Some scripts must be run as root..
+__write_build_cmd() {              #
 #----------------------------------#
   local this_script=$1
@@ -38 +39 @@
 (
 cat << EOF
-        @( time { export LFS=\$(MOUNT_PT) && ${BUILD_SCRIPTS}/$file >>\$(LOGDIR)/$this_script 2>&1 ; } ) 2>>\$(LOGDIR)/$this_script
+        @( time { export LFS=\$(MOUNT_PT) && ${BUILD_SCRIPTS}/${file} >>logs/${this_script} 2>&1 ; } ) 2>>logs/${this_script}
 EOF
 ) >> $MKFILE.tmp
@@ -46 +47 @@
 __wrt_touch() {                    #
 #----------------------------------#
+  local pkg_name=$1
 (
 cat << EOF
         @touch  \$@ && \\
-        touch /var/lib/jhalfs/BLFS/${1#*-} && \\
+        touch \$(TRACKING_DIR)/${pkg_name#*-} && \\
         sleep .25 && \\
         echo -e "\n\n "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
@@ -61 +63 @@
 __write_entry() {            #
 #----------------------------#
-  local pkg_name=$1
+  local script_name=$1
 
-  echo "${tab_}${tab_} entry for <$pkg_name>"
+  echo -n "${tab_}${tab_} entry for <$script_name>"
 
   #--------------------------------------------------------------------#
@@ -71 +73 @@
   # Drop in the name of the target on a new line, and the previous target
   # as a dependency. Also call the echo_message function.
-  __wrt_target "${pkg_name}" "$PREV_PACKAGE"
-  __write_build_cmd "${pkg_name}" "${pkg_name}"
+  __wrt_target "${script_name}" "$PREV_PACKAGE"
+  __write_build_cmd "${script_name}" "${script_name}"
 
   # Include a touch of the target name so make can check
   # if it's already been made.
-  __wrt_touch "${pkg_name}"
+  __wrt_touch "${script_name}"
   #
   #--------------------------------------------------------------------#
   #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
   #--------------------------------------------------------------------#
-
+  echo " .. OK"
 }
 
@@ -114 +116 @@
 SRC= /sources
 MOUNT_PT= $BUILDDIR
-LOGDIR= $LOGDIR
 PACKAGE= "`basename $PKGXML .xml`"
+TRACKING_DIR= $TRACKING_DIR
 
 BOLD= "[0;1m"
@@ -144 +146 @@
 ) > $MKFILE
 
- 
   cat $MKFILE.tmp >> $MKFILE
-
   echo "${tab_}Creating Makefile... ${BOLD}DONE${OFF}"
 
+  rm $MKFILE.tmp
+
 }