monodevelop-mint.patch

   1 diff -Nuard monodevelop-0.5.orig/configure.in monodevelop-0.5/configure.in
   2 --- monodevelop-0.5.orig/configure.in   2004-06-29 21:18:46.000000000 +0200
   3 +++ monodevelop-0.5/configure.in        2004-07-04 10:58:07.051839656 +0200
   4 @@ -12,9 +12,14 @@
   5  AC_PATH_PROG(MONO, mono)
   6  AC_PATH_PROG(MCS, mcs)
   7  AC_PATH_PROG(XDGMIME, update-mime-database, no)
   8 +
   9  if test "x$MONO" = "x" ; then
  10 -  AC_MSG_ERROR([Can't find "mono" in your PATH])
  11 +  AC_PATH_PROG(MINT, mint)
  12 +  if test "x$MINT" = "x" ; then
  13 +       AC_MSG_ERROR([Can't find "mono" or "mint" in your PATH])
  14 +  fi
  15  fi
  16 +
  17  if test "x$MCS" = "x" ; then
  18    AC_MSG_ERROR([Can't find "mcs" in your PATH])
  19  fi
  20 @@ -28,13 +33,38 @@
  21  fi
  22
  23  dnl unmanaged hard dependencies
  24 -MONO_REQUIRED_VERSION=1.0
  25  GNOMEVFS_REQUIRED_VERSION=2.0
  26  PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES,
  27 -mono >= $MONO_REQUIRED_VERSION
  28  gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED_VERSION
  29  )
  30
  31 +MONO_REQUIRED_VERSION=1.0
  32 +PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES_MONO,mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
  33 +PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES_MINT,mint >= $MONO_REQUIRED_VERSION, has_mint=true, has_mint=false)
  34 +
  35 +if test "x$has_mono" = "xtrue"; then
  36 +    if test `uname -s` = "Darwin"; then
  37 +       AC_PATH_PROG(RUNTIME, mono, no)
  38 +       AC_PATH_PROG(CSC, mcs, no)
  39 +       LIB_PREFIX=
  40 +       LIB_SUFFIX=.dylib
  41 +    else
  42 +       AC_PATH_PROG(RUNTIME, mono, no)
  43 +       AC_PATH_PROG(CSC, mcs, no)
  44 +       RUNTIME="$RUNTIME --debug"
  45 +       LIB_PREFIX=.so
  46 +       LIB_SUFFIX=
  47 +    fi
  48 +else
  49 +    if test "x$has_mint" = "xtrue"; then
  50 +       AC_PATH_PROG(RUNTIME, mint, no)
  51 +       AC_PATH_PROG(CSC, mcs, no)
  52 +       LIB_PREFIX=.so
  53 +       LIB_SUFFIX=
  54 +    fi
  55 +fi
  56 +
  57 +
  58  dnl hard dependencies
  59  GTKSHARP_REQUIRED_VERSION=1.0
  60  GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.5
  61 @@ -165,6 +195,8 @@
  62  po/Makefile.in
  63  src/AddIns/prj2make-sharp-lib/Makefile
  64  src/AddIns/prj2make-sharp-lib/AssemblyInfo.cs
  65 +src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs
  66 +src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs
  67  ])
  68
  69  echo "---"
  70 diff -Nuard monodevelop-0.5.orig/Makefile.am monodevelop-0.5/Makefile.am
  71 --- monodevelop-0.5.orig/Makefile.am    2004-06-27 06:04:20.000000000 +0200
  72 +++ monodevelop-0.5/Makefile.am 2004-07-04 10:17:22.675441352 +0200
  73 @@ -43,7 +43,7 @@
  74  run: runmd
  75
  76  runmd: $(PROGRAM)
  77 -       cd build/bin && LD_LIBRARY_PATH=`echo "$(LD_LIBRARY_PATH):$(MOZILLA_HOME)" | sed 's/^://g'` mono --debug MonoDevelop.exe
  78 +       cd build/bin && LD_LIBRARY_PATH=`echo "$(LD_LIBRARY_PATH):$(MOZILLA_HOME)" | sed 's/^://g'` $(RUNTIME) MonoDevelop.exe
  79
  80  pad: $(MONOPAD)
  81
  82 diff -Nuard monodevelop-0.5.orig/monodevelop.in monodevelop-0.5/monodevelop.in
  83 --- monodevelop-0.5.orig/monodevelop.in 2004-06-27 06:03:48.000000000 +0200
  84 +++ monodevelop-0.5/monodevelop.in      2004-07-04 10:13:21.858051160 +0200
  85 @@ -50,19 +50,19 @@
  86
  87  case x$1 in
  88      x--profile)
  89 -    mono --profile ./MonoDevelop.exe $@
  90 +    @RUNTIME@ --profile ./MonoDevelop.exe $@
  91         exit 0
  92      ;;
  93      x--debug)
  94 -    mono --debug ./MonoDevelop.exe $@
  95 +    @RUNTIME@ --debug ./MonoDevelop.exe $@
  96         exit 0
  97      ;;
  98         x--trace)
  99 -    mono --trace ./MonoDevelop.exe $@
 100 +    @RUNTIME@ --trace ./MonoDevelop.exe $@
 101         exit 0;
 102         ;;
 103  esac
 104
 105  # should not use --debug when we are more stable
 106 -mono --debug ./MonoDevelop.exe $@
 107 +@RUNTIME@ ./MonoDevelop.exe $@
 108
 109 diff -Nuard monodevelop-0.5.orig/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs monodevelop-0.5/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs
 110 --- monodevelop-0.5.orig/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs      2004-06-27 06:02:55.000000000 +0200
 111 +++ monodevelop-0.5/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs   1970-01-01 01:00:00.000000000 +0100
 112 @@ -1,106 +0,0 @@
 113 -// <file>
 114 -//     <copyright see="prj:///doc/copyright.txt"/>
 115 -//     <license see="prj:///doc/license.txt"/>
 116 -//     <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
 117 -//     <version value="$version"/>
 118 -// </file>
 119 -
 120 -using System;
 121 -using System.IO;
 122 -using System.Diagnostics;
 123 -using System.Collections;
 124 -using System.Reflection;
 125 -using System.Resources;
 126 -using System.Xml;
 127 -using System.CodeDom.Compiler;
 128 -using System.Threading;
 129 -
 130 -using MonoDevelop.Internal.Project;
 131 -using MonoDevelop.Gui;
 132 -using MonoDevelop.Core.Services;
 133 -using MonoDevelop.Services;
 134 -
 135 -namespace CSharpBinding
 136 -{
 137 -       /// <summary>
 138 -       /// This class describes the main functionalaty of a language codon
 139 -       /// </summary>
 140 -       public class CSharpBindingExecutionManager
 141 -       {
 142 -               public void Debug (IProject project)
 143 -               {
 144 -                       FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService (typeof (FileUtilityService));
 145 -                       string directory = fileUtilityService.GetDirectoryNameWithSeparator(((CSharpCompilerParameters)project.ActiveConfiguration).OutputDirectory);
 146 -                       string exe = ((CSharpCompilerParameters)project.ActiveConfiguration).OutputAssembly + ".exe";
 147 -
 148 -                       IDebuggingService dbgr = (IDebuggingService) ServiceManager.GetService (typeof (IDebuggingService));
 149 -                       if (dbgr != null)
 150 -                               dbgr.Run (new string[] { Path.Combine (directory, exe) } );
 151 -               }
 152 -
 153 -               public void Execute(string filename)
 154 -               {
 155 -                       string exe = Path.ChangeExtension(filename, ".exe");
 156 -                       ProcessStartInfo psi = new ProcessStartInfo("mono", "--debug " + exe);
 157 -                       psi.WorkingDirectory = Path.GetDirectoryName(exe);
 158 -                       psi.UseShellExecute = false;
 159 -                       try {
 160 -                               Process p = new Process();
 161 -                               p.StartInfo = psi;
 162 -                               p.Start();
 163 -                       } catch (Exception) {
 164 -                               throw new ApplicationException("Can not execute " + "\"" + exe + "\"\n(Try restarting MonoDevelop or start your app manually)");
 165 -                       }
 166 -               }
 167 -
 168 -               public void Execute(IProject project)
 169 -               {
 170 -                       CSharpCompilerParameters parameters = (CSharpCompilerParameters)project.ActiveConfiguration;
 171 -                       FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
 172 -
 173 -                       string directory = fileUtilityService.GetDirectoryNameWithSeparator(((CSharpCompilerParameters)project.ActiveConfiguration).OutputDirectory);
 174 -                       string exe = ((CSharpCompilerParameters)project.ActiveConfiguration).OutputAssembly + ".exe";
 175 -                       string args = ((CSharpCompilerParameters)project.ActiveConfiguration).CommandLineParameters;
 176 -
 177 -                       ProcessStartInfo psi;
 178 -                       if (parameters.ExecuteScript != null && parameters.ExecuteScript.Length > 0) {
 179 -                               //Console.WriteLine("EXECUTE SCRIPT!!!!!!");
 180 -                               psi = new ProcessStartInfo("\"" + parameters.ExecuteScript + "\"");
 181 -                               psi.UseShellExecute = false;
 182 -                       } else {
 183 -                               string runtimeStarter = "mono --debug ";
 184 -
 185 -                               switch (parameters.NetRuntime) {
 186 -                                       case NetRuntime.Mono:
 187 -                                               runtimeStarter = "mono --debug ";
 188 -                                               break;
 189 -                                       case NetRuntime.MonoInterpreter:
 190 -                                               runtimeStarter = "mint ";
 191 -                                               break;
 192 -                               }
 193 -
 194 -                               //if (parameters.CompileTarget != CompileTarget.WinExe && parameters.PauseConsoleOutput) {
 195 -                                       psi = new ProcessStartInfo("xterm",
 196 -                                               string.Format (
 197 -                                               @"-e ""{0} '{1}{2}' {3} ; echo; read -p 'press any key to continue...' -n1""",
 198 -                                               runtimeStarter, directory, exe, args));
 199 -                                       psi.UseShellExecute = false;
 200 -                               //} else {
 201 -                               //      psi = new ProcessStartInfo(runtimeStarter, "\"" + directory + exe + "\" " + args);
 202 -                               //      psi.UseShellExecute = false;
 203 -                               //}
 204 -                       }
 205 -
 206 -                       try {
 207 -                               psi.WorkingDirectory = Path.GetDirectoryName(directory);
 208 -                               psi.UseShellExecute  =  false;
 209 -
 210 -                               Process p = new Process();
 211 -                               p.StartInfo = psi;
 212 -                               p.Start();
 213 -                       } catch (Exception) {
 214 -                               throw new ApplicationException("Can not execute " + "\"" + directory + exe + "\"\n(Try restarting MonoDevelop or start your app manually)");
 215 -                       }
 216 -               }
 217 -       }
 218 -}
 219 diff -Nuard monodevelop-0.5.orig/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs.in monodevelop-0.5/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs.in
 220 --- monodevelop-0.5.orig/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs.in   1970-01-01 01:00:00.000000000 +0100
 221 +++ monodevelop-0.5/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs.in        2004-07-04 10:48:17.906403376 +0200
 222 @@ -0,0 +1,107 @@
 223 +// <file>
 224 +//     <copyright see="prj:///doc/copyright.txt"/>
 225 +//     <license see="prj:///doc/license.txt"/>
 226 +//     <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
 227 +//     <version value="$version"/>
 228 +// </file>
 229 +
 230 +using System;
 231 +using System.IO;
 232 +using System.Diagnostics;
 233 +using System.Collections;
 234 +using System.Reflection;
 235 +using System.Resources;
 236 +using System.Xml;
 237 +using System.CodeDom.Compiler;
 238 +using System.Threading;
 239 +
 240 +using MonoDevelop.Internal.Project;
 241 +using MonoDevelop.Gui;
 242 +using MonoDevelop.Core.Services;
 243 +using MonoDevelop.Services;
 244 +
 245 +namespace CSharpBinding
 246 +{
 247 +       /// <summary>
 248 +       /// This class describes the main functionalaty of a language codon
 249 +       /// </summary>
 250 +       public class CSharpBindingExecutionManager
 251 +       {
 252 +               public void Debug (IProject project)
 253 +               {
 254 +                       FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService (typeof (FileUtilityService));
 255 +                       string directory = fileUtilityService.GetDirectoryNameWithSeparator(((CSharpCompilerParameters)project.ActiveConfiguration).OutputDirectory);
 256 +                       string exe = ((CSharpCompilerParameters)project.ActiveConfiguration).OutputAssembly + ".exe";
 257 +
 258 +                       IDebuggingService dbgr = (IDebuggingService) ServiceManager.GetService (typeof (IDebuggingService));
 259 +                       if (dbgr != null)
 260 +                               dbgr.Run (new string[] { Path.Combine (directory, exe) } );
 261 +               }
 262 +
 263 +               public void Execute(string filename)
 264 +               {
 265 +                       string exe = Path.ChangeExtension(filename, ".exe");
 266 +
 267 +                       ProcessStartInfo psi = new ProcessStartInfo("@RUNTIME@ " + exe);
 268 +                       psi.WorkingDirectory = Path.GetDirectoryName(exe);
 269 +                       psi.UseShellExecute = false;
 270 +                       try {
 271 +                               Process p = new Process();
 272 +                               p.StartInfo = psi;
 273 +                               p.Start();
 274 +                       } catch (Exception) {
 275 +                               throw new ApplicationException("Can not execute " + "\"" + exe + "\"\n(Try restarting MonoDevelop or start your app manually)");
 276 +                       }
 277 +               }
 278 +
 279 +               public void Execute(IProject project)
 280 +               {
 281 +                       CSharpCompilerParameters parameters = (CSharpCompilerParameters)project.ActiveConfiguration;
 282 +                       FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
 283 +
 284 +                       string directory = fileUtilityService.GetDirectoryNameWithSeparator(((CSharpCompilerParameters)project.ActiveConfiguration).OutputDirectory);
 285 +                       string exe = ((CSharpCompilerParameters)project.ActiveConfiguration).OutputAssembly + ".exe";
 286 +                       string args = ((CSharpCompilerParameters)project.ActiveConfiguration).CommandLineParameters;
 287 +
 288 +                       ProcessStartInfo psi;
 289 +                       if (parameters.ExecuteScript != null && parameters.ExecuteScript.Length > 0) {
 290 +                               //Console.WriteLine("EXECUTE SCRIPT!!!!!!");
 291 +                               psi = new ProcessStartInfo("\"" + parameters.ExecuteScript + "\"");
 292 +                               psi.UseShellExecute = false;
 293 +                       } else {
 294 +                               string runtimeStarter = "mono --debug ";
 295 +
 296 +                               switch (parameters.NetRuntime) {
 297 +                                       case NetRuntime.Mono:
 298 +                                               runtimeStarter = "mono --debug ";
 299 +                                               break;
 300 +                                       case NetRuntime.MonoInterpreter:
 301 +                                               runtimeStarter = "mint ";
 302 +                                               break;
 303 +                               }
 304 +
 305 +                               //if (parameters.CompileTarget != CompileTarget.WinExe && parameters.PauseConsoleOutput) {
 306 +                                       psi = new ProcessStartInfo("xterm",
 307 +                                               string.Format (
 308 +                                               @"-e ""{0} '{1}{2}' {3} ; echo; read -p 'press any key to continue...' -n1""",
 309 +                                               runtimeStarter, directory, exe, args));
 310 +                                       psi.UseShellExecute = false;
 311 +                               //} else {
 312 +                               //      psi = new ProcessStartInfo(runtimeStarter, "\"" + directory + exe + "\" " + args);
 313 +                               //      psi.UseShellExecute = false;
 314 +                               //}
 315 +                       }
 316 +
 317 +                       try {
 318 +                               psi.WorkingDirectory = Path.GetDirectoryName(directory);
 319 +                               psi.UseShellExecute  =  false;
 320 +
 321 +                               Process p = new Process();
 322 +                               p.StartInfo = psi;
 323 +                               p.Start();
 324 +                       } catch (Exception) {
 325 +                               throw new ApplicationException("Can not execute " + "\"" + directory + exe + "\"\n(Try restarting MonoDevelop or start your app manually)");
 326 +                       }
 327 +               }
 328 +       }
 329 +}
 330 diff -Nuard monodevelop-0.5.orig/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs monodevelop-0.5/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs
 331 --- monodevelop-0.5.orig/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs   2004-06-27 06:02:53.000000000 +0200
 332 +++ monodevelop-0.5/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs        1970-01-01 01:00:00.000000000 +0100
 333 @@ -1,59 +0,0 @@
 334 -using System;
 335 -using System.IO;
 336 -using System.Diagnostics;
 337 -using System.Collections;
 338 -using System.Reflection;
 339 -using System.Resources;
 340 -using System.Xml;
 341 -using System.CodeDom.Compiler;
 342 -using System.Threading;
 343 -
 344 -using MonoDevelop.Internal.Project;
 345 -using MonoDevelop.Gui;
 346 -using MonoDevelop.Core.Services;
 347 -
 348 -namespace NemerleBinding
 349 -{
 350 -       public class NemerleBindingExecutionServices
 351 -       {
 352 -
 353 -               public void Execute(string filename)
 354 -               {
 355 -                       throw new ApplicationException("No ExecuteFile");
 356 -               }
 357 -
 358 -               public void Execute(IProject project)
 359 -               {
 360 -
 361 -                       NemerleParameters p = (NemerleParameters)project.ActiveConfiguration;
 362 -                       FileUtilityService fus = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
 363 -                       string exe;
 364 -
 365 -                       if (p.ExecuteScript == String.Empty)
 366 -                       {
 367 -                               exe     = "mono --debug";
 368 -                       } else
 369 -                       {
 370 -                               exe = p.ExecuteScript;
 371 -                       }
 372 -
 373 -                       exe += " " + p.OutputAssembly + ".exe " + p.Parameters;
 374 -
 375 -                       try {
 376 -                               ProcessStartInfo psi = new ProcessStartInfo("xterm",
 377 -                                       string.Format (
 378 -                                       @"-e ""{0} ;echo;read -p 'press any key to continue...' -n1""",
 379 -                                       exe));
 380 -                               psi.WorkingDirectory = fus.GetDirectoryNameWithSeparator(p.OutputDirectory);
 381 -                               psi.UseShellExecute = false;
 382 -
 383 -                               Process pr = new Process();
 384 -                               pr.StartInfo = psi;
 385 -                               pr.Start();
 386 -                       } catch (Exception) {
 387 -                               throw new ApplicationException("Can not execute");
 388 -                       }
 389 -               }
 390 -
 391 -       }
 392 -}
 393 diff -Nuard monodevelop-0.5.orig/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs.in monodevelop-0.5/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs.in
 394 --- monodevelop-0.5.orig/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs.in        1970-01-01 01:00:00.000000000 +0100
 395 +++ monodevelop-0.5/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs.in     2004-07-04 10:48:14.086984016 +0200
 396 @@ -0,0 +1,59 @@
 397 +using System;
 398 +using System.IO;
 399 +using System.Diagnostics;
 400 +using System.Collections;
 401 +using System.Reflection;
 402 +using System.Resources;
 403 +using System.Xml;
 404 +using System.CodeDom.Compiler;
 405 +using System.Threading;
 406 +
 407 +using MonoDevelop.Internal.Project;
 408 +using MonoDevelop.Gui;
 409 +using MonoDevelop.Core.Services;
 410 +
 411 +namespace NemerleBinding
 412 +{
 413 +       public class NemerleBindingExecutionServices
 414 +       {
 415 +
 416 +               public void Execute(string filename)
 417 +               {
 418 +                       throw new ApplicationException("No ExecuteFile");
 419 +               }
 420 +
 421 +               public void Execute(IProject project)
 422 +               {
 423 +
 424 +                       NemerleParameters p = (NemerleParameters)project.ActiveConfiguration;
 425 +                       FileUtilityService fus = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
 426 +                       string exe;
 427 +
 428 +                       if (p.ExecuteScript == String.Empty)
 429 +                       {
 430 +                               exe     = "@RUNTIME@ ";
 431 +                       } else
 432 +                       {
 433 +                               exe = p.ExecuteScript;
 434 +                       }
 435 +
 436 +                       exe += " " + p.OutputAssembly + ".exe " + p.Parameters;
 437 +
 438 +                       try {
 439 +                               ProcessStartInfo psi = new ProcessStartInfo("xterm",
 440 +                                       string.Format (
 441 +                                       @"-e ""{0} ;echo;read -p 'press any key to continue...' -n1""",
 442 +                                       exe));
 443 +                               psi.WorkingDirectory = fus.GetDirectoryNameWithSeparator(p.OutputDirectory);
 444 +                               psi.UseShellExecute = false;
 445 +
 446 +                               Process pr = new Process();
 447 +                               pr.StartInfo = psi;
 448 +                               pr.Start();
 449 +                       } catch (Exception) {
 450 +                               throw new ApplicationException("Can not execute");
 451 +                       }
 452 +               }
 453 +
 454 +       }
 455 +}
 456 diff -Nuard monodevelop-0.5.orig/src/Libraries/SharpRefactory/Makefile.am monodevelop-0.5/src/Libraries/SharpRefactory/Makefile.am
 457 --- monodevelop-0.5.orig/src/Libraries/SharpRefactory/Makefile.am       2004-06-27 06:03:38.000000000 +0200
 458 +++ monodevelop-0.5/src/Libraries/SharpRefactory/Makefile.am    2004-07-04 10:17:38.544028960 +0200
 459 @@ -125,7 +125,7 @@
 460         @ $(CSC) /out:$@ /r:$(DLL) src/Main.cs
 461
 462  run : test-parser.exe
 463 -       @ MONO_PATH=`dirname $(DLL)` mono --debug test-parser.exe $(TEST_SOURCE)
 464 +       @ MONO_PATH=`dirname $(DLL)` $(RUNTIME) test-parser.exe $(TEST_SOURCE)
 465
 466  assemblydir = $(libdir)/monodevelop/bin
 467  assembly_DATA = $(DLL)