← Back to branch summary

~ubuntu-branches/ubuntu/saucy/monodevelop/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/use_system_Mono.Debugger.Soft.patch

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2010-09-10 16:54:48 UTC
  • mfrom: (19.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20100910165448-0rybfk25zd4o9431
Tags: 2.4+dfsg-2
* debian/patches/inject_Mono.Debugger.Soft_source.patch,
  debian/patches/use_system_Mono.Debugger.Soft.patch,
  debian/control:
  + Build against system Soft Debugger, since we now have a new
    enough Mono to match MonoDevelop's required API

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/use_system_Mono.Debugger.Soft.patch
 
1
Index: monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Makefile.am
 
2
===================================================================
 
3
--- monodevelop.git.orig/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Makefile.am   2010-09-10 19:21:37.624328300 +0100
 
4
+++ monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Makefile.am        2010-09-10 19:48:06.716850531 +0100
 
5
@@ -2,16 +2,14 @@
 
6
 ASSEMBLY = $(ADDIN_BUILD)/Mono.Debugging.Soft.dll
 
7
 
 
8
 DBG_ASM = $(ADDIN_BUILD)/Mono.Debugger.Soft.dll
 
9
-DBG_ASM_SRC = $(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll
 
10
-DBG_MDB = $(DBG_ASM).mdb
 
11
-DBG_MDB_SRC = $(DBG_ASM_SRC).mdb
 
12
+DBG_ASM_SRC = /usr/lib/mono/2.0/Mono.Debugger.Soft.dll
 
13
 
 
14
 SIGNING_KEY=$(top_srcdir)/src/core/Mono.Debugging/mono.debugging.snk
 
15
 
 
16
 DEPS = $(top_builddir)/build/bin/Mono.Debugging.dll
 
17
 
 
18
 REFS =  \
 
19
-       -r:$(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll \
 
20
+       -r:$(DBG_ASM) \
 
21
        -r:System \
 
22
        -r:System.Core
 
23
 
 
24
@@ -32,7 +30,7 @@
 
25
 
 
26
 all: $(ASSEMBLY) $(ASSEMBLY).mdb $(DATA_FILE_BUILD) $(SIGNING_KEY)
 
27
 
 
28
-$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS) $(DBG_ASM) $(DBG_MDB)
 
29
+$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS) $(DBG_ASM)
 
30
        mkdir -p $(ADDIN_BUILD)
 
31
        $(CSC) $(CSC_FLAGS) -debug -out:$@ -keycontainer:$(SIGNING_KEY) -target:library $(REFS) $(build_deps) \
 
32
                $(build_resources:%=/resource:%) $(build_sources)
 
33
@@ -41,19 +39,15 @@
 
34
        mkdir -p $(ADDIN_BUILD)
 
35
        cp $^ $@ 
 
36
 
 
37
-$(DBG_MDB): $(DBG_MDB_SRC)
 
38
-       mkdir -p $(ADDIN_BUILD)
 
39
-       cp $^ $@
 
40
-
 
41
 $(ASSEMBLY).mdb: $(ASSEMBLY)
 
42
 
 
43
 check: all
 
44
 
 
45
 assemblydir = $(MD_ADDIN_DIR)/MonoDevelop.Debugger.Soft
 
46
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(DBG_ASM) $(DBG_MDB)
 
47
+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(DBG_ASM)
 
48
 
 
49
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(DBG_ASM) $(DBG_MDB)
 
50
-EXTRA_DIST = $(FILES) $(RES) $(DBG_ASM_SRC) $(DBG_MDB_SRC)
 
51
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(DBG_ASM)
 
52
+EXTRA_DIST = $(FILES) $(RES)
 
53
 
 
54
 include $(top_srcdir)/Makefile.include
 
55
 
 
56
Index: monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am
 
57
===================================================================
 
58
--- monodevelop.git.orig/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am      2010-09-10 19:21:37.594331820 +0100
 
59
+++ monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am   2010-09-10 19:48:06.726850824 +0100
 
60
@@ -14,7 +14,7 @@
 
61
 REFS =  \
 
62
        $(GLIB_SHARP_LIBS) \
 
63
        $(GTK_SHARP_LIBS) \
 
64
-       -r:$(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll \
 
65
+       -r:$(ADDIN_BUILD)/Mono.Debugger.Soft.dll \
 
66
        -r:System \
 
67
        -r:System.Core
 
68
 
 
69
Index: monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am
 
70
===================================================================
 
71
--- monodevelop.git.orig/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am   2010-09-10 19:21:37.574328440 +0100
 
72
+++ monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am        2010-09-10 19:48:06.736850838 +0100
 
73
@@ -14,7 +14,7 @@
 
74
 REFS =  \
 
75
        $(GLIB_SHARP_LIBS) \
 
76
        $(GTK_SHARP_LIBS) \
 
77
-       -r:$(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll \
 
78
+       -r:$(ADDIN_BUILD)/Mono.Debugger.Soft.dll \
 
79
        -r:System \
 
80
        -r:System.Core
 
81
 
 
82
Index: monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am
 
83
===================================================================
 
84
--- monodevelop.git.orig/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am     2010-09-10 19:48:32.926829600 +0100
 
85
+++ monodevelop.git/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am  2010-09-10 19:48:48.805040862 +0100
 
86
@@ -13,7 +13,7 @@
 
87
 REFS =  \
 
88
        $(GLIB_SHARP_LIBS) \
 
89
        $(GTK_SHARP_LIBS) \
 
90
-       -r:$(top_srcdir)/src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll \
 
91
+       -r:$(ADDIN_BUILD)/Mono.Debugger.Soft.dll \
 
92
        -r:System \
 
93
        -r:System.Core
 
94