Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(203)

Side by Side Diff: visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLink.cs

Issue 11367026: [VS Addin] Add PNaCl configs to examples (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1  1 
2 using System; 2 using System;
3 using System.IO; 3 using System.IO;
4 using System.Resources; 4 using System.Resources;
5 using System.Reflection; 5 using System.Reflection;
6 using System.Text; 6 using System.Text;
7 using Microsoft.Build.Framework; 7 using Microsoft.Build.Framework;
8 using Microsoft.Build.CPPTasks; 8 using Microsoft.Build.CPPTasks;
9 using Microsoft.Build.Utilities; 9 using Microsoft.Build.Utilities;
10 10
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 { 168 {
169 if (pnacl_arch == null) 169 if (pnacl_arch == null)
170 pnacl_arch = arch; 170 pnacl_arch = arch;
171 string outfile = PexeToNexe(OutputFile, arch); 171 string outfile = PexeToNexe(OutputFile, arch);
172 string cmd = String.Format("-arch {0} \"{1}\" -o \"{2}\"", 172 string cmd = String.Format("-arch {0} \"{1}\" -o \"{2}\"",
173 pnacl_arch, OutputFile, outfile); 173 pnacl_arch, OutputFile, outfile);
174 174
175 string dirname = Path.GetDirectoryName(GenerateFullPathToTool()); 175 string dirname = Path.GetDirectoryName(GenerateFullPathToTool());
176 string translateTool = Path.Combine(dirname, "pnacl-translate.bat"); 176 string translateTool = Path.Combine(dirname, "pnacl-translate.bat");
177 if (!OutputCommandLine) 177 if (!OutputCommandLine)
178 Log.LogMessage("pnacl-translate {0}", Path.GetFileName(outfile)) ; 178 Log.LogMessage("pnacl-translate -> {0}", Path.GetFileName(outfil e));
179 179
180 if (ExecuteTool(translateTool, cmd, string.Empty) != 0) 180 if (ExecuteTool(translateTool, cmd, string.Empty) != 0)
181 { 181 {
182 return false; 182 return false;
183 } 183 }
184 184
185 return true; 185 return true;
186 } 186 }
187 187
188 private bool IsPNaCl() 188 private bool IsPNaCl()
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 string bindir = Path.GetDirectoryName(NaClLinkerPath); 271 string bindir = Path.GetDirectoryName(NaClLinkerPath);
272 string tcroot = Path.GetDirectoryName(bindir); 272 string tcroot = Path.GetDirectoryName(bindir);
273 cmd += " -D \"" + Path.Combine(bindir, "x86_64-nacl-objd ump.exe") + "\""; 273 cmd += " -D \"" + Path.Combine(bindir, "x86_64-nacl-objd ump.exe") + "\"";
274 cmd += " -L \"" + Path.Combine(tcroot, "x86_64-nacl", "l ib") + "\""; 274 cmd += " -L \"" + Path.Combine(tcroot, "x86_64-nacl", "l ib") + "\"";
275 cmd += " -L \"" + Path.Combine(tcroot, "x86_64-nacl", "l ib32") + "\""; 275 cmd += " -L \"" + Path.Combine(tcroot, "x86_64-nacl", "l ib32") + "\"";
276 } 276 }
277 cmd += " \"" + OutputFile + "\""; 277 cmd += " \"" + OutputFile + "\"";
278 } 278 }
279 279
280 if (!OutputCommandLine) 280 if (!OutputCommandLine)
281 Log.LogMessage("CreateNMF"); 281 Log.LogMessage("CreateNMF -> {0}", Path.GetFileName(nmfPath) );
282 282
283 if (ExecuteTool("python", string.Empty, cmd) != 0) 283 if (ExecuteTool("python", string.Empty, cmd) != 0)
284 { 284 {
285 return false; 285 return false;
286 } 286 }
287 } 287 }
288 288
289 return true; 289 return true;
290 } 290 }
291 291
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 { 348 {
349 get 349 get
350 { 350 {
351 return "GCC"; 351 return "GCC";
352 } 352 }
353 set 353 set
354 {} 354 {}
355 } 355 }
356 } 356 }
357 } 357 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698