Changeset 642 for CMT

Timestamp:

Jun 6, 2013, 4:16:59 PM (11 years ago)

Author:

rybkin

Message:

merge -r 631:635 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• ChangeLog (modified) (1 diff, 1 prop)
• mgr/cmt_dcc_version.sh (modified) (1 prop)
• mgr/fragments/cleanup_library (modified) (1 diff)
• mgr/fragments/constituent (modified) (1 prop)
• mgr/fragments/constituent_lock (modified) (1 prop)
• mgr/fragments/jar (modified) (1 prop)
• mgr/fragments/java (modified) (1 prop)
• mgr/fragments/nmake/check_application (modified) (1 prop)
• mgr/fragments/nmake/constituent (modified) (1 prop)
• mgr/fragments/nmake/constituent_lock (modified) (1 prop)
• mgr/fragments/nmake/jar (modified) (1 prop)
• mgr/fragments/nmake/java (modified) (1 prop)
• mgr/fragments/nmake/library (modified) (1 prop)
• mgr/fragments/nmake/library_no_static (modified) (1 prop)
• source/cmt_parser.cxx (modified) (2 diffs)
• source/cmt_project.cxx (modified) (1 prop)

CMT/v1r25-branch/ChangeLog

@@ +1 @@
+2013-06-06    <rybkin@lal.in2p3.fr> 504
+
+        * source/cmt_parser.cxx: In class Cmt function do_config, ensure that *.in
+        files are removed in binary tag directory only
+        
+2013-02-07    <rybkin@lal.in2p3.fr> 503
+
+        * mgr/fragments/cleanup_library: Fix cleanup of libraries for Darwin
+        platform
+        
 2013-02-06    <rybkin@lal.in2p3.fr> 502
 

CMT/v1r25-branch/mgr/fragments/cleanup_library

@@ -1 +1 @@
 #-- start of cleanup_library -------------
         $(cleanup_echo) library ${CONSTITUENT}
-        -$(cleanup_silent) cd $(bin); /bin/rm -f $(library_prefix)${CONSTITUENT}$(library_suffix).a $(library_prefix)${CONSTITUENT}$(library_suffix).s? ${CONSTITUENT}.stamp ${CONSTITUENT}.shstamp
+        -$(cleanup_silent) cd $(bin) && \rm -f $(library_prefix)${CONSTITUENT}$(library_suffix).a $(library_prefix)${CONSTITUENT}$(library_suffix).$(shlibsuffix) ${CONSTITUENT}.stamp ${CONSTITUENT}.shstamp
 #-- end of cleanup_library ---------------

CMT/v1r25-branch/source/cmt_parser.cxx

@@ -3114 +3114 @@
     }
 
+  //  CmtSystem::cd ("..");
+  //  CmtSystem::scan_dir (Me.m_cmt_config, expression, makes); 
+
   cmt_string bin ("..");
   bin += CmtSystem::file_separator ();
   bin += Me.m_cmt_config;
-  //  CmtSystem::cd ("..");
-
-  CmtSystem::scan_dir (bin, expression, makes); 
-  //  CmtSystem::scan_dir (Me.m_cmt_config, expression, makes); 
+
+  if (CmtSystem::test_directory (bin))
+    // in case directory bin does not exist,
+    // this function scans the parent directory instead
+    CmtSystem::scan_dir (bin, expression, makes); 
+  else
+    makes.clear ();
     
   if (makes.size () > 0) 
@@ -3127 +3133 @@
         {
           cout << "Removing all previous make fragments from "
-               << Me.m_cmt_config << endl; 
+               << bin << endl; 
+          //           << Me.m_cmt_config << endl; 
         }