Changeset 472


Ignore:
Timestamp:
Nov 1, 2008, 9:05:54 PM (16 years ago)
Author:
rybkin
Message:

See C.L. 373

Location:
CMT/HEAD
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/ChangeLog

    r471 r472  
     12008-11-01    <rybkin@lal.in2p3.fr> 373
     2       
     3        * src/NMakefile.header: Do not rebuild any *.nmake or dependencies files
     4        when the NMake QUICK macro is set to a non-empty string
     5        * mgr/fragments/nmake/constituents_header: idem
     6        * mgr/fragments/nmake/constituent: idem
     7        * mgr/fragments/nmake/constituent_lock: idem
     8        * mgr/fragments/nmake/dependencies: idem
     9       
    1102008-11-01    <rybkin@lal.in2p3.fr> 372
    211       

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

    r469 r472  
    1717!endif
    1818
     19!if "$(QUICK)" == ""
     20
    1921!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
    2022!endif
    2123
    2224!if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_final_setup_${CONSTITUENT})] == 0
     25!endif
     26
    2327!endif
    2428
    … …  
    3236!endif
    3337
     38!if "$(QUICK)" == ""
    3439$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs
     40!else
     41$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
     42!endif
    3543        $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
    3644        @set include=$(include)
    … …  
    4351        @set include=$(include)
    4452        @set lib=$(lib)
    45         @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag)
     53        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) QUICK=$(QUICK) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag)
    4654        $(echo) (constituents.nmake) ${CONSTITUENT} done
    4755
    … …  
    5260        @set include=$(include)
    5361        @set lib=$(lib)
    54         @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
     62        @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) QUICK=$(QUICK) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    5563        $(echo) (constituents.nmake) ${CONSTITUENT}clean done
    5664
    … …  
    6169        @set include=$(include)
    6270        @set lib=$(lib)
    63         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles install tag=$(tag)
     71        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) QUICK=$(QUICK) build_strategy=keep_makefiles install tag=$(tag)
    6472        $(echo) (constituents.nmake) install ${CONSTITUENT} done
    6573
    … …  
    7078        @set include=$(include)
    7179        @set lib=$(lib)
    72         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag)
     80        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) QUICK=$(QUICK) build_strategy=keep_makefiles uninstall tag=$(tag)
    7381        $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done
    7482

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

    r469 r472  
    1717!endif
    1818
     19!if "$(QUICK)" == ""
     20
    1921!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
    2022!endif
    2123
    2224!if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_final_setup_${CONSTITUENT})] == 0
     25!endif
     26
    2327!endif
    2428
    … …  
    3236!endif
    3337
     38!if "$(QUICK)" == ""
    3439$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs
     40!else
     41$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
     42!endif
    3543        $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
    3644        @set include=$(include)
    … …  
    4553        @set include=$(include)
    4654        @set lib=$(lib)
    47         @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag) \
     55        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) QUICK=$(QUICK) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag) \
    4856        || ($(unlock_command) ${CONSTITUENT}$(lock_suffix) & exit 1)
    4957        @$(unlock_command) ${CONSTITUENT}$(lock_suffix)
    … …  
    5664        @set include=$(include)
    5765        @set lib=$(lib)
    58         @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
     66        @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) QUICK=$(QUICK) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    5967        $(echo) (constituents.nmake) ${CONSTITUENT}clean done
    6068
    … …  
    6573        @set include=$(include)
    6674        @set lib=$(lib)
    67         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles install tag=$(tag)
     75        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) QUICK=$(QUICK) build_strategy=keep_makefiles install tag=$(tag)
    6876        $(echo) (constituents.nmake) install ${CONSTITUENT} done
    6977
    … …  
    7482        @set include=$(include)
    7583        @set lib=$(lib)
    76         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag)
     84        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) QUICK=$(QUICK) build_strategy=keep_makefiles uninstall tag=$(tag)
    7785        $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done
    7886

  • CMT/HEAD/mgr/fragments/nmake/constituents_header

    r469 r472  
    1414cmt_local_tagfile = $(bin)$(${PACKAGE}_tag).nmake
    1515
     16!if "$(QUICK)" == ""
     17
    1618#!if [$(echo) (constituents.nmake) Rebuilding $(${PACKAGE}_tag).nmake] == 0
    1719!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile)] == 0
    … …  
    2022#!if [cmt build tag_makefile -tag_add=$(tags) >$(${PACKAGE}_tag).nmake] == 0
    2123!if [cmt build tag_makefile -tag_add=$(tags) >$(cmt_local_tagfile)] == 0
     24!endif
     25
    2226!endif
    2327
    … …  
    4549        @if not exist $(src) mkdir $(src)
    4650
     51!if "$(QUICK)" == ""
    4752dirs ::
    4853        @if not exist requirements echo "No requirements file"
    … …  
    5156        @$(cmtexe) -tag=$(tags) show setup   >$(cmt_setup_pid)
    5257        $(echo) setup.nmake ok
     58!else
     59dirs ::
     60        @if not exist requirements echo "No requirements file"
     61        @if not exist $(bin) mkdir $(bin)
     62!endif
    5363
    5464.DEFAULT :

  • CMT/HEAD/mgr/fragments/nmake/dependencies

    r469 r472  
    11#-- start of dependency ------------------
    22
    3 !if defined (QUICK)
    4 !else
     3!if "$(QUICK)" == ""
     4
    55!if exist ("$(CMTROOT)/$(CMTBIN)/cmt.exe")
    66!if [$(build_dependencies) ${CONSTITUENT} -all_sources -out=$(bin)${CONSTITUENT}_dependencies.nmake] == 0
    … …  
    1010!endif
    1111!endif
     12
    1213!endif
    1314

  • CMT/HEAD/src/NMakefile.header

    r469 r472  
    2828build_dependencies = echo
    2929
    30 all :: check_config
     30!if "$(QUICK)" == ""
     31all :: check_config ;
     32!else
     33all :: ;
     34!endif
    3135
    3236check_config ::
    … …  
    6266!ENDIF
    6367
     68!if "$(QUICK)" == ""
    6469!if [$(cmtexe) -tag=$(tags) build constituents_makefile -out=$(cmt_constituents_makefile)] == 0
     70!endif
    6571!endif
    6672
Note: See TracChangeset for help on using the changeset viewer.