diff options
| author | Maxim Lipnin <mlipnin@gmail.com> | 2019-03-14 01:47:39 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2019-03-14 01:47:39 +0300 |
| commit | 55fbd14763ba5e6ed6dc63326d39782ff76afbe9 (patch) | |
| tree | 48b6573c4c5114bfb9b7d87da10eb96769466a61 /mcs/Makefile | |
| parent | f62dfab807cba92bdc3f7f7e60f6e93b2339021f (diff) | |
Remove nunit24 from mono build and tree (#13415)
* Remove nunit24 from mono build and tree
* More cleanup
* Fix build
* [csproj] Update project files
Diffstat (limited to 'mcs/Makefile')
| -rw-r--r-- | mcs/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mcs/Makefile b/mcs/Makefile index 268866a5f66..5b418851526 100644 --- a/mcs/Makefile +++ b/mcs/Makefile @@ -1,6 +1,6 @@ thisdir := . -SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs packages +SUBDIRS := build jay mcs class ilasm tools tests errors docs packages # Resgen is corlib specific tool @@ -19,7 +19,7 @@ testing_aot_full_interp_SUBDIRS := build class testing_aot_hybrid_SUBDIRS := build class testing_aot_full_SUBDIRS := build class binary_reference_assemblies_SUBDIRS := build class -net_4_x_SUBDIRS := build class nunit24 ilasm tools tests errors docs mcs class/aot-compiler packages +net_4_x_SUBDIRS := build class ilasm tools tests errors docs mcs class/aot-compiler packages xammac_net_4_5_SUBDIRS := build class xbuild_12_SUBDIRS := build class tools/xbuild xbuild_14_SUBDIRS := build class tools/xbuild @@ -155,7 +155,7 @@ distcheck: dist-tarball MONO_API_SNAPSHOT_PATH := $(topdir)../external/api-snapshot/ GENAPI := $(MONO_API_SNAPSHOT_PATH)tools/genapi/Microsoft.DotNet.GenAPI.exe MONO_API_SNAPSHOT_PROFILE_PATH := $(MONO_API_SNAPSHOT_PATH)profiles/$(PROFILE)/ -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_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.CSharp.dll SystemWebTestShim.dll standalone-runner-support.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) |