diff options
| -rw-r--r-- | UpdateDependencies.ps1 | 2 | ||||
| -rw-r--r-- | build.cmd | 2 | ||||
| -rwxr-xr-x | build.sh | 4 | ||||
| -rwxr-xr-x | tests/scripts/arm32_ci_script.sh | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/UpdateDependencies.ps1 b/UpdateDependencies.ps1 index 8fee1b9bef..51f24c5c14 100644 --- a/UpdateDependencies.ps1 +++ b/UpdateDependencies.ps1 @@ -74,7 +74,7 @@ function UpdateValidDependencyVersionsFile # Updates all the project.json files with out of date version numbers function RunUpdatePackageDependencyVersions { - cmd /c $PSScriptRoot\tests\buildtest.cmd updateinvalidpackages | Out-Host + cmd /c $PSScriptRoot\build-test.cmd updateinvalidpackages | Out-Host return $LASTEXITCODE -eq 0 } @@ -103,6 +103,8 @@ if /i "%1" == "skiptests" (set __BuildTests=0&set processedArgs=!proce if /i "%1" == "skipbuildpackages" (set __BuildPackages=0&set processedArgs=!processedArgs! %1&goto Arg_Next) if /i "%1" == "buildjit32" (set __BuildJit32="-DBUILD_JIT32=1"&set processedArgs=!processedArgs! %1&goto Arg_Next) if /i "%1" == "toolset_dir" (set __ToolsetDir=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&goto Arg_Next) +if /i "%1" == "-priority" (set __UnprocessedBuildArgs=!__UnprocessedBuildArgs! %1=%2&shift&goto Arg_Next) +if /i "%1" == "-officialbuildid" (set __UnprocessedBuildArgs=!__UnprocessedBuildArgs! %1=%2&shift&goto Arg_Next) set __UnprocessedBuildArgs=!__UnprocessedBuildArgs! %1 @@ -197,9 +197,9 @@ build_coreclr() # Build CoreCLR - echo "Executing $buildTool install -j $NumProc $__UnprocessedBuildArgs" + echo "Executing $buildTool install -j $NumProc" - $buildTool install -j $NumProc $__UnprocessedBuildArgs + $buildTool install -j $NumProc if [ $? != 0 ]; then echo "Failed to build coreclr components." exit 1 diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh index 61f2bfc3a9..2c20d7fe2d 100755 --- a/tests/scripts/arm32_ci_script.sh +++ b/tests/scripts/arm32_ci_script.sh @@ -199,7 +199,7 @@ function cross_build_coreclr { fi #Cross building for emulator rootfs - ROOTFS_DIR="$__ARMRootfsMountPath" CPLUS_INCLUDE_PATH=$LINUX_ARM_INCPATH CXXFLAGS=$LINUX_ARM_CXXFLAGS ./build.sh $__buildArch cross $__verboseFlag $__skipMscorlib clang3.5 $__buildConfig + ROOTFS_DIR="$__ARMRootfsMountPath" CPLUS_INCLUDE_PATH=$LINUX_ARM_INCPATH CXXFLAGS=$LINUX_ARM_CXXFLAGS ./build.sh $__buildArch cross $__verboseFlag $__skipMscorlib clang3.5 $__buildConfig -rebuild #Reset the code to the upstream version (set +x; echo 'Rewinding HEAD to master code') |