From 830693f501a72dc033c07791921ae7517e0141de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tom=C3=A1=C5=A1=20Rylek?= Date: Fri, 8 Nov 2019 23:30:49 -0800 Subject: [PATCH] Pre-consolidation mop-up fixes part 2 (mostly path shuffles) (dotnet/coreclr#27777) (*) Clean up CoreCLR / root repo considerations in gen-buildsys.sh (*) Move tryrun.cmake to the root; adjust gen-buildsys.sh accordingly Commit migrated from https://github.com/dotnet/coreclr/commit/889a1a1abd7dfa4c95c7c5b7455b48c464f03139 --- eng/pipelines/coreclr/templates/build-job.yml | 2 +- eng/pipelines/coreclr/templates/build-test-job.yml | 2 +- eng/pipelines/coreclr/templates/job.yml | 3 +-- src/coreclr/build-test.sh | 4 ++-- src/coreclr/build.sh | 2 +- src/coreclr/src/pal/tools/gen-buildsys.sh | 16 +++++++++++----- src/coreclr/{src/pal/tools => }/tryrun.cmake | 0 7 files changed, 17 insertions(+), 12 deletions(-) rename src/coreclr/{src/pal/tools => }/tryrun.cmake (100%) diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 367baff..f80391d 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -98,7 +98,7 @@ jobs: # and FreeBSD builds use a build agent with dependencies # preinstalled, so we only need this step for OSX and Windows. - ${{ if eq(parameters.osGroup, 'OSX') }}: - - script: sh $(coreClrRepoRoot)/eng/install-native-dependencies.sh $(osGroup) + - script: sh $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) displayName: Install native dependencies - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: # Necessary to install python diff --git a/eng/pipelines/coreclr/templates/build-test-job.yml b/eng/pipelines/coreclr/templates/build-test-job.yml index 5347978..880ee29 100644 --- a/eng/pipelines/coreclr/templates/build-test-job.yml +++ b/eng/pipelines/coreclr/templates/build-test-job.yml @@ -63,7 +63,7 @@ jobs: # Install test build dependencies - ${{ if eq(parameters.osGroup, 'OSX') }}: - - script: sh $(coreClrRepoRootDir)eng/install-native-dependencies.sh $(osGroup) + - script: sh $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) displayName: Install native dependencies - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: # Necessary to install correct cmake version diff --git a/eng/pipelines/coreclr/templates/job.yml b/eng/pipelines/coreclr/templates/job.yml index 757eb87..ecebd0f 100644 --- a/eng/pipelines/coreclr/templates/job.yml +++ b/eng/pipelines/coreclr/templates/job.yml @@ -119,8 +119,7 @@ jobs: itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} - ${{ each step in parameters.steps }}: - - ${{ if ne(step, '') }}: - - ${{ step }} + - ${{ step }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 6840ef1..9c1ea07 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -548,7 +548,7 @@ build_native_projects() __versionSourceFile="$intermediatesForBuild/version.c" if [ $__SkipGenerateVersion == 0 ]; then pwd - $__RepoRootDir/eng/common/msbuild.sh $__ProjectRoot/eng/empty.csproj \ + $__RepoRootDir/eng/common/msbuild.sh $__RepoRootDir/eng/empty.csproj \ /p:NativeVersionFile=$__versionSourceFile \ /t:GenerateNativeVersionFile /restore \ $__CommonMSBuildArgs $__UnprocessedBuildArgs @@ -580,7 +580,7 @@ build_native_projects() extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1" fi - nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs" + nextCommand="\"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs" echo "Invoking $nextCommand" eval $nextCommand diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index c2faf17..290bb9b 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -273,7 +273,7 @@ build_native() extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1" fi - nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs" + nextCommand="\"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs" echo "Invoking $nextCommand" eval $nextCommand diff --git a/src/coreclr/src/pal/tools/gen-buildsys.sh b/src/coreclr/src/pal/tools/gen-buildsys.sh index 5e34f3d..41c49f0 100755 --- a/src/coreclr/src/pal/tools/gen-buildsys.sh +++ b/src/coreclr/src/pal/tools/gen-buildsys.sh @@ -30,6 +30,15 @@ then exit 1 fi +__CoreClrDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../.." +__RepoRootDir=${__CoreClrDir}/../.. + +# BEGIN SECTION to remove after repo consolidation +if [ ! -f "${__RepoRootDir}/.dotnet-runtime-placeholder" ]; then + __RepoRootDir=${__CoreClrDir} +fi +# END SECTION to remove after repo consolidation + build_arch="$3" buildtype=DEBUG code_coverage=OFF @@ -65,12 +74,9 @@ if [ "$CROSSCOMPILE" == "1" ]; then echo "ROOTFS_DIR not set for crosscompile" exit 1 fi - if [[ -z $CONFIG_DIR ]]; then - CONFIG_DIR="$1/eng/common/cross" - fi export TARGET_BUILD_ARCH=$build_arch - cmake_extra_defines="$cmake_extra_defines -C $scriptroot/tryrun.cmake" - cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$CONFIG_DIR/toolchain.cmake" + cmake_extra_defines="$cmake_extra_defines -C ${__CoreClrDir}/tryrun.cmake" + cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=${__RepoRootDir}/eng/common/cross/toolchain.cmake" fi cmake_command=$(command -v cmake) diff --git a/src/coreclr/src/pal/tools/tryrun.cmake b/src/coreclr/tryrun.cmake similarity index 100% rename from src/coreclr/src/pal/tools/tryrun.cmake rename to src/coreclr/tryrun.cmake -- 2.7.4