mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Rename prep.sh to indicate that it is source-build specific and move to the eng dir (#18840)

Browse source
This commit is contained in:
Michael Simons 2024-03-01 13:34:25 -06:00 committed by GitHub
parent 555df1c3c0
commit fc9e980c5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.devcontainer/vmr-source-build/init.sh
View file

@ -27,4 +27,4 @@ vmr_branch=$(git -C "$installer_dir" log --pretty=format:'%D' HEAD^ \
"$workspace_dir/synchronize-vmr.sh" --branch "$vmr_branch" --debug "$workspace_dir/synchronize-vmr.sh" --branch "$vmr_branch" --debug
(cd "$vmr_dir" && ./prep.sh) (cd "$vmr_dir" && ./eng/prep-source-build.sh)

2
eng/pipelines/source-build-license-scan.yml
View file

@ -68,7 +68,7 @@ jobs:
matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ] matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ]
steps: steps:
- script: $(Build.SourcesDirectory)/prep.sh --no-artifacts --no-bootstrap --no-prebuilts - script: $(Build.SourcesDirectory)/eng/prep-source-build.sh --no-artifacts --no-bootstrap --no-prebuilts
displayName: 'Install .NET SDK' displayName: 'Install .NET SDK'
- task: PipAuthenticate@1 - task: PipAuthenticate@1

2
eng/pipelines/templates/jobs/vmr-build.yml
View file

@ -245,7 +245,7 @@ jobs:
echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /vmr/.dotnet" echo "##vso[task.setvariable variable=additionalBuildArgs]--with-sdk /vmr/.dotnet"
fi fi
docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./prep.sh $customPrepArgs docker run --rm -v "$(sourcesPath):/vmr" -w /vmr ${{ parameters.container }} ./eng/prep-source-build.sh $customPrepArgs
displayName: Prep the Build displayName: Prep the Build
- script: | - script: |

2
src/SourceBuild/content/.devcontainer/README.md
View file

@ -24,7 +24,7 @@ or
```bash ```bash
# Building from source only # Building from source only
./prep.sh && ./build.sh -sb ./eng/prep-source-build.sh && ./build.sh -sb
``` ```
> Please note that, at this time, the build modifies some of the checked-in sources so it might > Please note that, at this time, the build modifies some of the checked-in sources so it might

2
src/SourceBuild/content/.devcontainer/prebuilt-sdk/init.sh
View file

@ -3,7 +3,7 @@
source="${BASH_SOURCE[0]}" source="${BASH_SOURCE[0]}"
script_root="$( cd -P "$( dirname "$source" )" && pwd )" script_root="$( cd -P "$( dirname "$source" )" && pwd )"
"$script_root"/../../prep.sh "$script_root"/../../eng/prep-source-build.sh
cp "$script_root/../synchronize-vmr.sh" "/workspaces/" cp "$script_root/../synchronize-vmr.sh" "/workspaces/"
"$script_root"/../../build.sh --online --clean-while-building || exit 0 "$script_root"/../../build.sh --online --clean-while-building || exit 0

4
src/SourceBuild/content/README.md
View file

@ -103,7 +103,7 @@ In case you don't want to / cannot prepare your environment per the requirements
```bash ```bash
# Prep the source to build on your distro. # Prep the source to build on your distro.
# This downloads a .NET SDK and a number of .NET packages needed to build .NET from source. # This downloads a .NET SDK and a number of .NET packages needed to build .NET from source.
./prep.sh ./eng/prep-source-build.sh
# Build the .NET SDK # Build the .NET SDK
./build.sh -sb --clean-while-building ./build.sh -sb --clean-while-building
@ -149,7 +149,7 @@ git clone https://github.com/dotnet/dotnet .
./build.sh --clean-while-building ./build.sh --clean-while-building
# - Building from source # - Building from source
./prep.sh && ./build.sh -sb --clean-while-building ./eng/prep-source-build.sh && ./build.sh -sb --clean-while-building
mkdir -p $HOME/.dotnet mkdir -p $HOME/.dotnet
tar -zxf artifacts/assets/Release/dotnet-sdk-9.0.100-centos.8-x64.tar.gz -C $HOME/.dotnet tar -zxf artifacts/assets/Release/dotnet-sdk-9.0.100-centos.8-x64.tar.gz -C $HOME/.dotnet

2
src/SourceBuild/content/build.sh
View file

@ -305,7 +305,7 @@ if [[ "$sourceOnly" == "true" ]]; then
fi fi
if [ ! -d "$scriptroot/.git" ]; then if [ ! -d "$scriptroot/.git" ]; then
echo "ERROR: $scriptroot is not a git repository. Please run prep.sh add initialize Source Link metadata." echo "ERROR: $scriptroot is not a git repository."
exit 1 exit 1
fi fi

22
src/SourceBuild/content/prep.sh → src/SourceBuild/content/eng/prep-source-build.sh
View file

@ -2,7 +2,7 @@
### Usage: $0 ### Usage: $0
### ###
### Prepares the environment to be built by downloading Private.SourceBuilt.Artifacts.*.tar.gz and ### Prepares the environment for a source build by downloading Private.SourceBuilt.Artifacts.*.tar.gz and
### installing the version of dotnet referenced in global.json ### installing the version of dotnet referenced in global.json
### ###
### Options: ### Options:
@ -20,7 +20,7 @@ set -euo pipefail
IFS=$'\n\t' IFS=$'\n\t'
source="${BASH_SOURCE[0]}" source="${BASH_SOURCE[0]}"
SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)" REPO_ROOT="$( cd -P "$( dirname "$0" )/../" && pwd )"
function print_help () { function print_help () {
sed -n '/^### /,/^$/p' "$source" | cut -b 5- sed -n '/^### /,/^$/p' "$source" | cut -b 5-
@ -79,7 +79,7 @@ done
# Attempting to bootstrap without an SDK will fail. So either the --no-sdk flag must be passed # Attempting to bootstrap without an SDK will fail. So either the --no-sdk flag must be passed
# or a pre-existing .dotnet SDK directory must exist. # or a pre-existing .dotnet SDK directory must exist.
if [ "$buildBootstrap" == true ] && [ "$installDotnet" == false ] && [ ! -d "$SCRIPT_ROOT/.dotnet" ]; then if [ "$buildBootstrap" == true ] && [ "$installDotnet" == false ] && [ ! -d "$REPO_ROOT/.dotnet" ]; then
echo " ERROR: --no-sdk requires --no-bootstrap or a pre-existing .dotnet SDK directory. Exiting..." echo " ERROR: --no-sdk requires --no-bootstrap or a pre-existing .dotnet SDK directory. Exiting..."
exit 1 exit 1
fi fi
@ -93,7 +93,7 @@ fi
# Check if Private.SourceBuilt artifacts archive exists # Check if Private.SourceBuilt artifacts archive exists
artifactsBaseFileName="Private.SourceBuilt.Artifacts" artifactsBaseFileName="Private.SourceBuilt.Artifacts"
packagesArchiveDir="$SCRIPT_ROOT/prereqs/packages/archive/" packagesArchiveDir="$REPO_ROOT/prereqs/packages/archive/"
if [ "$downloadArtifacts" == true ] && [ -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]; then if [ "$downloadArtifacts" == true ] && [ -f ${packagesArchiveDir}${artifactsBaseFileName}.*.tar.gz ]; then
echo " Private.SourceBuilt.Artifacts.*.tar.gz exists...it will not be downloaded" echo " Private.SourceBuilt.Artifacts.*.tar.gz exists...it will not be downloaded"
downloadArtifacts=false downloadArtifacts=false
@ -107,7 +107,7 @@ if [ "$downloadPrebuilts" == true ] && [ -f ${packagesArchiveDir}${prebuiltsBase
fi fi
# Check if dotnet is installed # Check if dotnet is installed
if [ "$installDotnet" == true ] && [ -d "$SCRIPT_ROOT/.dotnet" ]; then if [ "$installDotnet" == true ] && [ -d "$REPO_ROOT/.dotnet" ]; then
echo " ./.dotnet SDK directory exists...it will not be installed" echo " ./.dotnet SDK directory exists...it will not be installed"
installDotnet=false; installDotnet=false;
fi fi
@ -117,7 +117,7 @@ function DownloadArchive {
isRequired="$2" isRequired="$2"
artifactsRid="$3" artifactsRid="$3"
packageVersionsPath="$SCRIPT_ROOT/eng/Versions.props" packageVersionsPath="$REPO_ROOT/eng/Versions.props"
notFoundMessage="No source-built $archiveType found to download..." notFoundMessage="No source-built $archiveType found to download..."
echo " Looking for source-built $archiveType to download..." echo " Looking for source-built $archiveType to download..."
@ -145,17 +145,17 @@ function DownloadArchive {
} }
function BootstrapArtifacts { function BootstrapArtifacts {
DOTNET_SDK_PATH="$SCRIPT_ROOT/.dotnet" DOTNET_SDK_PATH="$REPO_ROOT/.dotnet"
# Create working directory for running bootstrap project # Create working directory for running bootstrap project
workingDir=$(mktemp -d) workingDir=$(mktemp -d)
echo " Building bootstrap previously source-built in $workingDir" echo " Building bootstrap previously source-built in $workingDir"
# Copy bootstrap project to working dir # Copy bootstrap project to working dir
cp "$SCRIPT_ROOT/eng/bootstrap/buildBootstrapPreviouslySB.csproj" "$workingDir" cp "$REPO_ROOT/eng/bootstrap/buildBootstrapPreviouslySB.csproj" "$workingDir"
# Copy NuGet.config from the installer repo to have the right feeds # Copy NuGet.config from the installer repo to have the right feeds
cp "$SCRIPT_ROOT/src/installer/NuGet.config" "$workingDir" cp "$REPO_ROOT/src/installer/NuGet.config" "$workingDir"
# Get PackageVersions.props from existing prev-sb archive # Get PackageVersions.props from existing prev-sb archive
echo " Retrieving PackageVersions.props from existing archive" echo " Retrieving PackageVersions.props from existing archive"
@ -165,7 +165,7 @@ function BootstrapArtifacts {
fi fi
# Run restore on project to initiate download of bootstrap packages # Run restore on project to initiate download of bootstrap packages
"$DOTNET_SDK_PATH/dotnet" restore "$workingDir/buildBootstrapPreviouslySB.csproj" /bl:artifacts/log/prep-bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/log/prep-bootstrap.log /p:ArchiveDir="$packagesArchiveDir" /p:BootstrapOverrideVersionsProps="$SCRIPT_ROOT/eng/bootstrap/OverrideBootstrapVersions.props" "$DOTNET_SDK_PATH/dotnet" restore "$workingDir/buildBootstrapPreviouslySB.csproj" /bl:artifacts/log/prep-bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/log/prep-bootstrap.log /p:ArchiveDir="$packagesArchiveDir" /p:BootstrapOverrideVersionsProps="$REPO_ROOT/eng/bootstrap/OverrideBootstrapVersions.props"
# Remove working directory # Remove working directory
rm -rf "$workingDir" rm -rf "$workingDir"
@ -178,7 +178,7 @@ if [ "$installDotnet" == true ]; then
(source ./eng/common/tools.sh && InitializeDotNetCli true) (source ./eng/common/tools.sh && InitializeDotNetCli true)
# TODO: Remove once runtime dependency is gone (https://github.com/dotnet/runtime/issues/93666) # TODO: Remove once runtime dependency is gone (https://github.com/dotnet/runtime/issues/93666)
bash .dotnet/dotnet-install.sh --install-dir "$SCRIPT_ROOT/.dotnet" --channel 8.0 --runtime dotnet bash .dotnet/dotnet-install.sh --install-dir "$REPO_ROOT/.dotnet" --channel 8.0 --runtime dotnet
fi fi
# Read the eng/Versions.props to get the archives to download and download them # Read the eng/Versions.props to get the archives to download and download them