← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric

« back to all changes in this revision

Viewing changes to src/addins/VBNetBinding/VBBindingCompilerServices.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2011-06-27 17:03:13 UTC
  • mto: (1.8.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: james.westby@ubuntu.com-20110627170313-6cvz3s19x6e9hqe9
Import upstream version 2.5.92+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/VBNetBinding/VBBindingCompilerServices.cs
245
245
                        string compilerName = configuration.TargetRuntime.GetToolPath (configuration.TargetFramework, "vbc");
246
246
                        if (compilerName == null) {
247
247
                                BuildResult res = new BuildResult ();
248
 
                                res.AddError (string.Format ("Visual Basict .NET compiler not found ({0})", configuration.TargetRuntime.DisplayName));
 
248
                                res.AddError (string.Format ("Visual Basic .NET compiler not found ({0})", configuration.TargetRuntime.DisplayName));
249
249
                                return res;
250
250
                        }
251
251
                        
252
 
                        string outstr = String.Concat (compilerName, " @", responseFileName);
253
 
                        
254
 
                        
255
252
                        string workingDir = ".";
256
253
                        if (configuration.ParentItem != null)
257
254
                                workingDir = configuration.ParentItem.BaseDirectory;
260
257
                        var envVars = configuration.TargetRuntime.GetToolsExecutionEnvironment (configuration.TargetFramework);
261
258
                        
262
259
                        monitor.Log.WriteLine (Path.GetFileName (compilerName) + " " + string.Join (" ", File.ReadAllLines (responseFileName)));
263
 
                        exitCode = DoCompilation (outstr, tf, workingDir, envVars, ref output);
 
260
                        exitCode = DoCompilation (compilerName, responseFileName, tf, workingDir, envVars, ref output);
264
261
                        
265
262
                        monitor.Log.WriteLine (output);                                                                           
266
263
                        BuildResult result = ParseOutput (tf, output);
360
357
                        return null;
361
358
                }
362
359
                
363
 
                private int DoCompilation (string outstr, TempFileCollection tf, string working_dir, ExecutionEnvironment envVars, ref string output)
 
360
                private int DoCompilation (string compilerName, string responseFileName, TempFileCollection tf, string working_dir, ExecutionEnvironment envVars, ref string output)
364
361
                {
365
362
                        StringWriter outwr = new StringWriter ();
366
 
                        string[] tokens = outstr.Split (' ');                   
367
363
                        try {
368
 
                                outstr = outstr.Substring (tokens[0].Length+1);
369
 
                                
370
 
                                ProcessStartInfo pinfo = new ProcessStartInfo (tokens[0], "\"" + outstr + "\"");
 
364
                                ProcessStartInfo pinfo = new ProcessStartInfo (compilerName, "\"@" + responseFileName + "\"");
371
365
                                pinfo.WorkingDirectory = working_dir;
372
366
                                envVars.MergeTo (pinfo);
373
367