[Monodevelop-patches-list] r558 - in trunk/MonoDevelop: build/data/templates/project/CSharp src/Main/Base/Internal/Project/Project

[commit-watcher at mono-cvs.ximian.com]

Author: benm
Date: 2004-01-18 22:27:10 -0500 (Sun, 18 Jan 2004)
New Revision: 558

Modified:
   trunk/MonoDevelop/build/data/templates/project/CSharp/GnomeSharpProject.xpt
   trunk/MonoDevelop/build/data/templates/project/CSharp/GtkSharpProject.xpt
   trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
Log:
get gnome/gtk combines to compile oob

Modified: trunk/MonoDevelop/build/data/templates/project/CSharp/GnomeSharpProject.xpt
===================================================================
--- trunk/MonoDevelop/build/data/templates/project/CSharp/GnomeSharpProject.xpt	2004-01-19 01:27:02 UTC (rev 557)
+++ trunk/MonoDevelop/build/data/templates/project/CSharp/GnomeSharpProject.xpt	2004-01-19 03:27:10 UTC (rev 558)
@@ -24,7 +24,18 @@
 		</Options>
 		
 		<Project name = "${ProjectName}" directory = ".">
-			<Options/>
+			<Options/>
+			
+			<References>
+				<Reference type="Gac" refto="gnome-sharp.dll" />
+				<Reference type="Gac" refto="gtk-sharp.dll" />
+				<Reference type="Gac" refto="gdk-sharp.dll" />
+				<Reference type="Gac" refto="glib-sharp.dll" />
+				<Reference type="Gac" refto="glade-sharp.dll" />
+				<Reference type="Gac" refto="pango-sharp.dll" />
+				<Reference type="Gac" refto="System.Drawing.dll" />
+			</References>
+
 			<Files>
 				<File name="Main.cs"><![CDATA[// project created on ${Date} at ${Time}
 using System;

Modified: trunk/MonoDevelop/build/data/templates/project/CSharp/GtkSharpProject.xpt
===================================================================
--- trunk/MonoDevelop/build/data/templates/project/CSharp/GtkSharpProject.xpt	2004-01-19 01:27:02 UTC (rev 557)
+++ trunk/MonoDevelop/build/data/templates/project/CSharp/GtkSharpProject.xpt	2004-01-19 03:27:10 UTC (rev 558)
@@ -21,17 +21,26 @@
 	<Combine name = "${ProjectName}" directory = ".">
 		<Options>
 			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
+		</Options>
 		
 		<Project name = "${ProjectName}" directory = ".">
-			<Options/>
+			<Options/>
+			
+			<References>
+				<Reference type="Gac" refto="gtk-sharp.dll" />
+				<Reference type="Gac" refto="gdk-sharp.dll" />
+				<Reference type="Gac" refto="glib-sharp.dll" />
+				<Reference type="Gac" refto="glade-sharp.dll" />
+				<Reference type="Gac" refto="pango-sharp.dll" />
+				<Reference type="Gac" refto="System.Drawing.dll" />
+			</References>
+		
 			<Files>
 				<File name="Main.cs"><![CDATA[// project created on ${Date} at ${Time}
 using System;
 using Gtk;
 
-class MainClass
-{
+class MainClass {
 	public static void Main(string[] args)
 	{
 		Application.Init ();
@@ -43,8 +52,7 @@
 using Gtk;
 using GtkSharp;
 
-public class MyWindow : Window
-{
+public class MyWindow : Window {
 	static GLib.GType type;
 	
 	static MyWindow ()
@@ -60,7 +68,7 @@
 		this.ShowAll ();
 	}
 	
-	private void OnMyWindowDelete (object o, DeleteEventArgs args)
+	void OnMyWindowDelete (object o, DeleteEventArgs args)
 	{
 		Application.Quit ();
 	}

Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs	2004-01-19 01:27:02 UTC (rev 557)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs	2004-01-19 03:27:10 UTC (rev 558)
@@ -100,9 +100,13 @@
 				case ReferenceType.Assembly:
 					return reference;
 				
-				case ReferenceType.Gac: 
+				case ReferenceType.Gac: 
+#if LINUX
 					return GetPathToGACAssembly(this);
-				
+#else
+					// TODO: gac on linux
+					return reference;
+#endif
 				case ReferenceType.Project:
 					IProjectService projectService = (IProjectService)ICSharpCode.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
 					string projectOutputLocation   = projectService.GetOutputAssemblyName(reference);