Skip to content

Commit

Permalink
CoreCLR selective integrations (#18)
Browse files Browse the repository at this point in the history
* Manually add src\coreclr\build.cmd / sh as of CoreCLR PR 27726

* Selective integration of CoreCLR PR# 27751

Commit SHA: 94b2a0dcd3d00d5d6a7600455c93e467d208b96c

* Selective integration of CoreCLR PR# 27767

Commit SHA: 969a31f4fcd44d0b33995c02e6cfa3a9a967688d

* Selective integration of CoreCLR PR# 27777

Commit SHA: 889a1a1abd7dfa4c95c7c5b7455b48c464f03139

* Fix executable flag on src/coreclr/build.sh
  • Loading branch information
trylek authored and ViktorHofer committed Nov 11, 2019
1 parent 4b621c8 commit 0962cd8
Show file tree
Hide file tree
Showing 13 changed files with 2,265 additions and 17 deletions.
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/templates/build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/templates/build-test-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions eng/pipelines/coreclr/templates/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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')) }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/templates/send-to-helix-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ parameters:
steps:
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
# TODO: Remove and consolidate this when we move to arcade via init-tools.cmd.
- powershell: $(Build.SourcesDirectory)\eng\common\build.ps1 /p:DotNetPublishToBlobFeed=true -ci -restore -projects ${{ parameters.coreClrRepoRoot }}\eng\empty.csproj
- powershell: $(Build.SourcesDirectory)\eng\common\build.ps1 /p:DotNetPublishToBlobFeed=true -ci -restore -projects $(Build.SourcesDirectory)\eng\empty.csproj
displayName: Restore blob feed tasks
${{ if ne(parameters.condition, '') }}:
condition: ${{ parameters.condition }}
Expand Down Expand Up @@ -58,7 +58,7 @@ steps:

- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
# TODO: Remove and consolidate this when we move to arcade via init-tools.sh.
- script: $(Build.SourcesDirectory)/eng/common/build.sh /p:DotNetPublishToBlobFeed=true --ci --restore --projects ${{ parameters.coreClrRepoRoot }}/eng/empty.csproj
- script: $(Build.SourcesDirectory)/eng/common/build.sh /p:DotNetPublishToBlobFeed=true --ci --restore --projects $(Build.SourcesDirectory)/eng/empty.csproj
displayName: Restore blob feed tasks
${{ if ne(parameters.condition, '') }}:
condition: ${{ parameters.condition }}
Expand Down
7 changes: 6 additions & 1 deletion eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,12 @@ jobs:
value: '/'

- name: coreClrRepoRoot
value: '$(Build.SourcesDirectory)'
value: '$(Build.SourcesDirectory)/src/coreclr
- ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'

- name: coreClrRepoRoot
value: '$(Build.SourcesDirectory)'

- name: coreClrRepoRootDir
value: '$(coreClrRepoRoot)$(dir)'
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,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
Expand Down Expand Up @@ -537,7 +537,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

Expand Down
1,085 changes: 1,085 additions & 0 deletions src/coreclr/build.cmd

Large diffs are not rendered by default.

Loading

0 comments on commit 0962cd8

Please sign in to comment.