Changeset 638 for CMT/v1r25-branch/mgr/fragments/constituent_lock

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

File:

• CMT/v1r25-branch/mgr/fragments/constituent_lock (modified) (4 diffs, 1 prop)

CMT/v1r25-branch/mgr/fragments/constituent_lock

@@ -7 +7 @@
 ifdef cmt_${CONSTITUENT}_has_target_tag
 
-#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make
-cmt_local_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}$$$$.make
 cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.make
-#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
 cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
 
 ${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT}
 
-#$(cmt_local_tagfile_${CONSTITUENT}) : $(cmt_lock_setup)
-ifndef QUICK
-$(cmt_local_tagfile_${CONSTITUENT}) ::
-else
-$(cmt_local_tagfile_${CONSTITUENT}) :
-endif
-        $(echo) "(constituents.make) Rebuilding $@"; \
-          if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \
-          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT})
-        $(echo) "(constituents.make) Rebuilding $(cmt_final_setup_${CONSTITUENT})"; \
-          test ! -f $(cmt_local_setup_${CONSTITUENT}) || \rm -f $(cmt_local_setup_${CONSTITUENT}); \
-          trap '\rm -f $(cmt_local_setup_${CONSTITUENT})' 0 1 2 15; \
-          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT}) && \
-          if [ -f $(cmt_final_setup_${CONSTITUENT}) ] && \
-            \cmp -s $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}); then \
-            \rm $(cmt_local_setup_${CONSTITUENT}); else \
-            \mv -f $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}); fi
-
 else
 
-#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make
 cmt_final_setup_${CONSTITUENT} = $(bin)setup.make
-#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
 cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
 
@@ -53 +30 @@
 ${CONSTITUENT}dirs : ;
 endif
-
-#ifndef QUICK
-#ifdef STRUCTURED_OUTPUT
-# ${CONSTITUENT}dirs ::
-#       @if test ! -d $(bin)${CONSTITUENT}; then $(mkdir) -p $(bin)${CONSTITUENT}; fi
-#       $(echo) "STRUCTURED_OUTPUT="$(bin)${CONSTITUENT}
-#
-#$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs ${CONSTITUENT}dirs
-#else
-#$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs
-#endif
-#else
-#$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
-#endif
 
 ifdef cmt_${CONSTITUENT}_has_target_tag
@@ -129 +92 @@
 ##        /bin/rm -f $(cmt_local_${CONSTITUENT}_makefile) $(bin)${CONSTITUENT}_dependencies.make
 
-install :: ${CONSTITUENT}install
+install :: ${CONSTITUENT}install ;
 
 ${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
@@ -148 +111 @@
         $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
 
-remove_library_links :: ${CONSTITUENT}uninstall
+remove_library_links :: ${CONSTITUENT}uninstall ;
 
 ifndef PEDANTIC