Author: mhutch
Date: 2007-09-19 08:40:34 -0400 (Wed, 19 Sep 2007)
New Revision: 86002
Modified:
trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkCoreService.cs
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
Log:
* MonoDevelop.GtkCore/GtkDesignInfo.cs: Don't touch GTK# assembly
versions when a target version is not set. Don't use
gtkVersion=null to represent default version.
* MonoDevelop.GtkCore/GtkCoreService.cs: Set TargetGtkVersion on new
projects. Bump default version to 2.8.
Modified: trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog 2007-09-19
12:29:24 UTC (rev 86001)
+++ trunk/monodevelop/Extras/MonoDevelop.GtkCore/ChangeLog 2007-09-19
12:40:34 UTC (rev 86002)
@@ -1,3 +1,11 @@
+2007-09-19 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * MonoDevelop.GtkCore/GtkDesignInfo.cs: Don't touch GTK# assembly
versions
+ when a target version is not set. Don't use gtkVersion=null to
represent
+ default version.
+ * MonoDevelop.GtkCore/GtkCoreService.cs: Set TargetGtkVersion on new
+ projects. Bump default version to 2.8.
+
2007-09-17 Michael Hutchinson <[EMAIL PROTECTED]>
* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp, lib/libstetic.mdp,
Modified:
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkCoreService.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkCoreService.cs
2007-09-19 12:29:24 UTC (rev 86001)
+++
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkCoreService.cs
2007-09-19 12:40:34 UTC (rev 86002)
@@ -79,7 +79,7 @@
foreach (SystemPackage p in
Runtime.SystemAssemblyService.GetPackages ()) {
if (p.Name == "gtk-sharp-2.0") {
versions.Add (p.Version);
- if (p.Version.StartsWith
("2.4"))
+ if (p.Version.StartsWith
("2.8"))
defaultGtkVersion =
p.Version;
}
}
@@ -113,6 +113,7 @@
return info;
info = new GtkDesignInfo ((DotNetProject) project);
+ info.TargetGtkVersion =
GtkCoreService.DefaultGtkVersion;
info.UpdateGtkFolder ();
if (GtkSupportChanged != null)
Modified:
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
2007-09-19 12:29:24 UTC (rev 86001)
+++
trunk/monodevelop/Extras/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
2007-09-19 12:40:34 UTC (rev 86002)
@@ -175,10 +175,7 @@
}
set {
if (TargetGtkVersion != value) {
- if (value !=
GtkCoreService.DefaultGtkVersion)
- gtkVersion = value;
- else
- gtkVersion = null;
+ gtkVersion = value;
GuiBuilderProject.SteticProject.TargetGtkVersion = TargetGtkVersion;
GuiBuilderProject.Save (false);
}
@@ -330,14 +327,16 @@
string gtkAsmVersion = "";
- foreach (SystemPackage p in
Runtime.SystemAssemblyService.GetPackages ()) {
- if (p.Name == "gtk-sharp-2.0" && p.Version ==
TargetGtkVersion) {
- string fn =
Runtime.SystemAssemblyService.GetAssemblyFullName (p.Assemblies[0]);
- int i = fn.IndexOf (',');
- gtkAsmVersion = fn.Substring (i+1).Trim
();
- break;
+ if (gtkVersion != null) {
+ foreach (SystemPackage p in
Runtime.SystemAssemblyService.GetPackages ()) {
+ if (p.Name == "gtk-sharp-2.0" &&
p.Version == TargetGtkVersion) {
+ string fn =
Runtime.SystemAssemblyService.GetAssemblyFullName (p.Assemblies[0]);
+ int i = fn.IndexOf (',');
+ gtkAsmVersion = fn.Substring
(i+1).Trim ();
+ break;
+ }
}
- }
+ }
bool gtk=false, gdk=false, posix=false;
foreach (ProjectReference r in new ArrayList
(project.ProjectReferences)) {
@@ -359,8 +358,8 @@
if (Array.IndexOf (GtkSharpAssemblies, aname)
== -1)
continue;
- // Correct version?
- if (r.Reference.Substring (i+1).Trim() !=
gtkAsmVersion) {
+ // Check and correct the assembly version only
if a version is set
+ if (!string.IsNullOrEmpty (gtkAsmVersion) &&
r.Reference.Substring (i+1).Trim() != gtkAsmVersion) {
project.ProjectReferences.Remove (r);
project.ProjectReferences.Add (new
ProjectReference (ReferenceType.Gac, aname + ", " + gtkAsmVersion));
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
