[xbuild] Vbc task - make error column check a little non-specific.

[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 868ee75c2a06b3eae94da303ccef1b656dd55e92..25992a2c3e4543dcaf6f8bd9017294a39bb7bc82 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Makefile
+++ b/mcs/class/Microsoft.Build.Tasks/Makefile
@@ -3,32 +3,69 @@ SUBDIRS =
 include ../../build/rules.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
+BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
+BUILD_ENGINE = Microsoft.Build.Engine.dll
+
+ifeq (3.5, $(FRAMEWORK_VERSION))
+NAME_SUFFIX = .v3.5
+BUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/$(BUILD_FRAMEWORK)
+BUILD_ENGINE := $(topdir)/class/lib/$(PROFILE)/$(BUILD_ENGINE)
+else
+ifeq (4.0, $(FRAMEWORK_VERSION))
+NAME_SUFFIX = .v4.0
+endif
 endif
 
+LIBRARY_NAME = Microsoft.Build.Tasks$(NAME_SUFFIX).dll
+
 LIB_MCS_FLAGS = \
        /r:$(corlib)                            \
        /r:System.dll                           \
-       /r:System.Xml.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.Utilities$(NAME_SUFFIX).dll  \
+       /r:$(BUILD_FRAMEWORK)   \
+       /r:$(BUILD_ENGINE)
 
 TEST_MCS_FLAGS = \
-       /r:Microsoft.Build.Engine.dll           \
-       /r:Microsoft.Build.Framework.dll        \
-       /r:Microsoft.Build.Tasks.dll            \
-       /r:Microsoft.Build.Utilities.dll
+       /r:$(BUILD_ENGINE)      \
+       /r:$(BUILD_FRAMEWORK)   \
+       /r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll
 
-EXTRA_DISTFILES = Test/resources/test.cs Test/resources/Sample.cs
+EXTRA_DISTFILES = \
+       Test/resources/test.cs \
+       Test/resources/Sample.cs \
+       Test/resources/Sample.vb \
+       Test/resources/junk.txt \
+       Test/test-config-file*
 
 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-dll
+
+clean-test-dll:
+       rm -f Test/resources/test.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
+
 include ../../build/library.make