Changeset 468 for CMT

Timestamp:

Oct 20, 2008, 4:34:53 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 369

Location:

CMT/HEAD

Files:

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

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-10-20    <rybkin@lal.in2p3.fr> 369
+        
+        * source/cmt_parser.cxx: In function fill_for_all_constituents, correct the
+        setting of macros in case the -import option for constituents is used so as
+        to import what is requested only. Do not set macro ${CONSTITUENT}linkopts
+        * mgr/fragments/application: Use $(cmt_installarea_linkopts) with
+        $(${CONSTITUENT}_use_linkopts) instead of $(${CONSTITUENT}linkopts)
+        * mgr/fragments/dsp_application_header: idem
+        * mgr/fragments/dsp_windows_header: idem
+        * mgr/fragments/nmake/application: idem
+        
 2008-09-24    <rybkin@lal.in2p3.fr> 368
         

CMT/HEAD/mgr/fragments/application

@@ -3 +3 @@
 $(bin)${CONSTITUENT}${application_suffix} :: ${OBJS} $(use_stamps) $(${CONSTITUENT}stamps) requirements $(use_requirements)
         $(link_echo) "application $@"
-        $(link_silent) cd $(bin); ${LINKMACRO} -o ${CONSTITUENT}.exe.new ${OBJS} $(use_linkopts) $(${CONSTITUENT}linkopts); mv -f ${CONSTITUENT}.exe.new ${CONSTITUENT}${application_suffix}
+        $(link_silent) cd $(bin); ${LINKMACRO} -o ${CONSTITUENT}.exe.new ${OBJS} $(cmt_installarea_linkopts) $(${CONSTITUENT}_use_linkopts) $(${CONSTITUENT}linkopts); mv -f ${CONSTITUENT}.exe.new ${CONSTITUENT}${application_suffix}
 
 #-----------------------------------------------------------------

CMT/HEAD/mgr/fragments/dsp_application_header

@@ -52 +52 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 $(cpplinkflags) $(use_linkopts) $(${CONSTITUENT}linkopts) /subsystem:console /debug /pdbtype:sept
-# ADD LINK32 $(cpplinkflags) $(use_linkopts) $(${CONSTITUENT}linkopts) /subsystem:console /debug /pdbtype:sept
+# ADD BASE LINK32 $(cpplinkflags) $(cmt_installarea_linkopts) $(${CONSTITUENT}_use_linkopts) $(${CONSTITUENT}linkopts) /subsystem:console /debug /pdbtype:sept
+# ADD LINK32 $(cpplinkflags) $(cmt_installarea_linkopts) $(${CONSTITUENT}_use_linkopts) $(${CONSTITUENT}linkopts) /subsystem:console /debug /pdbtype:sept
 
 

CMT/HEAD/mgr/fragments/dsp_windows_header

@@ -52 +52 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /debug /pdbtype:sept 
-# ADD LINK32 ${use_linkopts} kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /debug /pdbtype:sept
+# ADD LINK32 $(cmt_installarea_linkopts) $(${CONSTITUENT}_use_linkopts) kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /debug /pdbtype:sept
 
 # Begin Target

CMT/HEAD/mgr/fragments/nmake/application

@@ -4 +4 @@
         $(link_silent) ${LINKMACRO} /out:$(bin)${CONSTITUENT}$(application_suffix) @<<
 ${OBJS}
-$(use_linkopts)
+$(cmt_installarea_linkopts)
+$(${CONSTITUENT}_use_linkopts)
 $(${CONSTITUENT}linkopts)
 <<

CMT/HEAD/source/cmt_parser.cxx

@@ -7690 +7690 @@
         for (i = 0; i < base_auto_imports_states.size (); i++)
           {
-            if (base_auto_imports_states[i]== On && auto_imports_states[i] == Off) continue;
-            
+            //      if (base_auto_imports_states[i]== On && auto_imports_states[i] == Off) continue;
+            if (base_auto_imports_states[i] == On || auto_imports_states[i] == Off) continue;
+            /**
+             *  Consider the package (i) for import only if it is:
+             *   o not imported yet (i.e., base_auto_imports_states[i] != On)
+             *   o requested for import according to -import=xxx modifiers for
+             *     the current constituent (i.e., auto_imports_states[i] != Off)
+             */
             Use* u = Uses[i];
             
@@ -7819 +7825 @@
          *
          */
+        /**
         buffer = "macro_append ";
         buffer += constituent.name;
@@ -7831 +7838 @@
         buffer += "\"";
         apply ();
+        */
         
         /**