diff options
author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-09-17 00:22:02 +0400 |
---|---|---|
committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-09-17 03:14:20 +0400 |
commit | 2804d6af37c1833118cb28bc8f3e452f1b720bd0 (patch) | |
tree | 6ca3866f775c6a15215269fed7a6c603ff49357e /mcs | |
parent | 87622fc7118eb87e958f865353da4c14053f1808 (diff) |
Fix mobile and mobile_static profiles
And bring them to parity with monodroid and monotouch
Diffstat (limited to 'mcs')
33 files changed, 257 insertions, 179 deletions
diff --git a/mcs/Makefile b/mcs/Makefile index af4495e9195..9bcf32ea2fb 100644 --- a/mcs/Makefile +++ b/mcs/Makefile @@ -12,6 +12,7 @@ monotouch_SUBDIRS := build class monotouch_runtime_SUBDIRS := build class xammac_SUBDIRS := build class mobile_SUBDIRS := build class +mobile_static_SUBDIRS := build class net_3_5_SUBDIRS := build class tools/xbuild net_4_0_SUBDIRS := build class net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs @@ -114,6 +115,7 @@ $(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: $(_boot_:%=profile-do--monotouch_runtime--%): profile-do--monotouch_runtime--%: profile-do--build--% $(_boot_:%=profile-do--xammac--%): profile-do--xammac--%: profile-do--build--% $(_boot_:%=profile-do--mobile--%): profile-do--mobile--%: profile-do--build--% +$(_boot_:%=profile-do--mobile_static--%): profile-do--mobile_static--%: profile-do--build--% $(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--build--% $(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--% diff --git a/mcs/build/profiles/mobile.make b/mcs/build/profiles/mobile.make index 87c51f407c8..117ac605151 100644 --- a/mcs/build/profiles/mobile.make +++ b/mcs/build/profiles/mobile.make @@ -12,7 +12,22 @@ profile-check: @: DEFAULT_REFERENCES = -r:mscorlib.dll -PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOBILE -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) + +PROFILE_MCS_FLAGS = \ + -d:NET_1_1 \ + -d:NET_2_0 \ + -d:NET_2_1 \ + -d:MOBILE \ + -d:MOBILE_DYNAMIC \ + -d:NET_3_5 \ + -d:NET_4_0 \ + -d:NET_4_5 \ + -nowarn:1699 \ + -nostdlib \ + -lib:$(topdir)/class/lib/$(PROFILE) \ + $(DEFAULT_REFERENCES) \ + $(PLATFORM_DEBUG_FLAGS) + FRAMEWORK_VERSION = 2.1 NO_INSTALL = yes diff --git a/mcs/build/profiles/mobile_static.make b/mcs/build/profiles/mobile_static.make index 59505666ad7..b7898235194 100644 --- a/mcs/build/profiles/mobile_static.make +++ b/mcs/build/profiles/mobile_static.make @@ -12,7 +12,24 @@ profile-check: @: DEFAULT_REFERENCES = -r:mscorlib.dll -PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:FULL_AOT_RUNTIME -d:DISABLE_REMOTING -d:DISABLE_COM -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) + +PROFILE_MCS_FLAGS = \ + -d:NET_1_1 \ + -d:NET_2_0 \ + -d:NET_2_1 \ + -d:NET_3_5 \ + -d:NET_4_0 \ + -d:NET_4_5 \ + -d:MOBILE \ + -d:FULL_AOT_RUNTIME \ + -d:DISABLE_REMOTING \ + -d:DISABLE_COM \ + -nowarn:1699 \ + -nostdlib \ + -lib:$(topdir)/class/lib/$(PROFILE) \ + $(DEFAULT_REFERENCES) \ + $(PLATFORM_DEBUG_FLAGS) + FRAMEWORK_VERSION = 2.1 NO_TEST = yes diff --git a/mcs/build/profiles/monodroid.make b/mcs/build/profiles/monodroid.make index 7336ced7b7b..c14f61c6087 100644 --- a/mcs/build/profiles/monodroid.make +++ b/mcs/build/profiles/monodroid.make @@ -12,7 +12,24 @@ profile-check: @: DEFAULT_REFERENCES = -r:mscorlib.dll -PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MOBILE_DYNAMIC -d:MONODROID -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) + +PROFILE_MCS_FLAGS = \ + -d:NET_1_1 \ + -d:NET_2_0 \ + -d:NET_2_1 \ + -d:NET_3_5 \ + -d:NET_4_0 \ + -d:NET_4_5 \ + -d:MOBILE \ + -d:MOBILE_DYNAMIC \ + -d:MONODROID \ + -d:ANDROID \ + -nowarn:1699 \ + -nostdlib \ + -lib:$(topdir)/class/lib/$(PROFILE) \ + $(DEFAULT_REFERENCES) \ + $(PLATFORM_DEBUG_FLAGS) + FRAMEWORK_VERSION = 2.1 NO_TEST = yes diff --git a/mcs/build/profiles/monotouch.make b/mcs/build/profiles/monotouch.make index b841a1027ae..706463d748c 100644 --- a/mcs/build/profiles/monotouch.make +++ b/mcs/build/profiles/monotouch.make @@ -12,9 +12,27 @@ profile-check: @: DEFAULT_REFERENCES = -r:mscorlib.dll -PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -d:DISABLE_REMOTING -d:DISABLE_COM -d:FULL_AOT_RUNTIME -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) + +PROFILE_MCS_FLAGS = \ + -d:NET_1_1 \ + -d:NET_2_0 \ + -d:NET_2_1 \ + -d:NET_3_5 \ + -d:NET_4_0 \ + -d:NET_4_5 \ + -d:MOBILE \ + -d:MONOTOUCH \ + -d:DISABLE_REMOTING \ + -d:DISABLE_COM \ + -d:FULL_AOT_RUNTIME \ + -nowarn:1699 \ + -nostdlib \ + -lib:$(topdir)/class/lib/$(PROFILE) \ + $(DEFAULT_REFERENCES) \ + $(PLATFORM_DEBUG_FLAGS) + FRAMEWORK_VERSION = 2.1 NO_TEST = yes # the tuner takes care of the install -NO_INSTALL = yes
\ No newline at end of file +NO_INSTALL = yes diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 47cf334888e..8ca914dca53 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -106,7 +106,7 @@ net_2_0_only_dirs := \ pcl_facade_dirs := Facades -mobile_dirs := \ +mobile_common_dirs := \ corlib \ System \ System.Core \ @@ -134,19 +134,27 @@ mobile_dirs := \ System.Net \ System.Windows \ System.Xml.Serialization \ + Mono.CSharp \ + Microsoft.CSharp \ $(pcl_facade_dirs) -monodroid_dirs := \ +mobile_static_dirs := \ + $(mobile_common_dirs) \ + Mono.Dynamic.Interpreter + +mobile_dynamic_dirs := \ + $(mobile_common_dirs) \ Mono.CompilerServices.SymbolWriter \ - Mono.CSharp \ - Microsoft.CSharp \ System.Net.Http xammac_dirs := \ - Mono.CompilerServices.SymbolWriter \ - Mono.CSharp \ - Microsoft.CSharp \ - System.Net.Http + $(mobile_dynamic_dirs) + +monodroid_dirs := \ + $(mobile_dynamic_dirs) + +monotouch_dirs := \ + $(mobile_static_dirs) monotouch_runtime_dirs := \ corlib \ @@ -155,11 +163,6 @@ monotouch_runtime_dirs := \ System.XML \ Mono.CSharp -monotouch_dirs := \ - Mono.CSharp \ - Microsoft.CSharp \ - Mono.Dynamic.Interpreter - net_4_0_dirs := \ System.Numerics \ Microsoft.CSharp \ @@ -229,12 +232,12 @@ xbuild_4_0_dirs := \ Microsoft.Build net_2_0_SUBDIRS := $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler -monodroid_SUBDIRS := $(mobile_dirs) $(monodroid_dirs) -monotouch_SUBDIRS := $(mobile_dirs) $(monotouch_dirs) +monodroid_SUBDIRS := $(monodroid_dirs) +monotouch_SUBDIRS := $(monotouch_dirs) monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs) -mobile_static_SUBDIRS := $(mobile_dirs) -mobile_SUBDIRS := $(mobile_dirs) -xammac_SUBDIRS := $(mobile_dirs) $(xammac_dirs) +mobile_static_SUBDIRS := $(mobile_static_dirs) +mobile_SUBDIRS := $(mobile_dynamic_dirs) +xammac_SUBDIRS := $(xammac_dirs) net_3_5_SUBDIRS := $(xbuild_2_0_dirs) net_4_0_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs) net_4_5_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler @@ -242,7 +245,7 @@ xbuild_12_SUBDIRS := $(xbuild_4_0_dirs) include ../build/rules.make -SUBDIRS = $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_dirs) $(monotouch_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs) +SUBDIRS = $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs) DIST_ONLY_SUBDIRS = dlr aot-compiler $(xbuild_4_0_dirs) diff --git a/mcs/class/Mono.CSharp/Makefile b/mcs/class/Mono.CSharp/Makefile index 85b86e0f466..35ee0a302bc 100644 --- a/mcs/class/Mono.CSharp/Makefile +++ b/mcs/class/Mono.CSharp/Makefile @@ -6,7 +6,9 @@ LIBRARY = Mono.CSharp.dll LIB_MCS_FLAGS = -r:System.Core.dll -r:System.Xml.dll -r:System.dll -ifeq (monotouch, $(PROFILE)) +MOBILE_STATIC := $(filter mobile_static monotouch, $(PROFILE)) + +ifdef MOBILE_STATIC LIB_MCS_FLAGS += -d:IOS_REFLECTION endif diff --git a/mcs/class/Mono.CSharp/mobile_static_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/mobile_static_Mono.CSharp.dll.sources new file mode 100644 index 00000000000..6e4c34213be --- /dev/null +++ b/mcs/class/Mono.CSharp/mobile_static_Mono.CSharp.dll.sources @@ -0,0 +1,13 @@ +#include Mono.CSharp.dll.sources +../corlib/System.Reflection.Emit/AssemblyBuilderAccess.cs +../corlib/System.Reflection.Emit/FlowControl.cs +../corlib/System.Reflection.Emit/OpCode.cs +../corlib/System.Reflection.Emit/OpCodeNames.cs +../corlib/System.Reflection.Emit/OpCodes.cs +../corlib/System.Reflection.Emit/OpCodeType.cs +../corlib/System.Reflection.Emit/OperandType.cs +../corlib/System.Reflection.Emit/PEFileKinds.cs +../corlib/System.Reflection.Emit/Label.cs +../corlib/System.Reflection.Emit/MethodToken.cs +../corlib/System.Reflection.Emit/StackBehaviour.cs +monotouch.cs
\ No newline at end of file diff --git a/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources index 6e4c34213be..d04d5f08d95 100644 --- a/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources +++ b/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources @@ -1,13 +1,2 @@ -#include Mono.CSharp.dll.sources -../corlib/System.Reflection.Emit/AssemblyBuilderAccess.cs -../corlib/System.Reflection.Emit/FlowControl.cs -../corlib/System.Reflection.Emit/OpCode.cs -../corlib/System.Reflection.Emit/OpCodeNames.cs -../corlib/System.Reflection.Emit/OpCodes.cs -../corlib/System.Reflection.Emit/OpCodeType.cs -../corlib/System.Reflection.Emit/OperandType.cs -../corlib/System.Reflection.Emit/PEFileKinds.cs -../corlib/System.Reflection.Emit/Label.cs -../corlib/System.Reflection.Emit/MethodToken.cs -../corlib/System.Reflection.Emit/StackBehaviour.cs -monotouch.cs
\ No newline at end of file +#include mobil_static_Mono.CSharp.dll.sources +monotouch.cs diff --git a/mcs/class/Mono.Dynamic.Interpreter/Makefile b/mcs/class/Mono.Dynamic.Interpreter/Makefile index 76777611827..bbb733bf693 100644 --- a/mcs/class/Mono.Dynamic.Interpreter/Makefile +++ b/mcs/class/Mono.Dynamic.Interpreter/Makefile @@ -9,7 +9,9 @@ LIB_MCS_FLAGS = -r:System.dll -r:System.Core.dll \ -d:MONO_INTERPRETER \ -delaysign -keyfile:../mono.pub -ifeq (monotouch, $(subst _runtime,,$(PROFILE))) +MOBILE_STATIC := $(filter mobile_static monotouch monotouch_runtime, $(PROFILE)) + +ifdef MOBILE_STATIC mono_dynamic_interpreter_deps = $(the_libdir_base)plaincore/System.Core.dll LIB_MCS_FLAGS += -lib:$(the_libdir_base)plaincore endif @@ -21,4 +23,4 @@ $(the_libdir_base)Mono.Dynamic.Interpreter.dll: $(mono_dynamic_interpreter_deps) $(the_libdir_base)plaincore/System.Core.dll: (cd ../System.Core; $(MAKE) $@) -.NOTPARALLEL: $(the_libdir_base)plaincore/System.Core.dll
\ No newline at end of file +.NOTPARALLEL: $(the_libdir_base)plaincore/System.Core.dll diff --git a/mcs/class/System.ComponentModel.Composition.4.5/Makefile b/mcs/class/System.ComponentModel.Composition.4.5/Makefile index 4fe0fee915e..b71beeab45d 100644 --- a/mcs/class/System.ComponentModel.Composition.4.5/Makefile +++ b/mcs/class/System.ComponentModel.Composition.4.5/Makefile @@ -12,7 +12,7 @@ CLEAN_FILES += $(STRING_MESSAGES) EXTRA_DISTFILES = \ src/ComponentModel/Strings.resx -VALID_PROFILE := $(filter net_4_0 net_4_5 monotouch monodroid xammac mobile_static, $(PROFILE)) +VALID_PROFILE := $(filter net_4_0 net_4_5 monotouch monodroid xammac mobile mobile_static, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.ComponentModel.Composition.dll NO_INSTALL = yes diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Makefile b/mcs/class/System.ComponentModel.DataAnnotations/Makefile index 713754ccdb3..3d9ff9e2586 100644 --- a/mcs/class/System.ComponentModel.DataAnnotations/Makefile +++ b/mcs/class/System.ComponentModel.DataAnnotations/Makefile @@ -18,7 +18,7 @@ endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) # This is a .NET 3.5+ assembly -VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5 monotouch monodroid xammac mobile_static, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5 monotouch monodroid xammac mobile mobile_static, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.ComponentModel.DataAnnotations.dll NO_INSTALL = yes diff --git a/mcs/class/System.ComponentModel.DataAnnotations/mobile_System.ComponentModel.DataAnnotations.dll.sources b/mcs/class/System.ComponentModel.DataAnnotations/mobile_System.ComponentModel.DataAnnotations.dll.sources new file mode 100644 index 00000000000..3de14f5e0a7 --- /dev/null +++ b/mcs/class/System.ComponentModel.DataAnnotations/mobile_System.ComponentModel.DataAnnotations.dll.sources @@ -0,0 +1 @@ +#include net_4_5_System.ComponentModel.DataAnnotations.dll.sources diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile index c8836d3125b..f8cc33c7e8b 100644 --- a/mcs/class/System.Core/Makefile +++ b/mcs/class/System.Core/Makefile @@ -10,17 +10,16 @@ ifneq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720 endif -ifeq (monodroid, $(PROFILE)) -LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT,ANDROID -endif +MOBILE_DYNAMIC := $(filter monodroid xammac mobile, $(PROFILE)) +MOBILE_STATIC := $(filter mobile_static monotouch monotouch_runtime, $(PROFILE)) -ifeq (xammac, $(PROFILE)) +ifdef MOBILE_DYNAMIC LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT endif system_core_plain_libdir = $(the_libdir_base)plaincore -ifeq (monotouch, $(subst _runtime,,$(PROFILE))) +ifdef MOBILE_STATIC extra_test_flags := -exclude:NotWorkingInterpreter system_core_library_deps = $(the_libdir_base)Mono.Dynamic.Interpreter.dll $(system_core_plain_libdir)/System.Core.dll LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR @@ -72,4 +71,4 @@ ifneq ($(PROFILE),basic) csproj-local: $(MAKE) csproj-local intermediate=plaincore/ endif -endif
\ No newline at end of file +endif diff --git a/mcs/class/System.Core/mobile_System.Core.dll.sources b/mcs/class/System.Core/mobile_System.Core.dll.sources index dee2534a29b..5cd8ddf660b 100644 --- a/mcs/class/System.Core/mobile_System.Core.dll.sources +++ b/mcs/class/System.Core/mobile_System.Core.dll.sources @@ -1,109 +1,4 @@ -Assembly/AssemblyInfo.cs -System/Actions.cs -System/Funcs.cs -System/InvalidTimeZoneException.cs -System/TimeZoneInfo.AdjustmentRule.cs -System/TimeZoneInfo.cs -System/TimeZoneInfo.Serialization.cs -System/TimeZoneInfo.TransitionTime.cs -System/TimeZoneNotFoundException.cs -System/Util.cs -System.Runtime.CompilerServices/DynamicAttribute.cs -System.Runtime.CompilerServices/ExecutionScope.cs -System.Runtime.CompilerServices/ExtensionAttribute.cs -System.Runtime.CompilerServices/IStrongBox.cs -System.Runtime.CompilerServices/StrongBox_T.cs -System.Linq/Check.cs -System.Linq/Enumerable.cs -System.Linq/QueryableEnumerable.cs -System.Linq/QueryableTransformer.cs -System.Linq/Grouping.cs -System.Linq/IGrouping.cs -System.Linq/IOrderedQueryable.cs -System.Linq/IOrderedQueryable_T.cs -System.Linq/IOrderedEnumerable_T.cs -System.Linq/IQueryable.cs -System.Linq/IQueryable_T.cs -System.Linq/Lookup.cs -System.Linq/ILookup_T.cs -System.Linq/OrderedEnumerable.cs -System.Linq/OrderedSequence.cs -System.Linq/Queryable.cs -System.Linq/QuickSort.cs -System.Linq/SortContext.cs -System.Linq/SortDirection.cs -System.Linq/SortSequenceContext.cs -System.Linq/IQueryProvider.cs -System.Collections.Generic/HashSet.cs -System.Security.Cryptography/Aes.cs -System.Threading/LockRecursionPolicy.cs -System.Threading/ReaderWriterLockSlim.cs -System.Threading/ThreadLockState.cs -System.Threading/ReaderWriterLockSlimExtensions.cs -System.Linq.Parallel.QueryNodes/QueryBaseNode.cs -System.Linq.Parallel.QueryNodes/QueryCastNode.cs -System.Linq.Parallel.QueryNodes/QueryChildNode.cs -System.Linq.Parallel.QueryNodes/QueryConcatNode.cs -System.Linq.Parallel.QueryNodes/QueryDefaultEmptyNode.cs -System.Linq.Parallel.QueryNodes/QueryGroupByNode.cs -System.Linq.Parallel.QueryNodes/QueryHeadWorkerNode.cs -System.Linq.Parallel.QueryNodes/QueryJoinNode.cs -System.Linq.Parallel.QueryNodes/QueryMuxNode.cs -System.Linq.Parallel.QueryNodes/QueryOptionNode.cs -System.Linq.Parallel.QueryNodes/QueryOrderByNode.cs -System.Linq.Parallel.QueryNodes/QueryOrderGuardNode.cs -System.Linq.Parallel.QueryNodes/QueryOrderedStreamNode.cs -System.Linq.Parallel.QueryNodes/QueryReverseNode.cs -System.Linq.Parallel.QueryNodes/QuerySelectManyNode.cs -System.Linq.Parallel.QueryNodes/QuerySelectNode.cs -System.Linq.Parallel.QueryNodes/QuerySetNode.cs -System.Linq.Parallel.QueryNodes/QueryStartNode.cs -System.Linq.Parallel.QueryNodes/QueryStreamNode.cs -System.Linq.Parallel.QueryNodes/QueryWhereNode.cs -System.Linq.Parallel.QueryNodes/QueryZipNode.cs -System.Linq.Parallel.QueryNodes/SetInclusion.cs -System.Linq.Parallel.QueryNodes/WrapHelper.cs -System.Linq.Parallel/AggregationList.cs -System.Linq.Parallel/ConcurrentGrouping.cs -System.Linq.Parallel/ConcurrentLookup.cs -System.Linq.Parallel/INodeVisitor.cs -System.Linq.Parallel/IVisitableNode.cs -System.Linq.Parallel/OrderingEnumerator.cs -System.Linq.Parallel/ParallelExecuter.cs -System.Linq.Parallel/ParallelPartitioner.cs -System.Linq.Parallel/ParallelQueryEnumerator.cs -System.Linq.Parallel/ParallelQuickSort.cs -System.Linq.Parallel/QueryCheckerVisitor.cs -System.Linq.Parallel/QueryIsOrderedVisitor.cs -System.Linq.Parallel/QueryOptions.cs -System.Linq.Parallel/RangeList.cs -System.Linq.Parallel/RepeatList.cs -System.Linq.Parallel/ReverseList.cs -System.Linq.Parallel/StripPartitioner.cs -System.Linq.Parallel/TemporaryArea.cs -System.Linq/EnumerableExecutor.cs -System.Linq/EnumerableExecutor_T.cs -System.Linq/EnumerableQuery.cs -System.Linq/EnumerableQuery_T.cs -System.Linq/OrderedParallelQuery.cs -System.Linq/ParallelEnumerable.cs -System.Linq/ParallelExecutionMode.cs -System.Linq/ParallelMergeOptions.cs -System.Linq/ParallelQuery.cs -System.IO.MemoryMappedFiles/MemoryMappedFile.cs -System.IO.MemoryMappedFiles/MemoryMappedFileAccess.cs -System.IO.MemoryMappedFiles/MemoryMappedFileOptions.cs -System.IO.MemoryMappedFiles/MemoryMappedFileRights.cs -System.IO.MemoryMappedFiles/MemoryMappedFileSecurity.cs -System.IO.MemoryMappedFiles/MemoryMappedViewStream.cs -System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.cs -Microsoft.Win32.SafeHandles/SafeMemoryMappedFileHandle.cs -Microsoft.Win32.SafeHandles/SafeMemoryMappedViewHandle.cs -System.IO/HandleInheritability.cs -System.Threading.Tasks/TaskExtensions.cs -System.Linq.Expressions/Extensions.cs -System.Linq.Expressions/ExpressionTransformer.cs -../dlr/Runtime/Microsoft.Scripting.Core/Ast/DynamicExpression.cs -../dlr/Runtime/Microsoft.Scripting.Core/Compiler/Closure.cs -System.Linq.Expressions/DynamicExpressionVisitor.cs +#include mobile_common_System.Core.dll.sources + +#include dynamic_System.Core.dll.sources diff --git a/mcs/class/System.Core/mobile_common_System.Core.dll.sources b/mcs/class/System.Core/mobile_common_System.Core.dll.sources new file mode 100644 index 00000000000..10e86231252 --- /dev/null +++ b/mcs/class/System.Core/mobile_common_System.Core.dll.sources @@ -0,0 +1,108 @@ +Assembly/AssemblyInfo.cs +System/Actions.cs +System/Funcs.cs +System/InvalidTimeZoneException.cs +System/TimeZoneInfo.AdjustmentRule.cs +System/TimeZoneInfo.cs +System/TimeZoneInfo.Serialization.cs +System/TimeZoneInfo.TransitionTime.cs +System/TimeZoneNotFoundException.cs +System/Util.cs +System.Runtime.CompilerServices/DynamicAttribute.cs +System.Runtime.CompilerServices/ExecutionScope.cs +System.Runtime.CompilerServices/ExtensionAttribute.cs +System.Runtime.CompilerServices/IStrongBox.cs +System.Runtime.CompilerServices/StrongBox_T.cs +System.Linq/Check.cs +System.Linq/Enumerable.cs +System.Linq/QueryableEnumerable.cs +System.Linq/QueryableTransformer.cs +System.Linq/Grouping.cs +System.Linq/IGrouping.cs +System.Linq/IOrderedQueryable.cs +System.Linq/IOrderedQueryable_T.cs +System.Linq/IOrderedEnumerable_T.cs +System.Linq/IQueryable.cs +System.Linq/IQueryable_T.cs +System.Linq/Lookup.cs +System.Linq/ILookup_T.cs +System.Linq/OrderedEnumerable.cs +System.Linq/OrderedSequence.cs +System.Linq/Queryable.cs +System.Linq/QuickSort.cs +System.Linq/SortContext.cs +System.Linq/SortDirection.cs +System.Linq/SortSequenceContext.cs +System.Linq/IQueryProvider.cs +System.Collections.Generic/HashSet.cs +System.Security.Cryptography/Aes.cs +System.Threading/LockRecursionPolicy.cs +System.Threading/ReaderWriterLockSlim.cs +System.Threading/ThreadLockState.cs +System.Threading/ReaderWriterLockSlimExtensions.cs +System.Linq.Parallel.QueryNodes/QueryBaseNode.cs +System.Linq.Parallel.QueryNodes/QueryCastNode.cs +System.Linq.Parallel.QueryNodes/QueryChildNode.cs +System.Linq.Parallel.QueryNodes/QueryConcatNode.cs +System.Linq.Parallel.QueryNodes/QueryDefaultEmptyNode.cs +System.Linq.Parallel.QueryNodes/QueryGroupByNode.cs +System.Linq.Parallel.QueryNodes/QueryHeadWorkerNode.cs +System.Linq.Parallel.QueryNodes/QueryJoinNode.cs +System.Linq.Parallel.QueryNodes/QueryMuxNode.cs +System.Linq.Parallel.QueryNodes/QueryOptionNode.cs +System.Linq.Parallel.QueryNodes/QueryOrderByNode.cs +System.Linq.Parallel.QueryNodes/QueryOrderGuardNode.cs +System.Linq.Parallel.QueryNodes/QueryOrderedStreamNode.cs +System.Linq.Parallel.QueryNodes/QueryReverseNode.cs +System.Linq.Parallel.QueryNodes/QuerySelectManyNode.cs +System.Linq.Parallel.QueryNodes/QuerySelectNode.cs +System.Linq.Parallel.QueryNodes/QuerySetNode.cs +System.Linq.Parallel.QueryNodes/QueryStartNode.cs +System.Linq.Parallel.QueryNodes/QueryStreamNode.cs +System.Linq.Parallel.QueryNodes/QueryWhereNode.cs +System.Linq.Parallel.QueryNodes/QueryZipNode.cs +System.Linq.Parallel.QueryNodes/SetInclusion.cs +System.Linq.Parallel.QueryNodes/WrapHelper.cs +System.Linq.Parallel/AggregationList.cs +System.Linq.Parallel/ConcurrentGrouping.cs +System.Linq.Parallel/ConcurrentLookup.cs +System.Linq.Parallel/INodeVisitor.cs +System.Linq.Parallel/IVisitableNode.cs +System.Linq.Parallel/OrderingEnumerator.cs +System.Linq.Parallel/ParallelExecuter.cs +System.Linq.Parallel/ParallelPartitioner.cs +System.Linq.Parallel/ParallelQueryEnumerator.cs +System.Linq.Parallel/ParallelQuickSort.cs +System.Linq.Parallel/QueryCheckerVisitor.cs +System.Linq.Parallel/QueryIsOrderedVisitor.cs +System.Linq.Parallel/QueryOptions.cs +System.Linq.Parallel/RangeList.cs +System.Linq.Parallel/RepeatList.cs +System.Linq.Parallel/ReverseList.cs +System.Linq.Parallel/StripPartitioner.cs +System.Linq.Parallel/TemporaryArea.cs +System.Linq/EnumerableExecutor.cs +System.Linq/EnumerableExecutor_T.cs +System.Linq/EnumerableQuery.cs +System.Linq/EnumerableQuery_T.cs +System.Linq/OrderedParallelQuery.cs +System.Linq/ParallelEnumerable.cs +System.Linq/ParallelExecutionMode.cs +System.Linq/ParallelMergeOptions.cs +System.Linq/ParallelQuery.cs +System.IO.MemoryMappedFiles/MemoryMappedFile.cs +System.IO.MemoryMappedFiles/MemoryMappedFileAccess.cs +System.IO.MemoryMappedFiles/MemoryMappedFileOptions.cs +System.IO.MemoryMappedFiles/MemoryMappedFileRights.cs +System.IO.MemoryMappedFiles/MemoryMappedFileSecurity.cs +System.IO.MemoryMappedFiles/MemoryMappedViewStream.cs +System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.cs +Microsoft.Win32.SafeHandles/SafeMemoryMappedFileHandle.cs +Microsoft.Win32.SafeHandles/SafeMemoryMappedViewHandle.cs +System.IO/HandleInheritability.cs +System.Threading.Tasks/TaskExtensions.cs +System.Linq.Expressions/Extensions.cs +System.Linq.Expressions/ExpressionTransformer.cs +../dlr/Runtime/Microsoft.Scripting.Core/Ast/DynamicExpression.cs +../dlr/Runtime/Microsoft.Scripting.Core/Compiler/Closure.cs +System.Linq.Expressions/DynamicExpressionVisitor.cs diff --git a/mcs/class/System.Core/mobile_static_System.Core.dll.sources b/mcs/class/System.Core/mobile_static_System.Core.dll.sources new file mode 100644 index 00000000000..6da190e2546 --- /dev/null +++ b/mcs/class/System.Core/mobile_static_System.Core.dll.sources @@ -0,0 +1,2 @@ +#include mobile_common_System.Core.dll.sources +#include interpreter_System.Core.dll.sources diff --git a/mcs/class/System.Core/monodroid_System.Core.dll.sources b/mcs/class/System.Core/monodroid_System.Core.dll.sources index c681f5a1f8b..7228e910c42 100644 --- a/mcs/class/System.Core/monodroid_System.Core.dll.sources +++ b/mcs/class/System.Core/monodroid_System.Core.dll.sources @@ -1,4 +1,4 @@ -#include mobile_System.Core.dll.sources +#include mobile_common_System.Core.dll.sources #include dynamic_System.Core.dll.sources diff --git a/mcs/class/System.Core/monotouch_System.Core.dll.sources b/mcs/class/System.Core/monotouch_System.Core.dll.sources index fad05a08f1c..1296c8186d0 100644 --- a/mcs/class/System.Core/monotouch_System.Core.dll.sources +++ b/mcs/class/System.Core/monotouch_System.Core.dll.sources @@ -1,3 +1,3 @@ -#include mobile_System.Core.dll.sources +#include mobile_common_System.Core.dll.sources #include interpreter_System.Core.dll.sources System/TimeZoneInfo.MonoTouch.cs diff --git a/mcs/class/System.Core/xammac_System.Core.dll.sources b/mcs/class/System.Core/xammac_System.Core.dll.sources index 6ede304927a..5cd8ddf660b 100644 --- a/mcs/class/System.Core/xammac_System.Core.dll.sources +++ b/mcs/class/System.Core/xammac_System.Core.dll.sources @@ -1,4 +1,4 @@ -#include mobile_System.Core.dll.sources +#include mobile_common_System.Core.dll.sources #include dynamic_System.Core.dll.sources diff --git a/mcs/class/System.Data.Services.Client/mobile_System.Data.Services.Client.dll.sources b/mcs/class/System.Data.Services.Client/mobile_System.Data.Services.Client.dll.sources index 5ad9459d88a..37dc2990c8d 100644 --- a/mcs/class/System.Data.Services.Client/mobile_System.Data.Services.Client.dll.sources +++ b/mcs/class/System.Data.Services.Client/mobile_System.Data.Services.Client.dll.sources @@ -1,2 +1 @@ -#include System.Data.Services.Client.dll.sources -./Client/AssemblyAttributes.cs +#include net_4_5_System.Data.Services.Client.dll.sources diff --git a/mcs/class/System.Interactive.Async/Makefile b/mcs/class/System.Interactive.Async/Makefile index 70740170701..71e2b0dfc58 100644 --- a/mcs/class/System.Interactive.Async/Makefile +++ b/mcs/class/System.Interactive.Async/Makefile @@ -21,7 +21,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid xammac net_4_0 net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monodroid mobile mobile_static xammac net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Interactive.Async.dll NO_SIGN_ASSEMBLY = yes diff --git a/mcs/class/System.Interactive.Providers/Makefile b/mcs/class/System.Interactive.Providers/Makefile index c74dccb7271..ae8749cc694 100644 --- a/mcs/class/System.Interactive.Providers/Makefile +++ b/mcs/class/System.Interactive.Providers/Makefile @@ -22,7 +22,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid xammac net_4_0 net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Interactive.Providers.dll NO_SIGN_ASSEMBLY = yes diff --git a/mcs/class/System.Interactive/Makefile b/mcs/class/System.Interactive/Makefile index ec5cd5c01df..1429c533ef9 100644 --- a/mcs/class/System.Interactive/Makefile +++ b/mcs/class/System.Interactive/Makefile @@ -21,7 +21,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid xammac net_4_0 net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Interactive.dll NO_SIGN_ASSEMBLY = yes diff --git a/mcs/class/System.Reactive.Core/Makefile b/mcs/class/System.Reactive.Core/Makefile index 3f74f8bf98e..624018c1098 100644 --- a/mcs/class/System.Reactive.Core/Makefile +++ b/mcs/class/System.Reactive.Core/Makefile @@ -35,7 +35,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) -VALID_PROFILE := $(filter monotouch monodroid xammac net_4_0 net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Core.dll NO_SIGN_ASSEMBLY = yes diff --git a/mcs/class/System.Reactive.Debugger/Makefile b/mcs/class/System.Reactive.Debugger/Makefile index c603f89a68a..3e308212455 100644 --- a/mcs/class/System.Reactive.Debugger/Makefile +++ b/mcs/class/System.Reactive.Debugger/Makefile @@ -24,7 +24,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid xammac net_4_0 net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Debugger.dll NO_SIGN_ASSEMBLY = yes diff --git a/mcs/class/System.Reactive.Experimental/Makefile b/mcs/class/System.Reactive.Experimental/Makefile index 234a63b12d9..834240acccc 100644 --- a/mcs/class/System.Reactive.Experimental/Makefile +++ b/mcs/class/System.Reactive.Experimental/Makefile @@ -24,7 +24,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid xammac net_4_0 net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Experimental.dll NO_SIGN_ASSEMBLY = yes diff --git a/mcs/class/System.Reactive.Interfaces/Makefile b/mcs/class/System.Reactive.Interfaces/Makefile index acee40d2960..fae46634976 100644 --- a/mcs/class/System.Reactive.Interfaces/Makefile +++ b/mcs/class/System.Reactive.Interfaces/Makefile @@ -21,7 +21,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid xammac net_4_0 net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Interfaces.dll NO_SIGN_ASSEMBLY = yes diff --git a/mcs/class/System.Reactive.Linq/Makefile b/mcs/class/System.Reactive.Linq/Makefile index 18a3360dafe..3906cfc6adc 100644 --- a/mcs/class/System.Reactive.Linq/Makefile +++ b/mcs/class/System.Reactive.Linq/Makefile @@ -36,7 +36,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) -VALID_PROFILE := $(filter monotouch monodroid xammac net_4_0 net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Linq.dll NO_SIGN_ASSEMBLY = yes diff --git a/mcs/class/System.Reactive.PlatformServices/Makefile b/mcs/class/System.Reactive.PlatformServices/Makefile index 187dd7702ff..6fccc274c42 100644 --- a/mcs/class/System.Reactive.PlatformServices/Makefile +++ b/mcs/class/System.Reactive.PlatformServices/Makefile @@ -42,7 +42,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:Mono.Reactive.Tests.dll EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) -VALID_PROFILE := $(filter monotouch monodroid xammac net_4_0 net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.PlatformServices.dll NO_SIGN_ASSEMBLY = yes diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile index c52a56468ff..f44d93a6f0e 100644 --- a/mcs/class/System.XML/Makefile +++ b/mcs/class/System.XML/Makefile @@ -13,7 +13,7 @@ ifdef USE_BOOT_COMPILE LIBRARY_COMPILE = $(BOOT_COMPILE) endif -PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammac, $(PROFILE)) +PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammac mobile mobile_static, $(PROFILE)) LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -nowarn:0618,0612,0642 ifeq (2.1, $(FRAMEWORK_VERSION)) @@ -127,4 +127,4 @@ ifneq ($(PROFILE),basic) csproj-local: $(MAKE) csproj-local intermediate=bare/ endif -endif
\ No newline at end of file +endif diff --git a/mcs/class/System.Xaml/Makefile b/mcs/class/System.Xaml/Makefile index 17d16132910..5104e87b042 100644 --- a/mcs/class/System.Xaml/Makefile +++ b/mcs/class/System.Xaml/Makefile @@ -18,7 +18,7 @@ TEST_EXTRA_DISTFILES = \ Test/XmlFiles/*.xml \ Test/XmlFiles/*.xaml -VALID_PROFILE := $(filter 4 monodroid monotouch, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter 4 monodroid monotouch mobile mobile_static, $(FRAMEWORK_VERSION_MAJOR)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.Xaml.dll NO_INSTALL = yes diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index 50bc1fce7d1..cfa7564d4b6 100644 --- a/mcs/class/System/Makefile +++ b/mcs/class/System/Makefile @@ -24,14 +24,10 @@ TEST_MCS_FLAGS = -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:Sy LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 -unsafe $(RESOURCE_FILES:%=-resource:%) TEST_MCS_FLAGS += -r:System.Configuration -PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammac, $(PROFILE)) -NOT_SL := $(filter net_2_0 net_4_0 net_4_5 monotouch_runtime mobile xammac, $(PROFILE)) +PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammaci mobile mobile_static, $(PROFILE)) ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:INSIDE_SYSTEM -ifeq (moonlight_raw, $(PROFILE)) -LIB_MCS_FLAGS += -d:SECURITY_DEP -endif endif ifeq (monotouch, $(subst _runtime,,$(PROFILE))) LIB_MCS_FLAGS += -d:SECURITY_DEP @@ -154,4 +150,4 @@ csproj-local: $(MAKE) csproj-local intermediate=bare/ $(MAKE) csproj-local intermediate=secxml/ endif -endif
\ No newline at end of file +endif |