Changeset 637 for CMT/v1r25-branch/mgr


Ignore:
Timestamp:
Jun 6, 2013, 2:43:50 PM (11 years ago)
Author:
rybkin
Message:

merge -r 618:627 HEAD

Location:
CMT/v1r25-branch
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • CMT/v1r25-branch

  • CMT/v1r25-branch/mgr/fragments/check_application

    r593 r637  
    33check :: ${CONSTITUENT}check ;
    44
    5 ${CONSTITUENT}check :: ${CONSTITUENT}
    6         $(${CONSTITUENT}_pre_check)
    7         $(bin)${CONSTITUENT}${application_suffix} $(${CONSTITUENT}_check_args)
    8         $(${CONSTITUENT}_post_check)
     5#${CONSTITUENT}check :: ${CONSTITUENT}
     6${CONSTITUENT}check ::
     7        $(silent) $(${CONSTITUENT}_pre_check)
     8        $(silent) $(bin)${CONSTITUENT}${application_suffix} $(${CONSTITUENT}_check_args)
     9        $(silent) $(${CONSTITUENT}_post_check)
    910
    1011#-- end of check_application ------

  • CMT/v1r25-branch/mgr/fragments/check_application_header

    r492 r637  
    11#-- start of check_application_header ------
     2
     3cmt_${CONSTITUENT}_${ISCHECKGROUP} = 1
     4
     5#--------------------------------------
    26
    37check :: ${CONSTITUENT}check
    … …  
    711#${CONSTITUENT}check : ${CONSTITUENT} $(cmt_local_${CONSTITUENT}_makefile)
    812#${CONSTITUENT}check : $(cmt_local_${CONSTITUENT}_makefile)
     13ifdef cmt_${CONSTITUENT}_is_check_group
     14${CONSTITUENT}check : ${CONSTITUENT}
     15else
    916${CONSTITUENT}check :
     17endif
    1018        @if test ! -f $(cmt_local_${CONSTITUENT}_makefile); then \
    1119          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}; \

  • CMT/v1r25-branch/mgr/fragments/check_java

    r11 r637  
    11#-- start of check_java ------
    22
    3 check :: ${CONSTITUENT}check
     3check :: ${CONSTITUENT}check ;
    44
    5 ${CONSTITUENT}check :: ${CONSTITUENT}
    6         cd $(bin); $(${CONSTITUENT}_pre_check)
    7         cd $(bin); java $(java_run_options) $(${CONSTITUENT}_run_options) ${CONSTITUENT} $(${CONSTITUENT}_check_args)
    8         cd $(bin); $(${CONSTITUENT}_post_check)
     5#${CONSTITUENT}check :: ${CONSTITUENT}
     6${CONSTITUENT}check ::
     7        $(silent) cd $(bin); $(${CONSTITUENT}_pre_check)
     8        $(silent) cd $(bin); java $(java_run_options) $(${CONSTITUENT}_run_options) ${CONSTITUENT} $(${CONSTITUENT}_check_args)
     9        $(silent) cd $(bin); $(${CONSTITUENT}_post_check)
     10
    911#-- end of check_java ------

  • CMT/v1r25-branch/mgr/fragments/nmake/check_application

    r11 r637  
     1#-- start of check_application ------
    12
    2 check :: ${CONSTITUENT}check
     3check :: ${CONSTITUENT}check ;
    34
    4 ${CONSTITUENT}check :: ${CONSTITUENT}
    5         $(${CONSTITUENT}_pre_check)
    6         $(bin)${CONSTITUENT}$(application_suffix) $(${CONSTITUENT}_check_args)
    7         $(${CONSTITUENT}_post_check)
     5#${CONSTITUENT}check :: ${CONSTITUENT}
     6${CONSTITUENT}check ::
     7        $(silent) $(${CONSTITUENT}_pre_check)
     8        $(silent) $(bin)${CONSTITUENT}$(application_suffix) $(${CONSTITUENT}_check_args)
     9        $(silent) $(${CONSTITUENT}_post_check)
     10
     11#-- end of check_application ------

  • CMT/v1r25-branch/mgr/fragments/nmake/check_application_header

    r492 r637  
    11#-- start of check_application_header ------
     2
     3cmt_${CONSTITUENT}_${ISCHECKGROUP} = 1
     4
     5#--------------------------------------
    26
    37check :: ${CONSTITUENT}check
    … …  
    711#${CONSTITUENT}check : ${CONSTITUENT} $(cmt_local_${CONSTITUENT}_makefile)
    812#${CONSTITUENT}check : $(cmt_local_${CONSTITUENT}_makefile)
     13!if defined (cmt_${CONSTITUENT}_is_check_group)
     14${CONSTITUENT}check : ${CONSTITUENT}
     15!else
    916${CONSTITUENT}check :
     17!endif
    1018        @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    1119        $(echo) "(constituents.nmake) Starting $@"

  • CMT/v1r25-branch/mgr/fragments/nmake/check_java

    r11 r637  
     1#-- start of check_java ------
    12
    2 check :: ${CONSTITUENT}check
     3check :: ${CONSTITUENT}check ;
    34
    4 ${CONSTITUENT}check :: ${CONSTITUENT}
    5         $(${CONSTITUENT}_pre_check)
    6         java ${CONSTITUENT} $(${CONSTITUENT}_check_args)
    7         $(${CONSTITUENT}_post_check)
     5#${CONSTITUENT}check :: ${CONSTITUENT}
     6${CONSTITUENT}check ::
     7        $(silent) $(${CONSTITUENT}_pre_check)
     8        $(silent) java ${CONSTITUENT} $(${CONSTITUENT}_check_args)
     9        $(silent) $(${CONSTITUENT}_post_check)
     10
     11#-- end of check_java ------
Note: See TracChangeset for help on using the changeset viewer.