Merge pull request #2046 from rolfbjarne/profile-simplification

Profile simplification

mcs/build/profiles/mobile.make

@@ -33,3 +33,5 @@ PROFILE_MCS_FLAGS = \
 FRAMEWORK_VERSION = 2.1
 
 NO_INSTALL = yes
+MOBILE_DYNAMIC = yes
+MOBILE_PROFILE = yes

mcs/build/profiles/mobile_static.make

@@ -37,3 +37,5 @@ NO_TEST = yes
 
 # the tuner takes care of the install
 NO_INSTALL = yes
+MOBILE_STATIC = yes
+MOBILE_PROFILE = yes

mcs/build/profiles/monodroid.make

@@ -37,3 +37,5 @@ NO_TEST = yes
 
 # the tuner takes care of the install
 NO_INSTALL = yes
+MOBILE_DYNAMIC = yes
+MOBILE_PROFILE = yes

mcs/build/profiles/monotouch.make

@@ -38,3 +38,5 @@ NO_TEST = yes
 
 # the tuner takes care of the install
 NO_INSTALL = yes
+MOBILE_STATIC = yes
+MOBILE_PROFILE = yes

mcs/build/profiles/monotouch_runtime.make

@@ -20,3 +20,5 @@ FRAMEWORK_VERSION = 2.1
 
 # This is utility build only
 NO_INSTALL = yes
+MOBILE_STATIC = yes
+MOBILE_PROFILE = yes

mcs/build/profiles/xammac.make

@@ -32,3 +32,5 @@ PROFILE_MCS_FLAGS = \
 FRAMEWORK_VERSION = 2.1
 NO_TEST = yes
 NO_INSTALL = yes
+MOBILE_DYNAMIC = yes
+MOBILE_PROFILE = yes

mcs/class/Mono.CSharp/Makefile

@@ -7,8 +7,6 @@ LIBRARY = Mono.CSharp.dll
 LIB_REFS = System.Core System.Xml System
 LIB_MCS_FLAGS =
 
-MOBILE_STATIC := $(filter mobile_static monotouch monotouch_watch, $(PROFILE))
-
 ifdef MOBILE_STATIC
 LIB_MCS_FLAGS += -d:IOS_REFLECTION
 endif

mcs/class/Mono.Dynamic.Interpreter/Makefile

@@ -10,8 +10,6 @@ LIB_MCS_FLAGS = \
 	-d:MONO_INTERPRETER \
 	-delaysign -keyfile:../mono.pub
 
-MOBILE_STATIC := $(filter mobile_static monotouch monotouch_runtime monotouch_watch, $(PROFILE))
-
 ifdef MOBILE_STATIC
 mono_dynamic_interpreter_deps = $(the_libdir_base)plaincore/System.Core.dll
 LIB_MCS_FLAGS += -lib:$(the_libdir_base)plaincore

mcs/class/System.Core/Makefile

@@ -13,9 +13,6 @@ ifneq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720
 endif
 
-MOBILE_DYNAMIC := $(filter monodroid xammac mobile, $(PROFILE))
-MOBILE_STATIC := $(filter mobile_static monotouch monotouch_runtime monotouch_watch, $(PROFILE))
-
 ifdef MOBILE_DYNAMIC
 LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT
 endif

mcs/class/System.Data/Makefile

@@ -12,8 +12,7 @@ LIB_MCS_FLAGS = \
 	-d:MONO_PARTIAL_DATA_IMPORT \
 	-unsafe
 
-MOBILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static, $(PROFILE))
-ifdef MOBILE
+ifdef MOBILE_PROFILE
 LIB_REFS += Mono.Data.Tds System.Transactions
 LIB_MCS_FLAGS += -d:NO_CODEDOM -d:NO_OLEDB -d:NO_ODBC -d:NO_CONFIGURATION
 else

mcs/class/System.Json.Microsoft/Makefile

@@ -17,11 +17,7 @@ LIB_REFS += Microsoft.CSharp
 LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC
 endif
 
-ifeq (monodroid, $(PROFILE))
-LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC
-endif
-
-ifeq (xammac, $(PROFILE))
+ifdef MOBILE_DYNAMIC
 LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC
 endif
 

mcs/class/System.Transactions/Makefile

@@ -2,8 +2,6 @@ thisdir = class/System.Transactions
 SUBDIRS = 
 include ../../build/rules.make
 
-MOBILE_PROFILE := $(filter monotouch monotouch_runtime monotouch_watch monodroid xammac mobile mobile_static, $(PROFILE))
-
 LIBRARY = System.Transactions.dll
 ifdef MOBILE_PROFILE
 LIB_REFS = System

mcs/class/System.Web.Services/Makefile

@@ -3,8 +3,7 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = System.Web.Services.dll
-MOBILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static, $(PROFILE))
-ifdef MOBILE
+ifdef MOBILE_PROFILE
 LIB_REFS = System System.Xml
 LIB_MCS_FLAGS = \
 	-nowarn:649 -nowarn:169			\

mcs/class/System.XML/Makefile

@@ -17,8 +17,6 @@ RESOURCE_STRINGS = \
 	../../../external/referencesource/System.Xml/System.Xml.txt \
 	../../../external/referencesource/System.Data.SqlXml/System.Xml.Utils.txt
 
-PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monotouch_watch monodroid xammac mobile mobile_static, $(PROFILE))
-
 LIB_REFS = System
 LIB_MCS_FLAGS = -r:$(corlib)  -nowarn:219,414,649,1717 -unsafe -d:ASYNC
 
@@ -27,7 +25,7 @@ LIB_MCS_FLAGS += -d:AGCLR -d:NET_2_1_HACK -d:DISABLE_XSLT_COMPILER -d:DISABLE_XS
 endif
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 -r:System.Data.dll -r:System.Core.dll
 
-ifndef PROFILE_ANY_MOBILE
+ifndef MOBILE_PROFILE
 FINAL_MCS_FLAGS = -r:System.Configuration.dll -d:CONFIGURATION_DEP
 endif
 
@@ -81,7 +79,7 @@ system_xml_library_deps := 				\
 	$(bare_libdir)/System.dll			\
 	$(bare_libdir)/System.Xml.dll
 
-ifndef PROFILE_ANY_MOBILE
+ifndef MOBILE_PROFILE
 system_xml_library_deps += $(the_libdir_base)System.Configuration.dll
 endif
 

mcs/class/System.Xaml/Makefile

@@ -15,7 +15,7 @@ TEST_EXTRA_DISTFILES = \
 	Test/XmlFiles/*.xml \
 	Test/XmlFiles/*.xaml
 
-VALID_PROFILE := $(filter 4 monodroid monotouch monotouch_watch mobile mobile_static, $(FRAMEWORK_VERSION_MAJOR))
+VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Xaml.dll
 NO_INSTALL = yes

mcs/class/System/Makefile

@@ -25,23 +25,16 @@ TEST_MCS_FLAGS = -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:Sy
 REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX
 LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%)
 TEST_MCS_FLAGS += -r:System.Configuration
-PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monotouch_watch monodroid xammac mobile mobile_static, $(PROFILE))
 
 RESOURCE_STRINGS = ../../../external/referencesource/System/System.txt
 
 ifeq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:INSIDE_SYSTEM
 endif
-ifeq (monotouch, $(subst _runtime,,$(PROFILE)))
+ifdef MOBILE_PROFILE
 LIB_MCS_FLAGS += -d:SECURITY_DEP
 endif
-ifeq (monotouch_watch, $(PROFILE))
-LIB_MCS_FLAGS += -d:SECURITY_DEP
-endif
-ifeq (monodroid, $(PROFILE))
-LIB_MCS_FLAGS += -d:SECURITY_DEP
-endif
-ifndef PROFILE_ANY_MOBILE
+ifndef MOBILE_PROFILE
 FINAL_MCS_FLAGS = -r:System.Configuration.dll -d:CONFIGURATION_DEP
 endif
 
@@ -80,7 +73,7 @@ system_library_deps := \
 	$(the_libdir_base)Mono.Security.dll	\
 	$(bare_libdir)/System.dll
 
-ifndef PROFILE_ANY_MOBILE
+ifndef MOBILE_PROFILE
 system_library_deps += $(the_libdir_base)System.Configuration.dll	
 endif
 

mcs/class/corlib/Makefile

@@ -37,8 +37,6 @@ RESOURCE_FILES = \
 
 REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT
 
-MOBILE_STATIC := $(filter mobile_static monotouch monotouch_runtime monotouch_watch, $(PROFILE))
-
 ifndef MOBILE_STATIC
 REFERENCE_SOURCES_FLAGS += -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY
 endif