Changeset 459
- Timestamp:
- May 30, 2008, 4:52:11 PM (16 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 46 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r458 r459 1 2008-05-30 <rybkin@lal.in2p3.fr> 360 2 3 * source/cmt_log.h: Introduce an enumeration to hold diagnostic messages 4 levels (Debug, Info, Warning, Error, Fatal). Implement a class to hold 5 and manage diagnostic messages prefix, level (default values: #CMT--->, 6 Info), and functions to produce diagnostic messages 7 * source/cmt_parser.cxx: Implement functions to configure diagnostic 8 messages prefix, and level using the environment variables CMTMSGPREFIX, 9 and CMTDEBUG, CMTINFO, CMTWARNING, CMTERROR, CMTFATAL (in order of 10 precedence) if set to a non-empty string. Extend functions to configure 11 the diagnostic messages level using the existing command line options 12 -warnings (Warning), -disable_warnings (Error), -quiet (Fatal). 13 Introduce the CMTFLAGS environment variable (set up automatically) in order 14 to contain command line options (currently, to configure the diagnostic 15 messages level and the structuring style) so as to pass the flags to 16 recursive cmt invocations. If CMTFLAGS exists in the environment, the 17 flags from it are processed before the command line options. Implement 18 the CMTFLAGS functionality described above. 19 Use the diagnostic message functions for the messages 20 * source/cmt.h: idem 21 * source/cmt_tag.cxx: Use the diagnostic message functions for the messages 22 * source/cmt_awk.cxx: idem 23 * source/cmt_system.cxx: idem 24 * source/cmt_use.cxx: idem 25 * source/cmt_install_area.cxx: idem 26 * source/cmt_fragment.cxx: idem 27 * source/cmt_generators.cxx: idem 28 * source/cmt_constituent.cxx: idem 29 * source/cmt_syntax.cxx: idem 30 * source/cmt_triggers.cxx: idem 31 * source/cmt_error.cxx: idem 32 * source/cmt_model.cxx: idem 33 * source/cmt_commands.cxx: idem 34 * source/cmt_project.cxx: idem 35 * source/cmt_pattern.cxx: idem 36 * source/cmt_lock.cxx: idem 37 * source/cmt_generator.cxx: idem 38 * source/cmt_cvs.cxx: idem 39 * source/cmt_symbol.cxx: idem 40 * mgr/requirements: Do not use the -quiet command line option 41 * mgr/fragments/constituent: idem 42 * mgr/fragments/make_setup: idem 43 * mgr/fragments/check_application_header: idem 44 * mgr/fragments/constituents_header: idem 45 * mgr/fragments/constituent_lock: idem 46 * mgr/fragments/generator_header: idem 47 * mgr/fragments/cleanup_header: Improve control of Make verbosity 48 * mgr/fragments/make_setup_nmake: Do not use the -quiet command line option 49 * mgr/fragments/nmake/constituent: idem 50 * mgr/fragments/nmake/check_application_header: idem 51 * mgr/fragments/nmake/constituents_header: idem 52 * mgr/fragments/nmake/yacc: idem 53 * mgr/fragments/nmake/constituent_lock: idem 54 * mgr/fragments/nmake/lex: idem 55 * mgr/fragments/nmake/generator_header: idem 56 * mgr/fragments/nmake/yacc_library: idem 57 * mgr/fragments/nmake/lex_library: idem 58 * src/Makefile.header: idem, improve control of Make verbosity 59 * src/constituents.make: Do not use the -quiet command line option 60 * src/NMakefile.header: idem 61 * src/constituents.nmake: idem 62 1 63 2008-05-14 <rybkin@lal.in2p3.fr> 359 2 64 -
CMT/HEAD/mgr/cmt_dependencies.make
r427 r459 1 1 cmt_cxx_dependencies = ../source/cmt.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 2 cmt_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 2 cmt_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 ../source/cmt_log.h 3 3 cmt_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_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 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_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 ../source/cmt_log.h 5 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_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 6 cmt_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_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 6 cmt_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 ../source/cmt_log.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_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 ../source/cmt_log.h 8 8 cmt_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 9 9 cmt_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 10 10 cmt_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 11 11 cmt_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 ../source/cmt_map.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 ../source/cmt_map.h ../source/cmt_log.h 13 13 cmt_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 14 cmt_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 15 cmt_symbol_cxx_dependencies = ../source/cmt_symbol.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_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 16 cmt_error_cxx_dependencies = ../source/cmt_error.cxx ../source/cmt_std.h ../source/cmt_string.h ../source/cmt_error.h ../source/cmt_vector.h 17 cmt_pattern_cxx_dependencies = ../source/cmt_pattern.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_pattern.h ../source/cmt_include.h ../source/cmt_script.h ../source/cmt_scope_section.h ../source/cmt_use.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_awk.h ../source/cmt_project.h ../source/cmt_cmtpath_pattern.h ../source/cmt_database.h ../source/cmt_error.h ../source/cmt_syntax.h 14 cmt_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 ../source/cmt_log.h 15 cmt_symbol_cxx_dependencies = ../source/cmt_symbol.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_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_log.h 16 cmt_error_cxx_dependencies = ../source/cmt_error.cxx ../source/cmt_std.h ../source/cmt_string.h ../source/cmt_error.h ../source/cmt_vector.h ../source/cmt_log.h 17 cmt_pattern_cxx_dependencies = ../source/cmt_pattern.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_pattern.h ../source/cmt_include.h ../source/cmt_script.h ../source/cmt_scope_section.h ../source/cmt_use.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_awk.h ../source/cmt_project.h ../source/cmt_cmtpath_pattern.h ../source/cmt_database.h ../source/cmt_error.h ../source/cmt_syntax.h ../source/cmt_log.h 18 18 cmt_language_cxx_dependencies = ../source/cmt_language.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_language.h ../source/cmt_branch.h ../source/cmt_group.h ../source/cmt_constituent.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 19 cmt_cvs_cxx_dependencies = ../source/cmt_cvs.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_cvs.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_tag.h ../source/cmt_symbol.h ../source/cmt_project.h 19 cmt_cvs_cxx_dependencies = ../source/cmt_cvs.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_cvs.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_tag.h ../source/cmt_symbol.h ../source/cmt_project.h ../source/cmt_log.h 20 20 cmt_group_cxx_dependencies = ../source/cmt_group.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_group.h ../source/cmt_branch.h ../source/cmt_fragment.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 21 21 cmt_database_cxx_dependencies = ../source/cmt_database.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 22 cmt_lock_cxx_dependencies = ../source/cmt_lock.cxx ../source/cmt_std.h ../source/cmt_lock.h ../source/cmt_string.h ../source/cmt_vector.h ../source/cmt_regexp.h ../source/cmt_system.h ../source/cmt_error.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_symbol.h 23 cmt_triggers_cxx_dependencies = ../source/cmt_triggers.cxx ../source/cmt_std.h ../source/cmt_string.h ../source/cmt_triggers.h ../source/cmt_vector.h ../source/cmt_regexp.h ../source/cmt_system.h ../source/cmt_awk.h ../source/cmt_map.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_fragment.h ../source/cmt_group.h ../source/cmt_constituent.h ../source/cmt_project.h ../source/cmt_syntax.h 22 cmt_lock_cxx_dependencies = ../source/cmt_lock.cxx ../source/cmt_std.h ../source/cmt_lock.h ../source/cmt_string.h ../source/cmt_vector.h ../source/cmt_regexp.h ../source/cmt_system.h ../source/cmt_error.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_symbol.h ../source/cmt_log.h 23 cmt_triggers_cxx_dependencies = ../source/cmt_triggers.cxx ../source/cmt_std.h ../source/cmt_string.h ../source/cmt_triggers.h ../source/cmt_vector.h ../source/cmt_regexp.h ../source/cmt_system.h ../source/cmt_awk.h ../source/cmt_map.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_fragment.h ../source/cmt_group.h ../source/cmt_constituent.h ../source/cmt_project.h ../source/cmt_syntax.h ../source/cmt_log.h 24 24 cmt_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 25 cmt_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_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 27 cmt_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 28 cmt_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 25 cmt_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 ../source/cmt_log.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_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 ../source/cmt_log.h 27 cmt_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 ../source/cmt_log.h 28 cmt_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 ../source/cmt_log.h 29 29 cmt_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 30 30 cmt_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 … … 32 32 cmt_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 33 33 cmt_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 34 cmt_commands_cxx_dependencies = ../source/cmt_commands.cxx ../source/cmt_std.h ../source/cmt_string.h ../source/cmt_vector.h ../source/cmt_map.h ../source/cmt_parser.h ../source/cmt_regexp.h ../source/cmt_system.h ../source/cmt.h ../source/cmt_commands.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_awk.h ../source/cmt_project.h 34 cmt_commands_cxx_dependencies = ../source/cmt_commands.cxx ../source/cmt_std.h ../source/cmt_string.h ../source/cmt_vector.h ../source/cmt_map.h ../source/cmt_parser.h ../source/cmt_regexp.h ../source/cmt_system.h ../source/cmt.h ../source/cmt_commands.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_awk.h ../source/cmt_project.h ../source/cmt_log.h -
CMT/HEAD/mgr/fragments/check_application_header
r23 r459 6 6 ${CONSTITUENT}check :: 7 7 @echo "------> starting ${CONSTITUENT}check" 8 @$(cmtexe) -quietbuild constituent_makefile ${CONSTITUENT}; $(MAKE) -f ${CONSTITUENT}.make build_strategy=keep_makefiles ${CONSTITUENT}check8 @$(cmtexe) build constituent_makefile ${CONSTITUENT}; $(MAKE) -f ${CONSTITUENT}.make build_strategy=keep_makefiles ${CONSTITUENT}check 9 9 10 10 #-- end of check_application_header ------ -
CMT/HEAD/mgr/fragments/cleanup_header
r458 r459 6 6 ifndef PEDANTIC 7 7 .DEFAULT:: 8 @echo "#CMT> Warning: $@: No rule for such target" >&2; exit 8 $(echo) "(${CONSTITUENT}.make) $@: No rule for such target" >&2 9 # @echo "#CMT> Warning: $@: No rule for such target" >&2; exit 9 10 else 10 11 .DEFAULT:: 11 @echo "#CMT> PEDANTIC MODE >> No rule for target $@" >&212 @if test $@ = "$(cmt_final_setup)" -o\12 $(echo) "(${CONSTITUENT}.make) PEDANTIC: $@: No rule for such target" >&2 13 if test $@ = "$(cmt_final_setup)" -o\ 13 14 $@ = "$(cmt_final_setup_${CONSTITUENT})" ; then\ 14 15 found=n; for s in 1 2 3 4 5; do\ 15 16 sleep $$s; test ! -f $@ || { found=y; break; }\ 16 17 done; if test $$found = n; then\ 17 echo "#CMT> PEDANTIC MODE >> $@ seems to be missing. Ignore it for now" >&2; exit 0 ; fi;\ 18 test -z "$(cmtmsg)" ||\ 19 echo "$(CMTMSGPREFIX)" "(${CONSTITUENT}.make) PEDANTIC: $@: Seems to be missing. Ignore it for now" >&2; exit 0 ; fi;\ 18 20 elif test `expr index $@ '/'` -ne 0 ; then\ 19 echo "#CMT> PEDANTIC MODE >> $@ seems to be a missing file, please check" >&2; exit -1 ; \ 21 test -z "$(cmtmsg)" ||\ 22 echo "$(CMTMSGPREFIX)" "(${CONSTITUENT}.make) PEDANTIC: $@: Seems to be a missing file. Please check" >&2; exit 2 ; \ 20 23 else\ 21 echo "#CMT> PEDANTIC MODE >> $@ seems to be a fake target due to some pattern. Just ignore it" >&2 ; exit 0; fi 24 test -z "$(cmtmsg)" ||\ 25 echo "$(CMTMSGPREFIX)" "(${CONSTITUENT}.make) PEDANTIC: $@: Seems to be a fake target due to some pattern. Just ignore it" >&2 ; exit 0; fi 22 26 endif 23 27 -
CMT/HEAD/mgr/fragments/constituent
r441 r459 28 28 $(echo) "(constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})" 29 29 @if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \ 30 $(cmtexe) - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT}); \30 $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT}); \ 31 31 if test -f $(cmt_final_setup_${CONSTITUENT}); then /bin/rm -f $(cmt_final_setup_${CONSTITUENT}); fi; \ 32 $(cmtexe) - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >>$(cmt_final_setup_${CONSTITUENT})32 $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >>$(cmt_final_setup_${CONSTITUENT}) 33 33 $(echo) setup.make ok 34 34 … … 54 54 endif 55 55 $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \ 56 $(cmtexe) - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}56 $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT} 57 57 58 58 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) -
CMT/HEAD/mgr/fragments/constituent_lock
r447 r459 28 28 $(echo) "(constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})" 29 29 @if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \ 30 $(cmtexe) - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT}); \30 $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT}); \ 31 31 if test -f $(cmt_final_setup_${CONSTITUENT}); then /bin/rm -f $(cmt_final_setup_${CONSTITUENT}); fi; \ 32 $(cmtexe) - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >>$(cmt_final_setup_${CONSTITUENT})32 $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >>$(cmt_final_setup_${CONSTITUENT}) 33 33 $(echo) setup.make ok 34 34 … … 54 54 endif 55 55 $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \ 56 $(cmtexe) - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}56 $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT} 57 57 58 58 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) -
CMT/HEAD/mgr/fragments/constituents_header
r441 r459 47 47 endif 48 48 49 ## @bin=`$(cmtexe) -quietshow macro_value bin`49 ## @bin=`$(cmtexe) show macro_value bin` 50 50 51 51 #$(cmt_local_tagfile) : $(cmt_lock_setup) … … 60 60 if test -f $(cmt_local_setup); then /bin/rm -f $(cmt_local_setup); fi; \ 61 61 trap '/bin/rm -f $(cmt_local_setup)' 0 1 2 15; \ 62 $(cmtexe) - quiet -tag=$(tags) show setup >>$(cmt_local_setup); \62 $(cmtexe) -tag=$(tags) show setup >>$(cmt_local_setup); \ 63 63 if test ! -f $@; then \ 64 64 mv $(cmt_local_setup) $@; \ … … 78 78 79 79 env.make :: 80 printenv >env.make.tmp; $(cmtexe) -quietcheck files env.make.tmp env.make80 printenv >env.make.tmp; $(cmtexe) check files env.make.tmp env.make 81 81 82 82 ifndef QUICK … … 101 101 102 102 .DEFAULT :: 103 @echo "#CMT> Warning: $@: Using default commands" >&2; exit 103 $(echo) "(constituents.make) $@: No rule for such target" >&2 104 # @echo "#CMT> Warning: $@: Using default commands" >&2; exit 104 105 105 106 # @if test "$@" = "$(cmt_lock_setup)"; then \ -
CMT/HEAD/mgr/fragments/generator_header
r23 r459 12 12 ${dir}${out}_stamp :: 13 13 @echo ${out} 14 $(cmtexe) -quietexpand model "${model}" > ${dir}${out}_temp15 $(cmtexe) -quietcheck files ${dir}${out}_temp ${dir}${out}14 $(cmtexe) expand model "${model}" > ${dir}${out}_temp 15 $(cmtexe) check files ${dir}${out}_temp ${dir}${out} 16 16 @echo ${CONSTITUENT} >${dir}${out}_stamp 17 17 -
CMT/HEAD/mgr/fragments/make_setup
r95 r459 11 11 @if test "$(nocheck)" = ""; then \ 12 12 /bin/echo "Rebuilding $@"; \ 13 $(cmtexe) setup - quiet -tag=$(tags) | sed -e 's#`${CMTROOT}/mgr/cmt system`#$(${PACKAGE}_tag)#' >$(${PACKAGE}_tag).csh; \13 $(cmtexe) setup -tag=$(tags) | sed -e 's#`${CMTROOT}/mgr/cmt system`#$(${PACKAGE}_tag)#' >$(${PACKAGE}_tag).csh; \ 14 14 fi 15 15 … … 20 20 @if test "$(nocheck)" = ""; then \ 21 21 /bin/echo "Rebuilding $@"; \ 22 $(cmtexe) setup - quiet -sh -tag=$(tags) | sed -e 's#`${CMTROOT}/mgr/cmt system`#$(${PACKAGE}_tag)#' >$(${PACKAGE}_tag).csh; \22 $(cmtexe) setup -sh -tag=$(tags) | sed -e 's#`${CMTROOT}/mgr/cmt system`#$(${PACKAGE}_tag)#' >$(${PACKAGE}_tag).csh; \ 23 23 fi 24 24 … … 27 27 28 28 env.make :: 29 @printenv >env.make.tmp; $(cmtexe) -quietcheck files env.make.tmp env.make29 @printenv >env.make.tmp; $(cmtexe) check files env.make.tmp env.make 30 30 31 31 $(${PACKAGE}_tag).make : requirements $(use_requirements) 32 32 @if test ! -d $(bin) ; then $(mkdir) -p $(bin); fi; \ 33 33 if test -f $(${PACKAGE}_tag).make; then /bin/rm -f $(${PACKAGE}_tag).make; fi; \ 34 $(cmtexe) - quiet -tag=$(tags) build tag_makefile >t$$$$; mv t$$$$ $(${PACKAGE}_tag).make ; \35 $(cmtexe) - quiet -tag=$(tags) show uses >t$$$$; mv t$$$$ uses.make ; \34 $(cmtexe) -tag=$(tags) build tag_makefile >t$$$$; mv t$$$$ $(${PACKAGE}_tag).make ; \ 35 $(cmtexe) -tag=$(tags) show uses >t$$$$; mv t$$$$ uses.make ; \ 36 36 $(cmtexe) -tag=$(tags) show tags >t$$$$; mv t$$$$ tags.make 37 37 -
CMT/HEAD/mgr/fragments/make_setup_nmake
r11 r459 19 19 $(${PACKAGE}_tag).make : requirements ${use_requirements} 20 20 @echo "Now rebuilding $@" 21 ### @mkdir -p $(bin); touch $(${PACKAGE}_tag).make; ${CMTROOT}/mgr/cmt -quietbuild tag_makefile -tag=$(${PACKAGE}_tag) >t$$$$; mv t$$$$ $(${PACKAGE}_tag).make21 ### @mkdir -p $(bin); touch $(${PACKAGE}_tag).make; ${CMTROOT}/mgr/cmt build tag_makefile -tag=$(${PACKAGE}_tag) >t$$$$; mv t$$$$ $(${PACKAGE}_tag).make 22 22 23 23 -include $(${PACKAGE}_tag).make -
CMT/HEAD/mgr/fragments/nmake/check_application_header
r23 r459 5 5 ${CONSTITUENT}check :: 6 6 @echo "------> starting ${CONSTITUENT}check" 7 @$(cmtexe) -quietbuild -nmake constituent_makefile ${CONSTITUENT}7 @$(cmtexe) build -nmake constituent_makefile ${CONSTITUENT} 8 8 $(MAKE) /f ${CONSTITUENT}.nmake build_strategy=keep_makefiles ${CONSTITUENT}check 9 9 -
CMT/HEAD/mgr/fragments/nmake/constituent
r445 r459 16 16 !endif 17 17 18 !if [cmt - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 018 !if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0 19 19 !endif 20 20 21 !if [$(cmtexe) - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_final_setup_${CONSTITUENT})] == 021 !if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_final_setup_${CONSTITUENT})] == 0 22 22 !endif 23 23 … … 34 34 @set include=$(include) 35 35 @set lib=$(lib) 36 @$(cmtexe) - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile ${CONSTITUENT}36 @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile ${CONSTITUENT} 37 37 @move ${CONSTITUENT}.nmake $(bin) 38 38 $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done -
CMT/HEAD/mgr/fragments/nmake/constituent_lock
r445 r459 16 16 !endif 17 17 18 !if [cmt - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 018 !if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0 19 19 !endif 20 20 21 !if [$(cmtexe) - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_final_setup_${CONSTITUENT})] == 021 !if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_final_setup_${CONSTITUENT})] == 0 22 22 !endif 23 23 … … 34 34 @set include=$(include) 35 35 @set lib=$(lib) 36 @$(cmtexe) - quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile ${CONSTITUENT}36 @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile ${CONSTITUENT} 37 37 @move ${CONSTITUENT}.nmake $(bin) 38 38 $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done -
CMT/HEAD/mgr/fragments/nmake/constituents_header
r445 r459 15 15 !endif 16 16 17 !if [cmt -quietbuild tag_makefile -tag_add=$(tags) >$(${PACKAGE}_tag).nmake] == 017 !if [cmt build tag_makefile -tag_add=$(tags) >$(${PACKAGE}_tag).nmake] == 0 18 18 !endif 19 19 … … 30 30 31 31 env.nmake :: 32 @set >env.nmake.tmp; $(cmtexe) -quietcheck files env.nmake.tmp env.nmake32 @set >env.nmake.tmp; $(cmtexe) check files env.nmake.tmp env.nmake 33 33 34 34 all :: … … 44 44 $(echo) (constituents.nmake) Rebuilding setup.nmake 45 45 @if not exist $(bin) mkdir $(bin) 46 @$(cmtexe) - quiet -tag=$(tags) show setup >$(cmt_setup_pid)46 @$(cmtexe) -tag=$(tags) show setup >$(cmt_setup_pid) 47 47 $(echo) setup.nmake ok 48 48 -
CMT/HEAD/mgr/fragments/nmake/generator_header
r23 r459 9 9 ${dir}${out}_stamp :: 10 10 @echo ${out} 11 $(cmtexe) -quietexpand model "${model}" > ${dir}${out}_temp12 $(cmtexe) -quietcheck files ${dir}${out}_temp ${dir}${out}11 $(cmtexe) expand model "${model}" > ${dir}${out}_temp 12 $(cmtexe) check files ${dir}${out}_temp ${dir}${out} 13 13 @echo ${CONSTITUENT} >${dir}${out}_stamp 14 14 -
CMT/HEAD/mgr/fragments/nmake/lex
r23 r459 5 5 $(lex_silent) $(lex) ${FILENAME} 6 6 sed -e 's/yy/${NAME}YY/g' -e 's/LexYY/YY/g' -e 's/ = {stdin}//' -e 's/ = {stdout}//' lex.yy.c > lex.yy.c.tmp 7 $(cmtexe) -quietcheck_files lex.yy.c.tmp ${NAME}.c7 $(cmtexe) check_files lex.yy.c.tmp ${NAME}.c 8 8 del lex.yy.c 9 9 $(lex_silent) $(ccomp) /Fo"$(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj" $(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} $(src)${NAME}.c -
CMT/HEAD/mgr/fragments/nmake/lex_library
r23 r459 5 5 $(lex_silent) $(lex) ${FILENAME} 6 6 sed -e 's/yy/${NAME}YY/g' -e 's/LexYY/YY/g' -e 's/ = {stdin}//' -e 's/ = {stdout}//' lex.yy.c > lex.yy.c.tmp 7 $(cmtexe) -quietcheck_files lex.yy.c.tmp ${NAME}.c7 $(cmtexe) check_files lex.yy.c.tmp ${NAME}.c 8 8 del lex.yy.c 9 9 $(lex_silent) $(ccomp) /Fo"$(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj" $(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} $(src)${NAME}.c -
CMT/HEAD/mgr/fragments/nmake/yacc
r23 r459 5 5 $(yacc_silent) $(yacc) ${FILENAME} 6 6 sed -e 's/yy/${NAME}YY/g' -e 's/ParseYY/YY/g' y.tab.c > y.tab.c.tmp 7 $(cmtexe) -quietcheck_files y.tab.c.tmp ${NAME}.c7 $(cmtexe) check_files y.tab.c.tmp ${NAME}.c 8 8 sed -e 's/yy/${NAME}YY/g' -e 's/ParseYY/YY/g' y.tab.h > y.tab.h.tmp 9 $(cmtexe) -quietcheck_files y.tab.h.tmp ${NAME}.h9 $(cmtexe) check_files y.tab.h.tmp ${NAME}.h 10 10 del y.tab.[ch] 11 11 $(yacc_silent) $(ccomp) /Fo"$(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj" $(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} $(src)${NAME}.c -
CMT/HEAD/mgr/fragments/nmake/yacc_library
r23 r459 5 5 $(yacc_silent) $(yacc) ${FILENAME} 6 6 sed -e 's/yy/${NAME}YY/g' -e 's/ParseYY/YY/g' y.tab.c > y.tab.c.tmp 7 $(cmtexe) -quietcheck_files y.tab.c.tmp ${NAME}.c7 $(cmtexe) check_files y.tab.c.tmp ${NAME}.c 8 8 sed -e 's/yy/${NAME}YY/g' -e 's/ParseYY/YY/g' y.tab.h > y.tab.h.tmp 9 $(cmtexe) -quietcheck_files y.tab.h.tmp ${NAME}.h9 $(cmtexe) check_files y.tab.h.tmp ${NAME}.h 10 10 del y.tab.[ch] 11 11 $(yacc_silent) $(ccomp) /Fo"$(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj" $(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} $(src)${NAME}.c -
CMT/HEAD/mgr/requirements
r430 r459 405 405 VisualC "copy " 406 406 407 macro build_library_links "$(cmtexe) build library_links - quiet -tag=$(tags)"408 macro remove_library_links "$(cmtexe) remove library_links - quiet -tag=$(tags)"407 macro build_library_links "$(cmtexe) build library_links -tag=$(tags)" 408 macro remove_library_links "$(cmtexe) remove library_links -tag=$(tags)" 409 409 410 410 # … … 418 418 419 419 macro build_prototype "$(cmtexe) build prototype" 420 macro build_dependencies "$(cmtexe) - quiet -tag=$(tags) build dependencies"420 macro build_dependencies "$(cmtexe) -tag=$(tags) build dependencies" 421 421 macro build_triggers "$(cmtexe) build triggers" 422 422 -
CMT/HEAD/source/cmt.h
r438 r459 100 100 static void configure_uname_tag (); 101 101 static void configure_version_tag (); 102 // static void configure_cmt_message (); 103 static void configure_cmt_message (const ArgParser& ap); 102 104 103 105 static void do_awk (const ArgParser& ap); … … 222 224 static bool get_all_sets_done (); 223 225 226 static void get_cmt_flags (CmtSystem::cmt_string_vector& flags); 227 static cmt_string get_cmt_flags (); 228 static bool set_cmt_flags (const cmt_string& flags); 229 static bool add_cmt_flag (const cmt_string& flag); 230 224 231 /// If a project file exists above the current directory we don't need CMTPATH 225 232 static void guess_current_project (); -
CMT/HEAD/source/cmt_awk.cxx
r423 r459 13 13 #include "cmt_awk.h" 14 14 #include "cmt_system.h" 15 #include "cmt_log.h" 15 16 16 17 class Parser … … 504 505 if (line.find ("\n") == cmt_string::npos) 505 506 { 506 cerr << "#CMT> Warning: Line too long and truncated in PAwk::run for command " << command << endl; 507 CmtMessage::warning ("Line too long and truncated in PAwk::run for command " + command); 508 // cerr << "#CMT> Warning: Line too long and truncated in PAwk::run for command " << command << endl; 507 509 } 508 510 -
CMT/HEAD/source/cmt_commands.cxx
r428 r459 10 10 #include "cmt_symbol.h" 11 11 #include "cmt_project.h" 12 #include "cmt_log.h" 12 13 13 14 ArgParser::ArgParser (CmtContext& context) : cmt(context), argc(0), argv(0), mode(Csh) … … 503 504 // We have unexpected arguments (not handled by the command handler). This may sign 504 505 // an unprotected handler implementation. 505 if (!cmt.m_quiet) cerr << "#CMT> warning : unexpected parameter " << reduced_arg << endl; 506 CmtMessage::warning ("unexpected parameter " + reduced_arg); 507 // if (!cmt.m_quiet) cerr << "#CMT> warning : unexpected parameter " << reduced_arg << endl; 506 508 } 507 509 else … … 568 570 else if (argc > 0) 569 571 { 570 if (!cmt.m_quiet) cerr << "#CMT> syntax error : wrong arguments" << endl; 572 CmtMessage::error ("syntax: wrong arguments"); 573 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : wrong arguments" << endl; 571 574 cmt.m_action = action_build_constituent_makefile; 572 575 help_action = action_help; … … 574 577 else 575 578 { 576 if (!cmt.m_quiet) cerr << "#CMT> syntax error : constituent name missing" << endl; 579 CmtMessage::error ("syntax: constituent name missing"); 580 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : constituent name missing" << endl; 577 581 cmt.m_action = action_build_constituent_makefile; 578 582 help_action = action_help; … … 593 597 else 594 598 { 595 if (!cmt.m_quiet) cerr << "#CMT> syntax error : arguments missing " << endl; 599 CmtMessage::error ("syntax: arguments missing"); 600 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : arguments missing " << endl; 596 601 help_action = action_help; 597 602 cmt.m_action = action_build_dependencies; … … 637 642 else 638 643 { 639 if (!cmt.m_quiet) cerr << "#CMT> syntax error : arguments missing " << endl; 644 CmtMessage::error ("syntax: arguments missing"); 645 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : arguments missing " << endl; 640 646 help_action = action_help; 641 647 cmt.m_action = action_build_os9_makefile; … … 651 657 else 652 658 { 653 if (!cmt.m_quiet) cerr << "#CMT> syntax error : arguments missing" << endl; 659 CmtMessage::error ("syntax: arguments missing"); 660 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : arguments missing" << endl; 654 661 help_action = action_help; 655 662 cmt.m_action = action_build_prototype; … … 679 686 else 680 687 { 681 if (!cmt.m_quiet) cerr << "#CMT> syntax error : arguments missing" << endl; 688 CmtMessage::error ("syntax: arguments missing"); 689 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : arguments missing" << endl; 682 690 help_action = action_help; 683 691 cmt.m_action = action_build_triggers; … … 693 701 else 694 702 { 695 if (!cmt.m_quiet) cerr << "#CMT> syntax error : arguments missing" << endl; 703 CmtMessage::error ("syntax: arguments missing"); 704 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : arguments missing" << endl; 696 705 help_action = action_help; 697 706 cmt.m_action = action_build_windefs; … … 700 709 else 701 710 { 702 if (!cmt.m_quiet) cerr << "#CMT> syntax error : wrong build argument" << endl; 711 CmtMessage::error ("syntax: wrong build argument"); 712 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : wrong build argument" << endl; 703 713 help_action = action_help; 704 714 cmt.m_action = action_build; … … 707 717 else 708 718 { 709 if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to build" << endl; 719 CmtMessage::error ("syntax: don't know what to build"); 720 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to build" << endl; 710 721 help_action = action_help; 711 722 cmt.m_action = action_build; … … 738 749 else 739 750 { 740 if (!cmt.m_quiet) cerr << "#CMT> syntax error : reference file name missing"741 751 CmtMessage::error ("syntax: reference file name missing"); 752 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : reference file name missing" << endl; 742 753 help_action = action_help; 743 754 cmt.m_action = action_check_files; … … 746 757 else 747 758 { 748 if (!cmt.m_quiet) cerr << "#CMT> syntax error : file name missing" << endl; 759 CmtMessage::error ("syntax: file name missing"); 760 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : file name missing" << endl; 749 761 help_action = action_help; 750 762 cmt.m_action = action_check_files; … … 760 772 else 761 773 { 762 if (!cmt.m_quiet) cerr << "#CMT> syntax error : package name missing" << endl; 774 CmtMessage::error ("syntax: package name missing"); 775 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : package name missing" << endl; 763 776 help_action = action_help; 764 777 cmt.m_action = action_check_version; … … 767 780 else 768 781 { 769 if (!cmt.m_quiet) cerr << "#CMT> syntax error : bad check option" << endl; 782 CmtMessage::error ("syntax: bad check option"); 783 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : bad check option" << endl; 770 784 help_action = action_help; 771 785 cmt.m_action = action_check; … … 774 788 else 775 789 { 776 if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to check" << endl; 790 CmtMessage::error ("syntax: don't know what to check"); 791 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to check" << endl; 777 792 help_action = action_help; 778 793 cmt.m_action = action_check; … … 792 807 else 793 808 { 794 if (!cmt.m_quiet) cerr << "#CMT> syntax error : reference file missing" << endl;809 CmtMessage::error ("syntax: reference file name missing"); 795 810 help_action = action_help; 796 811 cmt.m_action = action_check_files; … … 799 814 else 800 815 { 801 if (!cmt.m_quiet) cerr << "#CMT> syntax error : file name missing" << endl;816 CmtMessage::error ("syntax: file name missing"); 802 817 help_action = action_help; 803 818 cmt.m_action = action_check_files; … … 814 829 else 815 830 { 816 if (!cmt.m_quiet) cerr << "#CMT> syntax error : checkout arguments missing" << endl; 831 CmtMessage::error ("syntax: checkout arguments missing"); 832 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : checkout arguments missing" << endl; 817 833 help_action = action_help; 818 834 cmt.m_action = action_checkout; … … 839 855 else 840 856 { 841 if (!cmt.m_quiet) cerr << "#CMT> syntax error : create arguments missing" << endl; 857 CmtMessage::error ("syntax: create arguments missing"); 858 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : create arguments missing" << endl; 842 859 help_action = action_help; 843 860 cmt.m_action = action_create; … … 854 871 else 855 872 { 856 if (!cmt.m_quiet) cerr << "#CMT> syntax error : create_project arguments missing" << endl; 873 CmtMessage::error ("syntax: create_project arguments missing"); 874 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : create_project arguments missing" << endl; 857 875 help_action = action_help; 858 876 cmt.m_action = action_create_project; … … 869 887 else 870 888 { 871 if (!cmt.m_quiet) cerr << "#CMT> syntax error : cvsbranches arguments missing" << endl; 889 CmtMessage::error ("syntax: cvsbranches arguments missing"); 890 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : cvsbranches arguments missing" << endl; 872 891 help_action = action_help; 873 892 cmt.m_action = action_cvsbranches; … … 904 923 else 905 924 { 906 if (!cmt.m_quiet) cerr << "#CMT> syntax error : package name missing" << endl;925 CmtMessage::error ("syntax: package name missing"); 907 926 help_action = action_help; 908 927 cmt.m_action = action_cvstags; … … 929 948 else 930 949 { 931 if (!cmt.m_quiet) cerr << "#CMT> syntax error : action not specified" << endl; 950 CmtMessage::error ("syntax: action not specified"); 951 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : action not specified" << endl; 932 952 help_action = action_help; 933 953 cmt.m_action = action_do; … … 951 971 else 952 972 { 953 if (!cmt.m_quiet) cerr << "#CMT> syntax error : model not specified" << endl; 973 CmtMessage::error ("syntax: model not specified"); 974 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : model not specified" << endl; 954 975 help_action = action_help; 955 976 cmt.m_action = action_expand_model; … … 958 979 else 959 980 { 960 if (!cmt.m_quiet) cerr << "#CMT> syntax error : bad expand option" << endl; 981 CmtMessage::error ("syntax: bad expand option"); 982 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : bad expand option" << endl; 961 983 help_action = action_help; 962 984 cmt.m_action = action_expand_model; … … 965 987 else 966 988 { 967 if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to expand" << endl; 989 CmtMessage::error ("syntax: don't know what to expand"); 990 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to expand" << endl; 968 991 help_action = action_help; 969 992 cmt.m_action = action_expand_model; … … 980 1003 else 981 1004 { 982 if (!cmt.m_quiet) cerr << "#CMT> syntax error : file to filter not specified" << endl; 1005 CmtMessage::error ("syntax: file to filter not specified"); 1006 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : file to filter not specified" << endl; 983 1007 help_action = action_help; 984 1008 cmt.m_action = action_filter; … … 1017 1041 else 1018 1042 { 1019 if (!cmt.m_quiet) cerr << "#CMT> syntax error : version missing" << endl; 1043 CmtMessage::error ("syntax: version missing"); 1044 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : version missing" << endl; 1020 1045 help_action = action_help; 1021 1046 cmt.m_action = action_lock; … … 1065 1090 else 1066 1091 { 1067 if (!cmt.m_quiet) cerr << "#CMT> syntax error : version missing" << endl;1092 CmtMessage::error ("syntax: version missing"); 1068 1093 help_action = action_help; 1069 1094 cmt.m_action = action_remove; … … 1073 1098 else 1074 1099 { 1075 if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to remove" << endl; 1100 CmtMessage::error ("syntax: don't know what to remove"); 1101 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to remove" << endl; 1076 1102 help_action = action_help; 1077 1103 cmt.m_action = action_remove; … … 1088 1114 else 1089 1115 { 1090 if (!cmt.m_quiet) cerr << "#CMT> syntax error : run arguments missing" << endl; 1116 CmtMessage::error ("syntax: run arguments missing"); 1117 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : run arguments missing" << endl; 1091 1118 help_action = action_help; 1092 1119 cmt.m_action = action_run; … … 1103 1130 else 1104 1131 { 1105 if (!cmt.m_quiet) cerr << "#CMT> syntax error : run_sequence arguments missing" << endl; 1132 CmtMessage::error ("syntax: run_sequence arguments missing"); 1133 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : run_sequence arguments missing" << endl; 1106 1134 help_action = action_help; 1107 1135 cmt.m_action = action_run_sequence; … … 1135 1163 else 1136 1164 { 1137 if (!cmt.m_quiet) cerr << "#CMT> syntax error : bad set argument" << endl; 1165 CmtMessage::error ("syntax: bad set argument"); 1166 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : bad set argument" << endl; 1138 1167 help_action = action_help; 1139 1168 //cmt.m_action = action_set; … … 1142 1171 else 1143 1172 { 1144 if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to set" << endl; 1173 CmtMessage::error ("syntax: don't know what to set"); 1174 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to set" << endl; 1145 1175 help_action = action_help; 1146 1176 //cmt.m_action = action_set; … … 1173 1203 else 1174 1204 { 1175 if (!cmt.m_quiet) cerr << "#CMT> syntax error : action name missing" << endl; 1205 CmtMessage::error ("syntax: action name missing"); 1206 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : action name missing" << endl; 1176 1207 help_action = action_help; 1177 1208 cmt.m_action = action_show_action; … … 1197 1228 else 1198 1229 { 1199 if (!cmt.m_quiet) cerr << "#CMT> syntax error : action name missing" << endl;1230 CmtMessage::error ("syntax: action name missing"); 1200 1231 help_action = action_help; 1201 1232 cmt.m_action = action_show_action_value; … … 1246 1277 else 1247 1278 { 1248 if (!cmt.m_quiet) cerr << "#CMT> syntax error : package name missing" << endl;1279 CmtMessage::error ("syntax: package name missing"); 1249 1280 help_action = action_help; 1250 1281 cmt.m_action = action_show_clients; … … 1264 1295 else 1265 1296 { 1266 if (!cmt.m_quiet) cerr << "#CMT> syntax error : constituent name missing" << endl; 1297 CmtMessage::error ("syntax: constituent name missing"); 1298 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : constituent name missing" << endl; 1267 1299 help_action = action_help; 1268 1300 cmt.m_action = action_show_constituent; … … 1290 1322 else 1291 1323 { 1292 if (!cmt.m_quiet) cerr << "#CMT> syntax error : fragment name missing" << endl; 1324 CmtMessage::error ("syntax: fragment name missing"); 1325 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : fragment name missing" << endl; 1293 1326 help_action = action_help; 1294 1327 cmt.m_action = action_show_fragment; … … 1316 1349 else 1317 1350 { 1318 if (!cmt.m_quiet) cerr << "#CMT> syntax error : language name missing" << endl; 1351 CmtMessage::error ("syntax: language name missing"); 1352 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : language name missing" << endl; 1319 1353 help_action = action_help; 1320 1354 cmt.m_action = action_show_language; … … 1334 1368 else 1335 1369 { 1336 if (!cmt.m_quiet) cerr << "#CMT> syntax error : macro name missing" << endl; 1370 CmtMessage::error ("syntax: macro name missing"); 1371 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : macro name missing" << endl; 1337 1372 help_action = action_help; 1338 1373 cmt.m_action = action_show_macro; … … 1358 1393 else 1359 1394 { 1360 if (!cmt.m_quiet) cerr << "#CMT> syntax error : macro name missing" << endl;1395 CmtMessage::error ("syntax: macro name missing"); 1361 1396 help_action = action_help; 1362 1397 cmt.m_action = action_show_macro_value; … … 1398 1433 else 1399 1434 { 1400 if (!cmt.m_quiet) cerr << "#CMT> syntax error : pattern name missing" << endl; 1435 CmtMessage::error ("syntax: pattern name missing"); 1436 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : pattern name missing" << endl; 1401 1437 help_action = action_help; 1402 1438 cmt.m_action = action_show_pattern; … … 1452 1488 else 1453 1489 { 1454 if (!cmt.m_quiet) cerr << "#CMT> syntax error : set name missing" << endl; 1490 CmtMessage::error ("syntax: set name missing"); 1491 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : set name missing" << endl; 1455 1492 help_action = action_help; 1456 1493 cmt.m_action = action_show_set_value; … … 1466 1503 else 1467 1504 { 1468 if (!cmt.m_quiet) cerr << "#CMT> syntax error : set name missing" << endl;1505 CmtMessage::error ("syntax: set name missing"); 1469 1506 help_action = action_help; 1470 1507 cmt.m_action = action_show_set; … … 1515 1552 else 1516 1553 { 1517 if (!cmt.m_quiet) cerr << "#CMT> syntax error : package name missing" << endl;1554 CmtMessage::error ("syntax: package name missing"); 1518 1555 help_action = action_help; 1519 1556 cmt.m_action = action_show_use_paths; … … 1545 1582 else 1546 1583 { 1547 if (!cmt.m_quiet) cerr << "#CMT> syntax error : package name missing" << endl;1584 CmtMessage::error ("syntax: package name missing"); 1548 1585 help_action = action_help; 1549 1586 cmt.m_action = action_show_versions; … … 1552 1589 else 1553 1590 { 1554 if (!cmt.m_quiet) cerr << "#CMT> syntax error : bad show argument" << endl; 1591 CmtMessage::error ("syntax: bad show argument"); 1592 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : bad show argument" << endl; 1555 1593 help_action = action_help; 1556 1594 cmt.m_action = action_show; … … 1559 1597 else 1560 1598 { 1561 if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to show" << endl; 1599 CmtMessage::error ("syntax: don't know what to show"); 1600 // if (!cmt.m_quiet) cerr << "#CMT> syntax error : don't know what to show" << endl; 1562 1601 help_action = action_help; 1563 1602 cmt.m_action = action_show; … … 1596 1635 else 1597 1636 { 1598 if (!cmt.m_quiet) cerr << "#CMT> syntax error : version missing" << endl;1637 CmtMessage::error ("syntax: version missing"); 1599 1638 help_action = action_help; 1600 1639 cmt.m_action = action_unlock; … … 1626 1665 { 1627 1666 cmt.m_disable_warnings = true; 1667 if (CmtMessage::level () <= Warning) 1668 CmtMessage::set_level (Error); 1628 1669 } 1629 1670 … … 1631 1672 { 1632 1673 cmt.m_quiet = true; 1674 if (CmtMessage::level () <= Error) 1675 CmtMessage::set_level (Fatal); 1633 1676 } 1634 1677 … … 1637 1680 { 1638 1681 cmt.m_warnings = true; 1682 if (CmtMessage::level () != Warning) 1683 CmtMessage::set_level (Warning); 1639 1684 } 1640 1685 … … 1747 1792 void ArgParser::option_e () 1748 1793 { 1749 cerr << "#CMT> Warning: extra statement = " << arg << endl; 1794 CmtMessage::warning ("extra statement = " + arg); 1795 // cerr << "#CMT> Warning: extra statement = " << arg << endl; 1750 1796 extra_line = arg; 1751 1797 } -
CMT/HEAD/source/cmt_constituent.cxx
r400 r459 15 15 #include "cmt_system.h" 16 16 #include "cmt_database.h" 17 #include "cmt_log.h" 17 18 18 19 /*----------------------------------------------------------*/ … … 248 249 //if (!Cmt::get_quiet ()) 249 250 //{ 250 cerr << "#CMT> Warning: bad option " 251 << w << " in constituent " << m_constituent.name << endl; 251 CmtMessage::warning ("bad option " + w + " in constituent " + 252 m_constituent.name); 253 // cerr << "#CMT> Warning: bad option " 254 // << w << " in constituent " << m_constituent.name << endl; 252 255 //CmtError::set (CmtError::execution_error, cmd); 253 256 //} -
CMT/HEAD/source/cmt_cvs.cxx
r454 r459 14 14 #include "cmt_symbol.h" 15 15 #include "cmt_project.h" 16 #include "cmt_log.h" 16 17 17 18 /** … … 272 273 if (m_verbose || m_simulation) 273 274 { 274 cerr << "#CMT> Executing [" << command << "]" << endl; 275 CmtMessage::info ("Executing [" + command + "]"); 276 // cerr << "#CMT> Executing [" << command << "]" << endl; 275 277 } 276 278 … … 296 298 retry++; 297 299 298 cerr << "# " << message << ": status=" << status << endl; 299 cerr << "#---------------------------------------------------------" << endl; 300 char stat[8]; 301 sprintf (stat, "%d", status); 302 CmtMessage::error ("# " + message + ": status=" + stat); 303 CmtMessage::error ("#---------------------------------------------------------"); 304 // cerr << "# " << message << ": status=" << status << endl; 305 // cerr << "#---------------------------------------------------------" << endl; 300 306 301 307 if (retry > 5) exit(0); … … 314 320 if (m_verbose || m_simulation) 315 321 { 316 cerr << "#CMT> Executing [" << command << "]" << endl; 322 CmtMessage::info ("Executing [" + command + "]"); 323 // cerr << "#CMT> Executing [" << command << "]" << endl; 317 324 } 318 325 … … 404 411 if (found) 405 412 { 406 cerr << "#CMT> Protocol level " << m_protocol_level << endl; 413 CmtMessage::info ("Protocol level " + m_protocol_level); 414 // cerr << "#CMT> Protocol level " << m_protocol_level << endl; 407 415 } 408 416 else 409 417 { 410 cerr << "#CMT> The CVS pluggin is not installed or is not at protocol level " << m_protocol_level << endl; 418 CmtMessage::error ("The CVS pluggin is not installed or is not at protocol level " + m_protocol_level); 419 // cerr << "#CMT> The CVS pluggin is not installed or is not at protocol level " << m_protocol_level << endl; 411 420 } 412 421 } … … 457 466 if (!CmtSystem::mkdir (tmp_dir)) 458 467 { 459 cerr << "#CMT> Cannot create the temporary directory [" << tmp_dir << "]" << endl; 468 CmtMessage::error ("Cannot create the temporary directory [" + tmp_dir + "]"); 469 // cerr << "#CMT> Cannot create the temporary directory [" << tmp_dir << "]" << endl; 460 470 return; 461 471 } … … 466 476 if (!CmtSystem::cd (tmp_dir)) 467 477 { 468 cerr << "#CMT> Cannot move to the temporary directory " << tmp_dir << endl; 478 CmtMessage::error ("Cannot move to the temporary directory " + tmp_dir); 479 // cerr << "#CMT> Cannot move to the temporary directory " << tmp_dir << endl; 469 480 470 481 if (m_verbose) 471 482 { 472 cerr << "#CMT> now removing tmp_dir " << tmp_dir << " home=" << home_dir << endl; 483 CmtMessage::info ("now removing tmp_dir " + tmp_dir + " home=" + home_dir); 484 // cerr << "#CMT> now removing tmp_dir " << tmp_dir << " home=" << home_dir << endl; 473 485 } 474 486 … … 480 492 if (m_verbose) 481 493 { 482 cerr << "#CMT> cvs infos are now obtained from the temporary directory " << CmtSystem::pwd () << endl; 494 CmtMessage::info ("cvs infos are now obtained from the temporary directory " + CmtSystem::pwd ()); 495 // cerr << "#CMT> cvs infos are now obtained from the temporary directory " << CmtSystem::pwd () << endl; 483 496 } 484 497 … … 536 549 if (m_verbose) 537 550 { 538 cerr << "#CMT> now removing tmp_dir " << tmp_dir << " home=" << home_dir << endl; 551 CmtMessage::info ("now removing tmp_dir " + tmp_dir + " home=" + home_dir); 552 // cerr << "#CMT> now removing tmp_dir " << tmp_dir << " home=" << home_dir << endl; 539 553 } 540 554 … … 570 584 if (!check_protocol ()) 571 585 { 572 cerr << "#CMT> The CVS pluggin is not installed or is not at protocol level " << m_protocol_level << endl; 586 CmtMessage::error ("The CVS pluggin is not installed or is not at protocol level " + m_protocol_level); 587 // cerr << "#CMT> The CVS pluggin is not installed or is not at protocol level " << m_protocol_level << endl; 573 588 return; 574 589 } … … 576 591 if (module == "") 577 592 { 578 cerr << "#CMT> cmt cvs needs a module name" << endl; 593 CmtMessage::error ("cmt cvs needs a module name"); 594 // cerr << "#CMT> cmt cvs needs a module name" << endl; 579 595 return; 580 596 } … … 584 600 if (m_verbose) 585 601 { 586 cerr << "#CMT> cvs infos for module " << module << " already there" << endl; 602 CmtMessage::info ("cvs infos for module " + module + " already there"); 603 // cerr << "#CMT> cvs infos for module " << module << " already there" << endl; 587 604 } 588 605 } … … 836 853 if (m_verbose) 837 854 { 838 cerr << "#CMT> requesting cvs infos onto module " << module << endl; 855 CmtMessage::info ("requesting cvs infos onto module " + module); 856 // cerr << "#CMT> requesting cvs infos onto module " << module << endl; 839 857 } 840 858 … … 844 862 { 845 863 versions = ""; 846 cerr << "#CMT> Product " << product << " not found in ${CVSROOT}" << endl; 864 CmtMessage::error ("Product " + product + " not found in ${CVSROOT}"); 865 // cerr << "#CMT> Product " << product << " not found in ${CVSROOT}" << endl; 847 866 return (false); 848 867 } … … 1000 1019 if (m_simulation) 1001 1020 { 1002 cerr << "#CMT> Would create the " << dir << " directory" << endl; 1021 CmtMessage::info ("Would create the " + dir + " directory"); 1022 // cerr << "#CMT> Would create the " << dir << " directory" << endl; 1003 1023 } 1004 1024 else … … 1008 1028 if (m_verbose) 1009 1029 { 1010 cerr << "#CMT> About to mkdir " << dir << endl; 1030 CmtMessage::info ("About to mkdir " + dir); 1031 // cerr << "#CMT> About to mkdir " << dir << endl; 1011 1032 } 1012 1033 … … 1014 1035 if (!CmtSystem::cd (dir)) 1015 1036 { 1016 cerr << "# Error creating the directory :" << dir << endl; 1017 cerr << "#---------------------------------------------------------" << endl; 1037 CmtMessage::error ("# Cannot cd into the directory: " + dir); 1038 CmtMessage::error ("#---------------------------------------------------------"); 1039 // cerr << "# Error creating the directory :" << dir << endl; 1040 // cerr << "#---------------------------------------------------------" << endl; 1018 1041 return (false); 1019 1042 } … … 1045 1068 if (m_verbose) 1046 1069 { 1047 cerr << "#CMT> CMTPATH=" << CmtSystem::getenv ("CMTPATH") << endl; 1070 CmtMessage::info ("CMTPATH=" + CmtSystem::getenv ("CMTPATH")); 1071 // cerr << "#CMT> CMTPATH=" << CmtSystem::getenv ("CMTPATH") << endl; 1048 1072 } 1049 1073 } … … 1063 1087 cmt_string dir = currentdir; 1064 1088 1065 cerr << " # get project files into " << dir << endl; 1089 CmtMessage::info ("get project files into " + dir); 1090 // cerr << " # get project files into " << dir << endl; 1066 1091 1067 1092 … … 1127 1152 if (m_simulation) 1128 1153 { 1129 cerr << "#CMT> Would fill in the CVS/Root file with " << endl; 1130 cerr << s << endl; 1154 CmtMessage::info ("Would fill in the CVS/Root file with\n" + s); 1155 // cerr << "#CMT> Would fill in the CVS/Root file with " << endl; 1156 // cerr << s << endl; 1131 1157 } 1132 1158 else … … 1134 1160 if (m_verbose) 1135 1161 { 1136 cerr << "#CMT> Fill in the CVS/Root file with " << endl; 1137 cerr << s << endl; 1162 CmtMessage::info ("Fill in the CVS/Root file with\n" + s); 1163 // cerr << "#CMT> Fill in the CVS/Root file with " << endl; 1164 // cerr << s << endl; 1138 1165 } 1139 1166 s.write (f); … … 1160 1187 if (m_simulation) 1161 1188 { 1162 cerr << "#CMT> Would fill in the CVS/Repository file with " << endl; 1163 cerr << s << endl; 1189 CmtMessage::info ("Would fill in the CVS/Repository file with\n" + s); 1190 // cerr << "#CMT> Would fill in the CVS/Repository file with " << endl; 1191 // cerr << s << endl; 1164 1192 } 1165 1193 else … … 1167 1195 if (m_verbose) 1168 1196 { 1169 cerr << "#CMT> Fill in the CVS/Repository file with " << endl; 1170 cerr << s << endl; 1197 CmtMessage::info ("Fill in the CVS/Repository file with\n" + s); 1198 // cerr << "#CMT> Fill in the CVS/Repository file with " << endl; 1199 // cerr << s << endl; 1171 1200 } 1172 1201 s.write (f); … … 1176 1205 if (m_simulation) 1177 1206 { 1178 cerr << "#CMT> Would write the top CVS/Entries file with " << endl; 1179 cerr << entries_text << endl; 1207 CmtMessage::info ("Would write the top CVS/Entries file with\n" + entries_text); 1208 // cerr << "#CMT> Would write the top CVS/Entries file with " << endl; 1209 // cerr << entries_text << endl; 1180 1210 } 1181 1211 else … … 1199 1229 if (m_verbose) 1200 1230 { 1201 cerr << "#CMT> Fill in the top CVS/Entries file with " << endl; 1202 cerr << text << endl; 1231 CmtMessage::info ("Fill in the top CVS/Entries file with\n" + text); 1232 // cerr << "#CMT> Fill in the top CVS/Entries file with " << endl; 1233 // cerr << text << endl; 1203 1234 } 1204 1235 … … 1226 1257 cmt_string dir = currentdir; 1227 1258 1228 cerr << " # get top files " << endl; 1259 CmtMessage::info ("get top files "); 1260 // cerr << " # get top files " << endl; 1229 1261 1230 1262 cmt_string command = "cvs -f -Q co -l "; … … 1273 1305 if (m_verbose) 1274 1306 { 1275 cerr << "#CMT> Now getting subdirectories pwd=" << CmtSystem::pwd () << " dir=" << dir << endl; 1307 CmtMessage::info ("Now getting subdirectories pwd=" + CmtSystem::pwd () 1308 + " dir=" + dir); 1309 // cerr << "#CMT> Now getting subdirectories pwd=" << CmtSystem::pwd () << " dir=" << dir << endl; 1276 1310 } 1277 1311 … … 1328 1362 { 1329 1363 1330 cerr << "# --> udapte the file timestamps" << endl; 1364 CmtMessage::info ("udapte the file timestamps"); 1365 // cerr << "# --> udapte the file timestamps" << endl; 1331 1366 for (i = 0; i < branch_vector.size (); i++) 1332 1367 { … … 1371 1406 { 1372 1407 1373 cerr << "# --> udapte the file timestamps" << endl; 1408 CmtMessage::info ("udapte the file timestamps"); 1409 // cerr << "# --> udapte the file timestamps" << endl; 1374 1410 for (i = 0; i < branch_vector.size (); i++) 1375 1411 { … … 1562 1598 1563 1599 add_cmtpath (here); 1564 1565 cerr << " # --> now getting project packages from the " << container << " " << here << endl; 1600 1601 CmtMessage::info ("now getting project packages from the " + container + " " + here); 1602 // cerr << " # --> now getting project packages from the " << container << " " << here << endl; 1566 1603 1567 1604 CmtSystem::cd (here); … … 1687 1724 if (m_verbose) 1688 1725 { 1726 CmtMessage::info ("do_checkout_phase2> offset=" + offset 1727 + " " + structure_info + "=" + product 1728 + " specified_version=" + specified_version 1729 + " tag=" + tag 1730 + " pwd=" + CmtSystem::pwd ()); 1731 /* 1689 1732 cerr << "#CMT> do_checkout_phase2> offset=" << offset 1690 1733 << " " << structure_info << "=" << product … … 1693 1736 << " pwd=" << CmtSystem::pwd () 1694 1737 << endl; 1738 */ 1695 1739 } 1696 1740 … … 1712 1756 if (version == "") 1713 1757 { 1714 cerr << "# ================= No version specified for " << structure_info << " " << product << endl; 1758 CmtMessage::warning ("================= No version specified for " + structure_info + " " + product); 1759 // cerr << "# ================= No version specified for " << structure_info << " " << product << endl; 1715 1760 return; 1716 1761 } … … 1763 1808 if (cvs_tag.find ("*") != cmt_string::npos) 1764 1809 { 1810 CmtMessage::warning ("================= " + structure_info + " " + product 1811 + " version " + cvs_tag + echo_ppath 1812 + " has wild cards and will not be considered."); 1813 /* 1765 1814 cerr << "# ================= " << structure_info << " " << product 1766 1815 << " version " << cvs_tag << echo_ppath 1767 1816 << " has wild cards and will not be considered." << endl; 1817 */ 1768 1818 return; 1769 1819 } … … 1802 1852 if (check_structure (dir, version)) 1803 1853 { 1854 CmtMessage::info ("================= " + structure_info + " " + product 1855 + " version " + version + echo_ppath 1856 + " already installed."); 1857 /* 1804 1858 cerr << "# ================= " << structure_info << " " << product 1805 1859 << " version " << version << echo_ppath 1806 1860 << " already installed." << endl; 1861 */ 1807 1862 recursive = false; 1808 1863 } … … 1815 1870 if (!really_checkout (offset, product, version, cvs_tag, module, dir, at_head)) 1816 1871 { 1817 cerr << "# bad return from really_checkout_product" << endl; 1872 CmtMessage::error ("bad return from really_checkout_product"); 1873 // cerr << "# bad return from really_checkout_product" << endl; 1818 1874 return; 1819 1875 } … … 1826 1882 if (m_simulation) 1827 1883 { 1828 cerr << "#CMT> " << structure_info << " directory not really created " << dir << endl; 1884 CmtMessage::info (structure_info + " directory not really created " + dir); 1885 // cerr << "#CMT> " << structure_info << " directory not really created " << dir << endl; 1829 1886 } 1830 1887 else if (structure_info == "package") … … 1832 1889 if (!CmtSystem::cd (dir)) 1833 1890 { 1834 cerr << "#CMT> Package directory not created " << dir << endl; 1891 CmtMessage::error ("Package directory not created " + dir); 1892 // cerr << "#CMT> Package directory not created " << dir << endl; 1835 1893 return; 1836 1894 } … … 1871 1929 else 1872 1930 { 1873 cerr << "# " << product << " not a CMT package" << endl; 1931 CmtMessage::error (product + " not a CMT package"); 1932 // cerr << "# " << product << " not a CMT package" << endl; 1874 1933 return; 1875 1934 } … … 1921 1980 if (m_verbose) 1922 1981 { 1923 cerr << "#CMT> dir=" << dir << endl; 1982 CmtMessage::info ("dir=" + dir); 1983 // cerr << "#CMT> dir=" << dir << endl; 1924 1984 } 1925 1985 1926 1986 if (!CmtSystem::cd (dir)) 1927 1987 { 1928 cerr << "#CMT> Project directory not created " << dir << endl; 1988 CmtMessage::error ("Project directory not created " + dir); 1989 // cerr << "#CMT> Project directory not created " << dir << endl; 1929 1990 return; 1930 1991 } … … 1938 1999 if (!CmtSystem::test_file (file_name)) 1939 2000 { 1940 cerr << "# " << product << " not a CMT project" << endl; 2001 CmtMessage::error (product + " not a CMT project"); 2002 // cerr << "# " << product << " not a CMT project" << endl; 1941 2003 return; 1942 2004 } … … 1947 2009 } 1948 2010 1949 cerr << "# ================= Project " << product << " completed" << endl; 2011 CmtMessage::info ("================= Project " + product + " completed"); 2012 // cerr << "# ================= Project " << product << " completed" << endl; 1950 2013 1951 2014 } … … 1968 2031 if (m_verbose) 1969 2032 { 1970 cerr << "#CMT> checkout phase1 module=" << module 1971 << " version_dir=" << version_dir << " version_tag=" << version_tag << endl; 2033 CmtMessage::info ("checkout phase1 module=" + module 2034 + " version_dir=" + version_dir + " version_tag=" + version_tag); 2035 // cerr << "#CMT> checkout phase1 module=" << module 2036 // << " version_dir=" << version_dir << " version_tag=" << version_tag << endl; 1972 2037 } 1973 2038 … … 1982 2047 if (m_verbose) 1983 2048 { 1984 cerr << "#CMT> Missing module name" << endl; 2049 CmtMessage::info ("Missing module name"); 2050 // cerr << "#CMT> Missing module name" << endl; 1985 2051 } 1986 2052 return; … … 2001 2067 if (error_info != "") 2002 2068 { 2003 cerr << error_info << endl; 2069 CmtMessage::error (error_info); 2070 // cerr << error_info << endl; 2004 2071 return; 2005 2072 } … … 2023 2090 if (m_verbose) 2024 2091 { 2025 cerr << "#CMT> cumulated versions " << versions << endl; 2092 CmtMessage::info ("cumulated versions " + versions); 2093 // cerr << "#CMT> cumulated versions " << versions << endl; 2026 2094 } 2027 2095 … … 2080 2148 if (m_verbose) 2081 2149 { 2082 cerr << "#CMT> about to checkout " << structure_info 2083 << " " << product << " version " << version << " into " << top_dir << endl; 2150 CmtMessage::info ("about to checkout " + structure_info 2151 + " " + product + " version " + version + " into " + top_dir); 2152 // cerr << "#CMT> about to checkout " << structure_info 2153 // << " " << product << " version " << version << " into " << top_dir << endl; 2084 2154 } 2085 2155 … … 2101 2171 if (!CmtSystem::test_file (file_name)) 2102 2172 { 2103 cerr << "# " << product << " was not properly checked out and is missing its cmt/project.cmt file" << endl; 2173 CmtMessage::error (product + " was not properly checked out and is missing its cmt/project.cmt file"); 2174 // cerr << "# " << product << " was not properly checked out and is missing its cmt/project.cmt file" << endl; 2104 2175 return; 2105 2176 } … … 2133 2204 else 2134 2205 { 2135 cerr << "# " << product << " was not properly checked out and is missing its cmt/requirements file" << endl; 2206 CmtMessage::error (product + " was not properly checked out and is missing its cmt/requirements file"); 2207 // cerr << "# " << product << " was not properly checked out and is missing its cmt/requirements file" << endl; 2136 2208 return; 2137 2209 } … … 2140 2212 if (m_verbose) 2141 2213 { 2142 cerr << "#CMT> product " << product << " has been checked out" << endl; 2214 CmtMessage::info ("product " + product + " has been checked out"); 2215 // cerr << "#CMT> product " << product << " has been checked out" << endl; 2143 2216 } 2144 2217 … … 2198 2271 if (CmtSystem::getenv ("CVSROOT") == "") 2199 2272 { 2200 cerr << "# Please set CVSROOT first !" << endl; 2273 CmtMessage::error ("Please set CVSROOT first !"); 2274 // cerr << "# Please set CVSROOT first !" << endl; 2201 2275 return; 2202 2276 } … … 2225 2299 if (error_info != "") 2226 2300 { 2227 cerr << error_info << endl; 2301 CmtMessage::error (error_info); 2302 // cerr << error_info << endl; 2228 2303 } 2229 2304 else … … 2250 2325 { 2251 2326 const cmt_string& s = v[i]; 2252 cerr << s << endl; 2327 cout << s << endl; 2328 // cerr << s << endl; 2253 2329 } 2254 2330 } … … 2269 2345 if (error_info != "") 2270 2346 { 2271 cerr << error_info << endl; 2347 CmtMessage::error (error_info); 2348 // cerr << error_info << endl; 2272 2349 } 2273 2350 else 2274 2351 { 2275 cerr << branches_info << endl; 2352 cout << branches_info << endl; 2353 // cerr << branches_info << endl; 2276 2354 } 2277 2355 } … … 2289 2367 if (error_info != "") 2290 2368 { 2291 cerr << error_info << endl; 2369 CmtMessage::error (error_info); 2370 // cerr << error_info << endl; 2292 2371 } 2293 2372 else 2294 2373 { 2295 cerr << subpackages_info << endl; 2374 cout << subpackages_info << endl; 2375 // cerr << subpackages_info << endl; 2296 2376 } 2297 2377 } … … 2309 2389 if (error_info != "") 2310 2390 { 2311 cerr << error_info << endl; 2391 CmtMessage::error (error_info); 2392 // cerr << error_info << endl; 2312 2393 } 2313 2394 else 2314 2395 { 2315 cerr << subprojects_info << endl; 2396 cout << subprojects_info << endl; 2397 // cerr << subprojects_info << endl; 2316 2398 } 2317 2399 } … … 2332 2414 if (CmtSystem::getenv ("CVSROOT") == "") 2333 2415 { 2334 cerr << "# Please set CVSROOT first !" << endl; 2416 CmtMessage::error ("Please set CVSROOT first !"); 2417 // cerr << "# Please set CVSROOT first !" << endl; 2335 2418 return; 2336 2419 } -
CMT/HEAD/source/cmt_error.cxx
r363 r459 8 8 #include "cmt_error.h" 9 9 #include "cmt_vector.h" 10 #include "cmt_log.h" 10 11 11 class Error12 class TheError 12 13 { 13 14 public: 14 static Error& instance ();15 static TheError& instance (); 15 16 16 Error ()17 TheError () 17 18 { 18 19 error_names.add() = "ok"; … … 40 41 } 41 42 42 ~ Error ()43 ~TheError () 43 44 { 44 45 } … … 88 89 89 90 //--------------------------------------------------------------- 90 Error&Error::instance ()91 TheError& TheError::instance () 91 92 { 92 static Error e;93 static TheError e; 93 94 94 95 return (e); … … 98 99 void CmtError::clear () 99 100 { 100 Error& e =Error::instance ();101 TheError& e = TheError::instance (); 101 102 102 103 e.clear (); … … 106 107 bool CmtError::has_pending_error () 107 108 { 108 Error& e =Error::instance ();109 TheError& e = TheError::instance (); 109 110 110 111 if (e.get_code () == ok) return (false); … … 115 116 CmtError::code CmtError::get_last_error_code () 116 117 { 117 Error& e =Error::instance ();118 TheError& e = TheError::instance (); 118 119 119 120 return (e.get_code ()); … … 123 124 int CmtError::get_last_execution_error () 124 125 { 125 Error& e =Error::instance ();126 TheError& e = TheError::instance (); 126 127 127 128 return (e.get_last_execution_error ()); … … 131 132 const cmt_string& CmtError::get_error_name (code error) 132 133 { 133 Error& e =Error::instance ();134 TheError& e = TheError::instance (); 134 135 135 136 return (e.get_name (error)); … … 139 140 void CmtError::set (code error, const cmt_string& text, const int execution_error) 140 141 { 141 Error& e =Error::instance ();142 TheError& e = TheError::instance (); 142 143 143 144 e.set (error, text, execution_error); … … 147 148 cmt_string CmtError::get_last_error () 148 149 { 149 Error& e =Error::instance ();150 TheError& e = TheError::instance (); 150 151 151 152 cmt_string result; … … 161 162 void CmtError::print () 162 163 { 163 Error& e = Error::instance (); 164 /* 165 TheError& e = TheError::instance (); 164 166 165 167 cerr << "CMT> Error: " << get_error_name (e.get_code ()) << " : " << e.get_text () << endl; 168 */ 169 CmtMessage::error (get_last_error ()); 166 170 } 167 171 -
CMT/HEAD/source/cmt_fragment.cxx
r400 r459 15 15 #include "cmt_system.h" 16 16 #include "cmt_database.h" 17 #include "cmt_log.h" 17 18 18 19 /*----------------------------------------------------------*/ … … 137 138 if (fragment == 0) 138 139 { 139 cerr << "Fragment " << name << " not found" << endl; 140 CmtMessage::info ("Fragment " + name + " not found"); 141 // cerr << "Fragment " << name << " not found" << endl; 140 142 } 141 143 else … … 1110 1112 if (!result) 1111 1113 { 1112 cerr << "#CMT> Fragment " << _name << " not found" << endl; 1114 CmtMessage::info ("Fragment " + _name + " not found"); 1115 // cerr << "#CMT> Fragment " << _name << " not found" << endl; 1113 1116 _fragment = 0; 1114 1117 } … … 1130 1133 if (!result) 1131 1134 { 1132 cerr << "#CMT> Fragment " << _name << " not found" << endl; 1135 CmtMessage::info ("Fragment " + _name + " not found"); 1136 // cerr << "#CMT> Fragment " << _name << " not found" << endl; 1133 1137 _fragment = 0; 1134 1138 } … … 1150 1154 if (!result) 1151 1155 { 1152 cerr << "#CMT> Fragment " << _name << " not found" << endl; 1156 CmtMessage::info ("Fragment " + _name + " not found"); 1157 // cerr << "#CMT> Fragment " << _name << " not found" << endl; 1153 1158 _fragment = 0; 1154 1159 } … … 1170 1175 if (!result) 1171 1176 { 1172 cerr << "#CMT> Fragment " << _name << " not found" << endl; 1177 CmtMessage::info ("Fragment " + _name + " not found"); 1178 // cerr << "#CMT> Fragment " << _name << " not found" << endl; 1173 1179 _fragment = 0; 1174 1180 } … … 1193 1199 if (!result) 1194 1200 { 1195 cerr << "#CMT> Fragment " << _name << " not found" << endl; 1201 CmtMessage::info ("Fragment " + _name + " not found"); 1202 // cerr << "#CMT> Fragment " << _name << " not found" << endl; 1196 1203 _fragment = 0; 1197 1204 } … … 1213 1220 if (!result) 1214 1221 { 1215 cerr << "#CMT> Fragment " << _name << " not found" << endl; 1222 CmtMessage::info ("Fragment " + _name + " not found"); 1223 // cerr << "#CMT> Fragment " << _name << " not found" << endl; 1216 1224 _fragment = 0; 1217 1225 } … … 1233 1241 if (!result) 1234 1242 { 1235 cerr << "#CMT> Fragment " << _name << " not found" << endl; 1243 CmtMessage::info ("Fragment " + _name + " not found"); 1244 // cerr << "#CMT> Fragment " << _name << " not found" << endl; 1236 1245 _fragment = 0; 1237 1246 } … … 1255 1264 if (!result) 1256 1265 { 1257 cerr << "#CMT> Fragment " << _name << " not found" << endl; 1266 CmtMessage::info ("Fragment " + _name + " not found"); 1267 // cerr << "#CMT> Fragment " << _name << " not found" << endl; 1258 1268 _fragment = 0; 1259 1269 } … … 1272 1282 if (_fragment == 0) 1273 1283 { 1274 cerr << "#CMT> Fragment " << _name << " not found" << endl; 1284 CmtMessage::info ("Fragment " + _name + " not found"); 1285 // cerr << "#CMT> Fragment " << _name << " not found" << endl; 1275 1286 } 1276 1287 } -
CMT/HEAD/source/cmt_generator.cxx
r428 r459 17 17 18 18 #include "cmt_generators.h" 19 #include "cmt_log.h" 19 20 20 21 //------------------------------------------------------------------------ … … 736 737 else 737 738 { 738 cerr << "#CMT> build constituent_makefile : wrong arguments" << endl; 739 CmtMessage::error ("build constituent_makefile : wrong arguments"); 740 // cerr << "#CMT> build constituent_makefile : wrong arguments" << endl; 739 741 return; 740 742 } -
CMT/HEAD/source/cmt_generators.cxx
r453 r459 107 107 { 108 108 file_not_found = true; 109 cerr << "#CMT> Warning: Source file " << file << " not found" << endl; 109 CmtMessage::warning ("Source file " + file + " not found"); 110 // cerr << "#CMT> Warning: Source file " << file << " not found" << endl; 110 111 } 111 112 … … 185 186 can_build = false; 186 187 obj = ""; 187 cerr << "#CMT> Warning: Source file " << name << " cannot be rebuilt" << endl; 188 CmtMessage::warning ("Source file " + name + " cannot be rebuilt"); 189 // cerr << "#CMT> Warning: Source file " << name << " cannot be rebuilt" << endl; 188 190 } 189 191 else … … 236 238 else 237 239 { 238 cerr << "#CMT> Warning: file " << m_FULLNAME << " not found" << endl; 240 CmtMessage::warning ("file " + m_FULLNAME + " not found"); 241 // cerr << "#CMT> Warning: file " << m_FULLNAME << " not found" << endl; 239 242 } 240 243 } … … 430 433 need_prototypes = constituent.need_prototypes; 431 434 432 cout << m_TITLE << " " << m_CONSTITUENT << endl; 435 // cout << m_TITLE << " " << m_CONSTITUENT << endl; 436 CmtMessage::info (m_TITLE + " " + m_CONSTITUENT); 433 437 434 438 lib = "$("; … … 881 885 int i; 882 886 883 cout << m_TITLE << " " << m_CONSTITUENT << endl; 887 // cout << m_TITLE << " " << m_CONSTITUENT << endl; 888 CmtMessage::info (m_TITLE + " " + m_CONSTITUENT); 884 889 885 890 // … … 1068 1073 if (!CmtSystem::test_file (file_name) && !CmtSystem::test_directory (file_name)) 1069 1074 { 1070 cerr << "#CMT> Warning: Source file " << file_name << " not found" << endl; 1075 CmtMessage::warning ("Source file " + file_name + " not found"); 1076 // cerr << "#CMT> Warning: Source file " << file_name << " not found" << endl; 1071 1077 } 1072 1078 … … 1117 1123 if (!CmtSystem::test_file (file) && !CmtSystem::test_directory (file)) 1118 1124 { 1119 cerr << "#CMT> Warning: Source file " << file << " not found" << endl; 1125 CmtMessage::warning ("Source file " + file + " not found"); 1126 // cerr << "#CMT> Warning: Source file " << file << " not found" << endl; 1120 1127 } 1121 1128 … … 1480 1487 if (file != NULL) 1481 1488 { 1489 CmtMessage::warning ("\n" 1490 "# A Makefile already exists " 1491 "but it does not provide\n" 1492 "# the recommended features " 1493 "for a full benefit of CMT\n" 1494 "#\n" 1495 "# CMT is now building " 1496 "a new 'Makefile.cmt' which you can use\n" 1497 "# to upgrade your current one."); 1498 /* 1482 1499 cerr << "# " << endl; 1483 1500 cerr << "#CMT> Warning: " << endl; … … 1491 1508 cerr << "# to upgrade your current one." << endl; 1492 1509 cerr << "# " << endl; 1493 1510 */ 1494 1511 s.write (file); 1495 1512 fclose (file); … … 2872 2889 if (f == 0) 2873 2890 { 2874 cerr << "Cannot open " << m_output_file_name << " for write" << endl; 2891 CmtMessage::error ("Cannot open " + m_output_file_name + " for write"); 2892 // cerr << "Cannot open " << m_output_file_name << " for write" << endl; 2875 2893 } 2876 2894 else … … 3007 3025 if (!CmtSystem::mkdir (stamp_output)) 3008 3026 { 3009 cerr << "Cannot create the binary output directory for this constituent" << endl; 3027 CmtMessage::error ("Cannot create the binary output directory for this constituent " + stamp_output); 3028 // cerr << "Cannot create the binary output directory for this constituent" << endl; 3010 3029 } 3011 3030 -
CMT/HEAD/source/cmt_install_area.cxx
r400 r459 13 13 #include "cmt_cmtpath_pattern.h" 14 14 #include "cmt_project.h" 15 #include "cmt_log.h" 15 16 16 17 CmtInstallAreaMgr& CmtInstallAreaMgr::instance () … … 86 87 if (installarea == "") return; 87 88 89 CmtMessage::warning ("Doing cleanup in the installation area " + installarea); 90 /* 88 91 if (!Cmt::get_quiet ()) 89 92 { 90 93 cerr << "#CMT> Warning: Doing cleanup in the installation area " << installarea << endl; 91 94 } 95 */ 92 96 93 97 Symbol* macro = Symbol::find ("cmt_installarea_paths"); … … 167 171 // and the reference file 168 172 173 CmtMessage::info ("Removing obsolete installed file [" + ref + "]" 174 " (and " + ref_file + ")"); 175 /* 169 176 if (!Cmt::get_quiet ()) 170 177 { … … 172 179 cerr << " (and " << ref_file << ")" << endl; 173 180 } 181 */ 174 182 175 183 CmtSystem::remove_file (ref); -
CMT/HEAD/source/cmt_lock.cxx
r429 r459 10 10 #include "cmt_error.h" 11 11 #include "cmt_symbol.h" 12 #include "cmt_log.h" 12 13 13 14 //---------------------------------------------------------- … … 73 74 } 74 75 75 cerr << "Package now locked" << endl; 76 CmtMessage::info ("Package now locked"); 77 // cerr << "Package now locked" << endl; 76 78 77 79 return (locked_by_user); … … 91 93 return (s); 92 94 case not_locked: 93 cerr << "Package not locked" << endl; 95 CmtMessage::info ("Package not locked"); 96 // cerr << "Package not locked" << endl; 94 97 return (s); 95 98 } … … 148 151 } 149 152 150 cerr << "Package now unlocked" << endl; 153 CmtMessage::info ("Package now unlocked"); 154 // cerr << "Package now unlocked" << endl; 151 155 152 156 return (not_locked); -
CMT/HEAD/source/cmt_log.h
r11 r459 40 40 #define Log static CmtLog log_instance 41 41 #define log_endl CmtLog::end () 42 #define log if (Cmt::get_debug ()) log_instance << "#CMT> (" << __FILE__ << "-" << __LINE__ << ") " 42 #define log if (Cmt::get_debug ()) log_instance << CmtMessage::prefix () + " (" << __FILE__ << ":" << __LINE__ << ") " 43 //#define log if (Cmt::get_debug ()) log_instance << "#CMT> (" << __FILE__ << "-" << __LINE__ << ") " 43 44 #define log_cont if (Cmt::get_debug ()) log_instance 44 45 46 47 enum CmtMsgLevel 48 { 49 Nil = 0, 50 Debug, 51 Info, 52 Warning, 53 Error, 54 Fatal 55 }; 56 57 class CmtMessage 58 { 59 public: 60 static cmt_string& prefix (); 61 static void set_prefix (const cmt_string& prefix); 62 static CmtMsgLevel& level (); 63 static void set_level (const CmtMsgLevel& level); 64 static bool active (const CmtMsgLevel& level); 65 static void info (const cmt_string& message); 66 static void warning (const cmt_string& message); 67 static void error (const cmt_string& message); 68 static void fatal (const cmt_string& message); 69 70 private: 71 CmtMessage (); 72 static CmtMessage& instance (); 73 cmt_string m_prefix; 74 CmtMsgLevel m_level; 75 }; 76 77 /**---------------------------------------------------------- 78 The CmtMessage default constructor 79 Here are primarily constructed all default definitions 80 */ 81 inline CmtMessage::CmtMessage () 82 : m_prefix ("#CMT--->"), m_level (Info) 83 { } 84 85 /**---------------------------------------------------------- 86 The CmtMessage singleton 87 */ 88 inline CmtMessage& CmtMessage::instance () 89 { 90 static CmtMessage me; 91 return me; 92 } 93 94 inline cmt_string& CmtMessage::prefix () 95 { 96 return instance ().m_prefix; 97 } 98 99 inline void CmtMessage::set_prefix (const cmt_string& prefix) 100 { 101 instance ().m_prefix = prefix; 102 } 103 104 inline CmtMsgLevel& CmtMessage::level () 105 { 106 return instance ().m_level; 107 } 108 109 inline void CmtMessage::set_level (const CmtMsgLevel& level) 110 { 111 instance ().m_level = level; 112 } 113 114 inline bool CmtMessage::active (const CmtMsgLevel& lvl) 115 { 116 return level () <= lvl; 117 } 118 119 inline void CmtMessage::info (const cmt_string& message) 120 { 121 if (active (Info)) 122 cerr << prefix () << " Info: " << message << endl; 123 } 124 125 inline void CmtMessage::warning (const cmt_string& message) 126 { 127 if (active (Warning)) 128 cerr << prefix () << " Warning: " << message << endl; 129 } 130 131 inline void CmtMessage::error (const cmt_string& message) 132 { 133 if (active (Error)) 134 cerr << prefix () << " Error: " << message << endl; 135 } 136 137 inline void CmtMessage::fatal (const cmt_string& message) 138 { 139 if (active (Fatal)) 140 cerr << prefix () << " Fatal: " << message << endl; 141 } 45 142 #endif -
CMT/HEAD/source/cmt_model.cxx
r400 r459 8 8 #include "cmt_fragment.h" 9 9 #include "cmt_symbol.h" 10 #include "cmt_log.h" 10 11 11 12 /** … … 199 200 if (it._pos != pos) 200 201 { 201 cerr << "Syntax error: no element name" << endl; 202 CmtMessage::error ("syntax: no element name"); 203 // cerr << "Syntax error: no element name" << endl; 202 204 break; 203 205 } … … 341 343 if (it._pos != pos) 342 344 { 343 cerr << "Syntax error : no attribute before closing the element [" << text.substr (pos) << "]" << endl; 345 CmtMessage::error ("syntax: no attribute before closing the element [" + text.substr (pos) + "]"); 346 // cerr << "Syntax error : no attribute before closing the element [" << text.substr (pos) << "]" << endl; 344 347 break; 345 348 } -
CMT/HEAD/source/cmt_parser.cxx
r457 r459 515 515 Me.clear (); 516 516 517 log << "configure_cmt_message" << log_endl; 518 //configure_cmt_message (); 519 configure_cmt_message (ap); 520 517 521 log << "configure_default_path" << log_endl; 518 522 configure_default_path (); … … 873 877 { 874 878 Me.m_current_version = "v*"; 875 cerr << "#CMT> Warning: " 876 << "Could not read `" << version_file << "'." 877 << " Default version " << Me.m_current_version << endl; 879 CmtMessage::warning ("Could not read `" + version_file + "'." 880 " Default version `" + Me.m_current_version + "'"); 878 881 } 879 882 … … 943 946 if (structuring_style == with_version_directory) 944 947 { 945 cerr << "#CMT> Warning: `" 946 << up_branch << "' is not correct version syntax." 947 " Assuming it is package name" << endl; 948 CmtMessage::warning ("`" + up_branch + "' is not correct version syntax." 949 " Assuming it is package name"); 948 950 } 949 951 // No version descriptor … … 952 954 Me.m_current_package = up_branch; 953 955 Me.m_current_version = "v*"; 954 cerr << "#CMT> Warning: " 955 << "Structuring style used `without_version_directory', `" 956 << version_file << "' missing." 957 << " Default version `" << Me.m_current_version << "'" << endl; 956 CmtMessage::warning ("Structuring style used `without_version_directory'" 957 ", `" + version_file + "' missing." 958 " Default version `" + Me.m_current_version + "'"); 958 959 CmtSystem::dirname (up_dir, Me.m_current_path); 959 960 … … 979 980 void Cmt::configure_current_structuring_style (const ArgParser& ap) 980 981 { 981 for (int i = ap.argc - 1; i >= 0; i--) 982 { 983 const cmt_string& arg = ap.argv[i]; 984 if (arg == "-without_version_directory") 982 cmt_string s; 983 s = CmtSystem::getenv ("CMTSTRUCTURINGSTYLE"); 984 if (s == "without_version_directory") 985 { 986 Me.m_current_structuring_style = without_version_directory; 987 } 988 else if (s == "with_version_directory") 989 { 990 Me.m_current_structuring_style = with_version_directory; 991 } 992 993 CmtSystem::cmt_string_vector flags; 994 Cmt::get_cmt_flags (flags); 995 for (int i = 0; i < flags.size (); i++) 996 { 997 const cmt_string& flag = flags[i]; 998 if (flag == "-without_version_directory") 985 999 { 986 1000 Me.m_current_structuring_style = without_version_directory; 987 return;988 1001 } 989 else if ( arg == "-with_version_directory")1002 else if (flag == "-with_version_directory") 990 1003 { 991 1004 Me.m_current_structuring_style = with_version_directory; 992 return; 1005 } 1006 } 1007 1008 for (int i = 1; i < ap.argc; i++) 1009 { 1010 const cmt_string& arg = ap.argv[i]; 1011 if (arg[0] != '-') break; 1012 if (arg == "-without_v" || 1013 arg == "-without_ve" || 1014 arg == "-without_ver" || 1015 arg == "-without_vers" || 1016 arg == "-without_versi" || 1017 arg == "-without_versio" || 1018 arg == "-without_version" || 1019 arg == "-without_version_" || 1020 arg == "-without_version_d" || 1021 arg == "-without_version_di" || 1022 arg == "-without_version_dir" || 1023 arg == "-without_version_dire" || 1024 arg == "-without_version_direc" || 1025 arg == "-without_version_direct" || 1026 arg == "-without_version_directo" || 1027 arg == "-without_version_director" || 1028 arg == "-without_version_directory") 1029 { 1030 Me.m_current_structuring_style = without_version_directory; 1031 // if (!CmtSystem::putenv ("CMTSTRUCTURINGSTYLE", "without_version_directory")) 1032 // CmtMessage::error ("Cannot set `CMTSTRUCTURINGSTYLE' to" 1033 // " `without_version_directory' in the environment"); 1034 if (!Cmt::add_cmt_flag ("-without_version_directory")) 1035 CmtMessage::error ("Cannot add flag `-without_version_directory'"); 993 1036 } 994 } 995 996 cmt_string s; 997 998 s = CmtSystem::getenv ("CMTSTRUCTURINGSTYLE"); 999 if (s == "without_version_directory") 1000 { 1001 Me.m_current_structuring_style = without_version_directory; 1002 } 1003 else if (s == "with_version_directory") 1004 { 1005 Me.m_current_structuring_style = with_version_directory; 1006 } 1037 else if (arg == "-with_v" || 1038 arg == "-with_ve" || 1039 arg == "-with_ver" || 1040 arg == "-with_vers" || 1041 arg == "-with_versi" || 1042 arg == "-with_versio" || 1043 arg == "-with_version" || 1044 arg == "-with_version_" || 1045 arg == "-with_version_d" || 1046 arg == "-with_version_di" || 1047 arg == "-with_version_dir" || 1048 arg == "-with_version_dire" || 1049 arg == "-with_version_direc" || 1050 arg == "-with_version_direct" || 1051 arg == "-with_version_directo" || 1052 arg == "-with_version_director" || 1053 arg == "-with_version_directory") 1054 { 1055 Me.m_current_structuring_style = with_version_directory; 1056 // if (!CmtSystem::putenv ("CMTSTRUCTURINGSTYLE", "with_version_directory")) 1057 // CmtMessage::error ("Cannot set `CMTSTRUCTURINGSTYLE' to" 1058 // " `with_version_directory' in the environment"); 1059 if (!Cmt::add_cmt_flag ("-with_version_directory")) 1060 CmtMessage::error ("Cannot add flag `-with_version_directory'"); 1061 } 1062 } 1007 1063 } 1008 1064 … … 1265 1321 1266 1322 //---------------------------------------------------------- 1323 //void Cmt::configure_cmt_message () 1324 void Cmt::configure_cmt_message (const ArgParser& ap) 1325 { 1326 cmt_string s; 1327 1328 s = CmtSystem::getenv ("CMTMSGPREFIX"); 1329 if (s != "") 1330 CmtMessage::set_prefix (s); 1331 1332 s = CmtSystem::getenv ("CMTFATAL"); 1333 if (s != "") 1334 { 1335 CmtMessage::set_level (Fatal); 1336 } 1337 1338 s = CmtSystem::getenv ("CMTERROR"); 1339 if (s != "") 1340 { 1341 CmtMessage::set_level (Error); 1342 } 1343 1344 s = CmtSystem::getenv ("CMTWARNING"); 1345 if (s != "") 1346 { 1347 CmtMessage::set_level (Warning); 1348 } 1349 1350 s = CmtSystem::getenv ("CMTINFO"); 1351 if (s != "") 1352 { 1353 CmtMessage::set_level (Info); 1354 } 1355 1356 s = CmtSystem::getenv ("CMTDEBUG"); 1357 if (s != "") 1358 { 1359 CmtMessage::set_level (Debug); 1360 } 1361 1362 CmtSystem::cmt_string_vector flags; 1363 Cmt::get_cmt_flags (flags); 1364 for (int i = 0; i < flags.size (); i++) 1365 { 1366 const cmt_string& flag = flags[i]; 1367 if (flag == "-disable_warnings") 1368 { 1369 Me.m_disable_warnings = true; 1370 if (CmtMessage::level () <= Warning) 1371 CmtMessage::set_level (Error); 1372 } 1373 else if (flag == "-quiet") 1374 { 1375 Me.m_quiet = true; 1376 if (CmtMessage::level () <= Error) 1377 CmtMessage::set_level (Fatal); 1378 } 1379 else if (flag == "-warnings") 1380 { 1381 Me.m_warnings = true; 1382 if (CmtMessage::level () != Warning) 1383 CmtMessage::set_level (Warning); 1384 // if (CmtMessage::level () > Warning) 1385 } 1386 } 1387 1388 for (int i = 1; i < ap.argc; i++) 1389 { 1390 const cmt_string& arg = ap.argv[i]; 1391 if (arg[0] != '-') break; 1392 if (arg == "-d" || 1393 arg == "-di" || 1394 arg == "-dis" || 1395 arg == "-disa" || 1396 arg == "-disab" || 1397 arg == "-disabl" || 1398 arg == "-disable" || 1399 arg == "-disable_" || 1400 arg == "-disable_w" || 1401 arg == "-disable_wa" || 1402 arg == "-disable_war" || 1403 arg == "-disable_warn" || 1404 arg == "-disable_warni" || 1405 arg == "-disable_warnin" || 1406 arg == "-disable_warning" || 1407 arg == "-disable_warnings") 1408 { 1409 Me.m_disable_warnings = true; 1410 if (CmtMessage::level () <= Warning) 1411 { 1412 CmtMessage::set_level (Error); 1413 // if (!CmtSystem::putenv ("CMTERROR", "1")) 1414 // CmtMessage::error ("Cannot set `CMTERROR' in the environment"); 1415 } 1416 if (!Cmt::add_cmt_flag ("-disable_warnings")) 1417 CmtMessage::error ("Cannot add flag `-disable_warnings'"); 1418 } 1419 else if (arg == "-q" || 1420 arg == "-qu" || 1421 arg == "-qui" || 1422 arg == "-quie" || 1423 arg == "-quiet") 1424 { 1425 Me.m_quiet = true; 1426 if (CmtMessage::level () <= Error) 1427 { 1428 CmtMessage::set_level (Fatal); 1429 // if (!CmtSystem::putenv ("CMTFATAL", "1")) 1430 // CmtMessage::error ("Cannot set `CMTFATAL' in the environment"); 1431 } 1432 if (!Cmt::add_cmt_flag ("-quiet")) 1433 CmtMessage::error ("Cannot add flag `-quiet'"); 1434 } 1435 else if (arg == "-warn" || 1436 arg == "-warni" || 1437 arg == "-warnin" || 1438 arg == "-warning" || 1439 arg == "-warnings") 1440 { 1441 Me.m_warnings = true; 1442 // if (CmtMessage::level () > Warning) 1443 if (CmtMessage::level () != Warning) 1444 { 1445 CmtMessage::set_level (Warning); 1446 // if (!CmtSystem::putenv ("CMTWARNING", "1")) 1447 // CmtMessage::error ("Cannot set `CMTWARNING' in the environment"); 1448 } 1449 if (!Cmt::add_cmt_flag ("-warnings")) 1450 CmtMessage::error ("Cannot add flag `-warnings'"); 1451 } 1452 } 1453 } 1454 1455 //---------------------------------------------------------- 1267 1456 // 1268 1457 // Actions … … 1285 1474 if (ap.arguments.size () < 1) 1286 1475 { 1287 cerr << "#CMT> cmt awk <file> <pattern>" << endl; 1476 CmtMessage::error ("cmt awk <file> <pattern>"); 1477 // cerr << "#CMT> cmt awk <file> <pattern>" << endl; 1288 1478 return; 1289 1479 } … … 1458 1648 if (!use->located ()) 1459 1649 { 1650 CmtMessage::warning ("package " + use->get_package_name () 1651 + " " + use->version + " " + use->path 1652 + " not found"); 1653 /* 1460 1654 if (!Me.m_quiet) 1461 1655 { … … 1465 1659 endl; 1466 1660 } 1661 */ 1467 1662 } 1468 1663 else … … 1623 1818 if (s.find ("cmt_standalone") != cmt_string::npos) 1624 1819 { 1625 cerr << "#CMT> Currently not in a CMT package" << endl; 1820 CmtMessage::warning ("Currently not in a CMT package"); 1821 // cerr << "#CMT> Currently not in a CMT package" << endl; 1626 1822 } 1627 1823 else 1628 1824 { 1825 char num[32]; sprintf (num, "%d/%d", i+1, uses.size ()); 1826 CmtMessage::error ("Cannot move to the package in " + s 1827 + " (" + num + ")"); 1828 /* 1629 1829 cerr << "#CMT> Cannot move to the package in " << s << " (" << i+1 << "/" 1630 1830 << uses.size () << ")"<< endl; 1831 */ 1631 1832 } 1632 1833 … … 1638 1839 if (CmtLock::check () == CmtLock::locked_by_another_user) 1639 1840 { 1841 char num[32]; sprintf (num, "%d/%d", i+1, uses.size ()); 1842 CmtMessage::warning ("Ignore locked package in " + s 1843 + " (" + num + ")"); 1844 /* 1640 1845 cerr << "#CMT> Ignore locked package in " << s << " (" << i+1 << "/" 1641 1846 << uses.size () << ")" << endl; 1847 */ 1642 1848 continue; 1643 1849 } … … 1686 1892 1687 1893 1894 if (CmtMessage::active (Error)) 1895 { 1688 1896 cout << "#--------------------------------------------------------------" << endl; 1689 1897 cout << "# Now trying [" << cmd << "] in " << s << " (" << i+1 << "/" << uses.size () 1690 1898 << ")" << endl; 1691 1899 cout << "#--------------------------------------------------------------" << endl; 1900 } 1692 1901 1693 1902 if (is_cmt) … … 2042 2251 if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag)) 2043 2252 { 2044 cerr << "#CMT> The tag " << t << " is not used in any tag expression. Please check spelling" << endl; 2253 CmtMessage::warning ("The tag " + t + " is not used in any tag expression. Please check spelling"); 2254 // cerr << "#CMT> The tag " << t << " is not used in any tag expression. Please check spelling" << endl; 2045 2255 } 2046 2256 } … … 2062 2272 if (!Tag::check_tag_used (tag) && !Symbol::check_tag_used (tag) && Cmt::get_warnings ()) 2063 2273 { 2064 cerr << "#CMT> The CMTSITE value " << env << " is not used in any tag expression. Please check spelling" << endl; 2274 CmtMessage::warning ("The CMTSITE value " + env + " is not used in any tag expression. Please check spelling"); 2275 // cerr << "#CMT> The CMTSITE value " << env << " is not used in any tag expression. Please check spelling" << endl; 2065 2276 } 2066 2277 … … 2160 2371 if (CmtSystem::test_file ("requirements")) 2161 2372 { 2373 if (CmtMessage::active (Error)) 2374 { 2162 2375 cout << "------------------------------------------" << endl; 2163 2376 cout << "Configuring environment for standalone package." << endl; … … 2165 2378 cout << "System is " << Me.m_cmt_config << endl; 2166 2379 cout << "------------------------------------------" << endl; 2380 } 2167 2381 2168 2382 install_test_setup_scripts (); … … 2198 2412 if (makes.size () > 0) 2199 2413 { 2200 cout << "Removing all previous make fragments from " << branch << endl; 2414 if (CmtMessage::active (Info)) 2415 cout << "Removing all previous make fragments from " << branch << endl; 2201 2416 2202 2417 for (int i = 0; i < makes.size (); i++) … … 2220 2435 if (makes.size () > 0) 2221 2436 { 2222 cout << "Removing all previous make fragments from " 2223 << Me.m_cmt_config << endl; 2437 if (CmtMessage::active (Info)) 2438 { 2439 cout << "Removing all previous make fragments from " 2440 << Me.m_cmt_config << endl; 2441 } 2224 2442 2225 2443 for (int i = 0; i < makes.size (); i++) … … 2253 2471 if (!reach_current_package ()) 2254 2472 { 2255 cout << "Cannot read the requirements file" << endl; 2473 CmtMessage::error ("Cannot read the requirements file"); 2474 // cout << "Cannot read the requirements file" << endl; 2256 2475 return; 2257 2476 } … … 2276 2495 if (!CmtSystem::mkdir (branch_name)) 2277 2496 { 2278 cout << "Cannot create the " << branch_name <<" branch" << endl; 2497 CmtMessage::error ("Cannot create the " + branch_name + " branch"); 2498 // cout << "Cannot create the " << branch_name <<" branch" << endl; 2279 2499 } 2280 2500 else 2281 2501 { 2282 cout << "Installing the " << branch_name << " directory" << endl; 2502 if (CmtMessage::active (Info)) 2503 cout << "Installing the " << branch_name << " directory" << endl; 2283 2504 } 2284 2505 } 2285 2506 else 2286 2507 { 2287 cout << branch_name << " directory already installed" << endl; 2508 if (CmtMessage::active (Info)) 2509 cout << branch_name << " directory already installed" << endl; 2288 2510 } 2289 2511 } … … 2330 2552 if (CmtSystem::test_file ("requirements")) 2331 2553 { 2554 if (CmtMessage::active (Error)) 2555 { 2332 2556 cout << "------------------------------------------" << endl; 2333 2557 cout << "Configuring environment for standalone package." << endl; … … 2335 2559 cout << "System is " << Me.m_cmt_config << endl; 2336 2560 cout << "------------------------------------------" << endl; 2337 2561 } 2338 2562 install_test_setup_scripts (); 2339 2563 install_test_cleanup_scripts (); … … 2379 2603 if (!reach_current_package ()) 2380 2604 { 2381 cout << "Cannot read the requirements file" << endl; 2605 CmtMessage::error ("Cannot read the requirements file"); 2606 // cout << "Cannot read the requirements file" << endl; 2382 2607 return; 2383 2608 } … … 2401 2626 if (!CmtSystem::mkdir (branch_name)) 2402 2627 { 2403 cout << "Cannot create the " << branch_name <<" branch" << endl; 2628 CmtMessage::error ("Cannot create the " + branch_name + " branch"); 2629 // cout << "Cannot create the " << branch_name <<" branch" << endl; 2404 2630 } 2405 2631 else 2406 2632 { 2407 cout << "Installing the " << branch_name << " directory" << endl; 2633 if (CmtMessage::active (Info)) 2634 cout << "Installing the " << branch_name << " directory" << endl; 2408 2635 } 2409 2636 } 2410 2637 else 2411 2638 { 2412 cout << branch_name << " directory already installed" << endl; 2639 if (CmtMessage::active (Info)) 2640 cout << branch_name << " directory already installed" << endl; 2413 2641 } 2414 2642 } … … 2456 2684 // Now 'the_path' contains the complete path where the package will be created 2457 2685 2686 if (CmtMessage::active (Error)) 2687 { 2458 2688 cout << "------------------------------------------" << endl; 2459 2689 cout << "Configuring environment for package " << package << … … 2463 2693 cout << "System is " << Me.m_cmt_config << endl; 2464 2694 cout << "------------------------------------------" << endl; 2695 } 2465 2696 2466 2697 if (!CmtSystem::test_directory (the_path)) … … 2468 2699 if (!CmtSystem::mkdir (the_path)) 2469 2700 { 2470 cout << "Cannot create the path directory" << endl; 2701 CmtMessage::error ("Cannot create the path directory"); 2702 // cout << "Cannot create the path directory" << endl; 2471 2703 return; 2472 2704 } 2473 2705 else 2474 2706 { 2475 cout << "Installing the path directory" << endl; 2707 if (CmtMessage::active (Info)) 2708 cout << "Installing the path directory" << endl; 2476 2709 } 2477 2710 } … … 2483 2716 if (!CmtSystem::mkdir (package)) 2484 2717 { 2485 cout << "Cannot create the package directory" << endl; 2718 CmtMessage::error ("Cannot create the package directory"); 2719 // cout << "Cannot create the package directory" << endl; 2486 2720 return; 2487 2721 } 2488 2722 else 2489 2723 { 2490 cout << "Installing the package directory" << endl; 2724 if (CmtMessage::active (Info)) 2725 cout << "Installing the package directory" << endl; 2491 2726 } 2492 2727 } 2493 2728 else 2494 2729 { 2495 cout << "Package directory already installed" << endl; 2730 if (CmtMessage::active (Info)) 2731 cout << "Package directory already installed" << endl; 2496 2732 } 2497 2733 … … 2528 2764 if (!CmtSystem::mkdir (version)) 2529 2765 { 2530 cout << "Cannot create the version directory" << endl; 2766 CmtMessage::error ("Cannot create the version directory"); 2767 // cout << "Cannot create the version directory" << endl; 2531 2768 return; 2532 2769 } 2533 2770 else 2534 2771 { 2535 cout << "Installing the version directory" << endl; 2772 if (CmtMessage::active (Info)) 2773 cout << "Installing the version directory" << endl; 2536 2774 } 2537 2775 } 2538 2776 else 2539 2777 { 2540 cout << "Version directory already installed" << endl; 2778 if (CmtMessage::active (Info)) 2779 cout << "Version directory already installed" << endl; 2541 2780 } 2542 2781 … … 2545 2784 else 2546 2785 { 2547 cout << "Version directory will not be created due to structuring style" << endl; 2786 if (CmtMessage::active (Info)) 2787 cout << "Version directory will not be created due to structuring style" << endl; 2548 2788 } 2549 2789 … … 2554 2794 if (!CmtSystem::mkdir ("cmt")) 2555 2795 { 2556 cout << "Cannot create the cmt directory" << endl; 2796 CmtMessage::error ("Cannot create the cmt directory"); 2797 // cout << "Cannot create the cmt directory" << endl; 2557 2798 return; 2558 2799 } … … 2568 2809 } 2569 2810 2570 cout << "Installing the cmt directory" << endl; 2811 if (CmtMessage::active (Info)) 2812 cout << "Installing the cmt directory" << endl; 2571 2813 } 2572 2814 } … … 2582 2824 } 2583 2825 2584 cout << "Mgr directory already installed" << endl; 2826 if (CmtMessage::active (Info)) 2827 cout << "Mgr directory already installed" << endl; 2585 2828 } 2586 2829 } … … 2596 2839 } 2597 2840 2598 cout << "Cmt directory already installed" << endl; 2841 if (CmtMessage::active (Info)) 2842 cout << "Cmt directory already installed" << endl; 2599 2843 } 2600 2844 … … 2603 2847 if (!CmtSystem::mkdir ("src")) 2604 2848 { 2605 cout << "Cannot create the src directory" << endl; 2849 CmtMessage::error ("Cannot create the src directory"); 2850 // cout << "Cannot create the src directory" << endl; 2606 2851 return; 2607 2852 } 2608 2853 else 2609 2854 { 2610 cout << "Installing the src directory" << endl; 2855 if (CmtMessage::active (Info)) 2856 cout << "Installing the src directory" << endl; 2611 2857 } 2612 2858 } 2613 2859 else 2614 2860 { 2615 cout << "src directory already installed" << endl; 2861 if (CmtMessage::active (Info)) 2862 cout << "src directory already installed" << endl; 2616 2863 } 2617 2864 … … 2801 3048 Symbol::expand (cmd); 2802 3049 2803 cerr << "Execute action " << ap.arguments[0] << " => " << cmd << endl;3050 CmtMessage::info ("Execute action " + ap.arguments[0] + " => " + cmd); 2804 3051 2805 3052 int status = CmtSystem::execute (cmd); … … 2849 3096 if (!CmtSystem::test_file (input)) 2850 3097 { 2851 cerr << "#CMT> File " << input << " not found" << endl; 3098 CmtMessage::error ("File " + input + " not found"); 3099 // cerr << "#CMT> File " << input << " not found" << endl; 2852 3100 return; 2853 3101 } … … 2864 3112 if (file == NULL) 2865 3113 { 2866 cerr << "#CMT> Cannot write filtered file " << output << endl; 3114 CmtMessage::error ("Cannot write filtered file " + output); 3115 // cerr << "#CMT> Cannot write filtered file " << output << endl; 2867 3116 } 2868 3117 else … … 2896 3145 //(unsused) Use& use = Use::current(); 2897 3146 2898 cerr << "try to lock package " << package << " in " << CmtSystem::pwd () << endl; 3147 CmtMessage::info ("try to lock package " + package + " in " + CmtSystem::pwd ()); 3148 // cerr << "try to lock package " << package << " in " << CmtSystem::pwd () << endl; 2899 3149 2900 3150 set_standard_macros (); … … 2936 3186 CmtSystem::compress_path (the_path); 2937 3187 3188 if (CmtMessage::active (Info)) 3189 { 2938 3190 cout << "------------------------------------------" << endl; 2939 3191 cout << "Removing package " << package << … … 2943 3195 cout << "System is " << Me.m_cmt_config << endl; 2944 3196 cout << "------------------------------------------" << endl; 3197 } 2945 3198 2946 3199 the_path += CmtSystem::file_separator (); … … 2949 3202 if (!CmtSystem::cd (the_path)) 2950 3203 { 2951 cerr << "Path " << the_path << " not reachable" << endl; 3204 CmtMessage::error ("Path " + the_path + " not reachable"); 3205 // cerr << "Path " << the_path << " not reachable" << endl; 2952 3206 return; 2953 3207 } … … 2957 3211 if (CmtSystem::remove_directory (version)) 2958 3212 { 2959 cerr << "Version " << version << " has been removed from " << the_path << endl; 3213 if (CmtMessage::active (Info)) 3214 cerr << "Version " << version << " has been removed from " << the_path << endl; 2960 3215 CmtSystem::cmt_string_vector contents; 2961 3216 CmtSystem::scan_dir (".", contents); … … 2965 3220 if (CmtSystem::remove_directory (package)) 2966 3221 { 2967 cerr << "Package " << package << " has no more versions. Thus it has been removed."<< endl; 3222 if (CmtMessage::active (Info)) 3223 cerr << "Package " << package << " has no more versions. Thus it has been removed."<< endl; 2968 3224 } 2969 3225 } … … 2971 3227 else 2972 3228 { 2973 cerr << "Impossible to remove version " << version << " from " << the_path << endl; 3229 CmtMessage::warning ("Impossible to remove version " + version + " from " + the_path); 3230 // cerr << "Impossible to remove version " << version << " from " << the_path << endl; 2974 3231 } 2975 3232 } … … 2986 3243 if (!CmtSystem::remove_directory ("cmt")) 2987 3244 { 3245 if (CmtMessage::active (Info)) 3246 { 2988 3247 cerr << "Unstructured version " << version 2989 3248 << " has been removed from " << the_path << endl; 3249 } 2990 3250 } 2991 3251 else 2992 3252 { 2993 cerr << "Impossible to remove unstructured version " << version 2994 << " from " << the_path << endl; 3253 CmtMessage::warning ("Impossible to remove unstructured version " + version + " from " + the_path); 3254 // cerr << "Impossible to remove unstructured version " << version 3255 // << " from " << the_path << endl; 2995 3256 } 2996 3257 } 2997 3258 else 2998 3259 { 2999 cerr << "Version " << version << " not found" << endl; 3260 CmtMessage::warning ("Version " + version + " not found"); 3261 // cerr << "Version " << version << " not found" << endl; 3000 3262 } 3001 3263 } 3002 3264 else 3003 3265 { 3004 cerr << "Version " << version << " not found" << endl; 3266 CmtMessage::warning ("Version " + version + " not found"); 3267 // cerr << "Version " << version << " not found" << endl; 3005 3268 } 3006 3269 } … … 3051 3314 if (!use->located ()) 3052 3315 { 3316 CmtMessage::warning ("package " + use->get_package_name () 3317 + " " + use->version + " " + use->path 3318 + " not found"); 3319 /* 3053 3320 if (!Me.m_quiet) 3054 3321 { … … 3058 3325 endl; 3059 3326 } 3327 */ 3060 3328 } 3061 3329 else … … 3185 3453 if (status != 2) CmtError::set (CmtError::execution_error, s); 3186 3454 3187 cerr << "#CMT> Cannot remove the symbolic link " << s << endl; 3455 CmtMessage::warning ("Cannot remove the symbolic link " + s); 3456 // cerr << "#CMT> Cannot remove the symbolic link " << s << endl; 3188 3457 3189 3458 break; … … 3218 3487 void Cmt::do_run_sequence (const ArgParser& ap) 3219 3488 { 3220 if (ap.arguments.size () == 0) cerr << "#CMT> run_sequence: no sequence specified" << endl; 3489 if (ap.arguments.size () == 0) 3490 CmtMessage::warning ("run_sequence: no sequence specified"); 3491 //cerr << "#CMT> run_sequence: no sequence specified" << endl; 3221 3492 3222 3493 SequenceRunner runner; 3223 3494 3224 cerr << "# cmt run_sequence: sequence " << ap.arguments[0] << endl; 3495 if (CmtMessage::active (Info)) 3496 cerr << "# cmt run_sequence: sequence " << ap.arguments[0] << endl; 3225 3497 3226 3498 runner.run (ap.arguments[0]); … … 3230 3502 void Cmt::do_set_version (const ArgParser& ap) 3231 3503 { 3232 if (ap.arguments.size () == 0) cerr << "#CMT> set version: no version specified" << endl; 3504 if (ap.arguments.size () == 0) 3505 CmtMessage::warning ("set version: no version specified"); 3506 //cerr << "#CMT> set version: no version specified" << endl; 3233 3507 3234 3508 const cmt_string& version = ap.arguments[0]; … … 3238 3512 if (!CmtSystem::is_version_directory (version, v, r, p)) 3239 3513 { 3240 cerr << "#CMT> set version " << version << " is not a correct version syntax" << endl; 3514 CmtMessage::error ("set version " + version + " is not a correct version syntax"); 3515 // cerr << "#CMT> set version " << version << " is not a correct version syntax" << endl; 3241 3516 return; 3242 3517 } … … 3244 3519 if ((v == -1) || (r == -1) || (p == -1)) 3245 3520 { 3246 cerr << "#CMT> set version " << version 3247 << " You cannot use wild card to set a version" << endl; 3521 CmtMessage::error ("set version " + version 3522 + " You cannot use wild card to set a version"); 3523 // cerr << "#CMT> set version " << version 3524 // << " You cannot use wild card to set a version" << endl; 3248 3525 return; 3249 3526 } … … 3258 3535 if (branch != "cmt") 3259 3536 { 3260 cerr << "#CMT> set version " << version << " must be applied in a cmt directory" 3261 << endl; 3537 CmtMessage::error ("set version " + version 3538 + " must be applied in a cmt directory"); 3539 // cerr << "#CMT> set version " << version << " must be applied in a cmt directory" 3540 // << endl; 3262 3541 return; 3263 3542 } … … 3268 3547 if (branch == version) 3269 3548 { 3270 cerr << "#CMT> set version " << version << " is already available as a version directory" 3271 << endl; 3549 CmtMessage::warning ("set version " + version 3550 + " is already available as a version directory"); 3551 // cerr << "#CMT> set version " << version << " is already available as a version directory" 3552 // << endl; 3272 3553 return; 3273 3554 } 3274 3555 3275 cerr << "Writing version file : " << version << endl; 3556 CmtMessage::info ("Writing version file : " + version); 3557 // cerr << "Writing version file : " << version << endl; 3276 3558 3277 3559 version.write ("version.cmt"); … … 4012 4294 // (unused??) Use& use = Use::current(); 4013 4295 4014 cerr << "try to unlock package " << package << " in " << CmtSystem::pwd () << endl; 4296 CmtMessage::info ("try to unlock package " + package + " in " + CmtSystem::pwd ()); 4297 // cerr << "try to unlock package " << package << " in " << CmtSystem::pwd () << endl; 4015 4298 4016 4299 set_standard_macros (); … … 4151 4434 { 4152 4435 return (Me.m_all_sets_done); 4436 } 4437 4438 //---------------------------------------------------------- 4439 void Cmt::get_cmt_flags (CmtSystem::cmt_string_vector& flags) 4440 { 4441 CmtSystem::split (CmtSystem::getenv ("CMTFLAGS"), " \t", flags); 4442 } 4443 4444 //---------------------------------------------------------- 4445 cmt_string Cmt::get_cmt_flags () 4446 { 4447 return CmtSystem::getenv ("CMTFLAGS"); 4448 } 4449 4450 //---------------------------------------------------------- 4451 bool Cmt::set_cmt_flags (const cmt_string& cmtflags) 4452 { 4453 return CmtSystem::putenv ("CMTFLAGS", cmtflags) ? 4454 true : 4455 (CmtMessage::error ("Cannot set `CMTFLAGS' to `" + cmtflags + 4456 "' in the environment"), 4457 false) ; 4458 } 4459 4460 //---------------------------------------------------------- 4461 bool Cmt::add_cmt_flag (const cmt_string& flag) 4462 { 4463 CmtSystem::cmt_string_vector flags; 4464 get_cmt_flags (flags); 4465 cmt_string cmtflags; 4466 for (int i = 0; i < flags.size (); i++) 4467 { 4468 if (flags[i] == flag) continue; 4469 if (cmtflags == "") 4470 cmtflags = flags[i]; 4471 else 4472 cmtflags += " " + flags[i]; 4473 } 4474 4475 if (cmtflags == "") 4476 cmtflags = flag; 4477 else 4478 cmtflags += " " + flag; 4479 4480 return set_cmt_flags (cmtflags); 4153 4481 } 4154 4482 … … 4311 4639 #endif 4312 4640 4313 cerr << "Creating cleanup scripts." << endl; 4641 if (CmtMessage::active (Error)) 4642 cerr << "Creating cleanup scripts." << endl; 4314 4643 4315 4644 cmt_string temp; … … 4397 4726 #endif 4398 4727 4399 cerr << "Creating setup scripts." << endl; 4728 if (CmtMessage::active (Error)) 4729 cerr << "Creating setup scripts." << endl; 4400 4730 4401 4731 Use& current_use = Use::current (); … … 4511 4841 #endif 4512 4842 4513 cerr << "Creating cleanup scripts." << endl; 4843 if (CmtMessage::active (Error)) 4844 cerr << "Creating cleanup scripts." << endl; 4514 4845 4515 4846 cmt_string temp; … … 4590 4921 if (value != "") 4591 4922 { 4592 cerr << "Creating native_version file." << endl; 4923 if (CmtMessage::active (Info)) 4924 cerr << "Creating native_version file." << endl; 4593 4925 4594 4926 FILE* f = fopen ("new.native_version.cmt", "wb"); … … 4618 4950 #endif 4619 4951 4620 cerr << "Creating setup scripts." << endl; 4952 if (CmtMessage::active (Error)) 4953 cerr << "Creating setup scripts." << endl; 4621 4954 4622 4955 Use& current_use = Use::current (); … … 4804 5137 if (!CmtSystem::cd (Me.m_current_path)) 4805 5138 { 5139 CmtMessage::error ("Cannot reach the directory " + Me.m_current_path); 5140 /* 4806 5141 if (!Me.m_quiet) 4807 5142 { … … 4809 5144 Me.m_current_path << endl; 4810 5145 } 5146 */ 4811 5147 CmtError::set (CmtError::package_not_found, "Load> Cannot reach the path directory"); 4812 5148 CmtSystem::cd (Me.m_current_dir); … … 4820 5156 if (!CmtSystem::cd (Me.m_current_package)) 4821 5157 { 5158 CmtMessage::error ("Cannot reach the package " + Me.m_current_package); 5159 /* 4822 5160 if (!Me.m_quiet) 4823 5161 { … … 4825 5163 Me.m_current_package << endl; 4826 5164 } 5165 */ 4827 5166 CmtError::set (CmtError::package_not_found, "Load> Cannot reach the package directory"); 4828 5167 CmtSystem::cd (Me.m_current_dir); … … 4840 5179 if (!CmtSystem::test_directory ("cmt")) 4841 5180 { 5181 CmtMessage::error ("Cannot reach the version " + Me.m_current_version); 5182 /* 4842 5183 if (!Me.m_quiet) 4843 5184 { … … 4845 5186 Me.m_current_version << endl; 4846 5187 } 5188 */ 4847 5189 CmtError::set (CmtError::package_not_found, "Load> Cannot reach the version directory"); 4848 5190 CmtSystem::cd (Me.m_current_dir); … … 4879 5221 else 4880 5222 { 5223 CmtMessage::error ("Cannot reach the mgr branch"); 5224 /* 4881 5225 if (!Me.m_quiet) 4882 5226 { 4883 5227 cerr << "#CMT> Cannot reach the mgr branch" << endl; 4884 5228 } 5229 */ 4885 5230 4886 5231 CmtError::set (CmtError::package_not_found, … … 5032 5377 } 5033 5378 5379 // save CMTFLAGS 5380 cmt_string cmtflags (get_cmt_flags ()); 5381 5034 5382 clear (); 5035 5383 … … 5069 5417 if (Me.m_configure_error != "") 5070 5418 { 5071 if (!Me.m_quiet) cerr << "#CMT> Error: " << Me.m_configure_error << endl; 5419 CmtMessage::error (Me.m_configure_error); 5420 // if (!Me.m_quiet) cerr << "#CMT> Error: " << Me.m_configure_error << endl; 5072 5421 return (CmtError::execution_error); 5073 5422 } … … 5645 5994 break; 5646 5995 case action_load : 5647 cerr << "#CMT> action not implemented" << endl; 5996 CmtMessage::error ("action not implemented"); 5997 // cerr << "#CMT> action not implemented" << endl; 5648 5998 break; 5649 5999 case action_lock : … … 5820 6170 } 5821 6171 } 6172 6173 // restore CMTFLAGS 6174 set_cmt_flags (cmtflags); 5822 6175 5823 6176 if (CmtError::has_pending_error ()) … … 6300 6653 else 6301 6654 { 6655 CmtMessage::error ("Cannot reach the mgr branch"); 6656 /* 6302 6657 if (!Me.m_quiet) 6303 6658 { 6304 6659 cerr << "#CMT> Cannot reach the mgr branch" << endl; 6305 6660 } 6661 */ 6306 6662 6307 6663 CmtError::set (CmtError::package_not_found, -
CMT/HEAD/source/cmt_pattern.cxx
r400 r459 16 16 #include "cmt_error.h" 17 17 #include "cmt_syntax.h" 18 #include "cmt_log.h" 18 19 19 20 … … 915 916 { 916 917 state = in_error; 918 CmtMessage::warning ("bad syntax in apply_pattern " + name 919 + " (missing '=' separator)" 920 + ( (use != 0) ? 921 " (from " + use->get_package_name () + ")": 922 "" ) 923 ); 924 /* 917 925 if (!Cmt::get_quiet ()) 918 926 { … … 924 932 cerr << endl; 925 933 } 934 */ 926 935 break; 927 936 } … … 990 999 if (p->line.find (tsearch) == cmt_string::npos) 991 1000 { 1001 CmtMessage::warning ("template <" + tname 1002 + "> not expected in pattern " + name 1003 + ( (use != 0) ? 1004 " (from " + use->get_package_name () + ")": 1005 "" ) 1006 ); 1007 /* 992 1008 if (!Cmt::get_quiet ()) 993 1009 { … … 996 1012 cerr << endl; 997 1013 } 1014 */ 998 1015 } 999 1016 -
CMT/HEAD/source/cmt_project.cxx
r457 r459 18 18 #include "cmt_tag.h" 19 19 #include "cmt_error.h" 20 #include "cmt_log.h" 20 21 21 22 class ProjectReader : public Awk … … 232 233 if (r != p.get_release ()) 233 234 { 235 CmtMessage::error ("Project " + p.get_name () 236 + " requested with conflicting releases " 237 + p.get_release () + " and " + r); 238 /* 234 239 if (!Cmt::get_quiet ()) 235 240 { … … 237 242 << " requested with conflicting releases " << p.get_release () << " and " << r << endl; 238 243 } 244 */ 239 245 CmtError::set (CmtError::project_release_conflict, p.get_name ()); 240 246 } … … 420 426 // The specified name is not in the path. 421 427 428 CmtMessage::warning ("none of specified project names " 429 + specified_name + " from graph and " 430 + project_name + " from project file match path."); 431 /* 422 432 if (!Cmt::get_quiet ()) 423 433 { … … 428 438 << " from project file match path." << endl; 429 439 } 440 */ 430 441 431 442 name = specified_name; … … 650 661 cmt_string pwd = CmtSystem::pwd (); 651 662 663 if (CmtMessage::active (Error)) 664 { 652 665 cerr << "------------------------------------------" << endl; 653 666 cerr << "Configuring environment for project " << name << " " << release << " (from " << pwd << ") "; … … 661 674 cerr << "CMT version " << Cmt::get_cmt_version () << "." << endl; 662 675 cerr << "------------------------------------------" << endl; 676 } 663 677 664 678 if (path != "") … … 666 680 if (!CmtSystem::mkdir (path)) 667 681 { 668 cerr << "Cannot create the " << path << " directory" << endl; 682 CmtMessage::error ("Cannot create the " + path + " directory"); 683 // cerr << "Cannot create the " << path << " directory" << endl; 669 684 return (false); 670 685 } … … 672 687 if (!CmtSystem::cd (path)) 673 688 { 674 cerr << "Cannot access the " << path << " directory" << endl; 689 CmtMessage::error ("Cannot access the " + path + " directory"); 690 // cerr << "Cannot access the " << path << " directory" << endl; 675 691 return (false); 676 692 } … … 679 695 if (!CmtSystem::mkdir (name)) 680 696 { 681 cerr << "Cannot create the " << name << " directory" << endl; 697 CmtMessage::error ("Cannot create the " + name + " directory"); 698 // cerr << "Cannot create the " << name << " directory" << endl; 682 699 return (false); 683 700 } … … 685 702 if (!CmtSystem::cd (name)) 686 703 { 687 cerr << "Cannot access the " << name << " directory" << endl; 704 CmtMessage::error ("Cannot access the " + name + " directory"); 705 // cerr << "Cannot access the " << name << " directory" << endl; 688 706 return (false); 689 707 } … … 693 711 if (!CmtSystem::mkdir (release)) 694 712 { 695 cerr << "Cannot create the " << release << " directory" << endl; 713 CmtMessage::error ("Cannot create the " + release + " directory"); 714 // cerr << "Cannot create the " << release << " directory" << endl; 696 715 return (false); 697 716 } … … 699 718 if (!CmtSystem::cd (release)) 700 719 { 701 cerr << "Cannot access the " << release << " directory" << endl; 720 CmtMessage::error ("Cannot access the " + release + " directory"); 721 // cerr << "Cannot access the " << release << " directory" << endl; 702 722 return (false); 703 723 } … … 708 728 if (!CmtSystem::mkdir ("cmt")) 709 729 { 710 cerr << "Cannot create the cmt directory" << endl; 730 CmtMessage::error ("Cannot create the cmt directory"); 731 // cerr << "Cannot create the cmt directory" << endl; 711 732 return (false); 712 733 } 713 734 else 714 735 { 715 cerr << "Installing the cmt directory" << endl; 736 if (CmtMessage::active (Info)) 737 cerr << "Installing the cmt directory" << endl; 716 738 } 717 739 } … … 721 743 if (!CmtSystem::test_file (get_project_file_name ())) 722 744 { 723 cerr << "Creating a new project file" << endl; 745 if (CmtMessage::active (Info)) 746 cerr << "Creating a new project file" << endl; 724 747 725 748 ofstream f (get_project_file_name ()); … … 732 755 else 733 756 { 734 cerr << "Cannot create the project file" << endl; 757 CmtMessage::error ("Cannot create the project file"); 758 // cerr << "Cannot create the project file" << endl; 735 759 return (false); 736 760 } … … 746 770 p.commit (); 747 771 748 cerr << "project file already there" << endl; 772 if (CmtMessage::active (Info)) 773 cerr << "project file already there" << endl; 749 774 } 750 775 … … 831 856 if (project != 0) 832 857 { 833 if (!Cmt::get_quiet ())834 {858 // if (!Cmt::get_quiet ()) 859 // { 835 860 if (release != project->get_release ()) 836 861 { 837 cerr << "#CMT> Project " << name << " requested with conflicting releases " << project->get_release () << " and " << release << endl; 862 CmtMessage::error ("Project " + name 863 + " requested with conflicting releases " 864 + project->get_release () + " and " + release); 865 // cerr << "#CMT> Project " << name << " requested with conflicting releases " << project->get_release () << " and " << release << endl; 838 866 CmtError::set (CmtError::project_release_conflict, name); 839 867 } 840 }868 // } 841 869 842 870 // Project objects are recreated here to follow the hierarchy … … 1592 1620 if (!found && (cmtprojectpath != "")) 1593 1621 { 1594 cerr << "#CMT> Project " << name << " " << release << " requested by " << m_name << " not found in CMTPROJECTPATH" << endl; 1622 CmtMessage::warning ("Project " + name + " " + release + " requested by " + m_name + " not found in CMTPROJECTPATH"); 1623 // cerr << "#CMT> Project " << name << " " << release << " requested by " << m_name << " not found in CMTPROJECTPATH" << endl; 1595 1624 } 1596 1625 } … … 1873 1902 if (def == 0) 1874 1903 { 1875 cerr << "#CMT> strategy " << name << " undefined" << endl; 1904 CmtMessage::warning ("strategy " + name + " undefined"); 1905 // cerr << "#CMT> strategy " << name << " undefined" << endl; 1876 1906 return (false); 1877 1907 } … … 1930 1960 if (def == 0) 1931 1961 { 1932 cerr << "#CMT> strategy " << name << " undefined" << endl; 1962 CmtMessage::warning ("strategy " + name + " undefined"); 1963 // cerr << "#CMT> strategy " << name << " undefined" << endl; 1933 1964 return; 1934 1965 } … … 1946 1977 if (def == 0) 1947 1978 { 1948 cerr << "#CMT> strategy " << name << " undefined" << endl; 1979 CmtMessage::warning ("strategy " + name + " undefined"); 1980 // cerr << "#CMT> strategy " << name << " undefined" << endl; 1949 1981 return; 1950 1982 } … … 1962 1994 else 1963 1995 { 1964 cerr << "#CMT> requested strategy value " << value << " undefined in strategy " << name << endl; 1996 CmtMessage::warning ("requested strategy value " + value + " undefined in strategy " + name); 1997 // cerr << "#CMT> requested strategy value " << value << " undefined in strategy " << name << endl; 1965 1998 return; 1966 1999 } -
CMT/HEAD/source/cmt_symbol.cxx
r400 r459 14 14 #include "cmt_system.h" 15 15 #include "cmt_database.h" 16 #include "cmt_log.h" 16 17 17 18 // Global inhibitor of any display … … 773 774 } 774 775 776 CmtMessage::warning ("Symbol " + name 777 + " inconsistently redeclared from " + s1 778 + " to " + s2 779 + ( (use != 0) ? 780 " in package " + use->get_package_name () : 781 "" ) 782 ); 783 /* 775 784 cerr << "#CMT> Warning: Symbol " << name 776 785 << " inconsistently redeclared from " << s1 << " to " << s2; 777 786 if (use != 0) cerr << " in package " << use->get_package_name (); 778 787 cerr << endl; 788 */ 779 789 } 780 790 } … … 876 886 if (!CmtSystem::test_directory (t)) 877 887 { 888 CmtMessage::warning ("Wrong path item " + t + " in " + name); 889 /* 878 890 if (Cmt::get_warnings ()) 879 891 { 880 892 cerr << "#CMT> Warning: Wrong path item " << t << " in " << name << endl; 881 893 } 882 894 */ 883 895 } 884 896 -
CMT/HEAD/source/cmt_syntax.cxx
r400 r459 18 18 #include "cmt_project.h" 19 19 #include "cmt_cmtpath_pattern.h" 20 #include "cmt_log.h" 20 21 21 22 … … 1294 1295 int line_number) 1295 1296 { 1296 cerr << "# Package " << use->get_package_name () << 1297 " sets obsolescent version strategy" << endl; 1297 CmtMessage::warning ("Package " + use->get_package_name () 1298 + " sets obsolescent version strategy"); 1299 // cerr << "# Package " << use->get_package_name () << 1300 // " sets obsolescent version strategy" << endl; 1298 1301 } 1299 1302 void action (const CmtSystem::cmt_string_vector& words, … … 1331 1334 Unknown keyword : just ignore the line 1332 1335 */ 1336 char num[32]; sprintf (num, "%d", line_number); 1337 CmtMessage::error ("bad syntax in requirements of " + use->get_package_name () 1338 + " " + use->version + " line #" + num 1339 + " [" + words[0] + "...]"); 1340 /* 1333 1341 if (!Cmt::get_quiet ()) 1334 1342 { … … 1337 1345 cerr << " [" << words[0] << "...]" << endl; 1338 1346 } 1347 */ 1339 1348 1340 1349 CmtError::set (CmtError::syntax_error, "ParseRequirements> "); … … 1890 1899 if (CmtError::has_pending_error ()) 1891 1900 { 1901 char num[32]; sprintf (num, "%d", line_number); 1902 CmtMessage::error ("bad syntax in requirements of " + use->get_package_name () 1903 + " " + use->version 1904 + " " + use->specified_path 1905 + " line #" + num 1906 + " [" + command + " ...]"); 1907 /* 1892 1908 if (!Cmt::get_quiet ()) 1893 1909 { … … 1898 1914 cerr << " [" << command << " ...]" << endl; 1899 1915 } 1916 */ 1900 1917 1901 1918 return; … … 1934 1951 if (CmtError::has_pending_error ()) 1935 1952 { 1953 char num[32]; sprintf (num, "%d", line_number); 1954 CmtMessage::error ("bad syntax in project file of " + project->get_name () 1955 + " line #" + num 1956 + " [" + command + " ...]"); 1957 /* 1936 1958 if (!Cmt::get_quiet ()) 1937 1959 { … … 1940 1962 cerr << " [" << command << " ...]" << endl; 1941 1963 } 1964 */ 1942 1965 1943 1966 return; -
CMT/HEAD/source/cmt_system.cxx
r444 r459 58 58 #include "cmt_error.h" 59 59 #include "cmt_map.h" 60 #include "cmt_log.h" 60 61 61 62 //-------------------------------------------------- … … 659 660 if (::unlink (name) != 0) 660 661 { 661 cerr << "#CMT> Cannot remove file " << name << endl; 662 CmtMessage::error ("Cannot remove file " + name); 663 // cerr << "#CMT> Cannot remove file " << name << endl; 662 664 return (false); 663 665 } … … 694 696 if (status != 0) 695 697 { 696 cerr << "#CMT> Cannot remove directory " << name << " errno=" << errno << endl; 698 char num[32]; sprintf (num, "%d", errno); 699 CmtMessage::error ("Cannot remove directory " + name + " errno=" + num); 700 // cerr << "#CMT> Cannot remove directory " << name << " errno=" << errno << endl; 697 701 return (false); 698 702 } -
CMT/HEAD/source/cmt_tag.cxx
r400 r459 202 202 if (name == "") 203 203 { 204 CmtMessage::warning ("apply_tag with empty name [" + words[1] + "]"); 205 /* 204 206 if (!Cmt::get_quiet ()) 205 207 { 206 208 cerr << "#CMT> Warning: apply_tag with empty name [" << words[1] << "]" << endl; 207 209 } 210 */ 208 211 } 209 212 else … … 485 488 else 486 489 { 487 cerr << "#Tag::add> unknown tag " << op_name << " in tag expression" << endl; 490 CmtMessage::warning ("Tag::add> unknown tag " + op_name + " in tag expression"); 491 // cerr << "#Tag::add> unknown tag " << op_name << " in tag expression" << endl; 488 492 } 489 493 } -
CMT/HEAD/source/cmt_triggers.cxx
r400 r459 25 25 #include "cmt_constituent.h" 26 26 #include "cmt_syntax.h" 27 #include "cmt_log.h" 27 28 28 29 //-------------------------------------------------- … … 248 249 if (pos == 0) 249 250 { 251 CmtMessage::error ("Syntax in trigger file : empty name"); 252 /* 250 253 if (!Cmt::get_quiet ()) 251 254 { 252 255 cerr << "Syntax error in trigger file : empty name" << endl; 253 256 } 257 */ 254 258 exit (0); 255 259 } 256 260 if (pos == cmt_string::npos) 257 261 { 262 CmtMessage::error ("Syntax in trigger file : no = sign"); 263 /* 258 264 if (!Cmt::get_quiet ()) 259 265 { 260 266 cerr << "Syntax error in trigger file : no = sign" << endl; 261 267 } 268 */ 262 269 exit (0); 263 270 } … … 297 304 else 298 305 { 306 CmtMessage::error ("Syntax in trigger file : bad keyword (" + name + ")"); 307 /* 299 308 if (!Cmt::get_quiet ()) 300 309 { … … 302 311 name << ")" << endl; 303 312 } 313 */ 304 314 exit (0); 305 315 } … … 418 428 if ((pos == 0) || (pos == cmt_string::npos)) 419 429 { 430 CmtMessage::error ("Syntax in dependency file: " + line 431 + ": Missing = or target name."); 432 /* 420 433 if (!Cmt::get_quiet ()) 421 434 { … … 423 436 cerr << " Missing = or target name." << endl; 424 437 } 438 */ 425 439 exit (1); 426 440 } … … 447 461 if (dependencies == "") 448 462 { 449 cerr << "#CMT> Warning: It seems there is nothing after \'=\' " 450 "in dependency file " << m_file_name << endl; 463 CmtMessage::warning ("It seems there is nothing after \'=\' " 464 "in dependency file " + m_file_name); 465 // cerr << "#CMT> Warning: It seems there is nothing after \'=\' " 466 // "in dependency file " << m_file_name << endl; 451 467 return; 452 468 } … … 831 847 if (analyzer->run (file_name) == Awk::failed) 832 848 { 833 cerr << " File " << file_name << " not found" << endl; 849 CmtMessage::warning (" File " + file_name + " not found"); 850 // cerr << " File " << file_name << " not found" << endl; 834 851 } 835 852 -
CMT/HEAD/source/cmt_use.cxx
r437 r459 16 16 #include "cmt_database.h" 17 17 #include "cmt_syntax.h" 18 #include "cmt_log.h" 18 19 19 20 static void show_packages (); … … 497 498 if (!use->located ()) 498 499 { 500 CmtMessage::warning ("package " + use->get_package_name () 501 + " " + use->version + " " + use->path 502 + " not found"); 503 /* 499 504 if (!Cmt::get_quiet ()) 500 505 { … … 504 509 endl; 505 510 } 511 */ 506 512 CmtError::set (CmtError::package_not_found, use->get_package_name ()); 507 513 } … … 2473 2479 if (!found) 2474 2480 { 2481 CmtMessage::warning ("package " + use->get_package_name () 2482 + " " + use->version + " " + use->path 2483 + " not found" 2484 + ( (context_use != 0) ? 2485 " (requested by " + context_use->get_package_name () + ")" : 2486 "" ) 2487 ); 2488 /* 2475 2489 if (!Cmt::get_quiet ()) 2476 2490 { … … 2486 2500 cerr << endl; 2487 2501 } 2502 */ 2488 2503 2489 2504 //CmtError::set (CmtError::package_not_found, use->get_package_name ()); … … 3153 3168 Symbol::expand (text); 3154 3169 3155 if (!Cmt::get_quiet ()) cerr << " Creating the reference file " << ref_file << endl; 3170 if (CmtMessage::active (Info)) 3171 cerr << " Creating the reference file " << ref_file << endl; 3172 // if (!Cmt::get_quiet ()) cerr << " Creating the reference file " << ref_file << endl; 3156 3173 text.write (ref_file); 3157 3174 } … … 3178 3195 3179 3196 //if (!Cmt::get_quiet ()) 3180 cerr << " Symlinking " << libname << " to " << s << endl; 3197 if (CmtMessage::active (Info)) 3198 cerr << " Symlinking " << libname << " to " << s << endl; 3181 3199 3182 3200 if (symlinkcmd == "") … … 3184 3202 if (!CmtSystem::create_symlink (libname, s)) 3185 3203 { 3186 cerr << "#CMT> Cannot create a symbolic link to " << libname << endl; 3204 CmtMessage::error ("Cannot create a symbolic link to " + libname); 3205 // cerr << "#CMT> Cannot create a symbolic link to " << libname << endl; 3187 3206 return (false); 3188 3207 } … … 3200 3219 if (status != 0) 3201 3220 { 3202 cerr << "#CMT> Cannot create a symbolic link to " << libname << endl; 3221 CmtMessage::error ("Cannot create a symbolic link to " + libname); 3222 // cerr << "#CMT> Cannot create a symbolic link to " << libname << endl; 3203 3223 return (false); 3204 3224 } … … 3219 3239 if (!located ()) 3220 3240 { 3241 CmtMessage::warning ("package " + get_package_name () 3242 + " " + version + " " + path 3243 + " not found"); 3244 /* 3221 3245 if (!Cmt::get_quiet ()) 3222 3246 { … … 3226 3250 endl; 3227 3251 } 3252 */ 3228 3253 return; 3229 3254 } … … 3494 3519 if (use == 0) 3495 3520 { 3496 cerr << "#CMT> No access to " << to_name << endl; 3521 CmtMessage::warning ("No access to " + to_name); 3522 // cerr << "#CMT> No access to " << to_name << endl; 3497 3523 return (false); 3498 3524 } -
CMT/HEAD/src/Makefile.header
r441 r459 51 51 52 52 binclean :: 53 @if test ! "$(bin)" = "./"; then \53 if test ! "$(bin)" = "./"; then \ 54 54 if test -d $(bin) ; then \ 55 echo "------> (Makefile.header) Cleaning all from $(bin)"; \ 55 test -z "$(cmtmsg)" || \ 56 echo "$(CMTMSGPREFIX)" "(Makefile.header) Cleaning all from $(bin)"; \ 56 57 /bin/rm -rf $(bin) ; \ 57 58 fi ; \ … … 83 84 /bin/rm -f $${temp_lock}; \ 84 85 echo "------> (Makefile.header) Rebuilding constituents.make"; \ 85 $(cmtexe) - quiet -tag=$(tags) build constituents_makefile -out=$${temp_constituents}; status=$$?; \86 $(cmtexe) -tag=$(tags) build constituents_makefile -out=$${temp_constituents}; status=$$?; \ 86 87 if test $${status} = 0; then \ 87 88 /bin/rm -f $(cmt_local_tagfile); \ … … 100 101 $(echo) "(Makefile.header) Rebuilding $@"; \ 101 102 if test ! -d $(@D) ; then $(mkdir) -p $(@D); fi; \ 102 $(cmtexe) - quiet -tag=$(tags) build constituents_makefile -out=$@; \103 $(cmtexe) -tag=$(tags) build constituents_makefile -out=$@; \ 103 104 retval=$$?; \ 104 105 if test $${retval} != 0; then \ … … 115 116 if test -f $@; then rm -f $@; fi; \ 116 117 if test ! -d $(@D); then $(mkdir) -p $(@D); fi; \ 117 $(cmtexe) - quiet -tag=$(tags) build tag_makefile >$@118 $(cmtexe) -tag=$(tags) build tag_makefile >$@ 118 119 119 120 # && /bin/echo $@ ok … … 125 126 # 126 127 $(gmake_hosts) :: 127 rsh $@ "sh -c '(cd `$(cmtexe) show pwd -quiet`; . setup.sh; gmake $(MAKEFLAGS) $(target))'"128 rsh $@ "sh -c '(cd `$(cmtexe) show pwd`; . setup.sh; gmake $(MAKEFLAGS) $(target))'" 128 129 129 130 $(make_hosts) :: … … 146 147 @echo 'binclean : fast erase of the binary directory' 147 148 @echo ' ' 148 @groups=`$(cmtexe) show groups - quiet -tag=$(tags)`; \149 @groups=`$(cmtexe) show groups -tag=$(tags)`; \ 149 150 for g in $${groups}; do \ 150 151 echo "$${g} : rebuild all constituents of group $${g}"; \ 151 152 done 152 153 @echo "Constituents:"; \ 153 for c in `$(cmtexe) show constituent_names - quiet -tag=$(tags)` ; do \154 for c in `$(cmtexe) show constituent_names -tag=$(tags)` ; do \ 154 155 echo " $${c} $${c}clean"; \ 155 156 done -
CMT/HEAD/src/NMakefile.header
r445 r459 55 55 56 56 57 !if [$(cmtexe) -quietbuild constituents_makefile -tag=$(tags)] == 057 !if [$(cmtexe) build constituents_makefile -tag=$(tags)] == 0 58 58 !endif 59 59 -
CMT/HEAD/src/constituents.make
r11 r459 9 9 # @if test ! -f constituents.make -o "$(build_strategy)" = "rebuild_makefiles"; then \ 10 10 # echo "Rebuilding $@"; \ 11 # $(cmtexe) build constituents_makefile - quiet -tag=$(tags); \11 # $(cmtexe) build constituents_makefile -tag=$(tags); \ 12 12 # fi 13 13 # -
CMT/HEAD/src/constituents.nmake
r11 r459 6 6 7 7 # 8 #!if [echo $(cmtexe) -quietbuild constituents_makefile -tag=$(tags)] == 08 #!if [echo $(cmtexe) build constituents_makefile -tag=$(tags)] == 0 9 9 #!endif 10 #!if [$(cmtexe) -quietbuild constituents_makefile -tag=$(tags)] == 010 #!if [$(cmtexe) build constituents_makefile -tag=$(tags)] == 0 11 11 #!endif 12 12 #
Note: See TracChangeset
for help on using the changeset viewer.