Skip to content
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

[vcpkg-tool-meson] Fix installation #35957

Merged
merged 1 commit into from
Jan 4, 2024
Merged

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Jan 1, 2024

Fixes #35795.

  • Install only necessary files, no symlinks.
    Fixes binary caching.
  • Redirect install output to log file.

COMMAND "${CMAKE_COMMAND}"
"-DSOURCE_PATH=${SOURCE_PATH}"
"-DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}"
-P "${CURRENT_PORT_DIR}/install.cmake"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why use a install script here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It allows to easily redirect the output.

Copy link
Contributor

Choose a reason for hiding this comment

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

Use COPY instead of INSTALL in the script then?
I dont think there is a reason to keep an install log here

Copy link
Contributor Author

@dg0yt dg0yt Jan 1, 2024

Choose a reason for hiding this comment

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

I wish the original change would have received this attention.

)

configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY)
Copy link
Contributor

Choose a reason for hiding this comment

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

there is no reason to change this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is no reason to use configure_file.

Copy link
Contributor

Choose a reason for hiding this comment

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

the PR updating meson will just change it back since meson will be moved back into DOWNLOADS an downloaded in the port config. As such this adds just another blame entry.
And since it is moved into downloads it will get directly extracted there.

@Cheney-W Cheney-W added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Jan 2, 2024
@Cheney-W Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Jan 2, 2024
@BillyONeal
Copy link
Member

I don't think there's value in creating a log for file copies like this, but I also don't really see harm either. I'm going to merge as is given that we have a clean build.

the PR updating meson will just change it back since meson will be moved back into DOWNLOADS an downloaded in the port config. As such this adds just another blame entry.

The problem this PR fixes is a problem created by not consuming meson from DOWNLOADS. As such I don't view that consumption from DOWNLOADS will obsolete the change makes the change irrelevant.

@BillyONeal BillyONeal merged commit 70fd6a9 into microsoft:master Jan 4, 2024
15 checks passed
@BillyONeal
Copy link
Member

Thanks!

Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Jan 4, 2024
[vcpkg-tool-meson] Fix installation (microsoft#35957)
@dg0yt dg0yt deleted the meson branch January 11, 2024 08:35
Osyotr pushed a commit to Osyotr/vcpkg that referenced this pull request Jan 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[vcpkg-tool-meson] Install so many files
4 participants