- Timestamp:
- May 10, 2011, 2:39:10 PM (13 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r575 r576 1 2011-05-10 <rybkin@lal.in2p3.fr> 458 2 3 * source/cmt_system.cxx: In class CmtSystem, in functions quote, mangle, 4 correct conversion specification in sprintf 5 * source/cmt_use.cxx: In class Use, in function set_auto_imports, idem 6 * mgr/fragments/nmake/constituent: Generate constituent Makefile from input 7 requirements file (with -f, -without_cmt options) for constituent without 8 associated tag 9 * mgr/fragments/nmake/constituent_lock: idem 10 * mgr/Unix.make: Invoke compiler as c++ for any Darwin platform, do not 11 use recent GNU Make features, specify arch i386 or x86_64 explicitly for 12 relevant Darwin platforms 13 * mgr/GNUmakefile: Use ln with -f option 14 1 15 2011-05-04 <rybkin@lal.in2p3.fr> 457 2 16 -
CMT/HEAD/mgr/GNUmakefile
r560 r576 26 26 ifneq ($(wildcard $(cmtexe)),) 27 27 all :: cmt 28 $(silent)\cd $(bin) && { [ -L cmt ] || [ $(notdir $(cmtexe)) = cmt ] || \ln -s $(notdir $(cmtexe)) cmt; }28 $(silent)\cd $(bin) && { [ -L cmt ] || [ $(notdir $(cmtexe)) = cmt ] || \ln -sf $(notdir $(cmtexe)) cmt; } 29 29 # $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt 30 30 $(echo) all ok … … 40 40 all :: cmt post_build done 41 41 endif 42 $(silent)\cd $(bin) && { [ -L cmt ] || [ $(notdir $(cmtexe)) = cmt ] || \ln -s $(notdir $(cmtexe)) cmt; }42 $(silent)\cd $(bin) && { [ -L cmt ] || [ $(notdir $(cmtexe)) = cmt ] || \ln -sf $(notdir $(cmtexe)) cmt; } 43 43 # $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt 44 44 $(echo) all ok -
CMT/HEAD/mgr/Unix.make
r560 r576 51 51 endif 52 52 53 if eq ($(CMTBIN),Darwin)53 ifneq (,$(findstring Darwin,$(CMTBIN))) 54 54 cpp = c++ -O2 55 55 endif … … 79 79 ifneq (,$(findstring i386,$(CMTBIN))) 80 80 _mode = 32 81 else ifneq (,$(findstring i486,$(CMTBIN))) 81 endif 82 ifneq (,$(findstring i486,$(CMTBIN))) 82 83 _mode = 32 83 else ifneq (,$(findstring i586,$(CMTBIN))) 84 endif 85 ifneq (,$(findstring i586,$(CMTBIN))) 84 86 _mode = 32 85 else ifneq (,$(findstring i686,$(CMTBIN))) 87 endif 88 ifneq (,$(findstring i686,$(CMTBIN))) 86 89 _mode = 32 87 else ifneq (,$(findstring x86_64,$(CMTBIN))) 90 endif 91 ifneq (,$(findstring x86_64,$(CMTBIN))) 88 92 _mode = 64 89 93 endif … … 107 111 ifeq ($(_mode),32) 108 112 TARGET_ARCH = -m32 109 else ifeq ($(_mode),64) 113 endif 114 ifeq ($(_mode),64) 110 115 TARGET_ARCH = -m64 116 endif 117 endif 118 119 # 120 # Specify mode explicitly for Darwin 121 # (on Mac OS X 10.6, uname -m may show i386 122 # while c++ builds for x86_64 by default) 123 # 124 ifneq (,$(findstring Darwin,$(CMTBIN))) 125 ifeq ($(_mode),32) 126 TARGET_ARCH = -arch i386 127 endif 128 ifeq ($(_mode),64) 129 TARGET_ARCH = -arch x86_64 111 130 endif 112 131 endif … … 139 158 format_dependencies = $(CMTROOT)/mgr/cmt_format_deps.sh 140 159 build_dependencies = : 141 else ifneq (,$(findstring Darwin,$(CMTBIN))) 160 endif 161 ifneq (,$(findstring Darwin,$(CMTBIN))) 142 162 cppdepflags = -MM 143 163 format_dependencies = $(CMTROOT)/mgr/cmt_format_deps.sh -
CMT/HEAD/mgr/fragments/nmake/constituent
r547 r576 58 58 #!endif 59 59 60 !if defined (cmt_${CONSTITUENT}_has_target_tag) 61 60 62 !if "$(QUICK)" == "" || !exist ($(cmt_local_${CONSTITUENT}_makefile)) || !exist ($(cmt_local_tagfile_${CONSTITUENT})) || !exist ($(cmt_final_setup_${CONSTITUENT})) 61 63 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) … … 68 70 !else 69 71 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) ; 72 !endif 73 74 !else 75 76 !if "$(QUICK)" == "" || !exist ($(cmt_local_${CONSTITUENT}_makefile)) || !exist ($(cmt_local_tagfile_${CONSTITUENT})) || !exist ($(cmt_final_setup_${CONSTITUENT})) 77 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) 78 $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake 79 @set include=$(include) 80 @set lib=$(lib) 81 @$(cmtexe) -f=$(bin)${CONSTITUENT}.in -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -without_cmt -out=$@ ${CONSTITUENT} 82 !else 83 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) ; 84 !endif 85 70 86 !endif 71 87 -
CMT/HEAD/mgr/fragments/nmake/constituent_lock
r547 r576 58 58 #!endif 59 59 60 !if defined (cmt_${CONSTITUENT}_has_target_tag) 61 60 62 !if "$(QUICK)" == "" || !exist ($(cmt_local_${CONSTITUENT}_makefile)) || !exist ($(cmt_local_tagfile_${CONSTITUENT})) || !exist ($(cmt_final_setup_${CONSTITUENT})) 61 63 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) … … 68 70 !else 69 71 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) ; 72 !endif 73 74 !else 75 76 !if "$(QUICK)" == "" || !exist ($(cmt_local_${CONSTITUENT}_makefile)) || !exist ($(cmt_local_tagfile_${CONSTITUENT})) || !exist ($(cmt_final_setup_${CONSTITUENT})) 77 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) 78 $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake 79 @set include=$(include) 80 @set lib=$(lib) 81 @$(cmtexe) -f=$(bin)${CONSTITUENT}.in -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -without_cmt -out=$@ ${CONSTITUENT} 82 !else 83 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) ; 84 !endif 85 70 86 !endif 71 87 -
CMT/HEAD/source/cmt_system.cxx
r569 r576 2193 2193 if (0 == buffer) 2194 2194 { 2195 char num[32]; sprintf (num, "% u", allocated + 1);2195 char num[32]; sprintf (num, "%lu", allocated + 1); 2196 2196 cmt_string msg ("Cannot allocate "); 2197 2197 msg += num; … … 2274 2274 if (0 == buffer) 2275 2275 { 2276 char num[32]; sprintf (num, "% u", allocated + 1);2276 char num[32]; sprintf (num, "%lu", allocated + 1); 2277 2277 cmt_string msg ("Cannot allocate "); 2278 2278 msg += num; -
CMT/HEAD/source/cmt_use.cxx
r575 r576 4150 4150 if (Cmt::get_debug ()) 4151 4151 { 4152 char num[32]; sprintf (num, "% #x", sub_uses[i]);4152 char num[32]; sprintf (num, "%p", sub_uses[i]); 4153 4153 char index[32]; sprintf (index, "%d", sub_uses[i]->m_index); 4154 4154 s += "["; … … 4165 4165 if (Cmt::get_debug ()) 4166 4166 { 4167 char num[32]; sprintf (num, "% #x", au);4167 char num[32]; sprintf (num, "%p", au); 4168 4168 char index[32]; sprintf (index, "%d", au->m_index); 4169 4169 s += "[";
Note: See TracChangeset
for help on using the changeset viewer.