OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 using System; | 4 using System; |
5 using System.Collections.Generic; | 5 using System.Collections.Generic; |
6 using System.Text; | 6 using System.Text; |
7 using System.Collections; | 7 using System.Collections; |
8 using System.IO; | 8 using System.IO; |
9 using System.Reflection; | 9 using System.Reflection; |
10 using System.Resources; | 10 using System.Resources; |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 srcGroups.Add(commandLine, new List<ITaskItem> {sourceItem})
; | 366 srcGroups.Add(commandLine, new List<ITaskItem> {sourceItem})
; |
367 } | 367 } |
368 } | 368 } |
369 | 369 |
370 string pythonScript = Path.GetDirectoryName(Path.GetDirectoryName(Pr
opertiesFile)); | 370 string pythonScript = Path.GetDirectoryName(Path.GetDirectoryName(Pr
opertiesFile)); |
371 pythonScript = Path.Combine(pythonScript, "compiler_wrapper.py"); | 371 pythonScript = Path.Combine(pythonScript, "compiler_wrapper.py"); |
372 | 372 |
373 foreach (KeyValuePair<string, List<ITaskItem>> entry in srcGroups) | 373 foreach (KeyValuePair<string, List<ITaskItem>> entry in srcGroups) |
374 { | 374 { |
375 string commandLine = entry.Key; | 375 string commandLine = entry.Key; |
376 string cmd = "\"" + pathToTool + "\" " + commandLine + "--"; | 376 string cmd = "\"" + pathToTool + "\" " + commandLine + " --"; |
377 List<ITaskItem> sources = entry.Value; | 377 List<ITaskItem> sources = entry.Value; |
378 | 378 |
379 foreach (ITaskItem sourceItem in sources) | 379 foreach (ITaskItem sourceItem in sources) |
380 { | 380 { |
| 381 cmd += " "; |
381 cmd += GCCUtilities.ConvertPathWindowsToPosix(sourceItem.ToS
tring()); | 382 cmd += GCCUtilities.ConvertPathWindowsToPosix(sourceItem.ToS
tring()); |
382 } | 383 } |
383 | 384 |
384 try | 385 try |
385 { | 386 { |
386 // compile this group of sources | 387 // compile this group of sources |
387 returnCode = base.ExecuteTool("python", cmd, "\"" + pythonSc
ript + "\""); | 388 returnCode = base.ExecuteTool("python", cmd, "\"" + pythonSc
ript + "\""); |
388 } | 389 } |
389 catch (Exception e) | 390 catch (Exception e) |
390 { | 391 { |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
539 protected override string ToolName | 540 protected override string ToolName |
540 { | 541 { |
541 get | 542 get |
542 { | 543 { |
543 return NaCLCompilerPath; | 544 return NaCLCompilerPath; |
544 } | 545 } |
545 } | 546 } |
546 | 547 |
547 } | 548 } |
548 } | 549 } |
OLD | NEW |