Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -3,8 +3,9 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = System.Web.Services.dll
MOBILE := $(filter monotouch monodroid xammac mobile mobile_static, $(PROFILE))
MOBILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static, $(PROFILE))
ifdef MOBILE
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = \
-nowarn:649 -nowarn:169 \
-r:$(corlib) \
@@ -14,31 +15,35 @@ LIB_MCS_FLAGS = \
-resource:System.Web.Services.Description/wsdl-1.1-soap.xsd,wsdl-1.1-soap.xsd \
-resource:System.Web.Services.Description/web-reference.xsd,web-reference.xsd
else
LIB_MCS_FLAGS = \
-nowarn:649 -nowarn:169 \
-r:$(corlib) \
-r:System.dll \
-r:System.EnterpriseServices.dll \
-r:System.Xml.dll \
LIB_REFS = System System.EnterpriseServices System.Xml System.Data
LIB_MCS_FLAGS = -nowarn:168,169,219,414,612,649 -d:MONO_BROKEN_CONFIGURATION_DLL
ifndef NO_SYSTEM_WEB_DEPENDENCY
LIB_MCS_FLAGS += -r:System.Web.dll
LIB_REFS += System.Web
plainweb_dir = $(the_libdir_base)plainweb
LOCAL_MCS_FLAGS = -lib:$(plainweb_dir)
plainweb = $(plainweb_dir)/System.Web.dll
system_web_services_deps = $(plainweb)
LOCAL_MCS_FLAGS += -lib:$(plainweb_dir)
endif
ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
ifndef NO_SYSTEM_DESIGN_DEPENDENCY
LIB_REFS += System.Design
plaindesign_dir = $(the_libdir_base)plaindesign
plaindesign = $(plaindesign_dir)/System.Design.dll
system_design_deps = $(plaindesign)
LOCAL_MCS_FLAGS += -lib:$(plaindesign_dir)
endif
ifndef NO_SYSTEM_DIRECTORY_SERVICES_DEPENDENCY
LIB_REFS += System.DirectoryServices
endif
LIB_REFS += System.Configuration
LIB_MCS_FLAGS += \
-r:System.Configuration.dll \
-resource:System.Web.Services.Description/wsdl-1.1.xsd,wsdl-1.1.xsd \
-resource:System.Web.Services.Description/wsdl-1.1-soap.xsd,wsdl-1.1-soap.xsd \
-resource:System.Web.Services.Description/web-reference.xsd,web-reference.xsd
endif
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618
@@ -51,9 +56,12 @@ EXTRA_DISTFILES = \
include ../../build/library.make
$(the_libdir_base)$(LIBRARY): $(system_web_services_deps)
$(the_libdir_base)$(LIBRARY): $(system_web_services_deps) $(system_design_deps)
$(plainweb):
(cd ../System.Web; $(MAKE) $@)
.NOTPARALLEL: $(plainweb)
$(plaindesign):
(cd ../System.Design; $(MAKE) $@)
.NOTPARALLEL: $(plainweb) $(plaindesign)