Changeset 487 for CMT/HEAD/mgr/fragments/constituent

Timestamp:

Jan 8, 2009, 11:23:36 AM (15 years ago)

Author:

rybkin

Message:

See C.L. 382

File:

• CMT/HEAD/mgr/fragments/constituent (modified) (5 diffs)

CMT/HEAD/mgr/fragments/constituent

@@ -7 +7 @@
 ifdef cmt_${CONSTITUENT}_has_target_tag
 
-ifdef READONLY
-cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag)_${CONSTITUENT}.make$(cmt_lock_pid)
-cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_${CONSTITUENT}setup.make
-cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
-else
 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make
-cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.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
-endif
 
 ${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT}
@@ -26 +22 @@
 $(cmt_local_tagfile_${CONSTITUENT}) :
 endif
-        $(echo) "(constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})"
-        @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}); \
-          if test -f $(cmt_final_setup_${CONSTITUENT}); then /bin/rm -f $(cmt_final_setup_${CONSTITUENT}); fi; \
-          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >>$(cmt_final_setup_${CONSTITUENT})
-        $(echo) setup.make ok
+        $(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
 
-ifdef READONLY
-cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag).make$(cmt_lock_pid)
-cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}setup.make
-cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
-else
 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make
-cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
+cmt_final_setup_${CONSTITUENT} = $(bin)setup.make
+#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
 cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
-endif
 
 endif
 
-ifndef QUICK
 ifdef STRUCTURED_OUTPUT
- ${CONSTITUENT}dirs ::
+${CONSTITUENT}dirs :
         @if test ! -d $(bin)${CONSTITUENT}; then $(mkdir) -p $(bin)${CONSTITUENT}; fi
         $(echo) "STRUCTURED_OUTPUT="$(bin)${CONSTITUENT}
+else
+${CONSTITUENT}dirs : ;
+endif
 
-$(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
+#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
+
+$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
         $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
           $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
 
-${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
+ifndef QUICK
+${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) build_library_links dirs ${CONSTITUENT}dirs
+else
+${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs ${CONSTITUENT}dirs
+endif
         $(echo) "(constituents.make) Starting ${CONSTITUENT}"
-        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}
+        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
         $(echo) "(constituents.make) ${CONSTITUENT} done"
 
 clean :: ${CONSTITUENT}clean
 
-${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
+${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
         $(echo) "(constituents.make) Starting ${CONSTITUENT}clean"
-        @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
-          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \
-        fi
+        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean
+        $(echo) "(constituents.make) ${CONSTITUENT}clean done"
+#       @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
+#         $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \
+#       fi
 
 ##        /bin/rm -f $(cmt_local_${CONSTITUENT}_makefile) $(bin)${CONSTITUENT}_dependencies.make
@@ -83 +95 @@
 ${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
         $(echo) "(constituents.make) Starting install ${CONSTITUENT}"
-        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} install
+        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) install
         $(echo) "(constituents.make) install ${CONSTITUENT} done"
 
@@ -90 +102 @@
 ${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
         $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
-        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} uninstall
+        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
         $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
 
@@ -100 +112 @@
 endif
 
-
 #-- end of constituent ------