Changeset 638


Ignore:
Timestamp:
Jun 6, 2013, 3:13:31 PM (11 years ago)
Author:
rybkin
Message:

merge -r 627:628 HEAD mgr/fragments/constituent mgr/fragments/constituent_lock mgr/fragments/jar mgr/fragments/java ChangeLog

Location:
CMT/v1r25-branch
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • CMT/v1r25-branch/ChangeLog

    r637 r638  
     12013-01-11    <rybkin@lal.in2p3.fr> 499
     2
     3        * mgr/fragments/constituent: Remove unused code, add empty command for
     4        double-colon rules without one (so that implicit rule is not searched for)
     5        * mgr/fragments/constituent_lock: idem
     6        * mgr/fragments/jar: Add empty command for double-colon rules without one (so that implicit rule is not searched for)
     7        * mgr/fragments/java: Create necessary directory in compilation rule to
     8        avoid race condition
     9
    1102013-01-03    <rybkin@lal.in2p3.fr> 498
    211

  • CMT/v1r25-branch/mgr/fragments/constituent

    r588 r638  
    33cmt_${CONSTITUENT}_${HASTARGETTAG} = 1
    44
    5 #--------------------------------------------------------
     5#--------------------------------------
    66
    77ifdef cmt_${CONSTITUENT}_has_target_tag
    88
    9 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
    109cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make
    11 cmt_local_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}$$$$.make
    1210cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.make
    13 #cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
    1411cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    1512
    1613${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT}
    1714
    18 #$(cmt_local_tagfile_${CONSTITUENT}) : $(cmt_lock_setup)
    19 ifndef QUICK
    20 $(cmt_local_tagfile_${CONSTITUENT}) ::
    21 else
    22 $(cmt_local_tagfile_${CONSTITUENT}) :
    23 endif
    24         $(echo) "(constituents.make) Rebuilding $@"; \
    25           if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \
    26           $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT})
    27         $(echo) "(constituents.make) Rebuilding $(cmt_final_setup_${CONSTITUENT})"; \
    28           test ! -f $(cmt_local_setup_${CONSTITUENT}) || \rm -f $(cmt_local_setup_${CONSTITUENT}); \
    29           trap '\rm -f $(cmt_local_setup_${CONSTITUENT})' 0 1 2 15; \
    30           $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT}) && \
    31           if [ -f $(cmt_final_setup_${CONSTITUENT}) ] && \
    32             \cmp -s $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}); then \
    33             \rm $(cmt_local_setup_${CONSTITUENT}); else \
    34             \mv -f $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}); fi
    35 
    3615else
    3716
    38 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
    3917cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make
    4018cmt_final_setup_${CONSTITUENT} = $(bin)setup.make
    41 #cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
    4219cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    4320
    … …  
    5330${CONSTITUENT}dirs : ;
    5431endif
    55 
    56 #ifndef QUICK
    57 #ifdef STRUCTURED_OUTPUT
    58 # ${CONSTITUENT}dirs ::
    59 #       @if test ! -d $(bin)${CONSTITUENT}; then $(mkdir) -p $(bin)${CONSTITUENT}; fi
    60 #       $(echo) "STRUCTURED_OUTPUT="$(bin)${CONSTITUENT}
    61 #
    62 #$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs ${CONSTITUENT}dirs
    63 #else
    64 #$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs
    65 #endif
    66 #else
    67 #$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
    68 #endif
    6932
    7033ifdef cmt_${CONSTITUENT}_has_target_tag
    … …  
    11477        $(echo) "(constituents.make) ${CONSTITUENT} done"
    11578
    116 clean :: ${CONSTITUENT}clean
     79clean :: ${CONSTITUENT}clean ;
    11780
    11881${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
    … …  
    12689##        /bin/rm -f $(cmt_local_${CONSTITUENT}_makefile) $(bin)${CONSTITUENT}_dependencies.make
    12790
    128 install :: ${CONSTITUENT}install
     91install :: ${CONSTITUENT}install ;
    12992
    13093${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    … …  
    145108        $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
    146109
    147 remove_library_links :: ${CONSTITUENT}uninstall
     110remove_library_links :: ${CONSTITUENT}uninstall ;
    148111
    149112ifndef PEDANTIC

  • CMT/v1r25-branch/mgr/fragments/constituent_lock

    r588 r638  
    77ifdef cmt_${CONSTITUENT}_has_target_tag
    88
    9 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
    109cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make
    11 cmt_local_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}$$$$.make
    1210cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.make
    13 #cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
    1411cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    1512
    1613${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT}
    1714
    18 #$(cmt_local_tagfile_${CONSTITUENT}) : $(cmt_lock_setup)
    19 ifndef QUICK
    20 $(cmt_local_tagfile_${CONSTITUENT}) ::
    21 else
    22 $(cmt_local_tagfile_${CONSTITUENT}) :
    23 endif
    24         $(echo) "(constituents.make) Rebuilding $@"; \
    25           if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \
    26           $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT})
    27         $(echo) "(constituents.make) Rebuilding $(cmt_final_setup_${CONSTITUENT})"; \
    28           test ! -f $(cmt_local_setup_${CONSTITUENT}) || \rm -f $(cmt_local_setup_${CONSTITUENT}); \
    29           trap '\rm -f $(cmt_local_setup_${CONSTITUENT})' 0 1 2 15; \
    30           $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT}) && \
    31           if [ -f $(cmt_final_setup_${CONSTITUENT}) ] && \
    32             \cmp -s $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}); then \
    33             \rm $(cmt_local_setup_${CONSTITUENT}); else \
    34             \mv -f $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}); fi
    35 
    3615else
    3716
    38 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
    3917cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make
    4018cmt_final_setup_${CONSTITUENT} = $(bin)setup.make
    41 #cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
    4219cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    4320
    … …  
    5330${CONSTITUENT}dirs : ;
    5431endif
    55 
    56 #ifndef QUICK
    57 #ifdef STRUCTURED_OUTPUT
    58 # ${CONSTITUENT}dirs ::
    59 #       @if test ! -d $(bin)${CONSTITUENT}; then $(mkdir) -p $(bin)${CONSTITUENT}; fi
    60 #       $(echo) "STRUCTURED_OUTPUT="$(bin)${CONSTITUENT}
    61 #
    62 #$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs ${CONSTITUENT}dirs
    63 #else
    64 #$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs
    65 #endif
    66 #else
    67 #$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
    68 #endif
    6932
    7033ifdef cmt_${CONSTITUENT}_has_target_tag
    … …  
    12992##        /bin/rm -f $(cmt_local_${CONSTITUENT}_makefile) $(bin)${CONSTITUENT}_dependencies.make
    13093
    131 install :: ${CONSTITUENT}install
     94install :: ${CONSTITUENT}install ;
    13295
    13396${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    … …  
    148111        $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
    149112
    150 remove_library_links :: ${CONSTITUENT}uninstall
     113remove_library_links :: ${CONSTITUENT}uninstall ;
    151114
    152115ifndef PEDANTIC

  • CMT/v1r25-branch/mgr/fragments/jar

    r441 r638  
    88${CONSTITUENT}installname = ${CONSTITUENT}.jar
    99
    10 ${CONSTITUENT} :: ${CONSTITUENT}install
     10${CONSTITUENT} :: ${CONSTITUENT}install ;
    1111
    12 install :: ${CONSTITUENT}install
     12install :: ${CONSTITUENT}install ;
    1313
    1414${CONSTITUENT}install :: $(install_dir)/$(${CONSTITUENT}installname)
    … …  
    2929##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    3030
    31 uninstall :: ${CONSTITUENT}uninstall
     31uninstall :: ${CONSTITUENT}uninstall ;
    3232
    3333${CONSTITUENT}uninstall ::
    … …  
    4141
    4242${CONSTITUENT}clean ::
    43         $(cleanup_silent) /bin/rm -rf $(javabin)/${CONSTITUENT}
    44         $(cleanup_silent) /bin/rm -f $(javabin)/${CONSTITUENT}.jar
     43        $(cleanup_silent) /bin/rm -rf $(javabin)${CONSTITUENT}
     44        $(cleanup_silent) /bin/rm -f $(javabin)${CONSTITUENT}.jar
    4545
    4646#-- end of jar ------

  • CMT/v1r25-branch/mgr/fragments/java

    r11 r638  
    33${OUTPUTNAME} : ${FULLNAME}
    44        $(java_echo) $@
    5         $(java_silent)cd $(src); $(javacomp) -d $(javabin)/${CONSTITUENT} $(use_javaflags) $(${CONSTITUENT}_javaflags) $(${NAME}_javaflags) ${FULLNAME}
     5        $(java_silent) [ -d $(javabin)${CONSTITUENT} ] || $(mkdir) -p $(javabin)${CONSTITUENT}
     6        $(java_silent)cd $(src); $(javacomp) -d $(javabin)${CONSTITUENT} $(use_javaflags) $(${CONSTITUENT}_javaflags) $(${NAME}_javaflags) ${FULLNAME}
    67
    78#-- end of java ------
Note: See TracChangeset for help on using the changeset viewer.