Changeset 669 for CMT/v1r25-branch
- Timestamp:
- Jan 31, 2014, 4:47:30 PM (10 years ago)
- Location:
- CMT/v1r25-branch
- Files:
-
- 26 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/v1r25-branch
-
CMT/v1r25-branch/ChangeLog
- Property svn:mergeinfo changed
/CMT/HEAD/ChangeLog merged: 667-668
r666 r669 1 2014-01-31 <rybkin@lal.in2p3.fr> 525 2 3 * source/cmt_parser.cxx: In class Cmt function do_broadcast, cosmetic 4 improvement to error message 5 6 2014-01-31 <rybkin@lal.in2p3.fr> 524 7 8 * source/cmt_use.cxx: Add default clause to switch statements to avoid 9 compilation warning about enumeration value(s) not being handled on 10 Mac OS X 10.8.5 11 * source/cmt_deps_builder.cxx: idem 12 * source/cmt_generators.cxx: idem 13 * source/cmt_script.cxx: idem 14 * source/cmt_project.cxx: idem 15 * source/cmt_pattern.cxx: idem 16 * source/cmt_lock.cxx: idem 17 * source/cmt_vcs.cxx: idem 18 * source/cmt_generator.cxx: idem 19 * source/cmt_symbol.cxx: idem 20 * source/cmt_parser.cxx: idem, 21 In class Cmt function do_broadcast, if depth option value is less than -1, 22 use depth value of -1 and issue warning 23 * source/cmt_constituent.cxx: Use cmt_string and string literal as first 24 and second arguments respectively of != operator to avoid compilation 25 warning about comparison being unspecified on Mac OS X 10.8.5 26 1 27 2014-01-25 <rybkin@lal.in2p3.fr> 523 2 28 - Property svn:mergeinfo changed
-
CMT/v1r25-branch/mgr/cmt_dcc_version.sh
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/constituent
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/constituent_lock
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/jar
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/java
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/check_application
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/constituent
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/constituent_lock
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/jar
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/java
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/library
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/mgr/fragments/nmake/library_no_static
- Property svn:mergeinfo changed (with no actual effect on merging)
-
CMT/v1r25-branch/source/cmt_constituent.cxx
r664 r669 395 395 parameters.clear (); 396 396 397 if (has_target_tag && (Document != type || "cmt_actions" != group->name ()))397 if (has_target_tag && (Document != type || group->name () != "cmt_actions")) 398 398 { 399 399 const Tag* tag = Tag::find ("target_" + name); … … 441 441 //---------------------------------------------------------- 442 442 Constituent* Constituent::add_for_action (const Symbol& symbol) 443 //Constituent* Constituent::add_for_action (const cmt_string& name)444 443 { 445 444 Constituent* constituent (0); … … 451 450 452 451 cmt_string value = symbol.build_macro_value (); 453 if ( "" == value&& !target_tag_used) return constituent;452 if ( 0 == value.size () && !target_tag_used) return constituent; 454 453 455 454 constituent = add (Document, symbol.name, "cmt_action_runner"); -
CMT/v1r25-branch/source/cmt_deps_builder.cxx
r664 r669 713 713 state = at_start; 714 714 break; 715 default: 716 break; 715 717 } 716 718 line_number++; -
CMT/v1r25-branch/source/cmt_generator.cxx
r664 r669 1106 1106 stamp += "mgr"; 1107 1107 break; 1108 default: 1109 break; 1108 1110 } 1109 1111 stamp += CmtSystem::file_separator (); … … 1151 1153 prefix = "lib_"; 1152 1154 break; 1155 default: 1156 break; 1153 1157 } 1154 1158 cmt_string macro_name (prefix + constituent.name + "_cppflags"); … … 1173 1177 case Library: 1174 1178 prefix = "lib_"; 1179 break; 1180 default: 1175 1181 break; 1176 1182 } -
CMT/v1r25-branch/source/cmt_generators.cxx
r664 r669 493 493 is_application = false; 494 494 m_TITLE = "Library"; 495 break; 496 default: 495 497 break; 496 498 } … … 2533 2535 temp += use->prefix; 2534 2536 temp += "ROOT)"; 2535 temp += CmtSystem::file_separator ();2536 2537 switch (use->style) 2537 2538 { 2538 2539 case cmt_style: 2540 temp += CmtSystem::file_separator (); 2539 2541 temp += "cmt"; 2540 2542 break; 2541 2543 case mgr_style: 2544 temp += CmtSystem::file_separator (); 2542 2545 temp += "mgr"; 2546 break; 2547 default: 2543 2548 break; 2544 2549 } … … 3264 3269 stamp += "mgr"; 3265 3270 break; 3271 default: 3272 break; 3266 3273 } 3267 3274 stamp += CmtSystem::file_separator (); … … 3321 3328 stamp += CmtSystem::file_separator (); 3322 3329 stamp += "mgr"; 3330 break; 3331 default: 3323 3332 break; 3324 3333 } -
CMT/v1r25-branch/source/cmt_lock.cxx
r664 r669 97 97 // cerr << "Package not locked" << endl; 98 98 return (s); 99 default: 100 break; 99 101 } 100 102 -
CMT/v1r25-branch/source/cmt_parser.cxx
r664 r669 1901 1901 msg = "Cannot read `depth' value `"; 1902 1902 msg += depth_str; 1903 msg += cmt_string ("'");1903 msg += "'"; 1904 1904 if (errno) 1905 msg += cmt_string (strerror (errno)); 1905 { 1906 msg += ": "; 1907 msg += strerror (errno); 1908 } 1906 1909 CmtError::set (CmtError::system_error, msg); 1907 1910 return; … … 1910 1913 msg = "Invalid `depth' value `"; 1911 1914 msg += depth_str; 1912 msg += cmt_string ("'");1915 msg += "'"; 1913 1916 CmtError::set (CmtError::syntax_error, msg); 1914 1917 return; … … 1917 1920 if (depth_value < -1) 1918 1921 { 1919 char num[32]; sprintf (num, "%lu", -depth_value); 1922 /* 1923 char num[32]; sprintf (num, "%d", -depth_value); 1920 1924 msg = "Invalid `depth' value `-"; 1921 1925 msg += num; … … 1923 1927 CmtError::set (CmtError::syntax_error, msg); 1924 1928 return; 1929 */ 1930 depth = -1; 1931 char num[4]; sprintf (num, "%d", depth); 1932 msg = "Using minimum `depth' value `"; 1933 msg += num; 1934 msg += "'"; 1935 CmtMessage::warning (msg); 1925 1936 } 1926 depth = depth_value; 1937 else 1938 { 1939 depth = depth_value; 1940 } 1927 1941 //cerr << "depth: " << depth << endl; 1928 1942 break; … … 4010 4024 //CmtSystem::cd ("mgr"); 4011 4025 break; 4026 default: 4027 break; 4012 4028 } 4013 4029 … … 4822 4838 case Xml : 4823 4839 cout << "</setup>" << endl; 4840 break; 4841 default: 4824 4842 break; 4825 4843 } … … 5553 5571 case with_version_directory: 5554 5572 cout << "with_version_directory"; 5573 break; 5574 default: 5555 5575 break; 5556 5576 } … … 8136 8156 } 8137 8157 break; 8158 default: 8159 break; 8138 8160 } 8139 8161 … … 8172 8194 cout << "set " << prefix << "CONFIG=" << endl; 8173 8195 break; 8196 default: 8197 break; 8174 8198 } 8175 8199 } … … 8187 8211 case Bat : 8188 8212 cout << "set CMTEXTRATAGS=" << endl; 8213 break; 8214 default: 8189 8215 break; 8190 8216 } … … 8355 8381 } 8356 8382 8383 break; 8384 default: 8357 8385 break; 8358 8386 } … … 10006 10034 prefix = "lib_"; 10007 10035 break; 10036 default: 10037 break; 10008 10038 } 10009 10039 -
CMT/v1r25-branch/source/cmt_pattern.cxx
r664 r669 1020 1020 1021 1021 break; 1022 default: 1023 break; 1022 1024 } 1023 1025 -
CMT/v1r25-branch/source/cmt_project.cxx
- Property svn:mergeinfo changed
/CMT/HEAD/source/cmt_project.cxx merged: 667
r666 r669 1294 1294 cout << "<projects>"; 1295 1295 break; 1296 default: 1297 break; 1296 1298 } 1297 1299 … … 1308 1310 case Xml : 1309 1311 cout << "</projects>" << endl; 1312 break; 1313 default: 1310 1314 break; 1311 1315 } … … 2847 2851 cout << "<clients>"; 2848 2852 break; 2853 default: 2854 break; 2849 2855 } 2850 2856 for (i = 0; i < m_parents.size (); i++) … … 2872 2878 cout << "</clients>"; 2873 2879 break; 2880 default: 2881 break; 2874 2882 } 2875 2883 … … 2878 2886 case Xml : 2879 2887 cout << "<uses>"; 2888 break; 2889 default: 2880 2890 break; 2881 2891 } - Property svn:mergeinfo changed
-
CMT/v1r25-branch/source/cmt_script.cxx
r400 r669 211 211 cout << ". "; 212 212 break; 213 default: 214 break; 213 215 } 214 216 -
CMT/v1r25-branch/source/cmt_symbol.cxx
r666 r669 808 808 type = SymbolCleanupScript; 809 809 break; 810 default: 811 break; 810 812 } 811 813 … … 850 852 s1 = "alias"; 851 853 break; 854 default: 855 break; 852 856 } 853 857 … … 874 878 case SymbolAlias: 875 879 s2 = "alias"; 880 break; 881 default: 876 882 break; 877 883 } … … 936 942 case SymbolAction: 937 943 symbol.builder = &Action; 944 break; 945 default: 938 946 break; 939 947 } … … 1808 1816 CmtMessage::info ("Replace " + name + " with " + _name); 1809 1817 break; 1818 default: 1819 break; 1810 1820 } 1811 1821 … … 1828 1838 result = 1; 1829 1839 break; 1840 default: 1841 break; 1830 1842 } 1831 1843 break; … … 1840 1852 cout << "alias " << name << " >/dev/null 2>&1 && unalias " << name; 1841 1853 result = 1; 1854 break; 1855 default: 1842 1856 break; 1843 1857 } … … 1865 1879 cout << "set " << _name << "=" << CmtSystem::quote (temp, " \t"); 1866 1880 result = 1; 1881 break; 1882 default: 1867 1883 break; 1868 1884 } … … 1895 1911 result = 1; 1896 1912 break; 1897 } 1913 default: 1914 break; 1915 } 1916 break; 1917 default: 1898 1918 break; 1899 1919 } … … 1979 1999 << "<value>" << temp << "</value></variable>"; 1980 2000 result = 1; 2001 break; 2002 default: 1981 2003 break; 1982 2004 } … … 2007 2029 << "<value>" << temp << "</value></alias>"; 2008 2030 result = 1; 2031 break; 2032 default: 2009 2033 break; 2010 2034 } … … 2048 2072 out << "<script>" << name << "</script>"; 2049 2073 result = 1; 2074 break; 2075 default: 2050 2076 break; 2051 2077 } … … 2452 2478 temp = new_value; 2453 2479 2480 break; 2481 2482 default: 2454 2483 break; 2455 2484 } … … 2908 2937 2909 2938 break; 2939 default: 2940 2941 break; 2910 2942 } 2911 2943 … … 3060 3092 temp.replace_all (";;", ";"); 3061 3093 } 3094 3095 break; 3096 default : 3062 3097 3063 3098 break; … … 3344 3379 } 3345 3380 break; 3381 default : 3382 break; 3346 3383 } 3347 3384 } … … 3563 3600 if (value.text == "") return; 3564 3601 break; 3602 default: 3603 break; 3565 3604 } 3566 3605 … … 3639 3678 cout << " " << define_text << " action " << symbol.name << " as "; 3640 3679 first_definition = false; 3680 break; 3681 default : 3641 3682 break; 3642 3683 } … … 3696 3737 //case CommandAction : 3697 3738 if (value.text.size () == 0) return result; 3739 break; 3740 default : 3698 3741 break; 3699 3742 } … … 3895 3938 3896 3939 break; 3940 default : 3941 break; 3897 3942 } 3898 3943 … … 4091 4136 break; 4092 4137 */ 4138 default : 4139 break; 4093 4140 } 4094 4141 -
CMT/v1r25-branch/source/cmt_use.cxx
r664 r669 550 550 Cmt::print_xml_prolog ("uses", out); 551 551 out << "<uses>"; 552 break; 553 default: 552 554 break; 553 555 } … … 713 715 out << "</uses>" << endl; 714 716 break; 717 default: 718 break; 715 719 } 716 720 /* … … 824 828 while (path_alias[path_alias.size() - 1] == '\\') path_alias.erase (path_alias.size() - 1); 825 829 state = finished; 830 break; 831 default: 826 832 break; 827 833 } -
CMT/v1r25-branch/source/cmt_vcs.cxx
r664 r669 649 649 path = s; 650 650 state = no_need; 651 break; 652 default: 651 653 break; 652 654 } … … 3376 3378 state = no_need; 3377 3379 break; 3380 default: 3381 break; 3378 3382 } 3379 3383 } … … 3474 3478 state = no_need; 3475 3479 break; 3480 default: 3481 break; 3476 3482 } 3477 3483 } … … 3539 3545 tag = s; 3540 3546 state = no_need; 3547 break; 3548 default: 3541 3549 break; 3542 3550 } … … 3635 3643 tag = s; 3636 3644 state = no_need; 3645 break; 3646 default: 3637 3647 break; 3638 3648 }
Note: See TracChangeset
for help on using the changeset viewer.