Renamed profile to winaot (#4190)

diff --git a/configure.ac b/configure.ac
index 6bbe325553459692b1ccf1b55dd39d747bb7d5ce..d7e91e1b2ed7869e64bd128f7741b1be8b921dae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -802,7 +802,7 @@ AC_ARG_WITH(bitcode,             [  --with-bitcode=yes,no               If bitco
 AC_ARG_WITH(xammac,              [  --with-xammac=yes,no                If you want to build the Xamarin.Mac assemblies (defaults to no)],          [], [with_xammac=default])
 AC_ARG_WITH(testing_aot_hybrid,  [  --with-testing_aot_hybrid=yes,no    If you want to build the testing_aot_hybrid assemblies (defaults to no)],   [], [with_testing_aot_hybrid=default])
 AC_ARG_WITH(testing_aot_full,    [  --with-testing_aot_full=yes,no      If you want to build the testing_aot_full assemblies (defaults to no)],     [], [with_testing_aot_full=default])
-AC_ARG_WITH(xbox,                [  --with-xbox=yes,no                  If you want to build the Xbox assemblies (defaults to no)],                 [], [with_xbox=default])
+AC_ARG_WITH(winaot,              [  --with-winaot=yes,no                If you want to build the Windows friendly AOT assemblies (defaults to no)], [], [with_winaot=default])
 
 AC_ARG_WITH(runtime_preset, [  --with-runtime_preset=net_4_x,all,aot,hybridaot,fullaot,bitcode   Which default profile to build (defaults to net_4_x)],  [], [with_runtime_preset=net_4_x])
 
@@ -820,7 +820,7 @@ with_monotouch_tv_default=no
 with_xammac_default=no
 with_testing_aot_hybrid_default=no
 with_testing_aot_full_default=no
-with_xbox_default=no
+with_winaot_default=no
 
 with_bitcode_default=no
 with_cooperative_gc_default=no
@@ -838,7 +838,7 @@ elif test x$with_runtime_preset = xall; then
    with_monotouch_watch_default=yes
    with_monotouch_tv_default=yes
    with_xammac_default=yes
-   with_xbox_default=yes
+   with_winaot_default=yes
 elif test x$with_runtime_preset = xfullaot; then
    DISABLE_MCS_DOCS_default=yes
    with_testing_aot_full_default=yes
@@ -926,8 +926,8 @@ fi
 if test "x$with_testing_aot_full" = "xdefault"; then
    with_testing_aot_full=$with_testing_aot_full_default
 fi
-if test "x$with_xbox" = "xdefault"; then
-   with_xbox=$with_xbox_default
+if test "x$with_winaot" = "xdefault"; then
+   with_winaot=$with_winaot_default
 fi
 
 
@@ -940,7 +940,7 @@ AM_CONDITIONAL(BITCODE, test "x$with_bitcode" = "xyes")
 AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
 AM_CONDITIONAL(INSTALL_TESTING_AOT_HYBRID, [test "x$with_testing_aot_hybrid" != "xno"])
 AM_CONDITIONAL(INSTALL_TESTING_AOT_FULL, [test "x$with_testing_aot_full" != "xno"])
-AM_CONDITIONAL(INSTALL_XBOX, [test "x$with_xbox" != "xno"])
+AM_CONDITIONAL(INSTALL_WINAOT, [test "x$with_winaot" != "xno"])
 
 AC_SUBST(INSTALL_TESTING_AOT_HYBRID)
 AC_SUBST(INSTALL_TESTING_AOT_FULL)
@@ -4502,7 +4502,7 @@ echo "
        Xamarin.WatchOS: $with_monotouch_watch
        Xamarin.TVOS:    $with_monotouch_tv
        Xamarin.Mac:     $with_xammac
-       Xbox:            $with_xbox
+       Windows AOT:     $with_winaot
        Test profiles:   AOT Full ($with_testing_aot_full), AOT Hybrid ($with_testing_aot_hybrid)
        JNI support:     $jdk_headers_found
        libgdiplus:      $libgdiplus_msg

diff --git a/mcs/Makefile b/mcs/Makefile
index a3e4132385fb5ad84379b6bc9b95f6e88f985997..043acf5563c9102864010136d29cfdfde3c78238 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -21,7 +21,7 @@ net_4_x_SUBDIRS := build class nunit24 ilasm tools tests errors docs mcs class/a
 xammac_net_4_5_SUBDIRS := build class
 xbuild_12_SUBDIRS := build class tools/xbuild
 xbuild_14_SUBDIRS := build class tools/xbuild
-xbox_SUBDIRS := build class
+winaot_SUBDIRS := build class
 
 include build/rules.make
 
@@ -74,7 +74,7 @@ $(_boot_:%=profile-do--xammac--%):            profile-do--xammac--%:
 $(_boot_:%=profile-do--xammac_net_4_5--%):    profile-do--xammac_net_4_5--%:           profile-do--build--%
 $(_boot_:%=profile-do--testing_aot_hybrid--%):        profile-do--testing_aot_hybrid--%:        profile-do--build--%
 $(_boot_:%=profile-do--testing_aot_full--%):          profile-do--testing_aot_full--%:          profile-do--build--%
-$(_boot_:%=profile-do--xbox--%):              profile-do--xbox--%:              profile-do--build--%
+$(_boot_:%=profile-do--winaot--%):              profile-do--winaot--%:              profile-do--build--%
 $(_boot_:%=profile-do--build--%):             profile-do--build--%:             profile-do--basic--%
 
 testcorlib:

diff --git a/mcs/build/profiles/winaot.make b/mcs/build/profiles/winaot.make
new file mode 100644 (file)
index 0000000..edd9f4e
--- /dev/null
+++ b/mcs/build/profiles/winaot.make
@@ -0,0 +1,45 @@
+#! -*- makefile -*-
+
+BOOTSTRAP_PROFILE = build
+
+BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
+MCS = $(BOOTSTRAP_MCS)
+
+# Use system resgen as we don't want local System.Windows.Forms dependency
+RESGEN = resgen2
+
+profile-check:
+       @:
+
+DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/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:MONO \
+       -d:NETSTANDARD \
+       -d:MOBILE,MOBILE_LEGACY \
+       -d:FULL_AOT_DESKTOP     \
+       -d:FULL_AOT_RUNTIME \
+       -d:DISABLE_REMOTING \
+       -d:DISABLE_COM \
+       -nowarn:1699 \
+       -nostdlib \
+       $(DEFAULT_REFERENCES) \
+       $(PLATFORM_DEBUG_FLAGS)
+
+FRAMEWORK_VERSION = 2.1
+
+# the tuner takes care of the install
+NO_INSTALL = yes
+AOT_FRIENDLY_PROFILE = yes
+ALWAYS_AOT = yes
+MOBILE_PROFILE = yes
+NO_VTS_TEST = yes
+
+# Note need for trailing comma. If you add, keep it
+PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking,PKITS,

diff --git a/mcs/build/profiles/xbox.make b/mcs/build/profiles/xbox.make
deleted file mode 100644 (file)
index edd9f4e..0000000
--- a/mcs/build/profiles/xbox.make
+++ /dev/null
@@ -1,45 +0,0 @@
-#! -*- makefile -*-
-
-BOOTSTRAP_PROFILE = build
-
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
-MCS = $(BOOTSTRAP_MCS)
-
-# Use system resgen as we don't want local System.Windows.Forms dependency
-RESGEN = resgen2
-
-profile-check:
-       @:
-
-DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/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:MONO \
-       -d:NETSTANDARD \
-       -d:MOBILE,MOBILE_LEGACY \
-       -d:FULL_AOT_DESKTOP     \
-       -d:FULL_AOT_RUNTIME \
-       -d:DISABLE_REMOTING \
-       -d:DISABLE_COM \
-       -nowarn:1699 \
-       -nostdlib \
-       $(DEFAULT_REFERENCES) \
-       $(PLATFORM_DEBUG_FLAGS)
-
-FRAMEWORK_VERSION = 2.1
-
-# the tuner takes care of the install
-NO_INSTALL = yes
-AOT_FRIENDLY_PROFILE = yes
-ALWAYS_AOT = yes
-MOBILE_PROFILE = yes
-NO_VTS_TEST = yes
-
-# Note need for trailing comma. If you add, keep it
-PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking,PKITS,

diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make
index e0727b721687d17986665a922ae6425b6bca4fdf..cae2d391a4b2c3270ff4c9b937af730143c91762 100644 (file)
--- a/mcs/class/Facades/subdirs.make
+++ b/mcs/class/Facades/subdirs.make
@@ -68,7 +68,7 @@ monotouch_watch_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
 monotouch_tv_SUBDIRS = $(monotouch_SUBDIRS)
 monotouch_tv_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
 
-xbox_PARALLEL_SUBDIRS :=
+winaot_PARALLEL_SUBDIRS :=
 
 mobile_only_SUBDIRS = System.Net.Ping System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp System.Security.Cryptography.Pkcs \
 System.Security.Cryptography.Cng

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index ba4de5ede59d24e92de27dc9a2b9f940e692d730..5e16e42b3bd3bb18b1d7d3a1f6ac853b5e9e3e74 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -123,7 +123,7 @@ monotouch_runtime_dirs := \
 monotouch_watch_runtime_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_runtime_dirs))
 monotouch_tv_runtime_dirs := $(monotouch_runtime_dirs)
 
-xbox_dirs := $(monotouch_dirs) System.Drawing
+winaot_dirs := $(monotouch_dirs) System.Drawing
 
 xammac_4_5_dirs := \
        corlib  \
@@ -343,7 +343,7 @@ net_4_x_SUBDIRS := $(net_4_x_dirs) $(xbuild_4_0_dirs)
 net_4_x_PARALLEL_SUBDIRS := $(net_4_x_parallel_dirs)
 xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
 xbuild_14_SUBDIRS := $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks
-xbox_SUBDIRS := $(xbox_dirs)
+winaot_SUBDIRS := $(winaot_dirs)
 
 include ../build/rules.make
 

diff --git a/mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources
new file mode 100644 (file)
index 0000000..4c30fc6
--- /dev/null
+++ b/mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources
@@ -0,0 +1,4 @@
+#include Mono.CSharp.dll.sources
+../corlib/System.Reflection.Emit/PEFileKinds.cs
+../corlib/System.Reflection.Emit/MethodToken.cs
+monotouch.cs

diff --git a/mcs/class/Mono.CSharp/xbox_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/xbox_Mono.CSharp.dll.sources
deleted file mode 100644 (file)
index 4c30fc6..0000000
--- a/mcs/class/Mono.CSharp/xbox_Mono.CSharp.dll.sources
+++ /dev/null
@@ -1,4 +0,0 @@
-#include Mono.CSharp.dll.sources
-../corlib/System.Reflection.Emit/PEFileKinds.cs
-../corlib/System.Reflection.Emit/MethodToken.cs
-monotouch.cs

diff --git a/mcs/class/Mono.Security/winaot_Mono.Security.dll.sources b/mcs/class/Mono.Security/winaot_Mono.Security.dll.sources
new file mode 100644 (file)
index 0000000..87eaa00
--- /dev/null
+++ b/mcs/class/Mono.Security/winaot_Mono.Security.dll.sources
@@ -0,0 +1,5 @@
+#include mobile_Mono.Security.dll.sources
+./Mono.Security.Cryptography/ARC4Managed.cs
+./Mono.Security.Cryptography/MD2Managed.cs
+./Mono.Security.Cryptography/MD4Managed.cs
+./Mono.Security.Cryptography/SHA224Managed.cs

diff --git a/mcs/class/Mono.Security/xbox_Mono.Security.dll.sources b/mcs/class/Mono.Security/xbox_Mono.Security.dll.sources
deleted file mode 100644 (file)
index 87eaa00..0000000
--- a/mcs/class/Mono.Security/xbox_Mono.Security.dll.sources
+++ /dev/null
@@ -1,5 +0,0 @@
-#include mobile_Mono.Security.dll.sources
-./Mono.Security.Cryptography/ARC4Managed.cs
-./Mono.Security.Cryptography/MD2Managed.cs
-./Mono.Security.Cryptography/MD4Managed.cs
-./Mono.Security.Cryptography/SHA224Managed.cs

diff --git a/mcs/class/System.Core/winaot_System.Core.dll.sources b/mcs/class/System.Core/winaot_System.Core.dll.sources
new file mode 100644 (file)
index 0000000..a7b1796
--- /dev/null
+++ b/mcs/class/System.Core/winaot_System.Core.dll.sources
@@ -0,0 +1 @@
+#include testing_aot_full_System.Core.dll.sources

diff --git a/mcs/class/System.Core/xbox_System.Core.dll.sources b/mcs/class/System.Core/xbox_System.Core.dll.sources
deleted file mode 100644 (file)
index a7b1796..0000000
--- a/mcs/class/System.Core/xbox_System.Core.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include testing_aot_full_System.Core.dll.sources

diff --git a/mcs/class/System.Data/winaot_System.Data.dll.sources b/mcs/class/System.Data/winaot_System.Data.dll.sources
new file mode 100644 (file)
index 0000000..bbc860b
--- /dev/null
+++ b/mcs/class/System.Data/winaot_System.Data.dll.sources
@@ -0,0 +1 @@
+#include mobile_System.Data.dll.sources

diff --git a/mcs/class/System.Data/xbox_System.Data.dll.sources b/mcs/class/System.Data/xbox_System.Data.dll.sources
deleted file mode 100644 (file)
index bbc860b..0000000
--- a/mcs/class/System.Data/xbox_System.Data.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.Data.dll.sources

diff --git a/mcs/class/System.Drawing/Makefile b/mcs/class/System.Drawing/Makefile
index 7ccc1dcd83ca99a60c901ccca8c0a878dc1d4313..ed784833306db2fdebaa4858a8c43eac50a167d0 100644 (file)
--- a/mcs/class/System.Drawing/Makefile
+++ b/mcs/class/System.Drawing/Makefile
@@ -10,7 +10,7 @@ LIB_MCS_FLAGS = /unsafe \
        -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico \
        -resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico
 
-ifneq (xbox, $(PROFILE))
+ifneq (winaot, $(PROFILE))
 LIB_MCS_FLAGS += -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS
 else
 LIB_MCS_FLAGS += /keyfile:../msfinal.pub

diff --git a/mcs/class/System.Drawing/winaot_System.Drawing.dll.sources b/mcs/class/System.Drawing/winaot_System.Drawing.dll.sources
new file mode 100644 (file)
index 0000000..c7c763e
--- /dev/null
+++ b/mcs/class/System.Drawing/winaot_System.Drawing.dll.sources
@@ -0,0 +1,3 @@
+Assembly/AssemblyInfo.cs
+../../build/common/Consts.cs
+#include netstandard.sources
\ No newline at end of file

diff --git a/mcs/class/System.Drawing/xbox_System.Drawing.dll.sources b/mcs/class/System.Drawing/xbox_System.Drawing.dll.sources
deleted file mode 100644 (file)
index c7c763e..0000000
--- a/mcs/class/System.Drawing/xbox_System.Drawing.dll.sources
+++ /dev/null
@@ -1,3 +0,0 @@
-Assembly/AssemblyInfo.cs
-../../build/common/Consts.cs
-#include netstandard.sources
\ No newline at end of file

diff --git a/mcs/class/System.IdentityModel/winaot_System.IdentityModel.dll.sources b/mcs/class/System.IdentityModel/winaot_System.IdentityModel.dll.sources
new file mode 100644 (file)
index 0000000..4296367
--- /dev/null
+++ b/mcs/class/System.IdentityModel/winaot_System.IdentityModel.dll.sources
@@ -0,0 +1 @@
+#include mobile_System.IdentityModel.dll.sources

diff --git a/mcs/class/System.IdentityModel/xbox_System.IdentityModel.dll.sources b/mcs/class/System.IdentityModel/xbox_System.IdentityModel.dll.sources
deleted file mode 100644 (file)
index 4296367..0000000
--- a/mcs/class/System.IdentityModel/xbox_System.IdentityModel.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.IdentityModel.dll.sources

diff --git a/mcs/class/System.Runtime.Serialization/winaot_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/winaot_System.Runtime.Serialization.dll.sources
new file mode 100644 (file)
index 0000000..6caafd4
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization/winaot_System.Runtime.Serialization.dll.sources
@@ -0,0 +1 @@
+#include mobile_System.Runtime.Serialization.dll.sources

diff --git a/mcs/class/System.Runtime.Serialization/xbox_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/xbox_System.Runtime.Serialization.dll.sources
deleted file mode 100644 (file)
index 6caafd4..0000000
--- a/mcs/class/System.Runtime.Serialization/xbox_System.Runtime.Serialization.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.Runtime.Serialization.dll.sources

diff --git a/mcs/class/System.ServiceModel.Web/winaot_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/winaot_System.ServiceModel.Web.dll.sources
new file mode 100644 (file)
index 0000000..cbea0fa
--- /dev/null
+++ b/mcs/class/System.ServiceModel.Web/winaot_System.ServiceModel.Web.dll.sources
@@ -0,0 +1 @@
+#include mobile_System.ServiceModel.Web.dll.sources

diff --git a/mcs/class/System.ServiceModel.Web/xbox_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/xbox_System.ServiceModel.Web.dll.sources
deleted file mode 100644 (file)
index cbea0fa..0000000
--- a/mcs/class/System.ServiceModel.Web/xbox_System.ServiceModel.Web.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.ServiceModel.Web.dll.sources

diff --git a/mcs/class/System.ServiceModel/winaot_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/winaot_System.ServiceModel.dll.sources
new file mode 100644 (file)
index 0000000..22ece5c
--- /dev/null
+++ b/mcs/class/System.ServiceModel/winaot_System.ServiceModel.dll.sources
@@ -0,0 +1 @@
+#include mobile_System.ServiceModel.dll.sources

diff --git a/mcs/class/System.ServiceModel/xbox_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/xbox_System.ServiceModel.dll.sources
deleted file mode 100644 (file)
index 22ece5c..0000000
--- a/mcs/class/System.ServiceModel/xbox_System.ServiceModel.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.ServiceModel.dll.sources

diff --git a/mcs/class/System.Web.Services/winaot_System.Web.Services.dll.sources b/mcs/class/System.Web.Services/winaot_System.Web.Services.dll.sources
new file mode 100644 (file)
index 0000000..9e39dcc
--- /dev/null
+++ b/mcs/class/System.Web.Services/winaot_System.Web.Services.dll.sources
@@ -0,0 +1 @@
+#include mobile_System.Web.Services.dll.sources

diff --git a/mcs/class/System.Web.Services/xbox_System.Web.Services.dll.sources b/mcs/class/System.Web.Services/xbox_System.Web.Services.dll.sources
deleted file mode 100644 (file)
index 9e39dcc..0000000
--- a/mcs/class/System.Web.Services/xbox_System.Web.Services.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.Web.Services.dll.sources

diff --git a/mcs/class/System.XML/winaot_System.Xml.dll.sources b/mcs/class/System.XML/winaot_System.Xml.dll.sources
new file mode 100644 (file)
index 0000000..b663093
--- /dev/null
+++ b/mcs/class/System.XML/winaot_System.Xml.dll.sources
@@ -0,0 +1 @@
+#include mobile_System.Xml.dll.sources

diff --git a/mcs/class/System.XML/xbox_System.Xml.dll.sources b/mcs/class/System.XML/xbox_System.Xml.dll.sources
deleted file mode 100644 (file)
index b663093..0000000
--- a/mcs/class/System.XML/xbox_System.Xml.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.Xml.dll.sources

diff --git a/mcs/class/System/winaot_System.dll.sources b/mcs/class/System/winaot_System.dll.sources
new file mode 100644 (file)
index 0000000..e9469d0
--- /dev/null
+++ b/mcs/class/System/winaot_System.dll.sources
@@ -0,0 +1,2 @@
+#include mobile_System.dll.sources
+Mono.Util/MonoPInvokeCallbackAttribute.cs

diff --git a/mcs/class/System/xbox_System.dll.sources b/mcs/class/System/xbox_System.dll.sources
deleted file mode 100644 (file)
index e9469d0..0000000
--- a/mcs/class/System/xbox_System.dll.sources
+++ /dev/null
@@ -1,2 +0,0 @@
-#include mobile_System.dll.sources
-Mono.Util/MonoPInvokeCallbackAttribute.cs