Changeset 492
- Timestamp:
- Mar 15, 2009, 1:13:07 PM (16 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r491 r492 1 2009-03-15 <rybkin@lal.in2p3.fr> 387 2 3 * mgr/fragments/constituent: Restore the dependency of 4 $(cmt_local_${CONSTITUENT}_makefile) on $(${CONSTITUENT}_dependencies). 5 For the constituent makefile to be generated properly, the constituent 6 source files have to exist. The latter may be generated as a result of 7 building other constituent(s). Discard the ${CONSTITUENT}clean dependency 8 on $(cmt_local_${CONSTITUENT}_makefile). Make ${CONSTITUENT}uninstall 9 also depend on $(${CONSTITUENT}uninstall_dependencies) and compute the 10 latter to insure that uninstallation be done in reverse build order 11 * mgr/fragments/constituent_lock: idem 12 * mgr/fragments/nmake/constituent: Restore the dependency of 13 $(cmt_local_${CONSTITUENT}_makefile) on $(${CONSTITUENT}_dependencies) as 14 detailed above. Discard the ${CONSTITUENT}clean dependency 15 on $(cmt_local_${CONSTITUENT}_makefile). Make ${CONSTITUENT}uninstall 16 independent of $(cmt_local_${CONSTITUENT}_makefile) but rather generate the 17 latter in the rule command, if non-existent 18 * mgr/fragments/nmake/constituent_lock: idem 19 * mgr/fragments/check_application_header: Discard the ${CONSTITUENT}check 20 dependency on $(cmt_local_${CONSTITUENT}_makefile) but rather generate the 21 latter in the rule command, if non-existent 22 * mgr/fragments/nmake/check_application_header: idem 23 * mgr/cmt_lockfile.sh: Use POSIX conformant syntax for the test utility 24 * mgr/fragments/nmake/library: Improve control of NMake verbosity 25 * mgr/fragments/nmake/library_no_share: idem 26 * mgr/fragments/nmake/library_no_static: idem 27 1 28 2009-02-11 <rybkin@lal.in2p3.fr> 386 2 29 -
CMT/HEAD/mgr/cmt_lockfile.sh
r430 r492 5 5 # is not installed 6 6 7 if [ "$1" = ="" ]; then7 if [ "$1" = "" ]; then 8 8 echo "Usage: cmt_lockfile.sh file" >&2 9 9 exit 1 … … 19 19 fi 20 20 while :; do 21 [ "$fstype" = =afs ] && fs flush -path $dir21 [ "$fstype" = afs ] && fs flush -path $dir 22 22 mkdir $1 2>/dev/null && break 23 23 sleep $secs -
CMT/HEAD/mgr/fragments/check_application_header
r487 r492 6 6 7 7 #${CONSTITUENT}check : ${CONSTITUENT} $(cmt_local_${CONSTITUENT}_makefile) 8 ${CONSTITUENT}check : $(cmt_local_${CONSTITUENT}_makefile) 8 #${CONSTITUENT}check : $(cmt_local_${CONSTITUENT}_makefile) 9 ${CONSTITUENT}check : 10 @if test ! -f $(cmt_local_${CONSTITUENT}_makefile); then \ 11 $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}; \ 12 fi 9 13 $(echo) "(constituents.make) Starting $@" 10 14 @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $@ -
CMT/HEAD/mgr/fragments/constituent
r488 r492 68 68 makefiles : $(cmt_local_${CONSTITUENT}_makefile) 69 69 70 ifndef QUICK 71 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links 72 else 70 73 $(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT}) 74 endif 71 75 $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \ 72 76 $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT} 73 77 74 ifndef QUICK75 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) build_library_links dirs ${CONSTITUENT}dirs76 else77 78 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs ${CONSTITUENT}dirs 78 endif79 79 $(echo) "(constituents.make) Starting ${CONSTITUENT}" 80 80 @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT} … … 83 83 clean :: ${CONSTITUENT}clean 84 84 85 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile)85 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile) 86 86 $(echo) "(constituents.make) Starting ${CONSTITUENT}clean" 87 @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean 87 @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \ 88 $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean; \ 89 fi 88 90 $(echo) "(constituents.make) ${CONSTITUENT}clean done" 89 # @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \ 90 # $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \ 91 # fi 91 # @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean 92 92 93 93 ## /bin/rm -f $(cmt_local_${CONSTITUENT}_makefile) $(bin)${CONSTITUENT}_dependencies.make … … 102 102 uninstall :: ${CONSTITUENT}uninstall 103 103 104 ${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile) 104 $(foreach d,$(${CONSTITUENT}_dependencies),$(eval $(d)uninstall_dependencies += ${CONSTITUENT}uninstall)) 105 106 ${CONSTITUENT}uninstall :: $(${CONSTITUENT}uninstall_dependencies) $(cmt_local_${CONSTITUENT}_makefile) 105 107 $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}" 106 108 @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall -
CMT/HEAD/mgr/fragments/constituent_lock
r488 r492 68 68 makefiles : $(cmt_local_${CONSTITUENT}_makefile) 69 69 70 ifndef QUICK 71 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links 72 else 70 73 $(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT}) 74 endif 71 75 $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \ 72 76 $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT} 73 77 74 ifndef QUICK75 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) build_library_links dirs ${CONSTITUENT}dirs76 else77 78 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs ${CONSTITUENT}dirs 78 endif79 79 $(echo) "(constituents.make) Creating ${CONSTITUENT}${lock_suffix} and Starting ${CONSTITUENT}" 80 80 @${lock_command} ${CONSTITUENT}${lock_suffix} || exit $$?; \ … … 87 87 clean :: ${CONSTITUENT}clean 88 88 89 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile)89 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile) 90 90 $(echo) "(constituents.make) Starting ${CONSTITUENT}clean" 91 @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean 91 @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \ 92 $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean; \ 93 fi 92 94 $(echo) "(constituents.make) ${CONSTITUENT}clean done" 93 # @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \ 94 # $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \ 95 # fi 95 # @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean 96 96 97 97 ## /bin/rm -f $(cmt_local_${CONSTITUENT}_makefile) $(bin)${CONSTITUENT}_dependencies.make … … 106 106 uninstall :: ${CONSTITUENT}uninstall 107 107 108 ${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile) 108 $(foreach d,$(${CONSTITUENT}_dependencies),$(eval $(d)uninstall_dependencies += ${CONSTITUENT}uninstall)) 109 110 ${CONSTITUENT}uninstall :: $(${CONSTITUENT}uninstall_dependencies) $(cmt_local_${CONSTITUENT}_makefile) 109 111 $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}" 110 112 @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall -
CMT/HEAD/mgr/fragments/nmake/check_application_header
r487 r492 6 6 7 7 #${CONSTITUENT}check : ${CONSTITUENT} $(cmt_local_${CONSTITUENT}_makefile) 8 ${CONSTITUENT}check : $(cmt_local_${CONSTITUENT}_makefile) 8 #${CONSTITUENT}check : $(cmt_local_${CONSTITUENT}_makefile) 9 ${CONSTITUENT}check : 10 @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT} 9 11 $(echo) "(constituents.nmake) Starting $@" 10 12 @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles $@ tag=$(tag) -
CMT/HEAD/mgr/fragments/nmake/constituent
r488 r492 52 52 !endif 53 53 54 #!if "$(QUICK)" == "" 55 #$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs 56 #!else 57 #$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT}) 58 #!endif 54 !if "$(QUICK)" == "" 55 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) 56 !else 59 57 $(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT}) 58 !endif 60 59 $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake 61 60 @set include=$(include) … … 85 84 clean :: ${CONSTITUENT}clean 86 85 87 #${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile) 88 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile) 86 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile) 89 87 $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean 90 88 @set include=$(include) 91 89 @set lib=$(lib) 92 @ $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)90 @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag) 93 91 $(echo) (constituents.nmake) ${CONSTITUENT}clean done 94 # @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag) 95 # $(echo) (constituents.nmake) ${CONSTITUENT}clean done 92 # @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag) 96 93 97 94 install :: ${CONSTITUENT}install … … 106 103 uninstall :: ${CONSTITUENT}uninstall 107 104 108 ${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile) 105 #${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile) 106 ${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT}) 109 107 $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT} 110 108 @set include=$(include) 111 109 @set lib=$(lib) 110 @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT} 112 111 @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag) 113 112 $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done -
CMT/HEAD/mgr/fragments/nmake/constituent_lock
r488 r492 52 52 !endif 53 53 54 #!if "$(QUICK)" == "" 55 #$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs 56 #!else 57 #$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT}) 58 #!endif 54 !if "$(QUICK)" == "" 55 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) 56 !else 59 57 $(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT}) 58 !endif 60 59 $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake 61 60 @set include=$(include) … … 89 88 clean :: ${CONSTITUENT}clean 90 89 91 #${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile) 92 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile) 90 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile) 93 91 $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean 94 92 @set include=$(include) 95 93 @set lib=$(lib) 96 @ $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)94 @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag) 97 95 $(echo) (constituents.nmake) ${CONSTITUENT}clean done 98 # @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag) 99 # $(echo) (constituents.nmake) ${CONSTITUENT}clean done 96 # @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag) 100 97 101 98 install :: ${CONSTITUENT}install … … 110 107 uninstall :: ${CONSTITUENT}uninstall 111 108 112 ${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile) 109 #${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile) 110 ${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT}) 113 111 $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT} 114 112 @set include=$(include) 115 113 @set lib=$(lib) 114 @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT} 116 115 @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag) 117 116 $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done -
CMT/HEAD/mgr/fragments/nmake/library
r487 r492 18 18 ${CONSTITUENT}clean :: 19 19 $(cleanup_echo) #objects 20 $(cleanup_silent) for %f in (${OBJS}) do if exist %f del %f20 $(cleanup_silent) for %f in (${OBJS}) do $(cleanup_silent)if exist %f del %f 21 21 $(cleanup_silent) if exist $(bin)${CONSTITUENT}.arc del $(bin)${CONSTITUENT}.arc 22 22 $(cleanup_silent) if exist $(bin)${CONSTITUENT}.lib del $(bin)${CONSTITUENT}.lib -
CMT/HEAD/mgr/fragments/nmake/library_no_share
r487 r492 13 13 ${CONSTITUENT}clean :: 14 14 $(cleanup_echo) #objects 15 $(cleanup_silent) for %f in (${OBJS}) do if exist %f del %f15 $(cleanup_silent) for %f in (${OBJS}) do $(cleanup_silent)if exist %f del %f 16 16 $(cleanup_silent) if exist $(${CONSTITUENT}lib) del $(${CONSTITUENT}lib) 17 17 -
CMT/HEAD/mgr/fragments/nmake/library_no_static
r487 r492 36 36 ${CONSTITUENT}clean :: 37 37 $(cleanup_echo) #objects 38 $(cleanup_silent) for %f in (${OBJS}) do if exist %f del %f38 $(cleanup_silent) for %f in (${OBJS}) do $(cleanup_silent)if exist %f del %f 39 39 $(cleanup_silent) if exist $(bin)${CONSTITUENT}.arc del $(bin)${CONSTITUENT}.arc 40 40 $(cleanup_silent) if exist $(bin)${CONSTITUENT}.lib del $(bin)${CONSTITUENT}.lib
Note: See TracChangeset
for help on using the changeset viewer.