Группа :: Разработка/Прочее
Пакет: monodevelop
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: monodevelop-0.19-alt-use-system-cecil.patch
Скачать
Скачать
diff -ur monodevelop-0.19/configure.in monodevelop-0.19.new/configure.in
--- monodevelop-0.19/configure.in 2008-01-30 06:52:39 +0300
+++ monodevelop-0.19.new/configure.in 2008-02-25 20:05:50 +0300
@@ -296,8 +296,6 @@
build/data/resources/css/Makefile
build/data/resources/Makefile
build/Makefile
-contrib/Makefile
-contrib/Mono.Cecil/Makefile
src/Makefile
src/core/Makefile
src/core/NRefactory/Makefile
diff -ur monodevelop-0.19/Makefile.am monodevelop-0.19.new/Makefile.am
--- monodevelop-0.19/Makefile.am 2008-01-30 06:52:39 +0300
+++ monodevelop-0.19.new/Makefile.am 2008-02-25 20:21:54 +0300
@@ -1,4 +1,4 @@
-SUBDIRS = contrib src build po man theme-icons
+SUBDIRS = src build po man theme-icons
bin_SCRIPTS = monodevelop mdtool
diff -ur monodevelop-0.19/Makefile.in monodevelop-0.19.new/Makefile.in
--- monodevelop-0.19/Makefile.in 2008-02-07 03:31:53 +0300
+++ monodevelop-0.19.new/Makefile.in 2008-02-25 20:06:16 +0300
@@ -206,7 +206,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = contrib src build po man theme-icons
+SUBDIRS = src build po man theme-icons
bin_SCRIPTS = monodevelop mdtool
desktopdir = $(datadir)/applications
desktop_DATA = monodevelop.desktop
diff -ur monodevelop-0.19/monodevelop.pc.in monodevelop-0.19.new/monodevelop.pc.in
--- monodevelop-0.19/monodevelop.pc.in 2008-01-30 06:52:39 +0300
+++ monodevelop-0.19.new/monodevelop.pc.in 2008-02-25 20:07:17 +0300
@@ -5,4 +5,4 @@
Name: MonoDevelop
Description: Free .NET Development Environment
Version: @VERSION@
-Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll -r:${libdir}/bin/Mono.Cecil.dll
+Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll -r:Mono.Cecil.dll
diff -ur monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am monodevelop-0.19.new/src/addins/MonoDevelop.GtkCore/lib/Makefile.am
--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am 2008-01-30 06:51:14 +0300
+++ monodevelop-0.19.new/src/addins/MonoDevelop.GtkCore/lib/Makefile.am 2008-02-25 20:08:23 +0300
@@ -58,7 +58,7 @@
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-r:$(libstetic) \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ -r:Mono.Cecil.dll \
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
diff -ur monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in monodevelop-0.19.new/src/addins/MonoDevelop.GtkCore/lib/Makefile.in
--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in 2008-02-07 03:31:51 +0300
+++ monodevelop-0.19.new/src/addins/MonoDevelop.GtkCore/lib/Makefile.in 2008-02-25 20:08:59 +0300
@@ -209,7 +209,7 @@
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-r:$(libstetic) \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ -r:Mono.Cecil.dll \
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
diff -ur monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am monodevelop-0.19.new/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am
--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am 2008-01-30 06:51:09 +0300
+++ monodevelop-0.19.new/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am 2008-02-25 20:14:51 +0300
@@ -5,7 +5,6 @@
ASSEMBLY_FILES = \
$(ASSEMBLY) \
$(ASSEMBLY_DIR)/libsteticui.dll.mdb \
- $(CECIL_DLL) \
$(DATA_FILE_BUILD)
pkglib_DATA = $(ASSEMBLY_FILES)
@@ -86,7 +85,7 @@
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-r:$(top_builddir)/bin/libstetic.dll \
- -r:$(top_srcdir)/libsteticui/lib/Mono.Cecil.dll \
+ -r:Mono.Cecil.dll \
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
@@ -94,7 +93,7 @@
libsteticui_dll_datafiles = libsteticui.dll.config
-all: $(ASSEMBLY) $(DATA_FILE_BUILD) $(CECIL_DLL)
+all: $(ASSEMBLY) $(DATA_FILE_BUILD)
RESOURCE_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_resources))
DATA_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_datafiles))
@@ -111,17 +110,9 @@
mkdir -p $(ASSEMBLY_DIR)
cp $(srcdir)/$(subst $(ASSEMBLY_DIR),$(srcdir),$@) $(ASSEMBLY_DIR)/.
-CECIL = Mono.Cecil.dll
-CECIL_DLL = $(ASSEMBLY_DIR)/$(CECIL)
-
-$(CECIL_DLL): $(srcdir)/lib/$(CECIL)
- mkdir -p $(ASSEMBLY_DIR)
- cp $(srcdir)/lib/$(CECIL) $(ASSEMBLY_DIR)/.
-
CLEANFILES = $(ASSEMBLY_FILES) sources.rsp
EXTRA_DIST = \
$(libsteticui_dll_sources) \
$(RESOURCE_FILES) \
- $(DATA_FILES) \
- $(srcdir)/lib/$(CECIL)
+ $(DATA_FILES)
diff -ur monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am monodevelop-0.19.new/src/addins/MonoDevelop.GtkCore/Makefile.am
--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am 2008-01-30 06:51:14 +0300
+++ monodevelop-0.19.new/src/addins/MonoDevelop.GtkCore/Makefile.am 2008-02-25 20:14:07 +0300
@@ -16,7 +16,7 @@
-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libsteticui.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ -r:Mono.Cecil.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff -ur monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in monodevelop-0.19.new/src/addins/MonoDevelop.GtkCore/Makefile.in
--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in 2008-02-07 03:31:51 +0300
+++ monodevelop-0.19.new/src/addins/MonoDevelop.GtkCore/Makefile.in 2008-02-25 20:14:15 +0300
@@ -198,7 +198,7 @@
-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libsteticui.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ -r:Mono.Cecil.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff -ur monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am monodevelop-0.19.new/src/core/MonoDevelop.Projects/Makefile.am
--- monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am 2008-01-30 06:51:37 +0300
+++ monodevelop-0.19.new/src/core/MonoDevelop.Projects/Makefile.am 2008-02-25 20:16:36 +0300
@@ -6,8 +6,8 @@
REFS = \
$(MONO_ADDINS_LIBS) \
$(MONODOC_LIBS) \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
+ -r:Mono.Cecil.dll \
+ -r:Mono.Cecil.Mdb.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:Mono.Posix \
-r:System \
diff -ur monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in monodevelop-0.19.new/src/core/MonoDevelop.Projects/Makefile.in
--- monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in 2008-02-07 03:31:52 +0300
+++ monodevelop-0.19.new/src/core/MonoDevelop.Projects/Makefile.in 2008-02-25 20:16:52 +0300
@@ -180,8 +180,8 @@
REFS = \
$(MONO_ADDINS_LIBS) \
$(MONODOC_LIBS) \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
+ -r:Mono.Cecil.dll \
+ -r:Mono.Cecil.Mdb.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:Mono.Posix \
-r:System \