Changeset 576


Ignore:
Timestamp:
May 10, 2011, 2:39:10 PM (13 years ago)
Author:
rybkin
Message:

See C.L. 458

Location:
CMT/HEAD
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/ChangeLog

    r575 r576  
     12011-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       
    1152011-05-04    <rybkin@lal.in2p3.fr> 457
    216

  • CMT/HEAD/mgr/GNUmakefile

    r560 r576  
    2626ifneq ($(wildcard $(cmtexe)),)
    2727all :: 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; }
    2929#       $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt
    3030        $(echo) all ok
    … …  
    4040all :: cmt post_build done
    4141endif
    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; }
    4343#       $(silent)\cd $(bin) && \rm -f cmt && ln -s cmt.exe cmt
    4444        $(echo) all ok

  • CMT/HEAD/mgr/Unix.make

    r560 r576  
    5151endif
    5252
    53 ifeq ($(CMTBIN),Darwin)
     53ifneq (,$(findstring Darwin,$(CMTBIN)))
    5454cpp       = c++ -O2
    5555endif
    … …  
    7979ifneq (,$(findstring i386,$(CMTBIN)))
    8080_mode = 32
    81 else ifneq (,$(findstring i486,$(CMTBIN)))
     81endif
     82ifneq (,$(findstring i486,$(CMTBIN)))
    8283_mode = 32
    83 else ifneq (,$(findstring i586,$(CMTBIN)))
     84endif
     85ifneq (,$(findstring i586,$(CMTBIN)))
    8486_mode = 32
    85 else ifneq (,$(findstring i686,$(CMTBIN)))
     87endif
     88ifneq (,$(findstring i686,$(CMTBIN)))
    8689_mode = 32
    87 else ifneq (,$(findstring x86_64,$(CMTBIN)))
     90endif
     91ifneq (,$(findstring x86_64,$(CMTBIN)))
    8892_mode = 64
    8993endif
    … …  
    107111ifeq ($(_mode),32)
    108112    TARGET_ARCH = -m32
    109 else ifeq ($(_mode),64)
     113endif
     114ifeq ($(_mode),64)
    110115    TARGET_ARCH = -m64
     116endif
     117endif
     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#
     124ifneq (,$(findstring Darwin,$(CMTBIN)))
     125ifeq ($(_mode),32)
     126    TARGET_ARCH = -arch i386
     127endif
     128ifeq ($(_mode),64)
     129    TARGET_ARCH = -arch x86_64
    111130endif
    112131endif
    … …  
    139158format_dependencies = $(CMTROOT)/mgr/cmt_format_deps.sh
    140159build_dependencies = :
    141 else ifneq (,$(findstring Darwin,$(CMTBIN)))
     160endif
     161ifneq (,$(findstring Darwin,$(CMTBIN)))
    142162cppdepflags = -MM
    143163format_dependencies = $(CMTROOT)/mgr/cmt_format_deps.sh

  • CMT/HEAD/mgr/fragments/nmake/constituent

    r547 r576  
    5858#!endif
    5959
     60!if defined (cmt_${CONSTITUENT}_has_target_tag)
     61
    6062!if "$(QUICK)" == "" || !exist ($(cmt_local_${CONSTITUENT}_makefile)) || !exist ($(cmt_local_tagfile_${CONSTITUENT})) || !exist ($(cmt_final_setup_${CONSTITUENT}))
    6163$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
    … …  
    6870!else
    6971$(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
    7086!endif
    7187

  • CMT/HEAD/mgr/fragments/nmake/constituent_lock

    r547 r576  
    5858#!endif
    5959
     60!if defined (cmt_${CONSTITUENT}_has_target_tag)
     61
    6062!if "$(QUICK)" == "" || !exist ($(cmt_local_${CONSTITUENT}_makefile)) || !exist ($(cmt_local_tagfile_${CONSTITUENT})) || !exist ($(cmt_final_setup_${CONSTITUENT}))
    6163$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
    … …  
    6870!else
    6971$(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
    7086!endif
    7187

  • CMT/HEAD/source/cmt_system.cxx

    r569 r576  
    21932193  if (0 == buffer)
    21942194    {
    2195       char num[32]; sprintf (num, "%u", allocated + 1);
     2195      char num[32]; sprintf (num, "%lu", allocated + 1);
    21962196      cmt_string msg ("Cannot allocate ");
    21972197      msg += num;
    … …  
    22742274  if (0 == buffer)
    22752275    {
    2276       char num[32]; sprintf (num, "%u", allocated + 1);
     2276      char num[32]; sprintf (num, "%lu", allocated + 1);
    22772277      cmt_string msg ("Cannot allocate ");
    22782278      msg += num;

  • CMT/HEAD/source/cmt_use.cxx

    r575 r576  
    41504150          if (Cmt::get_debug ())
    41514151            {
    4152               char num[32]; sprintf (num, "%#x", sub_uses[i]);
     4152              char num[32]; sprintf (num, "%p", sub_uses[i]);
    41534153              char index[32]; sprintf (index, "%d", sub_uses[i]->m_index);
    41544154              s += "[";
    … …  
    41654165              if (Cmt::get_debug ())
    41664166                {
    4167                   char num[32]; sprintf (num, "%#x", au);
     4167                  char num[32]; sprintf (num, "%p", au);
    41684168                  char index[32]; sprintf (index, "%d", au->m_index);
    41694169                  s += "[";
Note: See TracChangeset for help on using the changeset viewer.