Changeset 484
- Timestamp:
- Dec 14, 2008, 5:39:23 PM (16 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r483 r484 1 2008-12-14 <rybkin@lal.in2p3.fr> 379 2 3 * source/cmt_parser.cxx: In function fill_for_use_stamps, ensure that the 4 use_stamps macro is set taking into account the -no_auto_imports options, 5 in function fill_for_all_constituents, set the <constituent>_stamps macro 6 to the stamps introduced by the -import=<package> option(s). Similar for 7 use_libraries, <constituent>_libraries macros 8 * mgr/fragments/application: Make use of the <constituent>_stamps macro 9 * mgr/fragments/nmake/application: idem 10 1 11 2008-12-13 <rybkin@lal.in2p3.fr> 378 2 12 -
CMT/HEAD/mgr/fragments/application
r469 r484 1 1 #-- start of application 2 2 3 $(bin)${CONSTITUENT}${application_suffix} :: ${OBJS} $(use_stamps) $(${CONSTITUENT} stamps) requirements$(use_requirements)3 $(bin)${CONSTITUENT}${application_suffix} :: ${OBJS} $(use_stamps) $(${CONSTITUENT}_stamps) $(${CONSTITUENT}stamps) $(use_requirements) 4 4 $(link_echo) "application $@" 5 5 $(link_silent) ${LINKMACRO} -o $(@).new ${OBJS} $(cmt_installarea_linkopts) $(${CONSTITUENT}_use_linkopts) $(${CONSTITUENT}linkopts) && mv -f $(@).new $(@) -
CMT/HEAD/mgr/fragments/nmake/application
r469 r484 1 1 #-- start of application 2 2 3 $(bin)${CONSTITUENT}$(application_suffix) :: ${OBJS} $(use_stamps) $(${CONSTITUENT} stamps) requirements$(use_requirements)3 $(bin)${CONSTITUENT}$(application_suffix) :: ${OBJS} $(use_stamps) $(${CONSTITUENT}_stamps) $(${CONSTITUENT}stamps) $(use_requirements) 4 4 $(link_echo) application $@ 5 5 $(link_silent) ${LINKMACRO} /out:$(bin)${CONSTITUENT}$(application_suffix) @<< -
CMT/HEAD/source/cmt_parser.cxx
r482 r484 7336 7336 if (!Symbol::is_selected ("use_stamps")) 7337 7337 { 7338 /* 7338 7339 buffer = "macro use_stamps \""; 7339 7340 (Use::current()).fill_macro (buffer, "stamps"); … … 7353 7354 7354 7355 buffer += "\""; 7355 7356 */ 7357 Use::fill_macro_all (buffer, "stamps"); 7356 7358 apply (); 7357 7359 } … … 7481 7483 if (!Symbol::is_selected ("use_libraries")) 7482 7484 { 7485 /* 7483 7486 buffer = "macro use_libraries \""; 7484 7487 … … 7497 7500 7498 7501 buffer += "\""; 7499 7502 */ 7503 Use::fill_macro_all (buffer, "libraries"); 7500 7504 apply (); 7501 7505 } … … 7578 7582 * <constituent>linkopts 7579 7583 * <constituent>_GUID 7584 * <constituent>_libraries 7585 * <constituent>_stamps 7580 7586 * 7581 7587 */ … … 7907 7913 apply (); 7908 7914 7915 buffer = "macro_append "; 7916 buffer += constituent.name; 7917 buffer += "_libraries "; 7918 buffer += " \" "; 7919 for (i = 0; i < imports.size (); i++) 7920 { 7921 Use* u = imports[i]; 7922 7923 u->fill_macro (buffer, "libraries"); 7924 } 7925 buffer += "\""; 7926 apply (); 7927 7928 buffer = "macro_append "; 7929 buffer += constituent.name; 7930 buffer += "_stamps "; 7931 buffer += " \" "; 7932 for (i = 0; i < imports.size (); i++) 7933 { 7934 Use* u = imports[i]; 7935 7936 u->fill_macro (buffer, "stamps"); 7937 } 7938 buffer += "\""; 7939 apply (); 7940 7909 7941 /** 7910 7942 * Setting ${CONSTITUENT}linkopts is a temporary solution
Note: See TracChangeset
for help on using the changeset viewer.