projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2819 from BrzVlad/fix-major-log
[mono.git]
/
mcs
/
class
/
Microsoft.Build
/
Makefile
diff --git
a/mcs/class/Microsoft.Build/Makefile
b/mcs/class/Microsoft.Build/Makefile
index f41641208cc7aa697cd516c7564673b8c11eec36..933782ff268b64d48a5d746d2223c93ffee7d39c 100644
(file)
--- a/
mcs/class/Microsoft.Build/Makefile
+++ b/
mcs/class/Microsoft.Build/Makefile
@@
-2,25
+2,17
@@
thisdir = class/Microsoft.Build
SUBDIRS =
include ../../build/rules.make
SUBDIRS =
include ../../build/rules.make
-LIBRARY = Microsoft.Build.dll
+XBUILD_DIR=$(topdir)/tools/xbuild
+include $(XBUILD_DIR)/xbuild.make
-ifneq (4, $(FRAMEWORK_VERSION_MAJOR))
-LIBRARY_NAME = dummy-Microsoft.Build.dll
-NO_INSTALL = yes
-NO_TEST = yes
-NO_SIGN_ASSEMBLY = yes
-endif
+LIBRARY = Microsoft.Build.dll
+LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml Microsoft.Build.Engine Microsoft.Build.Framework
LIB_MCS_FLAGS = \
LIB_MCS_FLAGS = \
- /r:$(corlib) \
- /r:System.dll \
- /r:System.Core.dll \
- /r:System.Xml.dll \
- /r:Microsoft.Build.Engine.dll \
- /r:Microsoft.Build.Framework.dll \
/d:MICROSOFT_BUILD_DLL
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
/d:MICROSOFT_BUILD_DLL
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
+TEST_LIB_REFS = $(XBUILD_UTILITIES)
EXTRA_DISTFILES = \
Microsoft.Build.Internal/ExpressionParser.jay \
EXTRA_DISTFILES = \
Microsoft.Build.Internal/ExpressionParser.jay \
@@
-38,7
+30,4
@@
BUILT_SOURCES = $(EXPR_PARSER).cs
include ../../build/library.make
include ../../build/library.make
-export TESTING_MONO=a
-XBUILD_DIR=../../tools/xbuild
-XBUILD_FRAMEWORK_FOLDERS_PATH=xbuild-testing
-include $(XBUILD_DIR)/xbuild_targets.make
+include $(XBUILD_DIR)/xbuild_test.make