Changeset 442


Ignore:
Timestamp:
Feb 16, 2008, 1:29:38 PM (16 years ago)
Author:
rybkin
Message:

See C.L. 346

Location:
CMT/HEAD
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/ChangeLog

    r441 r442  
     12008-02-16    <rybkin@lal.in2p3.fr> 346
     2       
     3        * src/Makefile.core: Improve the control of the verbosity of Make
     4        * mgr/fragments/library: idem
     5        * mgr/cmt_install_action.sh: idem
     6        * mgr/cmt_uninstall_action.sh: idem
     7        * mgr/cmt_make_shlib.sh: idem
     8       
    192008-02-15    <rybkin@lal.in2p3.fr> 345
    210       
    3         * src/Makefile.core: Control the verbosity of Make by defining one of
    4         the Make variables with the following effect:
     11        * src/Makefile.core: Control the verbosity of Make by setting the following
     12        Make variables (in order of precedence):
     13        VERBOSE - print CMT messages and echo Make commands
    514        QUIET - print CMT messages (default)
    6         VERBOSE - print CMT messages and echo Make commands
    715        ECHO - echo Make commands
    816        SILENT - no CMT messages or Make commands echoing

  • CMT/HEAD/mgr/cmt_install_action.sh

    r441 r442  
    135135fi
    136136
    137 echo "${CMTMSGHDR}" "Installing file ${file_name} into ${install_dir}"
    138137if test -L ${dest_file_path} -o -f ${dest_file_path}; then
    139138    /bin/rm -f ${dest_file_path}
    … …  
    144143fi
    145144
     145if test "${cmtmsg}"; then
     146echo "${CMTMSGHDR}" "installing file ${file_name} into ${install_dir}"
     147fi
     148if test "${makecmd}"; then set -v; fi
    146149eval ${install_command} ${full_source_name} ${dest_file_path}
    147150echo ${full_source_name} >${ref_file}
     151if test "${makecmd}"; then set +v; fi

  • CMT/HEAD/mgr/cmt_make_shlib.sh

    r441 r442  
    3636
    3737if test `uname` = "Linux" ; then
     38if test "${cmtmsg}"; then
    3839  echo "${CMTMSGHDR}" "BUILDING SHARED LIBRARY ${lib}"
     40fi
    3941# ATTEMPT 2: temp for sharedlin force
    4042#   cp lib${lib}.a lib${lib}.so

  • CMT/HEAD/mgr/cmt_uninstall_action.sh

    r441 r442  
    123123
    124124if test -d ${dest_file_path}; then
    125   echo "${CMTMSGHDR}" Removing directory ${file_name} from ${install_dir}
     125if test "${cmtmsg}"; then
     126  echo "${CMTMSGHDR}" removing directory ${file_name} from ${install_dir}
     127fi
     128if test "${makecmd}"; then set -v; fi
    126129  /bin/rm -rf ${dest_file_path}
     130if test "${makecmd}"; then set +v; fi
    127131elif test -f ${dest_file_path}; then
    128   echo "${CMTMSGHDR}" Removing file ${file_name} from ${install_dir}
     132if test "${cmtmsg}"; then
     133  echo "${CMTMSGHDR}" removing file ${file_name} from ${install_dir}
     134fi
     135if test "${makecmd}"; then set -v; fi
    129136  /bin/rm -f ${dest_file_path}
     137if test "${makecmd}"; then set +v; fi
    130138fi
    131139
    132140if test -f ${ref_file}; then
     141if test "${makecmd}"; then set -v; fi
    133142  /bin/rm -f ${ref_file}
     143if test "${makecmd}"; then set +v; fi
    134144fi

  • CMT/HEAD/mgr/fragments/library

    r441 r442  
    55
    66$(${CONSTITUENT}lib) :: ${OBJS}
    7         $(lib_echo) "library $@"
     7        $(lib_echo) "static library $@"
    88        $(lib_silent) cd $(bin); \
    99          $(ar) $(${CONSTITUENT}lib) $?
    … …  
    2828
    2929$(${CONSTITUENT}libname).$(shlibsuffix) :: $(${CONSTITUENT}lib) requirements $(use_requirements) $(${CONSTITUENT}stamps)
    30         $(lib_silent) cd $(bin); QUIET=$(QUIET); $(make_shlib) "$(tags)" ${CONSTITUENT} $(${CONSTITUENT}_shlibflags)
     30        $(lib_echo) "shared library $@"
     31        $(lib_silent) cd $(bin); if test "$(makecmd)"; then QUIET=; else QUIET=1; fi; QUIET=$${QUIET} $(make_shlib) "$(tags)" ${CONSTITUENT} $(${CONSTITUENT}_shlibflags)
    3132
    3233$(${CONSTITUENT}shstamp) :: $(${CONSTITUENT}libname).$(shlibsuffix)

  • CMT/HEAD/src/Makefile.core

    r441 r442  
    4141#
    4242
    43 ifndef CMTMSGHDR
    44 CMTMSGHDR = \#CMT--->
     43# default settings
     44#   o print CMT messages
     45#   o do not echo Make commands
     46cmtmsg = 1
     47makecmd =
     48
     49# parse all the switches
     50ifdef SILENT
     51cmtmsg =
     52makecmd =
    4553endif
    4654
    4755ifdef ECHO
    48 VERBOSE = 1
     56cmtmsg =
     57makecmd = 1
    4958endif
    5059
    51 ifndef VERBOSE
    52 QUIET = 1
     60ifdef QUIET
     61cmtmsg = 1
     62makecmd =
    5363endif
    5464
    55 ifdef SILENT
    56 QUIET = 1
     65ifdef VERBOSE
     66cmtmsg = 1
     67makecmd = 1
     68endif
     69
     70# set the relevant Make variables
     71ifndef CMTMSGHDR
     72CMTMSGHDR = \#CMT--->
     73export CMTMSGHDR
     74endif
     75
     76ifdef cmtmsg
     77export cmtmsg
     78echo = @- echo "$(CMTMSGHDR)"
     79else
     80echo = @:
     81endif
     82
     83ifdef makecmd
     84export makecmd
     85silent =
     86else
     87silent = @
    5788MAKEFLAGS += --silent
    5889endif
    5990
    60 ifdef QUIET
    61 LEX_QUIET = 1
    62 YACC_QUIET = 1
    63 C_QUIET = 1
    64 CPP_QUIET = 1
    65 FORTRAN_QUIET = 1
    66 JAVA_QUIET = 1
    67 LINK_QUIET = 1
    68 LIB_QUIET = 1
    69 CLEANUP_QUIET = 1
    70 INSTALL_QUIET = 1
    71 silent = @
    72 echo = @- echo "$(CMTMSGHDR)"
    73 else
    74 silent =
    75 echo = @- echo "$(CMTMSGHDR)"
    76 endif
    77 
    78 ifdef LEX_QUIET
    79 lex_silent = @
    8091lex_echo = $(echo) building
    81 else
    82 lex_silent =
    83 lex_echo = $(echo) building
    84 endif
    85 
    86 ifdef YACC_QUIET
    87 yacc_silent = @
     92lex_silent = $(silent)
    8893yacc_echo = $(echo) building
    89 else
    90 yacc_silent =
    91 yacc_echo = $(echo) building
    92 endif
    93 
    94 ifdef C_QUIET
    95 c_silent = @
     94yacc_silent = $(silent)
    9695c_echo = $(echo) compiling
    97 else
    98 c_silent =
    99 c_echo = $(echo) compiling
    100 endif
    101 
    102 ifdef CPP_QUIET
    103 cpp_silent = @
     96c_silent = $(silent)
    10497cpp_echo = $(echo) compiling
    105 else
    106 cpp_silent =
    107 cpp_echo = $(echo) compiling
    108 endif
    109 
    110 ifdef FORTRAN_QUIET
    111 fortran_silent = @
     98cpp_silent = $(silent)
    11299fortran_echo = $(echo) compiling
    113 else
    114 fortran_silent =
    115 fortran_echo = $(echo) compiling
    116 endif
    117 
    118 ifdef JAVA_QUIET
    119 java_silent = @
     100fortran_silent = $(silent)
    120101java_echo = $(echo) building
    121 else
    122 java_silent =
    123 java_echo = $(echo) building
    124 endif
    125 
    126 ifdef LINK_QUIET
    127 link_silent = @
     102java_silent = $(silent)
    128103link_echo = $(echo) building
    129 else
    130 link_silent =
    131 link_echo = $(echo) building
    132 endif
    133 
    134 ifdef LIB_QUIET
    135 lib_silent = @
     104link_silent = $(silent)
    136105lib_echo = $(echo) building
    137 else
    138 lib_silent =
    139 lib_echo = $(echo) building
    140 endif
    141 
    142 ifdef CLEANUP_QUIET
    143 cleanup_silent = @
     106lib_silent = $(silent)
    144107cleanup_echo = $(echo) removing
    145 else
    146 cleanup_silent =
    147 cleanup_echo = $(echo) removing
    148 endif
    149 
    150 ifdef INSTALL_QUIET
    151 install_silent = @
     108cleanup_silent = $(silent)
    152109install_echo = $(echo) installing
    153 else
    154 install_silent =
    155 install_echo = $(echo) installing
    156 endif
    157 
    158 ifdef ECHO
    159 echo = @:
    160 endif
    161 
    162 ifdef SILENT
    163 echo = @:
    164 endif
     110install_silent = $(silent)
     111#
     112# End of Controlling the verbosity of Make
     113#---------------------------------------------
    165114
    166115SHELL     = /bin/sh
Note: See TracChangeset for help on using the changeset viewer.