X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fpackages%2FMakefile;h=9980aa9be99033f1625cc42cbad82a02a96d85e3;hb=HEAD;hp=5b3cc08cacfb8bfe87cff0b951325c5ac7837671;hpb=7a950a04504aca14aacd241def6b3369006723a9;p=mono.git

diff --git a/mcs/packages/Makefile b/mcs/packages/Makefile
index 5b3cc08cacf..9980aa9be99 100644
--- a/mcs/packages/Makefile
+++ b/mcs/packages/Makefile
@@ -3,23 +3,56 @@ include ../build/rules.make
 
 ROSLYN_CSC_DIR = $(dir $(CSC_LOCATION))
 
+ROSLYN_FILES_FOR_MONO = \
+	$(ROSLYN_CSC_DIR)/csc.exe				\
+	$(ROSLYN_CSC_DIR)/csc.rsp				\
+	$(ROSLYN_CSC_DIR)/csc.exe.config			\
+	$(ROSLYN_CSC_DIR)/csi.exe				\
+	$(ROSLYN_CSC_DIR)/csi.exe.config			\
+	$(ROSLYN_CSC_DIR)/csi.rsp				\
+	$(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.CSharp.dll	\
+	$(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.CSharp.Scripting.dll \
+	$(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.VisualBasic.dll \
+	$(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.dll		\
+	$(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.Scripting.dll \
+	$(ROSLYN_CSC_DIR)/System.Collections.Immutable.dll	\
+	$(ROSLYN_CSC_DIR)/System.Reflection.Metadata.dll	\
+	$(ROSLYN_CSC_DIR)/VBCSCompiler.exe			\
+	$(ROSLYN_CSC_DIR)/VBCSCompiler.exe.config
+
+ROSLYN_FILES_TO_COPY_FOR_MSBUILD = \
+	$(ROSLYN_CSC_DIR)/Microsoft.Build.Tasks.CodeAnalysis.dll \
+	$(ROSLYN_CSC_DIR)/Microsoft.CSharp.Core.targets 	 \
+	$(ROSLYN_CSC_DIR)/Microsoft.VisualBasic.Core.targets
+
+ROSLYN_FILES_TO_LINK_FOR_MSBUILD = \
+	csi.exe						\
+	csi.exe.config					\
+	csi.rsp						\
+	Microsoft.CodeAnalysis.dll			\
+	Microsoft.CodeAnalysis.CSharp.dll		\
+	Microsoft.CodeAnalysis.CSharp.Scripting.dll 	\
+	Microsoft.CodeAnalysis.Scripting.dll 		\
+	System.Collections.Immutable.dll		\
+	System.Reflection.Metadata.dll			\
+	VBCSCompiler.exe				\
+	VBCSCompiler.exe.config
+
+DISTFILES = $(ROSLYN_FILES_FOR_MONO) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD)
+
 ifeq ($(PROFILE), $(DEFAULT_PROFILE))
 
 TARGET_DIR = $(DESTDIR)$(mono_libdir)/mono/$(FRAMEWORK_VERSION)
+MSBUILD_ROSLYN_DIR = $(DESTDIR)$(mono_libdir)/mono/msbuild/15.0/bin/Roslyn
 
 install-local:
-	$(INSTALL_LIB) $(ROSLYN_CSC_DIR)/csc.exe $(TARGET_DIR)
-	$(INSTALL_LIB) $(ROSLYN_CSC_DIR)/csc.rsp $(TARGET_DIR)
-	$(INSTALL_LIB) $(ROSLYN_CSC_DIR)/csc.exe.config $(TARGET_DIR)
-	$(INSTALL_LIB) $(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.CSharp.dll $(TARGET_DIR)
-	$(INSTALL_LIB) $(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.dll $(TARGET_DIR)
-	$(INSTALL_LIB) $(ROSLYN_CSC_DIR)/System.Collections.Immutable.dll $(TARGET_DIR)
-	$(INSTALL_LIB) $(ROSLYN_CSC_DIR)/System.Reflection.Metadata.dll $(TARGET_DIR)
-
-	$(INSTALL_LIB) $(ROSLYN_CSC_DIR)/csc.exe$(PLATFORM_AOT_SUFFIX) $(TARGET_DIR)
-	$(INSTALL_LIB) $(ROSLYN_CSC_DIR)/System.Reflection.Metadata.dll$(PLATFORM_AOT_SUFFIX) $(TARGET_DIR)
-endif
+	$(MKINSTALLDIRS) $(TARGET_DIR)
+	$(INSTALL_LIB) $(ROSLYN_FILES_FOR_MONO) $(TARGET_DIR)
+	$(MKINSTALLDIRS) $(MSBUILD_ROSLYN_DIR)
+	$(INSTALL_LIB) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) $(MSBUILD_ROSLYN_DIR)
 
+	(cd $(MSBUILD_ROSLYN_DIR); for asm in $(ROSLYN_FILES_TO_LINK_FOR_MSBUILD); do ln -fs ../../../../$(FRAMEWORK_VERSION)/$$asm . ; done)
 
-dist-local: dist-default
+endif
 
+dist-local: dist-default