2009-12-01 Lluis Sanchez Gual <lluis@novell.com>extras/BooBinding/2.2-rc

	* BooBinding.sln:
	* BooBinding.booproj: Update.

	* BooBinding.addin.xml: Move the boo options panel to the
	  build section.

2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>

	* Gui/ShellTextView.boo:
	* BooLanguageBinding.boo:
	* BooBindingCompilerServices.boo: Introduced the
	  ConfigurationSelector class to all methods that previously
	  took a configuration name as string. This eliminates the
	  ambiguity between solution configuration names and project
	  configuration names.

2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>

	* BooShell.booproj: Update.


svn path=/branches/monodevelop/extras/BooBinding/2.2/; revision=147408

9 files changed, 36 insertions, 13 deletions

diff --git a/extras/BooBinding/BooBinding.addin.xml b/extras/BooBinding/BooBinding.addin.xml
index 6d7e1c68c7..f399fcac98 100644
--- a/extras/BooBinding/BooBinding.addin.xml
+++ b/extras/BooBinding/BooBinding.addin.xml
@@ -50,7 +50,7 @@
 		<DataType class = "BooBinding.BooCompilerParameters" />
 	</Extension>
 	
-  <Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels">
+  <Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Build">
     <Condition id="ActiveLanguage" value = "Boo">
       <Section id = "BooCodeGenerationPanel"
                    _label = "Code Generation"
diff --git a/extras/BooBinding/BooBinding.booproj b/extras/BooBinding/BooBinding.booproj
index 0062a41ae7..97fa5a6123 100644
--- a/extras/BooBinding/BooBinding.booproj
+++ b/extras/BooBinding/BooBinding.booproj
@@ -10,6 +10,7 @@
     <UsePartialTypes>false</UsePartialTypes>
     <AssemblyName>BooBinding</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <RootNamespace>BooBinding</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -125,7 +126,9 @@
     <EmbeddedResource Include="icons\Boo.FileIcon">
       <LogicalName>Boo.FileIcon</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="BooBinding.addin.xml" />
+    <EmbeddedResource Include="BooBinding.addin.xml">
+      <LogicalName>BooBinding.addin.xml</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\boo-icon-32.png">
       <LogicalName>boo-icon-32.png</LogicalName>
     </EmbeddedResource>
diff --git a/extras/BooBinding/BooBinding.sln b/extras/BooBinding/BooBinding.sln
index def1873017..f0d5491a78 100644
--- a/extras/BooBinding/BooBinding.sln
+++ b/extras/BooBinding/BooBinding.sln
@@ -22,9 +22,7 @@ Global
 		{87E0A9FD-8DFD-4A3D-93D7-C86F6322CCF4}.Release|Any CPU.ActiveCfg = Debug|Any CPU

 		{87E0A9FD-8DFD-4A3D-93D7-C86F6322CCF4}.Release|Any CPU.Build.0 = Debug|Any CPU

 		{E1321D51-614A-49D9-974B-2AEB9B27210D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{E1321D51-614A-49D9-974B-2AEB9B27210D}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{E1321D51-614A-49D9-974B-2AEB9B27210D}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{E1321D51-614A-49D9-974B-2AEB9B27210D}.Release|Any CPU.Build.0 = Release|Any CPU

 	EndGlobalSection

 	GlobalSection(MonoDevelopProperties) = preSolution

 		StartupItem = BooBinding.booproj

@@ -44,6 +42,5 @@ Global
 		$0.ChangeLogPolicy = $5

 		$5.UpdateMode = ProjectRoot

 		$5.inheritsSet = Mono

-		version = 0.1

 	EndGlobalSection

 EndGlobal

diff --git a/extras/BooBinding/BooBindingCompilerServices.boo b/extras/BooBinding/BooBindingCompilerServices.boo
index ae69e4bd13..1028a37e59 100644
--- a/extras/BooBinding/BooBindingCompilerServices.boo
+++ b/extras/BooBinding/BooBindingCompilerServices.boo
@@ -44,7 +44,7 @@ public class BooBindingCompilerServices:
 	public def CanCompile (fileName as string):
 		return Path.GetExtension (fileName).ToUpper () == ".BOO"
 	
-	def Compile (projectItems as ProjectItemCollection, configuration as DotNetProjectConfiguration, monitor as IProgressMonitor) as BuildResult:
+	def Compile (projectItems as ProjectItemCollection, configuration as DotNetProjectConfiguration, configurationSelector as ConfigurationSelector, monitor as IProgressMonitor) as BuildResult:
 		compilerparameters = cast (BooCompilerParameters, configuration.CompilationParameters)
 		if compilerparameters is null:
 			compilerparameters = BooCompilerParameters ()
@@ -57,7 +57,7 @@ public class BooBindingCompilerServices:
 			compilerTarget = "library"
 		elif configuration.CompileTarget == CompileTarget.WinExe:
 			compilerTarget = "winexe"
-			
+		
 		parameters as StringBuilder = StringBuilder (
 			"-o:${configuration.CompiledOutputName} -t:${compilerTarget}")
 		
@@ -89,7 +89,7 @@ public class BooBindingCompilerServices:
 		
 		#we add the different references
 		for lib as ProjectReference in projectItems.GetAllReferences ():
-			for fileName as string in lib.GetReferencedFileNames (configuration.Id):
+			for fileName as string in lib.GetReferencedFileNames (configurationSelector):
 				parameters.Append (" -reference:${fileName} ")
 				
 		for finfo as ProjectFile in projectItems.GetAllFiles ():
@@ -125,7 +125,7 @@ public class BooBindingCompilerServices:
 			
 			operationMonitor = AggregatedOperationMonitor (monitor)
 			monitor.Log.WriteLine (GettextCatalog.GetString ("Starting Boo compilation"))
-			monitor.Log.WriteLine (GettextCatalog.GetString ("booc ${parameters}"))
+			monitor.Log.WriteLine ("booc ${parameters}")
 			
 			#we create a new process that will be used to execute the command line of the compiler
 			wrapper =  MonoDevelop.Core.Runtime.ProcessService.StartProcess ("booc",parameters ,
diff --git a/extras/BooBinding/BooLanguageBinding.boo b/extras/BooBinding/BooLanguageBinding.boo
index 3c1236d479..ceed443adc 100644
--- a/extras/BooBinding/BooLanguageBinding.boo
+++ b/extras/BooBinding/BooLanguageBinding.boo
@@ -55,9 +55,9 @@ public class BooLanguageBinding(IDotNetLanguageBinding):
 		Debug.Assert(compilerServices is not null)
 		return compilerServices.CanCompile(fileName)
 	
-	public def Compile (projectItems as ProjectItemCollection , configuration as DotNetProjectConfiguration , monitor as IProgressMonitor ) as BuildResult:
+	public def Compile (projectItems as ProjectItemCollection , configuration as DotNetProjectConfiguration , configurationSelector as ConfigurationSelector, monitor as IProgressMonitor ) as BuildResult:
 		Debug.Assert(compilerServices is not null)
-		return compilerServices.Compile (projectItems, configuration, monitor)
+		return compilerServices.Compile (projectItems, configuration, configurationSelector, monitor)
 	
 	public def CreateCompilationParameters (projectOptions as XmlElement) as ConfigurationParameters:
 		parameters = BooCompilerParameters ()
diff --git a/extras/BooBinding/BooShell/BooShell.booproj b/extras/BooBinding/BooShell/BooShell.booproj
index 2cb1c1a673..eac4c00af7 100644
--- a/extras/BooBinding/BooShell/BooShell.booproj
+++ b/extras/BooBinding/BooShell/BooShell.booproj
@@ -10,6 +10,7 @@
     <UsePartialTypes>false</UsePartialTypes>
     <AssemblyName>BooShell</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <RootNamespace>BooShell</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/extras/BooBinding/BooShell/ChangeLog b/extras/BooBinding/BooShell/ChangeLog
index 35021e08c5..62857f5a1a 100644
--- a/extras/BooBinding/BooShell/ChangeLog
+++ b/extras/BooBinding/BooShell/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* BooShell.booproj: Update.
+
 2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* BooShell.booproj: We now depend on gtk# 2.12.8, Mono 2.4,
diff --git a/extras/BooBinding/ChangeLog b/extras/BooBinding/ChangeLog
index 95e1673b50..cb4669b4aa 100644
--- a/extras/BooBinding/ChangeLog
+++ b/extras/BooBinding/ChangeLog
@@ -1,3 +1,21 @@
+2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* BooBinding.sln:
+	* BooBinding.booproj: Update.
+
+	* BooBinding.addin.xml: Move the boo options panel to the
+	  build section.
+
+2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* Gui/ShellTextView.boo:
+	* BooLanguageBinding.boo:
+	* BooBindingCompilerServices.boo: Introduced the
+	  ConfigurationSelector class to all methods that previously
+	  took a configuration name as string. This eliminates the
+	  ambiguity between solution configuration names and project
+	  configuration names.
+
 2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* configure:
diff --git a/extras/BooBinding/Gui/ShellTextView.boo b/extras/BooBinding/Gui/ShellTextView.boo
index 5500cd7168..9ac36d00b0 100644
--- a/extras/BooBinding/Gui/ShellTextView.boo
+++ b/extras/BooBinding/Gui/ShellTextView.boo
@@ -150,7 +150,7 @@ class ShellTextView (SourceView, ICompletionWidget):
 	def getProjectAssemblies():
 		_assemblies = []
 		if (_proj is not null):
-			assembly = _proj.GetOutputFileName(ProjectService.DefaultConfiguration)
+			assembly = _proj.GetOutputFileName(ConfigurationSelector.Default)
 			if not assembly.IsNull:
 				_assemblies.Add(assembly)
 		else:
@@ -158,7 +158,7 @@ class ShellTextView (SourceView, ICompletionWidget):
 			for entry as Project in projects:
 				if entry is null:
 					continue
-				assembly = entry.GetOutputFileName(ProjectService.DefaultConfiguration)
+				assembly = entry.GetOutputFileName(ConfigurationSelector.Default)
 				if not assembly.IsNull:
 					_assemblies.Add(assembly)