Changeset 485 for CMT/HEAD

Timestamp:

Dec 15, 2008, 11:17:27 AM (15 years ago)

Author:

rybkin

Message:

See C.L. 380

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_parser.cxx (modified) (4 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-12-15    <rybkin@lal.in2p3.fr> 380
+        
+        * source/cmt_parser.cxx: In functions fill_for_use_libraries and
+        fill_for_all_constituents, discard the previous modification concerning the
+        use_libraries and <constituent>_libraries macros. This is in order to be
+        consistent with the command "cmt build library_links" that creates symlinks
+        based on the used packages macro <package>_libraries regardless of the
+        -no_auto_imports options
+        
 2008-12-14    <rybkin@lal.in2p3.fr> 379
         

CMT/HEAD/source/cmt_parser.cxx

@@ -7483 +7483 @@
     if (!Symbol::is_selected ("use_libraries"))
       {
-        /*
         buffer  = "macro use_libraries \"";
 
@@ -7500 +7499 @@
         
         buffer += "\"";
-        */        
-        Use::fill_macro_all (buffer, "libraries");
+
         apply ();
       }
@@ -7582 +7580 @@
    *    <constituent>linkopts
    *    <constituent>_GUID
-   *    <constituent>_libraries
    *    <constituent>_stamps
    *
@@ -7912 +7909 @@
         buffer += "\"";
         apply ();
-        
-        buffer = "macro_append ";
-        buffer += constituent.name;
-        buffer += "_libraries ";
-        buffer += " \" ";
-        for (i = 0; i < imports.size (); i++)
-          {
-            Use* u = imports[i];
-            
-            u->fill_macro (buffer, "libraries");
-          }
-        buffer += "\"";
-        apply ();
 
         buffer = "macro_append ";