Added the new mobile profile to the build.

diff --git a/configure.in b/configure.in
index a88b53b961bf9011f9bc18b7654692251275ba33..bd4fac85072c6b8b3a1db0489b03274e58d22f94 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2727,6 +2727,7 @@ esac
 AC_ARG_WITH(profile4,  [  --with-profile4=yes,no          If you want to install the 4.0 FX (defaults to yes)],                  [], [with_profile4=yes])
 AC_ARG_WITH(monodroid, [  --with-monodroid=yes,no         If you want to build the MonoDroid 2.1 assemblies (defaults to no)], [], [with_monodroid=no])
 AC_ARG_WITH(monotouch, [  --with-monotouch=yes,no         If you want to build the MonoTouch 2.1 assemblies (defaults to no)], [], [with_monotouch=no])
+AC_ARG_WITH(mobile,    [  --with-mobile=yes,no            If you want to build the Mobile 2.1 assemblies (defaults to no)], [], [with_mobile=no])
 
 OPROFILE=no
 AC_ARG_WITH(oprofile,[  --with-oprofile=no,<oprofile install dir>   Enable oprofile support (defaults to no)],[
@@ -2807,6 +2808,7 @@ AM_CONDITIONAL(MOONLIGHT_SGEN, [test "x$with_moon_gc" = "xsgen"])
 AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
 AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" = xyes])
 AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" = xyes])
+AM_CONDITIONAL(INSTALL_MOBILE, [test "x$with_mobile" = xyes])
 
 AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
 AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
@@ -3165,6 +3167,7 @@ echo "
        Moon Profile:  $with_moonlight ($with_moon_gc)
        MonoDroid:     $with_monodroid
        MonoTouch:     $with_monotouch
+       Mobile:        $with_mobile
        JNI support:   $jdk_headers_found
        libgdiplus:    $libgdiplus_msg
        zlib:          $zlib_msg

diff --git a/mcs/Makefile b/mcs/Makefile
index 65696ace3a7923471582d489611d2d35d04e62d1..37576edc4fe9571bc26397c4f37d4a32bc60bfb9 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -10,6 +10,7 @@ net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors
 moonlight_raw_SUBDIRS := build class
 monodroid_SUBDIRS := build class
 monotouch_SUBDIRS := build class
+mobile_SUBDIRS := build class
 net_3_5_SUBDIRS := build class tools/xbuild
 net_4_0_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
 
@@ -107,6 +108,7 @@ $(_boot_:%=profile-do--net_3_5--%):           profile-do--net_3_5--%:
 $(_boot_:%=profile-do--moonlight--%):         profile-do--moonlight--%:         profile-do--moonlight_raw--%
 $(_boot_:%=profile-do--monodroid--%):         profile-do--monodroid--%:         profile-do--build--%
 $(_boot_:%=profile-do--monotouch--%):         profile-do--monotouch--%:         profile-do--build--%
+$(_boot_:%=profile-do--mobile--%):            profile-do--mobile--%:         profile-do--build--%
 $(_boot_:%=profile-do--moonlight_raw--%):     profile-do--moonlight_raw--%:     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
new file mode 100644 (file)
index 0000000..ffebea4
--- /dev/null
+++ b/mcs/build/profiles/mobile.make
@@ -0,0 +1,15 @@
+#! -*- makefile -*-
+
+BOOTSTRAP_PROFILE = build
+
+BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
+MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
+
+profile-check:
+       @:
+
+DEFAULT_REFERENCES = -r:mscorlib.dll
+PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOBILE -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
+FRAMEWORK_VERSION = 2.1
+
+NO_INSTALL = yes

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 0800dd07b4a1929767baece81af444b2ae0e0ef5..71f858822313a2eb3420395f7638f1b43173a437 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -193,6 +193,7 @@ net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) aot-compi
 moonlight_raw_SUBDIRS := $(moonlight_raw_dirs)
 monodroid_SUBDIRS := $(mobile_dirs)
 monotouch_SUBDIRS := $(mobile_dirs)
+mobile_SUBDIRS := $(mobile_dirs)
 net_3_5_SUBDIRS := $(net_3_5_only_dirs)
 net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) aot-compiler
 

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
new file mode 100644 (file)
index 0000000..5ad9459
--- /dev/null
+++ b/mcs/class/System.Data.Services.Client/mobile_System.Data.Services.Client.dll.sources
@@ -0,0 +1,2 @@
+#include System.Data.Services.Client.dll.sources
+./Client/AssemblyAttributes.cs

diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile
index 2c43f38c27f587f8160490acf65bd08d80936f9b..c433babfb008f24d424136e36b58e4280f134e09 100644 (file)
--- a/mcs/class/System.Data/Makefile
+++ b/mcs/class/System.Data/Makefile
@@ -31,7 +31,7 @@ LIB_MCS_FLAGS +=      \
        -r:J2SE.Helpers.dll                     \
        $(OTHER_LIB_MCS_FLAGS)
 else 
-MOBILE := $(filter monotouch monodroid, $(PROFILE))
+MOBILE := $(filter monotouch monodroid mobile, $(PROFILE))
 ifdef MOBILE
 LIB_MCS_FLAGS += \
        -r:Mono.Data.Tds.dll \

diff --git a/mcs/class/System.Transactions/Makefile b/mcs/class/System.Transactions/Makefile
index 95696e807507d11fc0856bb5130a6cae5edd9cb3..0eb652f45a93265aef547c7f4ab83635df0eab2d 100644 (file)
--- 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, $(PROFILE))
+MOBILE_PROFILE := $(filter monotouch monodroid mobile, $(PROFILE))
 
 LIBRARY = System.Transactions.dll
 ifdef MOBILE_PROFILE
@@ -14,7 +14,7 @@ endif
 TEST_MCS_FLAGS = /nowarn:1595 $(LIB_MCS_FLAGS)
 
 # This is a .NET 2.0+ only assembly
-VALID_PROFILE := $(filter net_2_0 net_4_0 monotouch monodroid, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 net_4_0 monotouch monodroid mobile, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Transactions.dll
 NO_INSTALL = yes

diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile
index 666ebdbcf36f1ede9671b71274191d1964b86b1b..5a13d8ec0214e6d50ecf03b2ca9d6455e0a08bb6 100644 (file)
--- 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, $(PROFILE))
+MOBILE := $(filter monotouch monodroid mobile, $(PROFILE))
 ifdef MOBILE
 LIB_MCS_FLAGS = \
        -nowarn:649 -nowarn:169                 \

diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index 21872462f9c8815c504f5ad53253c7b73f103565..9ab57cd253b1324ee4dd0eb44041c5f7a401db06 100644 (file)
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -27,7 +27,7 @@ ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 -unsafe $(RESOURCE_FILES:%=-resource:%)
 TEST_MCS_FLAGS += -r:System.Configuration
 PROFILE_2_OR_4 := $(filter net_2_0 net_4_0, $(PROFILE))
-NOT_SL := $(filter net_2_0 net_4_0 monotouch monodroid, $(PROFILE))
+NOT_SL := $(filter net_2_0 net_4_0 monotouch monodroid mobile, $(PROFILE))
 endif
 ifeq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:INSIDE_SYSTEM

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index dde00adef647541e718a6758f25cf315d16da592..8250332863b324de6211a06e05a75ea2c93fd371 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -68,6 +68,10 @@ if INSTALL_MONOTOUCH
 build_profiles += monotouch
 endif
 
+if INSTALL_MOBILE
+build_profiles += mobile
+endif
+
 endif
 
 if BUILD_MCS