Changeset 548 for CMT/HEAD

Timestamp:

Aug 4, 2010, 11:37:54 AM (14 years ago)

Author:

rybkin

Message:

See C.L. 433

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (2 diffs)
• mgr/fragments/constituent (modified) (1 diff)
• mgr/fragments/constituent_lock (modified) (1 diff)
• mgr/fragments/dependencies (modified) (1 diff)
• mgr/fragments/nmake/dependencies (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2010-08-04    <rybkin@lal.in2p3.fr> 433
+
+        * mgr/fragments/dependencies: In QUICK mode, only generate dependencies
+        file if it does not exist
+        * mgr/fragments/nmake/dependencies: idem
+        * mgr/fragments/constituent: In QUICK mode, run "cmt build
+        constituent_config" command, if any of constituent Makefile, tag specific
+        Makefile, setup definitions file does not exist
+        * mgr/fragments/constituent_lock: idem
+        
 2010-08-03    <rybkin@lal.in2p3.fr> 432
 
@@ -9 +19 @@
         optional argument of type ostream
         * source/cmt_tag.cxx: Implement optional argument
-        * source/cmt_std.h: Add header and shortcut for ostringstream
+        * source/cmt_std.h: Add header file and shortcut for ostringstream
         * source/cmt_symbol.h: In class Symbol function show_macro, add optional
         argument of type ostream

CMT/HEAD/mgr/fragments/constituent

@@ -76 +76 @@
 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
 #$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
-        if [ ! -f $@ ]; then \
+        if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
+          [ ! -f $(cmt_final_setup_${CONSTITUENT}) ]; then \
           test -z "$(cmtmsg)" || \
           echo "$(CMTMSGPREFIX)" "(constituents.make) Building ${CONSTITUENT}.make"; \

CMT/HEAD/mgr/fragments/constituent_lock

@@ -76 +76 @@
 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
 #$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
-        if [ ! -f $@ ]; then \
+        if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
+          [ ! -f $(cmt_final_setup_${CONSTITUENT}) ]; then \
           test -z "$(cmtmsg)" || \
           echo "$(CMTMSGPREFIX)" "(constituents.make) Building ${CONSTITUENT}.make"; \

CMT/HEAD/mgr/fragments/dependencies

@@ -5 +5 @@
 #$(bin)${CONSTITUENT}_dependencies.make :: dirs
 
-#ifndef QUICK
+ifndef QUICK
 $(bin)${CONSTITUENT}_dependencies.make : ${LINE} $(use_requirements) $(cmt_final_setup_${CONSTITUENT})
+else
+$(bin)${CONSTITUENT}_dependencies.make :
+endif
         $(echo) "(${CONSTITUENT}.make) Rebuilding $@"; \
           $(build_dependencies) ${CONSTITUENT} -all_sources -out=$@ ${LINE}
-#endif
 
 #$(${CONSTITUENT}_dependencies)

CMT/HEAD/mgr/fragments/nmake/dependencies

@@ -13 +13 @@
 dependencies : $(bin)${CONSTITUENT}_dependencies.nmake
 
+!if "$(QUICK)" == ""
 $(bin)${CONSTITUENT}_dependencies.nmake : ${LINE} $(use_requirements) $(cmt_final_setup_${CONSTITUENT})
+!else
+$(bin)${CONSTITUENT}_dependencies.nmake :
+!endif
         $(echo) (${CONSTITUENT}.nmake) Rebuilding $@
         $(build_dependencies) ${CONSTITUENT} -all_sources -out:$@ ${LINE}