* MsPrjHelper.cs: Create default configurations for the imported

  solution. Fixes bug #504600 - Rebuild solution doesn't trigger a
  real build.

svn path=/trunk/monodevelop/; revision=141131

2 files changed, 11 insertions, 1 deletions

diff --git a/main/src/addins/prj2make-sharp-lib/ChangeLog b/main/src/addins/prj2make-sharp-lib/ChangeLog
index 8479b33917..74579fa1c0 100644
--- a/main/src/addins/prj2make-sharp-lib/ChangeLog
+++ b/main/src/addins/prj2make-sharp-lib/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-02  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* MsPrjHelper.cs: Create default configurations for the
+	  imported solution. Fixes bug #504600 - Rebuild solution
+	  doesn't trigger a real build.
+
 2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* prj2make-sharp-lib.csproj: Updated dependencies. We now
diff --git a/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs b/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs
index 5cb567c523..f41f0b1b7a 100644
--- a/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs
+++ b/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs
@@ -263,6 +263,10 @@ namespace MonoDevelop.Prj2Make
 
 					monitor.Step (1);
 					solution.RootFolder.Items.Add (prj);
+					foreach (ItemConfiguration conf in prj.Configurations) {
+						if (!solution.GetConfigurations ().Contains (conf.Id))
+							solution.AddConfiguration (conf.Id, false);
+					}
 					monitor.Step (1);
 				}
 				
@@ -475,7 +479,7 @@ namespace MonoDevelop.Prj2Make
 			
 			string dir = MapPath (project.BaseDirectory, ConfigBlock.OutputPath);
 			if (dir == null) {
-				dir = "bin/" + ConfigBlock.Name;
+				dir = Path.Combine ("bin", ConfigBlock.Name);
 				monitor.ReportWarning (string.Format (GettextCatalog.GetString ("Output directory '{0}' can't be mapped to a local directory. The directory '{1}' will be used instead"), ConfigBlock.OutputPath, dir));
 			}
 			confObj.OutputDirectory = dir;