diff options
Diffstat (limited to 'mcs/class')
21 files changed, 81 insertions, 244 deletions
diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 13d7aae2873..ff3d8df240e 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -14,6 +14,7 @@ basic_SUBDIRS := \ Mono.Security \ System \ System.XML \ + System.Security \ System.Core \ System.ComponentModel.Composition.4.5 \ System.Numerics \ @@ -31,6 +32,7 @@ build_SUBDIRS := \ Mono.Security \ System \ System.XML \ + System.Security \ Mono.Posix \ System.Core \ System.ComponentModel.Composition.4.5 \ @@ -57,8 +59,8 @@ mobile_common_dirs := \ Mono.Security \ System \ System.Core \ - System.Security \ System.XML \ + System.Security \ I18N \ System.ServiceModel.Internals \ System.Runtime.Serialization \ @@ -154,10 +156,11 @@ xammac_4_5_dirs := \ corlib \ Mono.Security \ System \ - Mono.Posix \ - System.Core \ + System.XML \ System.Security \ - System.XML \ + Mono.Posix \ + System.Core \ + System.Configuration \ I18N \ System.ServiceModel.Internals \ SMDiagnostics \ @@ -204,10 +207,10 @@ net_4_x_dirs := \ Mono.Security \ System \ System.XML \ + System.Security \ Mono.CompilerServices.SymbolWriter \ Mono.Posix \ System.Core \ - System.Security \ System.Configuration \ System.Drawing \ System.IO.Compression \ @@ -227,9 +230,9 @@ net_4_x_dirs := \ System.Web.ApplicationServices \ Novell.Directory.Ldap \ System.DirectoryServices \ - System.Web \ - System.Web.Services \ System.Design \ + System.Web.Services \ + System.Web \ System.Runtime.Remoting \ System.Configuration.Install \ System.Management \ diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile b/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile index 0c116da9d19..3f46ca4c085 100644 --- a/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile +++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile @@ -18,10 +18,3 @@ LIBRARY_COMPILE = $(BOOT_COMPILE) endif include ../../build/library.make - -$(build_lib): $(bare_libdir)/System.dll - -$(bare_libdir)/System.dll: - (cd ../System; make $@) - -.NOTPARALLEL: $(bare_libdir)/System.dll diff --git a/mcs/class/System.Configuration/Makefile b/mcs/class/System.Configuration/Makefile index e59076d70da..6e948af0a28 100644 --- a/mcs/class/System.Configuration/Makefile +++ b/mcs/class/System.Configuration/Makefile @@ -6,7 +6,7 @@ include ../../build/rules.make LIBRARY = System.Configuration.dll LOCAL_MCS_FLAGS = -LIB_REFS = secxml/System bare/System.Xml System.Security +LIB_REFS = System.Security System System.Xml KEYFILE = ../msfinal.pub LIB_MCS_FLAGS = -nowarn:618 TEST_MCS_FLAGS = @@ -16,27 +16,8 @@ LIBRARY_WARN_AS_ERROR = yes include ../../build/library.make -configuration_library_deps = \ - $(secxml_libdir)/System.dll \ - $(the_libdir_base)System.Security.dll \ - $(bare_libdir)/System.Xml.dll - -$(build_lib): $(configuration_library_deps) - test-local: cp Test/appSettings.config $(dir $(NUNITLITE_CONFIG_FILE))/Test-appSettings.config -.NOTPARALLEL: $(configuration_library_deps) - -$(secxml_libdir)/System.dll: - @echo System.Configuration: GETTING: $@ - (cd ../System; $(MAKE) $@) - -$(the_libdir_base)System.Security.dll: - (cd ../System.Security; $(MAKE) $@) - -$(bare_libdir)/System.Xml.dll: - (cd ../System.XML; $(MAKE) $@) - run-test: $(MAKE) -C Test/standalone diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile index 4ff4c5e8c4f..08aaa81de86 100644 --- a/mcs/class/System.Design/Makefile +++ b/mcs/class/System.Design/Makefile @@ -4,21 +4,12 @@ include ../../build/rules.make LIBRARY = System.Design.dll -LIB_REFS = System System.Xml plainweb/System.Web System.Windows.Forms System.Drawing Accessibility System.Data System.Configuration +LIB_REFS = System System.Xml System.Windows.Forms System.Drawing Accessibility System.Data System.Configuration KEYFILE = ../msfinal.pub LIB_MCS_FLAGS = -nowarn:436 -nowarn:612,618,649,67,672 +API_BIN_REFS := System.Web TEST_LIB_REFS = System System.Drawing System.Windows.Forms TEST_MCS_FLAGS = include ../../build/library.make - -ifneq (plaindesign/,$(intermediate)) -csproj-local: - $(MAKE) csproj-local intermediate=plaindesign/ - -$(the_libdir_base)plaindesign/System.Design.dll: - $(MAKE) intermediate=plaindesign/ $(the_libdir_base)plaindesign/System.Design.dll - -endif - diff --git a/mcs/class/System.Security/Makefile b/mcs/class/System.Security/Makefile index 04a3bea4d1e..c4baa98c30d 100644 --- a/mcs/class/System.Security/Makefile +++ b/mcs/class/System.Security/Makefile @@ -9,7 +9,7 @@ endif LIBRARY = System.Security.dll API_BIN_REFS := System.Numerics -LIB_REFS = secxml/System bare/System.Xml $(MONO_SECURITY) +LIB_REFS = $(MONO_SECURITY) System System.Xml KEYFILE = ../msfinal.pub LIB_MCS_FLAGS = \ -nowarn:414,618 \ @@ -31,12 +31,9 @@ RESX_RESOURCE_STRING = ../../../external/corefx/src/System.Security.Cryptography include ../../build/library.make -$(build_lib): $(secxml_libdir)/System.dll $(MONO_SECURITY_DLL) - -$(secxml_libdir)/System.dll: - (cd ../System; $(MAKE) $@) +$(build_lib): $(MONO_SECURITY_DLL) $(the_libdir_base)/Mono.Security.dll: (cd ../Mono.Security; $(MAKE)) -.NOTPARALLEL: $(secxml_libdir)/System.dll $(bare_libdir)/Mono.Security.dll +.NOTPARALLEL: $(bare_libdir)/Mono.Security.dll diff --git a/mcs/class/System.ServiceModel.Activation/Makefile b/mcs/class/System.ServiceModel.Activation/Makefile index e8c0e953fd2..26249a02ac8 100644 --- a/mcs/class/System.ServiceModel.Activation/Makefile +++ b/mcs/class/System.ServiceModel.Activation/Makefile @@ -4,20 +4,11 @@ include ../../build/rules.make LIBRARY = System.ServiceModel.Activation.dll -LIB_REFS = System.Core System plainservice/System.ServiceModel +LIB_REFS = System.Core System System.ServiceModel KEYFILE = ../winfx.pub LIB_MCS_FLAGS = TEST_MCS_FLAGS = TEST_LIB_REFS = System System.Core -servicemodel = $(the_libdir_base)plainservice/System.ServiceModel.dll - include ../../build/library.make - -$(the_libdir_base)$(LIBRARY): $(servicemodel) - -$(servicemodel): - (cd ../System.ServiceModel; $(MAKE) $@) - -.NOTPARALLEL: $(servicemodel) diff --git a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.dll.sources b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.dll.sources index 1d17a9ee4a4..2399d041586 100644 --- a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.dll.sources +++ b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.dll.sources @@ -2,5 +2,5 @@ ../../build/common/MonoTODOAttribute.cs Assembly/AssemblyInfo.cs -../System.ServiceModel/System.ServiceModel/ServiceHostingEnvironment.cs +System.ServiceModel/ServiceHostingEnvironment.cs ../System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs diff --git a/mcs/class/System.ServiceModel.Activation/System.ServiceModel/ServiceHostingEnvironment.cs b/mcs/class/System.ServiceModel.Activation/System.ServiceModel/ServiceHostingEnvironment.cs new file mode 100644 index 00000000000..504bf354646 --- /dev/null +++ b/mcs/class/System.ServiceModel.Activation/System.ServiceModel/ServiceHostingEnvironment.cs @@ -0,0 +1,40 @@ +// +// ServiceHostingEnvironment.cs +// +// Author: +// Ankit Jain <jankit@novell.com> +// +// Copyright (C) 2006 Novell, Inc. http://www.novell.com +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +namespace System.ServiceModel { + + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblySystemServiceModel_3_0)] + public static class ServiceHostingEnvironment + { + public static bool AspNetCompatibilityEnabled { get; internal set; } + + public static void EnsureServiceAvailable (string virtualPath) + { + } + } +}
\ No newline at end of file diff --git a/mcs/class/System.ServiceModel.Internals/Makefile b/mcs/class/System.ServiceModel.Internals/Makefile index 2ddf10ebd26..c6ec76df04e 100644 --- a/mcs/class/System.ServiceModel.Internals/Makefile +++ b/mcs/class/System.ServiceModel.Internals/Makefile @@ -8,9 +8,6 @@ endif LIBRARY = System.ServiceModel.Internals.dll LIB_REFS = System System.Core System.Xml -ifneq (2.1, $(FRAMEWORK_VERSION)) - LIB_REFS += System.Configuration -endif LIB_MCS_FLAGS = /unsafe $(REFERENCE_SOURCES_FLAGS) TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) diff --git a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs index f4779a1e600..87999d4b561 100644 --- a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs @@ -75,15 +75,12 @@ using System.Runtime.InteropServices; [assembly: InternalsVisibleTo ("System.ServiceModel.Discovery, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] // AnnouncementChannelEndpointElementCollection requires it. #endif -#if HAS_ACTIVATION - +#if SERVICEMODEL_ACTIVATION_DEPENDENCY [assembly: TypeForwardedTo (typeof (System.ServiceModel.ServiceHostingEnvironment))] [assembly: TypeForwardedTo (typeof (System.ServiceModel.Activation.ServiceHostFactory))] - #endif #if !MOBILE - [assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.BinarySecretKeyIdentifierClause))] [assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.KeyNameIdentifierClause))] [assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.SecurityContextKeyIdentifierClause))] diff --git a/mcs/class/System.ServiceModel/Makefile b/mcs/class/System.ServiceModel/Makefile index 683b096376f..c563c1ad87f 100644 --- a/mcs/class/System.ServiceModel/Makefile +++ b/mcs/class/System.ServiceModel/Makefile @@ -30,14 +30,9 @@ endif ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) ifndef NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY -activation = $(the_libdir_base)System.ServiceModel.Activation.dll -servicemodel_deps = $(activation) - -ifneq (plainservice/,$(intermediate)) -LIB_REFS += System.ServiceModel.Activation -LIB_MCS_FLAGS += -define:HAS_ACTIVATION -endif -endif # NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY +API_BIN_REFS := System.ServiceModel.Activation +LIB_MCS_FLAGS += /d:SERVICEMODEL_ACTIVATION_DEPENDENCY +endif ifndef NO_SYSTEM_WEB_APPSERVICES_DEPENDENCY LIB_REFS += System.Web.ApplicationServices @@ -73,22 +68,3 @@ NO_TEST = yes endif include ../../build/library.make - -$(the_libdir_base)System.ServiceModel.dll: $(servicemodel_deps) - -$(activation): - (cd ../System.ServiceModel.Activation; $(MAKE) $@) - -ifneq (plainservice/,$(intermediate)) -$(the_libdir_base)plainservice/System.ServiceModel.dll: - $(MAKE) intermediate=plainservice/ $(the_libdir_base)plainservice/System.ServiceModel.dll -endif - -.NOTPARALLEL: $(servicemodel_deps) - -CLEAN_FILES = $(the_libdir_base)plainservice/System.ServiceModel.dll - -ifndef intermediate -csproj-local: - $(MAKE) csproj-local intermediate=plainservice/ -endif diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpListenerManagerTable.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpListenerManagerTable.cs index 181b4de28f7..aaebe298f39 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpListenerManagerTable.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpListenerManagerTable.cs @@ -125,7 +125,7 @@ namespace System.ServiceModel.Channels.Http { HttpListenerManager m; - if (ServiceHostingEnvironment.InAspNet) + if (ServiceHostingEnvironmentInternal.InAspNet) m = new AspNetHttpListenerManager (uri); else m = new HttpStandaloneListenerManager (uri, element); diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SvcHttpHandlerFactory.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SvcHttpHandlerFactory.cs index e757f00eb98..e8a5b730586 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SvcHttpHandlerFactory.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SvcHttpHandlerFactory.cs @@ -49,7 +49,7 @@ namespace System.ServiceModel.Channels { public SvcHttpHandlerFactory () { - ServiceHostingEnvironment.InAspNet = true; + ServiceHostingEnvironmentInternal.InAspNet = true; } public IHttpHandler GetHandler (HttpContext context, string requestType, string url, string pathTranslated) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ConfigUtil.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ConfigUtil.cs index 43918f6f601..e034fca0e94 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ConfigUtil.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ConfigUtil.cs @@ -48,7 +48,7 @@ namespace System.ServiceModel.Configuration #if !XAMMAC_4_5 static object GetSection (string name) { - if (ServiceHostingEnvironment.InAspNet) + if (ServiceHostingEnvironmentInternal.InAspNet) return WebConfigurationManager.GetSection (name); else return ConfigurationManager.GetSection (name); diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources index 5067f01abe4..3754386ab5e 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources +++ b/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources @@ -130,7 +130,6 @@ System.Collections.Generic/SynchronizedKeyedCollection.cs System.Collections.Generic/SynchronizedReadOnlyCollection.cs System.IO/PipeException.cs System.ServiceModel.Activation/AspNetIntegrationRequirementsAttribute.cs -System.ServiceModel.Activation/ServiceHostFactory.cs System.ServiceModel.Activation/ServiceHostFactoryBase.cs System.ServiceModel.Activation/VirtualPathExtension.cs System.ServiceModel.Channels/AddressHeader.cs diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostingEnvironment.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostingEnvironment.cs index e41c00bb197..a3377e029a8 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostingEnvironment.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostingEnvironment.cs @@ -26,21 +26,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !HAS_ACTIVATION - namespace System.ServiceModel { - [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblySystemServiceModel_3_0)] - public static class ServiceHostingEnvironment + static class ServiceHostingEnvironmentInternal { internal static bool InAspNet { get; set; } - - public static bool AspNetCompatibilityEnabled { get; internal set; } - - public static void EnsureServiceAvailable (string virtualPath) - { - } } } - -#endif diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile index 566da23778b..308990590f3 100644 --- a/mcs/class/System.Web.Services/Makefile +++ b/mcs/class/System.Web.Services/Makefile @@ -16,15 +16,11 @@ LIB_REFS = System System.EnterpriseServices System.Xml System.Data LIB_MCS_FLAGS = -nowarn:168,612,618,649 -d:MONO_BROKEN_CONFIGURATION_DLL ifndef NO_SYSTEM_WEB_DEPENDENCY -plainweb = $(the_libdir_base)plainweb/System.Web.dll -system_web_deps = $(plainweb) -LIB_REFS += plainweb/System.Web +API_BIN_REFS := System.Web endif ifndef NO_SYSTEM_DESIGN_DEPENDENCY -plaindesign = $(the_libdir_base)plaindesign/System.Design.dll -system_design_deps = $(plaindesign) -LIB_REFS += plaindesign/System.Design +LIB_REFS += System.Design endif ifndef NO_SYSTEM_DIRECTORY_SERVICES_DEPENDENCY @@ -56,13 +52,3 @@ EXTRA_DISTFILES = \ Test/System.Web.Services.Description/*.wsdl include ../../build/library.make - -$(the_libdir_base)$(LIBRARY): $(system_web_deps) $(system_design_deps) - -$(plainweb): - (cd ../System.Web; $(MAKE) $@) - -$(plaindesign): - (cd ../System.Design; $(MAKE) $@) - -.NOTPARALLEL: $(plainweb) $(plaindesign) diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile index 495c1ea6b03..dd0a0f017ef 100644 --- a/mcs/class/System.Web/Makefile +++ b/mcs/class/System.Web/Makefile @@ -242,7 +242,7 @@ endif TXT_RESOURCE_STRINGS = ../referencesource/System.Web/System.Web.txt LIB_REFS = System System.Core System.Drawing System.Data System.Xml System.EnterpriseServices System.Runtime.Serialization.Formatters.Soap \ - System.ComponentModel.DataAnnotations System.Web.ApplicationServices System.Configuration Mono.Data.Sqlite + System.ComponentModel.DataAnnotations System.Web.ApplicationServices System.Configuration Mono.Data.Sqlite System.Web.Services System.Design KEYFILE = ../msfinal.pub LIB_MCS_FLAGS = \ -unsafe \ @@ -251,13 +251,7 @@ LIB_MCS_FLAGS = \ $(RESX_RES:%=/resource:%) \ $(OTHER_RES:%=/resource:%) -ifneq (plainweb/,$(intermediate)) -LIB_REFS += System.Web.Services plaindesign/System.Design -LIB_MCS_FLAGS += -define:WEBSERVICES_DEP - -all-local: System.Web/UplevelHelper.cs - -endif +#all-local: System.Web/UplevelHelper.cs TEST_LIB_REFS = SystemWebTestShim TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,1591 \ @@ -287,19 +281,6 @@ BUILT_SOURCES = System.Web/UplevelHelper.cs include ../../build/library.make -$(the_libdir_base)System.Web.dll: $(the_libdir_base)System.Web.Services.dll - -$(the_libdir_base)System.Web.Services.dll: - (cd ../System.Web.Services; $(MAKE) $@) - -ifneq (plainweb/,$(intermediate)) -$(the_libdir_base)plainweb/System.Web.dll: - $(MAKE) intermediate=plainweb/ $(the_libdir_base)plainweb/System.Web.dll - -endif - -.NOTPARALLEL: $(the_libdir_base)plainweb/System.Web.dll $(the_libdir_base)System.Web.Services.dll - ifdef DEBUG LIB_MCS_FLAGS += -define:DEBUG endif @@ -430,10 +411,3 @@ ifdef STANDALONE_TEST_COMPILABLE_TESTS $(MAKE) -C Test/standalone/$$d clean ; \ done endif - -ifndef intermediate -ifneq ($(PROFILE),basic) -csproj-local: - $(MAKE) csproj-local intermediate=plainweb/ -endif -endif diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebSectionGroup.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebSectionGroup.cs index 4492ffb0cc5..d7a0cf141af 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebSectionGroup.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebSectionGroup.cs @@ -31,9 +31,7 @@ using System; using System.Configuration; -#if WEBSERVICES_DEP using System.Web.Services.Configuration; -#endif namespace System.Web.Configuration { @@ -205,12 +203,10 @@ namespace System.Web.Configuration get { return (WebPartsSection)Sections ["webParts"]; } } -#if WEBSERVICES_DEP [ConfigurationProperty ("webServices")] public WebServicesSection WebServices { get { return (WebServicesSection)Sections ["webServices"]; } } -#endif [ConfigurationProperty ("xhtmlConformance")] public XhtmlConformanceSection XhtmlConformance { diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile index 59a3bae4024..3031c13c3cb 100644 --- a/mcs/class/System.XML/Makefile +++ b/mcs/class/System.XML/Makefile @@ -4,15 +4,6 @@ include ../../build/rules.make LIBRARY = System.Xml.dll -lib_file := $(wildcard ../lib/$(PROFILE)/System.Xml.dll) -ifndef lib_file -USE_BOOT_COMPILE = yes -endif - -ifdef USE_BOOT_COMPILE -LIBRARY_COMPILE = $(BOOT_COMPILE) -endif - TXT_RESOURCE_STRINGS = \ ../referencesource/System.Xml/System.Xml.txt \ ../referencesource/System.Data.SqlXml/System.Xml.Utils.txt @@ -28,15 +19,12 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 LIBRARY_WARN_AS_ERROR = yes -ifneq (bare/,$(intermediate)) -LIB_REFS += secxml/System +LIB_REFS = System + ifndef MOBILE_PROFILE -LIB_REFS += System.Configuration +API_BIN_REFS += System.Configuration LIB_MCS_FLAGS += -d:CONFIGURATION_DEP endif -else -LIB_REFS += $(intermediate)System -endif nist_dom_files = \ ITest.cs readme.txt util.cs \ @@ -64,40 +52,3 @@ EXTRA_DISTFILES = \ $(nist_dom_files:%=Test/System.Xml/nist_dom/%) include ../../build/library.make - -ifeq (bare/,$(intermediate)) -build-bare: -else -$(bare_libdir)/System.Xml.dll: - $(MAKE) intermediate=bare/ $(bare_libdir)/System.Xml.dll -endif - -system_xml_library_deps := \ - $(bare_libdir)/System.dll \ - $(bare_libdir)/System.Xml.dll - -ifndef MOBILE_PROFILE -system_xml_library_deps += $(the_libdir_base)System.Configuration.dll -endif - -artifacts = $(system_xml_library_deps) \ - $(the_libdir_base)System.Configuration.dll - -.NOTPARALLEL: $(artifacts) - -CLEAN_FILES = $(bare_libdir)/System.Xml.dll $(bare_libdir)/System.Xml.dll.pdb -$(the_libdir_base)System.Xml.dll: $(system_xml_library_deps) -$(bare_libdir)/System.dll: - (cd ../System; $(MAKE) $@) -$(bare_libdir)/System.Xml.dll: $(bare_libdir)/System.dll - -$(the_libdir_base)System.Configuration.dll: - (cd ../System.Configuration; $(MAKE) $@) - - -ifndef intermediate -ifneq ($(PROFILE),basic) -csproj-local: - $(MAKE) csproj-local intermediate=bare/ -endif -endif diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index 15012d1a82a..07803ef7d14 100644 --- a/mcs/class/System/Makefile +++ b/mcs/class/System/Makefile @@ -29,7 +29,7 @@ TEST_RESOURCES = \ USE_XTEST_REMOTE_EXECUTOR = YES XTEST_LIB_REFS = System System.Core System.Net Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation System.Net.Http -LIB_MCS_FLAGS = -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%) -nowarn:436 +LIB_MCS_FLAGS = -d:CONFIGURATION_2_0 -d:XML_DEP $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%) -nowarn:436 ifndef NO_MONO_SECURITY MONO_SECURITY=Mono.Security @@ -98,26 +98,26 @@ endif TXT_RESOURCE_STRINGS = ../referencesource/System/System.txt -API_BIN_REFS := System.Net.Http +API_BIN_REFS := System.Net.Http System.Xml # # Flags used to build the secxml version of System. # ifeq (secxml/, $(intermediate)) LOCAL_MCS_FLAGS = -LIB_REFS += bare/System.Xml $(MONO_SECURITY_REF) -LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP $(EXTERN_ALIAS_FLAGS) +LIB_REFS += $(MONO_SECURITY_REF) +LIB_MCS_FLAGS += -d:SECURITY_DEP $(EXTERN_ALIAS_FLAGS) endif # # Flags used to build the final version of System (when intermediate is not defined) # ifndef intermediate -LIB_REFS += System.Xml $(MONO_SECURITY_REF) -LIB_MCS_FLAGS += -d:SECURITY_DEP -d:XML_DEP $(EXTERN_ALIAS_FLAGS) +LIB_REFS += $(MONO_SECURITY_REF) +LIB_MCS_FLAGS += -d:SECURITY_DEP $(EXTERN_ALIAS_FLAGS) ifndef MOBILE_PROFILE -LIB_REFS += System.Configuration +API_BIN_REFS += System.Configuration LIB_MCS_FLAGS += -d:CONFIGURATION_DEP endif @@ -136,19 +136,11 @@ EXTRA_DISTFILES = \ include ../../build/library.make system_library_deps := \ - $(secxml_libdir)/System.dll \ - $(the_libdir_base)System.Xml.dll \ $(MONO_SECURITY_DLL) \ $(bare_libdir)/System.dll -ifndef MOBILE_PROFILE -system_library_deps += $(the_libdir_base)System.Configuration.dll -endif - artifacts = $(system_library_deps) \ - $(bare_libdir)/System.Xml.dll \ - $(MONO_SECURITY_DLL) \ - $(the_libdir_base)System.Configuration.dll + $(MONO_SECURITY_DLL) .NOTPARALLEL: $(system_library_deps) @@ -161,25 +153,9 @@ $(bare_libdir)/System.dll: $(MAKE) intermediate=bare/ $(bare_libdir)/System.dll endif -ifneq (secxml/,$(intermediate)) -$(secxml_libdir)/System.dll: $(bare_libdir)/System.dll $(bare_libdir)/System.Xml.dll $(MONO_SECURITY_DLL) $(bare_libdir)/System.dll - $(MAKE) intermediate=secxml/ $(secxml_libdir)/System.dll -else -build-sec: -endif - -$(the_libdir_base)System.Xml.dll: - (cd ../System.XML; $(MAKE) $@) - -$(bare_libdir)/System.Xml.dll: - (cd ../System.XML; $(MAKE) $@) - $(the_libdir_base)Mono.Security.dll: ../Mono.Security/Makefile (cd ../Mono.Security; $(MAKE)) -$(the_libdir_base)System.Configuration.dll: - (cd ../System.Configuration; $(MAKE)) - $(build_lib): $(CYCLIC_DEP_FILES) $(test_lib_output): $(TEST_RESOURCES) $(test_lib_dir) |