Changeset 445


Ignore:
Timestamp:
Feb 21, 2008, 5:59:30 PM (16 years ago)
Author:
rybkin
Message:

See C.L. 349

Location:
CMT/HEAD
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/ChangeLog

    r444 r445  
     12008-02-21    <rybkin@lal.in2p3.fr> 349
     2       
     3        * src/NMakefile.core: Control the verbosity of NMake (similar to Make, see below)
     4        * src/NMakefile.header: idem
     5        * mgr/fragments/nmake/constituents_header: idem
     6        * mgr/fragments/nmake/group: idem
     7        * mgr/fragments/nmake/constituent: idem, correct the passing of NMake options
     8        * mgr/fragments/nmake/constituent_lock: idem, correct the passing of NMake options
     9        * mgr/fragments/nmake/constituents_trailer: idem
     10        * mgr/fragments/nmake/application_header: idem
     11        * mgr/fragments/nmake/application: idem
     12        * mgr/fragments/nmake/library_header: idem
     13        * mgr/fragments/nmake/library: idem
     14        * mgr/fragments/nmake/library_no_share: idem
     15        * mgr/fragments/nmake/c: idem
     16        * mgr/fragments/nmake/c_library: idem
     17        * mgr/fragments/nmake/cpp: idem
     18        * mgr/fragments/nmake/cpp_library: idem
     19        * mgr/fragments/nmake/fortran: idem
     20        * mgr/fragments/nmake/fortran_library: idem
     21        * mgr/fragments/nmake/java_header: idem
     22        * mgr/fragments/nmake/jar_header: idem
     23        * mgr/fragments/nmake/jar: idem
     24        * mgr/fragments/nmake/installer: idem
     25        * mgr/cmt_install_action.bat: idem
     26        * mgr/cmt_uninstall_action.bat: idem
     27        * mgr/fragments/library: Improve control of the verbosity of Make
     28        * mgr/fragments/jar_header: idem
     29        * mgr/fragments/installer: idem
     30       
    1312008-02-18    <rybkin@lal.in2p3.fr> 348
    232       

  • CMT/HEAD/mgr/VisualC.nmake

    r96 r445  
    11CMT_tag=$(tag)
     2CMT_root=Z:\user\g\grybkine\maxidisk\Labs\devel\CMT\HEAD
    23CMTVERSION=HEAD
    34cmt_hardware_query_command=uname -m
    … …  
    4647mgr=..\mgr\
    4748application_suffix=.exe
    48 lock_command=attrib /S /D +R ..\*
    49 unlock_command=attrib /S /D -R ..\*
     49lock_command=$(CMTROOT)\mgr\cmt_lockfile.bat 
     50unlock_command=rmdir 
     51lock_name=cmt
     52lock_suffix=.lock
     53lock_file=$(lock_name)$(lock_suffix)
    5054MAKEFLAGS= --no-print-directory 
    5155gmake_hosts=lx1 rsplus lxtest as7 dxplus ax7 hp2 aleph hp1 hpplus papou1-fe atlas
    … …  
    7882javabin=..\classes\
    7983mgrdir=mgr
    80 cmt_installarea_paths=$(cmt_installarea_prefix)/$(tag)/bin $(cmt_installarea_prefix)/$(tag)/lib $(cmt_installarea_prefix)/share/lib $(cmt_installarea_prefix)/share/bin
     84cmt_installarea_paths= $(cmt_installarea_prefix)/$(CMTCONFIG)/bin
    8185use_linkopts= $(cmt_installarea_linkopts) 
    8286cmt_use_linkopts=  $(CMT_linkopts) 

  • CMT/HEAD/mgr/cmt_dependencies.nmake

    r79 r445  
    22cmt_awk_cxx_dependencies = "..\source\cmt_awk.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_regexp.h" "..\source\cmt_awk.h" "..\source\cmt_vector.h" "..\source\cmt_system.h"
    33cmt_branch_cxx_dependencies = "..\source\cmt_branch.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
    4 cmt_constituent_cxx_dependencies = "..\source\cmt_constituent.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_branch.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
    5 cmt_deps_builder_cxx_dependencies = "..\source\cmt_deps_builder.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_deps_builder.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_log.h"
     4cmt_constituent_cxx_dependencies = "..\source\cmt_constituent.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_branch.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
     5cmt_deps_builder_cxx_dependencies = "..\source\cmt_deps_builder.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_deps_builder.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_log.h"
    66cmt_fragment_cxx_dependencies = "..\source\cmt_fragment.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_branch.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
    7 cmt_generator_cxx_dependencies = "..\source\cmt_generator.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_generators.h"
     7cmt_generator_cxx_dependencies = "..\source\cmt_generator.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_generators.h"
    88cmt_include_cxx_dependencies = "..\source\cmt_include.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_map.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_log.h"
    99cmt_parser_cxx_dependencies = "..\source\cmt_parser.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_version.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_error.h" "..\source\cmt_cvs.h" "..\source\cmt_lock.h" "..\source\cmt_triggers.h" "..\source\cmt_model.h" "..\source\cmt_syntax.h" "..\source\cmt_install_area.h" "..\source\cmt_sequence.h" "..\source\cmt_log.h" "..\source\cmt_commands.h"
    1010cmt_script_cxx_dependencies = "..\source\cmt_script.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_script.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h"
    1111cmt_string_cxx_dependencies = "..\source\cmt_string.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h"
    12 cmt_system_cxx_dependencies = "..\source\cmt_system.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_error.h"
     12cmt_system_cxx_dependencies = "..\source\cmt_system.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_error.h" "..\source\cmt_map.h"
    1313cmt_tag_cxx_dependencies = "..\source\cmt_tag.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_log.h"
    1414cmt_use_cxx_dependencies = "..\source\cmt_use.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_error.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_syntax.h"
    … …  
    2424cmt_regexp_cxx_dependencies = "..\source\cmt_regexp.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_regexp.h" "..\source\cmt_vector.h" "..\source\cmt_system.h"
    2525cmt_model_cxx_dependencies = "..\source\cmt_model.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_model.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h"
    26 cmt_project_cxx_dependencies = "..\source\cmt_project.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_syntax.h" "..\source\cmt_error.h"
     26cmt_project_cxx_dependencies = "..\source\cmt_project.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_syntax.h" "..\source\cmt_error.h"
    2727cmt_syntax_cxx_dependencies = "..\source\cmt_syntax.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_syntax.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_error.h" "..\source\cmt_branch.h" "..\source\cmt_language.h" "..\source\cmt_cmtpath_pattern.h"
    2828cmt_install_area_cxx_dependencies = "..\source\cmt_install_area.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_parser.h" "..\source\cmt.h" "..\source\cmt_install_area.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_syntax.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_cmtpath_pattern.h"
    2929cmt_cmtpath_pattern_cxx_dependencies = "..\source\cmt_cmtpath_pattern.cxx" "..\source\cmt_vector.h" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_syntax.h"
    3030cmt_sequence_cxx_dependencies = "..\source\cmt_sequence.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_regexp.h" "..\source\cmt_awk.h" "..\source\cmt_sequence.h" "..\source\cmt_vector.h" "..\source\cmt_system.h"
    31 cmt_generators_cxx_dependencies = "..\source\cmt_generators.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_generators.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_log.h"
     31cmt_generators_cxx_dependencies = "..\source\cmt_generators.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_generators.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_log.h"
    3232cmt_scope_section_cxx_dependencies = "..\source\cmt_scope_section.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_scope_section.h"
    3333cmt_log_cxx_dependencies = "..\source\cmt_log.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_log.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h"

  • CMT/HEAD/mgr/cmt_install_action.bat

    r11 r445  
    2727if NOT exist %install_dir% echo "Cannot install file %file_name%, no installation directory specified" & exit /B 0
    2828
    29 echo Installing file %file_name% into %install_dir%
     29rem echo Installing file %file_name% into %install_dir%
    3030
    3131if exist %dest_file_path% del %dest_file_path%

  • CMT/HEAD/mgr/cmt_uninstall_action.bat

    r79 r445  
    2626if NOT exist %install_dir% echo "Cannot uninstall file %file_name%, no installation directory" & exit /B 0
    2727
    28 echo Removing file %file_name% from %install_dir%
     28rem echo Removing file %file_name% from %install_dir%
    2929
    3030if exist %dest_file_path% del %dest_file_path%

  • CMT/HEAD/mgr/fragments/installer

    r441 r445  
    44
    55${install_dir}/${NAME}${FILESUFFIX} : ${FULLNAME}
     6        $(install_echo) $(@F) into $(@D)
    67        $(install_silent) if test ! -d "${install_dir}" ; then mkdir -p ${install_dir}; fi
    78        $(install_silent) ${install_command} ${FULLNAME} ${install_dir}/${NAME}${FILESUFFIX}

  • CMT/HEAD/mgr/fragments/jar_header

    r11 r445  
    22
    33${CONSTITUENT}javadirs ::
    4         @if test ! -d $(javabin)/${CONSTITUENT} ; then $(mkdir) -p $(javabin)${CONSTITUENT} ; fi
     4        $(silent) if test ! -d $(javabin)/${CONSTITUENT} ; then $(mkdir) -p $(javabin)${CONSTITUENT} ; fi
    55
    66${CONSTITUENT} :: ${CONSTITUENT}javadirs $(javabin)${CONSTITUENT}.jar
    7         @/bin/echo ${CONSTITUENT} ok
    8 
     7        $(echo) "${CONSTITUENT} ok"
    98
    109#-- end of jar_header ------

  • CMT/HEAD/mgr/fragments/library

    r442 r445  
    3232
    3333$(${CONSTITUENT}shstamp) :: $(${CONSTITUENT}libname).$(shlibsuffix)
    34         @if test -f $(${CONSTITUENT}libname).$(shlibsuffix) ; then cat /dev/null >$(${CONSTITUENT}shstamp) ; fi
     34        $(lib_silent) if test -f $(${CONSTITUENT}libname).$(shlibsuffix) ; then cat /dev/null >$(${CONSTITUENT}shstamp) ; fi
    3535
    3636${CONSTITUENT}clean ::

  • CMT/HEAD/mgr/fragments/nmake/application

    r353 r445  
    11
    22$(bin)${CONSTITUENT}$(application_suffix) :: ${OBJS} $(use_stamps) $(${CONSTITUENT}stamps) requirements $(use_requirements)
    3         $(link_echo) $@
     3        $(link_echo) application $@
    44        $(link_silent) ${LINKMACRO} /out:$(bin)${CONSTITUENT}$(application_suffix) @<<
    55${OBJS}
    … …  
    1818
    1919${CONSTITUENT}install :: $(install_dir)\$(${CONSTITUENT}installname)
    20         @if NOT "$(CMTINSTALLAREA)"=="" echo "installation done"
     20!if "$(CMTINSTALLAREA)" != ""
     21        $(echo) "installation done"
     22!endif
    2123
    2224$(install_dir)\$(${CONSTITUENT}installname) :: $(bin)$(${CONSTITUENT}installname)
    23         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     25!if "$(CMTINSTALLAREA)" != ""
     26        $(install_echo) $(@F) into $(@D)
     27        $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     28!endif
    2429
    2530${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    … …  
    2833
    2934${CONSTITUENT}uninstall ::
    30         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     35!if "$(CMTINSTALLAREA)" != ""
     36        $(cleanup_echo) "$(${CONSTITUENT}installname)" from "$(install_dir)"
     37        $(cleanup_silent) $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     38!endif
    3139

  • CMT/HEAD/mgr/fragments/nmake/application_header

    r11 r445  
    11
    22${CONSTITUENT} :: dirs ${PROTOTARGET} $(bin)${CONSTITUENT}$(application_suffix)
    3         @echo "------> ${CONSTITUENT} ok"
     3        $(echo) "${CONSTITUENT} ok"
    44
    55

  • CMT/HEAD/mgr/fragments/nmake/c

    r11 r445  
    22
    33$(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies)
    4         $(c_echo) $@
    5         @if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
     4        $(c_echo) ${FULLNAME}
     5        $(c_silent) if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
    66        $(c_silent) $(ccomp) /Fo$(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj  /Fd$(bin)${CONSTITUENT}\ $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(app_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(app_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
    77

  • CMT/HEAD/mgr/fragments/nmake/c_library

    r11 r445  
    22
    33$(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies)
    4         $(c_echo) $@
    5         @if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
     4        $(c_echo) ${FULLNAME}
     5        $(c_silent) if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
    66        $(c_silent) $(ccomp) /Fo$(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj  /Fd$(bin)${CONSTITUENT}\ $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(lib_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(lib_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
    77

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

    r98 r445  
    3131
    3232$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs
    33         @echo (constituents.nmake) Building ${CONSTITUENT}.nmake
     33        $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
    3434        @set include=$(include)
    3535        @set lib=$(lib)
    3636        @$(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile ${CONSTITUENT}
    3737        @move ${CONSTITUENT}.nmake $(bin)
    38         @echo (constituents.nmake) ${CONSTITUENT}.nmake done
     38        $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
    3939
    4040${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    41         @echo (constituents.nmake) Starting ${CONSTITUENT}
     41        $(echo) (constituents.nmake) Starting ${CONSTITUENT}
    4242        @set include=$(include)
    4343        @set lib=$(lib)
    44         @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag)
    45         @echo (constituents.nmake) ${CONSTITUENT} done
     44        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag)
     45        $(echo) (constituents.nmake) ${CONSTITUENT} done
    4646
    4747clean :: ${CONSTITUENT}clean
    4848
    4949${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
    50         @echo (constituents.nmake) Starting ${CONSTITUENT}clean
     50        $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean
    5151        @set include=$(include)
    5252        @set lib=$(lib)
    53         @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    54         @echo (constituents.nmake) ${CONSTITUENT}clean done
     53        @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
     54        $(echo) (constituents.nmake) ${CONSTITUENT}clean done
    5555
    5656install :: ${CONSTITUENT}install
    5757
    5858${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    59         @echo (constituents.nmake) Starting install ${CONSTITUENT}
     59        $(echo) (constituents.nmake) Starting install ${CONSTITUENT}
    6060        @set include=$(include)
    6161        @set lib=$(lib)
    62         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) build_strategy=keep_makefiles install tag=$(tag)
    63         @echo (constituents.nmake) install ${CONSTITUENT} done
     62        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles install tag=$(tag)
     63        $(echo) (constituents.nmake) install ${CONSTITUENT} done
    6464
    6565uninstall :: ${CONSTITUENT}uninstall
    6666
    6767${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    68         @echo (constituents.nmake) Starting uninstall ${CONSTITUENT}"
     68        $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}"
    6969        @set include=$(include)
    7070        @set lib=$(lib)
    71         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) build_strategy=keep_makefiles uninstall tag=$(tag)
    72         @echo (constituents.nmake) uninstall ${CONSTITUENT} done
     71        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles uninstall tag=$(tag)
     72        $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done
    7373
    7474#-- end of constituent ------

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

    r429 r445  
    3131
    3232$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs
    33         @echo (constituents.nmake) Building ${CONSTITUENT}.nmake
     33        $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
    3434        @set include=$(include)
    3535        @set lib=$(lib)
    3636        @$(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile ${CONSTITUENT}
    3737        @move ${CONSTITUENT}.nmake $(bin)
    38         @echo (constituents.nmake) ${CONSTITUENT}.nmake done
     38        $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
    3939
    4040${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    41         @echo "------> (constituents.make) Creating ${CONSTITUENT}$(lock_suffix)"
     41        $(echo) (constituents.make) Creating ${CONSTITUENT}$(lock_suffix)
    4242        @$(lock_command) ${CONSTITUENT}$(lock_suffix)
    43         @echo (constituents.nmake) Starting ${CONSTITUENT}
     43        $(echo) (constituents.nmake) Starting ${CONSTITUENT}
    4444        @set include=$(include)
    4545        @set lib=$(lib)
    46         @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag) \
     46        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag) \
    4747        || ($(unlock_command) ${CONSTITUENT}$(lock_suffix) & exit 1)
    4848        @$(unlock_command) ${CONSTITUENT}$(lock_suffix)
    49         @echo (constituents.nmake) ${CONSTITUENT} done
     49        $(echo) (constituents.nmake) ${CONSTITUENT} done
    5050
    5151clean :: ${CONSTITUENT}clean
    5252
    5353${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
    54         @echo (constituents.nmake) Starting ${CONSTITUENT}clean
     54        $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean
    5555        @set include=$(include)
    5656        @set lib=$(lib)
    57         @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    58         @echo (constituents.nmake) ${CONSTITUENT}clean done
     57        @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
     58        $(echo) (constituents.nmake) ${CONSTITUENT}clean done
    5959
    6060install :: ${CONSTITUENT}install
    6161
    6262${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    63         @echo (constituents.nmake) Starting install ${CONSTITUENT}
     63        $(echo) (constituents.nmake) Starting install ${CONSTITUENT}
    6464        @set include=$(include)
    6565        @set lib=$(lib)
    66         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) build_strategy=keep_makefiles install tag=$(tag)
    67         @echo (constituents.nmake) install ${CONSTITUENT} done
     66        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles install tag=$(tag)
     67        $(echo) (constituents.nmake) install ${CONSTITUENT} done
    6868
    6969uninstall :: ${CONSTITUENT}uninstall
    7070
    7171${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    72         @echo (constituents.nmake) Starting uninstall ${CONSTITUENT}"
     72        $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}"
    7373        @set include=$(include)
    7474        @set lib=$(lib)
    75         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) $(MAKEFLAGS) build_strategy=keep_makefiles uninstall tag=$(tag)
    76         @echo (constituents.nmake) uninstall ${CONSTITUENT} done
     75        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles uninstall tag=$(tag)
     76        $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done
    7777
    7878#-- end of constituent_lock ------

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

    r11 r445  
    1212${PACKAGE}_tag = $(tag)
    1313
    14 !if [echo (constituents.nmake) Rebuilding $(${PACKAGE}_tag).nmake] == 0
     14!if [$(echo) (constituents.nmake) Rebuilding $(${PACKAGE}_tag).nmake] == 0
    1515!endif
    1616
    … …  
    4242dirs ::
    4343        @if not exist requirements echo "No requirements file"
    44         @echo (constituents.nmake) Rebuilding setup.nmake
     44        $(echo) (constituents.nmake) Rebuilding setup.nmake
    4545        @if not exist $(bin) mkdir $(bin)
    4646        @$(cmtexe) -quiet -tag=$(tags) show setup   >$(cmt_setup_pid)
    47         @echo setup.nmake ok
     47        $(echo) setup.nmake ok
    4848
    4949.DEFAULT :
    50         @echo "???"
     50        $(echo) "???"
    5151

  • CMT/HEAD/mgr/fragments/nmake/constituents_trailer

    r95 r445  
    33
    44remove_library_links ::
    5         @echo "Removing library links"
     5        $(echo) "Removing library links"
    66        @$(remove_library_links)
    77

  • CMT/HEAD/mgr/fragments/nmake/cpp

    r11 r445  
    22
    33$(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies)
    4         $(cpp_echo) $@
    5         @if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
     4        $(cpp_echo) ${FULLNAME}
     5        $(cpp_silent) if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
    66        $(cpp_silent) $(cppcomp) /Fo$(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj  /Fd$(bin)${CONSTITUENT}\ $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(app_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(app_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} /Tp${FULLNAME}
    77

  • CMT/HEAD/mgr/fragments/nmake/cpp_library

    r11 r445  
    22
    33$(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies)
    4         $(cpp_echo) $@
    5         @if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
     4        $(cpp_echo) ${FULLNAME}
     5        $(cpp_silent) if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
    66        $(cpp_silent) $(cppcomp) /Fo$(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj  /Fd$(bin)${CONSTITUENT}\ $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(lib_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(lib_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} /Tp${FULLNAME}
    77

  • CMT/HEAD/mgr/fragments/nmake/fortran

    r11 r445  
    22
    33$(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies)
    4         $(fortran_echo) $@
    5         @if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
     4        $(fortran_echo) ${FULLNAME}
     5        $(fortran_silent) if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
    66        $(fortran_silent) $(fcomp) /object:"$(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj" $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(app_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(app_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
    77

  • CMT/HEAD/mgr/fragments/nmake/fortran_library

    r11 r445  
    22
    33$(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies)
    4         $(fortran_echo) $@
    5         @if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
     4        $(fortran_echo) ${FULLNAME}
     5        $(fortran_silent) if not exist $(bin)${CONSTITUENT} mkdir $(bin)${CONSTITUENT}
    66        $(fortran_silent) $(fcomp) /object:"$(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj" $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(lib_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(lib_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
    77

  • CMT/HEAD/mgr/fragments/nmake/group

    r325 r445  
    33
    44${GROUP} ::  $(${GROUP}_pre_constituents)  $(${GROUP}_constituents)  $(${GROUP}_post_constituents)
    5         @echo " ${GROUP} ok."
     5        $(echo) " ${GROUP} ok."
    66
    77clean :: allclean
    88
    99${GROUP}clean ::  $(${GROUP}_constituentsclean)
    10         @echo $(${GROUP}_constituentsclean)
    11         @echo " ${GROUP}clean ok."
     10        $(echo) $(${GROUP}_constituentsclean)
     11        $(echo) " ${GROUP}clean ok."
    1212
    1313${GROUP}clean :: makefilesclean

  • CMT/HEAD/mgr/fragments/nmake/installer

    r11 r445  
    1 
     1#-- start of installer ------
    22
    33${CONSTITUENT} :: $(install_dir)${NAME}${FILESUFFIX}
    44
    55$(install_dir)${NAME}${FILESUFFIX} : ${FULLNAME}
    6         @if NOT exist $(install_dir) mkdir $(install_dir)
    7         @$(install_command) ${FULLNAME} $(install_dir)
     6        $(install_echo) $(@F) into $(@D)
     7        $(install_silent) if NOT exist $(install_dir) mkdir $(install_dir)
     8        $(install_silent) $(install_command) ${FULLNAME} $(install_dir)
    89
    910${CONSTITUENT}clean ::
    10         @if exist $(install_dir)\${NAME}${FILESUFFIX} $(uninstall_command) $(install_dir)\${NAME}${FILESUFFIX}
     11        $(cleanup_silent) if exist $(install_dir)\${NAME}${FILESUFFIX} $(uninstall_command) $(install_dir)\${NAME}${FILESUFFIX}
    1112
     13#-- end of installer ------

  • CMT/HEAD/mgr/fragments/nmake/jar

    r11 r445  
     1#-- start of jar ------
    12
    23$(javabin)${CONSTITUENT}.jar :: ${OBJS}
    34        $(java_echo) $@
    4         cd $(javabin)${CONSTITUENT}
    5         $(jar) cvf ..\${CONSTITUENT}.jar *
     5        $(java_silent) cd $(javabin)${CONSTITUENT}
     6        $(java_silent) $(jar) cvf ..\${CONSTITUENT}.jar *
    67
    78install_dir = $(CMTINSTALLAREA)\share\lib
    … …  
    1314
    1415${CONSTITUENT}install :: $(install_dir)\$(${CONSTITUENT}installname)
    15         @if NOT "$(CMTINSTALLAREA)"=="" echo "installation done"
     16!if "$(CMTINSTALLAREA)" != ""
     17        $(echo) "installation done"
     18!endif
    1619
    1720$(install_dir)\$(${CONSTITUENT}installname) :: $(javabin)$(${CONSTITUENT}installname)
    18         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_install_action) "$(PACKAGE_ROOT)\classes" "$(${CONSTITUENT}installname)" "$(install_dir)"
     21!if "$(CMTINSTALLAREA)" != ""
     22        $(install_echo) $(@F) into $(@D)
     23        $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\classes" "$(${CONSTITUENT}installname)" "$(install_dir)"
     24!endif
    1925
    2026${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    … …  
    2329
    2430${CONSTITUENT}uninstall ::
    25         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_uninstall_action) "$(PACKAGE_ROOT)\classes" "$(${CONSTITUENT}installname)" "$(install_dir)"
     31!if "$(CMTINSTALLAREA)" != ""
     32        $(cleanup_echo) "$(${CONSTITUENT}installlibname)" from "$(install_dir)"
     33        $(cleanup_silent) $(cmt_uninstall_action) "$(PACKAGE_ROOT)\classes" "$(${CONSTITUENT}installname)" "$(install_dir)"
     34!endif
    2635
    2736${CONSTITUENT}clean ::
    28         if exist $(javabin)\${CONSTITUENT} rmdir /Q /S $(javabin)\${CONSTITUENT}
    29         if exist $(javabin)\${CONSTITUENT}.jar del $(javabin)\${CONSTITUENT}.jar
     37        $(cleanup_silent) if exist $(javabin)\${CONSTITUENT} rmdir /Q /S $(javabin)\${CONSTITUENT}
     38        $(cleanup_silent) if exist $(javabin)\${CONSTITUENT}.jar del $(javabin)\${CONSTITUENT}.jar
    3039
    31 
    32 
     40#-- end of jar ------

  • CMT/HEAD/mgr/fragments/nmake/jar_header

    r11 r445  
     1#-- start of jar_header ------
    12
    23${CONSTITUENT}javadirs ::
    3         @if test ! -d $(javabin)/${CONSTITUENT} ; then $(mkdir) -p $(javabin)${CONSTITUENT} ; fi
     4        $(silent) if not exist $(javabin)${CONSTITUENT} mkdir $(javabin)${CONSTITUENT}
     5
    46
    57${CONSTITUENT} :: ${CONSTITUENT}javadirs $(javabin)${CONSTITUENT}.jar
    6         @echo ${CONSTITUENT} ok
     8        $(echo) "${CONSTITUENT} ok"
    79
     10#-- end of jar_header ------

  • CMT/HEAD/mgr/fragments/nmake/java_header

    r11 r445  
     1#-- start of java_header ------
    12
    23${CONSTITUENT}javadirs ::
    3         @if not exist $(javabin)${CONSTITUENT} mkdir $(javabin)${CONSTITUENT}
     4        $(silent) if not exist $(javabin)${CONSTITUENT} mkdir $(javabin)${CONSTITUENT}
    45
    56${CONSTITUENT} :: ${CONSTITUENT}javadirs $(javabin)${CONSTITUENT}.jar
    6         @echo "------> ${CONSTITUENT} ok"
     7        $(echo) "${CONSTITUENT} ok"
    78
    89$(javabin)${CONSTITUENT}.jar :: ${OBJS}
    … …  
    2021
    2122${CONSTITUENT}install :: $(install_dir)\$(${CONSTITUENT}installname)
    22         @if NOT "$(CMTINSTALLAREA)"=="" echo "installation done"
     23!if "$(CMTINSTALLAREA)" != ""
     24        $(echo) "installation done"
     25!endif
    2326
    2427$(install_dir)\$(${CONSTITUENT}installname) :: $(javabin)$(${CONSTITUENT}installname)
    25         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_install_action) "$(PACKAGE_ROOT)\classes" "$(${CONSTITUENT}installname)" "$(install_dir)"
     28!if "$(CMTINSTALLAREA)" != ""
     29        $(install_echo) $(@F) into $(@D)
     30        $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\classes" "$(${CONSTITUENT}installname)" "$(install_dir)"
     31!endif
    2632
    2733${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    … …  
    3036
    3137${CONSTITUENT}uninstall ::
    32         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_uninstall_action) "$(PACKAGE_ROOT)\classes" "$(${CONSTITUENT}installname)" "$(install_dir)"
     38!if "$(CMTINSTALLAREA)" != ""
     39        $(cleanup_echo) "$(${CONSTITUENT}installlibname)" from "$(install_dir)"
     40        $(cleanup_silent) $(cmt_uninstall_action) "$(PACKAGE_ROOT)\classes" "$(${CONSTITUENT}installname)" "$(install_dir)"
     41!endif
    3342
    3443
    3544${CONSTITUENT}clean ::
    36         if exist $(javabin)\${CONSTITUENT} rmdir /Q /S $(javabin)\${CONSTITUENT}
    37         if exist $(javabin)\${CONSTITUENT}.jar del $(javabin)\${CONSTITUENT}.jar
     45        $(cleanup_silent) if exist $(javabin)\${CONSTITUENT} rmdir /Q /S $(javabin)\${CONSTITUENT}
     46        $(cleanup_silent) if exist $(javabin)\${CONSTITUENT}.jar del $(javabin)\${CONSTITUENT}.jar
     47
     48#-- end of java_header ------

  • CMT/HEAD/mgr/fragments/nmake/library

    r11 r445  
    11
    22${CONSTITUENT}LIB :: $(${CONSTITUENT}shstamp)
    3         @echo "------> ${CONSTITUENT} : library ok"
     3        $(echo) "${CONSTITUENT} : library ok"
    44
    55$(${CONSTITUENT}arc) :: ${OBJS}
    … …  
    88${OBJS}
    99<<
    10         echo "" >$(${CONSTITUENT}stamp)
     10        $(lib_silent) echo "" >$(${CONSTITUENT}stamp)
    1111
    1212$(${CONSTITUENT}shstamp) :: $(${CONSTITUENT}arc) requirements $(use_requirements) $(${CONSTITUENT}stamps)
    13         $(make_shlib) $(tag) ${CONSTITUENT} $(cpplinkflags) $(${CONSTITUENT}_shlibflags)
    14         if exist $(bin)${CONSTITUENT}.dll echo "" >$(${CONSTITUENT}shstamp)
     13        $(lib_echo) dynamic library $(bin)${CONSTITUENT}.dll
     14        $(lib_silent) $(make_shlib) $(tag) ${CONSTITUENT} $(cpplinkflags) $(${CONSTITUENT}_shlibflags)
     15        $(lib_silent) if exist $(bin)${CONSTITUENT}.dll echo "" >$(${CONSTITUENT}shstamp)
    1516
    1617${CONSTITUENT}clean ::
    … …  
    3637!IF "$(vsCONFIG)" == "Debug"
    3738${CONSTITUENT}install :: $(${CONSTITUENT}shstamp) $(install_dir)\$(${CONSTITUENT}installlibname) $(install_dir)\$(${CONSTITUENT}installdllname) $(install_dir)\$(${CONSTITUENT}installpdbname)
    38         @if NOT "$(CMTINSTALLAREA)"=="" echo "installation done"
     39!if "$(CMTINSTALLAREA)" != ""
     40        $(echo) "installation done"
     41!endif
    3942
    4043!ELSE
    4144
    4245${CONSTITUENT}install :: $(${CONSTITUENT}shstamp) $(install_dir)\$(${CONSTITUENT}installlibname) $(install_dir)\$(${CONSTITUENT}installdllname)
    43         @if NOT "$(CMTINSTALLAREA)"=="" echo "installation done"
     46!if "$(CMTINSTALLAREA)" != ""
     47        $(echo) "installation done"
     48!endif
    4449!ENDIF
    4550
    4651$(install_dir)\$(${CONSTITUENT}installlibname) :: $(bin)$(${CONSTITUENT}installlibname)
    47         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
     52!if "$(CMTINSTALLAREA)" != ""
     53        $(install_echo) $(@F) into $(@D)
     54        $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
     55!endif
    4856
    4957$(install_dir)\$(${CONSTITUENT}installdllname) :: $(bin)$(${CONSTITUENT}installdllname)
    50         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
     58!if "$(CMTINSTALLAREA)" != ""
     59        $(install_echo) $(@F) into $(@D)
     60        $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
     61!endif
    5162
    5263$(install_dir)\$(${CONSTITUENT}installpdbname) :: $(bin)$(${CONSTITUENT}installpdbname)
    53         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installpdbname)" "$(install_dir)"
     64!if "$(CMTINSTALLAREA)" != ""
     65        $(install_echo) $(@F) into $(@D)
     66        $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installpdbname)" "$(install_dir)"
     67!endif
    5468
    5569${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    … …  
    5872
    5973${CONSTITUENT}uninstall ::
    60         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
    61         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
     74!if "$(CMTINSTALLAREA)" != ""
     75        $(cleanup_echo) "$(${CONSTITUENT}installlibname)" from "$(install_dir)"
     76        $(cleanup_silent) $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
     77        $(cleanup_echo) "$(${CONSTITUENT}installdllname)" from "$(install_dir)"
     78        $(cleanup_silent) $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
     79!endif
    6280
    63 
    64 
    65 

  • CMT/HEAD/mgr/fragments/nmake/library_header

    r11 r445  
    66
    77${CONSTITUENT} :: dirs ${PROTOTARGET} ${CONSTITUENT}LIB
    8         @echo "------> ${CONSTITUENT} ok"
     8        $(echo) "${CONSTITUENT} ok"
    99

  • CMT/HEAD/mgr/fragments/nmake/library_no_share

    r11 r445  
    11
    22${CONSTITUENT}LIB :: $(${CONSTITUENT}lib)
    3         @echo "------> ${CONSTITUENT} : library ok"
     3        $(echo) "${CONSTITUENT} : library ok"
    44
    55$(${CONSTITUENT}lib) :: ${OBJS}
    … …  
    88${OBJS}
    99<<
    10         @echo "" >$(${CONSTITUENT}stamp)
     10        $(lib_silent) echo "" >$(${CONSTITUENT}stamp)
    1111
    1212${CONSTITUENT}clean ::
    … …  
    2323
    2424${CONSTITUENT}install :: $(install_dir)\$(${CONSTITUENT}installname)
    25         @if NOT "$(CMTINSTALLAREA)"=="" echo "installation done"
     25!if "$(CMTINSTALLAREA)" != ""
     26        $(echo) "installation done"
     27!endif
    2628
    2729$(install_dir)\$(${CONSTITUENT}installname) :: $(bin)$(${CONSTITUENT}installname)
    28         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     30!if "$(CMTINSTALLAREA)" != ""
     31        $(install_echo) $(@F) into $(@D)
     32        $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     33!endif
    2934
    3035${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    … …  
    3338
    3439${CONSTITUENT}uninstall ::
    35         @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     40!if "$(CMTINSTALLAREA)" != ""
     41        $(cleanup_echo) "$(${CONSTITUENT}installname)" from "$(install_dir)"
     42        $(cleanup_silent) (cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     43!endif
    3644
    37 
    38 
    39 

  • CMT/HEAD/src/NMakefile.core

    r11 r445  
    4141#
    4242
    43 !if defined (QUIET)
    44 LEX_QUIET = 1
    45 YACC_QUIET = 1
    46 C_QUIET = 1
    47 CPP_QUIET = 1
    48 FORTRAN_QUIET = 1
    49 JAVA_QUIET = 1
    50 LINK_QUIET = 1
    51 LIB_QUIET = 1
    52 CLEANUP_QUIET = 1
    53 silent = @
    54 echo = @echo
    55 !else
    56 silent =
    57 echo = echo
     43# default settings
     44#   o print CMT messages
     45#   o do not echo Make commands
     46cmtmsg = 1
     47!undef makecmd
     48
     49# parse all the switches
     50!ifdef SILENT
     51!undef cmtmsg
     52!undef makecmd
    5853!endif
    5954
    60 !if defined (LEX_QUIET)
    61 lex_silent = @
    62 lex_echo = @echo rebuilding
    63 !else
    64 lex_silent =
    65 lex_echo = -@ $(echo)
     55!ifdef ECHO
     56!undef cmtmsg
     57makecmd = 1
    6658!endif
    6759
    68 !if defined (YACC_QUIET)
    69 yacc_silent = @
    70 yacc_echo = @echo rebuilding
    71 !else
    72 yacc_silent =
    73 yacc_echo = -@ $(echo)
     60!ifdef QUIET
     61cmtmsg = 1
     62!undef makecmd
    7463!endif
    7564
    76 !if defined (C_QUIET)
    77 c_silent = @
    78 c_echo = @echo rebuilding
    79 !else
    80 c_silent =
    81 c_echo = -@ $(echo)
     65!ifdef VERBOSE
     66cmtmsg = 1
     67makecmd = 1
    8268!endif
    8369
    84 !if defined (CPP_QUIET)
    85 cpp_silent = @
    86 cpp_echo = @echo rebuilding
    87 !else
    88 cpp_silent =
    89 cpp_echo = -@ $(echo)
     70# set the relevant Make variables
     71!ifndef CMTMSGHDR
     72CMTMSGHDR = ^#CMT--->
     73#export CMTMSGHDR
    9074!endif
    9175
    92 !if defined (FORTRAN_QUIET)
    93 fortran_silent = @
    94 fortran_echo = @echo rebuilding
     76!ifdef cmtmsg
     77#export cmtmsg
     78echo = @ echo "$(CMTMSGHDR)"
    9579!else
    96 fortran_silent =
    97 fortran_echo = -@ $(echo)
     80#echo = @:
     81echo = @rem
    9882!endif
    9983
    100 !if defined (JAVA_QUIET)
    101 java_silent = @
    102 java_echo = @echo rebuilding
     84!ifdef makecmd
     85silent =
    10386!else
    104 java_silent =
    105 java_echo = -@ $(echo)
     87silent = @
     88#MAKEFLAGS += --silent
     89!CMDSWITCHES +S
    10690!endif
    10791
    108 !if defined (LINK_QUIET)
    109 link_silent = @
    110 link_echo = @echo rebuilding
    111 !else
    112 link_silent =
    113 link_echo = -@ $(echo)
    114 !endif
     92lex_echo = $(echo) building
     93lex_silent = $(silent)
     94yacc_echo = $(echo) building
     95yacc_silent = $(silent)
     96c_echo = $(echo) compiling
     97c_silent = $(silent)
     98cpp_echo = $(echo) compiling
     99cpp_silent = $(silent)
     100fortran_echo = $(echo) compiling
     101fortran_silent = $(silent)
     102java_echo = $(echo) building
     103java_silent = $(silent)
     104link_echo = $(echo) building
     105link_silent = $(silent)
     106lib_echo = $(echo) building
     107lib_silent = $(silent)
     108cleanup_echo = $(echo) removing
     109cleanup_silent = $(silent)
     110install_echo = $(echo) installing
     111install_silent = $(silent)
     112#
     113# End of Controlling the verbosity of Make
     114#---------------------------------------------
    115115
    116 !if defined (LIB_QUIET)
    117 lib_silent = @
    118 lib_echo = @echo rebuilding
    119 !else
    120 lib_silent =
    121 lib_echo = -@ $(echo)
    122 !endif
    123 
    124 !if defined (CLEANUP_QUIET)
    125 cleanup_silent = @
    126 cleanup_echo = @echo removing
    127 !else
    128 cleanup_silent =
    129 cleanup_echo = @ $(echo)
    130 !endif
     116#!if defined (LEX_QUIET)
     117#lex_silent = @
     118#lex_echo = @echo rebuilding
     119#!else
     120#lex_silent =
     121#lex_echo = -@ $(echo)
     122#!endif
    131123
    132124cmtexe = $(CMTROOT)\$(CMTBIN)\cmt.exe

  • CMT/HEAD/src/NMakefile.header

    r23 r445  
    3131
    3232check_config ::
    33         $(cmtexe) check configuration
     33        @$(cmtexe) check configuration
    3434
    3535configclean ::
Note: See TracChangeset for help on using the changeset viewer.