[Monodevelop-patches-list] r1528 - in trunk/MonoDevelop: data/resources/glade src/AddIns/BackendBindings/NemerleBinding src/AddIns/BackendBindings/NemerleBinding/Gui src/AddIns/BackendBindings/NemerleBinding/Project

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Tue Apr 27 19:58:51 EDT 2004


Author: pawel
Date: 2004-04-27 19:58:51 -0400 (Tue, 27 Apr 2004)
New Revision: 1528

Modified:
   trunk/MonoDevelop/data/resources/glade/ChangeLog
   trunk/MonoDevelop/data/resources/glade/Nemerle.glade
   trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
   trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs
   trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs
   trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs
   trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs
   trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs
   trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs
Log:
use more from AbstractProjectConfiguration, Nemerle prjx looks cleaner now


Modified: trunk/MonoDevelop/data/resources/glade/ChangeLog
===================================================================
--- trunk/MonoDevelop/data/resources/glade/ChangeLog	2004-04-27 22:43:33 UTC (rev 1527)
+++ trunk/MonoDevelop/data/resources/glade/ChangeLog	2004-04-27 23:58:51 UTC (rev 1528)
@@ -1,3 +1,7 @@
+2004-04-28  Pawel Rozanski  <tokugawa at afn.no-ip.org>
+
+	* Nemerle.glade: "Ignore warnings" option added
+
 2004-04-26  Todd Berman  <tberman at sevenl.net>
 
 	* Base.glade: oops, missing combine->solution change

Modified: trunk/MonoDevelop/data/resources/glade/Nemerle.glade
===================================================================
--- trunk/MonoDevelop/data/resources/glade/Nemerle.glade	2004-04-27 22:43:33 UTC (rev 1527)
+++ trunk/MonoDevelop/data/resources/glade/Nemerle.glade	2004-04-27 23:58:51 UTC (rev 1528)
@@ -185,6 +185,24 @@
 		  <property name="fill">False</property>
 		</packing>
 	      </child>
+
+	      <child>
+		<widget class="GtkCheckButton" id="ignorewarnings">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Ignore warnings</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/ChangeLog	2004-04-27 22:43:33 UTC (rev 1527)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/ChangeLog	2004-04-27 23:58:51 UTC (rev 1528)
@@ -1,3 +1,14 @@
+2004-04-28  Pawel Rozanski  <tokugawa at afn.no-ip.org>
+
+	* Gui/OutputPanel.cs:
+	* Gui/CodeGenerationPanel.cs:
+	* NemerleBindingCompilerServices.cs:
+	* Project/NemerleParameters.cs:
+	* Project/NemerleProject.cs:
+	* NemerleBindingExecutionServices.cs:
+	NemerleParameters uses more from inherited AbstractProjectConfiguration
+	class
+
 2004-04-16  Pawel Rozanski <tokugawa at afn.no-ip.org>
 
 	* NemerleBindingCompilerServices.cs: without temp files now,

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs	2004-04-27 22:43:33 UTC (rev 1527)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs	2004-04-27 23:58:51 UTC (rev 1528)
@@ -21,6 +21,7 @@
  			[Glade.Widget] OptionMenu target;
  			[Glade.Widget] CheckButton nostdmacros;
 			[Glade.Widget] CheckButton nostdlib;
+			[Glade.Widget] CheckButton ignorewarnings;
  			[Glade.Widget] CheckButton ot;
  			[Glade.Widget] CheckButton obcm;
  			[Glade.Widget] CheckButton oocm;
@@ -36,6 +37,7 @@
 				
 				nostdmacros.Active = compilerParameters.Nostdmacros;
 				nostdlib.Active    = compilerParameters.Nostdlib;
+				ignorewarnings.Active = compilerParameters.RunWithWarnings;
 				ot.Active          = compilerParameters.Ot;
 				obcm.Active        = compilerParameters.Obcm;
 				oocm.Active        = compilerParameters.Oocm;
@@ -47,6 +49,7 @@
 				compilerParameters.Target = (NemerleBinding.CompileTarget)target.History;
 				compilerParameters.Nostdmacros = nostdmacros.Active;
 				compilerParameters.Nostdlib = nostdlib.Active;
+				compilerParameters.RunWithWarnings = ignorewarnings.Active;
 				compilerParameters.Ot = ot.Active;
 				compilerParameters.Obcm = obcm.Active;
 				compilerParameters.Oocm = oocm.Active;

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs	2004-04-27 22:43:33 UTC (rev 1527)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs	2004-04-27 23:58:51 UTC (rev 1528)
@@ -31,18 +31,18 @@
 				compilerParameters = (NemerleParameters)((IProperties)CustomizationObject).GetProperty("Config");
 				
 				outputPathButton.Clicked += new EventHandler(SelectFolder);
-				assemblyName.Text   = compilerParameters.AssemblyName;
-				outputPath.Text     = compilerParameters.OutputPath;
+				assemblyName.Text   = compilerParameters.OutputAssembly;
+				outputPath.Text     = compilerParameters.OutputDirectory;
 				parameters.Text     = compilerParameters.Parameters;
-				executeCommand.Text = compilerParameters.ExecuteCommand;
+				executeCommand.Text = compilerParameters.ExecuteScript;
  			}
 
 			public bool Store ()
 			{	
-				compilerParameters.AssemblyName   = assemblyName.Text;
-				compilerParameters.OutputPath     = outputPath.Text;
-				compilerParameters.Parameters     = parameters.Text;
-				compilerParameters.ExecuteCommand = executeCommand.Text;
+				compilerParameters.OutputAssembly  = assemblyName.Text;
+				compilerParameters.OutputDirectory = outputPath.Text;
+				compilerParameters.Parameters      = parameters.Text;
+				compilerParameters.ExecuteScript   = executeCommand.Text;
 				return true;
 			}
 			void SelectFolder(object sender, EventArgs e)			

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs	2004-04-27 22:43:33 UTC (rev 1527)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs	2004-04-27 23:58:51 UTC (rev 1528)
@@ -107,8 +107,8 @@
 		{
 			NemerleParameters cp = (NemerleParameters)project.ActiveConfiguration;
 			
-			return fileUtilityService.GetDirectoryNameWithSeparator(cp.OutputPath)
-					+ cp.AssemblyName + ((int)cp.Target == 0?".exe":".dll");
+			return fileUtilityService.GetDirectoryNameWithSeparator(cp.OutputDirectory)
+					+ cp.OutputAssembly + ((int)cp.Target == 0?".exe":".dll");
 		}
 		
 		public ICompilerResult CompileProject(IProject project)
@@ -130,8 +130,8 @@
 						break;
 					}
 
-			if (!Directory.Exists(cp.OutputPath))
-				Directory.CreateDirectory(cp.OutputPath);
+			if (!Directory.Exists(cp.OutputDirectory))
+				Directory.CreateDirectory(cp.OutputDirectory);
 			
 			string args = GetOptionsString(cp) + references + files  + " -o " + GetCompiledOutputName(project);
 			return DoCompilation (args);

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs	2004-04-27 22:43:33 UTC (rev 1527)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs	2004-04-27 23:58:51 UTC (rev 1528)
@@ -27,31 +27,26 @@
 			
 			NemerleParameters p = (NemerleParameters)project.ActiveConfiguration;
 			FileUtilityService fus = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
-			string dir = fus.GetDirectoryNameWithSeparator(p.OutputPath);
 			string exe;
 			
-			if (p.ExecuteCommand == String.Empty)
+			if (p.ExecuteScript == String.Empty)
 			{
 				exe	= "mono --debug";
 			} else
 			{
-				exe = p.ExecuteCommand;
+				exe = p.ExecuteScript;
 			}
 			
-			exe += " " + p.AssemblyName + ".exe " + p.Parameters;
+			exe += " " + p.OutputAssembly + ".exe " + p.Parameters;
 			
 			try {
-				string currentDir = Directory.GetCurrentDirectory();
-				Directory.SetCurrentDirectory(dir);				
-				
 				ProcessStartInfo psi = new ProcessStartInfo(exe);
-				psi.WorkingDirectory = dir;
+				psi.WorkingDirectory = fus.GetDirectoryNameWithSeparator(p.OutputDirectory);
 				psi.UseShellExecute = false;
 				
 				Process pr = new Process();
 				pr.StartInfo = psi;
 				pr.Start();
-				Directory.SetCurrentDirectory(currentDir);	
 			} catch (Exception) {
 				throw new ApplicationException("Can not execute");
 			}

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs	2004-04-27 22:43:33 UTC (rev 1527)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs	2004-04-27 23:58:51 UTC (rev 1528)
@@ -24,7 +24,7 @@
 			[XmlAttribute("nostdlib")]
 			public bool nostdlib            = false;
 			[XmlAttribute("ot")]
-			public bool ot                  = true;
+			public bool ot                  = false;
 			[XmlAttribute("obcm")]
 			public bool obcm                = true;
 			[XmlAttribute("oocm")]
@@ -32,26 +32,12 @@
 			[XmlAttribute("oscm")]
 			public bool oscm                = true;
 			
-			[XmlAttribute("assemblyname")]
-			public string assemblyname      = String.Empty;
-			[XmlAttribute("outputpath")]
-			public string outputpath        = String.Empty;
 			[XmlAttribute("parameters")]
 			public string parameters        = String.Empty;
 		}
 		
-		[XmlNodeName("Execution")]
-		class Execution
-		{
-			[XmlAttribute("executecommand")]
-			public string executecommand    = String.Empty;
-		}
-
-		
 		CodeGeneration codeGeneration = new CodeGeneration();
 		
-		Execution      execution      = new Execution();
-		
 		public CompileTarget Target
 		{
 			get { return codeGeneration.target; }
@@ -88,29 +74,12 @@
 			set { codeGeneration.oscm = value; }
 		}
 		
-		public string AssemblyName
-		{
-			get { return codeGeneration.assemblyname; }
-			set { codeGeneration.assemblyname = value; }
-		}
-		public string OutputPath
-		{
-			get { return codeGeneration.outputpath; }
-			set { codeGeneration.outputpath = value; }
-		}
 		public string Parameters
 		{
 			get { return codeGeneration.parameters; }
 			set { codeGeneration.parameters = value; }
 		}
 		
-		public string ExecuteCommand
-		{
-			get { return execution.executecommand; }
-			set { execution.executecommand = value; }
-		}
-
-	
 		public NemerleParameters()
 		{
 		}

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs	2004-04-27 22:43:33 UTC (rev 1527)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs	2004-04-27 23:58:51 UTC (rev 1528)
@@ -38,8 +38,9 @@
 				
 				foreach (NemerleParameters p in Configurations)
 				{
-					p.OutputPath = info.BinPath + Path.DirectorySeparatorChar + p.Name;
-					p.AssemblyName = Name;					
+					p.OutputDirectory = info.BinPath + Path.DirectorySeparatorChar + p.Name;
+					p.OutputAssembly = Name;
+					p.RunWithWarnings = true;
 				}				
 			}
 		}




More information about the Monodevelop-patches-list mailing list