From 47e150f561ec9acc5e6794baae506607bea119dd Mon Sep 17 00:00:00 2001 From: Bryan Date: Tue, 17 Nov 2015 14:06:42 -0800 Subject: [PATCH] Dotnet-Compile-Native Linux Integration --- scripts/build/build-stage.ps1 | 3 ++- scripts/build/build_appdeps.sh | 22 ++++++++++++++++++++++ scripts/compile.sh | 4 ++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/scripts/build/build-stage.ps1 b/scripts/build/build-stage.ps1 index bc90807da..4fb0a9360 100644 --- a/scripts/build/build-stage.ps1 +++ b/scripts/build/build-stage.ps1 @@ -21,7 +21,8 @@ $Projects = @( "Microsoft.DotNet.Tools.Repl.Csi", "Microsoft.DotNet.Tools.Resgen", "Microsoft.DotNet.Tools.Run", - "Microsoft.DotNet.Tools.Init" + "Microsoft.DotNet.Tools.Init", + "Microsoft.DotNet.Tools.Compiler.Native" ) $BinariesForCoreHost = @( diff --git a/scripts/build/build_appdeps.sh b/scripts/build/build_appdeps.sh index e69de29bb..64425744d 100644 --- a/scripts/build/build_appdeps.sh +++ b/scripts/build/build_appdeps.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +# This file encapsulates the temporary steps to build the dotnet-compile-native command successfully +# The AppDepSDK package is a temporary artifact until we have CoreRT assemblies published to Nuget + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +REPO_ROOT="$SCRIPT_DIR/../.." +APPDEPS_PROJECT_DIR=%REPO_ROOT%\Microsoft.DotNet.Tools.Compiler.Native\appdep + +# Get Absolute Output Dir +pushd $1 +OUTPUT_DIR="$(pwd)" +popd + +## App Deps ## +pushd $APPDEPS_PROJECT_DIR +dotnet restore --packages $APPDEPS_PROJECT_DIR\packages +APPDEP_SDK=$APPDEPS_PROJECT_DIR\packages\toolchain*\*\ +popd + +mkdir -p $OUTPUT_DIR/appdepsdk +cp -a $APPDEP_SDK/. $OUTPUT_DIR/appdepsdk \ No newline at end of file diff --git a/scripts/compile.sh b/scripts/compile.sh index 61c3527a3..ff49e71ce 100755 --- a/scripts/compile.sh +++ b/scripts/compile.sh @@ -106,6 +106,10 @@ cp -R $DNX_ROOT $STAGE2_DIR/bin/dnx cp $DIR/dotnet-restore.sh $STAGE2_DIR/bin/dotnet-restore chmod a+x $STAGE2_DIR/bin/dotnet-restore +# Copy in AppDeps +header "Acquiring Native App Dependencies" +$REPOROOT/scripts/build/build_appdeps.sh "$STAGE2_DIR/bin" + # Stamp the output with the commit metadata COMMIT_ID=$(git rev-parse HEAD) echo $COMMIT_ID > $STAGE2_DIR/.commit