Merge pull request #4722 from alexanderkyte/checked_after

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index b3ae8e523e7da12809c29641e42f2590f052ce02..6f5d31f6a52575ce3c2909212acf5961fbd39fcf 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,12 +20,9 @@ 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
-# and build it just a step before first dll needs it
-resgen_dir = ../tools/resgen
-
 build_SUBDIRS :=  \
        corlib \
        Mono.Security \
@@ -31,13 +34,14 @@ build_SUBDIRS :=  \
        System.Numerics \
        System.Xml.Linq \
        System.Runtime.InteropServices.RuntimeInformation \
+       System.IO.Compression \
+       System.Drawing                  \
        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
@@ -104,10 +108,13 @@ monodroid_dirs := \
        $(mobile_common_dirs)   \
        Mono.CompilerServices.SymbolWriter      \
        Mono.Btls.Interface     \
+       Mono.Posix      \
        $(pcl_facade_dirs)
 
 monotouch_dirs := \
-       $(testing_aot_full_dirs)
+       $(mobile_common_dirs)   \
+       Mono.Simd                       \
+       $(pcl_facade_dirs)
 
 monotouch_watch_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_dirs))
 monotouch_tv_dirs   := $(monotouch_dirs)
@@ -123,7 +130,10 @@ 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
+winaot_dirs := \
+       $(mobile_common_dirs)   \
+       System.Drawing                  \
+       $(pcl_facade_dirs)
 
 xammac_4_5_dirs := \
        corlib  \
@@ -184,10 +194,9 @@ net_4_x_dirs := \
        System.Core                     \
        System.Security                 \
        System.Configuration    \
-       $(resgen_dir)                   \
+       System.Drawing                  \
        System.IO.Compression           \
        System.IO.Compression.FileSystem \
-       System.Drawing                  \
        System.Transactions             \
        System.EnterpriseServices       \
        Mono.Data.Tds                   \
@@ -327,6 +336,11 @@ xbuild_4_0_dirs := \
        $(xbuild_2_0_dirs)      \
        Microsoft.Build
 
+orbis_dirs := \
+       $(filter-out Microsoft.CSharp Mono.CSharp Mono.Data.Sqlite,$(mobile_common_dirs))       \
+       System.Drawing          \
+       $(pcl_facade_dirs)
+
 monodroid_SUBDIRS := $(monodroid_dirs)
 monotouch_SUBDIRS := $(monotouch_dirs)
 monotouch_watch_SUBDIRS := $(monotouch_watch_dirs)
@@ -344,6 +358,7 @@ 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 := $(orbis_dirs)
 
 include ../build/rules.make
 
@@ -382,7 +397,7 @@ all-local $(STD_TARGETS:=-local):
 
 all-local-aot:
 
-monolite_dir := monolite
+monolite_dir := monolite/$(MONO_CORLIB_VERSION)
 
 # Files needed to bootstrap C# compiler
 build_files = mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll System.Security.dll System.Configuration.dll \
@@ -395,7 +410,7 @@ build_files = mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Co
        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.Security.Cryptography.Primitives.dll Facades/System.Security.Cryptography.Algorithms.dll \
-       Facades/System.ValueTuple.dll
+       Facades/System.ValueTuple.dll Facades/System.Text.Encoding.CodePages.dll
 
 monolite_files = $(build_files:%=lib/$(monolite_dir)/%)
 
@@ -417,6 +432,11 @@ $(build_files:%=lib/build/%):
 
 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
 
 dist-local: dist-default