[xbuild] TaskLoggingHelper: Implement support for correctly using task resources

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

diff --git a/mcs/class/Microsoft.Build.Utilities/Makefile b/mcs/class/Microsoft.Build.Utilities/Makefile
index bbfc0a9f1ae93282b0d27fc6d117bad4550fef78..e44bbc2fe80a85d6b9b06961e073b20b66097b3a 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Makefile
+++ b/mcs/class/Microsoft.Build.Utilities/Makefile
@@ -2,23 +2,32 @@ thisdir = class/Microsoft.Build.Utilities
 SUBDIRS = 
 include ../../build/rules.make
 
-LIBRARY = Microsoft.Build.Utilities.dll
-ifeq (1.0, $(FRAMEWORK_VERSION))
-LIBRARY_NAME = dummy-Microsoft.Build.Utilities.dll
-NO_INSTALL = yes
-NO_TEST = yes
-NO_SIGN_ASSEMBLY = yes
-endif
+XBUILD_DIR=$(topdir)/tools/xbuild
+include $(XBUILD_DIR)/xbuild.make
 
-ifeq (3.5, $(FRAMEWORK_VERSION))
-LIBRARY_NAME = Microsoft.Build.Utilities.v3.5.dll
-endif
+LIBRARY = Microsoft.Build.Utilities.dll
+LIBRARY_NAME = Microsoft.Build.Utilities$(NAME_SUFFIX).dll
 
+LIB_REFS = System System.Core System.Xml
 LIB_MCS_FLAGS = \
        /r:$(corlib)                            \
        /r:System.dll                           \
-       /r:Microsoft.Build.Framework.dll
+       /r:System.Core.dll                      \
+       /r:System.Xml.dll                       \
+       /r:$(XBUILD_FRAMEWORK)
 
-TEST_MCS_FLAGS = /r:Microsoft.Build.Framework.dll
+TEST_RESX_RESOURCES = Test/Microsoft.Build.Utilities/Strings.resources
 
+TEST_MCS_FLAGS = /r:$(XBUILD_ENGINE) /r:$(XBUILD_FRAMEWORK) -r:System.dll -r:System.Core.dll $(TEST_RESX_RESOURCES:%=-resource:%)
+
+include $(XBUILD_DIR)/xbuild_test.make
 include ../../build/library.make
+
+EXTRA_DISTFILES = $(TEST_RESX_RESOURCES:.resources=.resx)
+
+CLEAN_FILES += $(TEST_RESX_RESOURCES)
+
+$(TEST_RESX_RESOURCES): %.resources: %.resx
+       $(RESGEN) $< || cp $@.prebuilt $@
+
+$(test_lib): $(TEST_RESX_RESOURCES)