[Monodevelop-patches-list] r2131 - in trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding: . Gui Parser Project
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Thu Jan 13 19:28:44 EST 2005
Author: lluis
Date: 2005-01-13 19:28:44 -0500 (Thu, 13 Jan 2005)
New Revision: 2131
Removed:
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/OutputOptionsPanel.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBProject.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingExecutionServices.cs
Modified:
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/ChooseRuntimePanel.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/CodeGenerationPanel.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/VBCompilerPanel.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/VBDocConfigurationPanel.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Parser.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Resolver.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBCompilerParameters.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ProjectNodeBuilder.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VB.glade
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingCompilerServices.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBLanguageBinding.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBNetBinding.addin.xml
Log:
2005-01-11 Lluis Sanchez Gual <lluis at novell.com>
* VBCompilerPanel.cs:
* Gui/ChooseRuntimePanel.cs:
* Gui/VBDocConfigurationPanel.cs:
* Gui/CodeGenerationPanel.cs:
* VBNetBinding.addin.xml:
* ProjectNodeBuilder.cs:
* Parser/Parser.cs:
* Parser/Resolver.cs:
* VBBindingCompilerServices.cs:
* VBLanguageBinding.cs: Follow architecture changes.
* Gui/OutputOptionsPanel.cs:
* VB.glade: Removed dialog now implemented in Monodevelop.Base.
* Project/VBCompilerParameters.cs: Moved some parameters and enum
definitions to DotNetProjectConfiguration.
* Project/VBProject.cs:
* VBBindingExecutionServices.cs: Removed. Not needed any more.
* Makefile.am: Updated.
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ChangeLog 2005-01-14 00:28:44 UTC (rev 2131)
@@ -1,3 +1,26 @@
+2005-01-11 Lluis Sanchez Gual <lluis at novell.com>
+
+ * VBCompilerPanel.cs:
+ * Gui/ChooseRuntimePanel.cs:
+ * Gui/VBDocConfigurationPanel.cs:
+ * Gui/CodeGenerationPanel.cs:
+ * VBNetBinding.addin.xml:
+ * ProjectNodeBuilder.cs:
+ * Parser/Parser.cs:
+ * Parser/Resolver.cs:
+ * VBBindingCompilerServices.cs:
+ * VBLanguageBinding.cs: Follow architecture changes.
+
+ * Gui/OutputOptionsPanel.cs:
+ * VB.glade: Removed dialog now implemented in Monodevelop.Base.
+
+ * Project/VBCompilerParameters.cs: Moved some parameters and enum
+ definitions to DotNetProjectConfiguration.
+
+ * Project/VBProject.cs:
+ * VBBindingExecutionServices.cs: Removed. Not needed any more.
+ * Makefile.am: Updated.
+
2004-12-13 Lluis Sanchez Gual <lluis at novell.com>
* VBBindingCompilerServices.cs: StatusBarService.ProgressMonitor is not a
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/ChooseRuntimePanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/ChooseRuntimePanel.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/ChooseRuntimePanel.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -23,7 +23,9 @@
{
public class ChooseRuntimePanel : AbstractOptionPanel
{
- VBCompilerParameters config = null;
+ VBCompilerParameters parameters;
+ DotNetProjectConfiguration configuration;
+
// FIXME: set the right rb groups
RadioButton monoRadioButton;
RadioButton mintRadioButton;
@@ -109,14 +111,15 @@
public override void LoadPanelContents()
{
- this.config = (VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
+ configuration = (DotNetProjectConfiguration)((IProperties)CustomizationObject).GetProperty("Config");
+ parameters = (VBCompilerParameters) configuration.CompilationParameters;
msnetRadioButton.Active = config.NetRuntime == NetRuntime.MsNet;
monoRadioButton.Active = config.NetRuntime == NetRuntime.Mono;
mintRadioButton.Active = config.NetRuntime == NetRuntime.MonoInterpreter;
- vbcRadioButton.Active = config.VBCompiler == VBCompiler.Vbc;
- mbasRadioButton.Active = config.VBCompiler == VBCompiler.Mbas;
+ vbcRadioButton.Active = parameters.VBCompiler == VBCompiler.Vbc;
+ mbasRadioButton.Active = parameters.VBCompiler == VBCompiler.Mbas;
}
public override bool StorePanelContents()
@@ -128,7 +131,7 @@
} else {
config.NetRuntime = NetRuntime.MonoInterpreter;
}
- config.VBCompiler = vbcRadioButton.Active ? VBCompiler.Vbc : VBCompiler.Mbas;
+ parameters.VBCompiler = vbcRadioButton.Active ? VBCompiler.Vbc : VBCompiler.Mbas;
return true;
}
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/CodeGenerationPanel.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/CodeGenerationPanel.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -25,6 +25,7 @@
public class CodeGenerationPanel : AbstractOptionPanel
{
VBCompilerParameters compilerParameters = null;
+ DotNetProjectConfiguration configuration;
/*
@@ -125,6 +126,7 @@
StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
typeof (StringParserService));
+ DotNetProjectConfiguration configuration;
VBCompilerParameters compilerParameters = null;
//static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
@@ -132,7 +134,8 @@
public CodeGenerationPanelWidget(IProperties CustomizationObject) : base ("VB.glade", "CodeGenerationPanel")
{
- compilerParameters=(VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
+ configuration = (DotNetProjectConfiguration)((IProperties)CustomizationObject).GetProperty("Config");
+ compilerParameters = (VBCompilerParameters) configuration.CompilationParameters;
SetValues();
//CustomizationObjectChanged += new EventHandler(SetValues);
}
@@ -157,7 +160,7 @@
// "${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.Module}")));
CompileTargetOptionMenu.Menu=CompileTargetMenu;
- CompileTargetOptionMenu.SetHistory ( (uint) compilerParameters.CompileTarget);
+ CompileTargetOptionMenu.SetHistory ( (uint) configuration.CompileTarget);
//CompileTargetOptionMenu.Active=(int)compilerParameters.CompileTarget;
symbolsEntry.Text = compilerParameters.DefineSymbols;
@@ -168,7 +171,7 @@
enableOptimizationCheckButton.Active = compilerParameters.Optimize;
allowUnsafeCodeCheckButton.Active = compilerParameters.UnsafeCode;
generateOverflowChecksCheckButton.Active = compilerParameters.GenerateOverflowChecks;
- warningsAsErrorsCheckButton.Active = ! compilerParameters.RunWithWarnings;
+ warningsAsErrorsCheckButton.Active = ! configuration.RunWithWarnings;
warningLevelSpinButton.Value = compilerParameters.WarningLevel;
}
@@ -180,7 +183,7 @@
return true;
}
//compilerParameters.CompileTarget = (CompileTarget) CompileTargetOptionMenu.History;
- compilerParameters.CompileTarget=(CompileTarget)CompileTargetOptionMenu.History;
+ configuration.CompileTarget=(CompileTarget)CompileTargetOptionMenu.History;
compilerParameters.DefineSymbols = symbolsEntry.Text;
compilerParameters.MainClass = mainClassEntry.Text;
@@ -189,7 +192,7 @@
compilerParameters.Optimize = enableOptimizationCheckButton.Active;
compilerParameters.UnsafeCode = allowUnsafeCodeCheckButton.Active;
compilerParameters.GenerateOverflowChecks = generateOverflowChecksCheckButton.Active;
- compilerParameters.RunWithWarnings = ! warningsAsErrorsCheckButton.Active;
+ configuration.RunWithWarnings = ! warningsAsErrorsCheckButton.Active;
compilerParameters.WarningLevel = warningLevelSpinButton.ValueAsInt;
Deleted: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/OutputOptionsPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/OutputOptionsPanel.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/OutputOptionsPanel.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -1,303 +0,0 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krger" email="mike at icsharpcode.net"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Drawing;
-
-using Gtk;
-
-using MonoDevelop.Internal.Project;
-using MonoDevelop.Internal.ExternalTool;
-using MonoDevelop.Gui.Dialogs;
-using MonoDevelop.Gui.Widgets;
-using MonoDevelop.Core.Services;
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.AddIns.Codons;
-using MonoDevelop.Services;
-
-namespace VBBinding
-{
- public class OutputOptionsPanel : AbstractOptionPanel
- {
- VBCompilerParameters compilerParameters;
- static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
-
- /* public override bool ReceiveDialogMessage(DialogMessage message)
- {
- if (message == DialogMessage.OK) {
- if (compilerParameters == null) {
- return true;
- }
-
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- if (!fileUtilityService.IsValidFileName(ControlDictionary["assemblyNameTextBox"].Text)) {
- MessageBox.Show("Invalid assembly name specified", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand, MessageBoxDefaultButton.Button1);
- return false;
- }
- if (!fileUtilityService.IsValidFileName(ControlDictionary["outputDirectoryTextBox"].Text)) {
- MessageBox.Show("Invalid output directory specified", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand, MessageBoxDefaultButton.Button1);
- return false;
- }
-
- if (ControlDictionary["win32IconTextBox"].Text.Length > 0) {
- if (!fileUtilityService.IsValidFileName(ControlDictionary["win32IconTextBox"].Text)) {
- MessageBox.Show("Invalid Win32Icon specified", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand, MessageBoxDefaultButton.Button1);
- return false;
- }
- if (!File.Exists(ControlDictionary["win32IconTextBox"].Text)) {
- MessageBox.Show("Win32Icon doesn't exists", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand, MessageBoxDefaultButton.Button1);
- return false;
- }
- }
-
- compilerParameters.CompileTarget = (CompileTarget)((ComboBox)ControlDictionary["compileTargetComboBox"]).SelectedIndex;
- compilerParameters.OutputAssembly = ControlDictionary["assemblyNameTextBox"].Text;
- compilerParameters.OutputDirectory = ControlDictionary["outputDirectoryTextBox"].Text;
- compilerParameters.CommandLineParameters = ControlDictionary["parametersTextBox"].Text;
- compilerParameters.ExecuteBeforeBuild = ControlDictionary["executeBeforeTextBox"].Text;
- compilerParameters.ExecuteAfterBuild = ControlDictionary["executeAfterTextBox"].Text;
- compilerParameters.ExecuteScript = ControlDictionary["executeScriptTextBox"].Text;
- compilerParameters.Win32Icon = ControlDictionary["win32IconTextBox"].Text;
- compilerParameters.ExecuteBeforeBuildArguments = ControlDictionary["executeBeforeArgumentsTextBox"].Text;
- compilerParameters.ExecuteAfterBuildArguments = ControlDictionary["executeAfterArgumentsTextBox"].Text;
-
- compilerParameters.PauseConsoleOutput = ((CheckBox)ControlDictionary["pauseConsoleOutputCheckBox"]).Checked;
- }
- return true;
- }
-
- void SetValues(object sender, EventArgs e)
- {
- this.compilerParameters = (VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
-
- ((ComboBox)ControlDictionary["compileTargetComboBox"]).SelectedIndex = (int)compilerParameters.CompileTarget;
- ControlDictionary["win32IconTextBox"].Text = compilerParameters.Win32Icon;
- ControlDictionary["assemblyNameTextBox"].Text = compilerParameters.OutputAssembly;
- ControlDictionary["outputDirectoryTextBox"].Text = compilerParameters.OutputDirectory;
- ControlDictionary["parametersTextBox"].Text = compilerParameters.CommandLineParameters;
- ControlDictionary["executeScriptTextBox"].Text = compilerParameters.ExecuteScript;
- ControlDictionary["executeBeforeTextBox"].Text = compilerParameters.ExecuteBeforeBuild;
- ControlDictionary["executeAfterTextBox"].Text = compilerParameters.ExecuteAfterBuild;
- ControlDictionary["executeBeforeArgumentsTextBox"].Text = compilerParameters.ExecuteBeforeBuildArguments;
- ControlDictionary["executeAfterArgumentsTextBox"].Text = compilerParameters.ExecuteAfterBuildArguments;
-
- ((CheckBox)ControlDictionary["pauseConsoleOutputCheckBox"]).Checked = compilerParameters.PauseConsoleOutput;
- }
-
- void SelectFolder(object sender, EventArgs e)
- {
- FolderDialog fdiag = new FolderDialog();
-
- if (fdiag.DisplayDialog("${res:Dialog.Options.PrjOptions.Configuration.FolderBrowserDescription}") == DialogResult.OK) {
- ControlDictionary["outputDirectoryTextBox"].Text = fdiag.Path;
- }
- }
-
- void SelectFile2(object sender, EventArgs e)
- {
- OpenFileDialog fdiag = new OpenFileDialog();
- fdiag.Filter = stringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*");
- fdiag.Multiselect = false;
-
- if(fdiag.ShowDialog() == DialogResult.OK) {
- ControlDictionary["executeBeforeTextBox"].Text = fdiag.FileName;
- }
- }
-
- void SelectFile3(object sender, EventArgs e)
- {
- OpenFileDialog fdiag = new OpenFileDialog();
- fdiag.Filter = stringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*");
- fdiag.Multiselect = false;
-
- if(fdiag.ShowDialog() == DialogResult.OK) {
- ControlDictionary["executeAfterTextBox"].Text = fdiag.FileName;
- }
- }
- void SelectFile4(object sender, EventArgs e)
- {
- OpenFileDialog fdiag = new OpenFileDialog();
- fdiag.Filter = stringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*");
- fdiag.Multiselect = false;
-
- if(fdiag.ShowDialog() == DialogResult.OK) {
- ControlDictionary["executeScriptTextBox"].Text = fdiag.FileName;
- }
- }
- void SelectWin32Icon(object sender, EventArgs e)
- {
- using (OpenFileDialog fdiag = new OpenFileDialog()) {
- fdiag.AddExtension = true;
- fdiag.Filter = stringParserService.Parse("${res:SharpDevelop.FileFilter.Icons}|*.ico|${res:SharpDevelop.FileFilter.AllFiles}|*.*");
- fdiag.Multiselect = false;
- fdiag.CheckFileExists = true;
-
- if (fdiag.ShowDialog() == DialogResult.OK) {
- ControlDictionary["win32IconTextBox"].Text = fdiag.FileName;
- }
- }
- }
-
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- public OutputOptionsPanel() : base(propertyService.DataDirectory + @"\resources\panels\ProjectOptions\OutputPanel.xfrm")
- {
- CustomizationObjectChanged += new EventHandler(SetValues);
- ControlDictionary["browseButton"].Click += new EventHandler(SelectFolder);
- ControlDictionary["browseButton2"].Click += new EventHandler(SelectFile2);
- ControlDictionary["browseButton3"].Click += new EventHandler(SelectFile3);
- ControlDictionary["browseButton4"].Click += new EventHandler(SelectFile4);
- ControlDictionary["browseWin32IconButton"].Click += new EventHandler(SelectWin32Icon);
-
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- ((ComboBox)ControlDictionary["compileTargetComboBox"]).Items.Add(resourceService.GetString("Dialog.Options.PrjOptions.Configuration.CompileTarget.Exe"));
- ((ComboBox)ControlDictionary["compileTargetComboBox"]).Items.Add(resourceService.GetString("Dialog.Options.PrjOptions.Configuration.CompileTarget.WinExe"));
- ((ComboBox)ControlDictionary["compileTargetComboBox"]).Items.Add(resourceService.GetString("Dialog.Options.PrjOptions.Configuration.CompileTarget.Library"));
- ((ComboBox)ControlDictionary["compileTargetComboBox"]).Items.Add(resourceService.GetString("Dialog.Options.PrjOptions.Configuration.CompileTarget.Module"));
-
- }
- } */
-
- static MessageService messageService = (MessageService) ServiceManager.GetService (typeof (MessageService));
-
- class OutputOptionsPanelWidget : GladeWidgetExtract
- {
- //
- // Gtk Controls
- //
- [Glade.Widget] Entry assemblyNameEntry;
- [Glade.Widget] Entry outputDirectoryEntry;
- [Glade.Widget] Entry parametersEntry;
- [Glade.Widget] Entry executeBeforeEntry;
- [Glade.Widget] Entry executeScriptEntry;
- [Glade.Widget] Entry executeAfterEntry;
- [Glade.Widget] CheckButton pauseConsoleOutputCheckButton;
- [Glade.Widget] Button browseButton;
- [Glade.Widget] Button browseButton2;
- [Glade.Widget] Button browseButton3;
- [Glade.Widget] Button browseButton4;
-
- VBCompilerParameters compilerParameters;
-
- public OutputOptionsPanelWidget(IProperties CustomizationObject) : base ("VB.glade", "OutputOptionsPanel")
- {
- this.compilerParameters = (VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
- browseButton.Clicked += new EventHandler (SelectFolder);
- browseButton2.Clicked += new EventHandler (SelectFile4);
- browseButton3.Clicked += new EventHandler (SelectFile3);
- browseButton4.Clicked += new EventHandler (SelectFile2);
-
- assemblyNameEntry.Text = compilerParameters.OutputAssembly;
- outputDirectoryEntry.Text = compilerParameters.OutputDirectory;
- parametersEntry.Text = compilerParameters.CommandLineParameters;
- executeScriptEntry.Text = compilerParameters.ExecuteScript;
- executeBeforeEntry.Text = compilerParameters.ExecuteBeforeBuild;
- executeAfterEntry.Text = compilerParameters.ExecuteAfterBuild;
-
- pauseConsoleOutputCheckButton.Active = compilerParameters.PauseConsoleOutput;
- }
-
- public bool Store ()
- {
- if (compilerParameters == null) {
- return true;
- }
-
- FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService (typeof (FileUtilityService));
-
- if (!fileUtilityService.IsValidFileName(assemblyNameEntry.Text)) {
- messageService.ShowError (GettextCatalog.GetString ("Invalid assembly name specified"));
- return false;
- }
-
- if (!fileUtilityService.IsValidFileName (outputDirectoryEntry.Text)) {
- messageService.ShowError (GettextCatalog.GetString ("Invalid output directory specified"));
- return false;
- }
-
- compilerParameters.OutputAssembly = assemblyNameEntry.Text;
- compilerParameters.OutputDirectory = outputDirectoryEntry.Text;
- compilerParameters.CommandLineParameters = parametersEntry.Text;
- compilerParameters.ExecuteBeforeBuild = executeBeforeEntry.Text;
- compilerParameters.ExecuteAfterBuild = executeAfterEntry.Text;
- compilerParameters.ExecuteScript = executeScriptEntry.Text;
-
- compilerParameters.PauseConsoleOutput = pauseConsoleOutputCheckButton.Active;
- return true;
- }
-
- void SelectFolder(object sender, EventArgs e)
- {
- using (FileSelector fdiag = new FileSelector (GettextCatalog.GetString ("Select the directory in which the assembly will be created"))) {
- if (fdiag.Run () == (int) ResponseType.Ok) {
- outputDirectoryEntry.Text = fdiag.Filename;
- }
-
- fdiag.Hide ();
- }
- }
-
- void SelectFile2(object sender, EventArgs e)
- {
- using (FileSelector fdiag = new FileSelector ("")) {
- //fdiag.Filter = StringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*");
- fdiag.SelectMultiple = false;
-
- if(fdiag.Run () == (int) ResponseType.Ok) {
- executeBeforeEntry.Text = fdiag.Filename;
- }
-
- fdiag.Hide ();
- }
- }
-
- void SelectFile3(object sender, EventArgs e)
- {
- using (FileSelector fdiag = new FileSelector ("")) {
- //fdiag.Filter = StringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*");
- fdiag.SelectMultiple = false;
-
- if(fdiag.Run () == (int) ResponseType.Ok) {
- executeAfterEntry.Text = fdiag.Filename;
- }
-
- fdiag.Hide ();
- }
- }
-
- void SelectFile4(object sender, EventArgs e)
- {
- using (FileSelector fdiag = new FileSelector ("")) {
- //fdiag.Filter = StringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*");
- fdiag.SelectMultiple = false;
-
- if(fdiag.Run () == (int) ResponseType.Ok) {
- executeScriptEntry.Text = fdiag.Filename;
- }
-
- fdiag.Hide ();
- }
- }
- }
-
- OutputOptionsPanelWidget widget;
-
- public override void LoadPanelContents()
- {
- Add (widget = new OutputOptionsPanelWidget ((IProperties) CustomizationObject));
- }
-
- public override bool StorePanelContents()
- {
- bool result = true;
- result = widget.Store ();
- return result;
- }
- }
-
-}
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/VBCompilerPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/VBCompilerPanel.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/VBCompilerPanel.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -29,7 +29,8 @@
SetupFromXml(Path.Combine(PropertyService.DataDirectory,
@"resources\panels\VBCompilerPanel.xfrm"));
- this.config = (VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
+ DotNetProjectConfiguration cfg = (DotNetProjectConfiguration)((IProperties)CustomizationObject).GetProperty("Config");
+ config = (VBCompilerParameters) cfg.CompilationParameters;
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
((ComboBox)ControlDictionary["compilerVersionComboBox"]).Items.Add("Standard");
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/VBDocConfigurationPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/VBDocConfigurationPanel.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Gui/VBDocConfigurationPanel.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -31,7 +31,8 @@
/// </summary>
public static bool IsFileIncluded(string filename, VBProject project)
{
- VBCompilerParameters compilerparameters = (VBCompilerParameters)project.ActiveConfiguration;
+ DotNetProjectConfiguration config = (DotNetProjectConfiguration) project.ActiveConfiguration;
+ VBCompilerParameters compilerparameters = (VBCompilerParameters) config.CompilationParameters;
return Array.IndexOf(compilerparameters.VBDOCFiles, filename) == -1;
}
@@ -75,7 +76,8 @@
void SetValues(object sender, EventArgs e)
{
- this.compilerParameters = (VBCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
+ DotNetProjectConfiguration config = (DotNetProjectConfiguration) ((IProperties)CustomizationObject).GetProperty("Config");
+ compilerParameters = (VBCompilerParameters) config.CompilationParameters;
project = (VBProject)((IProperties)CustomizationObject).GetProperty("Project");
((TextBox)ControlDictionary["OutputFileTextBox"]).Text = compilerParameters.VBDOCOutputFile;
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am 2005-01-14 00:28:44 UTC (rev 2131)
@@ -17,10 +17,8 @@
AssemblyInfo.cs \
VBAmbience.cs \
VBBindingCompilerServices.cs \
-VBBindingExecutionServices.cs \
VBLanguageBinding.cs \
Gui/CodeGenerationPanel.cs \
-Gui/OutputOptionsPanel.cs \
Parser/ExpressionFinder.cs \
Parser/Parser.cs \
Parser/Resolver.cs \
@@ -37,8 +35,7 @@
Parser/SharpDevelopTree/Parameter.cs \
Parser/SharpDevelopTree/Property.cs \
Parser/SharpDevelopTree/ReturnType.cs \
-Project/VBCompilerParameters.cs \
-Project/VBProject.cs
+Project/VBCompilerParameters.cs
TEMPLATES = \
templates/EmptyVBFile.xft.xml \
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Parser.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Parser.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Parser.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -121,22 +121,22 @@
- public ArrayList CtrlSpace(IParserService parserService,IProject proj, int caretLine, int caretColumn, string fileName)
+ public ArrayList CtrlSpace(IParserService parserService,Project proj, int caretLine, int caretColumn, string fileName)
{
return new Resolver(proj).CtrlSpace(parserService, caretLine, caretColumn, fileName);
}
- public ResolveResult Resolve(IParserService parserService,IProject proj, string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent)
+ public ResolveResult Resolve(IParserService parserService,Project proj, string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent)
{
return new Resolver(proj).Resolve(parserService,expression, caretLineNumber, caretColumn, fileName, fileContent);
}
- public ArrayList IsAsResolve (IParserService parserService, IProject project, string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent)
+ public ArrayList IsAsResolve (IParserService parserService, Project project, string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent)
{
return new Resolver (project).IsAsResolve (parserService, expression, caretLineNumber, caretColumn, fileName, fileContent);
}
- public string MonodocResolver (IParserService parserService, IProject project, string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent)
+ public string MonodocResolver (IParserService parserService, Project project, string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent)
{
return new Resolver (project).MonodocResolver (parserService, expression, caretLineNumber, caretColumn, fileName, fileContent);
}
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Resolver.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Resolver.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Parser/Resolver.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -24,9 +24,9 @@
ICompilationUnit cu;
IClass callingClass;
LookupTableVisitor lookupTableVisitor;
- IProject project;
+ Project project;
- public Resolver (IProject project)
+ public Resolver (Project project)
{
this.project = project;
}
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBCompilerParameters.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBCompilerParameters.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBCompilerParameters.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -11,168 +11,102 @@
using System.ComponentModel;
using MonoDevelop.Internal.Project;
+using MonoDevelop.Internal.Serialization;
namespace VBBinding {
- public enum CompileTarget
- {
- Exe,
- WinExe,
- Library,
- Module
- };
-
public enum VBCompiler {
Vbc,
Mbas
};
- public enum NetRuntime {
- Mono,
- MonoInterpreter,
- MsNet
- };
-
/// <summary>
/// This class handles project specific compiler parameters
/// </summary>
- public class VBCompilerParameters : AbstractProjectConfiguration
+ public class VBCompilerParameters
{
- [XmlNodeName("CodeGeneration")]
- class CodeGeneration
- {
- [XmlAttribute("compilerversion")]
- public string vbCompilerVersion = String.Empty;
-
- [XmlAttribute("runtime")]
- public NetRuntime netRuntime = NetRuntime.Mono;
-
- [XmlAttribute("compiler")]
- public VBCompiler vbCompiler = VBCompiler.Mbas;
-
- [XmlAttribute("warninglevel")]
- public int warninglevel = 4;
-
- [XmlAttribute("nowarn")]
- public string noWarnings = String.Empty;
-
- //[XmlAttribute("includedebuginformation")]
- //public bool debugmode = false;
-
- [XmlAttribute("optimize")]
- public bool optimize = true;
-
- [XmlAttribute("unsafecodeallowed")]
- public bool unsafecode = false;
-
- [XmlAttribute("generateoverflowchecks")]
- public bool generateOverflowChecks = true;
-
- [XmlAttribute("rootnamespace")]
- public string rootnamespace = String.Empty;
-
- [XmlAttribute("mainclass")]
- public string mainclass = null;
-
- [XmlAttribute("target")]
- public CompileTarget compiletarget = CompileTarget.Exe;
-
- [XmlAttribute("definesymbols")]
- public string definesymbols = String.Empty;
-
- [XmlAttribute("generatexmldocumentation")]
- public bool generateXmlDocumentation = false;
-
- [XmlAttribute("optionexplicit")]
- public bool optionExplicit = true;
-
- [XmlAttribute("optionstrict")]
- public bool optionStrict = false;
-
- [ConvertToRelativePathAttribute()]
- [XmlAttribute("win32Icon")]
- public string win32Icon = String.Empty;
-
- [XmlAttribute("imports")]
- public string imports = String.Empty;
- }
+ [ItemProperty("compilerversion")]
+ string vbCompilerVersion = String.Empty;
+
+ [ItemProperty("compiler")]
+ VBCompiler vbCompiler = VBCompiler.Mbas;
+
+ [ItemProperty("warninglevel")]
+ int warninglevel = 4;
+
+ [ItemProperty("nowarn")]
+ string noWarnings = String.Empty;
- [XmlNodeName("Execution")]
- class Execution
- {
- [XmlAttribute("consolepause")]
- public bool pauseconsoleoutput = true;
-
- [XmlAttribute("commandlineparameters")]
- public string commandLineParameters = String.Empty;
-
- }
+ [ItemProperty("optimize")]
+ bool optimize = true;
+
+ [ItemProperty("unsafecodeallowed")]
+ bool unsafecode = false;
- [XmlNodeName("VBDOC")]
- class VBDOC
- {
- [XmlAttribute("outputfile")]
- [ConvertToRelativePathAttribute()]
- public string outputfile = String.Empty;
-
- [XmlAttribute("filestoparse")]
- public string filestoparse = String.Empty;
-
- [XmlAttribute("commentprefix")]
- public string commentprefix = "'";
- }
+ [ItemProperty("generateoverflowchecks")]
+ bool generateOverflowChecks = true;
- CodeGeneration codeGeneration = new CodeGeneration();
- VBDOC vbdoc = new VBDOC();
- Execution execution = new Execution();
+ [ItemProperty("rootnamespace")]
+ string rootnamespace = String.Empty;
+ [ItemProperty("mainclass")]
+ string mainclass = null;
+
+ [ItemProperty("definesymbols")]
+ string definesymbols = String.Empty;
+
+ [ItemProperty("generatexmldocumentation")]
+ bool generateXmlDocumentation = false;
+
+ [ItemProperty("optionexplicit")]
+ bool optionExplicit = true;
+
+ [ItemProperty("optionstrict")]
+ bool optionStrict = false;
+
+ [ProjectPathItemProperty("win32Icon")]
+ string win32Icon = String.Empty;
+
+ [ItemProperty("imports")]
+ string imports = String.Empty;
+
+ [ProjectPathItemProperty("VBDOC-outputfile")]
+ string outputfile = String.Empty;
+
+ [ItemProperty("VBDOC-filestoparse")]
+ string filestoparse = String.Empty;
+
+ [ItemProperty("VBDOC-commentprefix")]
+ string commentprefix = "'";
+
[Browsable(false)]
public string VBCompilerVersion
{
get {
- return codeGeneration.vbCompilerVersion;
+ return vbCompilerVersion;
}
set {
- codeGeneration.vbCompilerVersion = value;
+ vbCompilerVersion = value;
}
}
[Browsable(false)]
public VBCompiler VBCompiler {
get {
- return codeGeneration.vbCompiler;
+ return vbCompiler;
}
set {
- codeGeneration.vbCompiler = value;
+ vbCompiler = value;
}
}
- [Browsable(false)]
- public NetRuntime NetRuntime {
- get {
- return codeGeneration.netRuntime;
- }
- set {
- codeGeneration.netRuntime = value;
- }
- }
-
- public string CommandLineParameters
- {
- get {
- return execution.commandLineParameters;
- }
- set {
- execution.commandLineParameters = value;
- }
- }
public bool GenerateOverflowChecks
{
get {
- return codeGeneration.generateOverflowChecks;
+ return generateOverflowChecks;
}
set {
- codeGeneration.generateOverflowChecks = value;
+ generateOverflowChecks = value;
}
}
@@ -182,10 +116,10 @@
// Description = "${res:BackendBindings.CompilerOptions.CodeGeneration.UnsafeCode.Description}")]
public bool UnsafeCode {
get {
- return codeGeneration.unsafecode;
+ return unsafecode;
}
set {
- codeGeneration.unsafecode = value;
+ unsafecode = value;
}
}
@@ -195,10 +129,10 @@
// Description = "${res:BackendBindings.CompilerOptions.CodeGeneration.GenerateXmlDocumentation.Description}")]
public bool GenerateXmlDocumentation {
get {
- return codeGeneration.generateXmlDocumentation;
+ return generateXmlDocumentation;
}
set {
- codeGeneration.generateXmlDocumentation = value;
+ generateXmlDocumentation = value;
}
}
@@ -209,160 +143,121 @@
// Description = "${res:BackendBindings.CompilerOptions.WarningAndErrorCategory.WarningLevel.Description}")]
public int WarningLevel {
get {
- return codeGeneration.warninglevel;
+ return warninglevel;
}
set {
- codeGeneration.warninglevel = value;
+ warninglevel = value;
}
}
public string Imports
{
get {
- return codeGeneration.imports;
+ return imports;
}
set {
- codeGeneration.imports = value;
+ imports = value;
}
}
public string Win32Icon
{
get {
- return codeGeneration.win32Icon;
+ return win32Icon;
}
set {
- codeGeneration.win32Icon = value;
+ win32Icon = value;
}
}
public string RootNamespace
{
get {
- return codeGeneration.rootnamespace;
+ return rootnamespace;
}
set {
- codeGeneration.rootnamespace = value;
+ rootnamespace = value;
}
}
public string DefineSymbols
{
get {
- return codeGeneration.definesymbols;
+ return definesymbols;
}
set {
- codeGeneration.definesymbols = value;
+ definesymbols = value;
}
}
- public bool PauseConsoleOutput
- {
- get {
- return execution.pauseconsoleoutput;
- }
- set {
- execution.pauseconsoleoutput = value;
- }
- }
-
- //public bool Debugmode
- //{
- // get {
- // return codeGeneration.debugmode;
- // }
- // set {
- // codeGeneration.debugmode = value;
- // }
- //}
-
public bool Optimize
{
get {
- return codeGeneration.optimize;
+ return optimize;
}
set {
- codeGeneration.optimize = value;
+ optimize = value;
}
}
public string MainClass
{
get {
- return codeGeneration.mainclass;
+ return mainclass;
}
set {
- codeGeneration.mainclass = value;
+ mainclass = value;
}
}
- public CompileTarget CompileTarget
- {
- get {
- return codeGeneration.compiletarget;
- }
- set {
- codeGeneration.compiletarget = value;
- }
- }
-
public bool OptionExplicit
{
get {
- return codeGeneration.optionExplicit;
+ return optionExplicit;
}
set {
- codeGeneration.optionExplicit = value;
+ optionExplicit = value;
}
}
public bool OptionStrict
{
get {
- return codeGeneration.optionStrict;
+ return optionStrict;
}
set {
- codeGeneration.optionStrict = value;
+ optionStrict = value;
}
}
public string VBDOCOutputFile
{
get {
- return vbdoc.outputfile;
+ return outputfile;
}
set {
- vbdoc.outputfile = value;
+ outputfile = value;
}
}
public string[] VBDOCFiles
{
get {
- return vbdoc.filestoparse.Split(';');
+ return filestoparse.Split(';');
}
set {
- vbdoc.filestoparse = System.String.Join(";", value);
+ filestoparse = System.String.Join(";", value);
}
}
public string VBDOCCommentPrefix
{
get {
- return vbdoc.commentprefix;
+ return commentprefix;
}
set {
- vbdoc.commentprefix = value;
+ commentprefix = value;
}
}
-
- public VBCompilerParameters()
- {
- }
-
- public VBCompilerParameters(string name)
- {
- this.name = name;
- }
}
}
Deleted: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBProject.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBProject.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Project/VBProject.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -1,80 +0,0 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Markus Palme" email="MarkusPalme at gmx.de"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Diagnostics;
-using System.ComponentModel;
-using System.Xml;
-
-using MonoDevelop.Internal.Project;
-using MonoDevelop.Internal.Templates;
-
-namespace VBBinding
-{
- /// <summary>
- /// This class describes a VB.NET project and it compilation options.
- /// </summary>
- public class VBProject : AbstractProject
- {
- public override string ProjectType {
- get {
- return VBLanguageBinding.LanguageName;
- }
- }
-
- public override IConfiguration CreateConfiguration()
- {
- return new VBCompilerParameters();
- }
-
- public VBProject()
- {
- }
-
- public VBProject(ProjectCreateInformation info, XmlElement projectOptions)
- {
- if (info != null) {
- Name = info.ProjectName;
-
- //VBCompilerParameters debug = (VBCompilerParameters)CreateConfiguration("Debug");
- //debug.Optimize = false;
- //release.Debugmode=false;
- //Configurations.Add(debug);
-
- VBCompilerParameters release = (VBCompilerParameters)CreateConfiguration("Release");
- //release.Optimize = true;
- //release.Debugmode = false;
- //release.GenerateOverflowChecks = false;
- //release.TreatWarningsAsErrors = false;
- Configurations.Add(release);
-
- XmlElement el = projectOptions;
-
- foreach (VBCompilerParameters parameter in Configurations) {
- parameter.OutputDirectory = info.BinPath + Path.DirectorySeparatorChar + parameter.Name;
- parameter.OutputAssembly = Name;
-
- if (el != null) {
- System.Console.WriteLine("ProjectOptions " + el.OuterXml);
- if (el.Attributes["Target"] != null) {
- parameter.CompileTarget = (CompileTarget)Enum.Parse(typeof(CompileTarget), el.Attributes["Target"].InnerText);
- }
- if (el.Attributes["PauseConsoleOutput"] != null) {
- parameter.PauseConsoleOutput = Boolean.Parse(el.Attributes["PauseConsoleOutput"].InnerText);
- }
- }else{
- System.Console.WriteLine("ProjectOptions XML is NULL!");
- }
- }
- }else{
- System.Console.WriteLine("NULL Projectinfo!");
- }
- }
- }
-}
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ProjectNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ProjectNodeBuilder.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/ProjectNodeBuilder.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -29,12 +29,13 @@
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
IconService iconService = (IconService)ServiceManager.GetService(typeof(IconService));
- public bool CanBuildProjectTree(IProject project)
+ public bool CanBuildProjectTree(Project project)
{
- return project.ProjectType == VBLanguageBinding.LanguageName;
+ DotNetProject dp = project as DotNetProject;
+ return dp != null && dp.LanguageName == VBLanguageBinding.LanguageName;
}
- public AbstractBrowserNode BuildProjectTreeNode(IProject project)
+ public AbstractBrowserNode BuildProjectTreeNode(Project project)
{
ProjectBrowserNode projectNode = new ProjectBrowserNode(project);
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VB.glade
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VB.glade 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VB.glade 2005-01-14 00:28:44 UTC (rev 2131)
@@ -12,6 +12,11 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<child>
<widget class="GtkVBox" id="vbox62">
@@ -203,6 +208,7 @@
<widget class="GtkOptionMenu" id="CompileTargetOptionMenu">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="history">-1</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -350,6 +356,7 @@
<property name="label" translatable="yes">_Generate overflow checks</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -368,6 +375,7 @@
<property name="label" translatable="yes">Allow '_unsafe' code</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -386,6 +394,7 @@
<property name="label" translatable="yes">Enable _optimizations</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -404,6 +413,7 @@
<property name="label" translatable="yes">Treat warnings as _errors</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -422,6 +432,7 @@
<property name="label" translatable="yes">Generate _xml documentation</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -450,568 +461,4 @@
</child>
</widget>
-<widget class="GtkWindow" id="OutputOptionsPanel">
- <property name="visible">True</property>
- <property name="title" translatable="yes">OutputOptionsPanel</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
-
- <child>
- <widget class="GtkVBox" id="vbox66">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkVBox" id="vbox67">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label93">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Output</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox57">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label91">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox69">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkTable" id="table10">
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label98">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Assembly _name</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">assemblyNameEntry</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label99">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Output _path</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">outputDirectoryEntry</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label100">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Paramet_ers</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">parametersEntry</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="outputDirectoryEntry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="browseButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="assemblyNameEntry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="parametersEntry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="pauseConsoleOutputCheckButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Pause _console output</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>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox68">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label94">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Execute scripts </b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox58">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label92">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkTable" id="table9">
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label95">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Execute Command</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label96">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_After Build</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">executeAfterEntry</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label97">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Before build</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">executeBeforeEntry</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="executeScriptEntry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="executeAfterEntry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="executeBeforeEntry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="browseButton2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="browseButton3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="browseButton4">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
</glade-interface>
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingCompilerServices.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingCompilerServices.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingCompilerServices.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -35,33 +35,6 @@
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
- public string GetCompiledOutputName(string fileName)
- {
- return Path.ChangeExtension(fileName, ".exe");
- }
-
- public string GetCompiledOutputName(IProject project)
- {
- VBProject p = (VBProject)project;
- VBCompilerParameters compilerparameters = (VBCompilerParameters)p.ActiveConfiguration;
- /* switch(compilerparameters.CompileTarget){
- case CompileTarget.Exe:
- System.Console.WriteLine("EXE");
- break;
- case CompileTarget.Library:
- System.Console.WriteLine("Library!");
- break;
- case CompileTarget.WinExe:
- System.Console.WriteLine("WinEXE");
- break;
- default:
- System.Console.WriteLine("Unknown case: " + compilerparameters.CompileTarget);
- break;
- }
- */
- return fileUtilityService.GetDirectoryNameWithSeparator(compilerparameters.OutputDirectory) + compilerparameters.OutputAssembly + (compilerparameters.CompileTarget == CompileTarget.Library ? ".dll" : ".exe");
- }
-
public bool CanCompile(string fileName)
{
return Path.GetExtension(fileName) == ".vb";
@@ -77,7 +50,7 @@
return "mbas";
}
- string GenerateOptions(VBCompilerParameters compilerparameters, string outputFileName)
+ string GenerateOptions (DotNetProjectConfiguration configuration, VBCompilerParameters compilerparameters, string outputFileName)
{
StringBuilder sb = new StringBuilder();
@@ -86,7 +59,7 @@
sb.Append("-nologo");sb.Append(Environment.NewLine);
sb.Append("-utf8output");sb.Append(Environment.NewLine);
-// if (compilerparameters.Debugmode) {
+// if (compilerparameters.DebugMode) {
// sb.Append("--debug+");sb.Append(Environment.NewLine);
// sb.Append("--debug:full");sb.Append(Environment.NewLine);
// }
@@ -125,7 +98,7 @@
sb.Append("-imports:");sb.Append(compilerparameters.Imports);sb.Append(Environment.NewLine);
}
- switch (compilerparameters.CompileTarget) {
+ switch (configuration.CompileTarget) {
case CompileTarget.Exe:
sb.Append("-target:exe");
break;
@@ -139,65 +112,33 @@
sb.Append("-target:module");
break;
default:
- throw new NotSupportedException("unknown compile target:" + compilerparameters.CompileTarget);
+ throw new NotSupportedException("unknown compile target:" + configuration.CompileTarget);
}
sb.Append(Environment.NewLine);
return sb.ToString();
}
- public ICompilerResult CompileFile(string filename)
+ public ICompilerResult CompileProject (ProjectFileCollection projectFiles, ProjectReferenceCollection references, DotNetProjectConfiguration configuration)
{
- //System.Console.WriteLine("CompileFile " + filename);
- string output = "";
- string error = "";
- string exe = Path.ChangeExtension(filename, ".exe");
- VBCompilerParameters compilerparameters = new VBCompilerParameters();
- string stdResponseFileName = propertyService.DataDirectory + Path.DirectorySeparatorChar + "vb.rsp";
+ VBCompilerParameters compilerparameters = (VBCompilerParameters) configuration.CompilationParameters;
+ if (compilerparameters == null) compilerparameters = new VBCompilerParameters ();
+ string exe = configuration.CompiledOutputName;
string responseFileName = Path.GetTempFileName();
-
- StreamWriter writer = new StreamWriter(responseFileName);
- writer.WriteLine(GenerateOptions(compilerparameters, exe));
- writer.WriteLine(String.Concat('"', filename, '"'));
- writer.Close();
-
- string compilerName = GetCompilerName(compilerparameters.VBCompilerVersion);
- string outstr = String.Concat(compilerName, " @", responseFileName); //, " @", stdResponseFileName);
-
- TempFileCollection tf = new TempFileCollection ();
- //Executor.ExecWaitWithCapture(outstr, tf, ref output, ref error);
- DoCompilation(outstr,tf,ref output, ref error);
-
- ICompilerResult result = ParseOutput(tf, output);
-
- File.Delete(responseFileName);
- File.Delete(output);
- File.Delete(error);
- WriteManifestFile(exe);
- return result;
- }
-
- public ICompilerResult CompileProject(IProject project)
- {
- //System.Console.WriteLine("CompileProject ");
- VBProject p = (VBProject)project;
- VBCompilerParameters compilerparameters = (VBCompilerParameters)p.ActiveConfiguration;
- string exe = fileUtilityService.GetDirectoryNameWithSeparator(compilerparameters.OutputDirectory) + compilerparameters.OutputAssembly + (compilerparameters.CompileTarget == CompileTarget.Library ? ".dll" : ".exe");
- string responseFileName = Path.GetTempFileName();
string stdResponseFileName = String.Concat(propertyService.DataDirectory, Path.DirectorySeparatorChar, "vb.rsp");
StreamWriter writer = new StreamWriter(responseFileName);
//Console.WriteLine(GenerateOptions(compilerparameters,exe));
- writer.WriteLine(GenerateOptions(compilerparameters, exe));
+ writer.WriteLine(GenerateOptions (configuration, compilerparameters, exe));
- foreach (ProjectReference lib in p.ProjectReferences) {
- string fileName = lib.GetReferencedFileName(p);
+ foreach (ProjectReference lib in references) {
+ string fileName = lib.GetReferencedFileName();
//Console.WriteLine(String.Concat("-r:",fileName));
writer.WriteLine(String.Concat("-r:", fileName));
}
// write source files and embedded resources
- foreach (ProjectFile finfo in p.ProjectFiles) {
+ foreach (ProjectFile finfo in projectFiles) {
if (finfo.Subtype != Subtype.Directory) {
switch (finfo.BuildAction) {
case BuildAction.Compile:
@@ -233,12 +174,10 @@
ICompilerResult result = ParseOutput(tf, output);
ParseOutput(tf,error);
- project.CopyReferencesToOutputPath(false);
-
File.Delete(responseFileName);
File.Delete(output);
File.Delete(error);
- if (compilerparameters.CompileTarget != CompileTarget.Library) {
+ if (configuration.CompileTarget != CompileTarget.Library) {
WriteManifestFile(exe);
}
return result;
@@ -406,20 +345,20 @@
return error;
}
- public void GenerateMakefile (IProject project, Combine parentCombine)
+ public void GenerateMakefile (Project project, Combine parentCombine)
{
StreamWriter stream = new StreamWriter (Path.Combine (project.BaseDirectory, "Makefile." + project.Name.Replace (" ", "")));
- VBProject p = (VBProject)project;
- VBCompilerParameters compilerparameters = (VBCompilerParameters)p.ActiveConfiguration;
+ DotNetProjectConfiguration configuration = (DotNetProjectConfiguration) project.ActiveConfiguration;
+ VBCompilerParameters compilerparameters = (VBCompilerParameters) configuration.CompilationParameters;
//special case for module?
- string outputName = compilerparameters.OutputAssembly + (compilerparameters.CompileTarget == CompileTarget.Library ? ".dll" : ".exe");
+ string outputName = configuration.CompiledOutputName;
string target = "";
string relativeOutputDir = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, parentCombine.OutputDirectory);
- switch (compilerparameters.CompileTarget) {
+ switch (configuration.CompileTarget) {
case CompileTarget.Exe:
target = "exe";
break;
@@ -462,26 +401,26 @@
case ReferenceType.Gac:
string pkg = sas.GetPackageFromFullName (lib.Reference);
if (pkg == "MONO-SYSTEM") {
- system_references.Add (Path.GetFileName (lib.GetReferencedFileName (project)));
+ system_references.Add (Path.GetFileName (lib.GetReferencedFileName ()));
} else if (!pkg_references.Contains (pkg)) {
pkg_references.Add (pkg);
}
break;
case ReferenceType.Assembly:
- string assembly_fileName = lib.GetReferencedFileName (project);
+ string assembly_fileName = lib.GetReferencedFileName ();
string rel_path_to = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, Path.GetDirectoryName (assembly_fileName));
assembly_references.Add (Path.Combine (rel_path_to, Path.GetFileName (assembly_fileName)));
break;
case ReferenceType.Project:
- string project_fileName = lib.GetReferencedFileName (project);
+ string project_fileName = lib.GetReferencedFileName ();
IProjectService prjService = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
- ArrayList allProjects = Combine.GetAllProjects(prjService.CurrentOpenCombine);
+ CombineEntryCollection allProjects = prjService.CurrentOpenCombine.GetAllProjects();
- foreach (ProjectCombineEntry projectEntry in allProjects) {
- if (projectEntry.Project.Name == lib.Reference) {
- string project_base_dir = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, projectEntry.Project.BaseDirectory);
+ foreach (Project projectEntry in allProjects) {
+ if (projectEntry.Name == lib.Reference) {
+ string project_base_dir = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, projectEntry.BaseDirectory);
- string project_output_fileName = prjService.GetOutputAssemblyName (projectEntry.Project);
+ string project_output_fileName = projectEntry.GetOutputFileName ();
project_references.Add (Path.Combine (project_base_dir, Path.GetFileName (project_output_fileName)));
}
}
Deleted: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingExecutionServices.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingExecutionServices.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBBindingExecutionServices.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -1,110 +0,0 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Markus Palme" email="MarkusPalme at gmx.de"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Diagnostics;
-using System.Collections;
-using System.Reflection;
-using System.Resources;
-
-using System.Xml;
-using System.CodeDom.Compiler;
-using System.Threading;
-
-using MonoDevelop.Internal.Project;
-using MonoDevelop.Gui;
-using MonoDevelop.Services;
-using MonoDevelop.Core.Services;
-
-//using CSharpBinding;
-
-namespace VBBinding
-{
- /// <summary>
- /// This class controls the compilation of C Sharp files and C Sharp projects
- /// </summary>
- public class VBBindingExecutionServices //: CSharpBindingExecutionManager
- {
- public void Debug (IProject project)
- {
- FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService (typeof (FileUtilityService));
- string directory = fileUtilityService.GetDirectoryNameWithSeparator(((VBCompilerParameters)project.ActiveConfiguration).OutputDirectory);
- string exe = ((VBCompilerParameters)project.ActiveConfiguration).OutputAssembly + ".exe";
-
- IDebuggingService dbgr = (IDebuggingService) ServiceManager.GetService (typeof (IDebuggingService));
- if (dbgr != null)
- dbgr.Run (new string[] { Path.Combine (directory, exe) } );
- }
-
- public void Execute(string filename)
- {
- string exe = Path.ChangeExtension(filename, ".exe");
-
- ProcessStartInfo psi = new ProcessStartInfo("/usr/bin/mono " + exe);
- psi.WorkingDirectory = Path.GetDirectoryName(exe);
- psi.UseShellExecute = false;
- try {
- Process p = new Process();
- p.StartInfo = psi;
- p.Start();
- } catch (Exception) {
- throw new ApplicationException("Can not execute " + "\"" + exe + "\"\n(Try restarting MonoDevelop or start your app manually)");
- }
- }
-
- public void Execute(IProject project)
- {
- VBCompilerParameters parameters = (VBCompilerParameters)project.ActiveConfiguration;
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-
- string directory = fileUtilityService.GetDirectoryNameWithSeparator(((VBCompilerParameters)project.ActiveConfiguration).OutputDirectory);
- string exe = ((VBCompilerParameters)project.ActiveConfiguration).OutputAssembly + ".exe";
- string args = ((VBCompilerParameters)project.ActiveConfiguration).CommandLineParameters;
-
- ProcessStartInfo psi;
- if (parameters.ExecuteScript != null && parameters.ExecuteScript.Length > 0) {
- //Console.WriteLine("EXECUTE SCRIPT!!!!!!");
- psi = new ProcessStartInfo("\"" + parameters.ExecuteScript + "\"");
- psi.UseShellExecute = false;
- } else {
- string runtimeStarter = "mono --debug ";
-
- switch (parameters.NetRuntime) {
- case NetRuntime.Mono:
- runtimeStarter = "mono --debug ";
- break;
- case NetRuntime.MonoInterpreter:
- runtimeStarter = "mint ";
- break;
- }
-
- string additionalCommands = "";
- if (parameters.PauseConsoleOutput)
- additionalCommands = @"echo; read -p 'press any key to continue...' -n1;";
-
- psi = new ProcessStartInfo("xterm",
- string.Format (
- @"-e ""{0} '{1}{2}' {3} ; {4}""",
- runtimeStarter, directory, exe, args, additionalCommands));
- psi.UseShellExecute = false;
- }
-
- try {
- psi.WorkingDirectory = Path.GetDirectoryName(directory);
- psi.UseShellExecute = false;
-
- Process p = new Process();
- p.StartInfo = psi;
- p.Start();
- } catch (Exception) {
- throw new ApplicationException("Can not execute " + "\"" + directory + exe + "\"\n(Try restarting MonoDevelop or start your app manually)");
- }
- }
-
- }
-}
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBLanguageBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBLanguageBinding.cs 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBLanguageBinding.cs 2005-01-14 00:28:44 UTC (rev 2131)
@@ -13,18 +13,16 @@
using MonoDevelop.Gui;
using MonoDevelop.Internal.Project;
-using MonoDevelop.Internal.Templates;
-//using CSharpBinding;
+using MonoDevelop.Internal.Templates;
+using MonoDevelop.Services;
namespace VBBinding
{
public class VBLanguageBinding : ILanguageBinding
- //public class VBLanguageBinding : CSharpLanguageBinding
{
public const string LanguageName = "VBNet";
VBBindingCompilerServices compilerServices = new VBBindingCompilerServices();
- VBBindingExecutionServices executionServices = new VBBindingExecutionServices();
public string Language {
get {
@@ -32,86 +30,33 @@
}
}
- public void Execute(string filename, bool debug)
+ public VBLanguageBinding ()
{
- Debug.Assert(executionServices != null);
- executionServices.Execute(filename);
+ Runtime.ProjectService.DataContext.IncludeType (typeof(VBCompilerParameters));
}
- public void Execute(IProject project, bool debug)
- {
- Debug.Assert(executionServices != null);
- if(debug){
- executionServices.Debug(project);
- }else{
- executionServices.Execute(project);
- }//if
-
- }
-
- public string GetCompiledOutputName(string fileName)
- {
- Debug.Assert(compilerServices != null);
- return compilerServices.GetCompiledOutputName(fileName);
- }
-
- public string GetCompiledOutputName(IProject project)
- {
- Debug.Assert(compilerServices != null);
- return compilerServices.GetCompiledOutputName(project);
- }
-
public bool CanCompile(string fileName)
{
Debug.Assert(compilerServices != null);
return compilerServices.CanCompile(fileName);
}
- public ICompilerResult CompileFile(string fileName)
+ public ICompilerResult Compile (ProjectFileCollection projectFiles, ProjectReferenceCollection references, DotNetProjectConfiguration configuration)
{
Debug.Assert(compilerServices != null);
- return compilerServices.CompileFile(fileName);
+ return compilerServices.CompileProject (projectFiles, references, configuration);
}
- public ICompilerResult CompileProject(IProject project)
- {
- Debug.Assert(compilerServices != null);
- return compilerServices.CompileProject(project);
- }
+ public void GenerateMakefile (Project project, Combine parentCombine)
+ {
+ compilerServices.GenerateMakefile (project, parentCombine);
+ }
- public ICompilerResult RecompileProject(IProject project)
+ public object CreateCompilationParameters (XmlElement projectOptions)
{
- return CompileProject(project);
+ return new VBCompilerParameters ();
}
-
- public IProject CreateProject(ProjectCreateInformation info, XmlElement projectOptions)
- {
- return new VBProject(info, projectOptions);
- }
-
- public virtual void Execute(string filename)
- {
- Debug.Assert(executionServices != null);
- executionServices.Execute(filename);
- }
-
- public virtual void Execute(IProject project)
- {
- Debug.Assert(executionServices != null);
- executionServices.Execute(project);
- }
-
- public void DebugProject (IProject project)
- {
- executionServices.Debug (project);
- }
-
- public void GenerateMakefile (IProject project, Combine parentCombine)
- {
- compilerServices.GenerateMakefile (project, parentCombine);
- }
-
public string CommentTag
{
get { return "'"; }
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBNetBinding.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBNetBinding.addin.xml 2005-01-14 00:28:21 UTC (rev 2130)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/VBNetBinding.addin.xml 2005-01-14 00:28:44 UTC (rev 2131)
@@ -34,7 +34,7 @@
</Extension>
<Extension path = "/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">
- <Conditional activeproject = "VBNet">
+ <Conditional activelanguage = "VBNet">
<DialogPanel id = "VBNetCodeGenerationPanel"
_label = "Code Generation"
class = "VBBinding.CodeGenerationPanel"/>
@@ -42,15 +42,15 @@
</Extension>
<Extension path = "/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">
- <Conditional activeproject = "VBNet">
+ <Conditional activelanguage = "VBNet">
<DialogPanel id = "VBNetOutputOptionsPanel"
_label = "Output Options"
- class = "VBBinding.OutputOptionsPanel"/>
+ class = "MonoDevelop.Gui.Dialogs.OptionPanels.OutputOptionsPanel"/>
</Conditional>
</Extension>
<!-- <Extension path = "/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">
- <Conditional activeproject = "VBNet">
+ <Conditional activelanguage = "VBNet">
<DialogPanel id = "VBNetChooseRuntimePanel"
_label = "Choose Runtime"
class = "VBBinding.ChooseRuntimePanel"/>
More information about the Monodevelop-patches-list
mailing list