Merge pull request #2819 from BrzVlad/fix-major-log

[mono.git] / mcs / class / Microsoft.Build.Tasks / Makefile

diff --git a/mcs/class/Microsoft.Build.Tasks/Makefile b/mcs/class/Microsoft.Build.Tasks/Makefile
index 70d2cb677526ce4d642a4645711e0adfaf4873e2..d451c754e74471c627da9bbd3e6ffd86fd871a90 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Makefile
+++ b/mcs/class/Microsoft.Build.Tasks/Makefile
@@ -1,49 +1,40 @@
 thisdir = class/Microsoft.Build.Tasks
-SUBDIRS = 
+SUBDIRS =
 include ../../build/rules.make
 
+XBUILD_DIR=$(topdir)/tools/xbuild
+include $(XBUILD_DIR)/xbuild.make
+
 LIBRARY = Microsoft.Build.Tasks.dll
-ifeq (1.0, $(FRAMEWORK_VERSION))
 
-LIBRARY_NAME = dummy-Microsoft.Build.Tasks.dll
-NO_INSTALL = yes
-NO_TEST = yes
-NO_SIGN_ASSEMBLY = yes
+LIBRARY_NAME = Microsoft.Build.Tasks$(NAME_SUFFIX).dll
 
-else
+LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml $(PARENT_PROFILE)System.Windows.Forms \
+                       $(XBUILD_UTILITIES) $(XBUILD_FRAMEWORK) $(XBUILD_ENGINE) $(XBUILD_TASKS)
 
-ifeq (3.5, $(FRAMEWORK_VERSION))
-NAME_SUFFIX = .v3.5
-endif
-
-LIBRARY_NAME = Microsoft.Build.Tasks$(NAME_SUFFIX).dll
+TEST_MCS_FLAGS =
+TEST_LIB_REFS = $(PARENT_PROFILE)System.Xml $(XBUILD_ENGINE) $(XBUILD_FRAMEWORK) $(XBUILD_TASKS) $(XBUILD_UTILITIES) $(PARENT_PROFILE)System.Core
 
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
+TEST_LIB_REFS += Microsoft.Build
 endif
 
-LIB_MCS_FLAGS = \
-       /r:$(corlib)                            \
-       /r:System.dll                           \
-       /r:System.Core.dll                      \
-       /r:System.Xml.dll                       \
-       /r:System.Windows.Forms.dll             \
-       /r:Microsoft.Build.Utilities.dll        \
-       /r:Microsoft.Build.Framework.dll        \
-       /r:Microsoft.Build.Engine.dll
-
-TEST_MCS_FLAGS = \
-       /r:Microsoft.Build.Engine.dll           \
-       /r:Microsoft.Build.Framework.dll        \
-       /r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll
-
 EXTRA_DISTFILES = \
        Test/resources/test.cs \
        Test/resources/Sample.cs \
        Test/resources/Sample.vb \
-       Test/resources/junk.txt
+       Test/resources/junk.txt \
+       Test/test-config-file*
+
+Test/resources/test.dll: Test/resources/test.cs
+       $(CSCOMPILE) -target:library /out:$@ $<
+
+clean-test-resources:
+       rm -f Test/resources/test.dll
 
 test-local: Test/resources/test.dll
 
-Test/resources/test.dll: Test/resources/test.cs
-       $(CSCOMPILE) -target:library Test/resources/test.cs
+clean-local: clean-test-resources
 
+include $(XBUILD_DIR)/xbuild_test.make
 include ../../build/library.make