Move optdata and version file generation up to MSBuild from build-runtime #58674
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| #include "_version.h" | ||
|
|
||
| #include <windows.h> | ||
|
|
||
| VS_VERSION_INFO VERSIONINFO | ||
| FILEVERSION VER_FILEVERSION | ||
| PRODUCTVERSION VER_PRODUCTVERSION | ||
| FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | ||
| FILEFLAGS VER_DEBUG | ||
| FILEOS VOS__WINDOWS32 | ||
| FILETYPE VFT_DLL | ||
| FILESUBTYPE VFT2_UNKNOWN | ||
| BEGIN | ||
| BLOCK "StringFileInfo" | ||
| BEGIN | ||
| BLOCK "040904E4" | ||
| BEGIN | ||
| VALUE "CompanyName", VER_COMPANYNAME_STR | ||
| VALUE "FileDescription", VER_FILEDESCRIPTION_STR | ||
| VALUE "FileVersion", VER_FILEVERSION_STR | ||
| VALUE "InternalName", VER_INTERNALNAME_STR | ||
| VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR | ||
| VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR | ||
| VALUE "ProductName", VER_PRODUCTNAME_STR | ||
| VALUE "ProductVersion", VER_PRODUCTVERSION_STR | ||
| END | ||
| END | ||
|
|
||
| BLOCK "VarFileInfo" | ||
| BEGIN | ||
| /* The following line should only be modified for localized versions. */ | ||
| /* It consists of any number of WORD,WORD pairs, with each pair */ | ||
| /* describing a language,codepage combination supported by the file. */ | ||
| /* */ | ||
| /* For example, a file might have values "0x409,1252" indicating that it */ | ||
| /* supports English language (0x409) in the Windows ANSI codepage (1252). */ | ||
|
|
||
| VALUE "Translation", 0x409, 1252 | ||
|
|
||
| END | ||
| END |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| static char sccsid[] __attribute__((used)) = "@(#)No version information produced"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| #ifndef VER_COMPANYNAME_STR | ||
| #define VER_COMPANYNAME_STR ".NET Foundation" | ||
| #endif | ||
| #ifndef VER_FILEDESCRIPTION_STR | ||
| #define VER_FILEDESCRIPTION_STR ".NET Runtime" | ||
| #endif | ||
| #ifndef VER_INTERNALNAME_STR | ||
| #define VER_INTERNALNAME_STR VER_FILEDESCRIPTION_STR | ||
| #endif | ||
| #ifndef VER_ORIGINALFILENAME_STR | ||
| #define VER_ORIGINALFILENAME_STR VER_FILEDESCRIPTION_STR | ||
| #endif | ||
| #ifndef VER_PRODUCTNAME_STR | ||
| #define VER_PRODUCTNAME_STR ".NET" | ||
| #endif | ||
| #undef VER_PRODUCTVERSION | ||
| #define VER_PRODUCTVERSION 00,00,00,00000 | ||
| #undef VER_PRODUCTVERSION_STR | ||
| #define VER_PRODUCTVERSION_STR "0.0.0" | ||
| #undef VER_FILEVERSION | ||
| #define VER_FILEVERSION 00,00,00,00000 | ||
| #undef VER_FILEVERSION_STR | ||
| #define VER_FILEVERSION_STR "00,00,00,00000" | ||
| #ifndef VER_LEGALCOPYRIGHT_STR | ||
| #define VER_LEGALCOPYRIGHT_STR ".NET Foundation" | ||
| #endif | ||
| #ifndef VER_DEBUG | ||
| #define VER_DEBUG VS_FF_DEBUG | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| @if not defined _echo @echo off | ||
| setlocal EnableDelayedExpansion EnableExtensions | ||
|
|
||
| set __VersionFolder=%~dp0 | ||
| set __RepoRoot=%~dp0..\..\.. | ||
| set __artifactsObjDir=%__RepoRoot%\artifacts\obj | ||
|
|
||
| for /r "%__VersionFolder%" %%a in (*.h *.rc) do ( | ||
| if not exist "%__artifactsObjDir%\%%~nxa" ( | ||
| copy "%%a" "%__artifactsObjDir%" | ||
| ) | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| __VersionFolder="$(cd "$(dirname "$0")"; pwd -P)" | ||
jkoritzinsky marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| __RepoRoot="$(cd "$(dirname "$__VersionFolder")/../../"; pwd -P)" | ||
|
|
||
| for path in "${__VersionFolder}/"*{.h,.c}; do | ||
| if [[ "$(basename $path)" == _version.c ]]; then | ||
jkoritzinsky marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| # For _version.c, update the commit ID if it has changed from the last build. | ||
| # Set IFS to nothing to prevent the shell from combining all of the piped output into a single line in the script below | ||
| IFS= | ||
|
There was a problem hiding this comment. Just out of curiosity, is it There was a problem hiding this comment. I think it's bash jumbling the lines that are outputted from cat and sed. |
||
| # update commit | ||
| commit="$(git rev-parse HEAD 2>/dev/null)" | ||
| commit="${commit:-N/A}" | ||
| substitute="$(printf 'static char sccsid[] __attribute__((used)) = "@(#)Version N/A @Commit: %s";\n' "$commit")" | ||
| version_file_contents=$(cat $path | sed "s|^static.*|$substitute|") | ||
| version_file_destination=$__RepoRoot/artifacts/obj/_version.c | ||
| if [[ ! -e "$version_file_destination" || "$version_file_contents" != "$(<"$__RepoRoot/artifacts/obj/_version.c")" ]]; then | ||
| echo $version_file_contents > "$version_file_destination" | ||
jkoritzinsky marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| fi | ||
| elif [[ ! -e "$__RepoRoot/artifacts/obj/$(basename "$path")" ]]; then | ||
| cp "$path" "$__RepoRoot/artifacts/obj/" | ||
| fi | ||
| done | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| #define RuntimeAssemblyMajorVersion 0 | ||
| #define RuntimeAssemblyMinorVersion 0 | ||
| #define RuntimeFileMajorVersion 0 | ||
| #define RuntimeFileMinorVersion 0 | ||
| #define RuntimeFileBuildVersion 0 | ||
| #define RuntimeFileRevisionVersion 0 | ||
| #define RuntimeProductMajorVersion 0 | ||
| #define RuntimeProductMinorVersion 0 | ||
| #define RuntimeProductPatchVersion 0 | ||
| #define RuntimeProductVersion |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'windows' And ('$(TargetArchitecture)' == 'x64' Or '$(TargetArchitecture)' == 'x86')">true</NativeOptimizationDataSupported> | ||
| <NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'x64'">true</NativeOptimizationDataSupported> | ||
| <NativeOptimizationDataSupported Condition="'$(NoPgoOptimize)' == 'true'">false</NativeOptimizationDataSupported> | ||
| <NativeOptimizationDataSupported Condition="'$(DotNetBuildFromSource)' == 'true'">false</NativeOptimizationDataSupported> | ||
jkoritzinsky marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| <_NativeOptimizationDataPackageTarget>$(TargetOS.ToLower())-$(TargetArchitecture.ToLower())</_NativeOptimizationDataPackageTarget> | ||
| <_NativeOptimizationDataPackageTarget Condition="'$(TargetOS)' == 'windows'">windows_nt-$(TargetArchitecture.ToLower())</_NativeOptimizationDataPackageTarget> | ||
|
|
||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="optimization.$(_NativeOptimizationDataPackageTarget).PGO.CoreCLR" | ||
| Version="$(optimizationPGOCoreCLRVersion)" | ||
| Condition="'$(optimizationPGOCoreCLRVersion)'!='' And '$(NativeOptimizationDataSupported)'!=''" | ||
| GeneratePathProperty="true" /> | ||
| </ItemGroup> | ||
|
|
||
|
|
||
| <!-- --> | ||
| <!-- Task: GetPgoDataPackagePath --> | ||
| <!-- --> | ||
| <!-- Notes: --> | ||
| <!-- --> | ||
| <!-- DumpPgoDataPackagePath is used to get the path of the native PGO data --> | ||
| <!-- for other MSBuild projects, generally to pass to another project or --> | ||
| <!-- native script like build-runtime.cmd/sh. --> | ||
| <!-- --> | ||
|
|
||
| <Target Name="GetPgoDataPackagePath" Returns="$(PgoPackagePath)"> | ||
| <PropertyGroup> | ||
| <PgoPackagePathProperty>Pkgoptimization_$(_NativeOptimizationDataPackageTarget)_PGO_CoreCLR</PgoPackagePathProperty> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- | ||
| Use an item group for expansion of $($(PgoPackagePathProperty)) (an illegal MSBuild expression) | ||
| i.e. the prop value's value. | ||
| --> | ||
| <ItemGroup> | ||
| <PgoPackagePathPropertyItemList Include="$(PgoPackagePathProperty)" /> | ||
| <PgoPackagePathPropertyItemList> | ||
| <PgoPackagePath>$(%(Identity))</PgoPackagePath> | ||
| </PgoPackagePathPropertyItemList> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PgoPackagePath>@(PgoPackagePathPropertyItemList->'%(PgoPackagePath)')</PgoPackagePath> | ||
| </PropertyGroup> | ||
|
|
||
| <Error Condition="!Exists('$(PgoPackagePath)') And '$(NativeOptimizationDataSupported)' == 'true'" Text="Unable to locate restored PGO package at $(PgoPackagePath). Maybe the platform-specific package naming changed?" /> | ||
| </Target> | ||
|
|
||
| <Target Name="OutputPgoPathForCI" Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(NativeOptimizationDataSupported)' == 'true'" DependsOnTargets="GetPgoDataPackagePath"> | ||
| <Message Text="##vso[task.setvariable variable=CoreClrPgoDataArg]-pgodatapath "$(PgoPackagePath)"" Importance="High" /> | ||
| </Target> | ||
| </Project> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we just inline the
cpline (as done on line 52) rather than indirection and eval? Note that we don't always have 1:1 correspondence between .sh and .cmd, when it comes to internal scripts.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer to move towards a 1:1 correspondence to simplify maintenance costs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Separate file is alright, but concern was regarding usage of
eval: in other places like this file's (build-commons.sh) own usage, we have managed to avoid eval by using sourcing. eval is generally considered as a last resort in scripting languages. We can usesource copy_version_files.sh(or. copy_version_files.sh) syntax here as well.This is my ideal version of
copy_version_files.sh, consistent with most of the existing code:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For testing purposes, it's very nice to be able to manually call this script without having to set up any environment variables beforehand. I'd like to keep that experience if possible. If there's a way to call into another script using the current scripting engine when the path is constructed from vars in bash, I'd happily switch to that from
eval.