-
Notifications
You must be signed in to change notification settings - Fork 5k
Bring up android+coreclr windows build. #112256
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
6c79fe6
Bring up android+coreclr windows build. Mostly works except for the A…
steveisok 6d4d71a
Bring in Alex's appbuilder changes and note gen-buildsys.cmd in Direc…
steveisok 664e3b3
Merge remote-tracking branch 'upstream/main' into android-win-build
steveisok 4642773
Note GenerateNativeVersionFile workaround
steveisok e8e7eee
Merge remote-tracking branch 'upstream/main' into android-win-build
steveisok 44b4fd5
Make sure osx condition goes through for tryrun.cmake
steveisok 778cb35
Bring back TARGET_ARCH_NAME as system.native in mono depends on it
steveisok f125549
Only care about targetos in event scripts when cross compiling
steveisok a0c8f3d
Merge remote-tracking branch 'origin/android-win-build' into android-…
steveisok 4d250a4
Rearrange cmake variable order and build more subsets
steveisok 1721c3d
Cleanup genEventing
steveisok ef6f887
Update src/coreclr/generateredefinesfile.ps1
steveisok File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,34 @@ | ||
| param ( | ||
| [string]$inputFile, | ||
| [string]$prefix | ||
| ) | ||
|
|
||
| # Print the header | ||
| Write-Output "V1.0 {" | ||
| Write-Output " global:" | ||
|
|
||
| # Read the input file line by line | ||
| Get-Content $inputFile | ForEach-Object { | ||
| $line = $_.Trim() | ||
|
|
||
| # Skip empty lines and comment lines starting with semicolon | ||
| if ($line -match '^\;.*$' -or $line -match '^[\s]*$') { | ||
| return | ||
| } | ||
|
|
||
| # Remove the CR character in case the sources are mapped from | ||
| # a Windows share and contain CRLF line endings | ||
| $line = $line -replace "`r", "" | ||
|
|
||
| # Only prefix the entries that start with "#" | ||
| if ($line -match '^#.*$') { | ||
| $line = $line -replace '^#', '' | ||
| Write-Output " $prefix$line;" | ||
| } else { | ||
| Write-Output " $line;" | ||
| } | ||
| } | ||
|
|
||
| # Print the footer | ||
| Write-Output " local: *;" | ||
| Write-Output "};" |
This file contains hidden or 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 hidden or 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,27 @@ | ||
| $VersionFolder = $PSScriptRoot | ||
| $RepoRoot = (Resolve-Path "$VersionFolder/../../../").Path.TrimEnd("\") | ||
|
|
||
| Get-ChildItem -Path "$VersionFolder" -Filter "_version.*" | ForEach-Object { | ||
| $path = $_.FullName | ||
| if ($_.Name -eq "_version.c") { | ||
| # For _version.c, update the commit ID if it has changed from the last build. | ||
| $commit = (git rev-parse HEAD 2>$null) | ||
| if (-not $commit) { $commit = "N/A" } | ||
| $substitute = "static char sccsid[] __attribute__((used)) = `"@(#)Version N/A @Commit: $commit`";" | ||
| $version_file_contents = Get-Content -Path $path | ForEach-Object { $_ -replace "^static.*", $substitute } | ||
| $version_file_destination = "$RepoRoot\\artifacts\\obj\\_version.c" | ||
| $current_contents = "" | ||
| $is_placeholder_file = $false | ||
| if (Test-Path -Path $version_file_destination) { | ||
| $current_contents = Get-Content -Path $version_file_destination -Raw | ||
| $is_placeholder_file = $current_contents -match "@\(#\)Version N/A @Commit:" | ||
| } else { | ||
| $is_placeholder_file = $true | ||
| } | ||
| if ($is_placeholder_file -and $version_file_contents -ne $current_contents) { | ||
| $version_file_contents | Set-Content -Path $version_file_destination | ||
| } | ||
| } elseif (-not (Test-Path -Path "$RepoRoot\\artifacts\\obj\\$($_.Name)")) { | ||
| Copy-Item -Path $path -Destination "$RepoRoot\\artifacts\\obj\\" | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
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.
Why do we need
monoin the default subsets?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.
we still need to build mono runtime packs
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.
Oh ok, I suppose these are use for internal builds?
Is this also part of the
DotNetBuildAllRuntimePackslogic?