Merge pull request #4540 from kumpera/android-changes-part1

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index e2b290dba20b4a99687b7d89dd02fb7b05edd9e2..3f981f77aba50c4f2f1a4a430cff729bf516cc23 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -2,6 +2,12 @@ thisdir = class
 
 pcl_facade_dirs := Facades
 
+-include ../build/config.make
+
+ifdef MCS_MODE
+MCS_MODE_dirs := Mono.Cecil.Mdb
+endif
+
 # The minimal set of csc dependencies
 basic_SUBDIRS := \
        corlib \
@@ -14,6 +20,7 @@ basic_SUBDIRS := \
        System.Xml.Linq \
        System.Runtime.InteropServices.RuntimeInformation \
        Mono.Cecil \
+       $(MCS_MODE_dirs) \
        ../tools/cil-stringreplacer
 
 # resgen is corlib specific so we need to wait until corlib is build
@@ -31,11 +38,13 @@ build_SUBDIRS :=  \
        System.Numerics \
        System.Xml.Linq \
        System.Runtime.InteropServices.RuntimeInformation \
+       System.IO.Compression \
        Mono.Cecil \
+       $(MCS_MODE_dirs) \
+       Mono.CompilerServices.SymbolWriter      \
+       PEAPI \
        ../tools/cil-stringreplacer
 
--include ../build/config.make
-
 ifdef MCS_MODE
 basic_PARALLEL_SUBDIRS := ../mcs
 build_PARALLEL_SUBDIRS := ../mcs
@@ -83,18 +92,13 @@ mobile_common_dirs := \
        System.Reflection.Context       \
        System.Net.Http.WinHttpHandler
 
-aot_only_dirs := \
+testing_aot_full_dirs := \
        $(mobile_common_dirs)   \
-       Mono.Dynamic.Interpreter        \
-       PEAPI   \
-       Mono.CompilerServices.SymbolWriter      \
        Mono.Simd                       \
        $(pcl_facade_dirs)
 
-aot_hybrid_dirs := \
+testing_aot_hybrid_dirs := \
        $(mobile_common_dirs)   \
-       PEAPI   \
-       Mono.CompilerServices.SymbolWriter      \
        Mono.Simd                       \
        $(pcl_facade_dirs)
 
@@ -107,10 +111,11 @@ monodroid_dirs := \
        $(mobile_common_dirs)   \
        Mono.CompilerServices.SymbolWriter      \
        Mono.Btls.Interface     \
+       Mono.Posix      \
        $(pcl_facade_dirs)
 
 monotouch_dirs := \
-       $(aot_only_dirs)
+       $(testing_aot_full_dirs)
 
 monotouch_watch_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_dirs))
 monotouch_tv_dirs   := $(monotouch_dirs)
@@ -126,6 +131,8 @@ monotouch_runtime_dirs := \
 monotouch_watch_runtime_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_runtime_dirs))
 monotouch_tv_runtime_dirs := $(monotouch_runtime_dirs)
 
+winaot_dirs := $(monotouch_dirs) System.Drawing
+
 xammac_4_5_dirs := \
        corlib  \
        Mono.Security \
@@ -335,8 +342,8 @@ 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)
-aot_only_SUBDIRS := $(aot_only_dirs)
-aot_hybrid_SUBDIRS := $(aot_hybrid_dirs)
+testing_aot_full_SUBDIRS := $(testing_aot_full_dirs)
+testing_aot_hybrid_SUBDIRS := $(testing_aot_hybrid_dirs)
 xammac_SUBDIRS := $(xammac_dirs)
 xammac_net_4_5_SUBDIRS := $(xammac_4_5_dirs)
 binary_reference_assemblies_SUBDIRS := reference-assemblies
@@ -344,10 +351,12 @@ 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
+winaot_SUBDIRS := $(winaot_dirs)
+orbis_SUBDIRS := $(monotouch_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(aot_only_dirs) $(aot_hybrid_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS)
+SUBDIRS = $(testing_aot_full_dirs) $(testing_aot_hybrid_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS)
 
 DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks
 
@@ -363,6 +372,7 @@ DISTFILES = \
        silverlight.pub         \
        reactive.pub            \
        mono.snk                \
+       Open.snk                \
        LICENSE                 \
        README                  \
        doc/API-notes           \
@@ -372,6 +382,7 @@ DISTFILES = \
        MicrosoftAjaxLibrary/License.htm        \
        test-helpers/NetworkHelpers.cs  \
        test-helpers/SocketResponder.cs \
+       lib/$(monolite_dir)/mcs.exe   \
        $(monolite_files)
 
 .PHONY: all-local $(STD_TARGETS:=-local)
@@ -392,7 +403,8 @@ build_files = mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Co
        Facades/System.Threading.Tasks.dll Facades/System.Globalization.dll Facades/System.Runtime.Extensions.dll Facades/System.Threading.dll \
        Facades/System.IO.dll Facades/System.Runtime.InteropServices.dll Facades/System.Xml.ReaderWriter.dll Facades/System.Linq.Expressions.dll \
        Facades/System.Runtime.Numerics.dll Facades/System.Xml.XDocument.dll Facades/System.IO.FileSystem.Primitives.dll Facades/System.IO.FileSystem.dll \
-       Facades/System.Diagnostics.FileVersionInfo.dll
+       Facades/System.Diagnostics.FileVersionInfo.dll Facades/System.Security.Cryptography.Primitives.dll Facades/System.Security.Cryptography.Algorithms.dll \
+       Facades/System.ValueTuple.dll Facades/System.Text.Encoding.CodePages.dll
 
 monolite_files = $(build_files:%=lib/$(monolite_dir)/%)
 
@@ -405,10 +417,19 @@ $(monolite_files): | lib/$(monolite_dir)/Facades
 $(monolite_files): lib/$(monolite_dir)/%: lib/build/%
        cp -p $< $@
 
+lib/$(monolite_dir)/mcs.exe:
+       $(MAKE) -C ../mcs PROFILE=build
+       cp -p lib/build/mcs.exe lib/$(monolite_dir)
+
 $(build_files:%=lib/build/%):
        cd $(topdir) && $(MAKE) profile-do--build--all NO_DIR_CHECK=1 SKIP_AOT=1
 
-dist-monolite: $(monolite_files)
+dist-monolite: $(monolite_files) lib/$(monolite_dir)/mcs.exe
+
+package-monolite-latest:
+       MONOLITE=monolite-$(MONO_CORLIB_VERSION)-latest; \
+       $(MAKE) dist-monolite monolite_dir=$$MONOLITE; \
+       tar zcvpf $$MONOLITE.tar.gz --directory=lib $$MONOLITE/
 
 dist-default: dist-monolite