- Timestamp:
- Jan 3, 2013, 5:50:17 PM (11 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r626 r627 1 2013-01-03 <rybkin@lal.in2p3.fr> 498 2 3 * source/cmt_constituent.cxx: In class constituents_action_iterator, 4 set constituent attribute need_check to true, if specified, for applications 5 only 6 * source/cmt_generator.h: In class CmtGenerator, introduce member 7 m_ISCHECKGROUP 8 * source/cmt_generator.cxx: idem 9 * source/cmt_generators.cxx: In class ConstituentsMakefileGenerator 10 function build, depending on whether constituent belongs to check group, 11 set m_ISCHECKGROUP appropriately and fill check_application_header 12 makefiles fragments with value 13 * mgr/fragments/check_application_header: For applications belonging to 14 check group, ensure that application is built before running check 15 * mgr/fragments/nmake/check_application_header: idem 16 * mgr/fragments/check_application: In application Makefile, remove 17 check target dependency on application, handled in constituents Makefile, 18 improve control of Make verbosity 19 * mgr/fragments/check_java: idem 20 * mgr/fragments/nmake/check_application: idem 21 * mgr/fragments/nmake/check_java: idem 22 1 23 2012-11-23 <rybkin@lal.in2p3.fr> 497 2 24 -
CMT/HEAD/mgr/fragments/check_application
r593 r627 3 3 check :: ${CONSTITUENT}check ; 4 4 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) 9 10 10 11 #-- end of check_application ------ -
CMT/HEAD/mgr/fragments/check_application_header
r492 r627 1 1 #-- start of check_application_header ------ 2 3 cmt_${CONSTITUENT}_${ISCHECKGROUP} = 1 4 5 #-------------------------------------- 2 6 3 7 check :: ${CONSTITUENT}check … … 7 11 #${CONSTITUENT}check : ${CONSTITUENT} $(cmt_local_${CONSTITUENT}_makefile) 8 12 #${CONSTITUENT}check : $(cmt_local_${CONSTITUENT}_makefile) 13 ifdef cmt_${CONSTITUENT}_is_check_group 14 ${CONSTITUENT}check : ${CONSTITUENT} 15 else 9 16 ${CONSTITUENT}check : 17 endif 10 18 @if test ! -f $(cmt_local_${CONSTITUENT}_makefile); then \ 11 19 $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}; \ -
CMT/HEAD/mgr/fragments/check_java
r11 r627 1 1 #-- start of check_java ------ 2 2 3 check :: ${CONSTITUENT}check 3 check :: ${CONSTITUENT}check ; 4 4 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 9 11 #-- end of check_java ------ -
CMT/HEAD/mgr/fragments/nmake/check_application
r11 r627 1 #-- start of check_application ------ 1 2 2 check :: ${CONSTITUENT}check 3 check :: ${CONSTITUENT}check ; 3 4 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/HEAD/mgr/fragments/nmake/check_application_header
r492 r627 1 1 #-- start of check_application_header ------ 2 3 cmt_${CONSTITUENT}_${ISCHECKGROUP} = 1 4 5 #-------------------------------------- 2 6 3 7 check :: ${CONSTITUENT}check … … 7 11 #${CONSTITUENT}check : ${CONSTITUENT} $(cmt_local_${CONSTITUENT}_makefile) 8 12 #${CONSTITUENT}check : $(cmt_local_${CONSTITUENT}_makefile) 13 !if defined (cmt_${CONSTITUENT}_is_check_group) 14 ${CONSTITUENT}check : ${CONSTITUENT} 15 !else 9 16 ${CONSTITUENT}check : 17 !endif 10 18 @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT} 11 19 $(echo) "(constituents.nmake) Starting $@" -
CMT/HEAD/mgr/fragments/nmake/check_java
r11 r627 1 #-- start of check_java ------ 1 2 2 check :: ${CONSTITUENT}check 3 check :: ${CONSTITUENT}check ; 3 4 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 ------ -
CMT/HEAD/source/cmt_constituent.cxx
r609 r627 176 176 else if (w == "-check") 177 177 { 178 m_constituent.need_check = true; 178 if (m_constituent.type == Application) 179 { 180 m_constituent.need_check = true; 181 } 179 182 } 180 183 else if (w == "-triggers") -
CMT/HEAD/source/cmt_generator.cxx
r595 r627 86 86 m_HASTARGETTAG.set ("HASTARGETTAG"); 87 87 m_HASDEPENDENCIES.set ("HASDEPENDENCIES"); 88 m_ISCHECKGROUP.set ("ISCHECKGROUP"); 88 89 } 89 90 … … 125 126 m_HASTARGETTAG = ""; 126 127 m_HASDEPENDENCIES = ""; 128 m_ISCHECKGROUP = ""; 127 129 m_PACKINCLUDES = ""; 128 130 m_PACKOS9 = false; -
CMT/HEAD/source/cmt_generator.h
r595 r627 133 133 Variable m_HASTARGETTAG; 134 134 Variable m_HASDEPENDENCIES; 135 Variable m_ISCHECKGROUP; 135 136 }; 136 137 -
CMT/HEAD/source/cmt_generators.cxx
r626 r627 2773 2773 if (constituent.need_check) 2774 2774 { 2775 if (constituent.group != 0 && 2776 constituent.group->name () == "check") 2777 m_ISCHECKGROUP = "is_check_group"; 2778 else 2779 m_ISCHECKGROUP = "is_not_check_group"; 2780 2775 2781 check_application_header_fragment.copy (m_output_file, 2776 constituent.variables, 3,2782 constituent.variables, 4, 2777 2783 &m_PACKAGE, 2778 2784 &m_CONSTITUENT, 2779 &m_CONSTITUENTSUFFIX); 2785 &m_CONSTITUENTSUFFIX, 2786 &m_ISCHECKGROUP); 2780 2787 } 2781 2788 }
Note: See TracChangeset
for help on using the changeset viewer.