From 5c2f2609a2774a9ea2880d485e2514675f969cc9 Mon Sep 17 00:00:00 2001
From: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Thu, 8 Oct 2020 13:29:22 -0700
Subject: [PATCH] arcade linux build (#5423)
* arcade linux build
* put file execution permission change into source control
---
build.sh | 2 +-
eng/common/build.sh | 0
eng/common/dotnet-install.sh | 0
src/Native/build.sh | 10 ++++++----
.../Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj | 4 ++--
5 files changed, 9 insertions(+), 7 deletions(-)
mode change 100644 => 100755 eng/common/build.sh
mode change 100644 => 100755 eng/common/dotnet-install.sh
diff --git a/build.sh b/build.sh
index dc1acca8dfe..9cfcdfa797f 100755
--- a/build.sh
+++ b/build.sh
@@ -10,4 +10,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-"$DIR/run.sh" build "$@"
+"$DIR/eng/common/build.sh" --restore --build --pack --warnAsError false
diff --git a/eng/common/build.sh b/eng/common/build.sh
old mode 100644
new mode 100755
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
old mode 100644
new mode 100755
diff --git a/src/Native/build.sh b/src/Native/build.sh
index 46a643b30db..cbc7582ce15 100755
--- a/src/Native/build.sh
+++ b/src/Native/build.sh
@@ -25,8 +25,8 @@ RootRepo="$DIR/../.."
__build_arch=
__strip_argument=
__configuration=Debug
-__rootBinPath="$RootRepo/bin"
-__baseIntermediateOutputPath="$__rootBinPath/obj"
+__rootBinPath="$RootRepo/artifacts/bin"
+__baseIntermediateOutputPath="$RootRepo/artifacts/obj"
__versionSourceFile="$__baseIntermediateOutputPath/version.c"
__mkllibpath=""
__mkllibrpath=""
@@ -65,12 +65,14 @@ done
__cmake_defines="-DCMAKE_BUILD_TYPE=${__configuration} ${__strip_argument} -DMKL_LIB_PATH=${__mkllibpath} -DMKL_LIB_RPATH=${__mkllibrpath}"
-__IntermediatesDir="$__baseIntermediateOutputPath/$__build_arch.$__configuration/Native"
-__BinDir="$__rootBinPath/$__build_arch.$__configuration/Native"
+__IntermediatesDir="$__baseIntermediateOutputPath/Native/$__build_arch.$__configuration"
+__BinDir="$__rootBinPath/Native/$__build_arch.$__configuration"
mkdir -p "$__BinDir"
mkdir -p "$__IntermediatesDir"
+export __IntermediatesDir=$__IntermediatesDir
+
# Set up the environment to be used for building with clang.
if command -v "clang-3.5" > /dev/null 2>&1; then
export CC="$(command -v clang-3.5)"
diff --git a/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj b/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
index 6f7c7d27ab5..6acbb993b52 100644
--- a/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
+++ b/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
@@ -11,14 +11,14 @@