diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-01-10 04:12:55 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-01-10 10:11:33 +0400 |
| commit | e6ffa41b0eac41837e206c0023e3c4acf13cf5b7 (patch) | |
| tree | ed88f2618f633559ce61b15e280e00ae15b21d30 /mcs | |
| parent | 21a85cdd21b8106e8ace61b3e526b00fe0c7d087 (diff) | |
[xbuild] Do not allow running tests or installing exe w/4.0 profile
It's not a usable MSBuild 4.0 toolset, that's in the 4.5 profile directory.
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/tools/xbuild/Makefile | 7 | ||||
| -rw-r--r-- | mcs/tools/xbuild/xbuild_test.make | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile index 57f054fe933..f5a87b05af2 100644 --- a/mcs/tools/xbuild/Makefile +++ b/mcs/tools/xbuild/Makefile @@ -13,12 +13,17 @@ include ../../build/executable.make XBUILD_DIR=. include $(XBUILD_DIR)/xbuild_test.make -install-local: install-extras +ifeq (4.0, $(FRAMEWORK_VERSION)) +install-local: xbuild-net4-fail +else +install-local: install-extras +endif NETFRAMEWORK_DIR=$(mono_libdir)/mono/xbuild-frameworks/.NETFramework VS_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/VisualStudio PORTABLE_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/Portable + install-extras: install-bin-data install-frameworks install-pcl-targets install-web-targets install-bin-data: diff --git a/mcs/tools/xbuild/xbuild_test.make b/mcs/tools/xbuild/xbuild_test.make index b4709c71be3..48a8930b3da 100644 --- a/mcs/tools/xbuild/xbuild_test.make +++ b/mcs/tools/xbuild/xbuild_test.make @@ -4,7 +4,15 @@ XBUILD_PROFILE_DIR=$(topdir)/class/lib/$(PROFILE) # makes xbuild look in the class/lib/$PROFILE build directories for targets etc export TESTING_MONO=a +ifeq (4.0, $(FRAMEWORK_VERSION)) +test-local: xbuild-net4-fail +else test-local: copy-targets $(test_lib).config +endif + +xbuild-net4-fail: + @echo "The net_4_0 profile contains reference assemblies only and cannot be installed/tested as an xbuild toolset" + @exit 1 copy-targets: cp $(XBUILD_DATA_DIR)/$(XBUILD_VERSION)/Microsoft.Common.targets $(XBUILD_PROFILE_DIR) |