arcade linux build (dotnet#5423)

* arcade linux build * put file execution permission change into source control
michaelgsharp · Nov 9, 2020 · 5c2f260 · 5c2f260
1 parent 0f1ad80
commit 5c2f260
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git 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
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
diff --git 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/...rosoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj b/...rosoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
@@ -11,14 +11,14 @@
 
   <ItemGroup>
     <ModelFiles Include="$(ModelPlacementDir)\AlexNetPrepOnnx\AlexNetPreprocess.onnx"
-    Url="https://aka.ms/mlnet-resources/image/AlexNetPrepOnnx/AlexNetPreprocess.onnx "
+    Url="https://aka.ms/mlnet-resources/image/AlexNetPrepOnnx/AlexNetPreprocess.onnx"
     DestinationFile="$(ModelPlacementDir)\AlexNetPrepOnnx\AlexNetPreprocess.onnx"
     DestinationDir="$(ModelPlacementDir)\AlexNetPrepOnnx" />
   </ItemGroup>
 
   <ItemGroup>
     <ModelFiles Include="$(ModelPlacementDir)\ResNetPrepOnnx\ResNetPreprocess.onnx"
-    Url="https://aka.ms/mlnet-resources/image/ResNetPrepOnnx/ResNetPreprocess.onnx "
+    Url="https://aka.ms/mlnet-resources/image/ResNetPrepOnnx/ResNetPreprocess.onnx"
     DestinationFile="$(ModelPlacementDir)\ResNetPrepOnnx\ResNetPreprocess.onnx"
     DestinationDir="$(ModelPlacementDir)\ResNetPrepOnnx" />
   </ItemGroup>