Author: lluis
Date: 2007-05-04 09:40:39 -0400 (Fri, 04 May 2007)
New Revision: 76683
Added:
trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.exe.addins
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Startup/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Startup/Makefile.am
trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup.mdp
trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup/MonoDevelopMain.cs
Log:
* MonoDevelop.Startup.mdp, MonoDevelop.Startup/MonoDevelopMain.cs,
MonoDevelop.exe.addins, Makefile.am: Migration to Mono.Addins.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Startup/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Startup/ChangeLog 2007-05-04
13:40:27 UTC (rev 76682)
+++ trunk/monodevelop/Core/src/MonoDevelop.Startup/ChangeLog 2007-05-04
13:40:39 UTC (rev 76683)
@@ -1,3 +1,8 @@
+2007-05-04 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Startup.mdp, MonoDevelop.Startup/MonoDevelopMain.cs,
+ MonoDevelop.exe.addins, Makefile.am: Migration to Mono.Addins.
+
2007-04-26 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Startup.mdp: Don't copy referenced assemblies.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Startup/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Startup/Makefile.am 2007-05-04
13:40:27 UTC (rev 76682)
+++ trunk/monodevelop/Core/src/MonoDevelop.Startup/Makefile.am 2007-05-04
13:40:39 UTC (rev 76683)
@@ -10,7 +10,9 @@
all: $(ASSEMBLY) $(ASSEMBLY).config
-REFS = -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll
+REFS = \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:$(top_builddir)/contrib/Mono.Addins.dll
$(ASSEMBLY): $(build_sources) $(build_resources)
$(CSC) $(CSC_FLAGS) -out:$@ $(REFS) $(build_resources:%=/resource:%)
$(build_sources)
@@ -18,12 +20,15 @@
$(ASSEMBLY).config: $(ASSEMBLY) $(srcdir)/app.config
cp $(srcdir)/app.config $(ASSEMBLY).config
+$(ASSEMBLY).addins: $(ASSEMBLY) $(srcdir)/MonoDevelop.exe.addins
+ cp $(srcdir)/MonoDevelop.exe.addins $(ASSEMBLY).addins
+
assemblydir = $(MD_ASSEMBLY_DIR)
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config
+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config $(ASSEMBLY).addins
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-EXTRA_DIST = $(FILES) $(RES) app.config
+EXTRA_DIST = $(FILES) $(RES) app.config MonoDevelop.exe.addins
include $(top_srcdir)/Makefile.include
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup/MonoDevelopMain.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup/MonoDevelopMain.cs
2007-05-04 13:40:27 UTC (rev 76682)
+++
trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup/MonoDevelopMain.cs
2007-05-04 13:40:39 UTC (rev 76683)
@@ -2,7 +2,7 @@
using System;
using MonoDevelop.Core;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
namespace MonoDevelop.Startup
{
@@ -10,10 +10,11 @@
{
public static int Main (string[] args)
{
- Runtime.Initialize ();
- Runtime.AddInService.CheckAssemblyLoadConflicts = true;
+ Runtime.Initialize (true);
+
+ // AddinManager.CheckAssemblyLoadConflicts = true;
try {
- return Runtime.AddInService.StartApplication
("IDE", args);
+ return
Runtime.ApplicationService.StartApplication ("IDE", args);
} finally {
Runtime.Shutdown ();
}
Modified: trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup.mdp
2007-05-04 13:40:27 UTC (rev 76682)
+++ trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.Startup.mdp
2007-05-04 13:40:39 UTC (rev 76683)
@@ -22,9 +22,11 @@
<File name="./app.config" subtype="Code" buildaction="Nothing" />
<File name="./MonoDevelop.Startup/MonoDevelopMain.cs" subtype="Code"
buildaction="Compile" />
<File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
+ <File name="./MonoDevelop.exe.addins" subtype="Code"
buildaction="FileCopy" />
</Contents>
<References>
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Core" />
+ <ProjectReference type="Assembly" localcopy="True"
refto="../../../contrib/Mono.Addins.dll" />
</References>
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName=""
SyncReferences="True" IsAutotoolsProject="True"
RelativeConfigureInPath="../../../">
<ExcludedFiles>
Added: trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.exe.addins
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.exe.addins
2007-05-04 13:40:27 UTC (rev 76682)
+++ trunk/monodevelop/Core/src/MonoDevelop.Startup/MonoDevelop.exe.addins
2007-05-04 13:40:39 UTC (rev 76683)
@@ -0,0 +1,3 @@
+<Addins>
+ <Directory include-subdirs="true">../AddIns</Directory>
+</Addins>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
