Merge pull request #7897 from agocke/add-crossgen

Add crossgen script and crossgen xplat Roslyn toolsets

Makefile

@@ -11,11 +11,11 @@ MSBUILD_ADDITIONALARGS := /v:m /fl /fileloggerparameters:Verbosity=normal /p:Deb
 ifeq ($(OS_NAME),Linux)
 	MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=ubuntu.14.04
 	MONO_TOOLSET_NAME = mono.linux.4
-	ROSLYN_TOOLSET_NAME = roslyn.linux.2
+	ROSLYN_TOOLSET_NAME = roslyn.linux.3
 else ifeq ($(OS_NAME),Darwin)
 	MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=osx.10.10
 	MONO_TOOLSET_NAME = mono.mac.5
-	ROSLYN_TOOLSET_NAME = roslyn.mac.2
+	ROSLYN_TOOLSET_NAME = roslyn.mac.3
 endif
 
 ifneq ($(BUILD_LOG_PATH),)
@@ -41,6 +41,7 @@ bootstrap: toolset
 	mkdir -p $(BOOTSTRAP_PATH) ; \
 	cp Binaries/$(BUILD_CONFIGURATION)/csccore/* $(BOOTSTRAP_PATH) ; \
 	cp Binaries/$(BUILD_CONFIGURATION)/vbccore/* $(BOOTSTRAP_PATH) ; \
+	build/scripts/crossgen.sh $(BOOTSTRAP_PATH) ; \
 	rm -rf Binaries/$(BUILD_CONFIGURATION)
 
 test:

build/scripts/crossgen.sh

+#!/usr/bin/env bash
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+# USAGE: crossgen.sh directory-containing-roslyn
+
+set -e
+
+BIN_DIR="$( cd $1 && pwd )"
+
+UNAME=`uname`
+
+if [ -z "$RID" ]; then
+    if [ "$UNAME" == "Darwin" ]; then
+        RID=osx.10.10-x64
+    elif [ "$UNAME" == "Linux" ]; then
+        RID=ubuntu.14.04-x64
+    else
+        echo "Unknown OS: $UNAME" 1>&2
+        exit 1
+    fi
+fi
+
+# Replace with a robust method for finding the right crossgen.exe
+CROSSGEN_UTIL=$HOME/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-beta-23504/tools/crossgen
+
+cd $BIN_DIR
+
+# Crossgen currently requires itself to be next to mscorlib
+cp $CROSSGEN_UTIL $BIN_DIR
+chmod +x crossgen
+
+./crossgen -nologo -platform_assemblies_paths $BIN_DIR mscorlib.dll
+
+./crossgen -nologo -platform_assemblies_paths $BIN_DIR System.Collections.Immutable.dll
+
+./crossgen -nologo -platform_assemblies_paths $BIN_DIR System.Reflection.Metadata.dll
+
+# The bootstrap build is currently not copying a dependency. See dotnet/roslyn #7907
+./crossgen -nologo -MissingDependenciesOK -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.dll
+
+./crossgen -nologo -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.CSharp.dll
+
+./crossgen -nologo -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.VisualBasic.dll
+
+./crossgen -nologo -platform_assemblies_paths $BIN_DIR csc.exe
+
+./crossgen -nologo -platform_assemblies_paths $BIN_DIR vbc.exe