Changeset 527 for CMT/HEAD/source/cmt_parser.cxx
- Timestamp:
- Nov 20, 2009, 10:45:54 AM (15 years ago)
- File:
-
- 1 edited
-
CMT/HEAD/source/cmt_parser.cxx (modified) (25 diffs)
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/source/cmt_parser.cxx
r525 r527 2505 2505 // configure_current_package (); 2506 2506 2507 Generator::build_default_makefile ();2507 // Generator::build_default_makefile (); 2508 2508 2509 2509 CmtSystem::cmt_string_vector makes; … … 2581 2581 install_cleanup_scripts (); 2582 2582 install_native_version_file (); 2583 2584 Generator::build_default_makefile (); 2583 2585 2584 2586 CmtSystem::cd (".."); … … 3199 3201 if (!CmtSystem::test_file (input)) 3200 3202 { 3201 Cmt Message::error ("File " + input + " not found");3202 // cerr << "#CMT> File " << input << " not found" << endl;3203 CmtError::set (CmtError::path_not_found, input); 3204 // CmtMessage::error ("File " + input + " not found"); 3203 3205 return; 3204 3206 } … … 3213 3215 3214 3216 FILE* file = fopen (output, "wb"); 3215 if (file == NULL) 3216 { 3217 CmtMessage::error ("Cannot write filtered file " + output); 3218 // cerr << "#CMT> Cannot write filtered file " << output << endl; 3217 if (file != NULL) 3218 { 3219 text.write (file); 3220 CmtSystem::close_ostream (file, output); 3221 // fclose (file); 3219 3222 } 3220 3223 else 3221 3224 { 3222 text.write (file);3223 fclose (file);3225 CmtError::set (CmtError::file_access_error, output); 3226 // CmtMessage::error ("Cannot write filtered file " + output); 3224 3227 } 3225 3228 } … … 4812 4815 fprintf (f, "if $status != 0 then\n set tempfile=/tmp/cmt.$$\nendif\n"); 4813 4816 fprintf (f, "${CMTROOT}/mgr/cmt cleanup -%s " 4814 "-pack=%s -version=%s -path=%s $* >${tempfile}; " 4815 "source ${tempfile}\n", 4817 "-pack=%s -version=%s -path=%s $* >${tempfile}\n", 4816 4818 suffix[i].c_str (), 4817 4819 Me.m_current_package.c_str (), 4818 4820 version.c_str (), 4819 4821 Me.m_current_path.c_str ()); 4820 fprintf (f, "/bin/rm -f ${tempfile}\n"); 4822 fprintf (f, 4823 "if ( $status == 0 ) then\n" 4824 " source ${tempfile}\n" 4825 " /bin/rm -f ${tempfile}\n" 4826 "else\n" 4827 " echo \"${CMTROOT}/mgr/cmt cleanup -%s " 4828 "-pack=%s -version=%s -path=%s $* >${tempfile}\"\n" 4829 " /bin/rm -f ${tempfile}\n" 4830 " false\n" 4831 "endif\n", 4832 suffix[i].c_str (), 4833 Me.m_current_package.c_str (), 4834 version.c_str (), 4835 Me.m_current_path.c_str ()); 4821 4836 } 4822 4837 else if (mode[i] == Sh) … … 4829 4844 fprintf (f, "if test ! $? = 0 ; then tempfile=/tmp/cmt.$$; fi\n"); 4830 4845 fprintf (f, "${CMTROOT}/mgr/cmt cleanup -%s " 4831 "-pack=%s -version=%s -path=%s $* >${tempfile}; " 4832 ". ${tempfile}\n", 4846 "-pack=%s -version=%s -path=%s $* >${tempfile}\n", 4833 4847 suffix[i].c_str (), 4834 4848 Me.m_current_package.c_str (), 4835 4849 version.c_str (), 4836 4850 Me.m_current_path.c_str ()); 4837 fprintf (f, "/bin/rm -f ${tempfile}\n"); 4851 fprintf (f, 4852 "if test $? = 0 ; then\n" 4853 " . ${tempfile}\n" 4854 " /bin/rm -f ${tempfile}\n" 4855 "else\n" 4856 " echo >&2 \"${CMTROOT}/mgr/cmt cleanup -%s " 4857 "-pack=%s -version=%s -path=%s $* >${tempfile}\"\n" 4858 " /bin/rm -f ${tempfile}\n" 4859 " false\n" 4860 "fi\n", 4861 suffix[i].c_str (), 4862 Me.m_current_package.c_str (), 4863 version.c_str (), 4864 Me.m_current_path.c_str ()); 4838 4865 } 4839 4866 else if (mode[i] == Bat) … … 4846 4873 fprintf (f, "\n"); 4847 4874 4848 fclose (f); 4875 CmtSystem::close_ostream (f, file_name); 4876 // fclose (f); 4849 4877 4850 4878 cmt_string old_file_name = "cleanup"; … … 4854 4882 CmtSystem::compare_and_update_files (file_name, old_file_name); 4855 4883 } 4884 else 4885 { 4886 CmtError::set (CmtError::file_access_error, file_name); 4887 } 4856 4888 } 4857 4889 } … … 4932 4964 fprintf (f, "if $status != 0 then\n set tempfile=/tmp/cmt.$$\nendif\n"); 4933 4965 fprintf (f, "${CMTROOT}/mgr/cmt setup -%s " 4934 "-pack=%s -version=%s -path=%s %s $* >${tempfile}; " 4935 "source ${tempfile}\n", 4966 "-pack=%s -version=%s -path=%s %s $* >${tempfile}\n", 4936 4967 suffix[i].c_str (), 4937 4968 Me.m_current_package.c_str (), … … 4939 4970 Me.m_current_path.c_str (), 4940 4971 no_cleanup_opt.c_str ()); 4941 fprintf (f, "/bin/rm -f ${tempfile}\n"); 4972 fprintf (f, 4973 "if ( $status == 0 ) then\n" 4974 " source ${tempfile}\n" 4975 " /bin/rm -f ${tempfile}\n" 4976 "else\n" 4977 " echo \"${CMTROOT}/mgr/cmt setup -%s " 4978 "-pack=%s -version=%s -path=%s %s $* >${tempfile}\"\n" 4979 " /bin/rm -f ${tempfile}\n" 4980 " false\n" 4981 "endif\n", 4982 suffix[i].c_str (), 4983 Me.m_current_package.c_str (), 4984 version.c_str (), 4985 Me.m_current_path.c_str (), 4986 no_cleanup_opt.c_str ()); 4942 4987 } 4943 4988 else if (mode[i] == Sh) … … 4957 5002 fprintf (f, "if test ! $? = 0 ; then tempfile=/tmp/cmt.$$; fi\n"); 4958 5003 fprintf (f, "${CMTROOT}/mgr/cmt setup -%s " 4959 "-pack=%s -version=%s -path=%s %s $* >${tempfile}; " 4960 ". ${tempfile}\n", 5004 "-pack=%s -version=%s -path=%s %s $* >${tempfile}\n", 4961 5005 suffix[i].c_str (), 4962 5006 Me.m_current_package.c_str (), … … 4964 5008 Me.m_current_path.c_str (), 4965 5009 no_cleanup_opt.c_str ()); 4966 fprintf (f, "/bin/rm -f ${tempfile}\n"); 5010 fprintf (f, 5011 "if test $? = 0 ; then\n" 5012 " . ${tempfile}\n" 5013 " /bin/rm -f ${tempfile}\n" 5014 "else\n" 5015 " echo >&2 \"${CMTROOT}/mgr/cmt setup -%s " 5016 "-pack=%s -version=%s -path=%s %s $* >${tempfile}\"\n" 5017 " /bin/rm -f ${tempfile}\n" 5018 " false\n" 5019 "fi\n", 5020 suffix[i].c_str (), 5021 Me.m_current_package.c_str (), 5022 version.c_str (), 5023 Me.m_current_path.c_str (), 5024 no_cleanup_opt.c_str ()); 4967 5025 } 4968 5026 else if (mode[i] == Bat) … … 4978 5036 fprintf (f, "\n"); 4979 5037 4980 fclose (f); 5038 CmtSystem::close_ostream (f, file_name); 5039 // fclose (f); 4981 5040 4982 5041 cmt_string old_file_name = "setup"; … … 4986 5045 CmtSystem::compare_and_update_files (file_name, old_file_name); 4987 5046 } 5047 else 5048 { 5049 CmtError::set (CmtError::file_access_error, file_name); 5050 } 4988 5051 } 4989 5052 } … … 5049 5112 fprintf (f, "set tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`\n"); 5050 5113 fprintf (f, "if $status != 0 then\n set tempfile=/tmp/cmt.$$\nendif\n"); 5051 fprintf (f, "${CMTROOT}/mgr/cmt cleanup -%s -pack=cmt_standalone -path=%s $* >${tempfile}; " 5052 "source ${tempfile}\n", 5114 fprintf (f, "${CMTROOT}/mgr/cmt cleanup -%s -pack=cmt_standalone -path=%s $* >${tempfile}\n", 5053 5115 suffix[i].c_str (), 5054 5116 Me.m_current_path.c_str ()); 5055 fprintf (f, "/bin/rm -f ${tempfile}\n"); 5117 fprintf (f, 5118 "if ( $status == 0 ) then\n" 5119 " source ${tempfile}\n" 5120 " /bin/rm -f ${tempfile}\n" 5121 "else\n" 5122 " echo \"${CMTROOT}/mgr/cmt cleanup -%s -pack=cmt_standalone -path=%s $* >${tempfile}\"\n" 5123 " /bin/rm -f ${tempfile}\n" 5124 " false\n" 5125 "endif\n", 5126 suffix[i].c_str (), 5127 Me.m_current_path.c_str ()); 5056 5128 } 5057 5129 else if (mode[i] == Sh) … … 5063 5135 fprintf (f, "tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`\n"); 5064 5136 fprintf (f, "if test ! $? = 0 ; then tempfile=/tmp/cmt.$$; fi\n"); 5065 fprintf (f, "${CMTROOT}/mgr/cmt cleanup -%s -pack=cmt_standalone -path=%s $* >${tempfile}; " 5066 ". ${tempfile}\n", 5137 fprintf (f, "${CMTROOT}/mgr/cmt cleanup -%s -pack=cmt_standalone -path=%s $* >${tempfile}\n", 5067 5138 suffix[i].c_str (), 5068 5139 Me.m_current_path.c_str ()); 5069 fprintf (f, "/bin/rm -f ${tempfile}\n"); 5140 fprintf (f, 5141 "if test $? = 0 ; then\n" 5142 " . ${tempfile}\n" 5143 " /bin/rm -f ${tempfile}\n" 5144 "else\n" 5145 " echo >&2 \"${CMTROOT}/mgr/cmt cleanup -%s -pack=cmt_standalone -path=%s $* >${tempfile}\"\n" 5146 " /bin/rm -f ${tempfile}\n" 5147 " false\n" 5148 "fi\n", 5149 suffix[i].c_str (), 5150 Me.m_current_path.c_str ()); 5070 5151 } 5071 5152 else … … 5078 5159 fprintf (f, "\n"); 5079 5160 5080 fclose (f); 5161 CmtSystem::close_ostream (f, file_name); 5162 // fclose (f); 5081 5163 5082 5164 cmt_string old_file_name = "cleanup"; … … 5086 5168 CmtSystem::compare_and_update_files (file_name, old_file_name); 5087 5169 } 5170 else 5171 { 5172 CmtError::set (CmtError::file_access_error, file_name); 5173 } 5088 5174 } 5089 5175 } … … 5104 5190 cerr << "Creating native_version file." << endl; 5105 5191 5106 FILE* f = fopen ("new.native_version.cmt", "wb");5107 5192 cmt_string file_name ("new.native_version.cmt"); 5193 FILE* f = fopen (file_name.c_str (), "wb"); 5108 5194 if (f != NULL) 5109 5195 { 5110 5196 fprintf (f, "%s\n", value.c_str ()); 5197 CmtSystem::close_ostream (f, file_name); 5198 // fclose (f); 5199 5200 CmtSystem::compare_and_update_files ("new.native_version.cmt", "native_version.cmt"); 5111 5201 } 5112 5113 fclose (f);5114 5115 CmtSystem::compare_and_update_files ("new.native_version.cmt", "native_version.cmt");5202 else 5203 { 5204 CmtError::set (CmtError::file_access_error, file_name); 5205 } 5116 5206 } 5117 5207 } … … 5184 5274 fprintf (f, "set tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`\n"); 5185 5275 fprintf (f, "if $status != 0 then\n set tempfile=/tmp/cmt.$$\nendif\n"); 5186 fprintf (f, "${CMTROOT}/mgr/cmt setup -%s -pack=cmt_standalone -path=%s %s $* >${tempfile}; " 5187 "source ${tempfile}\n", 5276 fprintf (f, "${CMTROOT}/mgr/cmt setup -%s -pack=cmt_standalone -path=%s %s $* >${tempfile}\n", 5188 5277 suffix[i].c_str (), 5189 5278 Me.m_current_path.c_str (), 5190 5279 no_cleanup_opt.c_str ()); 5191 fprintf (f, "/bin/rm -f ${tempfile}\n"); 5280 fprintf (f, 5281 "if ( $status == 0 ) then\n" 5282 " source ${tempfile}\n" 5283 " /bin/rm -f ${tempfile}\n" 5284 "else\n" 5285 " echo \"${CMTROOT}/mgr/cmt setup -%s -pack=cmt_standalone -path=%s %s $* >${tempfile}\"\n" 5286 " /bin/rm -f ${tempfile}\n" 5287 " false\n" 5288 "endif\n", 5289 suffix[i].c_str (), 5290 Me.m_current_path.c_str (), 5291 no_cleanup_opt.c_str ()); 5192 5292 } 5193 5293 else if (mode[i] == Sh) … … 5203 5303 fprintf (f, "tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`\n"); 5204 5304 fprintf (f, "if test ! $? = 0 ; then tempfile=/tmp/cmt.$$; fi\n"); 5205 fprintf (f, "${CMTROOT}/mgr/cmt setup -%s -pack=cmt_standalone -path=%s %s $* >${tempfile}; " 5206 ". ${tempfile}\n", 5305 fprintf (f, "${CMTROOT}/mgr/cmt setup -%s -pack=cmt_standalone -path=%s %s $* >${tempfile}\n", 5207 5306 suffix[i].c_str (), 5208 5307 Me.m_current_path.c_str (), 5209 5308 no_cleanup_opt.c_str ()); 5210 fprintf (f, "/bin/rm -f ${tempfile}\n"); 5309 fprintf (f, 5310 "if test $? = 0 ; then\n" 5311 " . ${tempfile}\n" 5312 " /bin/rm -f ${tempfile}\n" 5313 "else\n" 5314 " echo >&2 \"${CMTROOT}/mgr/cmt setup -%s -pack=cmt_standalone -path=%s %s $* >${tempfile}\"\n" 5315 " /bin/rm -f ${tempfile}\n" 5316 " false\n" 5317 "fi\n", 5318 suffix[i].c_str (), 5319 Me.m_current_path.c_str (), 5320 no_cleanup_opt.c_str ()); 5211 5321 } 5212 5322 else … … 5220 5330 fprintf (f, "\n"); 5221 5331 5222 fclose (f); 5332 CmtSystem::close_ostream (f, file_name); 5333 // fclose (f); 5223 5334 5224 5335 cmt_string old_file_name = "setup"; … … 5228 5339 CmtSystem::compare_and_update_files (file_name, old_file_name); 5229 5340 } 5341 else 5342 { 5343 CmtError::set (CmtError::file_access_error, file_name); 5344 } 5230 5345 } 5231 5346 } … … 5623 5738 { 5624 5739 int code = CmtError::get_last_error_code (); 5625 if (!Me.m_quiet) CmtError::print (); 5740 CmtError::print (); 5741 // if (!Me.m_quiet) CmtError::print (); 5626 5742 clear (); 5627 5743 … … 6396 6512 } 6397 6513 6398 if (!Me.m_quiet) CmtError::print (); 6514 CmtError::print (); 6515 // if (!Me.m_quiet) CmtError::print (); 6399 6516 clear (); 6400 6517 return (code);
Note: See TracChangeset
for help on using the changeset viewer.
