Changeset 295
- Timestamp:
- Nov 1, 2006, 10:46:57 AM (18 years ago)
- Location:
- CMT/v1rbeta20p20061025
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/v1rbeta20p20061025/mgr/cmt_dependencies.make
r144 r295 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 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_ awk.h ../source/cmt_project.h ../source/cmt_branch.h ../source/cmt_fragment.h ../source/cmt_group.h ../source/cmt_constituent.h ../source/cmt_language.h ../source/cmt_map.h ../source/cmt_pattern.h ../source/cmt_include.h ../source/cmt_script.h ../source/cmt_scope_section.h ../source/cmt_use.h ../source/cmt_tag.h ../source/cmt_symbol.h ../source/cmt_cmtpath_pattern.h ../source/cmt_database.h ../source/cmt_syntax.h ../source/cmt_error.h26 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 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 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 -
CMT/v1rbeta20p20061025/source/cmt_cvs.cxx
r208 r295 184 184 m_verbose = false; 185 185 m_simulation = false; 186 no_config = false; 186 187 187 188 m_home_dir = ""; … … 218 219 m_verbose = other.m_verbose; 219 220 m_simulation = other.m_simulation; 221 no_config = other.no_config; 220 222 221 223 m_home_dir = other.m_home_dir; … … 1883 1885 if (did_recurse) 1884 1886 { 1885 execute ("cmt -quiet broadcast cmt -quiet config"); 1887 if (no_config==false) 1888 execute ("cmt -quiet broadcast cmt -quiet config"); 1889 1886 1890 } 1887 1891 else 1888 1892 { 1889 execute ("cmt -quiet config"); 1893 if (no_config==false) 1894 execute ("cmt -quiet config"); 1890 1895 } 1891 1896 } 1892 1897 else 1893 1898 { 1894 execute ("cmt -quiet config"); 1899 if (no_config==false) 1900 execute ("cmt -quiet config"); 1895 1901 } 1896 1902 } … … 2081 2087 if (!m_recursive) 2082 2088 { 2083 execute ("cmt -quiet config"); 2089 if (no_config==false) 2090 execute ("cmt -quiet config"); 2084 2091 } 2085 2092 } … … 2101 2108 cout << " -t Change file timestamps to the date of checkout" << endl; 2102 2109 cout << " -n simulation mode on" << endl; 2110 cout << " -no_config Disable config step after checkout" << endl; 2103 2111 cout << " -v verbose mode on" << endl; 2104 2112 cout << " --help print this help" << endl; … … 2271 2279 m_recursive = false; 2272 2280 need_touch_files = false; 2281 no_config = false; 2273 2282 2274 2283 bool need_version_tag = false; … … 2365 2374 m_simulation = true; 2366 2375 } 2376 else if (option == "-no_config") 2377 { 2378 no_config = true; 2379 } 2367 2380 else if (option == "-v") 2368 2381 { … … 2402 2415 bool m_verbose; 2403 2416 bool m_simulation; 2417 bool no_config; 2404 2418 2405 2419 cmt_string m_home_dir; -
CMT/v1rbeta20p20061025/source/cmt_project.cxx
r283 r295 262 262 cmt_string release; 263 263 264 265 264 // 266 265 // Figure out if this is the current project … … 566 565 } 567 566 567 568 568 569 if (text != "") 569 570 { … … 574 575 cout << "About to parse project file [" << text << "]" << endl; 575 576 } 577 578 // First create the Project.m_use for the policy 579 //cout << "About to add project policy package file [" << project->get_name()+"_project_policy" << "]" << endl; 580 Use* project_use = Use::create (project->get_cmtpath(), 581 project->get_name()+"_project_policy", 582 project->get_release (), "", ""); 583 584 project_use->done = false; 585 project_use->discarded = false; 586 project_use->selected = false; 587 project->set_use(project_use); 576 588 577 589 SyntaxParser::parse_project_file_text (text, … … 579 591 project); 580 592 } 593 594 581 595 582 596 CmtSystem::cd (here); … … 1279 1293 void Project::clear () 1280 1294 { 1281 m_name = "";1295 m_name = ""; 1282 1296 m_release = ""; 1283 1297 m_cmtpath = ""; 1284 m_cmtpath_pwd = "";1298 m_cmtpath_pwd = ""; 1285 1299 m_cmtpath_source = ""; 1300 m_use = 0; 1286 1301 1287 1302 m_parents.clear (); … … 2328 2343 } 2329 2344 //----------------------------------------------------------- 2345 Use* Project::get_use () const 2346 { 2347 return m_use; 2348 } 2349 //----------------------------------------------------------- 2350 void Project::set_use (Use* use) 2351 { 2352 this->m_use = use; 2353 } 2354 //----------------------------------------------------------- -
CMT/v1rbeta20p20061025/source/cmt_project.h
r273 r295 11 11 #include "cmt_parser.h" 12 12 #include "cmt_system.h" 13 #include "cmt_use.h" 13 14 #include "cmt_awk.h" 14 15 … … 185 186 // bool get_author (const cmt_string& name) const; 186 187 187 void visit (IProjectVisitor& visitor); 188 void visit (IProjectVisitor& visitor); 189 190 // Use 191 Use* get_use () const; 192 void set_use (Use* use); 188 193 189 194 private: … … 209 214 210 215 cmt_vector <Strategy> m_strategies; 216 217 Use* m_use; 211 218 }; 212 219 -
CMT/v1rbeta20p20061025/source/cmt_syntax.cxx
r284 r295 109 109 const cmt_string& file_name, 110 110 int line_number) 111 {} 111 { 112 action (words, project->get_use(), file_name, line_number); 113 } 112 114 113 115 }; … … 163 165 bool decode (const cmt_string& w, cmt_string& strategy, cmt_string& value) 164 166 { 165 bool result = true; 166 167 value = w; 168 169 if (w == "prototypes") 167 bool result = true; 168 169 value = w; 170 Symbol::expand(value); 171 cout <<"# strategy: "<<value<<endl; 172 173 if (value == "prototypes") 170 174 { 171 175 strategy = "BuildPrototypes"; 172 176 } 173 else if ( w== "no_prototypes")177 else if (value == "no_prototypes") 174 178 { 175 179 strategy = "BuildPrototypes"; 176 180 } 177 else if (( w == "with_installarea") || (w== "with_install_area"))181 else if ((value == "with_installarea") || (value == "with_install_area")) 178 182 { 179 183 value = "with_installarea"; 180 184 strategy = "InstallArea"; 181 185 } 182 else if (( w == "without_installarea") || (w== "without_install_area"))186 else if ((value == "without_installarea") || (value == "without_install_area")) 183 187 { 184 188 value = "without_installarea"; … … 232 236 int line_number) 233 237 { 234 for (int i = 1; i < words.size (); i++)238 for (int i = 1; i < words.size (); i++) 235 239 { 236 240 const cmt_string& w = words[i]; … … 244 248 { 245 249 if (project != 0) project->set_strategy (strategy, value, ""); 250 //(project->get_use())->get_package_name ()); 246 251 } 247 252 else … … 498 503 const cmt_string& file_name, 499 504 int line_number) 500 {} 505 { 506 action (words, project->get_use(), file_name, line_number); 507 } 501 508 }; 502 509 … … 515 522 const cmt_string& file_name, 516 523 int line_number) 517 {} 524 { 525 action (words, project->get_use(), file_name, line_number); 526 } 518 527 }; 519 528 … … 532 541 const cmt_string& file_name, 533 542 int line_number) 534 {} 543 { 544 action (words, project->get_use(), file_name, line_number); 545 } 535 546 }; 536 547 … … 549 560 const cmt_string& file_name, 550 561 int line_number) 551 {} 562 { 563 action (words, project->get_use(), file_name, line_number); 564 } 552 565 }; 553 566 … … 566 579 const cmt_string& file_name, 567 580 int line_number) 568 {} 581 582 { 583 action (words, project->get_use(), file_name, line_number); 584 } 569 585 }; 570 586 … … 583 599 const cmt_string& file_name, 584 600 int line_number) 585 {} 601 { 602 action (words, project->get_use(), file_name, line_number); 603 } 586 604 }; 587 605 … … 600 618 const cmt_string& file_name, 601 619 int line_number) 602 {} 620 { 621 action (words, project->get_use(), file_name, line_number); 622 } 603 623 }; 604 624 … … 1153 1173 const cmt_string& file_name, 1154 1174 int line_number) 1155 {} 1175 { 1176 action (words, project->get_use(), file_name, line_number); 1177 } 1156 1178 }; 1157 1179 … … 1170 1192 const cmt_string& file_name, 1171 1193 int line_number) 1172 {} 1194 { 1195 action (words, project->get_use(), file_name, line_number); 1196 } 1173 1197 }; 1174 1198 … … 1283 1307 me.do_parse_text (buffer, "", package_context, use, 0); 1284 1308 Cmt::set_current_access (saved_current_access); 1309 } 1310 1311 // 1312 Project* p = use->get_project (); 1313 if (p != 0) 1314 { 1315 Use* p_use = p->get_use(); 1316 if (p_use != 0) 1317 { 1318 //cout << "About to add dependency on project policy package file [" << p_use->get_package_name() << "]" << endl; 1319 p_use->add_sub_use (p_use); 1320 } 1285 1321 } 1286 1322 … … 1437 1473 1438 1474 m_project_keywords.add ("author", new KwdAuthor()); 1475 m_project_keywords.add ("apply_tag", new KwdApplyTag ()); 1439 1476 m_project_keywords.add ("build_strategy", new KwdBuildStrategy ()); 1440 1477 m_project_keywords.add ("container", new KwdContainer ()); 1478 m_project_keywords.add ("macro", new KwdMacro ()); 1479 m_project_keywords.add ("macro+", new KwdMacroAppend ()); 1480 m_project_keywords.add ("macro_prepend", new KwdMacroPrepend ()); 1481 m_project_keywords.add ("macro_append", new KwdMacroAppend ()); 1482 m_project_keywords.add ("macro_remove", new KwdMacroRemove ()); 1483 m_project_keywords.add ("macro_remove_regexp", new KwdMacroRemoveRegexp ()); 1484 m_project_keywords.add ("macro_remove_all", new KwdMacroRemoveAll ()); 1485 m_project_keywords.add ("macro_remove_all_regexp", new KwdMacroRemoveAllRegexp ()); 1486 1441 1487 m_project_keywords.add ("project", new KwdProject ()); 1442 1488 m_project_keywords.add ("setup_strategy", new KwdSetupStrategy ()); 1489 1490 m_project_keywords.add ("tag", new KwdTag ()); 1491 m_project_keywords.add ("tag_exclude", new KwdTagExclude ()); 1492 1493 1443 1494 m_project_keywords.add ("structure_strategy", new KwdStructureStrategy ()); 1444 1495 m_project_keywords.add ("use", new KwdUse ()); -
CMT/v1rbeta20p20061025/source/cmt_use.cxx
r280 r295 4370 4370 } 4371 4371 4372 Project* Use::get_project () 4373 { 4374 Project* p; 4375 cmt_string cmtpath = ""; 4376 cmt_string offset = ""; 4377 get_cmtpath_and_offset (cmtpath, offset); 4378 p = Project::find_by_cmtpath (cmtpath); 4379 return p; 4380 } -
CMT/v1rbeta20p20061025/source/cmt_use.h
r283 r295 60 60 static void fill_macro_all (cmt_string& buffer, const cmt_string& suffix); 61 61 62 // Private class methods63 private:64 62 static Use* create (const cmt_string& path, 65 63 const cmt_string& package, … … 67 65 const cmt_string& version_alias, 68 66 const cmt_string& path_alias); 67 68 void add_sub_use(Use* use) 69 { 70 this->sub_uses.push_back (use); 71 } 72 73 // Private class methods 74 private: 69 75 70 76 // Public instance methods … … 126 132 ScopeType get_current_scope () const; 127 133 134 Project* get_project (); 128 135 // Public attributes 129 136 public:
Note: See TracChangeset
for help on using the changeset viewer.