[Monodevelop-patches-list] r1930 - in branches/MonoDevelop-plan-43: . build/bin build/lib/monodevelop src src/Content src/Core src/Editor src/Node src/Workbench
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Wed Aug 11 07:31:15 EDT 2004
Author: jzwart
Date: 2004-08-11 07:31:15 -0400 (Wed, 11 Aug 2004)
New Revision: 1930
Added:
branches/MonoDevelop-plan-43/ChangeLog
Modified:
branches/MonoDevelop-plan-43/build/bin/monodevelop.exe
branches/MonoDevelop-plan-43/build/bin/monodevelop.exe.config
branches/MonoDevelop-plan-43/build/lib/monodevelop/content.dll
branches/MonoDevelop-plan-43/build/lib/monodevelop/content.plugin
branches/MonoDevelop-plan-43/build/lib/monodevelop/editor.dll
branches/MonoDevelop-plan-43/build/lib/monodevelop/editor.plugin
branches/MonoDevelop-plan-43/build/lib/monodevelop/node.dll
branches/MonoDevelop-plan-43/build/lib/monodevelop/node.plugin
branches/MonoDevelop-plan-43/build/lib/monodevelop/workbench.dll
branches/MonoDevelop-plan-43/build/lib/monodevelop/workbench.plugin
branches/MonoDevelop-plan-43/src/Content/ContentManager.cs
branches/MonoDevelop-plan-43/src/Content/content.build
branches/MonoDevelop-plan-43/src/Core/core.build
branches/MonoDevelop-plan-43/src/Editor/editor.build
branches/MonoDevelop-plan-43/src/Node/FileNode.cs
branches/MonoDevelop-plan-43/src/Node/node.build
branches/MonoDevelop-plan-43/src/Workbench/workbench.build
branches/MonoDevelop-plan-43/src/plugins.build
Log:
2004-08-11 Jeroen Zwartepoorte <jeroen at xs4all.nl>
Start keeping a ChangeLog. This revision should compile with the latest
nant nightly build: 20040811. This version is required because of the
<replacetokens> filterchain changes.
Added: branches/MonoDevelop-plan-43/ChangeLog
===================================================================
--- branches/MonoDevelop-plan-43/ChangeLog 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/ChangeLog 2004-08-11 11:31:15 UTC (rev 1930)
@@ -0,0 +1,5 @@
+2004-08-11 Jeroen Zwartepoorte <jeroen at xs4all.nl>
+
+ Start keeping a ChangeLog. This revision should compile with the latest
+ nant nightly build: 20040811. This version is required because of the
+ <replacetokens> filterchain changes.
Modified: branches/MonoDevelop-plan-43/build/bin/monodevelop.exe
===================================================================
(Binary files differ)
Modified: branches/MonoDevelop-plan-43/build/bin/monodevelop.exe.config
===================================================================
--- branches/MonoDevelop-plan-43/build/bin/monodevelop.exe.config 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/build/bin/monodevelop.exe.config 2004-08-11 11:31:15 UTC (rev 1930)
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
<add key="imagePath" value="@monodevelop_images_dir@"/>
- <add key="pluginPath" value="/home/jeroen/Projects/monodevelop/build/lib/monodevelop"/>
+ <add key="pluginPath" value="/home/jeroen/Projects/MonoDevelop-plan-43/build/lib/monodevelop"/>
<add key="resourcePath" value="@monodevelop_resource_dir@"/>
- <add key="uiPath" value="/home/jeroen/Projects/monodevelop/build/share/monodevelop/ui"/>
+ <add key="uiPath" value="/home/jeroen/Projects/MonoDevelop-plan-43/build/share/monodevelop/ui"/>
</appSettings>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
Modified: branches/MonoDevelop-plan-43/build/lib/monodevelop/content.dll
===================================================================
(Binary files differ)
Modified: branches/MonoDevelop-plan-43/build/lib/monodevelop/content.plugin
===================================================================
--- branches/MonoDevelop-plan-43/build/lib/monodevelop/content.plugin 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/build/lib/monodevelop/content.plugin 2004-08-11 11:31:15 UTC (rev 1930)
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<plugin version="1.0">
- <assembly>/home/jeroen/Projects/monodevelop/build/lib/monodevelop/content.dll</assembly>
+ <assembly>/home/jeroen/Projects/MonoDevelop-plan-43/build/lib/monodevelop/content.dll</assembly>
<class name="MonoDevelop.Content.ContentManager"/>
</plugin>
Modified: branches/MonoDevelop-plan-43/build/lib/monodevelop/editor.dll
===================================================================
(Binary files differ)
Modified: branches/MonoDevelop-plan-43/build/lib/monodevelop/editor.plugin
===================================================================
--- branches/MonoDevelop-plan-43/build/lib/monodevelop/editor.plugin 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/build/lib/monodevelop/editor.plugin 2004-08-11 11:31:15 UTC (rev 1930)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin version="1.0">
- <assembly>/home/jeroen/Projects/monodevelop/build/lib/monodevelop/editor.dll</assembly>
+ <assembly>@assembly@</assembly>
<class name="MonoDevelop.Editor.EditorNodeViewer"/>
</plugin>
Modified: branches/MonoDevelop-plan-43/build/lib/monodevelop/node.dll
===================================================================
(Binary files differ)
Modified: branches/MonoDevelop-plan-43/build/lib/monodevelop/node.plugin
===================================================================
--- branches/MonoDevelop-plan-43/build/lib/monodevelop/node.plugin 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/build/lib/monodevelop/node.plugin 2004-08-11 11:31:15 UTC (rev 1930)
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<plugin version="1.0">
- <assembly>/home/jeroen/Projects/monodevelop/build/lib/monodevelop/node.dll</assembly>
+ <assembly>/home/jeroen/Projects/MonoDevelop-plan-43/build/lib/monodevelop/node.dll</assembly>
<class name="MonoDevelop.Node.Node"/>
</plugin>
Modified: branches/MonoDevelop-plan-43/build/lib/monodevelop/workbench.dll
===================================================================
(Binary files differ)
Modified: branches/MonoDevelop-plan-43/build/lib/monodevelop/workbench.plugin
===================================================================
--- branches/MonoDevelop-plan-43/build/lib/monodevelop/workbench.plugin 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/build/lib/monodevelop/workbench.plugin 2004-08-11 11:31:15 UTC (rev 1930)
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<plugin version="1.0">
- <assembly>/home/jeroen/Projects/monodevelop/build/lib/monodevelop/workbench.dll</assembly>
+ <assembly>/home/jeroen/Projects/MonoDevelop-plan-43/build/lib/monodevelop/workbench.dll</assembly>
<class name="MonoDevelop.Workbench.Workbench"/>
</plugin>
Modified: branches/MonoDevelop-plan-43/src/Content/ContentManager.cs
===================================================================
--- branches/MonoDevelop-plan-43/src/Content/ContentManager.cs 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/src/Content/ContentManager.cs 2004-08-11 11:31:15 UTC (rev 1930)
@@ -63,7 +63,7 @@
if (resp != (int)ResponseType.Ok)
return;
- string mimetype = Mime.GetMimeType (fcd.Filename);
+ string mimetype = MimeType.GetMimeTypeForUri (fcd.Filename);
log.Debug ("Mimetype for " + fcd.Filename + " is " + mimetype);
// Find a FileNode Type for the specified mimetype.
Modified: branches/MonoDevelop-plan-43/src/Content/content.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Content/content.build 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/src/Content/content.build 2004-08-11 11:31:15 UTC (rev 1930)
@@ -5,7 +5,7 @@
<property name="assemblyfile" value="${path::combine(plugin.dir, 'content.dll')}"/>
<csc target="library" output="${assemblyfile}" debug="${build.debug}">
<arg value="${gnome-sharp.libs}"/>
- <arg value="-r:/usr/lib/gnome-vfs-sharp.dll"/>
+ <arg value="${gnome-vfs-sharp.libs}"/>
<sources>
<include name="*.cs"/>
</sources>
@@ -19,8 +19,13 @@
</csc>
<!-- install the plugin file -->
- <copy file="content.plugin.in" tofile="content.plugin"/>
- <replaceregex match="@assembly@" replace="${assemblyfile}" file="content.plugin" byline="true" />
+ <copy file="content.plugin.in" tofile="content.plugin">
+ <filterchain>
+ <replacetokens>
+ <token key="assembly" value="${assemblyfile}"/>
+ </replacetokens>
+ </filterchain>
+ </copy>
<move file="content.plugin" todir="${plugin.dir}"/>
<!-- install the ui file -->
Modified: branches/MonoDevelop-plan-43/src/Core/core.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Core/core.build 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/src/Core/core.build 2004-08-11 11:31:15 UTC (rev 1930)
@@ -13,9 +13,14 @@
</csc>
<!-- install the plugin file -->
- <copy file="monodevelop.exe.config.in" tofile="monodevelop.exe.config"/>
- <replaceregex match="@monodevelop_plugin_dir@" replace="${path::combine(lib.dir, 'monodevelop')}" file="monodevelop.exe.config"/>
- <replaceregex match="@monodevelop_ui_dir@" replace="${path::combine(share.dir, 'ui')}" file="monodevelop.exe.config"/>
+ <copy file="monodevelop.exe.config.in" tofile="monodevelop.exe.config">
+ <filterchain>
+ <replacetokens>
+ <token key="monodevelop_plugin_dir" value="${path::combine(lib.dir, 'monodevelop')}"/>
+ <token key="monodevelop_ui_dir" value="${path::combine(share.dir, 'ui')}"/>
+ </replacetokens>
+ </filterchain>
+ </copy>
<move file="monodevelop.exe.config" todir="${bin.dir}"/>
</target>
</project>
Modified: branches/MonoDevelop-plan-43/src/Editor/editor.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Editor/editor.build 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/src/Editor/editor.build 2004-08-11 11:31:15 UTC (rev 1930)
@@ -19,8 +19,13 @@
</csc>
<!-- install the plugin file -->
- <copy file="editor.plugin.in" tofile="editor.plugin"/>
- <replaceregex match="@assembly@" replace="${assemblyfile}" file="editor.plugin" byline="true" />
+ <copy file="editor.plugin.in" tofile="editor.plugin">
+ <filterchain>
+ <replacetokens>
+ <token key="assembly" value="${assemblyfile}"/>
+ </replacetokens>
+ </filterchain>
+ </copy>
<move file="editor.plugin" todir="${plugin.dir}"/>
<!-- install the ui file -->
Modified: branches/MonoDevelop-plan-43/src/Node/FileNode.cs
===================================================================
--- branches/MonoDevelop-plan-43/src/Node/FileNode.cs 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/src/Node/FileNode.cs 2004-08-11 11:31:15 UTC (rev 1930)
@@ -35,22 +35,22 @@
public override bool CanDelete {
get {
return uri.Exists &&
- ((File.GetAttributes (filename) &
- FileAttributes.ReadOnly) != FileAttributes.ReadOnly);
+ ((uri.GetFileInfo ().Permissions &
+ FilePermissions.AccessWritable) == FilePermissions.AccessWritable);
}
}
public override bool CanRename {
get {
return uri.Exists &&
- ((File.GetAttributes (filename) &
- FileAttributes.ReadOnly) != FileAttributes.ReadOnly);
+ ((uri.GetFileInfo ().Permissions &
+ FilePermissions.AccessWritable) == FilePermissions.AccessWritable);
}
}
public override bool CanRevert {
get {
- return Vfs.Exists (filename);
+ return uri.Exists;
}
}
@@ -58,8 +58,8 @@
get {
return !uri.Exists ||
(uri.Exists &&
- ((File.GetAttributes (filename) &
- FileAttributes.ReadOnly) != FileAttributes.ReadOnly));
+ ((uri.GetFileInfo ().Permissions &
+ FilePermissions.AccessWritable) == FilePermissions.AccessWritable));
}
}
@@ -89,7 +89,7 @@
public override string DisplayName {
get {
- return Path.GetFileName (filename);
+ return uri.ExtractShortName ();
}
}
@@ -107,13 +107,13 @@
public override string LongDisplayName {
get {
- return Path.GetFullPath (filename);
+ return uri.ToString ();
}
}
public string MimeType {
get {
- return mimetype;
+ return uri.MimeType.Name;
}
}
Modified: branches/MonoDevelop-plan-43/src/Node/node.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Node/node.build 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/src/Node/node.build 2004-08-11 11:31:15 UTC (rev 1930)
@@ -16,8 +16,13 @@
</csc>
<!-- install the plugin file -->
- <copy file="node.plugin.in" tofile="node.plugin"/>
- <replaceregex match="@assembly@" replace="${assemblyfile}" file="node.plugin" byline="true" />
+ <copy file="node.plugin.in" tofile="node.plugin">
+ <filterchain>
+ <replacetokens>
+ <token key="assembly" value="${assemblyfile}"/>
+ </replacetokens>
+ </filterchain>
+ </copy>
<move file="node.plugin" todir="${plugin.dir}"/>
</target>
</project>
Modified: branches/MonoDevelop-plan-43/src/Workbench/workbench.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Workbench/workbench.build 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/src/Workbench/workbench.build 2004-08-11 11:31:15 UTC (rev 1930)
@@ -16,8 +16,13 @@
</csc>
<!-- install the plugin file -->
- <copy file="workbench.plugin.in" tofile="workbench.plugin"/>
- <replaceregex match="@assembly@" replace="${assemblyfile}" file="workbench.plugin" byline="true" />
+ <copy file="workbench.plugin.in" tofile="workbench.plugin">
+ <filterchain>
+ <replacetokens>
+ <token key="assembly" value="${assemblyfile}"/>
+ </replacetokens>
+ </filterchain>
+ </copy>
<move file="workbench.plugin" todir="${plugin.dir}"/>
<!-- install the ui file -->
Modified: branches/MonoDevelop-plan-43/src/plugins.build
===================================================================
--- branches/MonoDevelop-plan-43/src/plugins.build 2004-08-10 05:09:51 UTC (rev 1929)
+++ branches/MonoDevelop-plan-43/src/plugins.build 2004-08-11 11:31:15 UTC (rev 1930)
@@ -17,6 +17,12 @@
<property name="gnome-vfs-sharp.libs" value="${pkg-config::get-link-flags('gnome-vfs-sharp-2.0')}"/>
</if>
</if>
+ <!-- check for gnome-sharp -->
+ <if test="${pkg-config::exists('gnome-sharp-2.0')}">
+ <if test="${pkg-config::is-atleast-version('gnome-sharp-2.0', '1.2.99')}">
+ <property name="gnome-sharp.libs" value="${pkg-config::get-link-flags('gnome-sharp-2.0')}"/>
+ </if>
+ </if>
<!-- check for gtksourceview-sharp -->
<if test="${pkg-config::exists('gtksourceview-sharp')}">
<if test="${pkg-config::is-atleast-version('gtksourceview-sharp', '0.3')}">
@@ -33,6 +39,10 @@
<call target="dependencies"/>
<fail message="gnome-vfs-sharp dependency not found"/>
</if>
+ <if test="${not(property::exists('gnome-sharp.libs'))}">
+ <call target="dependencies"/>
+ <fail message="gnome-sharp dependency not found"/>
+ </if>
<if test="${not(property::exists('gtksourceview-sharp.libs'))}">
<call target="dependencies"/>
<fail message="gtksourceview-sharp dependency not found"/>
More information about the Monodevelop-patches-list
mailing list