Changeset 528
- Timestamp:
- Nov 25, 2009, 12:11:28 PM (15 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r527 r528 1 2009-11-25 <rybkin@lal.in2p3.fr> 415 2 3 * source/cmt_awk.cxx: In function PathScanner::scan_path, skip .svn 4 directories, invoke a.run with 4th argument "true" when the structure is 5 without version directory 6 * source/cmt_system.cxx: Correct a comment typo 7 * source/cmt_use.cxx: In function Use::get_all_clients, do not issue the 8 warning 9 * source/cmt_fragment.cxx: In function Fragment::show, set error if the 10 fragment is not found 11 * source/cmt_error.h: Introduce errors constituent_not_found, 12 fragment_not_found, language_not_found 13 * source/cmt_error.cxx: idem 14 * source/cmt_commands.cxx: In function ArgParser::do_show, pass all 15 arguments to "cmt show packages", correct "cmt show clients" help message, 16 add "cmt show container" help message, update "cmt show packages" help 17 message 18 * source/cmt_project.cxx: In function Project::scan_paths_for_package, set 19 error if the package is not found 20 * source/cmt_language.cxx: In function Language::show, set error if the 21 language is not found 22 * source/cmt_parser.cxx: In function Cmt::do_config, invoke 23 Generator::build_default_makefile after parsing the requirements file in 24 order to keep track of possible errors (which may be cleared otherwise), in 25 function Cmt::do_show_constituent, set error if the constituent is not found, 26 in function Cmt::do_show_packages, search and show packages in all paths 27 supplied (if any), in function Cmt::do_show_use_paths, set error if the 28 package is not found 29 * mgr/cmt_dependencies.make: Update 30 1 31 2009-11-20 <rybkin@lal.in2p3.fr> 414 2 32 -
CMT/HEAD/mgr/cmt_dependencies.make
r527 r528 4 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 ../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 ../source/cmt_log.h ../source/cmt_error.h 7 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 … … 16 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 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 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 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 ../source/cmt_error.h 19 19 cmt_vcs_cxx_dependencies = ../source/cmt_vcs.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_vcs.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 ../source/cmt_error.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 -
CMT/HEAD/source/cmt_awk.cxx
r461 r528 648 648 649 649 if ((level == 0) && (entry == "InstallArea")) continue; 650 if (entry == " CVS") continue;650 if (entry == ".svn" || entry == "CVS") continue; 651 651 652 652 cmt_string req; … … 742 742 // The structure is without the version directory. 743 743 744 a.run (name, "v1", path); 744 if (!Package::get_version (version, vreq)) 745 version = "v*"; 746 747 a.run (name, version, path, true); 748 // a.run (name, "v1", path); 745 749 has_package = true; 746 750 -
CMT/HEAD/source/cmt_commands.cxx
r525 r528 1422 1422 if (argc > 0) 1423 1423 { 1424 cmt.m_current_target = fill_one_argument (); 1424 fill_arguments (); 1425 // cmt.m_current_target = fill_one_argument (); 1425 1426 } 1426 1427 … … 2241 2242 help_texts.add () = "show author : package author"; 2242 2243 help_texts.add () = "show branches : added branches"; 2243 help_texts.add () = "show clients : package clients";2244 help_texts.add () = "show clients <package> [<version> [<path>]] : clients of <package> [of <version> [in <path>]]"; 2244 2245 help_texts.add () = "show cmtpath_patterns : cmtpath_patterns"; 2245 2246 help_texts.add () = "show constituent <name>: constituent definition"; 2246 2247 help_texts.add () = "show constituent_names : constituent names"; 2247 2248 help_texts.add () = "show constituents : constituent definitions"; 2249 help_texts.add () = "show container : container package of current project"; 2248 2250 help_texts.add () = "show cycles : cycles in the use graph"; 2249 2251 help_texts.add () = "show fragment <name> : one fragment definition"; … … 2258 2260 help_texts.add () = "show macros : all macro definitions"; 2259 2261 help_texts.add () = "show manager : package manager"; 2260 help_texts.add () = "show packages : packages reachable from the current context";2262 help_texts.add () = "show packages [<path>]... : packages reachable from the current context [or <path>s]"; 2261 2263 help_texts.add () = "show path [-d] : the package search paths list [in detail]"; 2262 2264 help_texts.add () = "show pattern <name> : the pattern definition and usages"; … … 2273 2275 help_texts.add () = "show strategies : all strategies (build & version)"; 2274 2276 help_texts.add () = "show tags : all currently active tags"; 2275 help_texts.add () = "show use_paths <pack > : all paths to the used package";2277 help_texts.add () = "show use_paths <package> : all use paths to the used <package>"; 2276 2278 help_texts.add () = "show uses : used packages"; 2277 2279 help_texts.add () = "show version : version of the current package"; 2278 help_texts.add () = "show versions < name> : visible versions of the selected package";2280 help_texts.add () = "show versions <package> : visible versions of the selected <package>"; 2279 2281 help_texts.add () = "system : display the system tag"; 2280 2282 help_texts.add () = "unlock [<p> <v> [<path>]] : unlock a package"; -
CMT/HEAD/source/cmt_error.cxx
r496 r528 21 21 error_names.add() = "symbol not found"; 22 22 error_names.add() = "pattern not found"; 23 error_names.add() = "constituent not found"; 24 error_names.add() = "fragment not found"; 25 error_names.add() = "language not found"; 23 26 error_names.add() = "syntax error"; 24 27 error_names.add() = "command_not_implemented"; -
CMT/HEAD/source/cmt_error.h
r496 r528 22 22 symbol_not_found, 23 23 pattern_not_found, 24 constituent_not_found, 25 fragment_not_found, 26 language_not_found, 24 27 syntax_error, 25 28 command_not_implemented, -
CMT/HEAD/source/cmt_fragment.cxx
r459 r528 16 16 #include "cmt_database.h" 17 17 #include "cmt_log.h" 18 #include "cmt_error.h" 18 19 19 20 /*----------------------------------------------------------*/ … … 138 139 if (fragment == 0) 139 140 { 140 CmtMessage::info ("Fragment " + name + " not found"); 141 cmt_string t (name); 142 // t += " is not defined"; 143 CmtError::set (CmtError::fragment_not_found, t); 144 // CmtMessage::info ("Fragment " + name + " not found"); 141 145 // cerr << "Fragment " << name << " not found" << endl; 142 146 } -
CMT/HEAD/source/cmt_language.cxx
r486 r528 13 13 #include "cmt_system.h" 14 14 #include "cmt_database.h" 15 #include "cmt_error.h" 15 16 16 17 /*----------------------------------------------------------*/ … … 26 27 Language& language = find (name); 27 28 28 if (language == null ()) return; 29 30 language.show (); 29 if (language == null ()) 30 { 31 cmt_string t (name); 32 33 CmtError::set (CmtError::language_not_found, t); 34 } 35 else 36 { 37 language.show (); 38 } 31 39 } 32 40 -
CMT/HEAD/source/cmt_parser.cxx
r527 r528 2687 2687 // configure_current_package (); 2688 2688 2689 Generator::build_default_makefile ();2689 // Generator::build_default_makefile (); 2690 2690 2691 2691 CmtSystem::cd (".."); … … 2714 2714 install_setup_scripts (); 2715 2715 install_cleanup_scripts (); 2716 2717 Generator::build_default_makefile (); 2716 2718 2717 2719 CmtSystem::cd (".."); … … 3732 3734 if (symbol == 0) 3733 3735 { 3734 cmt_string t = " "; 3735 t += target; 3736 t += " is not defined "; 3736 cmt_string t (target); 3737 t += " is not defined"; 3737 3738 3738 3739 CmtError::set (CmtError::symbol_not_found, t); … … 3881 3882 configure (ap); 3882 3883 3883 cout << "# ----------- Clients of " << package << 3884 " " << version << 3885 " " << path_name << 3886 endl; 3884 cout << "# ----------- Clients of " << package 3885 << (version != "" ? " " + version : "") 3886 << (path_name != "" ? " (" + path_name + ")": "") 3887 // " " << version << 3888 // " " << path_name << 3889 << endl; 3887 3890 3888 3891 if (path_name == "") … … 3916 3919 { 3917 3920 c->show (); 3921 } 3922 else 3923 { 3924 cmt_string t (ap.arguments[0]); 3925 CmtError::set (CmtError::constituent_not_found, t); 3918 3926 } 3919 3927 } … … 4138 4146 void Cmt::do_show_packages (const ArgParser& ap) 4139 4147 { 4140 cmt_string path_name;4141 4142 if (ap.arguments.size () > 0) path_name = ap.arguments[0];4143 4144 4148 PathScanner scanner; 4145 4149 PackageViewer viewer; 4146 4150 4147 if ( path_name == "")4151 if (ap.arguments.size () == 0) 4148 4152 { 4149 4153 Project::scan_paths (scanner, viewer); … … 4151 4155 else 4152 4156 { 4153 scanner.scan_path (path_name, viewer); 4157 for (int i = 0; i < ap.arguments.size (); i++) 4158 { 4159 const cmt_string& path_name = ap.arguments[i]; 4160 if (CmtSystem::test_directory (path_name)) 4161 { 4162 scanner.scan_path (path_name, viewer); 4163 } 4164 else 4165 { 4166 CmtMessage::warning ("No such directory: " + path_name); 4167 CmtError::set (CmtError::path_not_found, path_name); 4168 } 4169 } 4154 4170 } 4155 4171 } … … 4378 4394 Use* current = &(Use::current()); 4379 4395 4380 current->get_all_clients (to_name); 4396 if (!current->get_all_clients (to_name)) 4397 CmtError::set (CmtError::package_not_found, to_name); 4381 4398 } 4382 4399 -
CMT/HEAD/source/cmt_project.cxx
r526 r528 1422 1422 static ProjectVector& Projects = projects (); 1423 1423 1424 bool found (false); 1424 1425 for (int i = 0; i < Projects.size (); i++) 1425 1426 { … … 1427 1428 1428 1429 const cmt_string& p = project.m_cmtpath; 1429 scanner.scan_package (p, name); 1430 } 1430 if (scanner.scan_package (p, name)) 1431 found = true; 1432 } 1433 1434 if (!found) 1435 CmtError::set (CmtError::package_not_found, name); 1431 1436 } 1432 1437 -
CMT/HEAD/source/cmt_system.cxx
r527 r528 2450 2450 /* 2451 2451 * The idea and, to some extent, implementation of this function 2452 * w asborrowed from the GNU core utilities of the Free Software Foundation2452 * were borrowed from the GNU core utilities of the Free Software Foundation 2453 2453 * http://www.gnu.org/software/coreutils/ 2454 2454 */ -
CMT/HEAD/source/cmt_use.cxx
r515 r528 3513 3513 if (use == 0) 3514 3514 { 3515 CmtMessage::warning ("No access to " + to_name); 3516 // cerr << "#CMT> No access to " << to_name << endl; 3515 // CmtMessage::warning ("No access to " + to_name); 3517 3516 return (false); 3518 3517 }
Note: See TracChangeset
for help on using the changeset viewer.