Changeset 642 for CMT/v1r25-branch
- Timestamp:
- Jun 6, 2013, 4:16:59 PM (11 years ago)
- Location:
- CMT/v1r25-branch
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/v1r25-branch
-
CMT/v1r25-branch/ChangeLog
- Property svn:mergeinfo changed
/CMT/HEAD/ChangeLog merged: 632,635
r641 r642 1 2013-06-06 <rybkin@lal.in2p3.fr> 504 2 3 * source/cmt_parser.cxx: In class Cmt function do_config, ensure that *.in 4 files are removed in binary tag directory only 5 6 2013-02-07 <rybkin@lal.in2p3.fr> 503 7 8 * mgr/fragments/cleanup_library: Fix cleanup of libraries for Darwin 9 platform 10 1 11 2013-02-06 <rybkin@lal.in2p3.fr> 502 2 12 - Property svn:mergeinfo changed
-
CMT/v1r25-branch/mgr/cmt_dcc_version.sh
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/cleanup_library
r487 r642 1 1 #-- start of cleanup_library ------------- 2 2 $(cleanup_echo) library ${CONSTITUENT} 3 -$(cleanup_silent) cd $(bin) ; /bin/rm -f $(library_prefix)${CONSTITUENT}$(library_suffix).a $(library_prefix)${CONSTITUENT}$(library_suffix).s?${CONSTITUENT}.stamp ${CONSTITUENT}.shstamp3 -$(cleanup_silent) cd $(bin) && \rm -f $(library_prefix)${CONSTITUENT}$(library_suffix).a $(library_prefix)${CONSTITUENT}$(library_suffix).$(shlibsuffix) ${CONSTITUENT}.stamp ${CONSTITUENT}.shstamp 4 4 #-- end of cleanup_library --------------- -
CMT/v1r25-branch/mgr/fragments/constituent
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/constituent_lock
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/jar
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/java
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/check_application
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/constituent
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/constituent_lock
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/jar
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/java
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/library
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/library_no_static
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/source/cmt_parser.cxx
r640 r642 3114 3114 } 3115 3115 3116 // CmtSystem::cd (".."); 3117 // CmtSystem::scan_dir (Me.m_cmt_config, expression, makes); 3118 3116 3119 cmt_string bin (".."); 3117 3120 bin += CmtSystem::file_separator (); 3118 3121 bin += Me.m_cmt_config; 3119 // CmtSystem::cd (".."); 3120 3121 CmtSystem::scan_dir (bin, expression, makes); 3122 // CmtSystem::scan_dir (Me.m_cmt_config, expression, makes); 3122 3123 if (CmtSystem::test_directory (bin)) 3124 // in case directory bin does not exist, 3125 // this function scans the parent directory instead 3126 CmtSystem::scan_dir (bin, expression, makes); 3127 else 3128 makes.clear (); 3123 3129 3124 3130 if (makes.size () > 0) … … 3127 3133 { 3128 3134 cout << "Removing all previous make fragments from " 3129 << Me.m_cmt_config << endl; 3135 << bin << endl; 3136 // << Me.m_cmt_config << endl; 3130 3137 } 3131 3138 -
CMT/v1r25-branch/source/cmt_project.cxx
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.