Skip to content

Move a few vendor libraries to src/native/external - #62673

Merged
jkotas merged 6 commits into
dotnet:mainfrom
am11:feature/consolidations
Dec 12, 2021
Merged

Move a few vendor libraries to src/native/external#62673
jkotas merged 6 commits into
dotnet:mainfrom
am11:feature/consolidations

Conversation

@am11

@am11am11 commented Dec 11, 2021

Copy link
Copy Markdown
Member

Moved:

  • brotli
  • rapidjson
  • zlib
  • zlib-intel

@ghostghost added the community-contribution Indicates that the PR has been added by a community member label Dec 11, 2021
@am11

am11 commented Dec 11, 2021

Copy link
Copy Markdown
MemberAuthor

cc @jkotas

  • rapidjson was missing the version file, so added rapidjson-version.txt
  • zlib-intel is not moved, only the one which we use on win-arm/arm64 in libs and on multiple targets in mono (now moved zlib-intel as well)

The format is:

src/native/external/{libname}/
src/native/external/{libname}-version.txt
src/native/external/{libname}.cmake # exception being rapidjson which is header-only lib with no build configs

@janvorli, I was thinking about moving libunwind here as well and refactoring our configurations in a libunwind.cmake file without overwriting anything in vendor's tree. (of course after #62092 is merged) 🙂

@am11
am11force-pushed the feature/consolidations branch from 3b269fc to 31c4d33CompareDecember 11, 2021 17:06
@am11
am11 marked this pull request as ready for review December 11, 2021 19:09
@am11

am11 commented Dec 11, 2021

Copy link
Copy Markdown
MemberAuthor

Red diffs are because one copy (out of three) of zlib is deleted from the repo.
cc @carlossanlop

Comment threadsrc/native/corehost/hostcommon/files.cmake Outdated
@ghost

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

Issue Details

Moved:

  • brotli
  • rapidjson
  • zlib
  • zlib-intel
Author:am11
Assignees:-
Labels:

area-Infrastructure, community-contribution

Milestone:-

@jkotasjkotas left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Thank you!

Except for the ones in vendor directory:
```sh
# git remote add dotnet https://github.com/dotnet/runtime && git pull --rebase dotnet main
if uname 2>/dev/null | grep -q Darwin; then
space=" "
fi
git show --name-only --pretty="" HEAD...dotnet/main \
':!*external/brotli/*' ':!*external/rapidjson/*' ':!*external/zlib/*' ':!*external/zlib-intel/*' |
xargs -I{} sh -c "test -f {} && sed -i$space'' 's/[[:space:]]*$//' {}"
```
@jkotas
jkotas merged commit 0e499ac into dotnet:mainDec 12, 2021
@am11
am11 deleted the feature/consolidations branch December 12, 2021 16:51
@ghostghost locked as resolved and limited conversation to collaborators Jan 11, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-Infrastructurecommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@am11@jkotas