Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mcs/Makefile4
-rw-r--r--mcs/build/profiles/monotouch.make44
-rw-r--r--mcs/build/profiles/monotouch_runtime.make19
-rw-r--r--mcs/build/profiles/monotouch_tv_runtime.make4
-rw-r--r--mcs/build/profiles/monotouch_watch_runtime.make4
-rw-r--r--mcs/class/Makefile5
-rw-r--r--mcs/class/System.Core/monotouch_tv_runtime_System.Core.dll.sources1
-rw-r--r--mcs/class/System.Core/monotouch_watch_runtime_System.Core.dll.sources1
-rw-r--r--mcs/class/System.XML/monotouch_tv_runtime_System.Xml.dll.sources1
-rw-r--r--mcs/class/System.XML/monotouch_watch_runtime_System.Xml.dll.sources1
-rw-r--r--mcs/class/System/monotouch_tv_runtime_System.dll.sources1
-rw-r--r--mcs/class/System/monotouch_watch_runtime_System.dll.sources1
-rw-r--r--mcs/class/corlib/monotouch_tv_runtime_corlib.dll.sources1
-rw-r--r--mcs/class/corlib/monotouch_watch_runtime_corlib.dll.sources1
-rw-r--r--runtime/Makefile.am4
15 files changed, 48 insertions, 44 deletions
diff --git a/mcs/Makefile b/mcs/Makefile
index 35ae9f963f5..f6127157641 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -11,6 +11,8 @@ monotouch_SUBDIRS := build class
monotouch_watch_SUBDIRS := build class
monotouch_tv_SUBDIRS := build class
monotouch_runtime_SUBDIRS := build class
+monotouch_watch_runtime_SUBDIRS := build class
+monotouch_tv_runtime_SUBDIRS := build class
xammac_SUBDIRS := build class
mobile_SUBDIRS := build class
mobile_static_SUBDIRS := build class
@@ -65,6 +67,8 @@ $(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%:
$(_boot_:%=profile-do--monotouch_watch--%): profile-do--monotouch_watch--%: profile-do--build--%
$(_boot_:%=profile-do--monotouch_tv--%): profile-do--monotouch_tv--%: profile-do--build--%
$(_boot_:%=profile-do--monotouch_runtime--%): profile-do--monotouch_runtime--%: profile-do--build--%
+$(_boot_:%=profile-do--monotouch_watch_runtime--%): profile-do--monotouch_watch_runtime--%: profile-do--build--%
+$(_boot_:%=profile-do--monotouch_tv_runtime--%): profile-do--monotouch_tv_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--%
$(_boot_:%=profile-do--mobile--%): profile-do--mobile--%: profile-do--build--%
diff --git a/mcs/build/profiles/monotouch.make b/mcs/build/profiles/monotouch.make
index bdeba2bac4e..39d5443914f 100644
--- a/mcs/build/profiles/monotouch.make
+++ b/mcs/build/profiles/monotouch.make
@@ -1,42 +1,4 @@
-#! -*- makefile -*-
+include $(topdir)/build/profiles/monotouch_runtime.make
-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)
-
-# Use system resgen as we don't want local System.Windows.Forms dependency
-RESGEN := $(dir $(shell which $(EXTERNAL_MCS)))resgen2
-
-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,MOBILE_LEGACY \
- -d:MONO \
- -d:DISABLE_CAS_USE \
- -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
-MOBILE_STATIC = yes
-MOBILE_PROFILE = yes
+PROFILE_MCS_FLAGS += \
+ -d:FULL_AOT_RUNTIME
diff --git a/mcs/build/profiles/monotouch_runtime.make b/mcs/build/profiles/monotouch_runtime.make
index 8f42ec8acbe..de74d7d92bf 100644
--- a/mcs/build/profiles/monotouch_runtime.make
+++ b/mcs/build/profiles/monotouch_runtime.make
@@ -14,7 +14,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:MONO -d:DISABLE_CAS_USE -d:MOBILE,MOBILE_LEGACY -d:MONOTOUCH -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,MOBILE_LEGACY \
+ -d:MONO \
+ -d:DISABLE_CAS_USE \
+ -d:MONOTOUCH \
+ -d:DISABLE_REMOTING \
+ -d:DISABLE_COM \
+ -nowarn:1699 \
+ -nostdlib \
+ -lib:$(topdir)/class/lib/$(PROFILE) \
+ $(DEFAULT_REFERENCES) \
+ $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
diff --git a/mcs/build/profiles/monotouch_tv_runtime.make b/mcs/build/profiles/monotouch_tv_runtime.make
new file mode 100644
index 00000000000..c6c98dcdc68
--- /dev/null
+++ b/mcs/build/profiles/monotouch_tv_runtime.make
@@ -0,0 +1,4 @@
+include $(topdir)/build/profiles/monotouch_runtime.make
+
+PROFILE_MCS_FLAGS += \
+ -d:MONOTOUCH_TV
diff --git a/mcs/build/profiles/monotouch_watch_runtime.make b/mcs/build/profiles/monotouch_watch_runtime.make
new file mode 100644
index 00000000000..0a631823f98
--- /dev/null
+++ b/mcs/build/profiles/monotouch_watch_runtime.make
@@ -0,0 +1,4 @@
+include $(topdir)/build/profiles/monotouch_runtime.make
+
+PROFILE_MCS_FLAGS += \
+ -d:MONOTOUCH_WATCH
diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 309f3826aab..64790f2005f 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -85,6 +85,9 @@ monotouch_runtime_dirs := \
System.XML \
Mono.CSharp
+monotouch_watch_runtime_dirs := $(monotouch_runtime_dirs)
+monotouch_tv_runtime_dirs := $(monotouch_runtime_dirs)
+
xammac_4_5_dirs := \
corlib \
System \
@@ -283,6 +286,8 @@ monotouch_SUBDIRS := $(monotouch_dirs)
monotouch_watch_SUBDIRS := $(monotouch_watch_dirs)
monotouch_tv_SUBDIRS := $(monotouch_tv_dirs)
monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
+monotouch_watch_runtime_SUBDIRS := $(monotouch_watch_runtime_dirs)
+monotouch_tv_runtime_SUBDIRS := $(monotouch_tv_runtime_dirs)
mobile_static_SUBDIRS := $(mobile_static_dirs)
mobile_SUBDIRS := $(mobile_dynamic_dirs)
xammac_SUBDIRS := $(xammac_dirs)
diff --git a/mcs/class/System.Core/monotouch_tv_runtime_System.Core.dll.sources b/mcs/class/System.Core/monotouch_tv_runtime_System.Core.dll.sources
new file mode 100644
index 00000000000..b050f33be70
--- /dev/null
+++ b/mcs/class/System.Core/monotouch_tv_runtime_System.Core.dll.sources
@@ -0,0 +1 @@
+#include monotouch_System.Core.dll.sources
diff --git a/mcs/class/System.Core/monotouch_watch_runtime_System.Core.dll.sources b/mcs/class/System.Core/monotouch_watch_runtime_System.Core.dll.sources
new file mode 100644
index 00000000000..b050f33be70
--- /dev/null
+++ b/mcs/class/System.Core/monotouch_watch_runtime_System.Core.dll.sources
@@ -0,0 +1 @@
+#include monotouch_System.Core.dll.sources
diff --git a/mcs/class/System.XML/monotouch_tv_runtime_System.Xml.dll.sources b/mcs/class/System.XML/monotouch_tv_runtime_System.Xml.dll.sources
new file mode 100644
index 00000000000..b6630930f75
--- /dev/null
+++ b/mcs/class/System.XML/monotouch_tv_runtime_System.Xml.dll.sources
@@ -0,0 +1 @@
+#include mobile_System.Xml.dll.sources
diff --git a/mcs/class/System.XML/monotouch_watch_runtime_System.Xml.dll.sources b/mcs/class/System.XML/monotouch_watch_runtime_System.Xml.dll.sources
new file mode 100644
index 00000000000..b6630930f75
--- /dev/null
+++ b/mcs/class/System.XML/monotouch_watch_runtime_System.Xml.dll.sources
@@ -0,0 +1 @@
+#include mobile_System.Xml.dll.sources
diff --git a/mcs/class/System/monotouch_tv_runtime_System.dll.sources b/mcs/class/System/monotouch_tv_runtime_System.dll.sources
new file mode 100644
index 00000000000..7c0bd5983a5
--- /dev/null
+++ b/mcs/class/System/monotouch_tv_runtime_System.dll.sources
@@ -0,0 +1 @@
+#include monotouch_System.dll.sources
diff --git a/mcs/class/System/monotouch_watch_runtime_System.dll.sources b/mcs/class/System/monotouch_watch_runtime_System.dll.sources
new file mode 100644
index 00000000000..7c0bd5983a5
--- /dev/null
+++ b/mcs/class/System/monotouch_watch_runtime_System.dll.sources
@@ -0,0 +1 @@
+#include monotouch_System.dll.sources
diff --git a/mcs/class/corlib/monotouch_tv_runtime_corlib.dll.sources b/mcs/class/corlib/monotouch_tv_runtime_corlib.dll.sources
new file mode 100644
index 00000000000..9e173da97f7
--- /dev/null
+++ b/mcs/class/corlib/monotouch_tv_runtime_corlib.dll.sources
@@ -0,0 +1 @@
+#include corlib.dll.sources \ No newline at end of file
diff --git a/mcs/class/corlib/monotouch_watch_runtime_corlib.dll.sources b/mcs/class/corlib/monotouch_watch_runtime_corlib.dll.sources
new file mode 100644
index 00000000000..9e173da97f7
--- /dev/null
+++ b/mcs/class/corlib/monotouch_watch_runtime_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 f2e02e28cbc..3e9251af29e 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -41,11 +41,11 @@ build_profiles += monotouch monotouch_runtime
endif
if INSTALL_MONOTOUCH_WATCH
-build_profiles += monotouch_watch
+build_profiles += monotouch_watch monotouch_watch_runtime
endif
if INSTALL_MONOTOUCH_TV
-build_profiles += monotouch_tv
+build_profiles += monotouch_tv monotouch_tv_runtime
endif
if INSTALL_XAMMAC
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 21:14:36 +0300