From 97f919f7b763beb9f9d7f4545adf236b311be7e5 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 18 Jun 2015 20:09:13 +0200 Subject: Add a monotouch_watch profile. --- mcs/Makefile | 2 ++ mcs/build/profiles/monotouch_watch.make | 4 ++++ mcs/class/Facades/Makefile | 2 ++ mcs/class/Makefile | 3 +++ mcs/class/Mono.CSharp/Makefile | 2 +- mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources | 2 ++ mcs/class/Mono.Dynamic.Interpreter/Makefile | 2 +- mcs/class/Mono.Security/monotouch_watch_Mono.Security.dll.sources | 1 + mcs/class/System.ComponentModel.Composition.4.5/Makefile | 2 +- mcs/class/System.Core/Makefile | 2 +- mcs/class/System.Core/monotouch_watch_System.Core.dll.sources | 2 ++ .../monotouch_watch_System.Data.Services.Client.dll.sources | 1 + mcs/class/System.Data/Makefile | 2 +- mcs/class/System.Data/monotouch_watch_System.Data.dll.sources | 1 + mcs/class/System.Interactive.Async/Makefile | 2 +- mcs/class/System.Interactive.Providers/Makefile | 2 +- mcs/class/System.Interactive/Makefile | 2 +- .../System.Net.Http/monotouch_watch_System.Net.Http.dll.sources | 1 + mcs/class/System.Reactive.Core/Makefile | 2 +- mcs/class/System.Reactive.Debugger/Makefile | 2 +- mcs/class/System.Reactive.Experimental/Makefile | 2 +- mcs/class/System.Reactive.Interfaces/Makefile | 2 +- mcs/class/System.Reactive.Linq/Makefile | 2 +- mcs/class/System.Reactive.PlatformServices/Makefile | 2 +- .../monotouch_watch_System.Runtime.Serialization.dll.sources | 1 + .../monotouch_watch_System.ServiceModel.Web.dll.sources | 1 + .../monotouch_watch_System.ServiceModel.dll.sources | 1 + mcs/class/System.Transactions/Makefile | 2 +- mcs/class/System.Web.Services/Makefile | 2 +- .../monotouch_watch_System.Web.Services.dll.sources | 1 + mcs/class/System.XML/Makefile | 2 +- mcs/class/System.XML/monotouch_watch_System.Xml.dll.sources | 1 + mcs/class/System.Xaml/Makefile | 2 +- mcs/class/System/Makefile | 5 ++++- mcs/class/System/monotouch_watch_System.dll.sources | 1 + mcs/class/corlib/Makefile | 2 +- mcs/class/corlib/monotouch_watch_corlib.dll.sources | 1 + runtime/Makefile.am | 2 +- 38 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 mcs/build/profiles/monotouch_watch.make create mode 100644 mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources create mode 100644 mcs/class/Mono.Security/monotouch_watch_Mono.Security.dll.sources create mode 100644 mcs/class/System.Core/monotouch_watch_System.Core.dll.sources create mode 100644 mcs/class/System.Data.Services.Client/monotouch_watch_System.Data.Services.Client.dll.sources create mode 100644 mcs/class/System.Data/monotouch_watch_System.Data.dll.sources create mode 100644 mcs/class/System.Net.Http/monotouch_watch_System.Net.Http.dll.sources create mode 100644 mcs/class/System.Runtime.Serialization/monotouch_watch_System.Runtime.Serialization.dll.sources create mode 100644 mcs/class/System.ServiceModel.Web/monotouch_watch_System.ServiceModel.Web.dll.sources create mode 100644 mcs/class/System.ServiceModel/monotouch_watch_System.ServiceModel.dll.sources create mode 100644 mcs/class/System.Web.Services/monotouch_watch_System.Web.Services.dll.sources create mode 100644 mcs/class/System.XML/monotouch_watch_System.Xml.dll.sources create mode 100644 mcs/class/System/monotouch_watch_System.dll.sources create mode 100644 mcs/class/corlib/monotouch_watch_corlib.dll.sources diff --git a/mcs/Makefile b/mcs/Makefile index cb07044a7fd..8c40454ca32 100644 --- a/mcs/Makefile +++ b/mcs/Makefile @@ -8,6 +8,7 @@ basic_SUBDIRS := build jay mcs class build_SUBDIRS := build class mcs class/aot-compiler tools monodroid_SUBDIRS := build class monotouch_SUBDIRS := build class +monotouch_watch_SUBDIRS := build class monotouch_runtime_SUBDIRS := build class xammac_SUBDIRS := build class mobile_SUBDIRS := build class @@ -60,6 +61,7 @@ $(_boot_:%=profile-do--binary_reference_assemblies--%): profile-do--bi $(_boot_:%=profile-do--net_4_5--%): profile-do--net_4_5--%: profile-do--build--% $(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--% $(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--% +$(_boot_:%=profile-do--monotouch_watch--%): profile-do--monotouch_watch--%: profile-do--build--% $(_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--xammac_net_4_5--%): profile-do--xammac_net_4_5--%: profile-do--build--% diff --git a/mcs/build/profiles/monotouch_watch.make b/mcs/build/profiles/monotouch_watch.make new file mode 100644 index 00000000000..eb2880175ad --- /dev/null +++ b/mcs/build/profiles/monotouch_watch.make @@ -0,0 +1,4 @@ +include $(topdir)/build/profiles/monotouch.make + +PROFILE_MCS_FLAGS += \ + -d:MONOTOUCH_WATCH diff --git a/mcs/class/Facades/Makefile b/mcs/class/Facades/Makefile index cdbf120ea5d..f282abf814f 100644 --- a/mcs/class/Facades/Makefile +++ b/mcs/class/Facades/Makefile @@ -20,6 +20,8 @@ monodroid_SUBDIRS = $(net_4_5_SUBDIRS) xammac_SUBDIRS = $(net_4_5_SUBDIRS) xammac_net_4_5_SUBDIRS = $(net_4_5_SUBDIRS) +monotouch_watch_SUBDIRS = $(monotouch_SUBDIRS) + PROFILE_SUBDIRS = $(net_4_5_SUBDIRS) #OVERRIDE_TARGET_ALL = yes diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 70211dc1f21..5c9688b78d7 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -70,6 +70,8 @@ monodroid_dirs := \ monotouch_dirs := \ $(mobile_static_dirs) +monotouch_watch_dirs := $(monotouch_dirs) + monotouch_runtime_dirs := \ corlib \ System \ @@ -265,6 +267,7 @@ xbuild_4_0_dirs := \ monodroid_SUBDIRS := $(monodroid_dirs) monotouch_SUBDIRS := $(monotouch_dirs) +monotouch_watch_SUBDIRS := $(monotouch_watch_dirs) monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs) mobile_static_SUBDIRS := $(mobile_static_dirs) mobile_SUBDIRS := $(mobile_dynamic_dirs) diff --git a/mcs/class/Mono.CSharp/Makefile b/mcs/class/Mono.CSharp/Makefile index 74f8e7ae15e..74a1f0fe8f1 100644 --- a/mcs/class/Mono.CSharp/Makefile +++ b/mcs/class/Mono.CSharp/Makefile @@ -7,7 +7,7 @@ LIBRARY = Mono.CSharp.dll LIB_REFS = System.Core System.Xml System LIB_MCS_FLAGS = -MOBILE_STATIC := $(filter mobile_static monotouch, $(PROFILE)) +MOBILE_STATIC := $(filter mobile_static monotouch monotouch_watch, $(PROFILE)) ifdef MOBILE_STATIC LIB_MCS_FLAGS += -d:IOS_REFLECTION diff --git a/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources new file mode 100644 index 00000000000..6a71501e34c --- /dev/null +++ b/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources @@ -0,0 +1,2 @@ +#include mobile_static_Mono.CSharp.dll.sources +monotouch.cs diff --git a/mcs/class/Mono.Dynamic.Interpreter/Makefile b/mcs/class/Mono.Dynamic.Interpreter/Makefile index a8cdba45d46..fd1d15500a6 100644 --- a/mcs/class/Mono.Dynamic.Interpreter/Makefile +++ b/mcs/class/Mono.Dynamic.Interpreter/Makefile @@ -10,7 +10,7 @@ LIB_MCS_FLAGS = \ -d:MONO_INTERPRETER \ -delaysign -keyfile:../mono.pub -MOBILE_STATIC := $(filter mobile_static monotouch monotouch_runtime, $(PROFILE)) +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 diff --git a/mcs/class/Mono.Security/monotouch_watch_Mono.Security.dll.sources b/mcs/class/Mono.Security/monotouch_watch_Mono.Security.dll.sources new file mode 100644 index 00000000000..007d94062fd --- /dev/null +++ b/mcs/class/Mono.Security/monotouch_watch_Mono.Security.dll.sources @@ -0,0 +1 @@ +#include monotouch_Mono.Security.dll.sources \ No newline at end of file diff --git a/mcs/class/System.ComponentModel.Composition.4.5/Makefile b/mcs/class/System.ComponentModel.Composition.4.5/Makefile index ebf971c11b9..617cc35d89b 100644 --- a/mcs/class/System.ComponentModel.Composition.4.5/Makefile +++ b/mcs/class/System.ComponentModel.Composition.4.5/Makefile @@ -13,7 +13,7 @@ CLEAN_FILES += $(STRING_MESSAGES) EXTRA_DISTFILES = \ src/ComponentModel/Strings.resx -VALID_PROFILE := $(filter net_4_5 monotouch monodroid xammac xammac_net_4_5 mobile mobile_static, $(PROFILE)) +VALID_PROFILE := $(filter net_4_5 monotouch monotouch_watch monodroid xammac xammac_net_4_5 mobile mobile_static, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.ComponentModel.Composition.dll NO_INSTALL = yes diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile index 12226e3d2e9..a115311812c 100644 --- a/mcs/class/System.Core/Makefile +++ b/mcs/class/System.Core/Makefile @@ -14,7 +14,7 @@ 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, $(PROFILE)) +MOBILE_STATIC := $(filter mobile_static monotouch monotouch_runtime monotouch_watch, $(PROFILE)) ifdef MOBILE_DYNAMIC LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR,FEATURE_REFEMIT diff --git a/mcs/class/System.Core/monotouch_watch_System.Core.dll.sources b/mcs/class/System.Core/monotouch_watch_System.Core.dll.sources new file mode 100644 index 00000000000..7d32d44a88b --- /dev/null +++ b/mcs/class/System.Core/monotouch_watch_System.Core.dll.sources @@ -0,0 +1,2 @@ +#include common_System.Core.dll.sources +#include interpreter_System.Core.dll.sources diff --git a/mcs/class/System.Data.Services.Client/monotouch_watch_System.Data.Services.Client.dll.sources b/mcs/class/System.Data.Services.Client/monotouch_watch_System.Data.Services.Client.dll.sources new file mode 100644 index 00000000000..37dc2990c8d --- /dev/null +++ b/mcs/class/System.Data.Services.Client/monotouch_watch_System.Data.Services.Client.dll.sources @@ -0,0 +1 @@ +#include net_4_5_System.Data.Services.Client.dll.sources diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile index 82f49a2804e..3ab96408521 100644 --- a/mcs/class/System.Data/Makefile +++ b/mcs/class/System.Data/Makefile @@ -12,7 +12,7 @@ LIB_MCS_FLAGS = \ -d:MONO_PARTIAL_DATA_IMPORT \ -unsafe -MOBILE := $(filter monotouch monodroid xammac mobile mobile_static, $(PROFILE)) +MOBILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static, $(PROFILE)) ifdef MOBILE LIB_REFS += Mono.Data.Tds System.Transactions LIB_MCS_FLAGS += -d:NO_CODEDOM -d:NO_OLEDB -d:NO_ODBC -d:NO_CONFIGURATION diff --git a/mcs/class/System.Data/monotouch_watch_System.Data.dll.sources b/mcs/class/System.Data/monotouch_watch_System.Data.dll.sources new file mode 100644 index 00000000000..bbc860b8cd7 --- /dev/null +++ b/mcs/class/System.Data/monotouch_watch_System.Data.dll.sources @@ -0,0 +1 @@ +#include mobile_System.Data.dll.sources diff --git a/mcs/class/System.Interactive.Async/Makefile b/mcs/class/System.Interactive.Async/Makefile index 8fa6632c72a..f7662a4ce00 100644 --- a/mcs/class/System.Interactive.Async/Makefile +++ b/mcs/class/System.Interactive.Async/Makefile @@ -19,7 +19,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid mobile mobile_static xammac net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monotouch_watch monodroid mobile mobile_static xammac 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 a6381f50d89..eab4068fd9b 100644 --- a/mcs/class/System.Interactive.Providers/Makefile +++ b/mcs/class/System.Interactive.Providers/Makefile @@ -19,7 +19,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static 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 b28f3b343df..70749cc0163 100644 --- a/mcs/class/System.Interactive/Makefile +++ b/mcs/class/System.Interactive/Makefile @@ -19,7 +19,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Interactive.dll NO_SIGN_ASSEMBLY = yes diff --git a/mcs/class/System.Net.Http/monotouch_watch_System.Net.Http.dll.sources b/mcs/class/System.Net.Http/monotouch_watch_System.Net.Http.dll.sources new file mode 100644 index 00000000000..685ab03d98b --- /dev/null +++ b/mcs/class/System.Net.Http/monotouch_watch_System.Net.Http.dll.sources @@ -0,0 +1 @@ +#include monotouch_System.Net.Http.dll.sources \ No newline at end of file diff --git a/mcs/class/System.Reactive.Core/Makefile b/mcs/class/System.Reactive.Core/Makefile index 2928707e8ca..cf89862c556 100644 --- a/mcs/class/System.Reactive.Core/Makefile +++ b/mcs/class/System.Reactive.Core/Makefile @@ -34,7 +34,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) -VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static 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 2d4bc4fcc72..595774c6183 100644 --- a/mcs/class/System.Reactive.Debugger/Makefile +++ b/mcs/class/System.Reactive.Debugger/Makefile @@ -19,7 +19,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static 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 2d66a6010b8..a798e522401 100644 --- a/mcs/class/System.Reactive.Experimental/Makefile +++ b/mcs/class/System.Reactive.Experimental/Makefile @@ -19,7 +19,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static 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 5962757a17f..c2dc76ce60d 100644 --- a/mcs/class/System.Reactive.Interfaces/Makefile +++ b/mcs/class/System.Reactive.Interfaces/Makefile @@ -19,7 +19,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static 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 480a20543f2..2cfaa902373 100644 --- a/mcs/class/System.Reactive.Linq/Makefile +++ b/mcs/class/System.Reactive.Linq/Makefile @@ -34,7 +34,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) -VALID_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static 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 9192c21468a..5d92774a6b4 100644 --- a/mcs/class/System.Reactive.PlatformServices/Makefile +++ b/mcs/class/System.Reactive.PlatformServices/Makefile @@ -39,7 +39,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 mobile mobile_static net_4_5, $(PROFILE)) +VALID_PROFILE := $(filter monotouch monotouch_watch monodroid xammac mobile mobile_static 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.Runtime.Serialization/monotouch_watch_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/monotouch_watch_System.Runtime.Serialization.dll.sources new file mode 100644 index 00000000000..6caafd41198 --- /dev/null +++ b/mcs/class/System.Runtime.Serialization/monotouch_watch_System.Runtime.Serialization.dll.sources @@ -0,0 +1 @@ +#include mobile_System.Runtime.Serialization.dll.sources diff --git a/mcs/class/System.ServiceModel.Web/monotouch_watch_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/monotouch_watch_System.ServiceModel.Web.dll.sources new file mode 100644 index 00000000000..cbea0fae7b4 --- /dev/null +++ b/mcs/class/System.ServiceModel.Web/monotouch_watch_System.ServiceModel.Web.dll.sources @@ -0,0 +1 @@ +#include mobile_System.ServiceModel.Web.dll.sources diff --git a/mcs/class/System.ServiceModel/monotouch_watch_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/monotouch_watch_System.ServiceModel.dll.sources new file mode 100644 index 00000000000..22ece5ce8ce --- /dev/null +++ b/mcs/class/System.ServiceModel/monotouch_watch_System.ServiceModel.dll.sources @@ -0,0 +1 @@ +#include mobile_System.ServiceModel.dll.sources diff --git a/mcs/class/System.Transactions/Makefile b/mcs/class/System.Transactions/Makefile index 46df964af01..ba910861e3b 100644 --- a/mcs/class/System.Transactions/Makefile +++ b/mcs/class/System.Transactions/Makefile @@ -2,7 +2,7 @@ thisdir = class/System.Transactions SUBDIRS = include ../../build/rules.make -MOBILE_PROFILE := $(filter monotouch monodroid xammac mobile mobile_static, $(PROFILE)) +MOBILE_PROFILE := $(filter monotouch monotouch_runtime monotouch_watch monodroid xammac mobile mobile_static, $(PROFILE)) LIBRARY = System.Transactions.dll ifdef MOBILE_PROFILE diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile index ca3e6878fba..a77c3683895 100644 --- a/mcs/class/System.Web.Services/Makefile +++ b/mcs/class/System.Web.Services/Makefile @@ -3,7 +3,7 @@ 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 = \ diff --git a/mcs/class/System.Web.Services/monotouch_watch_System.Web.Services.dll.sources b/mcs/class/System.Web.Services/monotouch_watch_System.Web.Services.dll.sources new file mode 100644 index 00000000000..9e39dcc73b1 --- /dev/null +++ b/mcs/class/System.Web.Services/monotouch_watch_System.Web.Services.dll.sources @@ -0,0 +1 @@ +#include mobile_System.Web.Services.dll.sources diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile index 1d5298bcd3a..4e1d65c8e8d 100644 --- a/mcs/class/System.XML/Makefile +++ b/mcs/class/System.XML/Makefile @@ -17,7 +17,7 @@ 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 monodroid xammac mobile mobile_static, $(PROFILE)) +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 diff --git a/mcs/class/System.XML/monotouch_watch_System.Xml.dll.sources b/mcs/class/System.XML/monotouch_watch_System.Xml.dll.sources new file mode 100644 index 00000000000..b6630930f75 --- /dev/null +++ b/mcs/class/System.XML/monotouch_watch_System.Xml.dll.sources @@ -0,0 +1 @@ +#include mobile_System.Xml.dll.sources diff --git a/mcs/class/System.Xaml/Makefile b/mcs/class/System.Xaml/Makefile index 884452d6ed9..4b87a21275b 100644 --- a/mcs/class/System.Xaml/Makefile +++ b/mcs/class/System.Xaml/Makefile @@ -15,7 +15,7 @@ TEST_EXTRA_DISTFILES = \ Test/XmlFiles/*.xml \ Test/XmlFiles/*.xaml -VALID_PROFILE := $(filter 4 monodroid monotouch mobile mobile_static, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter 4 monodroid monotouch monotouch_watch 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 9e072e80c17..8136bb048ae 100644 --- a/mcs/class/System/Makefile +++ b/mcs/class/System/Makefile @@ -25,7 +25,7 @@ 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 monodroid xammac mobile mobile_static, $(PROFILE)) +PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monotouch_watch monodroid xammac mobile mobile_static, $(PROFILE)) RESOURCE_STRINGS = ../../../external/referencesource/System/System.txt @@ -35,6 +35,9 @@ endif ifeq (monotouch, $(subst _runtime,,$(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 diff --git a/mcs/class/System/monotouch_watch_System.dll.sources b/mcs/class/System/monotouch_watch_System.dll.sources new file mode 100644 index 00000000000..7c0bd5983a5 --- /dev/null +++ b/mcs/class/System/monotouch_watch_System.dll.sources @@ -0,0 +1 @@ +#include monotouch_System.dll.sources diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index 40586b76082..ddd9cb43a31 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -37,7 +37,7 @@ 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, $(PROFILE)) +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 diff --git a/mcs/class/corlib/monotouch_watch_corlib.dll.sources b/mcs/class/corlib/monotouch_watch_corlib.dll.sources new file mode 100644 index 00000000000..9e173da97f7 --- /dev/null +++ b/mcs/class/corlib/monotouch_watch_corlib.dll.sources @@ -0,0 +1 @@ +#include corlib.dll.sources \ No newline at end of file diff --git a/runtime/Makefile.am b/runtime/Makefile.am index f3b3893d1be..8f9d7470e0f 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -37,7 +37,7 @@ build_profiles += monodroid endif if INSTALL_MONOTOUCH -build_profiles += monotouch monotouch_runtime +build_profiles += monotouch monotouch_runtime monotouch_watch endif if INSTALL_XAMMAC -- cgit v1.2.3