Changeset 660
- Timestamp:
- Dec 13, 2013, 3:47:35 PM (10 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r659 r660 1 2013-12-13 <rybkin@lal.in2p3.fr> 519 2 3 * source/cmt_symbol.cxx: In class Symbol function action, fully resolve 4 setup, cleanup script path except for setup, cleanup shell script 5 generation, in function print_clean, use unalias command to remove alias 6 with Bourne syntax shell, in function print, fully resolve set value, do 7 not mangle set, path name in Xml mode 8 * source/cmt_parser.cxx: In class Cmt function print_context, do not mangle 9 use prefix in Xml mode 10 1 11 2013-12-11 <rybkin@lal.in2p3.fr> 518 2 12 -
CMT/HEAD/source/cmt_parser.cxx
r659 r660 8108 8108 switch (mode) 8109 8109 { 8110 case Xml : 8110 8111 case Requirements : 8111 8112 break; -
CMT/HEAD/source/cmt_symbol.cxx
r659 r660 1108 1108 { 1109 1109 if (use->get_strategy ("SetupRoot") && 1110 use->get_package_name () != "cmt_standalone") 1110 use->get_package_name () != "cmt_standalone" && 1111 (action_setup == Cmt::get_action () || 1112 action_cleanup == Cmt::get_action ()) && 1113 Requirements != Cmt::get_print_mode () && 1114 Xml != Cmt::get_print_mode ()) 1111 1115 { 1112 1116 #ifdef WIN32 … … 1823 1827 break; 1824 1828 case Sh : 1825 cout << "[ -z ${" << name << "+CMT} ] || unset " << name; 1826 // cout << "unset " << name; 1829 cout << "alias " << name << " >/dev/null 2>&1 && unalias " << name; 1827 1830 result = 1; 1828 1831 break; … … 1898 1901 bool empty = (temp.size () == 0) ? true : false; 1899 1902 1903 cmt_string _name (name); 1904 switch (type) 1905 { 1906 case SymbolSet : 1907 case SymbolPath : 1908 expand (temp); 1909 if (type == SymbolPath) 1910 { 1911 if (!pb) 1912 pb = static_cast<PathBuilder*> (builder); 1913 pb->filter_path_value (*this, temp); 1914 } 1915 switch (mode) 1916 { 1917 case Xml : 1918 break; 1919 default: 1920 if (0 != CmtSystem::mangle (name, _name)) 1921 CmtMessage::info ("Replace " + name + " with " + _name); 1922 break; 1923 } 1924 break; 1925 default: 1926 break; 1927 } 1928 1929 /* 1900 1930 if (type == SymbolPath) 1901 1931 { … … 1906 1936 pb->filter_path_value (*this, temp); 1907 1937 } 1908 1909 cmt_string _name; 1938 */ 1910 1939 switch (type) 1911 1940 { 1912 1941 case SymbolSet : 1913 1942 case SymbolPath : 1914 if (0 != CmtSystem::mangle (name, _name))1915 CmtMessage::info ("Replace " + name + " with " + _name);1916 1943 switch (mode) 1917 1944 {
Note: See TracChangeset
for help on using the changeset viewer.