diff options
author | Marek Safar <marek.safar@gmail.com> | 2018-03-05 20:22:48 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2018-03-08 00:48:05 +0300 |
commit | e6de24c2d196b064e64aeea6e45350e985a1bb23 (patch) | |
tree | b97ca2244bffca1149881eccfa267a466032e3a6 /mcs/class | |
parent | 73859e3df2867ad8bfbff92e37a2b355518e9f7a (diff) |
[build] Unify DEFAULT_REFERENCE handling so I can override it with TARGET_NET_REFERENCE for individual tools
Diffstat (limited to 'mcs/class')
-rw-r--r-- | mcs/class/Microsoft.Build.Engine/Makefile | 2 | ||||
-rw-r--r-- | mcs/class/Microsoft.Build.Tasks/Makefile | 2 | ||||
-rw-r--r-- | mcs/class/Mono.Debugger.Soft/Makefile | 2 | ||||
-rw-r--r-- | mcs/class/Mono.Options/Makefile | 2 | ||||
-rw-r--r-- | mcs/class/Mono.WebBrowser/Makefile | 2 | ||||
-rw-r--r-- | mcs/class/System.ComponentModel.DataAnnotations/Makefile | 3 | ||||
-rw-r--r-- | mcs/class/System.Data.OracleClient/Makefile | 3 | ||||
-rw-r--r-- | mcs/class/System.IdentityModel/Makefile | 3 | ||||
-rw-r--r-- | mcs/class/System.Json.Microsoft/Makefile | 2 | ||||
-rw-r--r-- | mcs/class/System.Reactive.Linq/Makefile | 2 | ||||
-rw-r--r-- | mcs/class/System.ServiceProcess/Makefile | 3 | ||||
-rw-r--r-- | mcs/class/System.Threading.Tasks.Dataflow/Makefile | 4 | ||||
-rw-r--r-- | mcs/class/System.Web.Extensions/Makefile | 2 | ||||
-rw-r--r-- | mcs/class/System.Web/Test/tools/Makefile | 3 | ||||
-rw-r--r-- | mcs/class/System.Xml.Linq/Makefile | 4 |
15 files changed, 22 insertions, 17 deletions
diff --git a/mcs/class/Microsoft.Build.Engine/Makefile b/mcs/class/Microsoft.Build.Engine/Makefile index c8ce9a22816..30fdb0fd1e1 100644 --- a/mcs/class/Microsoft.Build.Engine/Makefile +++ b/mcs/class/Microsoft.Build.Engine/Makefile @@ -23,7 +23,7 @@ EXTRA_DISTFILES = \ CLEAN_FILES = Test/resources/TestTasks-$(PROFILE).dll Test/resources/TestTasks-$(PROFILE).dll.mdb Test/resources/TestTasks-$(PROFILE).pdb Test/resources/TestTasks-$(PROFILE).dll: Test/resources/TestTasks.cs - $(CSCOMPILE) /out:$@ Test/resources/TestTasks.cs /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_FRAMEWORK).dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_UTILITIES).dll /target:library + $(CSCOMPILE) /out:$@ Test/resources/TestTasks.cs /r:$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)/mscorlib.dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_FRAMEWORK).dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_UTILITIES).dll /target:library test-local: compile-resources diff --git a/mcs/class/Microsoft.Build.Tasks/Makefile b/mcs/class/Microsoft.Build.Tasks/Makefile index b926ba9ff31..09aeca3b10b 100644 --- a/mcs/class/Microsoft.Build.Tasks/Makefile +++ b/mcs/class/Microsoft.Build.Tasks/Makefile @@ -29,7 +29,7 @@ EXTRA_DISTFILES = \ Test/resources/junk.txt Test/resources/test.dll: Test/resources/test.cs - $(CSCOMPILE) -target:library /out:$@ $< + $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -target:library /out:$@ $< clean-test-resources: rm -f Test/resources/test.dll diff --git a/mcs/class/Mono.Debugger.Soft/Makefile b/mcs/class/Mono.Debugger.Soft/Makefile index 4fb6f306a97..5b002b86eeb 100644 --- a/mcs/class/Mono.Debugger.Soft/Makefile +++ b/mcs/class/Mono.Debugger.Soft/Makefile @@ -23,7 +23,7 @@ TEST_HELPERS_SOURCES = \ test-local: dtest-app.exe dtest-excfilter.exe dtest-app.exe: Test/dtest-app.cs $(TEST_HELPERS_SOURCES) - $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -out:$@ -unsafe $(PLATFORM_DEBUG_FLAGS) -optimize- Test/dtest-app.cs $(TEST_HELPERS_SOURCES) + $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -out:$@ -unsafe $(PLATFORM_DEBUG_FLAGS) -optimize- Test/dtest-app.cs $(TEST_HELPERS_SOURCES) dtest-excfilter.exe: Test/dtest-excfilter.il $(ILASM) -out:$@ /exe /debug Test/dtest-excfilter.il diff --git a/mcs/class/Mono.Options/Makefile b/mcs/class/Mono.Options/Makefile index cf83d944572..28d27326fe0 100644 --- a/mcs/class/Mono.Options/Makefile +++ b/mcs/class/Mono.Options/Makefile @@ -23,7 +23,7 @@ test-local: Mono.Options-PCL.dll clean-local: clean-pcl Mono.Options-PCL.dll: Mono.Options.dll.sources $(shell cat Mono.Options.dll.sources) - $(CSCOMPILE) -target:library -out:$@ -debug+ -d:PCL -r:../lib/$(PROFILE)/System.dll @$< + $(CSCOMPILE) -target:library -out:$@ -d:PCL -r:../lib/$(PROFILE)/mscorlib.dll -r:../lib/$(PROFILE)/System.dll @$< clean-pcl: -rm Mono.Options-PCL.dll diff --git a/mcs/class/Mono.WebBrowser/Makefile b/mcs/class/Mono.WebBrowser/Makefile index 65b6d44df17..93cf7f68576 100644 --- a/mcs/class/Mono.WebBrowser/Makefile +++ b/mcs/class/Mono.WebBrowser/Makefile @@ -7,7 +7,7 @@ LIB_REFS = System KEYFILE = ../mono.snk LIB_MCS_FLAGS = -warn:1 -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = EXTRA_DISTFILES = README diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Makefile b/mcs/class/System.ComponentModel.DataAnnotations/Makefile index 53519907a9c..a46151a796b 100644 --- a/mcs/class/System.ComponentModel.DataAnnotations/Makefile +++ b/mcs/class/System.ComponentModel.DataAnnotations/Makefile @@ -7,7 +7,8 @@ LIB_REFS = System System.Core System.Data System.Xml KEYFILE = ../winfx.pub LIB_MCS_FLAGS = -nowarn:414 -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = +TEST_LIB_REFS = System System.Core TXT_RESOURCE_STRINGS = ../referencesource/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.txt diff --git a/mcs/class/System.Data.OracleClient/Makefile b/mcs/class/System.Data.OracleClient/Makefile index 66fbba34971..9b6f7cbafd4 100644 --- a/mcs/class/System.Data.OracleClient/Makefile +++ b/mcs/class/System.Data.OracleClient/Makefile @@ -7,7 +7,8 @@ LIB_REFS = System System.Xml System.Data System.EnterpriseServices System.Drawin KEYFILE = ../ecma.pub LIB_MCS_FLAGS = -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618 +TEST_MCS_FLAGS = /nowarn:618 +TEST_LIB_REFS = System System.Data EXTRA_DISTFILES = Test/*.cs diff --git a/mcs/class/System.IdentityModel/Makefile b/mcs/class/System.IdentityModel/Makefile index 000c536c02d..5d00d28a478 100644 --- a/mcs/class/System.IdentityModel/Makefile +++ b/mcs/class/System.IdentityModel/Makefile @@ -29,7 +29,8 @@ LIB_REFS += System.Web.ApplicationServices endif endif -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = +TEST_LIB_REFS = System System.Xml System.Security System.Runtime.Serialization ifdef MOBILE_PROFILE NO_TEST = yes diff --git a/mcs/class/System.Json.Microsoft/Makefile b/mcs/class/System.Json.Microsoft/Makefile index 56c51c6330d..5b4c8fbfbf1 100644 --- a/mcs/class/System.Json.Microsoft/Makefile +++ b/mcs/class/System.Json.Microsoft/Makefile @@ -18,6 +18,6 @@ ifdef MOBILE_DYNAMIC LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC endif -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = include ../../build/library.make diff --git a/mcs/class/System.Reactive.Linq/Makefile b/mcs/class/System.Reactive.Linq/Makefile index 071bd7c2451..2c79f2d1089 100644 --- a/mcs/class/System.Reactive.Linq/Makefile +++ b/mcs/class/System.Reactive.Linq/Makefile @@ -29,7 +29,7 @@ ifdef NET_4_5 LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = EXTRA_DISTFILES = $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) diff --git a/mcs/class/System.ServiceProcess/Makefile b/mcs/class/System.ServiceProcess/Makefile index 8414fa099f5..13195ce8eb2 100644 --- a/mcs/class/System.ServiceProcess/Makefile +++ b/mcs/class/System.ServiceProcess/Makefile @@ -6,7 +6,8 @@ LIBRARY = System.ServiceProcess.dll LIB_REFS = System System.Configuration.Install System.Windows.Forms KEYFILE = ../msfinal.pub LIB_MCS_FLAGS = /nowarn:0618 -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = +TEST_LIB_REFS = System EXTRA_DISTFILES = diff --git a/mcs/class/System.Threading.Tasks.Dataflow/Makefile b/mcs/class/System.Threading.Tasks.Dataflow/Makefile index 77e279ebb23..6ca3d61e47a 100644 --- a/mcs/class/System.Threading.Tasks.Dataflow/Makefile +++ b/mcs/class/System.Threading.Tasks.Dataflow/Makefile @@ -8,9 +8,9 @@ LIB_REFS += System.Core System KEYFILE = ../ecma.pub LIB_MCS_FLAGS += -d:CONCURRENT_COLLECTIONS -include ../../build/library.make - TEST_MCS_FLAGS = TEST_LIB_REFS = System.Core System EXTRA_DISTFILES=README.md + +include ../../build/library.make diff --git a/mcs/class/System.Web.Extensions/Makefile b/mcs/class/System.Web.Extensions/Makefile index 1d2c48154a2..317cd320295 100644 --- a/mcs/class/System.Web.Extensions/Makefile +++ b/mcs/class/System.Web.Extensions/Makefile @@ -39,7 +39,7 @@ NUNIT_RESOURCE_FILES= \ CLASSLIB_DIR = $(topdir)/class/lib/$(PROFILE) STANDALONE_RUNNER_SUPPORT_ASSEMBLY = $(CLASSLIB_DIR)/standalone-runner-support.dll -STANDALONE_TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) $(PROFILE_MCS_FLAGS) -r:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) -r:$(topdir)/class/lib/$(PROFILE)/System.Web.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Web.Extensions.dll -r:$(topdir)/class/lib/$(PROFILE)/nunit.framework.dll +STANDALONE_TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) $(PROFILE_MCS_FLAGS) -r:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Web.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Web.Extensions.dll -r:$(topdir)/class/lib/$(PROFILE)/nunit.framework.dll STANDALONE_TEST_ASSEMBLY = System.Web.Extensions_standalone_test_$(PROFILE).dll STANDALONE_TEST_MAKEFRAG = $(depsdir)/$(STANDALONE_TEST_ASSEMBLY).makefrag diff --git a/mcs/class/System.Web/Test/tools/Makefile b/mcs/class/System.Web/Test/tools/Makefile index 9cbb4159d00..09755061ff6 100644 --- a/mcs/class/System.Web/Test/tools/Makefile +++ b/mcs/class/System.Web/Test/tools/Makefile @@ -12,7 +12,8 @@ STANDALONE_RUNNER_SOURCES = \ STANDALONE_RUNNER_REFERENCES = \ -r:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) \ -r:$(CLASSLIB_DIR)/System.Web.dll \ - -r:$(CLASSLIB_DIR)/System.dll + -r:$(CLASSLIB_DIR)/System.dll \ + -r:$(CLASSLIB_DIR)/mscorlib.dll CACHE_PQ_TEST_GENERATOR_SOURCES = \ CachePQTestGenerator/CacheItemComparer.cs \ diff --git a/mcs/class/System.Xml.Linq/Makefile b/mcs/class/System.Xml.Linq/Makefile index 3b058bd9c42..c2355bac19e 100644 --- a/mcs/class/System.Xml.Linq/Makefile +++ b/mcs/class/System.Xml.Linq/Makefile @@ -16,8 +16,8 @@ ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:MONO_HYBRID_SYSTEM_XML endif -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) - +TEST_LIB_REFS = System.Core System.Xml System +TEST_MCS_FLAGS = EXTRA_DISTFILES = include ../../build/library.make |