Changeset 492 for CMT


Ignore:
Timestamp:
Mar 15, 2009, 1:13:07 PM (15 years ago)
Author:
rybkin
Message:

See C.L. 387

Location:
CMT/HEAD
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/ChangeLog

    r491 r492  
     12009-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       
    1282009-02-11    <rybkin@lal.in2p3.fr> 386
    229       

  • CMT/HEAD/mgr/cmt_lockfile.sh

    r430 r492  
    55# is not installed
    66
    7 if [ "$1" == "" ]; then
     7if [ "$1" = "" ]; then
    88    echo "Usage: cmt_lockfile.sh file" >&2
    99    exit 1
    … …  
    1919    fi
    2020    while :; do
    21         [ "$fstype" == afs ] && fs flush -path $dir
     21        [ "$fstype" = afs ] && fs flush -path $dir
    2222        mkdir $1 2>/dev/null && break
    2323        sleep $secs

  • CMT/HEAD/mgr/fragments/check_application_header

    r487 r492  
    66
    77#${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
    913        $(echo) "(constituents.make) Starting $@"
    1014        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $@

  • CMT/HEAD/mgr/fragments/constituent

    r488 r492  
    6868makefiles : $(cmt_local_${CONSTITUENT}_makefile)
    6969
     70ifndef QUICK
     71$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links
     72else
    7073$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
     74endif
    7175        $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
    7276          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    7377
    74 ifndef QUICK
    75 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) build_library_links dirs ${CONSTITUENT}dirs
    76 else
    7778${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs ${CONSTITUENT}dirs
    78 endif
    7979        $(echo) "(constituents.make) Starting ${CONSTITUENT}"
    8080        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    … …  
    8383clean :: ${CONSTITUENT}clean
    8484
    85 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
     85${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
    8686        $(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
    8890        $(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
    9292
    9393##        /bin/rm -f $(cmt_local_${CONSTITUENT}_makefile) $(bin)${CONSTITUENT}_dependencies.make
    … …  
    102102uninstall :: ${CONSTITUENT}uninstall
    103103
    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)
    105107        $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
    106108        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall

  • CMT/HEAD/mgr/fragments/constituent_lock

    r488 r492  
    6868makefiles : $(cmt_local_${CONSTITUENT}_makefile)
    6969
     70ifndef QUICK
     71$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links
     72else
    7073$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
     74endif
    7175        $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
    7276          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    7377
    74 ifndef QUICK
    75 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) build_library_links dirs ${CONSTITUENT}dirs
    76 else
    7778${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs ${CONSTITUENT}dirs
    78 endif
    7979        $(echo) "(constituents.make) Creating ${CONSTITUENT}${lock_suffix} and Starting ${CONSTITUENT}"
    8080        @${lock_command} ${CONSTITUENT}${lock_suffix} || exit $$?; \
    … …  
    8787clean :: ${CONSTITUENT}clean
    8888
    89 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
     89${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
    9090        $(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
    9294        $(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
    9696
    9797##        /bin/rm -f $(cmt_local_${CONSTITUENT}_makefile) $(bin)${CONSTITUENT}_dependencies.make
    … …  
    106106uninstall :: ${CONSTITUENT}uninstall
    107107
    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)
    109111        $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
    110112        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall

  • CMT/HEAD/mgr/fragments/nmake/check_application_header

    r487 r492  
    66
    77#${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}
    911        $(echo) "(constituents.nmake) Starting $@"
    1012        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles $@ tag=$(tag)

  • CMT/HEAD/mgr/fragments/nmake/constituent

    r488 r492  
    5252!endif
    5353
    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
    5957$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
     58!endif
    6059        $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
    6160        @set include=$(include)
    … …  
    8584clean :: ${CONSTITUENT}clean
    8685
    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)
    8987        $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean
    9088        @set include=$(include)
    9189        @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)
    9391        $(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)
    9693
    9794install :: ${CONSTITUENT}install
    … …  
    106103uninstall :: ${CONSTITUENT}uninstall
    107104
    108 ${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
     105#${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
     106${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT})
    109107        $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}
    110108        @set include=$(include)
    111109        @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}
    112111        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag)
    113112        $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done

  • CMT/HEAD/mgr/fragments/nmake/constituent_lock

    r488 r492  
    5252!endif
    5353
    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
    5957$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
     58!endif
    6059        $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
    6160        @set include=$(include)
    … …  
    8988clean :: ${CONSTITUENT}clean
    9089
    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)
    9391        $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean
    9492        @set include=$(include)
    9593        @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)
    9795        $(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)
    10097
    10198install :: ${CONSTITUENT}install
    … …  
    110107uninstall :: ${CONSTITUENT}uninstall
    111108
    112 ${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
     109#${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
     110${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT})
    113111        $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}
    114112        @set include=$(include)
    115113        @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}
    116115        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag)
    117116        $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done

  • CMT/HEAD/mgr/fragments/nmake/library

    r487 r492  
    1818${CONSTITUENT}clean ::
    1919        $(cleanup_echo) #objects
    20         $(cleanup_silent) for %f in (${OBJS}) do if exist %f del %f
     20        $(cleanup_silent) for %f in (${OBJS}) do $(cleanup_silent)if exist %f del %f
    2121        $(cleanup_silent) if exist $(bin)${CONSTITUENT}.arc del $(bin)${CONSTITUENT}.arc
    2222        $(cleanup_silent) if exist $(bin)${CONSTITUENT}.lib del $(bin)${CONSTITUENT}.lib

  • CMT/HEAD/mgr/fragments/nmake/library_no_share

    r487 r492  
    1313${CONSTITUENT}clean ::
    1414        $(cleanup_echo) #objects
    15         $(cleanup_silent) for %f in (${OBJS}) do if exist %f del %f
     15        $(cleanup_silent) for %f in (${OBJS}) do $(cleanup_silent)if exist %f del %f
    1616        $(cleanup_silent) if exist $(${CONSTITUENT}lib) del $(${CONSTITUENT}lib)
    1717

  • CMT/HEAD/mgr/fragments/nmake/library_no_static

    r487 r492  
    3636${CONSTITUENT}clean ::
    3737        $(cleanup_echo) #objects
    38         $(cleanup_silent) for %f in (${OBJS}) do if exist %f del %f
     38        $(cleanup_silent) for %f in (${OBJS}) do $(cleanup_silent)if exist %f del %f
    3939        $(cleanup_silent) if exist $(bin)${CONSTITUENT}.arc del $(bin)${CONSTITUENT}.arc
    4040        $(cleanup_silent) if exist $(bin)${CONSTITUENT}.lib del $(bin)${CONSTITUENT}.lib
Note: See TracChangeset for help on using the changeset viewer.