- Timestamp:
- Jan 18, 2008, 11:54:07 AM (17 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r432 r434 1 2008-01-18 <rybkin@lal.in2p3.fr> 339 2 3 * mgr/fragments/constituent: Do not rebuild any *.make files when QUICK 4 is defined, build all the *.make files in the binary tag directory, 5 do not use MAKEFLAGS explicitly, do not leave a lock file in /tmp 6 * mgr/fragments/constituent_lock: idem 7 * mgr/fragments/constituents_header: idem 8 * mgr/fragments/make_header: idem 9 * src/Makefile.header: idem 10 1 11 2008-01-14 <rybkin@lal.in2p3.fr> 338 2 12 -
CMT/HEAD/mgr/fragments/constituent
r428 r434 12 12 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make 13 13 else 14 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make 14 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make 15 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make 15 16 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make 16 17 cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make … … 19 20 ${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT} 20 21 21 $(cmt_local_tagfile_${CONSTITUENT}) : $(cmt_lock_setup) 22 #$(cmt_local_tagfile_${CONSTITUENT}) : $(cmt_lock_setup) 23 ifndef QUICK 24 $(cmt_local_tagfile_${CONSTITUENT}) :: 25 else 26 $(cmt_local_tagfile_${CONSTITUENT}) : 27 endif 22 28 @/bin/echo "------> (constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})" 23 29 @if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \ … … 34 40 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make 35 41 else 36 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make 42 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make 43 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make 37 44 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make 38 45 cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make … … 41 48 endif 42 49 50 ifndef QUICK 43 51 $(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs 52 else 53 $(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT}) 54 endif 44 55 @echo "------> (constituents.make) Building ${CONSTITUENT}.make"; \ 45 56 $(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT} … … 47 58 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) 48 59 @echo "------> (constituents.make) Starting ${CONSTITUENT}" 49 @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS)cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}60 @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT} 50 61 @echo "------> (constituents.make) ${CONSTITUENT} done" 51 62 … … 55 66 @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \ 56 67 echo "------> (constituents.make) Starting ${CONSTITUENT}clean"; \ 57 $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS)cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \68 $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \ 58 69 fi 59 70 … … 64 75 ${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) 65 76 @echo "------> (constituents.make) Starting install ${CONSTITUENT}" 66 @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS)cmt_lock_pid=$${cmt_lock_pid} install77 @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} install 67 78 @echo "------> (constituents.make) install ${CONSTITUENT} done" 68 79 … … 71 82 ${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile) 72 83 @echo "------> (constituents.make) Starting uninstall ${CONSTITUENT}" 73 @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS)cmt_lock_pid=$${cmt_lock_pid} uninstall84 @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} uninstall 74 85 @echo "------> (constituents.make) uninstall ${CONSTITUENT} done" 75 86 -
CMT/HEAD/mgr/fragments/constituent_lock
r429 r434 12 12 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make 13 13 else 14 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make 14 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make 15 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make 15 16 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make 16 17 cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make … … 19 20 ${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT} 20 21 21 $(cmt_local_tagfile_${CONSTITUENT}) : $(cmt_lock_setup) 22 #$(cmt_local_tagfile_${CONSTITUENT}) : $(cmt_lock_setup) 23 ifndef QUICK 24 $(cmt_local_tagfile_${CONSTITUENT}) :: 25 else 26 $(cmt_local_tagfile_${CONSTITUENT}) : 27 endif 22 28 @/bin/echo "------> (constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})" 23 29 @if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \ … … 34 40 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make 35 41 else 36 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make 42 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make 43 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make 37 44 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make 38 45 cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make … … 41 48 endif 42 49 50 ifndef QUICK 43 51 $(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs 52 else 53 $(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT}) 54 endif 44 55 @echo "------> (constituents.make) Building ${CONSTITUENT}.make"; \ 45 56 $(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT} … … 49 60 @${lock_command} ${CONSTITUENT}${lock_suffix} 50 61 @echo "------> (constituents.make) Starting ${CONSTITUENT}" 51 @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS)cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}; \52 status=$$?; ${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${status}62 @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}; \ 63 retval=$$?; ${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval} 53 64 @echo "------> (constituents.make) ${CONSTITUENT} done" 54 65 … … 58 69 @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \ 59 70 echo "------> (constituents.make) Starting ${CONSTITUENT}clean"; \ 60 $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS)cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \71 $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \ 61 72 fi 62 73 … … 67 78 ${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) 68 79 @echo "------> (constituents.make) Starting install ${CONSTITUENT}" 69 @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS)cmt_lock_pid=$${cmt_lock_pid} install80 @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} install 70 81 @echo "------> (constituents.make) install ${CONSTITUENT} done" 71 82 … … 74 85 ${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile) 75 86 @echo "------> (constituents.make) Starting uninstall ${CONSTITUENT}" 76 @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS)cmt_lock_pid=$${cmt_lock_pid} uninstall87 @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} uninstall 77 88 @echo "------> (constituents.make) uninstall ${CONSTITUENT} done" 78 89 -
CMT/HEAD/mgr/fragments/constituents_header
r198 r434 17 17 cmt_local_tagfile = /tmp/CMT_$(${PACKAGE}_tag).make$(cmt_lock_pid) 18 18 else 19 cmt_local_tagfile = $(${PACKAGE}_tag).make 19 #cmt_local_tagfile = $(${PACKAGE}_tag).make 20 cmt_local_tagfile = $(bin)$(${PACKAGE}_tag).make 20 21 endif 21 22 22 -include $(cmt_local_tagfile) 23 #-include $(cmt_local_tagfile) 24 include $(cmt_local_tagfile) 23 25 24 26 ifdef READONLY … … 26 28 cmt_final_setup = /tmp/CMT_${PACKAGE}setup.make 27 29 else 28 cmt_local_setup = $(bin)${PACKAGE}setup$(cmt_lock_pid).make 29 cmt_final_setup = $(bin)${PACKAGE}setup.make 30 #cmt_local_setup = $(bin)${PACKAGE}setup$(cmt_lock_pid).make 31 cmt_local_setup = $(bin)$(package)setup$$$$.make 32 #cmt_final_setup = $(bin)${PACKAGE}setup.make 33 cmt_final_setup = $(bin)$(package)setup.make 30 34 endif 31 35 32 36 #-------------------------------------------------------- 33 37 34 cmt_lock_setup = /tmp/lock$(cmt_lock_pid).make35 cmt_temp_tag = /tmp/tag$(cmt_lock_pid).make38 #cmt_lock_setup = /tmp/lock$(cmt_lock_pid).make 39 #cmt_temp_tag = /tmp/tag$(cmt_lock_pid).make 36 40 37 first :: $(cmt_local_tagfile) 38 @echo $(cmt_local_tagfile) ok 41 #first :: $(cmt_local_tagfile) 42 # @echo $(cmt_local_tagfile) ok 43 ifndef QUICK 44 first :: $(cmt_final_setup) ; 45 else 46 first :: ; 47 endif 39 48 40 49 ## @bin=`$(cmtexe) -quiet show macro_value bin` 41 50 42 $(cmt_local_tagfile) : $(cmt_lock_setup) 43 @/bin/echo "------> (constituents.make) Rebuilding setup.make $(cmt_local_tagfile)" 44 @if test -f $(cmt_local_tagfile); then /bin/rm -f $(cmt_local_tagfile); fi 45 @$(cmtexe) -quiet -tag=$(tags) build tag_makefile >$(cmt_temp_tag) 46 @mv $(cmt_temp_tag) $(cmt_local_tagfile) 47 @bin=$(bin); \ 48 if test ! -d $${bin} ; then $(mkdir) -p $${bin} ; fi; \ 49 echo CMTCONFIG=$(CMTCONFIG); \ 51 #$(cmt_local_tagfile) : $(cmt_lock_setup) 52 # @echo "#CMT> Error: $@: No such file" >&2; exit 1 53 $(cmt_local_tagfile) : 54 @echo "#CMT> Warning: $@: No such file" >&2; exit 55 # @echo "#CMT> Info: $@: No need to rebuild file" >&2; exit 56 57 $(cmt_final_setup) : $(cmt_local_tagfile) 58 @/bin/echo "------> (constituents.make) Rebuilding $@" 59 @if test ! -d $(@D); then $(mkdir) -p $(@D); fi; \ 50 60 if test -f $(cmt_local_setup); then /bin/rm -f $(cmt_local_setup); fi; \ 51 cmt_local_setup=$${bin}${PACKAGE}setup$(cmt_lock_pid).make; \ 52 cmt_final_setup=$${bin}${PACKAGE}setup.make; \ 53 trap '/bin/rm -f $${cmt_local_setup}' 0 1 2 15; \ 54 $(cmtexe) -quiet -tag=$(tags) show setup >>$${cmt_local_setup}; \ 55 if test ! -f $${cmt_final_setup}; then \ 56 mv $${cmt_local_setup} $${cmt_final_setup}; \ 61 trap '/bin/rm -f $(cmt_local_setup)' 0 1 2 15; \ 62 $(cmtexe) -quiet -tag=$(tags) show setup >>$(cmt_local_setup); \ 63 if test ! -f $@; then \ 64 mv $(cmt_local_setup) $@; \ 57 65 else \ 58 if /usr/bin/diff $ ${cmt_local_setup} $${cmt_final_setup}>/dev/null ; then \59 echo "$ ${cmt_final_setup} untouched"; \66 if /usr/bin/diff $(cmt_local_setup) $@ >/dev/null ; then \ 67 echo "$@ untouched"; \ 60 68 else \ 61 mv $ ${cmt_local_setup} $${cmt_final_setup}; \69 mv $(cmt_local_setup) $@; \ 62 70 fi; \ 63 71 fi 64 @/bin/echo setup.make ok 72 @/bin/echo $@ ok 73 65 74 config :: checkuses 66 75 @exit 0 76 checkuses : ; 67 77 68 78 env.make :: 69 79 printenv >env.make.tmp; $(cmtexe) -quiet check files env.make.tmp env.make 70 80 81 ifndef QUICK 71 82 all :: build_library_links 72 83 @echo "------> (constituents.make) all done" 84 endif 73 85 74 86 javadirs :: … … 88 100 89 101 .DEFAULT :: 90 @if test "$@" = "$(cmt_lock_setup)"; then \ 91 /bin/rm -f $(cmt_lock_setup); \ 92 touch $(cmt_lock_setup); \ 93 fi 102 @echo "#CMT> Warning: $@: Using default commands" >&2; exit 103 104 # @if test "$@" = "$(cmt_lock_setup)"; then \ 105 # /bin/rm -f $(cmt_lock_setup); \ 106 # touch $(cmt_lock_setup); \ 107 #fi 94 108 95 109 #-- end of constituents_header ------ -
CMT/HEAD/mgr/fragments/make_header
r201 r434 29 29 cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag)_${CONSTITUENT}.make$(cmt_lock_pid) 30 30 else 31 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make 31 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make 32 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make 32 33 endif 33 34 … … 41 42 cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag).make$(cmt_lock_pid) 42 43 else 43 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make 44 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make 45 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make 44 46 endif 45 47 -
CMT/HEAD/src/Makefile.header
r11 r434 21 21 cmt_local_tagfile = /tmp/CMT_$(tag).make$$$$ 22 22 else 23 cmt_local_tagfile = $(tag).make 23 cmt_local_tagfile = $(bin)$(tag).make 24 endif 25 26 ifdef READONLY 27 cmt_constituents_makefile = /tmp/CMT_$(tag)_constituents.make$$$$ 28 else 29 cmt_constituents_makefile = $(bin)constituents.make 24 30 endif 25 31 … … 27 33 # Generic entry points for all targets 28 34 # 29 all :: check_config 35 ifndef QUICK 36 all :: check_config ; 37 else 38 all :: no_check_config ; 39 endif 30 40 31 41 check_config :: 32 @$(cmtexe) check configuration; status=$$?; \ 33 if test $${status} = 0; then \ 34 /bin/rm -f $(cmt_local_tagfile); \ 35 $(MAKE) --no-print-directory $(MAKEFLAGS) target="first config all" common_target; \ 42 @$(cmtexe) check configuration; retval=$$?; \ 43 if test $${retval} = 0; then \ 44 $(MAKE) --no-print-directory target="first config all" common_target; \ 36 45 else \ 37 46 echo "#CMT> There are configuration errors. Please correct them before running gmake"; \ 38 47 fi 48 49 no_check_config :: 50 @$(MAKE) --no-print-directory target="first config all" common_target 39 51 40 52 binclean :: … … 57 69 # Capture all possible targets 58 70 # 71 ifdef READONLY 59 72 common_target :: 60 73 @tmpdir=/tmp; \ … … 79 92 fi; \ 80 93 exit $${status} 94 else 95 common_target : $(cmt_constituents_makefile) 96 @$(MAKE) --no-print-directory -f $< cmt_lock_pid=$(cmt_lock_pid) $(target) 97 endif 81 98 99 $(cmt_constituents_makefile) : $(cmt_local_tagfile) 100 @echo "------> (Makefile.header) Rebuilding $@"; \ 101 if test ! -d $(@D) ; then $(mkdir) -p $(@D); fi; \ 102 $(cmtexe) -quiet -tag=$(tags) build constituents_makefile -out=$@; \ 103 retval=$$?; \ 104 if test $${retval} != 0; then \ 105 echo "#CMT> Error generating constituents makefile" >&2; \ 106 /bin/rm -f $@; fi; \ 107 exit $${retval} 108 109 ifndef QUICK 110 $(cmt_local_tagfile) :: 111 else 112 $(cmt_local_tagfile) : 113 endif 114 @/bin/echo "------> (Makefile.header) Rebuilding $@"; \ 115 if test -f $@; then rm -f $@; fi; \ 116 if test ! -d $(@D); then $(mkdir) -p $(@D); fi; \ 117 echo CMTCONFIG=$(CMTCONFIG) ; \ 118 $(cmtexe) -quiet -tag=$(tags) build tag_makefile >$@ \ 119 && /bin/echo $@ ok 82 120 83 121 # … … 120 158 121 159 160 # explicit rule not to remake 161 ${CMTROOT}/src/Makefile.header : ; 162 ${CMTROOT}/src/Makefile.core : ;
Note: See TracChangeset
for help on using the changeset viewer.