Skip to content

Commit 71ad99f

Browse files
marek-safarmarek-safar
committed
[build] Narrow recursive dependencies
1 parent b3d6025 commit 71ad99f

21 files changed

Lines changed: 81 additions & 244 deletions

File tree

‎mcs/class/Makefile‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ basic_SUBDIRS := \
1414
Mono.Security \
1515
System \
1616
System.XML \
17+
System.Security \
1718
System.Core \
1819
System.ComponentModel.Composition.4.5 \
1920
System.Numerics \
@@ -31,6 +32,7 @@ build_SUBDIRS := \
3132
Mono.Security \
3233
System \
3334
System.XML \
35+
System.Security \
3436
Mono.Posix \
3537
System.Core \
3638
System.ComponentModel.Composition.4.5 \
@@ -57,8 +59,8 @@ mobile_common_dirs := \
5759
Mono.Security \
5860
System \
5961
System.Core \
60-
System.Security \
6162
System.XML \
63+
System.Security \
6264
I18N \
6365
System.ServiceModel.Internals \
6466
System.Runtime.Serialization \
@@ -154,10 +156,11 @@ xammac_4_5_dirs := \
154156
corlib \
155157
Mono.Security \
156158
System \
157-
Mono.Posix \
158-
System.Core \
159+
System.XML \
159160
System.Security \
160-
System.XML \
161+
Mono.Posix \
162+
System.Core \
163+
System.Configuration \
161164
I18N \
162165
System.ServiceModel.Internals \
163166
SMDiagnostics \
@@ -204,10 +207,10 @@ net_4_x_dirs := \
204207
Mono.Security \
205208
System \
206209
System.XML \
210+
System.Security \
207211
Mono.CompilerServices.SymbolWriter \
208212
Mono.Posix \
209213
System.Core \
210-
System.Security \
211214
System.Configuration \
212215
System.Drawing \
213216
System.IO.Compression \
@@ -227,9 +230,9 @@ net_4_x_dirs := \
227230
System.Web.ApplicationServices \
228231
Novell.Directory.Ldap \
229232
System.DirectoryServices \
230-
System.Web \
231-
System.Web.Services \
232233
System.Design \
234+
System.Web.Services \
235+
System.Web \
233236
System.Runtime.Remoting \
234237
System.Configuration.Install \
235238
System.Management \

‎mcs/class/Mono.CompilerServices.SymbolWriter/Makefile‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,3 @@ LIBRARY_COMPILE = $(BOOT_COMPILE)
1818
endif
1919

2020
include ../../build/library.make
21-
22-
$(build_lib): $(bare_libdir)/System.dll
23-
24-
$(bare_libdir)/System.dll:
25-
(cd ../System; make $@)
26-
27-
.NOTPARALLEL: $(bare_libdir)/System.dll

‎mcs/class/System.Configuration/Makefile‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include ../../build/rules.make
66
LIBRARY = System.Configuration.dll
77

88
LOCAL_MCS_FLAGS =
9-
LIB_REFS = secxml/System bare/System.Xml System.Security
9+
LIB_REFS = System.Security System System.Xml
1010
KEYFILE = ../msfinal.pub
1111
LIB_MCS_FLAGS = -nowarn:618
1212
TEST_MCS_FLAGS =
@@ -16,27 +16,8 @@ LIBRARY_WARN_AS_ERROR = yes
1616

1717
include ../../build/library.make
1818

19-
configuration_library_deps = \
20-
$(secxml_libdir)/System.dll \
21-
$(the_libdir_base)System.Security.dll \
22-
$(bare_libdir)/System.Xml.dll
23-
24-
$(build_lib): $(configuration_library_deps)
25-
2619
test-local:
2720
cp Test/appSettings.config $(dir $(NUNITLITE_CONFIG_FILE))/Test-appSettings.config
2821

29-
.NOTPARALLEL: $(configuration_library_deps)
30-
31-
$(secxml_libdir)/System.dll:
32-
@echo System.Configuration: GETTING: $@
33-
(cd ../System; $(MAKE) $@)
34-
35-
$(the_libdir_base)System.Security.dll:
36-
(cd ../System.Security; $(MAKE) $@)
37-
38-
$(bare_libdir)/System.Xml.dll:
39-
(cd ../System.XML; $(MAKE) $@)
40-
4122
run-test:
4223
$(MAKE) -C Test/standalone

‎mcs/class/System.Design/Makefile‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,12 @@ include ../../build/rules.make
44

55
LIBRARY = System.Design.dll
66

7-
LIB_REFS = System System.Xml plainweb/System.Web System.Windows.Forms System.Drawing Accessibility System.Data System.Configuration
7+
LIB_REFS = System System.Xml System.Windows.Forms System.Drawing Accessibility System.Data System.Configuration
88
KEYFILE = ../msfinal.pub
99
LIB_MCS_FLAGS = -nowarn:436 -nowarn:612,618,649,67,672
10+
API_BIN_REFS := System.Web
1011

1112
TEST_LIB_REFS = System System.Drawing System.Windows.Forms
1213
TEST_MCS_FLAGS =
1314

1415
include ../../build/library.make
15-
16-
ifneq (plaindesign/,$(intermediate))
17-
csproj-local:
18-
$(MAKE) csproj-local intermediate=plaindesign/
19-
20-
$(the_libdir_base)plaindesign/System.Design.dll:
21-
$(MAKE) intermediate=plaindesign/ $(the_libdir_base)plaindesign/System.Design.dll
22-
23-
endif
24-

‎mcs/class/System.Security/Makefile‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ endif
99

1010
LIBRARY = System.Security.dll
1111
API_BIN_REFS := System.Numerics
12-
LIB_REFS = secxml/System bare/System.Xml $(MONO_SECURITY)
12+
LIB_REFS = $(MONO_SECURITY) System System.Xml
1313
KEYFILE = ../msfinal.pub
1414
LIB_MCS_FLAGS = \
1515
-nowarn:414,618 \
@@ -31,12 +31,9 @@ RESX_RESOURCE_STRING = ../../../external/corefx/src/System.Security.Cryptography
3131

3232
include ../../build/library.make
3333

34-
$(build_lib): $(secxml_libdir)/System.dll $(MONO_SECURITY_DLL)
35-
36-
$(secxml_libdir)/System.dll:
37-
(cd ../System; $(MAKE) $@)
34+
$(build_lib): $(MONO_SECURITY_DLL)
3835

3936
$(the_libdir_base)/Mono.Security.dll:
4037
(cd ../Mono.Security; $(MAKE))
4138

42-
.NOTPARALLEL: $(secxml_libdir)/System.dll $(bare_libdir)/Mono.Security.dll
39+
.NOTPARALLEL: $(bare_libdir)/Mono.Security.dll

‎mcs/class/System.ServiceModel.Activation/Makefile‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,11 @@ include ../../build/rules.make
44

55
LIBRARY = System.ServiceModel.Activation.dll
66

7-
LIB_REFS = System.Core System plainservice/System.ServiceModel
7+
LIB_REFS = System.Core System System.ServiceModel
88
KEYFILE = ../winfx.pub
99
LIB_MCS_FLAGS =
1010

1111
TEST_MCS_FLAGS =
1212
TEST_LIB_REFS = System System.Core
1313

14-
servicemodel = $(the_libdir_base)plainservice/System.ServiceModel.dll
15-
1614
include ../../build/library.make
17-
18-
$(the_libdir_base)$(LIBRARY): $(servicemodel)
19-
20-
$(servicemodel):
21-
(cd ../System.ServiceModel; $(MAKE) $@)
22-
23-
.NOTPARALLEL: $(servicemodel)

‎mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.dll.sources‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
../../build/common/MonoTODOAttribute.cs
33
Assembly/AssemblyInfo.cs
44

5-
../System.ServiceModel/System.ServiceModel/ServiceHostingEnvironment.cs
5+
System.ServiceModel/ServiceHostingEnvironment.cs
66
../System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs

‎mcs/class/System.ServiceModel.Activation/System.ServiceModel/ServiceHostingEnvironment.cs‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
//
2+
// ServiceHostingEnvironment.cs
3+
//
4+
// Author:
5+
// Ankit Jain <[email protected]>
6+
//
7+
// Copyright (C) 2006 Novell, Inc. http://www.novell.com
8+
//
9+
// Permission is hereby granted, free of charge, to any person obtaining
10+
// a copy of this software and associated documentation files (the
11+
// "Software"), to deal in the Software without restriction, including
12+
// without limitation the rights to use, copy, modify, merge, publish,
13+
// distribute, sublicense, and/or sell copies of the Software, and to
14+
// permit persons to whom the Software is furnished to do so, subject to
15+
// the following conditions:
16+
//
17+
// The above copyright notice and this permission notice shall be
18+
// included in all copies or substantial portions of the Software.
19+
//
20+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
21+
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
22+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
23+
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
24+
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
25+
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
26+
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
27+
//
28+
29+
namespace System.ServiceModel {
30+
31+
[System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblySystemServiceModel_3_0)]
32+
public static class ServiceHostingEnvironment
33+
{
34+
public static bool AspNetCompatibilityEnabled { get; internal set; }
35+
36+
public static void EnsureServiceAvailable (string virtualPath)
37+
{
38+
}
39+
}
40+
}

‎mcs/class/System.ServiceModel.Internals/Makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ endif
88

99
LIBRARY = System.ServiceModel.Internals.dll
1010
LIB_REFS = System System.Core System.Xml
11-
ifneq (2.1, $(FRAMEWORK_VERSION))
12-
LIB_REFS += System.Configuration
13-
endif
1411
LIB_MCS_FLAGS = /unsafe $(REFERENCE_SOURCES_FLAGS)
1512

1613
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)

‎mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,12 @@
7575
[assembly: InternalsVisibleTo ("System.ServiceModel.Discovery, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] // AnnouncementChannelEndpointElementCollection requires it.
7676
#endif
7777

78-
#if HAS_ACTIVATION
79-
78+
#if SERVICEMODEL_ACTIVATION_DEPENDENCY
8079
[assembly: TypeForwardedTo (typeof (System.ServiceModel.ServiceHostingEnvironment))]
8180
[assembly: TypeForwardedTo (typeof (System.ServiceModel.Activation.ServiceHostFactory))]
82-
8381
#endif
8482

8583
#if !MOBILE
86-
8784
[assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.BinarySecretKeyIdentifierClause))]
8885
[assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.KeyNameIdentifierClause))]
8986
[assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.SecurityContextKeyIdentifierClause))]

0 commit comments

Comments
 (0)