[xbuild] Log build errors and raise events even if a build fails.

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

diff --git a/mcs/class/Microsoft.Build.Engine/Makefile b/mcs/class/Microsoft.Build.Engine/Makefile
index 1d49aee0cbe109c39c08b17301de4ac0a691b545..7b49d4d246bca84af7ab71e655752228826a7ea4 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Makefile
+++ b/mcs/class/Microsoft.Build.Engine/Makefile
@@ -4,28 +4,59 @@ include ../../build/rules.make
 
 LIBRARY = Microsoft.Build.Engine.dll
 
-ifeq (1.0, $(FRAMEWORK_VERSION))
-LIBRARY_NAME = dummy-Microsoft.Build.Engine.dll
-NO_INSTALL = yes
-NO_TEST = yes
-NO_SIGN_ASSEMBLY = yes
+BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
+
+ifeq (3.5, $(FRAMEWORK_VERSION))
+NAME_SUFFIX = .v3.5
+BUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/$(BUILD_FRAMEWORK)
+else
+ifeq (4.0, $(FRAMEWORK_VERSION))
+NAME_SUFFIX = .v4.0
+endif
 endif
 
 LIB_MCS_FLAGS = \
        /r:$(corlib)                            \
        /r:System.dll                           \
+       /r:System.Core.dll              \
        /r:System.Xml.dll                       \
-       /r:Microsoft.Build.Framework.dll        \
-       /r:Microsoft.Build.Utilities.dll
+       /r:$(BUILD_FRAMEWORK)                   \
+       /r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll
 
 TEST_MCS_FLAGS = \
-       /r:Microsoft.Build.Framework.dll        \
-       /r:Microsoft.Build.Utilities.dll
+       /r:$(BUILD_FRAMEWORK)   \
+       /r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll
 
-EXTRA_DISTFILES = Test/resources/TestTasks.cs
+EXTRA_DISTFILES = \
+       Test/resources/TestTasks.cs             \
+       Test/resources/*.*proj  \
+       Test/test-config-file*
 
 Test/resources/TestTasks.dll: Test/resources/TestTasks.cs
-       $(CSCOMPILE) Test/resources/TestTasks.cs /r:Microsoft.Build.Framework.dll /r:Microsoft.Build.Utilities.dll /target:library
+       $(CSCOMPILE) Test/resources/TestTasks.cs /r:Microsoft.Build.Framework.dll /r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll /target:library
+
+clean-local: clean-test-tasks
+
+clean-test-tasks:
+       rm -f Test/resources/TestTasks.dll      
+
+test-local: copy-config
+
+ifeq (net_4_0, $(PROFILE))
+copy-config:
+       cp Test/test-config-file-net-4.0 $(test_lib).config
+else
+ifeq (net_3_5, $(PROFILE))
+copy-config:
+       cp Test/test-config-file-net-3.5 $(test_lib).config
+else
+copy-config:
+endif
+endif
+
+export TESTING_MONO=a
+XBUILD_DIR=../../tools/xbuild
+include $(XBUILD_DIR)/xbuild_targets.make
 
 test-local: Test/resources/TestTasks.dll