85c05c9932
organization, error workflow, working debugger etc. For more info please consult http://monodevelop.com/Download/What's_new_in_MonoDevelop_2.4
48 lines
2 KiB
Text
48 lines
2 KiB
Text
$NetBSD: patch-ac,v 1.3 2010/10/16 04:40:37 kefren Exp $
|
|
--- src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs.orig 2010-06-14 22:48:25.000000000 +0300
|
|
+++ src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs 2010-10-15 18:07:01.000000000 +0300
|
|
@@ -170,7 +170,7 @@ namespace MonoDevelop.Autotools
|
|
chainedOutput.ChainWriter (monitor.Log);
|
|
chainedOutput.ChainWriter (swOutput);
|
|
|
|
- ProcessWrapper process = Runtime.ProcessService.StartProcess ("make",
|
|
+ ProcessWrapper process = Runtime.ProcessService.StartProcess ("MAKEPROGRAM",
|
|
args,
|
|
baseDir,
|
|
chainedOutput,
|
|
@@ -258,7 +258,7 @@ namespace MonoDevelop.Autotools
|
|
// Snatched from our codedom code :-).
|
|
//FIXME: Get this from the language binding.. if a known lang
|
|
|
|
- static Regex regexEnterDir = new Regex (@"make\[[0-9]*\]: ([a-zA-Z]*) directory `(.*)'");
|
|
+ static Regex regexEnterDir = new Regex (@"MAKEPROGRAM\[[0-9]*\]: ([a-zA-Z]*) directory `(.*)'");
|
|
|
|
private static CompilerError CreateCompilerErrorFromString (string error_string, Stack<string> dirs, Regex regex)
|
|
{
|
|
@@ -284,7 +284,7 @@ namespace MonoDevelop.Autotools
|
|
return null;
|
|
}
|
|
|
|
- if (error_string.StartsWith ("make"))
|
|
+ if (error_string.StartsWith ("MAKEPROGRAM"))
|
|
return null;
|
|
|
|
match = regex.Match (error_string);
|
|
@@ -349,7 +349,7 @@ namespace MonoDevelop.Autotools
|
|
{
|
|
string baseDir = proj.BaseDirectory;
|
|
|
|
- ProcessWrapper process = Runtime.ProcessService.StartProcess ( "make",
|
|
+ ProcessWrapper process = Runtime.ProcessService.StartProcess ( "MAKEPROGRAM",
|
|
data.CleanTargetName,
|
|
baseDir,
|
|
monitor.Log,
|
|
@@ -404,7 +404,7 @@ namespace MonoDevelop.Autotools
|
|
monitor.BeginTask (GettextCatalog.GetString ("Executing {0}", project.Name), 1);
|
|
try
|
|
{
|
|
- ProcessWrapper process = Runtime.ProcessService.StartProcess ("make",
|
|
+ ProcessWrapper process = Runtime.ProcessService.StartProcess ("MAKEPROGRAM",
|
|
data.ExecuteTargetName,
|
|
project.BaseDirectory,
|
|
console.Out,
|