Changeset e2ef100


Ignore:
Timestamp:
06/09/2006 11:05:39 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
4a444f1
Parents:
aed6c72
Message:

Added " Target $@ OK" lines to the Makefile output.
Made more accurate the time meassured by progress_bar.sh.

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • LFS/master.sh

    raed6c72 re2ef100  
    2424        rm -f /tools && \\
    2525        ln -s \$(MOUNT_PT)/tools / && \\
    26         touch \$@
     26        touch \$@ && \\
     27        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK\$(WHITE) && \\
     28        echo --------------------------------------------------------------------------------
    2729
    2830021-addinguser:  020-creatingtoolsdir
    … …  
    3638        @chown lfs \$(MOUNT_PT)/tools && \\
    3739        chmod a+wt \$(MOUNT_PT)/sources && \\
    38         touch \$@
     40        touch \$@ && \\
     41        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK\$(WHITE) && \\
     42        echo --------------------------------------------------------------------------------
    3943
    4044022-settingenvironment:  021-addinguser
    … …  
    5559        chown lfs:lfs /home/lfs/.bashrc && \\
    5660        touch envars && \\
    57         touch \$@
     61        touch \$@ && \\
     62        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK\$(WHITE) && \\
     63        echo --------------------------------------------------------------------------------
    5864EOF
    5965) >> $MKFILE.tmp
    … …  
    135141    # Include a touch of the target name so make can check
    136142    # if it's already been made.
    137     echo -e '\t@touch $@' >> $MKFILE.tmp
     143    wrt_touch
    138144    #
    139145    #--------------------------------------------------------------------#
    … …  
    247253    # Include a touch of the target name so make can check
    248254    # if it's already been made.
    249     echo -e '\t@touch $@' >> $MKFILE.tmp
     255    wrt_touch
    250256    #
    251257    #--------------------------------------------------------------------#
    … …  
    329335    # Include a touch of the target name so make can check
    330336    # if it's already been made.
    331     echo -e '\t@touch $@' >> $MKFILE.tmp
     337    wrt_touch
    332338    #
    333339    #--------------------------------------------------------------------#
    … …  
    447453        fi;
    448454        @chown lfs:lfs /home/lfs/.bash* && \\
    449         touch \$@
     455        touch \$@ && \\
     456        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK\$(WHITE) && \\
     457        echo --------------------------------------------------------------------------------
    450458
    451459do_housekeeping:

  • common/common-functions

    raed6c72 re2ef100  
    460460                rm -r \$(SRC)/$name-build; \\
    461461        fi;
     462EOF
     463) >> $MKFILE.tmp
     464}
     465
     466
     467#----------------------------------#
     468wrt_touch() {                      #
     469#----------------------------------#
     470(
     471cat << EOF
     472        @touch  \$@ && \\
     473        sleep .25 && \\
     474        echo -e "\n "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK\$(WHITE) && \\
     475        echo --------------------------------------------------------------------------------
    462476EOF
    463477) >> $MKFILE.tmp

  • common/makefile-functions

    raed6c72 re2ef100  
    88BLUE= "[1;34m"
    99WHITE= "[00m"
    10 CURSOR_ON= "[?25h"
    1110
    1211define echo_message
    … …  
    1413  @echo --------------------------------------------------------------------------------
    1514  @echo $(BOLD)$(1) target $(BLUE)$@$(BOLD)
    16   @echo --------------------------------------------------------------------------------$(WHITE)
     15  @echo $(WHITE)
    1716endef
    1817
    … …  
    7473  @echo $(BOLD)
    7574  @echo --------------------------------------------------------------------------------
    76   @echo -e \\t\\t$(GREEN)Have a nice day $(ORANGE):-\)$(BOLD)$(CURSOR_ON)
     75  @echo -e \\t\\t$(GREEN)Have a nice day $(ORANGE):-\)$(BOLD)
    7776  @echo --------------------------------------------------------------------------------$(WHITE)
    7877endef
    … …  
    9998  @echo  The build process should resume. Follow any instructions that appear.
    10099  @echo --------------------------------------------------------------------------------
    101   @echo -e \\t\\t$(GREEN)Have a nice day $(ORANGE):-\)$(BOLD)$(CURSOR_ON)
     100  @echo -e \\t\\t$(GREEN)Have a nice day $(ORANGE):-\)$(BOLD)
    102101  @echo --------------------------------------------------------------------------------$(WHITE)
    103102endef

  • common/progress_bar.sh

    raed6c72 re2ef100  
    2828     echo -n "${CURSOR_ON}" && exit
    2929  fi
    30     # Target build complete, leave. If we are here, make is alive and a new
    31     # package target may has been started. Close this instance of the script.
    32     # The cursor will be restored by echo-finished in makefile-functions.
    33   [[ -f ${TARGET} ]] && exit
     30    # Target build complete, leave.
     31  [[ -f ${TARGET} ]] && echo -n "${CURSOR_ON}" && exit
    3432    # It is safe to write to the screen
    3533  echo -n "$1"
    … …  
    4341    for GRAPHIC_CHAR in ${GRAPHIC_STR} ; do
    4442      write_or_exit "${CSI}${POS}G${GRAPHIC_CHAR}"
    45       sleep .2
     43      # Compensate code execution time (need verification on other machines)
     44      sleep .137
    4645    done
    4746      # Display the accumulated time.
Note: See TracChangeset for help on using the changeset viewer.