[jit] Fix the saving of the 'cfg->ret_var_set' flag when inlining, it was set to...

[mono.git] / mcs / Makefile

diff --git a/mcs/Makefile b/mcs/Makefile
index eeda3d38bbea49e906b809faf5ab43ec719e8d04..ea121b9459e3183860af3308db838a3386dc79f9 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -23,6 +23,7 @@ xbuild_12_SUBDIRS := build class tools/xbuild
 xbuild_14_SUBDIRS := build class tools/xbuild
 winaot_SUBDIRS := build class
 orbis_SUBDIRS := build class
+unreal_SUBDIRS := build class
 
 include build/rules.make
 
@@ -77,6 +78,7 @@ $(_boot_:%=profile-do--testing_aot_hybrid--%):        profile-do--testing_aot_hy
 $(_boot_:%=profile-do--testing_aot_full--%):          profile-do--testing_aot_full--%:          profile-do--build--%
 $(_boot_:%=profile-do--winaot--%):              profile-do--winaot--%:              profile-do--build--%
 $(_boot_:%=profile-do--orbis--%):              profile-do--orbis--%:              profile-do--build--%
+$(_boot_:%=profile-do--unreal--%):              profile-do--unreal--%:              profile-do--build--%
 $(_boot_:%=profile-do--build--%):             profile-do--build--%:             profile-do--basic--%
 
 testcorlib:
@@ -95,8 +97,7 @@ DISTFILES = \
        mkinstalldirs           \
        MonoIcon.png            \
        README                  \
-       ScalableMonoIcon.svg    \
-       winexe.in
+       ScalableMonoIcon.svg
 
 dist-local: dist-default
 
@@ -138,34 +139,12 @@ distcheck: dist-tarball
        rm -f before.list after.list distdist.list ; \
        rm -rf $(package) InstallTest
 
-monocharge:
-       chargedir=monocharge-`date -u +%Y%m%d` ; \
-       mkdir "$$chargedir" ; \
-       DESTDIR=`cd "$$chargedir" && pwd` ; \
-       $(MAKE) install DESTDIR="$$DESTDIR" || exit 1 ; \
-       tar cvjf "$$chargedir".tar.bz2 "$$chargedir" ; \
-       rm -rf "$$chargedir"
-
-# A bare-bones monocharge.
-
-monocharge-lite:
-       chargedir=monocharge-lite-`date -u +%Y%m%d` ; \
-       mkdir "$$chargedir" ; \
-       DESTDIR=`cd "$$chargedir" && pwd` ; \
-       $(MAKE) -C mcs install DESTDIR="$$DESTDIR" || exit 1; \
-       $(MAKE) -C class/corlib install DESTDIR="$$DESTDIR" || exit 1; \
-       $(MAKE) -C class/System install DESTDIR="$$DESTDIR" || exit 1; \
-       $(MAKE) -C class/System.XML install DESTDIR="$$DESTDIR" || exit 1; \
-       $(MAKE) -C class/Mono.CSharp.Debugger install DESTDIR="$$DESTDIR" || exit 1; \
-       tar cvjf "$$chargedir".tar.bz2 "$$chargedir" ; \
-       rm -rf "$$chargedir"
-
 # Targets for creating API diffs of the framework
 
 MONO_API_SNAPSHOT_PATH := $(topdir)../external/api-snapshot/
 GENAPI := $(MONO_API_SNAPSHOT_PATH)tools/genapi/GenAPI.exe
 MONO_API_SNAPSHOT_PROFILE_PATH := $(MONO_API_SNAPSHOT_PATH)profiles/$(PROFILE)/
-MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, SystemWebTestShim.dll standalone-runner-support.dll nunit.core.dll nunit.core.extensions.dll nunit.core.interfaces.dll nunit.framework.dll nunit.framework.extensions.dll nunit.mocks.dll nunit.util.dll nunit-console-runner.dll nunitlite.dll)
+MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.CSharp.dll SystemWebTestShim.dll standalone-runner-support.dll nunit.core.dll nunit.core.extensions.dll nunit.core.interfaces.dll nunit.framework.dll nunit.framework.extensions.dll nunit.mocks.dll nunit.util.dll nunit-console-runner.dll nunitlite.dll Mono.Profiler.Log.dll)
 MONO_API_ASSEMBLIES := $(filter-out $(MONO_API_ASSEMBLIES_IGNORED), $(wildcard $(topdir)class/lib/$(PROFILE)/*.dll)) $(wildcard $(topdir)class/lib/$(PROFILE)/Facades/*.dll)
 MONO_API_ASSEMBLIES_CS := $(MONO_API_ASSEMBLIES:$(topdir)class/lib/$(PROFILE)/%.dll=$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs)
 
@@ -175,10 +154,17 @@ $(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs: $(topdir)class/lib/$(PROFILE)/%.dll $(GEN
 
 mono-api-current: $(MONO_API_ASSEMBLIES_CS)
 
+mono-api-current-clean:
+       $(Q) rm -rf "$(MONO_API_SNAPSHOT_PROFILE_PATH)"
+
 mono-api-diff:
        @echo "Regenerating API snapshot..."
-       $(Q) rm -rf "$(MONO_API_SNAPSHOT_PROFILE_PATH)"
-       $(Q) $(MAKE) mono-api-current
+       $(Q) $(MAKE) mono-api-current-clean PROFILE=net_4_x
+       $(Q) $(MAKE) mono-api-current-clean PROFILE=monotouch
+       $(Q) $(MAKE) mono-api-current-clean PROFILE=monodroid
+       $(Q) $(MAKE) mono-api-current PROFILE=net_4_x
+       $(Q) $(MAKE) mono-api-current PROFILE=monotouch
+       $(Q) $(MAKE) mono-api-current PROFILE=monodroid
        @echo "Checking public API differences..."
        $(Q) cd $(MONO_API_SNAPSHOT_PATH); git add -A .
        $(Q) cd $(MONO_API_SNAPSHOT_PATH); git diff --no-renames HEAD > $(abspath $(topdir))/temp.patch