[Monodevelop-patches-list] r1934 - in branches/MonoDevelop-plan-43: . src/Core src/Libraries/Gdl src/Plugins/Content src/Plugins/Editor src/Plugins/Node src/Plugins/Workbench
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Fri Aug 13 11:16:15 EDT 2004
Author: jzwart
Date: 2004-08-13 11:16:15 -0400 (Fri, 13 Aug 2004)
New Revision: 1934
Added:
branches/MonoDevelop-plan-43/src/Core/monodevelop.in
Modified:
branches/MonoDevelop-plan-43/
branches/MonoDevelop-plan-43/ChangeLog
branches/MonoDevelop-plan-43/src/Core/core.build
branches/MonoDevelop-plan-43/src/Libraries/Gdl/Stock.cs
branches/MonoDevelop-plan-43/src/Libraries/Gdl/gdl.build
branches/MonoDevelop-plan-43/src/Plugins/Content/content.build
branches/MonoDevelop-plan-43/src/Plugins/Editor/editor.build
branches/MonoDevelop-plan-43/src/Plugins/Node/node.build
branches/MonoDevelop-plan-43/src/Plugins/Workbench/workbench.build
Log:
2004-08-13 Jeroen Zwartepoorte <jeroen at xs4all.nl>
* **/*.build: don't hardcode the paths to the dependencies.
* src/Core/core.build: install the monodevelop script.
* src/Core/monodevelop.in: script for starting monodevelop with the
correct MONO_PATH etc.
* src/Libraries/Gdl/gdl.build: include the png's as resources.
* src/Libraries/Gdl/Stock.cs: use the resources which are part of the
assembly, don't load the png's by file.
These changes allow you to build and run MD fully now. Atm the only
hard dependency is nant for building MD. Log4net assembly is included
in SVN for ease-of-use.
Property changes on: branches/MonoDevelop-plan-43
___________________________________________________________________
Name: svn:ignore
+ build
Modified: branches/MonoDevelop-plan-43/ChangeLog
===================================================================
--- branches/MonoDevelop-plan-43/ChangeLog 2004-08-11 14:22:25 UTC (rev 1933)
+++ branches/MonoDevelop-plan-43/ChangeLog 2004-08-13 15:16:15 UTC (rev 1934)
@@ -1,3 +1,17 @@
+2004-08-13 Jeroen Zwartepoorte <jeroen at xs4all.nl>
+
+ * **/*.build: don't hardcode the paths to the dependencies.
+ * src/Core/core.build: install the monodevelop script.
+ * src/Core/monodevelop.in: script for starting monodevelop with the
+ correct MONO_PATH etc.
+ * src/Libraries/Gdl/gdl.build: include the png's as resources.
+ * src/Libraries/Gdl/Stock.cs: use the resources which are part of the
+ assembly, don't load the png's by file.
+
+ These changes allow you to build and run MD fully now. Atm the only
+ hard dependency is nant for building MD. Log4net assembly is included
+ in SVN for ease-of-use.
+
2004-08-11 Jeroen Zwartepoorte <jeroen at xs4all.nl>
* lib/log4net.dll: include a compiled log4net assembly for ease of use.
Modified: branches/MonoDevelop-plan-43/src/Core/core.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Core/core.build 2004-08-11 14:22:25 UTC (rev 1933)
+++ branches/MonoDevelop-plan-43/src/Core/core.build 2004-08-13 15:16:15 UTC (rev 1934)
@@ -6,8 +6,7 @@
<sources>
<include name="*.cs"/>
</sources>
- <!-- FIXME: use $prefix/lib? -->
- <references basedir="/usr/lib">
+ <references basedir="${path::combine(basedir, 'lib')}">
<include name="log4net.dll"/>
</references>
</csc>
@@ -22,5 +21,19 @@
</filterchain>
</copy>
<move file="monodevelop.exe.config" todir="${bin.dir}"/>
+
+ <!-- install the monodevelop script -->
+ <copy file="monodevelop.in" tofile="monodevelop">
+ <filterchain encoding="ASCII">
+ <replacetokens>
+ <token key="bindir" value="${bin.dir}"/>
+ <token key="libdir" value="${lib.dir}"/>
+ <token key="monodir" value="${path::combine(pkg-config::get-variable('mono', 'prefix'), 'bin')}"/>
+ </replacetokens>
+ </filterchain>
+ </copy>
+ <!-- work around shortcoming of NAnt: no <chmod> task available atm -->
+ <exec program="chmod" commandline="a+x monodevelop"/>
+ <move file="monodevelop" todir="${bin.dir}"/>
</target>
</project>
Added: branches/MonoDevelop-plan-43/src/Core/monodevelop.in
===================================================================
--- branches/MonoDevelop-plan-43/src/Core/monodevelop.in 2004-08-11 14:22:25 UTC (rev 1933)
+++ branches/MonoDevelop-plan-43/src/Core/monodevelop.in 2004-08-13 15:16:15 UTC (rev 1934)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+MONO_PATH=@libdir@
+export MONO_PATH
+
+ at monodir@/mono @bindir@/monodevelop.exe "$@"
Property changes on: branches/MonoDevelop-plan-43/src/Core/monodevelop.in
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/MonoDevelop-plan-43/src/Libraries/Gdl/Stock.cs
===================================================================
--- branches/MonoDevelop-plan-43/src/Libraries/Gdl/Stock.cs 2004-08-11 14:22:25 UTC (rev 1933)
+++ branches/MonoDevelop-plan-43/src/Libraries/Gdl/Stock.cs 2004-08-13 15:16:15 UTC (rev 1934)
@@ -1,10 +1,10 @@
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using Gtk;
+
namespace Gdl {
-
- using System;
- using System.Collections;
- using System.Runtime.InteropServices;
- using Gtk;
-
public class Stock {
static Gtk.IconFactory stock = new Gtk.IconFactory ();
@@ -33,8 +33,10 @@
Gtk.IconSet iconset = stock.Lookup (stockid);
if (iconset == null) {
+ Assembly assembly = System.Reflection.Assembly.GetCallingAssembly ();
+ System.IO.Stream stream = assembly.GetManifestResourceStream (file);
iconset = new Gtk.IconSet ();
- Gdk.Pixbuf img = new Gdk.Pixbuf (file);
+ Gdk.Pixbuf img = new Gdk.Pixbuf (stream);
IconSource source = new IconSource ();
source.Size = Gtk.IconSize.Menu;
source.SizeWildcarded = false;
Modified: branches/MonoDevelop-plan-43/src/Libraries/Gdl/gdl.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Libraries/Gdl/gdl.build 2004-08-11 14:22:25 UTC (rev 1933)
+++ branches/MonoDevelop-plan-43/src/Libraries/Gdl/gdl.build 2004-08-13 15:16:15 UTC (rev 1934)
@@ -6,7 +6,10 @@
<sources>
<include name="*.cs"/>
<exclude name="GdlDockTest.cs"/>
- </sources>
+ </sources>
+ <resources dynamicprefix="true" prefix="">
+ <include name="*.png"/>
+ </resources>
</csc>
</target>
</project>
Modified: branches/MonoDevelop-plan-43/src/Plugins/Content/content.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Content/content.build 2004-08-11 14:22:25 UTC (rev 1933)
+++ branches/MonoDevelop-plan-43/src/Plugins/Content/content.build 2004-08-13 15:16:15 UTC (rev 1934)
@@ -9,12 +9,12 @@
<sources>
<include name="*.cs"/>
</sources>
- <references basedir="${build.dir}">
- <include name="bin/monodevelop.exe"/>
- <include name="lib/gdl-sharp.dll"/>
- <include name="lib/log4net.dll"/>
- <include name="lib/monodevelop/node.dll"/>
- <include name="lib/monodevelop/workbench.dll"/>
+ <references>
+ <include name="${bin.dir}/monodevelop.exe"/>
+ <include name="${lib.dir}/gdl-sharp.dll"/>
+ <include name="${lib.dir}/log4net.dll"/>
+ <include name="${plugin.dir}/node.dll"/>
+ <include name="${plugin.dir}/workbench.dll"/>
</references>
</csc>
Modified: branches/MonoDevelop-plan-43/src/Plugins/Editor/editor.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Editor/editor.build 2004-08-11 14:22:25 UTC (rev 1933)
+++ branches/MonoDevelop-plan-43/src/Plugins/Editor/editor.build 2004-08-13 15:16:15 UTC (rev 1934)
@@ -8,13 +8,13 @@
<sources>
<include name="*.cs"/>
</sources>
- <references basedir="${build.dir}">
- <include name="bin/monodevelop.exe"/>
- <include name="lib/gdl-sharp.dll"/>
- <include name="lib/log4net.dll"/>
- <include name="lib/monodevelop/content.dll"/>
- <include name="lib/monodevelop/node.dll"/>
- <include name="lib/monodevelop/workbench.dll"/>
+ <references>
+ <include name="${bin.dir}/monodevelop.exe"/>
+ <include name="${lib.dir}/gdl-sharp.dll"/>
+ <include name="${lib.dir}/log4net.dll"/>
+ <include name="${plugin.dir}/content.dll"/>
+ <include name="${plugin.dir}/node.dll"/>
+ <include name="${plugin.dir}/workbench.dll"/>
</references>
</csc>
Modified: branches/MonoDevelop-plan-43/src/Plugins/Node/node.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Node/node.build 2004-08-11 14:22:25 UTC (rev 1933)
+++ branches/MonoDevelop-plan-43/src/Plugins/Node/node.build 2004-08-13 15:16:15 UTC (rev 1934)
@@ -9,9 +9,9 @@
<sources>
<include name="*.cs"/>
</sources>
- <references basedir="${build.dir}">
- <include name="lib/log4net.dll"/>
- <include name="bin/monodevelop.exe"/>
+ <references>
+ <include name="${bin.dir}/monodevelop.exe"/>
+ <include name="${lib.dir}/log4net.dll"/>
</references>
</csc>
Modified: branches/MonoDevelop-plan-43/src/Plugins/Workbench/workbench.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Workbench/workbench.build 2004-08-11 14:22:25 UTC (rev 1933)
+++ branches/MonoDevelop-plan-43/src/Plugins/Workbench/workbench.build 2004-08-13 15:16:15 UTC (rev 1934)
@@ -8,10 +8,10 @@
<sources>
<include name="*.cs"/>
</sources>
- <references basedir="${build.dir}">
- <include name="lib/gdl-sharp.dll"/>
- <include name="lib/log4net.dll"/>
- <include name="bin/monodevelop.exe"/>
+ <references>
+ <include name="${bin.dir}/monodevelop.exe"/>
+ <include name="${lib.dir}/gdl-sharp.dll"/>
+ <include name="${lib.dir}/log4net.dll"/>
</references>
</csc>
More information about the Monodevelop-patches-list
mailing list