Skip to content
This repository was archived by the owner on Nov 11, 2024. It is now read-only.

Commit 7fa59a8

Browse files
committed
Fix build after new debugger-libs submodule
We still need to use nuget restore since one project is still using packages.config. Also copy files from the correct location so the build works
1 parent 115b1d8 commit 7fa59a8

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

Makefile

+14-9
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ install: $(addprefix bin/, $(results))
134134
$(INSTALL) -m755 bin/Mono.Debugging.Soft.dll $(PREFIX)/lib/sdb
135135
$(INSTALL) -m755 bin/System.Collections.Immutable.dll $(PREFIX)/lib/sdb
136136
$(INSTALL) -m755 bin/System.Reflection.Metadata.dll $(PREFIX)/lib/sdb
137+
$(INSTALL) -m755 bin/Newtonsoft.Json.dll $(PREFIX)/lib/sdb
137138
$(INSTALL) -m755 bin/sdb.exe $(PREFIX)/lib/sdb
138139
$(INSTALL) -m755 bin/sdb.exe.config $(PREFIX)/lib/sdb
139140
$(INSTALL) -m755 -d $(PREFIX)/bin
@@ -153,6 +154,7 @@ uninstall:
153154
$(RM) $(PREFIX)/lib/sdb/Mono.Debugging.Soft.dll
154155
$(RM) $(PREFIX)/lib/sdb/System.Collections.Immutable.dll
155156
$(RM) $(PREFIX)/lib/sdb/System.Reflection.Metadata.dll
157+
$(RM) $(PREFIX)/lib/sdb/Newtonsoft.Json.dll
156158
$(RM) $(PREFIX)/lib/sdb/sdb.exe
157159
$(RM) $(PREFIX)/lib/sdb/sdb.exe.config
158160
$(RM) $(PREFIX)/bin/sdb
@@ -171,6 +173,7 @@ override deps = \
171173
Mono.Debugger.Soft.dll \
172174
System.Collections.Immutable.dll \
173175
System.Reflection.Metadata.dll \
176+
Newtonsoft.Json.dll \
174177
$(refs)
175178

176179
$(addprefix bin/, $(deps)):
@@ -180,24 +183,26 @@ $(addprefix bin/, $(deps)):
180183
bin/ICSharpCode.NRefactory.dll
181184
$(CP) dep/nrefactory/bin/$(MODE)/ICSharpCode.NRefactory.CSharp.dll \
182185
bin/ICSharpCode.NRefactory.CSharp.dll
183-
$(CP) dep/debugger-libs/packages/Microsoft.CodeAnalysis.Common.1.3.2/lib/net45/Microsoft.CodeAnalysis.dll \
186+
$(CP) dep/debugger-libs/Mono.Debugging.Soft/bin/$(MODE)/Microsoft.CodeAnalysis.dll \
184187
bin/Microsoft.CodeAnalysis.dll
185-
$(CP) dep/debugger-libs/packages/Microsoft.CodeAnalysis.CSharp.1.3.2/lib/net45/Microsoft.CodeAnalysis.CSharp.dll \
188+
$(CP) dep/debugger-libs/Mono.Debugging.Soft/bin/$(MODE)/Microsoft.CodeAnalysis.CSharp.dll \
186189
bin/Microsoft.CodeAnalysis.CSharp.dll
187-
$(CP) dep/debugger-libs/packages/Mono.Cecil.0.10.0-beta6/lib/net40/Mono.Cecil.dll \
190+
$(CP) dep/debugger-libs/Mono.Debugging.Soft/bin/$(MODE)/Mono.Cecil.dll \
188191
bin/Mono.Cecil.dll
189-
$(CP) dep/debugger-libs/packages/Mono.Cecil.0.10.0-beta6/lib/net40/Mono.Cecil.Mdb.dll \
192+
$(CP) dep/debugger-libs/Mono.Debugging.Soft/bin/$(MODE)/Mono.Cecil.Mdb.dll \
190193
bin/Mono.Cecil.Mdb.dll
191-
$(CP) dep/debugger-libs/Mono.Debugger.Soft/bin/Debug/Mono.Debugger.Soft.dll \
194+
$(CP) dep/debugger-libs/Mono.Debugger.Soft/bin/$(MODE)/Mono.Debugger.Soft.dll \
192195
bin/Mono.Debugger.Soft.dll
193-
$(CP) dep/debugger-libs/Mono.Debugging/bin/Debug/Mono.Debugging.dll \
196+
$(CP) dep/debugger-libs/Mono.Debugging/bin/$(MODE)/Mono.Debugging.dll \
194197
bin/Mono.Debugging.dll
195-
$(CP) dep/debugger-libs/Mono.Debugging.Soft/bin/Debug/Mono.Debugging.Soft.dll \
198+
$(CP) dep/debugger-libs/Mono.Debugging.Soft/bin/$(MODE)/Mono.Debugging.Soft.dll \
196199
bin/Mono.Debugging.Soft.dll
197-
$(CP) dep/debugger-libs/packages/System.Collections.Immutable.1.3.1/lib/netstandard1.0/System.Collections.Immutable.dll \
200+
$(CP) dep/debugger-libs/Mono.Debugging.Soft/bin/$(MODE)/System.Collections.Immutable.dll \
198201
bin/System.Collections.Immutable.dll
199-
$(CP) dep/debugger-libs/packages/System.Reflection.Metadata.1.4.2/lib/netstandard1.1/System.Reflection.Metadata.dll \
202+
$(CP) dep/debugger-libs/Mono.Debugging.Soft/bin/$(MODE)/System.Reflection.Metadata.dll \
200203
bin/System.Reflection.Metadata.dll
204+
$(CP) dep/debugger-libs/Mono.Debugging.Soft/bin/$(MODE)/Newtonsoft.Json.dll \
205+
bin/Newtonsoft.Json.dll
201206

202207
override srcs = \
203208
src/Options.cs \

0 commit comments

Comments
 (0)