Changeset 434 for CMT/HEAD/mgr


Ignore:
Timestamp:
Jan 18, 2008, 11:54:07 AM (16 years ago)
Author:
rybkin
Message:

See C.L. 339

Location:
CMT/HEAD/mgr/fragments
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/mgr/fragments/constituent

    r428 r434  
    1212cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    1313else
    14 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
     14#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
     15cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make
    1516cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
    1617cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    … …  
    1920${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT}
    2021
    21 $(cmt_local_tagfile_${CONSTITUENT}) : $(cmt_lock_setup)
     22#$(cmt_local_tagfile_${CONSTITUENT}) : $(cmt_lock_setup)
     23ifndef QUICK
     24$(cmt_local_tagfile_${CONSTITUENT}) ::
     25else
     26$(cmt_local_tagfile_${CONSTITUENT}) :
     27endif
    2228        @/bin/echo "------> (constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})"
    2329        @if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \
    … …  
    3440cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    3541else
    36 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
     42#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
     43cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make
    3744cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
    3845cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    … …  
    4148endif
    4249
     50ifndef QUICK
    4351$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs
     52else
     53$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
     54endif
    4455        @echo "------> (constituents.make) Building ${CONSTITUENT}.make"; \
    4556          $(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    … …  
    4758${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    4859        @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}
    5061        @echo "------> (constituents.make) ${CONSTITUENT} done"
    5162
    … …  
    5566        @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
    5667          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; \
    5869        fi
    5970
    … …  
    6475${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    6576        @echo "------> (constituents.make) Starting install ${CONSTITUENT}"
    66         @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) cmt_lock_pid=$${cmt_lock_pid} install
     77        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} install
    6778        @echo "------> (constituents.make) install ${CONSTITUENT} done"
    6879
    … …  
    7182${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    7283        @echo "------> (constituents.make) Starting uninstall ${CONSTITUENT}"
    73         @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) cmt_lock_pid=$${cmt_lock_pid} uninstall
     84        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} uninstall
    7485        @echo "------> (constituents.make) uninstall ${CONSTITUENT} done"
    7586

  • CMT/HEAD/mgr/fragments/constituent_lock

    r429 r434  
    1212cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    1313else
    14 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
     14#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
     15cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make
    1516cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
    1617cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    … …  
    1920${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT}
    2021
    21 $(cmt_local_tagfile_${CONSTITUENT}) : $(cmt_lock_setup)
     22#$(cmt_local_tagfile_${CONSTITUENT}) : $(cmt_lock_setup)
     23ifndef QUICK
     24$(cmt_local_tagfile_${CONSTITUENT}) ::
     25else
     26$(cmt_local_tagfile_${CONSTITUENT}) :
     27endif
    2228        @/bin/echo "------> (constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})"
    2329        @if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \
    … …  
    3440cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    3541else
    36 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
     42#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
     43cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make
    3744cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
    3845cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    … …  
    4148endif
    4249
     50ifndef QUICK
    4351$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs
     52else
     53$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
     54endif
    4455        @echo "------> (constituents.make) Building ${CONSTITUENT}.make"; \
    4556          $(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    … …  
    4960        @${lock_command} ${CONSTITUENT}${lock_suffix}
    5061        @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}
    5364        @echo "------> (constituents.make) ${CONSTITUENT} done"
    5465
    … …  
    5869        @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
    5970          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; \
    6172        fi
    6273
    … …  
    6778${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    6879        @echo "------> (constituents.make) Starting install ${CONSTITUENT}"
    69         @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) cmt_lock_pid=$${cmt_lock_pid} install
     80        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} install
    7081        @echo "------> (constituents.make) install ${CONSTITUENT} done"
    7182
    … …  
    7485${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    7586        @echo "------> (constituents.make) Starting uninstall ${CONSTITUENT}"
    76         @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) cmt_lock_pid=$${cmt_lock_pid} uninstall
     87        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} uninstall
    7788        @echo "------> (constituents.make) uninstall ${CONSTITUENT} done"
    7889

  • CMT/HEAD/mgr/fragments/constituents_header

    r198 r434  
    1717cmt_local_tagfile = /tmp/CMT_$(${PACKAGE}_tag).make$(cmt_lock_pid)
    1818else
    19 cmt_local_tagfile = $(${PACKAGE}_tag).make
     19#cmt_local_tagfile = $(${PACKAGE}_tag).make
     20cmt_local_tagfile = $(bin)$(${PACKAGE}_tag).make
    2021endif
    2122
    22 -include $(cmt_local_tagfile)
     23#-include $(cmt_local_tagfile)
     24include $(cmt_local_tagfile)
    2325
    2426ifdef READONLY
    … …  
    2628cmt_final_setup = /tmp/CMT_${PACKAGE}setup.make
    2729else
    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
     31cmt_local_setup = $(bin)$(package)setup$$$$.make
     32#cmt_final_setup = $(bin)${PACKAGE}setup.make
     33cmt_final_setup = $(bin)$(package)setup.make
    3034endif
    3135
    3236#--------------------------------------------------------
    3337
    34 cmt_lock_setup = /tmp/lock$(cmt_lock_pid).make
    35 cmt_temp_tag = /tmp/tag$(cmt_lock_pid).make
     38#cmt_lock_setup = /tmp/lock$(cmt_lock_pid).make
     39#cmt_temp_tag = /tmp/tag$(cmt_lock_pid).make
    3640
    37 first :: $(cmt_local_tagfile)
    38         @echo $(cmt_local_tagfile) ok
     41#first :: $(cmt_local_tagfile)
     42#       @echo $(cmt_local_tagfile) ok
     43ifndef QUICK
     44first :: $(cmt_final_setup) ;
     45else
     46first :: ;
     47endif
    3948
    4049##      @bin=`$(cmtexe) -quiet show macro_value bin`
    4150
    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; \
    5060          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) $@; \
    5765          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"; \
    6068            else \
    61               mv $${cmt_local_setup} $${cmt_final_setup}; \
     69              mv $(cmt_local_setup) $@; \
    6270            fi; \
    6371          fi
    64         @/bin/echo setup.make ok   
     72        @/bin/echo $@ ok   
     73
    6574config :: checkuses
    6675        @exit 0
     76checkuses : ;
    6777
    6878env.make ::
    6979        printenv >env.make.tmp; $(cmtexe) -quiet check files env.make.tmp env.make
    7080
     81ifndef QUICK
    7182all :: build_library_links
    7283        @echo "------> (constituents.make) all done"
     84endif
    7385
    7486javadirs ::
    … …  
    88100
    89101.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
    94108
    95109#-- end of constituents_header ------

  • CMT/HEAD/mgr/fragments/make_header

    r201 r434  
    2929cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag)_${CONSTITUENT}.make$(cmt_lock_pid)
    3030else
    31 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
     31#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
     32cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make
    3233endif
    3334
    … …  
    4142cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag).make$(cmt_lock_pid)
    4243else
    43 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
     44#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
     45cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make
    4446endif
    4547
Note: See TracChangeset for help on using the changeset viewer.