Changeset 95

Timestamp:

Sep 30, 2005, 10:06:01 AM (20 years ago)

Author:

arnault

Message:

Bug fixes see CL283

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/cmt.nmake (modified) (1 diff)
• mgr/fragments/constituents_header (modified) (4 diffs)
• mgr/fragments/constituents_trailer (modified) (1 diff)
• mgr/fragments/make_header (modified) (1 diff)
• mgr/fragments/make_setup (modified) (1 diff)
• mgr/fragments/nmake/constituents_trailer (modified) (1 diff)
• source/cmt_cvs.cxx (modified) (1 diff)
• source/cmt_parser.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2005-09-29  Christian Arnault  <arnault@lal.in2p3.fr> 283
+
+        * mgr/fragments/nmake/constituents_trailer (makefilesclean): Remove references to checkuses
+        * mgr/fragments/constituents_header (config): Remove references to checkuses
+        * mgr/fragments/constituents_trailer (makefilesclean): Remove references to checkuses
+        * mgr/fragments/make_header (dirs): Remove references to checkuses
+        * mgr/fragments/make_setup (config): Remove references to checkuses
+
+        * source/cmt_parser.cxx (do_broadcast): bug fix: the set_standard_macro was not called 
+        prior to set all EVs before the broadcast loop
+
 2005-09-09    <arnault@lal.in2p3.fr> 282
 

CMT/HEAD/mgr/cmt.nmake

@@ -3 +3 @@
 #  Application cmt
 #
-#   Generated Mon Sep 05 15:17:19 2005  by ARNAULT
+#   Generated Fri Sep 30 09:25:35 2005  by arnault
 #
 #====================================

CMT/HEAD/mgr/fragments/constituents_header

@@ -32 +32 @@
 #--------------------------------------------------------
 
-cmt_lock_setup = /tmp/lock$(cmt_lock_pid).make
+##cmt_lock_setup = /tmp/lock$(cmt_lock_pid).make
 cmt_temp_tag = /tmp/tag$(cmt_lock_pid).make
 
@@ -40 +40 @@
 ##      @bin=`$(cmtexe) -quiet show macro_value bin`
 
-$(cmt_local_tagfile) : $(cmt_lock_setup)
+$(cmt_local_tagfile) : ##$(cmt_lock_setup)
         @/bin/echo "------> (constituents.make) Rebuilding setup.make $(cmt_local_tagfile)"
         @if test -f $(cmt_local_tagfile); then /bin/rm -f $(cmt_local_tagfile); fi
@@ -64 +64 @@
         @/bin/echo setup.make ok
 
-config :: checkuses
+config :: ## checkuses
         @exit 0
 
@@ -89 +89 @@
 
 .DEFAULT ::
-        @if test "$@" = "$(cmt_lock_setup)"; then \
-          /bin/rm -f $(cmt_lock_setup); \
-          touch $(cmt_lock_setup); \
-        fi
+
+#       @if test "$@" = "$(cmt_lock_setup)"; then \
+#         /bin/rm -f $(cmt_lock_setup); \
+#         touch $(cmt_lock_setup); \
+#       fi
 
 #-- end of constituents_header ------

CMT/HEAD/mgr/fragments/constituents_trailer

@@ -8 +8 @@
 
 makefilesclean ::
-        @/bin/rm -f checkuses
+
+###     @/bin/rm -f checkuses
 
 ###     /bin/rm -f *.make*

CMT/HEAD/mgr/fragments/make_header

@@ -88 +88 @@
 dirs ::
         @if test ! -r requirements ; then echo "No requirements file" ; fi; \
-          if test ! -d $(bin) ; then $(mkdir) -p $(bin) ; fi; \
-          /bin/rm -f checkuses
+          if test ! -d $(bin) ; then $(mkdir) -p $(bin) ; fi
+
+###       /bin/rm -f checkuses
 
 javadirs ::

CMT/HEAD/mgr/fragments/make_setup

@@ -23 +23 @@
         fi
 
-config :: checkuses ##$(${PACKAGE}_tag).make
+config :: ## checkuses $(${PACKAGE}_tag).make
         @/bin/echo $(${PACKAGE}_tag).make ok
 

CMT/HEAD/mgr/fragments/nmake/constituents_trailer

@@ -8 +8 @@
 makefilesclean ::
         @if exist *.make.* del *.make*
-        @if exist checkuses del checkuses
+
+###     @if exist checkuses del checkuses
 
 clean :: makefilesclean

CMT/HEAD/source/cmt_cvs.cxx

@@ -1778 +1778 @@
             CmtSystem::cd (here);
 
-            if (did_recurse) execute ("cmt -quiet broadcast cmt -quiet config");
+            if (did_recurse) 
+              {
+                execute ("cmt -quiet broadcast cmt -quiet config");
+              }
+            else
+              {
+                execute ("cmt -quiet config");
+              }
+          }
+        else
+          {
+            execute ("cmt -quiet config");
           }
       }

CMT/HEAD/source/cmt_parser.cxx

@@ -1434 +1434 @@
   if (begin == "") started = true;
 
+  set_standard_macros ();
   Cmt::reset_all_sets_done ();
   Symbol::all_set ();