Skip to content

Commit

Permalink
Remove entry point helper scripts (#33756)
Browse files Browse the repository at this point in the history
* Remove entry point helper scripts

The entry point helper scripts were useful during the consolidation of
the repositories. This work is mostly done and the build.cmd/sh script
should be used, going forward.
  • Loading branch information
ViktorHofer committed Apr 6, 2020
1 parent 42183b1 commit 62112b0
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 103 deletions.
7 changes: 0 additions & 7 deletions coreclr.cmd

This file was deleted.

16 changes: 0 additions & 16 deletions coreclr.sh

This file was deleted.

6 changes: 2 additions & 4 deletions docs/workflow/building/mono/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build.cmd
Note that the debug configuration is the default option. It generates a 'debug' output and that includes asserts, fewer code optimizations, and is easier for debugging. If you want to make performance measurements, or just want tests to execute more quickly, you can also build the 'release' version which does not have these checks by adding the flag `-configuration release` (or `-c release`).


Once you've built the whole runtime and assuming you want to work with just mono, we have provided `$/mono.sh` that only builds mono and is short hand for:
Once you've built the whole runtime and assuming you want to work with just mono, you want to use the following command:

```bash
./build.sh --subsetCategory mono
Expand All @@ -24,9 +24,7 @@ build.cmd -subsetCategory mono
When the build completes, product binaries will be dropped in the `artifacts\bin\mono\<OS>.<arch>.<flavor>` folder.

### Useful Build Arguments
Here are a list of build arguments that may be of use. These apply to both `build.sh` and `mono.sh`:

For both `build.sh` and `mono.sh`
Here are a list of build arguments that may be of use:

`/p:MonoEnableLlvm=true` - Builds mono w/ LLVM

Expand Down
10 changes: 5 additions & 5 deletions eng/pipelines/installer/jobs/base-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:

- name: BaseJobBuildCommand
value: >-
installer.cmd -restore -build -ci -test
build.cmd -subsetcategory installer -restore -build -test -ci
-configuration $(_BuildConfig)
$(LiveOverridePathArgs)
$(CommonMSBuildArgs)
Expand All @@ -121,7 +121,7 @@ jobs:
- name: BaseJobBuildCommand
value: >-
$(Build.SourcesDirectory)/installer.sh --restore --build --ci --test
$(Build.SourcesDirectory)/build.sh -subsetcategory installer -restore -build -test -ci
-configuration $(_BuildConfig)
$(LiveOverridePathArgs)
$(CommonMSBuildArgs)
Expand All @@ -136,7 +136,7 @@ jobs:
- name: BaseJobBuildCommand
value: >-
$(Build.SourcesDirectory)/installer.sh --restore --build --ci --test
$(Build.SourcesDirectory)/build.sh -subsetcategory installer --restore --build --ci --test
-configuration $(_BuildConfig)
-os ${{ parameters.osGroup }}
-arch ${{ parameters.archType }}
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
value: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar &&

- name: BuildScript
value: ./installer.sh
value: ./build.sh
- name: MSBuildScript
value: /root/runtime/eng/common/msbuild.sh

Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:

- name: BuildArguments
value: >-
--restore --build --ci --test
-subsetcategory installer -restore -build -test -ci
/p:CrossBuild=${{ ne(parameters.crossrootfsDir, '') }}
/p:PortableBuild=$(_PortableBuild)
/p:SkipTests=$(SkipTests)
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/libraries/base-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
helixRepo: dotnet/runtime
pool: ${{ parameters.pool }}
variables:
- _buildScriptFileName: libraries
- _buildScriptFileName: build
- _BuildConfig: ${{ parameters.buildConfig }}

- _msbuildCommonParameters: ''
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- _buildScript: ./$(_buildScriptFileName)$(scriptExt)

- _buildArguments: -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testScopeArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
- _buildArguments: -subsetcategory libraries -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testScopeArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg)
- ${{ parameters.variables }}

dependsOn:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/enterprise/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ variables:
- name: enterpriseTestsSetup
value: $(sourcesRoot)/Common/tests/System/Net/EnterpriseTests/setup
- name: containerRunTestsCommand
value: /repo/.dotnet/dotnet build /t:test
value: /repo/dotnet.sh build /t:test
- name: containerLibrariesRoot
value: /repo/src/libraries

Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/mono/templates/build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ jobs:

# Build
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) $(osOverride) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
- script: ./build$(scriptExt) -subsetcategory mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) $(osOverride) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
- script: build$(scriptExt) -subsetcategory mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
displayName: Build product

# Publish product output directory for consumption by tests.
Expand All @@ -108,10 +108,10 @@ jobs:

# Build packages
- ${{ if and(ne(parameters.llvm, true), ne(parameters.osGroup, 'Windows_NT')) }}:
- script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }} -pack $(OutputRidArg)
- script: ./build$(scriptExt) -subsetcategory mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }} -pack $(OutputRidArg)
displayName: Build nupkg
- ${{ if and(ne(parameters.llvm, true), eq(parameters.osGroup, 'Windows_NT')) }}:
- script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }} -pack $(OutputRidArg)
- script: build$(scriptExt) -subsetcategory mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }} -pack $(OutputRidArg)
displayName: Build nupkg

# Save packages using the prepare-signed-artifacts format.
Expand Down
7 changes: 0 additions & 7 deletions installer.cmd

This file was deleted.

16 changes: 0 additions & 16 deletions installer.sh

This file was deleted.

7 changes: 0 additions & 7 deletions libraries.cmd

This file was deleted.

16 changes: 0 additions & 16 deletions libraries.sh

This file was deleted.

2 changes: 0 additions & 2 deletions mono.cmd

This file was deleted.

16 changes: 0 additions & 16 deletions mono.sh

This file was deleted.

0 comments on commit 62112b0

Please sign in to comment.