Changeset 484 for CMT

Timestamp:

Dec 14, 2008, 5:39:23 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 379

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/fragments/application (modified) (1 diff)
• mgr/fragments/nmake/application (modified) (1 diff)
• source/cmt_parser.cxx (modified) (6 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-12-14    <rybkin@lal.in2p3.fr> 379
+        
+        * source/cmt_parser.cxx: In function fill_for_use_stamps, ensure that the
+        use_stamps macro is set taking into account the -no_auto_imports options,
+        in function fill_for_all_constituents, set the <constituent>_stamps macro
+        to the stamps introduced by the -import=<package> option(s). Similar for
+        use_libraries, <constituent>_libraries macros
+        * mgr/fragments/application: Make use of the <constituent>_stamps macro
+        * mgr/fragments/nmake/application: idem
+        
 2008-12-13    <rybkin@lal.in2p3.fr> 378
         

CMT/HEAD/mgr/fragments/application

@@ -1 +1 @@
 #-- start of application
 
-$(bin)${CONSTITUENT}${application_suffix} :: ${OBJS} $(use_stamps) $(${CONSTITUENT}stamps) requirements $(use_requirements)
+$(bin)${CONSTITUENT}${application_suffix} :: ${OBJS} $(use_stamps) $(${CONSTITUENT}_stamps) $(${CONSTITUENT}stamps) $(use_requirements)
         $(link_echo) "application $@"
         $(link_silent) ${LINKMACRO} -o $(@).new ${OBJS} $(cmt_installarea_linkopts) $(${CONSTITUENT}_use_linkopts) $(${CONSTITUENT}linkopts) && mv -f $(@).new $(@)

CMT/HEAD/mgr/fragments/nmake/application

@@ -1 +1 @@
 #-- start of application
 
-$(bin)${CONSTITUENT}$(application_suffix) :: ${OBJS} $(use_stamps) $(${CONSTITUENT}stamps) requirements $(use_requirements)
+$(bin)${CONSTITUENT}$(application_suffix) :: ${OBJS} $(use_stamps) $(${CONSTITUENT}_stamps) $(${CONSTITUENT}stamps) $(use_requirements)
         $(link_echo) application $@
         $(link_silent) ${LINKMACRO} /out:$(bin)${CONSTITUENT}$(application_suffix) @<<

CMT/HEAD/source/cmt_parser.cxx

@@ -7336 +7336 @@
     if (!Symbol::is_selected ("use_stamps"))
       {
+        /*
         buffer = "macro use_stamps \"";
         (Use::current()).fill_macro (buffer, "stamps");
@@ -7353 +7354 @@
         
         buffer += "\"";
-        
+        */
+        Use::fill_macro_all (buffer, "stamps");
         apply ();
       }
@@ -7481 +7483 @@
     if (!Symbol::is_selected ("use_libraries"))
       {
+        /*
         buffer  = "macro use_libraries \"";
 
@@ -7497 +7500 @@
         
         buffer += "\"";
-        
+        */        
+        Use::fill_macro_all (buffer, "libraries");
         apply ();
       }
@@ -7578 +7582 @@
    *    <constituent>linkopts
    *    <constituent>_GUID
+   *    <constituent>_libraries
+   *    <constituent>_stamps
    *
    */
@@ -7907 +7913 @@
         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 ";
+        buffer += constituent.name;
+        buffer += "_stamps ";
+        buffer += " \" ";
+        for (i = 0; i < imports.size (); i++)
+          {
+            Use* u = imports[i];
+            
+            u->fill_macro (buffer, "stamps");
+          }
+        buffer += "\"";
+        apply ();
+
         /**
          *  Setting ${CONSTITUENT}linkopts is a temporary solution